diff --git a/Manifest.files.gz b/Manifest.files.gz
index 57c83c6e2180..93c843fd7dab 100644
Binary files a/Manifest.files.gz and b/Manifest.files.gz differ
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index d790d492d956..078a322e0496 100644
Binary files a/app-accessibility/Manifest.gz and b/app-accessibility/Manifest.gz differ
diff --git a/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
index 7e24f93de77b..8559b3ff195b 100644
--- a/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
+++ b/app-accessibility/nfbtrans/nfbtrans-7.74-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Braille translator from the National Federation of the Blind"
 HOMEPAGE="http://www.nfbnet.org/download/nfbtrans.htm"
-SRC_URI="http://www.nfb.org/Images/nfb/Products_Technology/nfbtr774.zip"
+SRC_URI="http://www.nfb.org/Images/nfb/Products_Technology/nfbtr$(ver_rs 1-2 '').zip"
 S="${WORKDIR}"
 
 LICENSE="public-domain"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 2a1f3bf23a87..562fa7b56767 100644
Binary files a/app-admin/Manifest.gz and b/app-admin/Manifest.gz differ
diff --git a/app-admin/ansible-lint/Manifest b/app-admin/ansible-lint/Manifest
index 50798b869357..9021b8b0133c 100644
--- a/app-admin/ansible-lint/Manifest
+++ b/app-admin/ansible-lint/Manifest
@@ -1,3 +1,2 @@
-DIST ansible-lint-6.4.0.gh.tar.gz 235346 BLAKE2B a2f55e6f4df739dccb011225f0a660978a9dfdbcc6e45cee2eef12467482c471d8700bb1bfad87e03eb1c4f21291307db5dc174e2440370ca11368f6ad6d195d SHA512 75e30a325a5c62f64066925b99e691886e299e029adc78fdceaa5eb23a74a46408793479e7c54c312d93e0a62d190b34f1e7614dec31a94822d39a231796e9df
 DIST ansible-lint-6.5.2.gh.tar.gz 248425 BLAKE2B 02fe3f0cb410831ee7913c5f5ae434678ff183f9c60f0355988d69b516324513fd417439f9ceee4a38192c1e593d7bc00c8fd1aafdff6ba904cdb4ba56257657 SHA512 36a8d7b746bbb0c0f4d85a63180432b9165b1e59ff9da07f6b9477aa02d8998c5c682a317a04c4971a08f0691a10f420d9fd0e7d396d7d1b7f49979c7faf41f5
-DIST ansible-lint-6.6.0.gh.tar.gz 270913 BLAKE2B c192da771939055be89d66783d0b09e114de20919af6ab5ce044ba58b8398f598c63180498f1f4737a3535f687a41f007fb41c9b83151308ec1491fe19d48c87 SHA512 af5e1cf88717bc1e6ee0b9479a380bb06de0b29ef26200acefa0eba6bf1ef9ffa3117e0d4a43db94a8b6ba94b01cbb5790b1286a98576699cca100afb2316313
+DIST ansible-lint-6.6.1.gh.tar.gz 272235 BLAKE2B 50d014a919b7e915aff541b7be401f287ac990ec3dc435af2356143434fb27619e2e9ebad4a6b0ed57d9b0c1972137c34d08b603eda7f8dba49359d209da2e0a SHA512 bd6c2b695ba65e808f7773deef11bd51693b0343dc356788a87761810295fad32114bfb6f8df8eef69a13702b136f1c1d02b1a9f41c43c6e64174842ec67124f
diff --git a/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
deleted file mode 100644
index bc3e252daa8c..000000000000
--- a/app-admin/ansible-lint/ansible-lint-6.4.0.ebuild
+++ /dev/null
@@ -1,75 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="Checks ansible playbooks for practices and behaviour that can be improved"
-HOMEPAGE="https://github.com/ansible/ansible-lint"
-# PyPI tarballs do not contain all the data files needed by the tests
-SRC_URI="https://github.com/ansible/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.12.0[${PYTHON_USEDEP}]
-	>=dev-python/ansible-compat-2.1.0[${PYTHON_USEDEP}]
-	>=dev-python/enrich-1.2.6[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.8.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/rich-9.5.1[${PYTHON_USEDEP}]
-	>=dev-python/ruamel-yaml-0.15.37[${PYTHON_USEDEP}]
-	>=dev-python/wcmatch-7.0[${PYTHON_USEDEP}]
-	>=dev-util/yamllint-1.25.0[${PYTHON_USEDEP}]"
-BDEPEND="
-	>=dev-python/setuptools_scm-3.5.0[${PYTHON_USEDEP}]
-	>=dev-python/setuptools_scm_git_archive-1.0[${PYTHON_USEDEP}]
-	test? (
-		>=dev-python/flaky-3.7.0[${PYTHON_USEDEP}]
-		>=dev-python/pytest-plus-0.2[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-2.5.0[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.2_test-module-check.patch
-)
-
-# Skip problematic tests:
-#  - test_call_from_outside_venv doesn't play nicely with the sandbox
-#  - all the others require Internet access, mostly in order to access Ansible Galaxy
-EPYTEST_DESELECT=(
-	test/test_cli_role_paths.py::test_run_playbook_github
-	test/test_eco.py
-	test/test_examples.py::test_custom_kinds
-	test/test_import_playbook.py::test_task_hook_import_playbook
-	test/test_list_rules.py::test_list_rules_includes_opt_in_rules
-	test/test_list_rules.py::test_list_rules_with_format_option
-	test/test_list_rules.py::test_list_tags_includes_opt_in_rules
-	test/test_main.py::test_call_from_outside_venv
-	test/test_prerun.py::test_install_collection
-	test/test_prerun.py::test_prerun_reqs_v1
-	test/test_prerun.py::test_prerun_reqs_v2
-	test/test_prerun.py::test_require_collection_wrong_version
-	test/test_profiles.py::test_profile_listing
-	test/test_rules_collection.py::test_rich_rule_listing
-	test/test_utils.py::test_cli_auto_detect
-	test/test_utils.py::test_template_lookup
-	test/test_verbosity.py::test_default_verbosity
-)
-
-distutils_enable_tests pytest
-
-python_test() {
-	# As of 6.2.1, without this the test suite still gets confused by the presence of ansible-lint modules
-	# in both ${ED} and ${S}.
-	cd "${S}" || die
-
-	epytest test
-}
diff --git a/app-admin/ansible-lint/ansible-lint-6.6.0.ebuild b/app-admin/ansible-lint/ansible-lint-6.6.1.ebuild
similarity index 98%
rename from app-admin/ansible-lint/ansible-lint-6.6.0.ebuild
rename to app-admin/ansible-lint/ansible-lint-6.6.1.ebuild
index 71e510a4133d..a483735e3a30 100644
--- a/app-admin/ansible-lint/ansible-lint-6.6.0.ebuild
+++ b/app-admin/ansible-lint/ansible-lint-6.6.1.ebuild
@@ -40,7 +40,7 @@ BDEPEND="
 	)"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-6.5.2_test-module-check.patch
+	"${FILESDIR}"/${PN}-6.6.1_test-module-check.patch
 )
 
 # Skip problematic tests:
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.0.2_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.0.2_test-module-check.patch
deleted file mode 100644
index 4288bb897c1e..000000000000
--- a/app-admin/ansible-lint/files/ansible-lint-6.0.2_test-module-check.patch
+++ /dev/null
@@ -1,23 +0,0 @@
-Let the package managers handle dependencies, m'kay?
-
---- a/conftest.py
-+++ b/conftest.py
-@@ -3,18 +3,6 @@
- import os
- import sys
- 
--# checking if user is running pytest without installing test dependencies:
--missing = []
--for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint", "pytest_cov"]:
--    if not importlib.util.find_spec(module):
--        missing.append(module)
--if missing:
--    print(
--        f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'",
--        file=sys.stderr,
--    )
--    sys.exit(1)
--
- 
- os.environ["NO_COLOR"] = "1"
- pytest_plugins = ["ansiblelint.testing.fixtures"]
diff --git a/app-admin/ansible-lint/files/ansible-lint-6.6.1_test-module-check.patch b/app-admin/ansible-lint/files/ansible-lint-6.6.1_test-module-check.patch
new file mode 100644
index 000000000000..0f6e9aadde9e
--- /dev/null
+++ b/app-admin/ansible-lint/files/ansible-lint-6.6.1_test-module-check.patch
@@ -0,0 +1,32 @@
+--- a/conftest.py
++++ b/conftest.py
+@@ -7,29 +7,6 @@
+ import pytest
+ from ansible.module_utils.common.yaml import HAS_LIBYAML
+ 
+-# checking if user is running pytest without installing test dependencies:
+-missing = []
+-for module in ["ansible", "black", "flake8", "flaky", "mypy", "pylint"]:
+-    if not importlib.util.find_spec(module):
+-        missing.append(module)
+-if missing:
+-    print(
+-        f"FATAL: Missing modules: {', '.join(missing)} -- probably you missed installing test requirements with: pip install -e '.[test]'",
+-        file=sys.stderr,
+-    )
+-    sys.exit(1)
+-
+-if not HAS_LIBYAML and sys.version_info >= (3, 9, 0):
+-    # While presence of libyaml is not required for runtime, we keep this error
+-    # fatal here in order to be sure that we spot libyaml errors during testing.
+-    #
+-    # For 3.8.x we do not do this check, as libyaml does not have an arm64 build for py38.
+-    print(
+-        "FATAL: For testing, we require pyyaml to be installed with its native extension, missing it would make testing 3x slower and risk missing essential bugs.",
+-        file=sys.stderr,
+-    )
+-    sys.exit(1)
+-
+ 
+ os.environ["NO_COLOR"] = "1"
+ 
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index a724ad8b8622..d431e5cde064 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -8,3 +8,4 @@ DIST aws-cli-1.25.70.gh.tar.gz 2267239 BLAKE2B e20606c8b3df77698f6ad67eb28a63d8d
 DIST aws-cli-1.25.71.gh.tar.gz 2267936 BLAKE2B a44cc3995335d2556e919879127ebac77c274d6a1f55a390acb85d59d1ee3850826a9d0cc1b7d4e86cb7a5abf9ebac00a1a62aa0d0846a06c04166fa40b18abf SHA512 8c0f235a8f16404ca770ff8c157b52981bd808c25c045e39f7cca6b35d992caa921ac84f82309323b1b742ff783296a1d9ca51cb154704270940ce8a900c09b0
 DIST aws-cli-1.25.75.gh.tar.gz 2270365 BLAKE2B 68cd58d03e0712133104dbb145c6d4bcedf8925e59088d0f2c7ecb7c91beb572a3c8c33f55d95e1a2e0e462648c06cde2460e595942e8adb33c3dcab8ec6a2fc SHA512 c21de74e0ae7380a810d11bad53f0233bc50c8959f047d58c4f4c2cd23231fab34dbba1dac6096790adb28b1ca99e22e70019bcda32738df6e984b2bb46abaa8
 DIST aws-cli-1.25.76.gh.tar.gz 2270850 BLAKE2B 5c642f9cff01884a7a54c619ff8a174b88209d2010ddec22b99e6d6b8294a3aeaca5b0737c050ab3a1ae339046ef41565669db3a706c0bbf03206ce164784cbf SHA512 43a939c87b1cad66be7c45092ba069933a89aa7ad638bf06d2b7995e59728c1a88971481714f2a950148b3974ac105b3d2f3c6e535f61e0722ff3037a86a9a7c
+DIST aws-cli-1.25.79.gh.tar.gz 2272740 BLAKE2B f7b411a17d13ab9e2f19c46827d63d47079b6563dd11fd0ecc200256974e1fb45787bd6f92b90248b406622eca163c5a0ed027a7f20de695699b074178316cbd SHA512 3b7986cb43e0c1124e11a70d6d4bfc932919aef4a40f41bbeed27d19659e0de0c69ef8426078d3b3193bbfe43de07fc7df460898426822ca885d6c3497f7c2d1
diff --git a/app-admin/awscli/awscli-1.25.79.ebuild b/app-admin/awscli/awscli-1.25.79.ebuild
new file mode 100644
index 000000000000..511be374181c
--- /dev/null
+++ b/app-admin/awscli/awscli-1.25.79.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..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 ~arm64 ~riscv ~x86"
+
+# botocore is x.(y+2).(z-1)
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(( $(ver_cut 3-) - 1 ))"
+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() {
+	# 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/djbdns-logparse/Manifest b/app-admin/djbdns-logparse/Manifest
new file mode 100644
index 000000000000..debe5329f77f
--- /dev/null
+++ b/app-admin/djbdns-logparse/Manifest
@@ -0,0 +1 @@
+DIST djbdns-logparse-0.0.1.tar.gz 23317 BLAKE2B d44b2af042990dc1632746e111ecb53dcd16cd0a245a778f198163afb7de26a5f41cf624c81fe06dbffad94c9370e24267bb3c69176b4afb2e26a71fa5fa1afc SHA512 e066875d3718ab7780c6a82ed022106bd26b454827532beb2f6f2ef5e38d2619b71067250b9ed22eea03380da2f0e68b26931ceb99d9300e15be77d070d7fdf2
diff --git a/app-admin/djbdns-logparse/djbdns-logparse-0.0.1.ebuild b/app-admin/djbdns-logparse/djbdns-logparse-0.0.1.ebuild
new file mode 100644
index 000000000000..a37424d8def8
--- /dev/null
+++ b/app-admin/djbdns-logparse/djbdns-logparse-0.0.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+DESCRIPTION="Make tinydns and dnscache logs human-readable"
+HOMEPAGE="http://michael.orlitzky.com/code/djbdns-logparse.xhtml"
+SRC_URI="http://michael.orlitzky.com/code/releases/${P}.tar.gz"
+LICENSE="AGPL-3+"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+# djbdns-logparse pipes the logs through the "tai64nlocal" program
+# that comes with sys-process/daemontools.
+RDEPEND="sys-process/daemontools"
+BDEPEND="test? ( ${RDEPEND} )"
+
+python_install_all() {
+	doman "doc/man1/${PN}.1"
+	local DOCS=( doc/README )
+	distutils-r1_python_install_all
+}
+
+python_test() {
+	esetup.py test
+}
diff --git a/app-admin/djbdns-logparse/metadata.xml b/app-admin/djbdns-logparse/metadata.xml
new file mode 100644
index 000000000000..c6418674131d
--- /dev/null
+++ b/app-admin/djbdns-logparse/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>mjo@gentoo.org</email>
+  </maintainer>
+</pkgmetadata>
diff --git a/app-admin/sudo/Manifest b/app-admin/sudo/Manifest
index 5f2abb112918..fd7558ec2a90 100644
--- a/app-admin/sudo/Manifest
+++ b/app-admin/sudo/Manifest
@@ -1,6 +1,2 @@
-DIST sudo-1.9.10.tar.gz 4516568 BLAKE2B 94d97379e31b41917616a829cbece3d3fce7dd6ab9d04791b928981c14249c306508298655c19dc59a054ccf7deed4e69e65367cbfe9f6d8b5aba8895cfa6064 SHA512 65cf92b67b64413cb807da8b9602fc90b75e5b30dd1402d682ca36f276a3d6209a8a59c14e463898abc9856bc56263e5ba4bb6d44774f56a2885a9eea4a35375
-DIST sudo-1.9.10.tar.gz.sig 566 BLAKE2B 808919c826faa4f63efc283461f9f2089fd745aaf7462bcc41c505e7f978e7d56307202f96548d95844c99236fec10cada8438b935a1e1b6ea3601ee857d6900 SHA512 4ea0b736783b8e7be47645f770d7684d99c31f901177d3527f1ff78f5126d41592a94d36c67762bf5cb941eed80b9f585637aaa81d7f4920576d31a83f447323
-DIST sudo-1.9.11p2.tar.gz 4825417 BLAKE2B b6b16f17ba8b6d5ab80f5515beebddf21579944376c2b0752111120d9fb6e2c3d3c40c8150a4f1c2c7165fb93e1f9ac3d03f77b0951a6f721e026a175cc948c4 SHA512 ca64ace6b663a61336a2aa45fb96eb585b5075a867e770b0b384aaf015479dfae48847226c83f824372e64f4697454e68c36305f7979f14b662185c284e1da67
-DIST sudo-1.9.11p2.tar.gz.sig 566 BLAKE2B 9ffe8ebf79f3d94c2df4ce18bb811f73854920b262774ef114ed77ff78a2f856765651c0408cd0cd71191b21840fa3c6a73ca7897baa7975dd7b655eead45ab1 SHA512 a452fb875b3f4a05cc8623df18f7b53192b8671cdd8fcdbb9360cc86160b9aadb1148a60f91f106fd381997b91a4dfcf06149f3cb43292284d27997a4d97473f
 DIST sudo-1.9.11p3.tar.gz 4826520 BLAKE2B f8508f65b514abd9979a11628d8bc0e085b2625993281e7d1f8794a576e88970bda6939d2f2f50d9485f00276970aba3489b19c102eca5625e389c9610f338dd SHA512 ad5c3d623547d1e3016e1a721676fee6d6b7348e77b2c234041e0af40c7220e8934c8c27beef0d12fa6df11708d37de711dacfefc135d26de46abca7f91c55d1
 DIST sudo-1.9.11p3.tar.gz.sig 566 BLAKE2B 8caf03b051222f0446eaf333b48563aa18d52acbd9f7e2d880f0a97043df1ec8d25d87cfd7b1b9543ab8f52f5dacff4cf031fe3e6b94593d576d1d351eb05aa4 SHA512 ea728cddbab50746a2cbb8ce6cb55df3def1c5e806a1d91ec6f2d65c8d246079bdb5799b961ab0da1cc2c347a36d93cc00d32c10856141a467b25e1224876e50
diff --git a/app-admin/sudo/sudo-1.9.10-r1.ebuild b/app-admin/sudo/sudo-1.9.10-r1.ebuild
deleted file mode 100644
index 2f7cd3f35838..000000000000
--- a/app-admin/sudo/sudo-1.9.10-r1.ebuild
+++ /dev/null
@@ -1,263 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-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
-	inherit verify-sig
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/sudo.ws.asc
-	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-sudo )"
-
-	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
-fi
-
-# 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 )
-	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
-"
-
-S="${WORKDIR}/${MY_P}"
-
-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 #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
-	tc-export PKG_CONFIG #767712
-
-	# 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.
-	myeconfargs=(
-		# 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
-	fperms 0711 /var/db/sudo #652958
-
-	# Don't install into /run as that is a tmpfs most of the time
-	# (bug #504854)
-	rm -rf "${ED}"/run || die
-
-	find "${ED}" -type f -name "*.la" -delete || die #697812
-}
-
-pkg_postinst() {
-	tmpfiles_process sudo.conf
-
-	#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 /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 /etc/nsswitch.conf."
-			ewarn
-			ewarn "To make use of LDAP, add this line to your /etc/nsswitch.conf:"
-			ewarn "  sudoers: ldap files"
-			ewarn
-		fi
-	fi
-	if use prefix ; then
-		ewarn
-		ewarn "To use sudo, 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/sudo/sudo-1.9.11_p2.ebuild b/app-admin/sudo/sudo-1.9.11_p2.ebuild
deleted file mode 100644
index afb8327d1680..000000000000
--- a/app-admin/sudo/sudo-1.9.11_p2.ebuild
+++ /dev/null
@@ -1,281 +0,0 @@
-# Copyright 1999-2022 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
-
-# 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 )
-	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
-"
-
-S="${WORKDIR}/${MY_P}"
-
-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/sudo/sudo-1.9.11_p3.ebuild b/app-admin/sudo/sudo-1.9.11_p3-r1.ebuild
similarity index 99%
rename from app-admin/sudo/sudo-1.9.11_p3.ebuild
rename to app-admin/sudo/sudo-1.9.11_p3-r1.ebuild
index 40273e0501e8..e677d6731aaf 100644
--- a/app-admin/sudo/sudo-1.9.11_p3.ebuild
+++ b/app-admin/sudo/sudo-1.9.11_p3-r1.ebuild
@@ -54,6 +54,7 @@ DEPEND="
 	)
 	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] )
diff --git a/app-admin/sudo/sudo-9999.ebuild b/app-admin/sudo/sudo-9999.ebuild
index afb8327d1680..046d001b4139 100644
--- a/app-admin/sudo/sudo-9999.ebuild
+++ b/app-admin/sudo/sudo-9999.ebuild
@@ -54,6 +54,7 @@ DEPEND="
 	)
 	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] )
diff --git a/app-arch/Manifest.gz b/app-arch/Manifest.gz
index e28a224674e3..74fb40edc65d 100644
Binary files a/app-arch/Manifest.gz and b/app-arch/Manifest.gz differ
diff --git a/app-arch/zstd/zstd-1.5.2-r1.ebuild b/app-arch/zstd/zstd-1.5.2-r2.ebuild
similarity index 95%
rename from app-arch/zstd/zstd-1.5.2-r1.ebuild
rename to app-arch/zstd/zstd-1.5.2-r2.ebuild
index a55e96f74c14..846cd7ce5c57 100644
--- a/app-arch/zstd/zstd-1.5.2-r1.ebuild
+++ b/app-arch/zstd/zstd-1.5.2-r2.ebuild
@@ -14,8 +14,11 @@ SLOT="0/1"
 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 ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="lz4 static-libs +threads"
 
-RDEPEND="app-arch/xz-utils
-	lz4? ( app-arch/lz4 )"
+RDEPEND="
+	app-arch/xz-utils
+	sys-libs/zlib
+	lz4? ( app-arch/lz4 )
+"
 DEPEND="${RDEPEND}"
 
 src_prepare() {
diff --git a/app-cdr/Manifest.gz b/app-cdr/Manifest.gz
index 58a5ac196166..4526a57a96fc 100644
Binary files a/app-cdr/Manifest.gz and b/app-cdr/Manifest.gz differ
diff --git a/app-cdr/kcdemu/kcdemu-0.8.0.ebuild b/app-cdr/kcdemu/kcdemu-0.8.0.ebuild
index 48b3dc4d0496..2ebcd8fc228b 100644
--- a/app-cdr/kcdemu/kcdemu-0.8.0.ebuild
+++ b/app-cdr/kcdemu/kcdemu-0.8.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -10,7 +10,7 @@ inherit ecm
 
 DESCRIPTION="Frontend to cdemu daemon based on KDE Frameworks"
 HOMEPAGE="https://www.linux-apps.com/p/998461/"
-SRC_URI="mirror://sourceforge/project/kde-cdemu-manager/kde_cdemu-0.8.0.tar.bz2"
+SRC_URI="mirror://sourceforge/project/kde-cdemu-manager/kde_cdemu-${PV}.tar.bz2"
 
 LICENSE="GPL-2"
 SLOT="5"
diff --git a/app-containers/Manifest.gz b/app-containers/Manifest.gz
index 446ed7fc1e9d..cc27f5719f22 100644
Binary files a/app-containers/Manifest.gz and b/app-containers/Manifest.gz differ
diff --git a/app-containers/docker-registry/Manifest b/app-containers/docker-registry/Manifest
index c13a696e584b..1c86f766db1e 100644
--- a/app-containers/docker-registry/Manifest
+++ b/app-containers/docker-registry/Manifest
@@ -1 +1,2 @@
 DIST docker-registry-2.7.1.tar.gz 1996699 BLAKE2B 2e22db69f476be5a4688f5b3d6b41fbbf71460351543ae849f707dd5b3d56624f674815a25214002886b057f0859f75fd197bb275a7b3cc8a7787422f716ad0e SHA512 f6baf0e7aa96ebe828c628f7dfd84ee899331c3c1bdab86662aef595b092702b6d9b2c9be766a6de6d153ff4ca55d85c5fd8785a0968f285f56a32a50092c754
+DIST docker-registry-2.8.1.tar.gz 2007611 BLAKE2B abf3e630652f195cf3ad4d07e6d9845000e79d340b0bb8046528bb62592df754c125fd38a92d1af27d068fcd51910f80f356d6a894cb1b97f28d7042af24b898 SHA512 b9c8525051458ff4bf4592ca3ddba83c4325e88c6812ddb28c1567e331c1571f112e3b646ca970f0fe420f3b1d61d00f7151450d7b9948a08733606255731266
diff --git a/app-containers/docker-registry/docker-registry-2.8.1.ebuild b/app-containers/docker-registry/docker-registry-2.8.1.ebuild
new file mode 100644
index 000000000000..773fa15bb205
--- /dev/null
+++ b/app-containers/docker-registry/docker-registry-2.8.1.ebuild
@@ -0,0 +1,55 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit golang-vcs-snapshot systemd
+
+EGIT_COMMIT="b5ca020cfbe998e5af3457fda087444cf5116496"
+EGO_PN="github.com/docker/distribution"
+
+DESCRIPTION="Docker Registry 2.0"
+HOMEPAGE="https://github.com/docker/distribution"
+SRC_URI="https://${EGO_PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 MIT ZLIB"
+SLOT="0"
+KEYWORDS="amd64 ~arm64"
+
+DEPEND="
+	acct-group/registry
+	acct-user/registry
+"
+RDEPEND="${DEPEND}"
+
+SVCNAME="registry"
+
+src_prepare() {
+	default
+	pushd src/${EGO_PN} || die
+	eapply "${FILESDIR}"/${PN}-2.7.0-notification-metrics.patch
+	sed -e "s/git describe.*/echo ${PV})/" \
+		-e "s/git rev-parse.*/echo ${EGIT_COMMIT})/" \
+		-e "s/-s -w/-w/" \
+		-i Makefile || die
+	popd || die
+}
+
+src_compile() {
+	export -n GOCACHE XDG_CACHE_HOME #681072
+	GOPATH="${S}" GO_BUILD_FLAGS="-v" emake -C src/${EGO_PN} binaries
+}
+
+src_install() {
+	exeinto /usr/libexec/${PN}
+	doexe src/${EGO_PN}/bin/*
+	insinto /etc/docker/registry
+	newins src/${EGO_PN}/cmd/registry/config-example.yml config.yml.example
+	newinitd "${FILESDIR}/${SVCNAME}.initd" "${SVCNAME}"
+	newconfd "${FILESDIR}/${SVCNAME}.confd" "${SVCNAME}"
+	systemd_dounit "${FILESDIR}/${SVCNAME}.service"
+	keepdir /var/log/${SVCNAME}
+	fowners ${SVCNAME}:${SVCNAME} /var/log/${SVCNAME}
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/${SVCNAME}.logrotated" "${SVCNAME}"
+}
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index 97122c96905d..18b1dc1b14cd 100644
Binary files a/app-crypt/Manifest.gz and b/app-crypt/Manifest.gz differ
diff --git a/app-crypt/gnupg/Manifest b/app-crypt/gnupg/Manifest
index 1ae533ed4a9a..fdb506e83ca5 100644
--- a/app-crypt/gnupg/Manifest
+++ b/app-crypt/gnupg/Manifest
@@ -1,14 +1,4 @@
-DIST gnupg-2.2.35.tar.bz2 7262687 BLAKE2B 18b5965151ded3b3f28d139824e14d7a6f1673c5192ec5f5a80366a6d5f2e04ed7fa035e2bff105e1752753584f992626ccc9ea8840c2bfa39ffe7ca39b81f7f SHA512 ad9f8d10890b7fafb15a7422e2cebaf0f85ce7cf5f880f4edd8d1dec46aa73c01f9096e601f6edd665f8684d1f5892634991a400e00b3185e6b201f549004d3e
-DIST gnupg-2.2.35.tar.bz2.sig 119 BLAKE2B d95323703c12c9474b21fa91ddb70d4d4d464c794223e21f6ae5d4de955f07a5cabde50612e977168ea6071c4b12be3262cbafe9bcaa8e9a0b009318c0ff6718 SHA512 9043894730520e974e7bc17e0f95419c319fbcd514f102faf644e2f5580e238719cecb8b5e778ecf20f9212ee2554206eb0686e8b5fce7f8c556146657660fe2
-DIST gnupg-2.2.36.tar.bz2 7273805 BLAKE2B 82f26f48380632ddffedacb5e7cff653aec7bea2cf90d88184e0ddeb4053bd2b0ed1ee7addeceb684ffcbf07ccc2cba699172d78e5ab023af2e3d777fbb702b0 SHA512 2d14000a0e8b36688d5e89372a1ef5f8a526b2724715377323d1f9abd23122aa9d0ab2c0988063c397f969afefbf205aedb7205915fd751c539336e680d8462a
-DIST gnupg-2.2.36.tar.bz2.sig 119 BLAKE2B ad6dc03c34f6c0d13080ef0bdea2db152c12ea4f129783ba1b0b7f237965b8eeec22b2e79fcf42657dafdd20cae558d781b07378bed78386979a0b4c4ef4a49b SHA512 4ad3f9041aa1fbffaab3cc4aa0df038a67dc8eb200492cdd96259dcf1e0005cb39d6e6245280f1a2a8d4db9f686381e2b0f5bb80c412edbdbcb3fc11dca044c5
-DIST gnupg-2.2.37.tar.bz2 7285172 BLAKE2B 40606f996aea3d26e28989466861bf486b8bf95e38d23377c0745b85f4817988f794fa07cbb1d5b8b7ae1da3c8bd5fcee5fabb1998b2fc1aa0b0e3ea4351575b SHA512 b56c47002948fd28fc9d5c23b46f5522e4210ed61c17f491c3b3fab5fab8893da33b1f8ff55a3bbef6367ff92b10c141c1f24d8350c37a0e756d2bdfbe86d7be
-DIST gnupg-2.2.37.tar.bz2.sig 119 BLAKE2B b5166f574a35223eeadf056d6bc3e8bcbd02fad766713afba28e20d4d431fcf123b5566527274923fede092c1e48efefd32b825644583f016bf3db119af03209 SHA512 8a1c34a5cd6afa3a263669922bc43217274f796634dc14b54558e1361f5e38680c6897e402a5289ccbe08c91efa3647bccd741fa09f3259174b8dabf86ecbc6f
-DIST gnupg-2.2.38.tar.bz2 7290509 BLAKE2B 249fd6502a1607d1881fd97e4a97a1a3557da26929b67424bafcf29b5ef1588c9295347c5be497a8485dd61755bfe40b4f0232e0f1f67d2517c69613c6080da1 SHA512 30483492e27c31db114c29e22eae1b9c54db9f02ade491f443a7748b42825fa3e52545286316b99217aed0b0af29f67ccecca2399c76554a086bcd49b35ad3e5
-DIST gnupg-2.2.38.tar.bz2.sig 119 BLAKE2B 9e7257a7326ccf107eff1f93b92f7e79ab31a2e58c12d4085a2106528c822df1737a127923c62a05fa199fa1d1e0ac900726808870d059871be6ab178849369e SHA512 e00ec552e1347ab26d37ad7830f599aa51e7620e9780250480192f83c67e319bf2d26f7198f49c553204ab96461c0a4aea1fa6ae57c83a91681f98c2596a9ab6
 DIST gnupg-2.2.39.tar.bz2 7290098 BLAKE2B a9e31830f3ef9ec6d8d461a85fcbe4b91bcac9607d3b5f13f5edc0c54505afb6c6c119cd397023b1378d96c7d0f15c0d60da1d15721e9a18eb3ea8c7b69fba83 SHA512 73f881c12c82010aeaada500517ff39ab22b27ff21b1248bc2228b60a2d75385a44a53c5cfadb8f6b84ef22ad9db0105096b6620fb689560809b324019713940
 DIST gnupg-2.2.39.tar.bz2.sig 119 BLAKE2B 584d7d36671670ac507948257e9c6be556ed2a2d3c0100bb2746edfe96df5ee1d4c6172fe0cae39d85fc290097bc5f6e1b351debc8ec2f5cc78047354fbed016 SHA512 6f7d7c2d1fae706b03c735cf453976c3aebef3f23659426f39a88c63d979f4d873ae09280d75dee9000805468d2a7f49d348609061939000f7cedf34ec5c6019
-DIST gnupg-2.3.6.tar.bz2 7604761 BLAKE2B 6cbc749156c50b6633c126cde621271c6c9682a04efea51fbc5a2e92ee56493e8348814391ee0c337adcb4de4dd23293b9592db78998626905038c859ac4af6e SHA512 4540e8d2be836b491918f4987ba301a73fcdc4539b1f9abf6112a74c2d39c0e5dc3f17511212bac1dd7fd0594feecd91f95ecf78d4b2c1e70e818342a1802b85
-DIST gnupg-2.3.6.tar.bz2.sig 119 BLAKE2B c7d4cdc81580b8b1e56c7bc83236d65c9d2c1bab2d210d14a0d3c58f635d656c9b449ef9596b9601027cb891bd437cc8f2a63eb3c17742c288531511984fba7f SHA512 85d155f9809c8d0f38723d8622c085e421531c016d19fcce2ae34dc9a4aeac0bc1895f7a094ee9cdf69a15b426fb0d72ee53319fe0a05665c92caa0e950c1797
 DIST gnupg-2.3.7.tar.bz2 7599853 BLAKE2B 3e9e33c8357222f42cc0e2af538e9f1f1f0453f35d790aaadf47ce9df24229efa91457b6014b34f19084448a3a6603c82e7d07714b89a68c6a84a08af6fa0e02 SHA512 c7fe169050ef17051cdaac9ad476e7ea792483baad1208fc359d568fa9e138d920ecaa2cd9cae73b20f5472a7d8ca6540a62062ff7a06055cc656b0eb4b917b9
 DIST gnupg-2.3.7.tar.bz2.sig 119 BLAKE2B c2652adf203bc828ed0aaf778542e990028156c16b435cd35aa6fe57ca0a5b798087c98e16589685c8ab9b8b92e16c3f7d4da56a4b1209b9adf2c24ea548ae6e SHA512 0257034b3e7ac390dadb151c656ff59822dacedaddca4ad6b5980b3e03a468ada47553e6a1fcff6a12c64ae2f9c15b245df855cd424b010041df8daaaab9a1b8
diff --git a/app-crypt/gnupg/files/gnupg-2.2.35-status-messages-garbled.patch b/app-crypt/gnupg/files/gnupg-2.2.35-status-messages-garbled.patch
deleted file mode 100644
index 23dbf00b1831..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.2.35-status-messages-garbled.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/855395
-https://marc.info/?l=oss-security&m=165657063921408&w=2
-https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=7b1db7192e6e4d0cfc439b23b13831837c85bc21
-
-From 7b1db7192e6e4d0cfc439b23b13831837c85bc21 Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Tue, 14 Jun 2022 11:33:27 +0200
-Subject: [PATCH] g10: Fix garbled status messages in NOTATION_DATA
-
-* g10/cpr.c (write_status_text_and_buffer): Fix off-by-one
---
-
-Depending on the escaping and line wrapping the computed remaining
-buffer length could be wrong.  Fixed by always using a break to
-terminate the escape detection loop.  Might have happened for all
-status lines which may wrap.
-
-GnuPG-bug-id: T6027
---- a/g10/cpr.c
-+++ b/g10/cpr.c
-@@ -328,20 +328,15 @@ write_status_text_and_buffer (int no, const char *string,
-             }
-           first = 0;
-         }
--      for (esc=0, s=buffer, n=len; n && !esc; s++, n--)
-+      for (esc=0, s=buffer, n=len; n; s++, n--)
-         {
-           if (*s == '%' || *(const byte*)s <= lower_limit
-               || *(const byte*)s == 127 )
-             esc = 1;
-           if (wrap && ++count > wrap)
--            {
--              dowrap=1;
--              break;
--            }
--        }
--      if (esc)
--        {
--          s--; n++;
-+            dowrap=1;
-+          if (esc || dowrap)
-+            break;
-         }
-       if (s != buffer)
-         es_fwrite (buffer, s-buffer, 1, statusfp);
diff --git a/app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch b/app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch
deleted file mode 100644
index 4bac4fea0f0e..000000000000
--- a/app-crypt/gnupg/files/gnupg-2.3.6-status-messages-garbled.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://bugs.gentoo.org/855395
-https://marc.info/?l=oss-security&m=165657063921408&w=2
-https://git.gnupg.org/cgi-bin/gitweb.cgi?p=gnupg.git;a=commitdiff;h=34c649b3601383cd11dbc76221747ec16fd68e1b;hp=4dbef2addca8c76fb4953fd507bd800d2a19d3ec
-
-From 34c649b3601383cd11dbc76221747ec16fd68e1b Mon Sep 17 00:00:00 2001
-From: Werner Koch <wk@gnupg.org>
-Date: Tue, 14 Jun 2022 11:33:27 +0200
-Subject: [PATCH 1/1] g10: Fix garbled status messages in NOTATION_DATA
-
-* g10/cpr.c (write_status_text_and_buffer): Fix off-by-one
---
-
-Depending on the escaping and line wrapping the computed remaining
-buffer length could be wrong.  Fixed by always using a break to
-terminate the escape detection loop.  Might have happened for all
-status lines which may wrap.
-
-GnuPG-bug-id: T6027
---- a/g10/cpr.c
-+++ b/g10/cpr.c
-@@ -372,20 +372,15 @@ write_status_text_and_buffer (int no, const char *string,
-             }
-           first = 0;
-         }
--      for (esc=0, s=buffer, n=len; n && !esc; s++, n--)
-+      for (esc=0, s=buffer, n=len; n; s++, n--)
-         {
-           if (*s == '%' || *(const byte*)s <= lower_limit
-               || *(const byte*)s == 127 )
-             esc = 1;
-           if (wrap && ++count > wrap)
--            {
--              dowrap=1;
--              break;
--            }
--        }
--      if (esc)
--        {
--          s--; n++;
-+            dowrap=1;
-+          if (esc || dowrap)
-+            break;
-         }
-       if (s != buffer)
-         es_fwrite (buffer, s-buffer, 1, statusfp);
diff --git a/app-crypt/gnupg/gnupg-2.2.35-r1.ebuild b/app-crypt/gnupg/gnupg-2.2.35-r1.ebuild
deleted file mode 100644
index cc1044746b9d..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.35-r1.ebuild
+++ /dev/null
@@ -1,160 +0,0 @@
-# Copyright 1999-2022 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/gnupg.asc
-inherit flag-o-matic systemd toolchain-funcs verify-sig
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
-RESTRICT="!test? ( test )"
-
-# Existence of executables is checked during configuration.
-# Note: On each bump, update dep bounds on each version from configure.ac!
-DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.8.0:=
-	>=dev-libs/libgpg-error-1.29
-	>=dev-libs/libksba-1.3.5
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap:= )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
-	"${FILESDIR}"/${P}-status-messages-garbled.patch
-)
-
-src_prepare() {
-	default
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable test all-tests)
-		$(use_enable test tests)
-		$(use_enable tofu)
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-gpg
-		--enable-gpgsm
-		--enable-large-secmem
-
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	# bug #663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	# bug #638574
-	use tofu && export TESTFLAGS=--parallel
-
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.35.ebuild b/app-crypt/gnupg/gnupg-2.2.35.ebuild
deleted file mode 100644
index f27f0d8dab72..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.35.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 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/gnupg.asc
-inherit flag-o-matic systemd toolchain-funcs verify-sig
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
-RESTRICT="!test? ( test )"
-
-# Existence of executables is checked during configuration.
-# Note: On each bump, update dep bounds on each version from configure.ac!
-DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.8.0:=
-	>=dev-libs/libgpg-error-1.29
-	>=dev-libs/libksba-1.3.5
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap:= )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch"
-)
-
-src_prepare() {
-	default
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable test all-tests)
-		$(use_enable test tests)
-		$(use_enable tofu)
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-gpg
-		--enable-gpgsm
-		--enable-large-secmem
-
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	# bug #663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	# bug #638574
-	use tofu && export TESTFLAGS=--parallel
-
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.36.ebuild b/app-crypt/gnupg/gnupg-2.2.36.ebuild
deleted file mode 100644
index 6500ebd0e1fb..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.36.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 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/gnupg.asc
-inherit flag-o-matic systemd toolchain-funcs verify-sig
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
-RESTRICT="!test? ( test )"
-
-# Existence of executables is checked during configuration.
-# Note: On each bump, update dep bounds on each version from configure.ac!
-DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.8.0:=
-	>=dev-libs/libgpg-error-1.29
-	>=dev-libs/libksba-1.3.5
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap:= )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
-)
-
-src_prepare() {
-	default
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable test all-tests)
-		$(use_enable test tests)
-		$(use_enable tofu)
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-gpg
-		--enable-gpgsm
-		--enable-large-secmem
-
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	# bug #663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	# bug #638574
-	use tofu && export TESTFLAGS=--parallel
-
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.37.ebuild b/app-crypt/gnupg/gnupg-2.2.37.ebuild
deleted file mode 100644
index 6500ebd0e1fb..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.37.ebuild
+++ /dev/null
@@ -1,159 +0,0 @@
-# Copyright 1999-2022 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/gnupg.asc
-inherit flag-o-matic systemd toolchain-funcs verify-sig
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
-RESTRICT="!test? ( test )"
-
-# Existence of executables is checked during configuration.
-# Note: On each bump, update dep bounds on each version from configure.ac!
-DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.8.0:=
-	>=dev-libs/libgpg-error-1.29
-	>=dev-libs/libksba-1.3.5
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap:= )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
-)
-
-src_prepare() {
-	default
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable test all-tests)
-		$(use_enable test tests)
-		$(use_enable tofu)
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-gpg
-		--enable-gpgsm
-		--enable-large-secmem
-
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	# bug #663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	# bug #638574
-	use tofu && export TESTFLAGS=--parallel
-
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.2.38.ebuild b/app-crypt/gnupg/gnupg-2.2.38.ebuild
deleted file mode 100644
index 29c399bdc9e6..000000000000
--- a/app-crypt/gnupg/gnupg-2.2.38.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Maintainers should:
-# 1. Join the "Gentoo" project at https://dev.gnupg.org/project/view/27/
-# 2. Subscribe to release tasks like https://dev.gnupg.org/T6159
-# (find the one for the current release then subscribe to it +
-# any subsequent ones linked within so you're covered for a while.)
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-inherit flag-o-matic systemd toolchain-funcs verify-sig
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server"
-RESTRICT="!test? ( test )"
-
-# Existence of executables is checked during configuration.
-# Note: On each bump, update dep bounds on each version from configure.ac!
-DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.8.0:=
-	>=dev-libs/libgpg-error-1.29
-	>=dev-libs/libksba-1.3.5
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap:= )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-	tofu? ( >=dev-db/sqlite-3.7 )"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
-)
-
-src_prepare() {
-	default
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable test all-tests)
-		$(use_enable test tests)
-		$(use_enable tofu)
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-gpg
-		--enable-gpgsm
-		--enable-large-secmem
-
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${EPREFIX}/usr/include/libusb-1.0"
-	fi
-
-	# bug #663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	# bug #638574
-	use tofu && export TESTFLAGS=--parallel
-
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpg-zip,gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.3.6-r1.ebuild b/app-crypt/gnupg/gnupg-2.3.6-r1.ebuild
deleted file mode 100644
index c3371534dadc..000000000000
--- a/app-crypt/gnupg/gnupg-2.3.6-r1.ebuild
+++ /dev/null
@@ -1,165 +0,0 @@
-# Copyright 1999-2022 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/gnupg.asc
-inherit flag-o-matic systemd toolchain-funcs verify-sig
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-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="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( tofu )"
-
-# Existence of executables is checked during configuration.
-# Note: On each bump, update dep bounds on each version from configure.ac!
-DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.9.1:=
-	>=dev-libs/libgpg-error-1.41
-	>=dev-libs/libksba-1.3.4
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap:= )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	tofu? ( >=dev-db/sqlite-3.27 )
-	tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
-	"${FILESDIR}"/${P}-status-messages-garbled.patch
-)
-
-src_prepare() {
-	default
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable test all-tests)
-		$(use_enable test tests)
-		$(use_enable tofu)
-		$(use_enable tofu keyboxd)
-		$(use_enable tofu sqlite)
-		$(usex tpm '--with-tss=intel' '--disable-tpm2d')
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-gpgsm
-		--enable-large-secmem
-
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
-	fi
-
-	# bug #663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	# bug #638574
-	use tofu && export TESTFLAGS=--parallel
-
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gnupg/gnupg-2.3.6.ebuild b/app-crypt/gnupg/gnupg-2.3.6.ebuild
deleted file mode 100644
index 9311b4498b77..000000000000
--- a/app-crypt/gnupg/gnupg-2.3.6.ebuild
+++ /dev/null
@@ -1,164 +0,0 @@
-# Copyright 1999-2022 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/gnupg.asc
-inherit flag-o-matic systemd toolchain-funcs verify-sig
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="The GNU Privacy Guard, a GPL OpenPGP implementation"
-HOMEPAGE="https://gnupg.org/"
-SRC_URI="mirror://gnupg/gnupg/${MY_P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnupg/gnupg/${P}.tar.bz2.sig )"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="GPL-3+"
-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="bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="test? ( tofu )"
-
-# Existence of executables is checked during configuration.
-# Note: On each bump, update dep bounds on each version from configure.ac!
-DEPEND=">=dev-libs/libassuan-2.5.0
-	>=dev-libs/libgcrypt-1.9.1:=
-	>=dev-libs/libgpg-error-1.41
-	>=dev-libs/libksba-1.3.4
-	>=dev-libs/npth-1.2
-	>=net-misc/curl-7.10
-	sys-libs/zlib
-	bzip2? ( app-arch/bzip2 )
-	ldap? ( net-nds/openldap:= )
-	readline? ( sys-libs/readline:0= )
-	smartcard? ( usb? ( virtual/libusb:1 ) )
-	tofu? ( >=dev-db/sqlite-3.27 )
-	tpm? ( >=app-crypt/tpm2-tss-2.4.0:= )
-	ssl? ( >=net-libs/gnutls-3.0:0= )
-"
-
-RDEPEND="${DEPEND}
-	app-crypt/pinentry
-	nls? ( virtual/libintl )
-	selinux? ( sec-policy/selinux-gpg )
-	wks-server? ( virtual/mta )"
-
-BDEPEND="virtual/pkgconfig
-	doc? ( sys-apps/texinfo )
-	nls? ( sys-devel/gettext )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-DOCS=(
-	ChangeLog NEWS README THANKS TODO VERSION
-	doc/FAQ doc/DETAILS doc/HACKING doc/TRANSLATE doc/OpenPGP doc/KEYSERVER
-)
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.1.20-gpgscm-Use-shorter-socket-path-lengts-to-improve-tes.patch
-)
-
-src_prepare() {
-	default
-
-	# Inject SSH_AUTH_SOCK into user's sessions after enabling gpg-agent-ssh.socket in systemctl --user mode,
-	# idea borrowed from libdbus, see
-	#   https://gitlab.freedesktop.org/dbus/dbus/-/blob/master/bus/systemd-user/dbus.socket.in#L6
-	#
-	# This cannot be upstreamed, as it requires determining the exact prefix of 'systemctl',
-	# which in turn requires discovery in Autoconf, something that upstream deeply resents.
-	sed -e "/DirectoryMode=/a ExecStartPost=-${EPREFIX}/bin/systemctl --user set-environment SSH_AUTH_SOCK=%t/gnupg/S.gpg-agent.ssh" \
-		-i doc/examples/systemd-user/gpg-agent-ssh.socket || die
-}
-
-src_configure() {
-	local myconf=(
-		$(use_enable bzip2)
-		$(use_enable nls)
-		$(use_enable smartcard scdaemon)
-		$(use_enable ssl gnutls)
-		$(use_enable test all-tests)
-		$(use_enable test tests)
-		$(use_enable tofu)
-		$(use_enable tofu keyboxd)
-		$(use_enable tofu sqlite)
-		$(usex tpm '--with-tss=intel' '--disable-tpm2d')
-		$(use smartcard && use_enable usb ccid-driver || echo '--disable-ccid-driver')
-		$(use_enable wks-server wks-tools)
-		$(use_with ldap)
-		$(use_with readline)
-		--with-mailprog=/usr/libexec/sendmail
-		--disable-ntbtls
-		--enable-gpgsm
-		--enable-large-secmem
-
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		KSBA_CONFIG="${ESYSROOT}/usr/bin/ksba-config"
-		LIBASSUAN_CONFIG="${ESYSROOT}/usr/bin/libassuan-config"
-		LIBGCRYPT_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-libgcrypt-config"
-		NPTH_CONFIG="${ESYSROOT}/usr/bin/npth-config"
-
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-
-	if use prefix && use usb; then
-		# bug #649598
-		append-cppflags -I"${ESYSROOT}/usr/include/libusb-1.0"
-	fi
-
-	# bug #663142
-	if use user-socket; then
-		myconf+=( --enable-run-gnupg-user-socket )
-	fi
-
-	# glib fails and picks up clang's internal stdint.h causing weird errors
-	tc-is-clang && export gl_cv_absolute_stdint_h="${ESYSROOT}"/usr/include/stdint.h
-
-	# Hardcode mailprog to /usr/libexec/sendmail even if it does not exist.
-	# As of GnuPG 2.3, the mailprog substitution is used for the binary called
-	# by wks-client & wks-server; and if it's autodetected but not not exist at
-	# build time, then then 'gpg-wks-client --send' functionality will not
-	# work. This has an unwanted side-effect in stage3 builds: there was a
-	# [R]DEPEND on virtual/mta, which also brought in virtual/logger, bloating
-	# the build where the install guide previously make the user chose the
-	# logger & mta early in the install.
-
-	econf "${myconf[@]}"
-}
-
-src_compile() {
-	default
-
-	use doc && emake -C doc html
-}
-
-src_test() {
-	# bug #638574
-	use tofu && export TESTFLAGS=--parallel
-
-	default
-}
-
-src_install() {
-	default
-
-	use tools &&
-		dobin \
-			tools/{convert-from-106,gpg-check-pattern} \
-			tools/{gpgconf,gpgsplit,lspgpot,mail-signed-keys} \
-			tools/make-dns-cert
-
-	dosym gpg /usr/bin/gpg2
-	dosym gpgv /usr/bin/gpgv2
-	echo ".so man1/gpg.1" > "${ED}"/usr/share/man/man1/gpg2.1 || die
-	echo ".so man1/gpgv.1" > "${ED}"/usr/share/man/man1/gpgv2.1 || die
-
-	dodir /etc/env.d
-	echo "CONFIG_PROTECT=/usr/share/gnupg/qualified.txt" >> "${ED}"/etc/env.d/30gnupg || die
-
-	use doc && dodoc doc/gnupg.html/* doc/*.png
-
-	systemd_douserunit doc/examples/systemd-user/*.{service,socket}
-}
diff --git a/app-crypt/gpgme/gpgme-1.18.0.ebuild b/app-crypt/gpgme/gpgme-1.18.0.ebuild
deleted file mode 100644
index 4338e7b48226..000000000000
--- a/app-crypt/gpgme/gpgme-1.18.0.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_OPTIONAL=1
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/gnupg.asc
-
-inherit distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig
-
-DESCRIPTION="GnuPG Made Easy is a library for making GnuPG easier to use"
-HOMEPAGE="https://www.gnupg.org/related_software/gpgme"
-SRC_URI="mirror://gnupg/gpgme/${P}.tar.bz2
-	verify-sig? ( mirror://gnupg/gpgme/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-2 LGPL-2.1"
-# Please check ABI on each bump, even if SONAMEs didn't change: bug #833355
-# Use e.g. app-portage/iwdevtools integration with dev-libs/libabigail's abidiff.
-# Subslot: SONAME of each: <libgpgme.libgpgmepp.libqgpgme.FUDGE>
-# Bump FUDGE if a release is made which breaks ABI without changing SONAME.
-# (Reset to 0 if FUDGE != 0 if libgpgme/libgpgmepp/libqpggme change.)
-SLOT="1/11.6.15.1"
-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="common-lisp static-libs +cxx python qt5 test"
-RESTRICT="!test? ( test )"
-
-# Note: On each bump, update dep bounds on each version from configure.ac!
-RDEPEND=">=app-crypt/gnupg-2
-	>=dev-libs/libassuan-2.5.3:=
-	>=dev-libs/libgpg-error-1.36:=
-	python? ( ${PYTHON_DEPS} )
-	qt5? ( dev-qt/qtcore:5 )"
-	#doc? ( app-doc/doxygen[dot] )
-DEPEND="${RDEPEND}
-	test? (
-		qt5? ( dev-qt/qttest:5 )
-	)"
-BDEPEND="python? ( dev-lang/swig )
-	verify-sig? ( sec-keys/openpgp-keys-gnupg )"
-
-REQUIRED_USE="qt5? ( cxx ) python? ( ${PYTHON_REQUIRED_USE} )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.18.0-tests-start-stop-agent-use-command-v.patch
-)
-
-do_python() {
-	if use python; then
-		pushd "lang/python" > /dev/null || die
-		top_builddir="../.." srcdir="." CPP="$(tc-getCPP)" distutils-r1_src_${EBUILD_PHASE}
-		popd > /dev/null || die
-	fi
-}
-
-src_prepare() {
-	default
-
-	elibtoolize
-
-	# bug #697456
-	addpredict /run/user/$(id -u)/gnupg
-
-	local MAX_WORKDIR=66
-	if use test && [[ "${#WORKDIR}" -gt "${MAX_WORKDIR}" ]]; then
-		eerror "Unable to run tests as WORKDIR='${WORKDIR}' is longer than ${MAX_WORKDIR} which causes failure!"
-		die "Could not run tests as requested with too-long WORKDIR."
-	fi
-
-	# Make best effort to allow longer PORTAGE_TMPDIR
-	# as usock limitation fails build/tests
-	ln -s "${P}" "${WORKDIR}/b" || die
-	S="${WORKDIR}/b"
-}
-
-src_configure() {
-	local languages=()
-
-	use common-lisp && languages+=( "cl" )
-	use cxx && languages+=( "cpp" )
-	if use qt5; then
-		languages+=( "qt" )
-		#use doc ||
-		export DOXYGEN=true
-		export MOC="$(qt5_get_bindir)/moc"
-	fi
-
-	# bug #847955
-	append-lfs-flags
-
-	# bug #811933 for libassuan prefix
-	econf \
-		$(use test || echo "--disable-gpgconf-test --disable-gpg-test --disable-gpgsm-test --disable-g13-test") \
-		--enable-languages="${languages[*]}" \
-		--with-libassuan-prefix="${ESYSROOT}"/usr \
-		$(use_enable static-libs static)
-
-	use python && emake -C lang/python prepare
-
-	do_python
-}
-
-src_compile() {
-	default
-	do_python
-}
-
-src_test() {
-	default
-
-	use python && distutils-r1_src_test
-}
-
-python_test() {
-	emake -C lang/python/tests check \
-		PYTHON=${EPYTHON} \
-		PYTHONS=${EPYTHON} \
-		TESTFLAGS="--python-libdir=${BUILD_DIR}/lib"
-}
-
-src_install() {
-	default
-
-	do_python
-
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	# Backward compatibility for gentoo
-	# (in the past, we had slots)
-	dodir /usr/include/gpgme
-	dosym ../gpgme.h /usr/include/gpgme/gpgme.h
-}
diff --git a/app-dicts/Manifest.gz b/app-dicts/Manifest.gz
index 55287a38fe18..f899a20b264b 100644
Binary files a/app-dicts/Manifest.gz and b/app-dicts/Manifest.gz differ
diff --git a/app-dicts/myspell-de/metadata.xml b/app-dicts/myspell-de/metadata.xml
index 13909778f856..123df3cd5c79 100644
--- a/app-dicts/myspell-de/metadata.xml
+++ b/app-dicts/myspell-de/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">
+		<email>gentoo.2019@r123.de</email>
+		<name>Robert Siebeck</name>
+	</maintainer>
+	<maintainer type="project">
+		<email>proxy-maint@gentoo.org</email>
+		<name>Proxy Maintainers</name>
+	</maintainer>
 	<stabilize-allarches/>
 	<longdescription lang="en">
 		German "frami" standard dictionary with spell check, hyphenation patterns and
diff --git a/app-dicts/myspell-de/myspell-de-2017.01.12-r1.ebuild b/app-dicts/myspell-de/myspell-de-2017.01.12-r1.ebuild
new file mode 100644
index 000000000000..262d7cdec76b
--- /dev/null
+++ b/app-dicts/myspell-de/myspell-de-2017.01.12-r1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit myspell-r2
+
+MY_PV=$(ver_rs 1- -)	# YYYY-MM-DD
+
+DESCRIPTION="German (AT,CH,DE) dictionaries for myspell/hunspell"
+HOMEPAGE="
+	https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries
+	https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries
+	https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries
+"
+SRC_URI="
+	l10n_de? (
+		https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries/$(ver_rs 1 -)/@@download/file/dict-de_AT-frami_${MY_PV}.oxt
+		https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries/$(ver_rs 1 -)/@@download/file/dict-de_CH-frami_${MY_PV}.oxt
+		https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries/${MY_PV}/@@download/file/dict-de_DE-frami_${MY_PV}.oxt )
+	l10n_de-AT? ( https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries/$(ver_rs 1 -)/@@download/file/dict-de_AT-frami_${MY_PV}.oxt )
+	l10n_de-CH? ( https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries/$(ver_rs 1 -)/@@download/file/dict-de_CH-frami_${MY_PV}.oxt )
+	l10n_de-DE? ( https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries/${MY_PV}/@@download/file/dict-de_DE-frami_${MY_PV}.oxt )
+"
+
+LICENSE="GPL-3 GPL-2 LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+PLOCALES=( "de-AT" "de-CH" "de-DE" )
+IUSE+="+l10n_de ${PLOCALES[@]/#/l10n_}"
+REQUIRED_USE="|| ( l10n_de ${PLOCALES[@]/#/l10n_} )"
+
+src_prepare() {
+	# fixing file names
+	for i in *_frami.*; do
+		mv "${i}" "${i/_frami}" || die
+	done
+
+	MYSPELL_DICT=( )
+	MYSPELL_HYPH=( )
+	MYSPELL_THES=( )
+	for lang in "${PLOCALES[@]}"; do
+		local mylinguas="${lang//-/_}"
+		if use "l10n_${lang}" || use l10n_de; then
+			MYSPELL_DICT+=( "${mylinguas}.aff" "${mylinguas}.dic" )
+			MYSPELL_HYPH+=( "hyph_${mylinguas}.dic" )
+			MYSPELL_THES+=( "th_${mylinguas}_v2.dat" "th_${mylinguas}_v2.idx" )
+		fi
+	done
+
+	default
+}
diff --git a/app-dicts/myspell-de_1901/myspell-de_1901-20170622.ebuild b/app-dicts/myspell-de_1901/myspell-de_1901-20170622.ebuild
index 80a4cd81d4aa..eb8931885c04 100644
--- a/app-dicts/myspell-de_1901/myspell-de_1901-20170622.ebuild
+++ b/app-dicts/myspell-de_1901/myspell-de_1901-20170622.ebuild
@@ -16,7 +16,7 @@ inherit myspell-r2
 
 DESCRIPTION="German (traditional orthography) dictionaries for myspell/hunspell"
 HOMEPAGE="http://extensions.libreoffice.org/extension-center/german-de-de-1901-old-spelling-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/z/dict-de-de-1901-oldspell-2017-06-22.oxt"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/z/dict-de-de-1901-oldspell-${PV:0:4}-${PV:4:2}-${PV:6:2}.oxt"
 
 LICENSE="LGPL-3"
 SLOT="0"
diff --git a/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild b/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
index 6555dcd2b179..d6d4a8aa9529 100644
--- a/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20210601-r2.ebuild
@@ -7,7 +7,7 @@ inherit myspell-r2
 
 DESCRIPTION="English dictionaries for myspell/hunspell"
 HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/dict-en-20210601.oxt"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/dict-en-${PV}.oxt"
 
 LICENSE="BSD MIT LGPL-3+"
 SLOT="0"
diff --git a/app-dicts/myspell-en/myspell-en-20220701.ebuild b/app-dicts/myspell-en/myspell-en-20220701.ebuild
index 6f7a8205cd41..70048e43695a 100644
--- a/app-dicts/myspell-en/myspell-en-20220701.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20220701.ebuild
@@ -7,7 +7,7 @@ inherit myspell-r2
 
 DESCRIPTION="English dictionaries for myspell/hunspell"
 HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1656659156/dict-en-20220701_lo.oxt"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1656659156/dict-en-${PV}_lo.oxt"
 
 LICENSE="BSD MIT LGPL-3+"
 SLOT="0"
diff --git a/app-dicts/myspell-en/myspell-en-20220801.ebuild b/app-dicts/myspell-en/myspell-en-20220801.ebuild
index a207732d153b..3f1fd85b5195 100644
--- a/app-dicts/myspell-en/myspell-en-20220801.ebuild
+++ b/app-dicts/myspell-en/myspell-en-20220801.ebuild
@@ -7,7 +7,7 @@ inherit myspell-r2
 
 DESCRIPTION="English dictionaries for myspell/hunspell"
 HOMEPAGE="https://extensions.libreoffice.org/extensions/english-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1659325608/dict-en-20220801_lo.oxt"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/41/1659325608/dict-en-${PV}_lo.oxt"
 
 LICENSE="BSD MIT LGPL-3+"
 SLOT="0"
diff --git a/app-dicts/myspell-is/myspell-is-20140808.ebuild b/app-dicts/myspell-is/myspell-is-20140818.ebuild
similarity index 92%
rename from app-dicts/myspell-is/myspell-is-20140808.ebuild
rename to app-dicts/myspell-is/myspell-is-20140818.ebuild
index 5f1b42e8d5e1..4022d67c5c5b 100644
--- a/app-dicts/myspell-is/myspell-is-20140808.ebuild
+++ b/app-dicts/myspell-is/myspell-is-20140818.ebuild
@@ -17,7 +17,7 @@ inherit myspell-r2
 
 DESCRIPTION="Icelandic dictionaries for myspell/hunspell"
 HOMEPAGE="https://extensions.libreoffice.org/extension-center/hunspell-is-the-icelandic-spelling-dictionary-project"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/z/hunspell-is-2014-08-18.oxt"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/z/hunspell-is-${PV:0:4}-${PV:4:2}-${PV:6:2}.oxt"
 
 LICENSE="CC-BY-SA-3.0"
 SLOT="0"
diff --git a/app-dicts/myspell-lt/myspell-lt-1.3-r1.ebuild b/app-dicts/myspell-lt/myspell-lt-1.3-r1.ebuild
index 5679506453aa..d6f06d67ec83 100644
--- a/app-dicts/myspell-lt/myspell-lt-1.3-r1.ebuild
+++ b/app-dicts/myspell-lt/myspell-lt-1.3-r1.ebuild
@@ -16,7 +16,7 @@ inherit myspell-r2
 
 DESCRIPTION="Lithuanian dictionaries for myspell/hunspell"
 HOMEPAGE="https://extensions.libreoffice.org/en/extensions/show/lithuanian-spellcheck-and-hyphenation-dictionaries"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/z/openoffice-spellcheck-lt-1-3.oxt"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/z/openoffice-spellcheck-lt-$(ver_rs 1 '-').oxt"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/app-dicts/myspell-sk/myspell-sk-20200501.ebuild b/app-dicts/myspell-sk/myspell-sk-20200501.ebuild
index 6793cf047a68..429306fa2f9b 100644
--- a/app-dicts/myspell-sk/myspell-sk-20200501.ebuild
+++ b/app-dicts/myspell-sk/myspell-sk-20200501.ebuild
@@ -21,7 +21,7 @@ inherit myspell-r2
 
 DESCRIPTION="Slovak dictionaries for myspell/hunspell"
 HOMEPAGE="https://extensions.libreoffice.org/en/extensions/show/874"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/84/slovak-dictionaries-2020-05.oxt"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/84/slovak-dictionaries-${PV:0:4}-${PV:4:2}.oxt"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/app-dicts/myspell-tr/myspell-tr-1.2.ebuild b/app-dicts/myspell-tr/myspell-tr-1.2.ebuild
index 053e83e5bd43..030e61695ff6 100644
--- a/app-dicts/myspell-tr/myspell-tr-1.2.ebuild
+++ b/app-dicts/myspell-tr/myspell-tr-1.2.ebuild
@@ -12,7 +12,7 @@ inherit myspell-r2
 
 DESCRIPTION="Turkish dictionaries for myspell/hunspell"
 HOMEPAGE="https://extensions.libreoffice.org/en/extensions/show/turkish-spellcheck-dictionary"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/z/oo-turkish-dict-v1-2.oxt"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/z/oo-turkish-dict-v$(ver_rs 1-2 -).oxt"
 
 LICENSE="LGPL-3+"
 SLOT="0"
diff --git a/app-dicts/myspell-uk/myspell-uk-5.3.1.ebuild b/app-dicts/myspell-uk/myspell-uk-5.3.1.ebuild
index c509cc0c6f51..addfea3d5378 100644
--- a/app-dicts/myspell-uk/myspell-uk-5.3.1.ebuild
+++ b/app-dicts/myspell-uk/myspell-uk-5.3.1.ebuild
@@ -21,7 +21,7 @@ inherit myspell-r2
 
 DESCRIPTION="Ukrainian dictionaries for myspell/hunspell"
 HOMEPAGE="https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/521/dict-uk_UA-5.3.1.oxt"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/521/dict-uk_UA-${PV}.oxt"
 
 LICENSE="GPL-3 LGPL-2.1 MPL-1.1"
 SLOT="0"
diff --git a/app-dicts/myspell-uk/myspell-uk-5.8.0.ebuild b/app-dicts/myspell-uk/myspell-uk-5.8.0.ebuild
index 4a810503913e..9a15e122f21c 100644
--- a/app-dicts/myspell-uk/myspell-uk-5.8.0.ebuild
+++ b/app-dicts/myspell-uk/myspell-uk-5.8.0.ebuild
@@ -21,7 +21,7 @@ inherit myspell-r2
 
 DESCRIPTION="Ukrainian dictionaries for myspell/hunspell"
 HOMEPAGE="https://extensions.libreoffice.org/extension-center/ukrainian-spelling-dictionary-and-thesaurus"
-SRC_URI="https://extensions.libreoffice.org/assets/downloads/521/1655471128/dict-uk_UA-5.8.0.oxt"
+SRC_URI="https://extensions.libreoffice.org/assets/downloads/521/1655471128/dict-uk_UA-${PV}.oxt"
 
 LICENSE="GPL-3 LGPL-2.1 MPL-1.1"
 SLOT="0"
diff --git a/app-doc/Manifest.gz b/app-doc/Manifest.gz
index 0454b7501a1d..bb6810aa93d2 100644
Binary files a/app-doc/Manifest.gz and b/app-doc/Manifest.gz differ
diff --git a/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild b/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
index cc87a5b9fd0b..8098c758596a 100644
--- a/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
+++ b/app-doc/mathjax-docs/mathjax-docs-2.7.7.ebuild
@@ -15,7 +15,7 @@ S="${WORKDIR}/MathJax-docs-${COMMIT}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 BDEPEND="
 	$(python_gen_any_dep '
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 038c36e700f0..cb07ade88a5f 100644
Binary files a/app-editors/Manifest.gz and b/app-editors/Manifest.gz differ
diff --git a/app-editors/nano/Manifest b/app-editors/nano/Manifest
index c5b73d5ebd4a..9df8f4a66755 100644
--- a/app-editors/nano/Manifest
+++ b/app-editors/nano/Manifest
@@ -1,3 +1,2 @@
-DIST nano-6.2.tar.gz 3146876 BLAKE2B be6dbc1f53890764184a701e97e792762600c892933830bfcb5c2c4eab19d659583fe797d7197c9045ea8912215aa5885a05f02c66194df17253d6788e0ba599 SHA512 5a59906664a88a03f215d8dba8f7e481fbaffc7bdf93c89ca997df7a8aba2cbb4d45ac84d11f03a796488b82b01ca75161a5ab49fd9115661575451b6ab018c4
 DIST nano-6.3.tar.xz 1581772 BLAKE2B 92ef2acac0dacebc0bf8364bfee928a8394d8e4323e622ad6ba9d35bebd18d3976ab0ca747f7c9b5597874775b44ba4b5560e7392606aa68736158c2bda62b92 SHA512 42279bee54f4d83a0dc06e93c2f385798c304a41e995461b018f5724010213761455563cb53e2411e12bc43c7245e289f4254c359717ca1b89a34d5af8b8c3f3
 DIST nano-6.4.tar.xz 1593804 BLAKE2B b59ff7a741ce4c8b31afdbbfaf1d704cccbceddcd7f1421f30a6dd40495ec456ca891aeb9777c070c6cce4e9c594f83798ff0cdacdfe06e81b0aa0b700033da3 SHA512 cff2d9d90f1a23ab8905320e651f8bbc9d38046153a4f64bbc21927687d9628135915468b00b28f88a0eb7d395d1bcb0b9b7abcf367e5a46a5f3da01d8d6e72b
diff --git a/app-editors/nano/nano-6.2.ebuild b/app-editors/nano/nano-6.2.ebuild
deleted file mode 100644
index c76f1abb21ba..000000000000
--- a/app-editors/nano/nano-6.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit flag-o-matic
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/nano.git"
-	inherit git-r3 autotools
-else
-	MY_P="${PN}-${PV/_}"
-	SRC_URI="https://www.nano-editor.org/dist/v${PV:0:1}/${MY_P}.tar.gz"
-	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="GNU GPL'd Pico clone with more functionality"
-HOMEPAGE="https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide"
-
-LICENSE="GPL-3"
-SLOT="0"
-IUSE="debug justify magic minimal ncurses nls +spell +split-usr static unicode"
-
-LIB_DEPEND="
-	>=sys-libs/ncurses-5.9-r1:=[unicode(+)?]
-	sys-libs/ncurses:=[static-libs(+)]
-	magic? ( sys-apps/file[static-libs(+)] )
-	nls? ( virtual/libintl )"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="${RDEPEND}
-	static? ( ${LIB_DEPEND} )"
-BDEPEND="
-	nls? ( sys-devel/gettext )
-	virtual/pkgconfig
-"
-
-REQUIRED_USE="
-	magic? ( !minimal )
-"
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	use static && append-ldflags -static
-	local myconf=(
-		--bindir="${EPREFIX}"/bin
-		--htmldir=/trash
-		$(use_enable !minimal color)
-		$(use_enable !minimal multibuffer)
-		$(use_enable !minimal nanorc)
-		$(use_enable magic libmagic)
-		$(use_enable spell speller)
-		$(use_enable justify)
-		$(use_enable debug)
-		$(use_enable nls)
-		$(use_enable unicode utf8)
-		$(use_enable minimal tiny)
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	# don't use "${ED}" here or things break (#654534)
-	rm -r "${D}"/trash || die
-
-	dodoc doc/sample.nanorc
-	docinto html
-	dodoc doc/faq.html
-	insinto /etc
-	newins doc/sample.nanorc nanorc
-	if ! use minimal ; then
-		# Enable colorization by default.
-		sed -i \
-			-e '/^# include /s:# *::' \
-			"${ED}"/etc/nanorc || die
-
-		# Since nano-5.0 these are no longer being "enabled" by default
-		# (bug #736848)
-		local rcdir="/usr/share/nano"
-		mv "${ED}"${rcdir}/extra/* "${ED}"/${rcdir}/ || die
-		rmdir "${ED}"${rcdir}/extra || die
-
-		insinto "${rcdir}"
-		doins "${FILESDIR}/gentoo.nanorc"
-	fi
-
-	use split-usr && dosym ../../bin/nano /usr/bin/nano
-}
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index 64eca3419043..3ede371eafbf 100644
Binary files a/app-emacs/Manifest.gz and b/app-emacs/Manifest.gz differ
diff --git a/app-emacs/nxml-libvirt-schemas/Manifest b/app-emacs/nxml-libvirt-schemas/Manifest
index 9cf0f7a8fa6d..71be91197512 100644
--- a/app-emacs/nxml-libvirt-schemas/Manifest
+++ b/app-emacs/nxml-libvirt-schemas/Manifest
@@ -1,4 +1,2 @@
 DIST libvirt-7.10.0.tar.xz 8798000 BLAKE2B 6cb2ab5913d382b11d24b46154dc3250355050cd3038f64ba571b35f33ae5bd0a322d4b96469bd6c78fd848c87f2e6fc7213c33e5bdb9d375a9b81d2a40899bb SHA512 c7eecc9538b68852a8cc67565566d64ec7b087b6f009858b2eb524bc3ef0f6ca3c0da67edf801e6a3ae3fcc0364e65e108fa92bcb01ee810c85fa5f37785aa32
-DIST libvirt-8.4.0.tar.xz 8846528 BLAKE2B 479d7d47a9d711e0240da09eb295f1a644bc4cfddbe544908f2011eb45dff9cf9ffdfff87ba63ded96f5b69024c65832326f9fb0837c5338114ad5dbbada7af1 SHA512 e9dcaa489f162e3a26fe1ca7bb83a22e3f1952594c3541ddd2a7f8e8a0e6ad37e193fb89421df1efe3d2a4d9bb7cf5455c7b7a0b59e133eb6c0ff3cbbd8403b6
-DIST libvirt-8.5.0.tar.xz 8886088 BLAKE2B a789b5d4d4f3d359403b53b1b6bdc31ddd8938d12fce3c77e953a30be359a3f75071c385bc8ce3df11ccc7ad682e433c067781948cf107abef84e54d5aadd0d9 SHA512 62b05c5cd58eab0ab2d945b832fd85807aea9b5f12a7ef5d1205fe0edac8d361ba3a9245f60f200a8548c96f718943d4502d87fff87c4495bd1e2637f14aaccf
 DIST libvirt-8.7.0.tar.xz 8937316 BLAKE2B 131d46206662627e952b6daa3ceeab187321ff5fb1984980bc2816dfedf730c6ccd4b5a1cbfb46f33cc9e84508621e2625fa661f06b9e35561e8de52906824e5 SHA512 35d33d0e0dab525e8f0a8a592d286e9d17fc5c5d1ff2fab5af5c40b85248481dd17b5c3daf64e8c6e1b8a93328eebee6ece3e95edacff208a81d8b78dc102d7a
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.4.0.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.4.0.ebuild
deleted file mode 100644
index 1c0188f9655a..000000000000
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.4.0.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
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-inherit elisp
-
-MY_P="libvirt-${PV}"
-DESCRIPTION="Extension for nxml-mode with libvirt schemas"
-HOMEPAGE="https://www.libvirt.org/"
-SRC_URI="https://libvirt.org/sources/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P%-rc*}/src/conf/schemas"
-
-# This is the license of the package, but the schema files are
-# provided without license, maybe it's bad.
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Yes this requires Java, but I'd rather not repackage this, if you
-# know something better in C, I'll be glad to use that.
-BDEPEND="app-text/trang"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_compile() {
-	emake -f "${FILESDIR}"/Makefile-trang
-}
-
-src_install() {
-	insinto "${SITEETC}/${PN}"
-	doins "${FILESDIR}"/schemas.xml *.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.5.0.ebuild b/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.5.0.ebuild
deleted file mode 100644
index 1c0188f9655a..000000000000
--- a/app-emacs/nxml-libvirt-schemas/nxml-libvirt-schemas-8.5.0.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
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-inherit elisp
-
-MY_P="libvirt-${PV}"
-DESCRIPTION="Extension for nxml-mode with libvirt schemas"
-HOMEPAGE="https://www.libvirt.org/"
-SRC_URI="https://libvirt.org/sources/${MY_P}.tar.xz"
-S="${WORKDIR}/${MY_P%-rc*}/src/conf/schemas"
-
-# This is the license of the package, but the schema files are
-# provided without license, maybe it's bad.
-LICENSE="LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-# Yes this requires Java, but I'd rather not repackage this, if you
-# know something better in C, I'll be glad to use that.
-BDEPEND="app-text/trang"
-
-SITEFILE="60${PN}-gentoo.el"
-
-src_compile() {
-	emake -f "${FILESDIR}"/Makefile-trang
-}
-
-src_install() {
-	insinto "${SITEETC}/${PN}"
-	doins "${FILESDIR}"/schemas.xml *.rnc
-	elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index 5676c260abb9..1dad94a6c78f 100644
Binary files a/app-emulation/Manifest.gz and b/app-emulation/Manifest.gz differ
diff --git a/app-emulation/diskimage-builder/Manifest b/app-emulation/diskimage-builder/Manifest
index e1b651f12a76..0978dc68dd96 100644
--- a/app-emulation/diskimage-builder/Manifest
+++ b/app-emulation/diskimage-builder/Manifest
@@ -2,3 +2,4 @@ DIST diskimage-builder-3.22.0.tar.gz 507997 BLAKE2B 559203fb5e92ff6b32e3cda6e977
 DIST diskimage-builder-3.23.0.tar.gz 509773 BLAKE2B 5896571442b5e359cbae10df3c504c2a3df48ace6ec52294afbad6c03baf300336d955b0180a174395cad118da42dbacfb395df9b32a85976982ff5194ec9e18 SHA512 080bca891890a02a7a0c6910668ccc966a8f2282f62a8b89cd01d5165b4cb52e4bd198b7a2ff431d86a75acae86e7490389f7053f197947c820925d540a3c934
 DIST diskimage-builder-3.23.1.tar.gz 509516 BLAKE2B 05d0484b33bf965f6f534445a13be3771a486b586d36f13905d351e434a6d04732195b484ec29f5c5792e8343bbd56dffb7393641d3d2902e5bfadb2759d3a4b SHA512 0f881dba486f057e18ce81eeb3eca91fa421e6ad6fe59d5e7c4eda11721fde243e0e233863545d16010386defc23aebf195364615324296393a77bab1ce60359
 DIST diskimage-builder-3.24.0.tar.gz 511917 BLAKE2B 4db5132d449c932202ede7a4d9e9f5711b667c39f3dad51dcd68ec81f49a71bafc4bfb09de363a5d16cac89942385a0b43b1adb31424581ccf0c903c0df5f80e SHA512 1e98e8c8886f2d046ccb2b02a647e294ba2d8bd691168678ef81ddab889f8945bae3c46e5e26ad03e0b2311c367bf3dd5d4bd2f07baab6e2002433ca1dfe0f74
+DIST diskimage-builder-3.25.0.tar.gz 512950 BLAKE2B 3a0c5658df5bc2498d4656b77c152dba9bedbbc342b53b20b88e89327cbb98e9c8e5dd8de97cc0b7b0bd31f01cd4d425e8e2f158bde24746b08a460db4ac79da SHA512 e602a9e8e3a8cef1c3cc62fcb3074183a4028c70f2b9e9c27416b6244773eb7cf2aa33a5bf38dca5f10dcfbee5d80eaffa9287e14beccb065cec3ddaf7a76ff7
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.23.1.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.23.1.ebuild
index bbd75fbe73fb..cfd2e2377172 100644
--- a/app-emulation/diskimage-builder/diskimage-builder-3.23.1.ebuild
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.23.1.ebuild
@@ -14,7 +14,7 @@ if [[ ${PV} == 9999* ]]; then
 	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
 else
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm64 x86 ~amd64-linux ~x86-linux"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/app-emulation/diskimage-builder/diskimage-builder-3.25.0.ebuild b/app-emulation/diskimage-builder/diskimage-builder-3.25.0.ebuild
new file mode 100644
index 000000000000..bbd75fbe73fb
--- /dev/null
+++ b/app-emulation/diskimage-builder/diskimage-builder-3.25.0.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{7,8,9,10} )
+DISTUTILS_USE_SETUPTOOLS=rdepend
+inherit distutils-r1
+
+DESCRIPTION="Golden Disk Image builder"
+HOMEPAGE="http://docs.openstack.org/developer/diskimage-builder/"
+if [[ ${PV} == 9999* ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://opendev.org/openstack/diskimage-builder.git"
+else
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux"
+fi
+
+LICENSE="Apache-2.0"
+SLOT="0"
+IUSE=""
+
+CDEPEND=">=dev-python/pbr-2.0.0[${PYTHON_USEDEP}]
+	!~dev-python/pbr-2.1.0[${PYTHON_USEDEP}]"
+DEPEND="${CDEPEND}"
+RDEPEND="${CDEPEND}
+	>=dev-python/Babel-2.3.4[${PYTHON_USEDEP}]
+	!~dev-python/Babel-2.4.0[${PYTHON_USEDEP}]
+	>=dev-python/networkx-1.10[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.12[${PYTHON_USEDEP}]
+	>=dev-python/six-1.10.0[${PYTHON_USEDEP}]
+	>=dev-python/stevedore-1.20.0[${PYTHON_USEDEP}]
+	app-emulation/qemu
+	sys-block/parted
+	sys-fs/multipath-tools
+	sys-fs/dosfstools
+	sys-apps/gptfdisk
+	!dev-python/dib-utils[${PYTHON_USEDEP}]"
diff --git a/app-emulation/libvirt/Manifest b/app-emulation/libvirt/Manifest
index 057ce4489084..25aea9f44d2a 100644
--- a/app-emulation/libvirt/Manifest
+++ b/app-emulation/libvirt/Manifest
@@ -1,18 +1,6 @@
-DIST libvirt-7.10.0.tar.xz 8798000 BLAKE2B 6cb2ab5913d382b11d24b46154dc3250355050cd3038f64ba571b35f33ae5bd0a322d4b96469bd6c78fd848c87f2e6fc7213c33e5bdb9d375a9b81d2a40899bb SHA512 c7eecc9538b68852a8cc67565566d64ec7b087b6f009858b2eb524bc3ef0f6ca3c0da67edf801e6a3ae3fcc0364e65e108fa92bcb01ee810c85fa5f37785aa32
-DIST libvirt-7.10.0.tar.xz.asc 833 BLAKE2B b9e129dcce43a87320b7284264c0689ce45742c0038a68c86fe7a0b789ddc2a49794fe89ae30d4d3675e884891a3b335b61beeb7ff0c5291fbc763ca6629de40 SHA512 41ef8e5fe9a8d1d6ba1c4fa8bd8204b0be83b50d3c936765d7ad005e75600287de0f13e0b14fab4d94d2d4b8bf8916fbe869cbfccf6293cc61c854513a0ef0c3
 DIST libvirt-7.7.0.tar.xz 8670212 BLAKE2B 93c72117941b0a74484c7510c8437054e66fc3ad20c02cead3ce917a38868da2acff9b1e70bbb823122ba647763a3682aaa0da04d82fa75e1acc67449301ae8c SHA512 a0d585c9ac46be08d2865d66456d681b7233291d17f6e0ed2564d0f29dc38ea7afc846ab382f58a193d3cd9acaf25fcc526feb3c98e12a6b4b8ae5aa4aec2f3e
 DIST libvirt-7.7.0.tar.xz.asc 833 BLAKE2B 86a77bf461e353776d79f31f1d0c82fa13e28348bd9c6ae7cb653b98886c7e070d67ed0db55f5e1f3b5e5bd2a3861a5cb08dbf95799b14df1037139f8001b030 SHA512 d5f8cd6accd3bfaebfb7c8761e321aaa9a090c7705256785c5507aa88d985f78a788047dc881f37ea6f64a4634c65c9718d8b1ee0a24744acc3ad5ed6e517bdf
-DIST libvirt-8.0.0.tar.xz 8860124 BLAKE2B 4669ae8f4de6379c3f94d3b6875ccc8eb435fbbf96aac26642fc593bc1921e9189decd9d366f5ca9e3e0fd8392ce840dce9e50ae048a5a2b72c465fd514eaf73 SHA512 e84cf2753d3c57cfe5aadbb6601fa76e0ba750471c1c24631720fe64376c3599ea252863ec671a50527e4fb380ffe0c2f02f07705b4b87d373ccf3e516ff4b1c
-DIST libvirt-8.0.0.tar.xz.asc 833 BLAKE2B 2571ee10d433630ddd79761b1a50948aed33f61ef11e793a7e563e37c28e48bc856139aa1cc62bf50852b056de14f36bb75fa97155b31bfa97c8af2ef55ba4dc SHA512 ce1252a034723774542ab00e782c24b7ef243b5ca302033e45993f90273c697cdb82e9a126b729557a6c90b5f407f0f06b78c0affb6eefe60c364fa979831f8b
-DIST libvirt-8.1.0.tar.xz 8881608 BLAKE2B ddbd684f43a75ab04aca8be0a761ec5890c365e3c802af55e85d0f3b906a3b075f737acd14648d46cdacce90cbd2ccdda12d39784eaa17a05657b13447df1fe7 SHA512 5db227b78f48e35f917030eeb45ce9d0f7e868c5ce75da496ca06fad175ad6b026173b2fb78415c0103a61af24aec78d89bcebdf60b817d8ff6e84dc926faa97
-DIST libvirt-8.1.0.tar.xz.asc 833 BLAKE2B 21ea45127d68313264b9e17c315d75b20e409ef56ce3f6a61899c3c9d9ce1ff51a4743d912f7440d2197230df802d955516cbc8d6f98960cef8a0265a7d0f334 SHA512 9a28b0405c01518f7d6837d02df492d6d97d6e73cd711e718b53cc18d8830a1216aa87366b2065ef5ce65b12d72cbb3d80024529264430de20fe89d8bf595d76
 DIST libvirt-8.2.0.tar.xz 8871236 BLAKE2B 85c4fd7323f4ea0564e6fcb37dffe643d0ff54f228a695476c1b24c78022402a86cf967503e40fad003d82528f24a02bef79466e38c133c5ad37cbcd5783f01d SHA512 fbdc2953e86117643aafb3198a3d9327188d94abfd155eae4439ee0e722737a57ee44dbb2929746c0a28e10e275c35f4a8190e99668e4cba4025555358591544
 DIST libvirt-8.2.0.tar.xz.asc 833 BLAKE2B 3dba2fe7dc76052307ab8b1d7f2a61445759ed15e130615ca2a6325e981ae5c1a7143e7d78ee67f2bf9001cdf82126dff89f4f1eb3b39b77620721a5b75f4cfa SHA512 33ecc465da1b7e4b53733611255d01414f8c1081c96fdcb0a9f1a0e194823872b7f9f9032938527f6d1d8bbebc3b61f2dc393875b8d11fdd47bec40e9408475b
-DIST libvirt-8.3.0.tar.xz 8829288 BLAKE2B 37890dac8f46e14c5f0329f7f3318b611bfe3b97b7beddcdb91541e71a619738baa2a3e9847fee2d0b63abb630895860555a5337686702fc6fb06cc4f060f8b5 SHA512 914c8a4884d703f368849b852ba8330d1b17cf598a359f70d344e0a94e02f60337216e9011cbeba90eb4e87fa644e7eb9e8a407ca58632b2b41511d3f598ff71
-DIST libvirt-8.3.0.tar.xz.asc 833 BLAKE2B d1faf041532fc4c33641cab0510401db2fb1c45004f2615df6807729d7a83a8a28bd2410eb5478e479e7cd1b28272ee92885b30ecdccb8a9390536df51377d5e SHA512 5c32087769aba0d2a245a4ce317e1428842a682cf71e03e5f33fc4476309f40c08118241b1ad2b4be14933971431960b89960858a1f841ab1b7c9bda9f571d52
-DIST libvirt-8.4.0.tar.xz 8846528 BLAKE2B 479d7d47a9d711e0240da09eb295f1a644bc4cfddbe544908f2011eb45dff9cf9ffdfff87ba63ded96f5b69024c65832326f9fb0837c5338114ad5dbbada7af1 SHA512 e9dcaa489f162e3a26fe1ca7bb83a22e3f1952594c3541ddd2a7f8e8a0e6ad37e193fb89421df1efe3d2a4d9bb7cf5455c7b7a0b59e133eb6c0ff3cbbd8403b6
-DIST libvirt-8.4.0.tar.xz.asc 833 BLAKE2B 7bfbfc05ce7d95018c07e92d475bc0fddbb0b396132c12defd0205638d22534ba83fea8180345635b9f59b8a10fd3177b1a84ad748f1ddb9e533e11700bd4cbd SHA512 5d85ce4764dc36d940033c5feda59b9cff64844a52e3a25b1b8d0278adbc2378978a7dbe6f577f82bc760d617edc75c4a6ab8e1325a38847e1d40e3bf7c9684b
-DIST libvirt-8.5.0.tar.xz 8886088 BLAKE2B a789b5d4d4f3d359403b53b1b6bdc31ddd8938d12fce3c77e953a30be359a3f75071c385bc8ce3df11ccc7ad682e433c067781948cf107abef84e54d5aadd0d9 SHA512 62b05c5cd58eab0ab2d945b832fd85807aea9b5f12a7ef5d1205fe0edac8d361ba3a9245f60f200a8548c96f718943d4502d87fff87c4495bd1e2637f14aaccf
-DIST libvirt-8.5.0.tar.xz.asc 833 BLAKE2B 2e4ee3309e409fa700b0e09c067d2d7978f5033bc947108012582a9ba4b6a5438a2f419375e10b342dd0082560768eab1913aea86558293abc9a51bdb87111eb SHA512 d05482a7d0ef5649428368553e7a9c49a116435b273179c13248081711ecc2d8fa1f6ad82a3d5ce43efc2afee51718bc3362e483463c61ebd10dbcc41875749e
 DIST libvirt-8.7.0.tar.xz 8937316 BLAKE2B 131d46206662627e952b6daa3ceeab187321ff5fb1984980bc2816dfedf730c6ccd4b5a1cbfb46f33cc9e84508621e2625fa661f06b9e35561e8de52906824e5 SHA512 35d33d0e0dab525e8f0a8a592d286e9d17fc5c5d1ff2fab5af5c40b85248481dd17b5c3daf64e8c6e1b8a93328eebee6ece3e95edacff208a81d8b78dc102d7a
 DIST libvirt-8.7.0.tar.xz.asc 833 BLAKE2B ebea1430670bcb44e9ffb4460388b2ab41e8b409d1513d09ac56b12f379621f5ad39af0dba9691b36220bbed5634ad24b2efda8315b41bb2e7f3f6a65e9b028c SHA512 5ac09b10de74283c474fb80cfe600a171d6b49039df73113702cda565889f6c6919e99aff6ce60538ee7fda52287ef035ee15e8f47e5f724384c6ec474e6bed8
diff --git a/app-emulation/libvirt/files/libvirt-8.1.0-libxl-Fix-libvirtd-crash-on-domain-restore.patch b/app-emulation/libvirt/files/libvirt-8.1.0-libxl-Fix-libvirtd-crash-on-domain-restore.patch
deleted file mode 100644
index f6116aa535d2..000000000000
--- a/app-emulation/libvirt/files/libvirt-8.1.0-libxl-Fix-libvirtd-crash-on-domain-restore.patch
+++ /dev/null
@@ -1,37 +0,0 @@
-From 454b927d1e33a1fe9dca535db2c97300fdae62cc Mon Sep 17 00:00:00 2001
-Message-Id: <454b927d1e33a1fe9dca535db2c97300fdae62cc.1646730306.git.mprivozn@redhat.com>
-From: Jim Fehlig <jfehlig@suse.com>
-Date: Thu, 17 Feb 2022 11:48:13 -0700
-Subject: [PATCH] libxl: Fix libvirtd crash on domain restore
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Commit cc2a3c2a94 missed one case in the libxl driver where virDomainDef
-is returned from libxlDomainSaveImageOpen and a g_steal_pointer is needed.
-Without it, the virDomainDef object is freed and the driver crashes later
-in the restore process when accessing the object.
-
-Signed-off-by: Jim Fehlig <jfehlig@suse.com>
-Reviewed-by: Ján Tomko <jtomko@redhat.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/libxl/libxl_domain.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/libxl/libxl_domain.c b/src/libxl/libxl_domain.c
-index c91e531a9a..ee031267ca 100644
---- a/src/libxl/libxl_domain.c
-+++ b/src/libxl/libxl_domain.c
-@@ -811,7 +811,7 @@ libxlDomainSaveImageOpen(libxlDriverPrivate *driver,
-                                         VIR_DOMAIN_DEF_PARSE_SKIP_VALIDATE)))
-         goto error;
- 
--    *ret_def = def;
-+    *ret_def = g_steal_pointer(&def);
-     *ret_hdr = hdr;
- 
-     return fd;
--- 
-2.34.1
-
diff --git a/app-emulation/libvirt/files/libvirt-8.2.0-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch b/app-emulation/libvirt/files/libvirt-8.2.0-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch
deleted file mode 100644
index f37ec7065afd..000000000000
--- a/app-emulation/libvirt/files/libvirt-8.2.0-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-From 823a62ec8aac4fb75e6e281164f3eb56ae47597c Mon Sep 17 00:00:00 2001
-Message-Id: <823a62ec8aac4fb75e6e281164f3eb56ae47597c.1646211032.git.mprivozn@redhat.com>
-From: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Date: Tue, 1 Mar 2022 18:47:59 +0100
-Subject: [PATCH] qemu: segmentation fault in virtqemud executing
- qemuDomainUndefineFlags
-
-Commit 5adfb3472342741c443ac91dee0abb18b5a3d038 causes a segmentation fault.
-
-Stack trace of thread 664419:
- #0  0x000003ff62ec553c in qemuDomainUndefineFlags (dom=0x3ff6c002810, flags=<optimized out>) at ../src/qemu/qemu_driver.c:6618
- #1  0x000003ff876a7e5c in virDomainUndefineFlags (domain=domain@entry=0x3ff6c002810, flags=<optimized out>) at ../src/libvirt-domain.c:6519
- #2  0x000002aa2b64a808 in remoteDispatchDomainUndefineFlags (server=0x2aa2c3d7880, msg=0x2aa2c3d2770, args=<optimized out>, rerr=0x3ff8287b950, client=<optimized out>)
-        at src/remote/remote_daemon_dispatch_stubs.h:13080
- #3  remoteDispatchDomainUndefineFlagsHelper (server=0x2aa2c3d7880, client=<optimized out>, msg=0x2aa2c3d2770, rerr=0x3ff8287b950, args=<optimized out>, ret=0x0)
-        at src/remote/remote_daemon_dispatch_stubs.h:13059
- #4  0x000003ff8758bbf4 in virNetServerProgramDispatchCall (msg=0x2aa2c3d2770, client=0x2aa2c3e3050, server=0x2aa2c3d7880, prog=0x2aa2c3d8010)
-        at ../src/rpc/virnetserverprogram.c:428
- #5  virNetServerProgramDispatch (prog=0x2aa2c3d8010, server=server@entry=0x2aa2c3d7880, client=0x2aa2c3e3050, msg=0x2aa2c3d2770) at ../src/rpc/virnetserverprogram.c:302
- #6  0x000003ff8758c260 in virNetServerProcessMsg (msg=<optimized out>, prog=<optimized out>, client=<optimized out>, srv=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:140
- #7  virNetServerHandleJob (jobOpaque=0x2aa2c3e2d30, opaque=0x2aa2c3d7880) at ../src/rpc/virnetserver.c:160
- #8  0x000003ff874c49aa in virThreadPoolWorker (opaque=<optimized out>) at ../src/util/virthreadpool.c:164
- #9  0x000003ff874c3f62 in virThreadHelper (data=<optimized out>) at ../src/util/virthread.c:256
- #10 0x000003ff86c1cf8c in start_thread () from /lib64/libc.so.6
- #11 0x000003ff86c9650e in thread_start () from /lib64/libc.so.6
-
-Signed-off-by: Boris Fiuczynski <fiuczy@linux.ibm.com>
-Reviewed-by: Jim Fehlig <jfehlig@suse.com>
-Reviewed-by: Michal Privoznik <mprivozn@redhat.com>
-Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
----
- src/qemu/qemu_driver.c | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/qemu/qemu_driver.c b/src/qemu/qemu_driver.c
-index bcd9bdb436..8337eed510 100644
---- a/src/qemu/qemu_driver.c
-+++ b/src/qemu/qemu_driver.c
-@@ -6615,7 +6615,7 @@ qemuDomainUndefineFlags(virDomainPtr dom,
-         }
-     }
- 
--    if (vm->def->os.loader->nvram) {
-+    if (vm->def->os.loader && vm->def->os.loader->nvram) {
-         nvram_path = g_strdup(vm->def->os.loader->nvram);
-     } else if (vm->def->os.firmware == VIR_DOMAIN_OS_DEF_FIRMWARE_EFI) {
-         qemuDomainNVRAMPathFormat(cfg, vm->def, &nvram_path);
--- 
-2.34.1
-
diff --git a/app-emulation/libvirt/libvirt-7.10.0-r3.ebuild b/app-emulation/libvirt/libvirt-7.10.0-r3.ebuild
deleted file mode 100644
index 7c4d799d196f..000000000000
--- a/app-emulation/libvirt/libvirt-7.10.0-r3.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-	SRC_URI=""
-	SLOT="0"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.48.0
-	dev-libs/libgcrypt:0
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.7.6
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-1.0.25:0=
-	net-libs/libssh2
-	net-libs/libtirpc
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	sys-libs/readline:=
-	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:0= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( sys-block/open-iscsi )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( net-libs/libssh )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	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[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-2.11
-		dev-libs/yajl
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	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:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )"
-
-DEPEND="${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-7.9.0-fix_cgroupv2.patch
-	"${FILESDIR}"/${PN}-7.10.0-fix_soname.patch
-	"${FILESDIR}"/${PN}-8.1.0-docs-Fix-template-matching-in-page.xsl.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-8.0.0-r2.ebuild b/app-emulation/libvirt/libvirt-8.0.0-r2.ebuild
deleted file mode 100644
index d0232f98e39a..000000000000
--- a/app-emulation/libvirt/libvirt-8.0.0-r2.ebuild
+++ /dev/null
@@ -1,337 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-	SRC_URI=""
-	SLOT="0"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.48.0
-	dev-libs/libgcrypt:0
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.7.6
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-1.0.25:0=
-	net-libs/libssh2
-	net-libs/libtirpc
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	sys-libs/readline:=
-	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:0= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( sys-block/open-iscsi )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( net-libs/libssh )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	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[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-2.11
-		dev-libs/yajl
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	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:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )"
-
-DEPEND="${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-6.7.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-6.7.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-8.1.0-docs-Fix-template-matching-in-page.xsl.patch
-	"${FILESDIR}"/${PN}-8.1.0-libxl-Fix-libvirtd-crash-on-domain-restore.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-8.1.0.ebuild b/app-emulation/libvirt/libvirt-8.1.0.ebuild
deleted file mode 100644
index bdc9eb2b9f6e..000000000000
--- a/app-emulation/libvirt/libvirt-8.1.0.ebuild
+++ /dev/null
@@ -1,338 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with dev-python/libvirt-python!
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-	SRC_URI=""
-	SLOT="0"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-	SLOT="0/${PV}"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="
-	apparmor audit bash-completion +caps dtrace firewalld fuse glusterfs
-	iscsi iscsi-direct +libvirtd lvm libssh lxc nfs nls numa openvz
-	parted pcap policykit +qemu rbd sasl selinux +udev
-	virtualbox +virt-network wireshark-plugins xen zfs
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-RDEPEND="
-	acct-user/qemu
-	app-misc/scrub
-	>=dev-libs/glib-2.48.0
-	dev-libs/libgcrypt:0
-	dev-libs/libnl:3
-	>=dev-libs/libxml2-2.7.6
-	>=net-analyzer/openbsd-netcat-1.105-r1
-	>=net-libs/gnutls-1.0.25:0=
-	net-libs/libssh2
-	net-libs/libtirpc
-	>=net-misc/curl-7.18.0
-	sys-apps/dbus
-	sys-apps/dmidecode
-	sys-devel/gettext
-	sys-libs/readline:=
-	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:0= )
-	glusterfs? ( >=sys-cluster/glusterfs-3.4.1 )
-	iscsi? ( sys-block/open-iscsi )
-	iscsi-direct? ( >=net-libs/libiscsi-1.18.0 )
-	libssh? ( net-libs/libssh )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	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[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.0.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-2.11
-		dev-libs/yajl
-	)
-	rbd? ( sys-cluster/ceph )
-	sasl? ( dev-libs/cyrus-sasl )
-	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:= )
-	xen? (
-		>=app-emulation/xen-4.9.0
-		app-emulation/xen-tools:=
-	)
-	udev? (
-		virtual/libudev
-		>=x11-libs/libpciaccess-0.10.9
-	)
-	zfs? ( sys-fs/zfs )"
-
-DEPEND="${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-8.2.0-qemu-segmentation-fault-in-virtqemud-executing-qemuD.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-8.3.0.ebuild b/app-emulation/libvirt/libvirt-8.3.0.ebuild
deleted file mode 100644
index 6128a61b974d..000000000000
--- a/app-emulation/libvirt/libvirt-8.3.0.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{8..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-else
-	SRC_URI="https://libvirt.org/sources/${P}.tar.xz
-		verify-sig? ( https://libvirt.org/sources/${P}.tar.xz.asc )"
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-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
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-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.7:= )
-	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	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[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.8.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-2.11
-		>=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 )"
-DEPEND="${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-8.4.0.ebuild b/app-emulation/libvirt/libvirt-8.4.0.ebuild
deleted file mode 100644
index 1ac6f7431bdb..000000000000
--- a/app-emulation/libvirt/libvirt-8.4.0.ebuild
+++ /dev/null
@@ -1,340 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{8..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-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"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-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
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-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.7:= )
-	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	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[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.8.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-2.11
-		>=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 )"
-DEPEND="${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/libvirt/libvirt-8.5.0.ebuild b/app-emulation/libvirt/libvirt-8.5.0.ebuild
deleted file mode 100644
index f81dbc7d518b..000000000000
--- a/app-emulation/libvirt/libvirt-8.5.0.ebuild
+++ /dev/null
@@ -1,341 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{8..11} )
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit meson bash-completion-r1 linux-info python-any-r1 readme.gentoo-r1 tmpfiles verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt.git"
-	EGIT_BRANCH="master"
-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"
-fi
-
-DESCRIPTION="C toolkit to manipulate virtual machines"
-HOMEPAGE="https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/"
-LICENSE="LGPL-2.1"
-SLOT="0/${PV}"
-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
-"
-
-REQUIRED_USE="
-	firewalld? ( virt-network )
-	libvirtd? ( || ( lxc openvz qemu virtualbox xen ) )
-	lxc? ( caps libvirtd )
-	openvz? ( libvirtd )
-	qemu? ( libvirtd )
-	virt-network? ( libvirtd )
-	virtualbox? ( libvirtd )
-	xen? ( libvirtd )"
-
-BDEPEND="
-	app-text/xhtml1
-	dev-lang/perl
-	dev-libs/libxslt
-	dev-perl/XML-XPath
-	dev-python/docutils
-	virtual/pkgconfig
-	net-libs/rpcsvc-proto
-	bash-completion? ( >=app-shells/bash-completion-2.0 )
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )"
-
-# gettext.sh command is used by the libvirt command wrappers, and it's
-# non-optional, so put it into RDEPEND.
-# We can use both libnl:1.1 and libnl:3, but if you have both installed, the
-# package will use 3 by default. Since we don't have slot pinning in an API,
-# we must go with the most recent
-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.7:= )
-	libssh2? ( >=net-libs/libssh2-1.3 )
-	lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] )
-	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[-device-mapper-only(-)]
-	)
-	pcap? ( >=net-libs/libpcap-1.8.0 )
-	policykit? (
-		acct-group/libvirt
-		>=sys-auth/polkit-0.9
-	)
-	qemu? (
-		>=app-emulation/qemu-2.11
-		>=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 )"
-DEPEND="${BDEPEND}
-	${RDEPEND}
-	${PYTHON_DEPS}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-6.0.0-fix_paths_in_libvirt-guests_sh.patch
-	"${FILESDIR}"/${PN}-8.2.0-do-not-use-sysconfig.patch
-	"${FILESDIR}"/${PN}-8.2.0-fix-paths-for-apparmor.patch
-	"${FILESDIR}"/${PN}-8.5.0-glibc-2.36.patch
-)
-
-pkg_setup() {
-	# Check kernel configuration:
-	CONFIG_CHECK=""
-	use fuse && CONFIG_CHECK+="
-		~FUSE_FS"
-
-	use lvm && CONFIG_CHECK+="
-		~BLK_DEV_DM
-		~DM_MULTIPATH
-		~DM_SNAPSHOT"
-
-	use lxc && CONFIG_CHECK+="
-		~BLK_CGROUP
-		~CGROUP_CPUACCT
-		~CGROUP_DEVICE
-		~CGROUP_FREEZER
-		~CGROUP_NET_PRIO
-		~CGROUP_PERF
-		~CGROUPS
-		~CGROUP_SCHED
-		~CPUSETS
-		~IPC_NS
-		~MACVLAN
-		~NAMESPACES
-		~NET_CLS_CGROUP
-		~NET_NS
-		~PID_NS
-		~POSIX_MQUEUE
-		~SECURITYFS
-		~USER_NS
-		~UTS_NS
-		~VETH
-		~!GRKERNSEC_CHROOT_MOUNT
-		~!GRKERNSEC_CHROOT_DOUBLE
-		~!GRKERNSEC_CHROOT_PIVOT
-		~!GRKERNSEC_CHROOT_CHMOD
-		~!GRKERNSEC_CHROOT_CAPS"
-
-	kernel_is lt 4 7 && use lxc && CONFIG_CHECK+="
-		~DEVPTS_MULTIPLE_INSTANCES"
-
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_MARK_T
-		~BRIDGE_NF_EBTABLES
-		~NETFILTER_ADVANCED
-		~NETFILTER_XT_CONNMARK
-		~NETFILTER_XT_MARK
-		~NETFILTER_XT_TARGET_CHECKSUM
-		~IP_NF_FILTER
-		~IP_NF_MANGLE
-		~IP_NF_NAT
-		~IP_NF_TARGET_MASQUERADE
-		~IP6_NF_FILTER
-		~IP6_NF_MANGLE
-		~IP6_NF_NAT"
-	# Bandwidth Limiting Support
-	use virt-network && CONFIG_CHECK+="
-		~BRIDGE_EBT_T_NAT
-		~IP_NF_TARGET_REJECT
-		~NET_ACT_POLICE
-		~NET_CLS_FW
-		~NET_CLS_U32
-		~NET_SCH_HTB
-		~NET_SCH_INGRESS
-		~NET_SCH_SFQ"
-
-	ERROR_USER_NS="Optional depending on LXC configuration."
-
-	if [[ -n ${CONFIG_CHECK} ]]; then
-		linux-info_pkg_setup
-	fi
-
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	touch "${S}/.mailmap" || die
-
-	default
-	python_fix_shebang .
-
-	# Skip fragile tests which relies on pristine environment
-	# (Breaks because of sandbox environment variables)
-	# bug #802876
-	sed -i -e "/commandtest/d" tests/meson.build || die
-
-	# Tweak the init script:
-	cp "${FILESDIR}/libvirtd.init-r19" "${S}/libvirtd.init" || die
-	sed -e "s/USE_FLAG_FIREWALLD/$(usex firewalld 'need firewalld' '')/" \
-		-i "${S}/libvirtd.init" || die "sed failed"
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature apparmor)
-		$(meson_feature apparmor apparmor_profiles)
-		$(meson_feature audit)
-		$(meson_feature caps capng)
-		$(meson_feature dtrace)
-		$(meson_feature firewalld)
-		$(meson_feature fuse)
-		$(meson_feature glusterfs)
-		$(meson_feature glusterfs storage_gluster)
-		$(meson_feature iscsi storage_iscsi)
-		$(meson_feature iscsi-direct storage_iscsi_direct)
-		$(meson_feature libvirtd driver_libvirtd)
-		$(meson_feature libssh)
-		$(meson_feature libssh2)
-		$(meson_feature lvm storage_lvm)
-		$(meson_feature lvm storage_mpath)
-		$(meson_feature lxc driver_lxc)
-		$(meson_feature nls)
-		$(meson_feature numa numactl)
-		$(meson_feature numa numad)
-		$(meson_feature openvz driver_openvz)
-		$(meson_feature parted storage_disk)
-		$(meson_feature pcap libpcap)
-		$(meson_feature policykit polkit)
-		$(meson_feature qemu driver_qemu)
-		$(meson_feature qemu yajl)
-		$(meson_feature rbd storage_rbd)
-		$(meson_feature sasl)
-		$(meson_feature selinux)
-		$(meson_feature udev)
-		$(meson_feature virt-network driver_network)
-		$(meson_feature virtualbox driver_vbox)
-		$(meson_feature wireshark-plugins wireshark_dissector)
-		$(meson_feature xen driver_libxl)
-		$(meson_feature zfs storage_zfs)
-
-		-Dnetcf=disabled
-		-Dsanlock=disabled
-
-		-Ddriver_esx=enabled
-		-Dinit_script=systemd
-		-Dqemu_user=$(usex caps qemu root)
-		-Dqemu_group=$(usex caps qemu root)
-		-Ddriver_remote=enabled
-		-Dstorage_fs=enabled
-		-Ddriver_vmware=enabled
-
-		--localstatedir="${EPREFIX}/var"
-		-Drunstatedir="${EPREFIX}/run"
-		-Ddocdir="${EPREFIX}/usr/share/doc/${PF}"
-	)
-
-	meson_src_configure
-}
-
-src_test() {
-	export VIR_TEST_DEBUG=1
-	# Don't run the syntax check tests, they're fragile and not relevant
-	# to us downstream anyway.
-	# We also crank up the timeout (as Fedora does) just to preempt failures
-	# on slower arches.
-	meson_src_test --no-suite syntax-check --timeout-multiplier 10
-}
-
-src_install() {
-	meson_src_install
-
-	# Depending on configuration option, libvirt will create some bogus
-	# directoreis. They are either not used, or libvirtd is able to create
-	# them on demand, so let's remove them.
-	#
-	# Note, we are using -f here so that rm does not fail or warn if the
-	# directory is nonexistent.
-	rm -rf "${D}"/etc/sysconfig
-	rm -rf "${D}"/var
-	rm -rf "${D}"/run
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-
-	newtmpfiles "${FILESDIR}"/libvirtd.tmpfiles.conf libvirtd.conf
-
-	newinitd "${S}/libvirtd.init" libvirtd
-	newinitd "${FILESDIR}/libvirt-guests.init-r4" libvirt-guests
-	newinitd "${FILESDIR}/virtlockd.init-r2" virtlockd
-	newinitd "${FILESDIR}/virtlogd.init-r2" virtlogd
-
-	newconfd "${FILESDIR}/libvirtd.confd-r5" libvirtd
-	newconfd "${FILESDIR}/libvirt-guests.confd" libvirt-guests
-
-	DOC_CONTENTS=$(<"${FILESDIR}/README.gentoo-r3")
-	DISABLE_AUTOFORMATTING=true
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	if [[ -e "${ROOT}"/etc/libvirt/qemu/networks/default.xml ]]; then
-		touch "${ROOT}"/etc/libvirt/qemu/networks/default.xml || die
-	fi
-
-	use libvirtd || return 0
-	# From here, only libvirtd-related instructions, be warned!
-	tmpfiles_process libvirtd.conf
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/protontricks/Manifest b/app-emulation/protontricks/Manifest
index e5bdbab14967..447d35b8b7a2 100644
--- a/app-emulation/protontricks/Manifest
+++ b/app-emulation/protontricks/Manifest
@@ -1,2 +1,3 @@
 DIST protontricks-1.9.0.tar.gz 154202 BLAKE2B e998bd899ec953ed7ee0bb0f3944da0212b71f2d0eef6c6996040e4d9c607f7bc73b52df4cbc6a70480b308473fa8c0978415a6202f498247bf91662761adf5c SHA512 43ffd2a5cd4d58c44696a2a66da0223a93d553822fdc92a476c661d69f7522d2aef12787bfc33610751bc1171fb1a3da169e3d40a2b60863a9f37ed205771835
 DIST protontricks-1.9.1.tar.gz 158292 BLAKE2B 0825fb03bb05604482c893e7dc399bf0223d76a29eff86f0dd407d89cc8f5b39e8fcfec752a2979a3127921dbdb6dc3d186cc61b53f96c544e9b1526ec5e2246 SHA512 85ab3b1f3d5ff73eee7a8bae2021409443e2f82414f42cfa03646415e53a76e0b853ff1a99cb2d5eed512833ac7a60a2718095161aa56864ca83fe9901786881
+DIST protontricks-1.9.2.tar.gz 158505 BLAKE2B ea4bc39d835d28c3f1ba50fa64d9a646ec9ef535b7369517b77bccaceb62cb922bed8844a8a4ea1d4561e248e302628379326a4760b25ac24411e679d018cee0 SHA512 75158c5a8a86edaafcb5be1b01053db91e45754488db0febe026ef0cbfbbb67fa6f3f17d60fec997c6dd19a73245ee408bd2220e09a3983ccd253e6e4c10457d
diff --git a/app-emulation/protontricks/protontricks-1.9.2.ebuild b/app-emulation/protontricks/protontricks-1.9.2.ebuild
new file mode 100644
index 000000000000..d33c17e8e46a
--- /dev/null
+++ b/app-emulation/protontricks/protontricks-1.9.2.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+DISTUTILS_SINGLE_IMPL=1
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 xdg-utils
+
+DESCRIPTION="app-emulation/winetricks wrapper for Proton (Steam Play) games"
+HOMEPAGE="https://github.com/Matoking/protontricks"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="+gui"
+
+RDEPEND="app-emulation/winetricks
+	$(python_gen_cond_dep '
+		dev-python/setuptools[${PYTHON_USEDEP}]
+		dev-python/vdf[${PYTHON_USEDEP}]
+	')
+	gui? ( gnome-extra/zenity
+		|| (
+			app-emulation/winetricks[gtk]
+			app-emulation/winetricks[kde]
+		)
+	)"
+BDEPEND="$(python_gen_cond_dep '
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+')"
+
+DOCS=( CHANGELOG.md README.md )
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	distutils-r1_python_prepare_all
+	echo "version = '${PV}'" > "${S}"/src/${PN}/_version.py || die "Failed to generate the version file"
+}
+
+pkg_postinst() {
+	xdg_desktop_database_update
+
+	elog
+
+	if ! use gui; then
+		ewarn "Please note that disabling USE=gui does *not* presently remove the --gui command-line option,"
+		ewarn "it just means using this option will fail unless gnome-extra/zenity happens to be installed."
+		ewarn
+	fi
+
+	elog "Protontricks can only find games for which a Proton prefix already exists."
+	elog "Make sure to run a Proton game at least once before trying to use protontricks on it."
+	elog
+}
+
+pkg_postrm() {
+	xdg_desktop_database_update
+}
diff --git a/app-emulation/ruffle/ruffle-0_p20220816.ebuild b/app-emulation/ruffle/ruffle-0_p20220816.ebuild
index 14ca1dfdb98e..0447e8da2522 100644
--- a/app-emulation/ruffle/ruffle-0_p20220816.ebuild
+++ b/app-emulation/ruffle/ruffle-0_p20220816.ebuild
@@ -506,7 +506,8 @@ pkg_postinst() {
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog "${PN} is experimental software that is still under heavy development"
 		elog "and only receiving nightly releases. Plans in Gentoo is to update"
-		elog "roughly every two weeks if no known major regressions."
+		elog "roughly every months if no known major regressions (feel free to"
+		elog "report if you feel a newer nightly is needed ahead of time)."
 		elog
 		elog "There is currently no plans to support wasm builds / browser"
 		elog "extensions, this provides the desktop viewer and other tools."
diff --git a/app-emulation/ruffle/ruffle-0_p20220914.ebuild b/app-emulation/ruffle/ruffle-0_p20220914.ebuild
index 00666af6e501..ebad754a07e0 100644
--- a/app-emulation/ruffle/ruffle-0_p20220914.ebuild
+++ b/app-emulation/ruffle/ruffle-0_p20220914.ebuild
@@ -515,7 +515,8 @@ pkg_postinst() {
 	if [[ ! ${REPLACING_VERSIONS} ]]; then
 		elog "${PN} is experimental software that is still under heavy development"
 		elog "and only receiving nightly releases. Plans in Gentoo is to update"
-		elog "roughly every two weeks if no known major regressions."
+		elog "roughly every months if no known major regressions (feel free to"
+		elog "report if you feel a newer nightly is needed ahead of time)."
 		elog
 		elog "There is currently no plans to support wasm builds / browser"
 		elog "extensions, this provides the desktop viewer and other tools."
diff --git a/app-eselect/Manifest.gz b/app-eselect/Manifest.gz
index e7d9c70a530e..9ec915556cc9 100644
Binary files a/app-eselect/Manifest.gz and b/app-eselect/Manifest.gz differ
diff --git a/app-eselect/eselect-rust/eselect-rust-20210703.ebuild b/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
index 0083ce57617b..da461d1f9fdc 100644
--- a/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
+++ b/app-eselect/eselect-rust/eselect-rust-20210703.ebuild
@@ -9,7 +9,7 @@ if [[ ${PV} == "99999999" ]] ; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/${PN}.git"
 else
 	SRC_URI="https://gitweb.gentoo.org/proj/${PN}.git/snapshot/${P}.tar.bz2"
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86"
+	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 fi
 
 DESCRIPTION="Eselect module for management of multiple Rust versions"
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index e02031814c20..876c403eb0cd 100644
Binary files a/app-forensics/Manifest.gz and b/app-forensics/Manifest.gz differ
diff --git a/app-forensics/aflplusplus/Manifest b/app-forensics/aflplusplus/Manifest
index 3a76da8c144b..3e32b229cde6 100644
--- a/app-forensics/aflplusplus/Manifest
+++ b/app-forensics/aflplusplus/Manifest
@@ -1,2 +1,4 @@
 DIST aflplusplus-4.01c.tar.gz 2818445 BLAKE2B f3699c4b2fabec0ab238277c3b2c7b19b35af7a0b82b14a57c34b8579121cfa0644ef432132cf4a3382547db3faf799d2ab601512ddfb469e4a2246cdb61aa7f SHA512 d2b03ab4ff9538fe0b52aa3ed4778a6e5657d64d6f0e5f75a99305bad69c5179d6b1c882650f19a884a740577acb73dab7cee3d5c9c7b06ff2326ffeba37d1fe
 DIST aflplusplus-4.02c.tar.gz 2828429 BLAKE2B 0c4d7937626a699bb6768e2f67f369508f7ec131d1170cd48f8650d8081135b466733de34e52f2ac2213c4bd13ab8936b17d3b0f8debf28e8a32ad87d9dcb55d SHA512 f5159a84e0ecd2c260d2d8ce7df33fe4704c664bdf06f193a7fef377d48646e4d921ee90d0b66c7dac02d16e6b1607c6569351aaeea9b2ee3968d22b3f583763
+DIST aflplusplus-4.03c-patches.tar.xz 4444 BLAKE2B 4eed2ee97e4f7aef987e5c931469b7bb1d85310cb101878e5e71431ac36329a07b0e05812ed1e743c6ed3ce76e10c4392f2bf7ccc98ec1537b75196c5629acfe SHA512 bcaa196640f47923be6daa65e3c5f8461eadaec3b939f2cfe0223eacc64be385c80166ec7dc0df25d0c38053a38c3efcfbc25d8387bed5c54c95a8781ed64b00
+DIST aflplusplus-4.03c.tar.gz 2830718 BLAKE2B 1b55daf3c3a0a0b11c1ef0a7dd1005cfa1ec61fb54691b96519f57788233b1385b52948468f2d5beada3c58129bc0524f07aebfb25ee8cef1e5d5afd06b1233d SHA512 4bab00d964eb9d0664d97062f5da8090dfef599480f25b04d08b84e7f47676a9790fb23573f7e885b5da6ab813694f9ab26a0b5c9d341834892530558e3b83ef
diff --git a/app-forensics/aflplusplus/aflplusplus-4.03c.ebuild b/app-forensics/aflplusplus/aflplusplus-4.03c.ebuild
new file mode 100644
index 000000000000..3c1388fc37fd
--- /dev/null
+++ b/app-forensics/aflplusplus/aflplusplus-4.03c.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+LLVM_MAX_SLOT=15
+inherit toolchain-funcs llvm optfeature python-single-r1
+
+AFL_PATCHSET="${PN}-4.03c-patches"
+DESCRIPTION="A fork of AFL, the popular compile-time instrumentation fuzzer"
+HOMEPAGE="https://github.com/AFLplusplus/AFLplusplus"
+SRC_URI="https://github.com/AFLplusplus/AFLplusplus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${AFL_PATCHSET}.tar.xz"
+S="${WORKDIR}"/AFLplusplus-${PV}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="test"
+
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+# Tests involve heavy use of LD_PRELOAD in some cases
+# This isn't compatible with sandbox
+RESTRICT="test"
+
+# It turns out we need Clang too
+RDEPEND="${PYTHON_DEPS}
+	>=sys-devel/llvm-13:=
+	|| (
+		sys-devel/clang:13
+		sys-devel/clang:${LLVM_MAX_SLOT}
+	)
+	!app-forensics/afl"
+DEPEND="${RDEPEND}
+	test? ( dev-util/cmocka )"
+
+QA_FLAGS_IGNORED="afl-gcc-cmplog-pass.so afl-gcc-cmptrs-pass.so"
+QA_PREBUILT="usr/share/afl/testcases/others/elf/small_exec.elf"
+
+PATCHES=(
+	"${WORKDIR}"/${AFL_PATCHSET}
+)
+
+llvm_check_deps() {
+	has_version -b "sys-devel/clang:${LLVM_SLOT}" && \
+		has_version -b "sys-devel/llvm:${LLVM_SLOT}"
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+	python-single-r1_pkg_setup
+}
+
+mymake() {
+	emake \
+		CC="$(tc-getCC)" \
+		CXX="$(tc-getCXX)" \
+		CFLAGS_FLTO="" \
+		LLVM_CONFIG="$(get_llvm_prefix ${LLVM_MAX_SLOT})"/bin/llvm-config \
+		PREFIX="${EPREFIX}/usr" \
+		HELPER_PATH="${EPREFIX}/usr/$(get_libdir)/afl" \
+		DOC_PATH="${EPREFIX}/usr/share/doc/${PF}" \
+		MAN_PATH="${EPREFIX}/usr/share/man/man8" \
+		"$@"
+}
+
+src_compile() {
+	mymake
+}
+
+src_test() {
+	mymake test
+}
+
+src_install() {
+	mymake DESTDIR="${D}" install
+	dostrip -x /usr/share/afl/testcases/
+}
+
+pkg_postinst() {
+	# TODO: Any others?
+	optfeature "fuzzing with AFL_USE_ASAN" sys-libs/compiler-rt-sanitizers[asan]
+	optfeature "fuzzing with AFL_USE_MSAN" sys-libs/compiler-rt-sanitizers[msan]
+}
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 3cc3dd8373cd..2bfd5a1d0978 100644
Binary files a/app-i18n/Manifest.gz and b/app-i18n/Manifest.gz differ
diff --git a/app-i18n/transifex-client/Manifest b/app-i18n/transifex-client/Manifest
index 68db5956ddfa..9c352452785f 100644
--- a/app-i18n/transifex-client/Manifest
+++ b/app-i18n/transifex-client/Manifest
@@ -1,4 +1,4 @@
-DIST transifex-client-1.1-deps.tar.xz 227565760 BLAKE2B d976f8e778abd2bab54306f53afa02f450be3564d427ac3624849e17d2e1adc109c0ec344bfb052a59e5a8060dd0d7313919efbf9883243f27aa82b25df0d5fb SHA512 d244fc394db334478593b69069b61b2795607ed3fdf719b6083eebcb50e128e33c8513e35660490005f2716892d98886f990a0850a15f91c3f75e9569341005a
-DIST transifex-client-1.1.0.tar.gz 83035 BLAKE2B fafee6b554116c8525409b2ad581f4b9c46faf58332b885afc74468e73f50936af743e9fefca29f773a8126fd5e91f0fd902b3542c1d2bb0e41ff6475d3bcddb SHA512 315208498ad18a6008c16b8e7cf6c25c227b4c28f1c54ced7fc31d082da3eb54859230acd67ad293405770be444c96687a1879792b6385c3ca6cf5f221ed9450
 DIST transifex-client-1.3.0-deps.tar.bz 241930614 BLAKE2B 7855172504f3fe1208556e0030bcaec7dac4b21ed948926368b0b91c1984cb73e6d0bda0110bdd592cf3be7835f847fe54009f2c5c41fd14899b7b5d37932937 SHA512 5eb88614b354aeac0acd02cfe416c884adb8070614946dd71de512030e410a20ca7eb6b426876c218ef9b6ec1d4faf9eb557e2daf84cf9895cce04c33a937655
 DIST transifex-client-1.3.0.tar.gz 87395 BLAKE2B 90da67d49e1b2e09d509b0ff373f0403eddc5c29a63ca64f747006ed3cb95c51add58e442a139e7e17d28b44e700aed249d0e5ca563f6af832578640f8f7164d SHA512 6e81d94e95157322d0fc74386d7e6f218f589bb81ce36b0967c09ca9199d641b13953f491373d9e7ec9f6ddc50c243801a24da985a2e577b733bf364623e3d75
+DIST transifex-client-1.3.1-deps.tar.bz 241386467 BLAKE2B fb0e2c6c3f722afee5b6ce0eb8536b53139ec816411eba9bfa6fdf17d850c3cce0bce5f662e770da582001b7f34709d362d2ac3cfc8149f4affa5878a9f475f9 SHA512 f2d77065a31c2aa8c6518b5ce382ed82ee6eb34d03c2981daf9563ab09367d8f2a8b0be37947a23dfca56d59c987e555b89b6728fffba190b56b54871b161895
+DIST transifex-client-1.3.1.tar.gz 87320 BLAKE2B 5fa402f8b9dbcde3030335b544ff5b7982f3477d7f3484d324709467dd694e2d4368e2e78c8ac7203eff92c079814594d7251372cc023bc22c21d966a5ef6a7a SHA512 8692c8d98511240672e1252e309c714eda89c83e34b53826cc8fb0d24059a3fc46ad3f5159c57ce974d63f26c35281cf7100207d3d5932f26c87692f80dac7d2
diff --git a/app-i18n/transifex-client/transifex-client-1.1.0.ebuild b/app-i18n/transifex-client/transifex-client-1.3.1.ebuild
similarity index 92%
rename from app-i18n/transifex-client/transifex-client-1.1.0.ebuild
rename to app-i18n/transifex-client/transifex-client-1.3.1.ebuild
index a8541179dbdf..9a033bd17757 100644
--- a/app-i18n/transifex-client/transifex-client-1.1.0.ebuild
+++ b/app-i18n/transifex-client/transifex-client-1.3.1.ebuild
@@ -9,12 +9,12 @@ 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}/${PN}-1.1-deps.tar.xz"
+	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"
+KEYWORDS="~amd64 ~ppc64 ~x86"
 
 src_compile() {
 	emake GOFLAGS="${GOFLAGS} -ldflags=-X="github.com/transifex/cli/internal/txlib.Version=${PV}
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index bc56de919221..bacb04f04284 100644
Binary files a/app-misc/Manifest.gz and b/app-misc/Manifest.gz differ
diff --git a/app-misc/pax-utils/Manifest b/app-misc/pax-utils/Manifest
index 0674bce37dce..9f254952cea3 100644
--- a/app-misc/pax-utils/Manifest
+++ b/app-misc/pax-utils/Manifest
@@ -1,3 +1,2 @@
-DIST pax-utils-1.3.3.tar.xz 725900 BLAKE2B 17004a4fe57f05e80e0c51a156931975cbaf73e20d96fa50dedf6bd1538ff3f8383591f4b5fd0df926a6a6b75cb083724aaf92b1a4d4ebc67290500520919c29 SHA512 bb0d03371cf8f0cc26a83cbee888a6d91e70416dedc740476cd5549ddaef67048c6802e30e469ab1aced0fd7f63f84e9644744602b2d483ef7af37191505f72e
 DIST pax-utils-1.3.4.tar.xz 753448 BLAKE2B c105ff568a8e4378cfef5f8b9acb415a850b1e209ea8413cdf518de82e5e925fdba60288557f042bf02d2e075ed5e538175b2078e4dafbe5c54117ed580fd87e SHA512 44a475860823e8b70b1d09d69e5fba3ed8298511d07e1e7b09ce62237cb8b1ecee8fc2fc550d6853d0b9f8db3c350bf78ced49d5f210997b294dc10e36627fcd
 DIST pax-utils-1.3.5.tar.xz 119764 BLAKE2B 13bd4dbdadefb382133bf42a2b1e740e84ac11661595b082346c80ff05fc7423f5d75cc01ff8a651d921310ae66c2b39a862d0b9db5d7f18e11d393360627fcf SHA512 f2b1753e15907461cc395abffe033d7f7ab8eb15e296b874e2c9d00507458672347b32d7f2f05d3a8625fc3afbdbf0721543f84e062afce7181a726d967e4836
diff --git a/app-misc/pax-utils/pax-utils-1.3.3.ebuild b/app-misc/pax-utils/pax-utils-1.3.3.ebuild
deleted file mode 100644
index 345f27e9a3a6..000000000000
--- a/app-misc/pax-utils/pax-utils-1.3.3.ebuild
+++ /dev/null
@@ -1,74 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-# Note: if bumping pax-utils because of syscall changes in glibc, please
-# revbump glibc and update the dependency in its ebuild for the affected
-# versions.
-PYTHON_COMPAT=( python3_{8,9,10} )
-
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="ELF utils that can check files for security relevant properties"
-HOMEPAGE="https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities"
-SRC_URI="mirror://gentoo/${P}.tar.xz
-	https://dev.gentoo.org/~sam/distfiles/${P}.tar.xz
-	https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="caps debug python seccomp"
-
-RDEPEND="caps? ( >=sys-libs/libcap-2.24 )
-	python? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/pyelftools[${PYTHON_USEDEP}]
-		')
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	caps? ( virtual/pkgconfig )
-"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-_emake() {
-	emake \
-		USE_CAP=$(usex caps) \
-		USE_DEBUG=$(usex debug) \
-		USE_PYTHON=$(usex python) \
-		USE_SECCOMP=$(usex seccomp) \
-		"$@"
-}
-
-pkg_setup() {
-	if use python; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-src_configure() {
-	# Avoid slow configure+gnulib+make if on an up-to-date Linux system
-	if use prefix || ! use kernel_linux; then
-		econf $(use_with caps) $(use_with debug) $(use_with python) $(use_with seccomp)
-	else
-		tc-export CC PKG_CONFIG
-	fi
-}
-
-src_compile() {
-	_emake
-}
-
-src_test() {
-	_emake check
-}
-
-src_install() {
-	_emake DESTDIR="${D}" PKGDOCDIR='$(DOCDIR)'/${PF} install
-
-	use python && python_fix_shebang "${ED}"/usr/bin/lddtree
-}
diff --git a/app-misc/tmux/files/tmux-3.3a-clang.patch b/app-misc/tmux/files/tmux-3.3a-clang.patch
new file mode 100644
index 000000000000..e292e698f310
--- /dev/null
+++ b/app-misc/tmux/files/tmux-3.3a-clang.patch
@@ -0,0 +1,59 @@
+https://github.com/tmux/tmux/pull/3332
+
+From 1b4c87de0249242309f10684761698aa880b80a5 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Tue, 13 Sep 2022 03:25:00 +0200
+Subject: [PATCH 1/2] compat/systemd: Include <string.h> for strerror
+
+Recent compilers are getting stricter about function declarations being
+known during compilation and e.g. clang-15 now errors out if a function
+signature is not found:
+
+> compat/systemd.c:56:49: error: call to undeclared library function 'strerror' with type 'char *(int)'; ISO C99 and
+>       later do not support implicit function declarations [-Wimplicit-function-declaration]
+>                 xasprintf(cause, "systemd socket error (%s)", strerror(errno));
+>                                                               ^
+> compat/systemd.c:56:49: note: include the header <string.h> or explicitly provide a declaration for 'strerror'
+> 1 warning and 1 error generated.
+
+Provide the declaration of `strerror` by including `<string.h>` to fix
+this
+--- a/compat/systemd.c
++++ b/compat/systemd.c
+@@ -16,6 +16,7 @@
+  * OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+  */
+ 
++#include <string.h>
+ #include <sys/types.h>
+ #include <sys/un.h>
+ 
+
+From 1e7ef02c52f2f8a67ab05d8a1c3fec9f4ccb7ea0 Mon Sep 17 00:00:00 2001
+From: Marvin Schmidt <marv@exherbo.org>
+Date: Tue, 13 Sep 2022 03:34:01 +0200
+Subject: [PATCH 2/2] compat/systemd: Use socklen_t instead of int to fix
+ warning
+
+clang-15 warns about the pointer passed to `getsockname()` being of
+different signedness then the parameter declaration:
+
+> compat/systemd.c:46:47: warning: passing 'int *' to parameter of type 'socklen_t *' (aka 'unsigned int *')
+>       converts between pointers to integer types with different sign [-Wpointer-sign]
+>                 if (getsockname(fd, (struct sockaddr *)&sa, &addrlen) == -1)
+>                                                             ^~~~~~~~
+> /usr/x86_64-pc-linux-musl/include/sys/socket.h:391:73: note: passing argument to parameter here
+> int getsockname (int, struct sockaddr *__restrict, socklen_t *__restrict);
+>                                                                         ^
+--- a/compat/systemd.c
++++ b/compat/systemd.c
+@@ -30,7 +30,7 @@ systemd_create_socket(int flags, char **cause)
+ 	int			fds;
+ 	int			fd;
+ 	struct sockaddr_un	sa;
+-	int			addrlen = sizeof sa;
++	socklen_t		addrlen = sizeof sa;
+ 
+ 	fds = sd_listen_fds(0);
+ 	if (fds > 1) { /* too many file descriptors */
+
diff --git a/app-misc/tmux/tmux-3.3a-r1.ebuild b/app-misc/tmux/tmux-3.3a-r1.ebuild
new file mode 100644
index 000000000000..551fa7c7e57d
--- /dev/null
+++ b/app-misc/tmux/tmux-3.3a-r1.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Terminal multiplexer"
+HOMEPAGE="https://tmux.github.io/"
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	SRC_URI="https://raw.githubusercontent.com/przepompownia/tmux-bash-completion/678a27616b70c649c6701cae9cd8c92b58cc051b/completions/tmux -> tmux-bash-completion-678a27616b70c649c6701cae9cd8c92b58cc051b"
+	EGIT_REPO_URI="https://github.com/tmux/tmux.git"
+else
+	SRC_URI="https://github.com/tmux/tmux/releases/download/${PV}/${P/_/-}.tar.gz"
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+	fi
+	S="${WORKDIR}/${P/_/-}"
+fi
+
+LICENSE="ISC"
+SLOT="0"
+IUSE="debug selinux systemd utempter vim-syntax"
+
+DEPEND="
+	dev-libs/libevent:=
+	sys-libs/ncurses:=
+	systemd? ( sys-apps/systemd:= )
+	utempter? ( sys-libs/libutempter )
+	kernel_Darwin? ( dev-libs/libutf8proc:= )
+"
+
+BDEPEND="
+	virtual/pkgconfig
+	virtual/yacc
+"
+
+RDEPEND="
+	${DEPEND}
+	selinux? ( sec-policy/selinux-screen )
+	vim-syntax? ( app-vim/vim-tmux )
+"
+
+DOCS=( CHANGES README )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4-flags.patch
+	"${FILESDIR}"/${P}-clang.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	# bug 438558
+	# 1.7 segfaults when entering copy mode if compiled with -Os
+	replace-flags -Os -O2
+
+	local myeconfargs=(
+		--sysconfdir="${EPREFIX}"/etc
+		$(use_enable debug)
+		$(use_enable systemd)
+		$(use_enable utempter)
+
+		# For now, we only expose this for macOS, because
+		# upstream strongly encourage it. I'm not sure it's
+		# needed on Linux right now.
+		$(use_enable kernel_Darwin utf8proc)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	default
+
+	einstalldocs
+
+	dodoc example_tmux.conf
+	docompress -x /usr/share/doc/${PF}/example_tmux.conf
+}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 1e1dda08f4cb..faa646be475e 100644
Binary files a/app-office/Manifest.gz and b/app-office/Manifest.gz differ
diff --git a/app-office/gnumeric/Manifest b/app-office/gnumeric/Manifest
index 470816fe06d8..7d3875bf9608 100644
--- a/app-office/gnumeric/Manifest
+++ b/app-office/gnumeric/Manifest
@@ -1 +1,2 @@
 DIST gnumeric-1.12.52.tar.xz 18115444 BLAKE2B 6d8489c27b6f7bd0ffad7d255b606a48ca9660dd38973e4bb529d38797a3029db4a0a399e40f69c84ddf33b96d27cfc184fd079fbe16590b92e056c1a836b037 SHA512 3baa2d2c4ed5f740429454f988ea527991febf38f49df17f0d88affe501c676bae95149fb0cdb4b369ef8d32247c1f4fe4c0eeab9a60329e1332aaf9c566f868
+DIST gnumeric-1.12.53.tar.xz 18125272 BLAKE2B 6c25107977492391152c403d2ad6fef79161bc9045660090e12cdd281e5832b4f9e414a0ef5e67f93c10ca789097b510fafed712dcea5b6210f67428a2dc7dd7 SHA512 6e9d7b12f9448c75d39985984fac9880c61583fbac10ad9070f5ec7a5bd573874d79e13372d9a185616a5cdb5f53d3f67aeda6ca4bae33e3f5ca0a2160045d7b
diff --git a/app-office/gnumeric/gnumeric-1.12.53.ebuild b/app-office/gnumeric/gnumeric-1.12.53.ebuild
new file mode 100644
index 000000000000..2f621517609c
--- /dev/null
+++ b/app-office/gnumeric/gnumeric-1.12.53.ebuild
@@ -0,0 +1,94 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit autotools gnome.org python-r1 xdg
+
+DESCRIPTION="The GNOME Spreadsheet"
+HOMEPAGE="http://www.gnumeric.org/"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="+introspection libgda perl"
+REQUIRED_USE="introspection? ( ${PYTHON_REQUIRED_USE} )"
+
+# Missing gnome-extra/libgnomedb required version in tree
+# but its upstream is dead and will be dropped soon.
+
+# lots of missing files, also fails tests due to 80-bit long story
+# upstream bug #721556
+RESTRICT="test"
+
+# Gnumeric has two python components
+# 1. The python loader for loading python-based plugins.
+#    This component is pure python 2 and a port "is not currently being worked on".
+# 2. The python gobject-based introspection API. This component is compatible
+#    with python 3.
+# Component 1. can only be re-enabled once someone has ported the upstream
+# codebase to python 3.
+# https://gitlab.gnome.org/GNOME/gnumeric/issues/419#note_618852
+RDEPEND="
+	app-arch/bzip2
+	sys-libs/zlib
+	>=dev-libs/glib-2.40.0:2
+	>=gnome-extra/libgsf-1.14.33:=
+	>=x11-libs/goffice-0.10.51:0.10[introspection?]
+	>=dev-libs/libxml2-2.4.12:2
+	>=x11-libs/pango-1.24.0:=
+
+	>=x11-libs/gtk+-3.8.7:3
+	x11-libs/cairo:=[svg]
+
+	introspection? (
+		${PYTHON_DEPS}
+		>=dev-libs/gobject-introspection-1:=
+	)
+	perl? ( dev-lang/perl:= )
+	libgda? ( gnome-extra/libgda:5[gtk] )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-text/docbook-xml-dtd:4.5
+	app-text/yelp-tools
+	dev-util/gtk-doc-am
+	>=dev-util/intltool-0.35.0
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+
+	# Manage gi overrides ourselves
+	sed '/SUBDIRS/ s/introspection//' -i Makefile.{am,in} || die
+
+	# Changed from 'elibtoolize' for bug # 791610
+	eautoreconf
+}
+
+src_configure() {
+	econf \
+		--disable-gtk-doc \
+		--disable-maintainer-mode \
+		--disable-schemas-compile \
+		--disable-static \
+		--without-psiconv \
+		--without-python \
+		--with-zlib \
+		$(use_with libgda gda) \
+		$(use_enable introspection) \
+		$(use_with perl)
+}
+
+src_install() {
+	default
+	dodoc HACKING MAINTAINERS
+
+	if use introspection; then
+		python_moduleinto gi.overrides
+		python_foreach_impl python_domodule introspection/gi/overrides/Gnm.py
+	fi
+
+	# no static archives
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/app-shells/Manifest.gz b/app-shells/Manifest.gz
index 328f3580f982..3032f4356cc4 100644
Binary files a/app-shells/Manifest.gz and b/app-shells/Manifest.gz differ
diff --git a/app-shells/bash/Manifest b/app-shells/bash/Manifest
index 87f6925ef845..ff793c382b45 100644
--- a/app-shells/bash/Manifest
+++ b/app-shells/bash/Manifest
@@ -21,10 +21,6 @@ DIST bash-5.0_p18-patches.tar.xz 804 BLAKE2B 89e615a08920a4cfc90f72d125a8256275b
 DIST bash-5.1.tar.gz 10458638 BLAKE2B 42059556694b604911b5b7936f94d42d8923f2931f3ebacefd95454274c7baadb1ec97629a524c1542e2e282dae66f1389334f8edc572ca8ee841cc3ac449ba7 SHA512 c44a0ce381469219548a3a27589af3fea4f22eda1ca4e9434b59fc16da81b471c29ce18e31590e0860a6a251a664b68c2b45e3a17d22cfc02799ffd9a208390c
 DIST bash-5.1.tar.gz.sig 95 BLAKE2B ac9209d6a4ab4436c511a7a195594e9036d7d1aef7887972f61a0e97378a9685b882621d7f95f5326b155dc155c41635417ce2ca41ac6d0dda78bd293ea4249f SHA512 3966404c0f683c7ef214fcf283b551e5441af3897009f778308c2e34067d98d57c95561453416a54ca5b1daf9a1288dbf950fe3f13353703cead12f5eec5fad8
 DIST bash-5.1_p16-patches.tar.xz 388 BLAKE2B 1575d54d311872c7ca71e13711fa0f7e3534fca16fd9d1ca045b6c696c9ca56f6a0ed5023a05d847ab5ddbefc22b8ef2c2a681f09571520f0294d83b495f0015 SHA512 c85e5b83f6ee1a7345647fa937d9718cab13be1a65886755d26a78d21fea4246650c7441a34fd729212e220366985b410562002d74c02c18de7ef0469b409ac7
-DIST bash-5.2-rc2.tar.gz 10925605 BLAKE2B 839be13e89b679bbcfca19f2e331e471639ceab0187f1b5127fbf647199f565047ed309b9e30ec5efe6c6095acf08959e732d620f260d4c96ad2bc161754535b SHA512 431e13c93f846c16b87d75d63f2b3f7514528e36ae30a2e75866d93a988b87ca1ea05415bc672390fcdb2f94cab9555a0ae5390fa3b908764b906a3c5d58f644
-DIST bash-5.2-rc2.tar.gz.sig 95 BLAKE2B 446d310659eda48ee27f2982609073904e36e64dc439ef79d172b7326199c71d87e13daad8c069e3f9c20a4db4986a76793a5f7bba0ce1827531fa351eb7b47f SHA512 c9c3e218681ec367562b7c55785a18843d40f1c0cbdd27a5f4c07d94d5e797f7d735ed7652f56f6fcb065e9305508b578d64dde3d83f314c86447fc8d537126f
-DIST bash-5.2-rc3.tar.gz 10896868 BLAKE2B 32b3345325f50a1883390403eb77105a9f1aacc5c1991bd47b817e9d86dbefa389281a68b758e898018e734a77e61117e581347ebc1f132003ae8b93239e1ac2 SHA512 a8ac061d6815de74c820081e320634f671ad91dace9e3fbcc5dc4b9ab56208c6207cebd4dd6aaf2379c1ff98f6edcd3333f8ca58c6b07f6b2b490a4a632eea36
-DIST bash-5.2-rc3.tar.gz.sig 95 BLAKE2B b4f87665814943860a64bc3c2102c61147f9047f525e81554c8a46a5366421e13a02052f878f955f775355920ae32af8033a209abf70bd36b64e14177dce5db2 SHA512 e0591d761d2502591edc2e0e330341708104f8d5bdddb7f62d737c5c306c1aa7a4d129d00a197e63d52833a3fc1691a0b6b8060de6e6762afa165a147126d95b
 DIST bash-5.2-rc4.tar.gz 10953456 BLAKE2B c39eb9640a08fe3a6e8e61fd7e9f8116b34e5da83fd97afa3abb78164cb70af9774fb2315bbd2507ead33fd38718ca7fcfd4df7ee6d2e564424dce9c5f230640 SHA512 3f00e5872b1c90901446c3d9299d72229f2fb28e7db7659acc52d353e20b34f627ced42e6b02159f499c5885a211aaf55510b9cd145c46f4e0b3cb19237b4bbc
 DIST bash-5.2-rc4.tar.gz.sig 95 BLAKE2B 6ae8e4e48fcd821bad7a67a0f1ab8bf4c20c385d8eefceca178d114210a4a95d03ae891039d01efdf15b7849401df61f4748d2baa6ca13b09fe4d23b0132113f SHA512 c44b02fb2e22a8d77bbb09a3712878478fabe287abe5a5a5c40e00cef89a9b516e9e72074f123580b0840e3e62ef9a192096738fa1bd5906acadbfe5cc5e206c
 DIST bash205b-001 1132 BLAKE2B 0c5eef29777d54ef05957ea3d63b1556fb380bd20c238dc28993d822b37bc4e78ff4048ad069f6b8cd25da77ccdeb7aecd86c4349cb9d81e5e94c7001eeae5e6 SHA512 5ce4357468821b05e747201f3aa57225ad8f540c9e2c87051720490e039c30b478b9b662a68f14a0800fefe40184e4495e2645665200f9d75e9a115b2ac08071
diff --git a/app-shells/bash/bash-5.2_rc2.ebuild b/app-shells/bash/bash-5.2_rc2.ebuild
deleted file mode 100644
index 847e52506d7f..000000000000
--- a/app-shells/bash/bash-5.2_rc2.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO on release:
-# - check READLINE_VER, obviously
-# (presumably there weren't always readline releases for bash RCs etc)
-
-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
-		9999|*_alpha*|*_beta*|*_rc*)
-			return 1
-			;;
-		*)
-			return 0
-			;;
-	esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for non-releases.
-READLINE_VER="8.2"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
-	EGIT_BRANCH=devel
-	inherit git-r3
-elif 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="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.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"
-if is_release ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
-
-DEPEND="
-	>=sys-libs/ncurses-5.2-r2:=
-	nls? ( virtual/libintl )
-"
-if is_release ; then
-	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
-fi
-RDEPEND="
-	${DEPEND}
-"
-# We only need yacc when the .y files get patched (bash42-005, bash51-011)
-#BDEPEND="virtual/yacc"
-BDEPEND="
-	pgo? ( dev-util/gperf )
-	verify-sig? ( sec-keys/openpgp-keys-chetramey )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# EAPI 8 tries to append it but it doesn't exist here
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-PATCHES=(
-	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
-	# Patches from Chet sent to bashbug ml
-	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.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}
-		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 )
-
-	if is_release ; then
-		# 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%%_*}
-
-		# 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() {
-	if use pgo ; then
-		# Build Bash and run its tests to generate profiles.
-		emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo"
-
-		# Used in test suite.
-		unset A
-
-		emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo" -k check
-
-		# Rebuild Bash using the profiling data we just generated.
-		emake clean
-		emake CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo"
-
-		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo" all others
-	else
-		emake
-
-		use plugins && emake -C examples/loadables all others
-	fi
-}
-
-src_test() {
-	# Used in test suite.
-	unset A
-
-	default
-}
-
-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/bash-5.2_rc3.ebuild b/app-shells/bash/bash-5.2_rc3.ebuild
deleted file mode 100644
index 847e52506d7f..000000000000
--- a/app-shells/bash/bash-5.2_rc3.ebuild
+++ /dev/null
@@ -1,348 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# TODO on release:
-# - check READLINE_VER, obviously
-# (presumably there weren't always readline releases for bash RCs etc)
-
-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
-		9999|*_alpha*|*_beta*|*_rc*)
-			return 1
-			;;
-		*)
-			return 0
-			;;
-	esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-# The version of readline this bash normally ships with.
-# Note: right now, we don't use the system copy of readline for bash for non-releases.
-READLINE_VER="8.2"
-
-DESCRIPTION="The standard GNU Bourne again shell"
-HOMEPAGE="https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/bash.git"
-	EGIT_BRANCH=devel
-	inherit git-r3
-elif 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="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.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"
-if is_release ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="afs bashlogger examples mem-scramble +net nls plugins pgo +readline"
-
-DEPEND="
-	>=sys-libs/ncurses-5.2-r2:=
-	nls? ( virtual/libintl )
-"
-if is_release ; then
-	DEPEND+=" readline? ( >=sys-libs/readline-${READLINE_VER}:= )"
-fi
-RDEPEND="
-	${DEPEND}
-"
-# We only need yacc when the .y files get patched (bash42-005, bash51-011)
-#BDEPEND="virtual/yacc"
-BDEPEND="
-	pgo? ( dev-util/gperf )
-	verify-sig? ( sec-keys/openpgp-keys-chetramey )
-"
-
-S="${WORKDIR}/${MY_P}"
-
-# EAPI 8 tries to append it but it doesn't exist here
-QA_CONFIGURE_OPTIONS="--disable-static"
-
-PATCHES=(
-	#"${WORKDIR}"/${PN}-${GENTOO_PATCH_VER}/
-
-	# Patches from Chet sent to bashbug ml
-	"${FILESDIR}"/${PN}-5.0-syslog-history-extern.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}
-		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 )
-
-	if is_release ; then
-		# 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%%_*}
-
-		# 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() {
-	if use pgo ; then
-		# Build Bash and run its tests to generate profiles.
-		emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo"
-
-		# Used in test suite.
-		unset A
-
-		emake CFLAGS="${CFLAGS} -fprofile-generate=${T}/pgo -fprofile-dir=${T}/pgo" -k check
-
-		# Rebuild Bash using the profiling data we just generated.
-		emake clean
-		emake CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo"
-
-		use plugins && emake -C examples/loadables CFLAGS="${CFLAGS} -fprofile-use=${T}/pgo -fprofile-dir=${T}/pgo" all others
-	else
-		emake
-
-		use plugins && emake -C examples/loadables all others
-	fi
-}
-
-src_test() {
-	# Used in test suite.
-	unset A
-
-	default
-}
-
-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-text/Manifest.gz b/app-text/Manifest.gz
index b377ad36ea8a..a975570adacf 100644
Binary files a/app-text/Manifest.gz and b/app-text/Manifest.gz differ
diff --git a/app-text/evince/Manifest b/app-text/evince/Manifest
index b4f593097b00..60881c518262 100644
--- a/app-text/evince/Manifest
+++ b/app-text/evince/Manifest
@@ -1 +1,2 @@
 DIST evince-42.3.tar.xz 2856080 BLAKE2B 55711dd1869e9cce783845683093bb621b416de66f1d53f901353f6f66ff97ec80ce45e0d32e346b2b37d18285568d01ee96cfe851b09f893565d277651d837c SHA512 4ec212e90c3fd259a2afe191592c135938766b11c6891297a10dc34152f69bba9350a467c394ec6cacde5bd16ced02d0c38b7a112dd7d676f53b12fd1b29a62e
+DIST evince-43.0.tar.xz 2908508 BLAKE2B 5f1a9a697693a64c2b54ae5d5499ae8993b02f2df0b1706d0335770037285bb13e2af5254d7ff65ae4abb5a0c8ed6e338c61306f47e121de8c6546407c8968d5 SHA512 dd50ba45c4eb56f8af1df38f7a12c3c13747a1053bb97c8600d85cbc398e340d7bc5db73f441b68cfb8294ab985be361e48605cdc5e3dccb051d917869a12ba9
diff --git a/app-text/evince/evince-43.0.ebuild b/app-text/evince/evince-43.0.ebuild
new file mode 100644
index 000000000000..0dc935d74b76
--- /dev/null
+++ b/app-text/evince/evince-43.0.ebuild
@@ -0,0 +1,122 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit gnome.org gnome2-utils meson systemd xdg
+
+DESCRIPTION="Simple document viewer for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Evince"
+
+LICENSE="GPL-2+ CC-BY-SA-3.0"
+# subslot = evd3.(suffix of libevdocument3)-evv3.(suffix of libevview3)
+SLOT="0/evd3.4-evv3.3"
+IUSE="cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+
+# atk used in libview
+# bundles unarr
+DEPEND="
+	dev-libs/atk
+	>=dev-libs/glib-2.44.0:2
+	>=gui-libs/libhandy-1.5.0:1=
+	>=dev-libs/libxml2-2.5:2
+	sys-libs/zlib:=
+	>=x11-libs/gdk-pixbuf-2.40:2
+	>=x11-libs/gtk+-3.22.0:3[cups?,introspection?]
+	gnome-base/gsettings-desktop-schemas
+	>=x11-libs/cairo-1.10:=
+	>=app-text/poppler-22.02.0[cairo]
+	>=app-arch/libarchive-3.6.0
+	djvu? ( >=app-text/djvu-3.5.22:= )
+	dvi? (
+		>=app-text/libspectre-0.2:=
+		dev-libs/kpathsea:=
+	)
+	gstreamer? (
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+		media-libs/gst-plugins-good:1.0 )
+	gnome? ( gnome-base/gnome-desktop:3= )
+	gnome-keyring? ( >=app-crypt/libsecret-0.5 )
+	introspection? ( >=dev-libs/gobject-introspection-1:= )
+	nautilus? ( >=gnome-base/nautilus-3.28.0 <gnome-base/nautilus-42.20 )
+	postscript? ( >=app-text/libspectre-0.2:= )
+	spell? ( >=app-text/gspell-1.6.0:= )
+	tiff? ( >=media-libs/tiff-4.0:0= )
+	xps? ( >=app-text/libgxps-0.2.1:= )
+"
+RDEPEND="${DEPEND}
+	gnome-base/gvfs
+	gnome-base/librsvg
+	|| (
+		>=x11-themes/adwaita-icon-theme-2.17.1
+		>=x11-themes/hicolor-icon-theme-0.10
+	)
+"
+BDEPEND="
+	gtk-doc? (
+		>=dev-util/gi-docgen-2021.1
+		app-text/docbook-xml-dtd:4.3
+	)
+	dev-libs/appstream-glib
+	dev-util/gdbus-codegen
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	xdg_environment_reset
+
+	# Do not depend on adwaita-icon-theme, bug #326855, #391859
+	# https://gitlab.freedesktop.org/xdg/default-icon-theme/issues/7
+	sed -i '/adwaita_icon_theme_dep/d' meson.build shell/meson.build || die
+}
+
+src_configure() {
+	local emesonargs=(
+		-Ddevelopment=false
+		-Dplatform=gnome
+
+		-Dviewer=true
+		-Dpreviewer=true
+		-Dthumbnailer=true
+		$(meson_use nautilus)
+
+		-Dcomics=enabled
+		$(meson_feature djvu)
+		$(meson_feature dvi)
+		-Dpdf=enabled
+		$(meson_feature postscript ps)
+		$(meson_feature tiff)
+		$(meson_feature xps)
+
+		$(meson_use gtk-doc gtk_doc)
+		-Duser_doc=true
+		$(meson_use introspection)
+		-Ddbus=true
+		$(meson_feature gnome-keyring keyring)
+		$(meson_feature cups gtk_unix_print)
+		$(meson_feature gnome thumbnail_cache)
+		$(meson_feature gstreamer multimedia)
+		$(meson_feature spell gspell)
+
+		-Dinternal_synctex=true
+
+		-Dsystemduserunitdir="$(systemd_get_userunitdir)"
+	)
+	meson_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/app-text/html401/html401-19991224-r4.ebuild b/app-text/html401/html401-19991224-r4.ebuild
index 8b2044b87896..65a3e66ba88e 100644
--- a/app-text/html401/html401-19991224-r4.ebuild
+++ b/app-text/html401/html401-19991224-r4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -6,7 +6,7 @@ inherit sgml-catalog-r1
 
 DESCRIPTION="DTDs for the HyperText Markup Language 4.01"
 HOMEPAGE="https://www.w3.org/TR/html401/"
-SRC_URI="https://www.w3.org/TR/1999/REC-html401-19991224/html40.tgz"
+SRC_URI="https://www.w3.org/TR/1999/REC-html401-${PV}/html40.tgz"
 
 LICENSE="W3C"
 SLOT="0"
diff --git a/app-text/po4a/po4a-0.67.ebuild b/app-text/po4a/po4a-0.67.ebuild
index af06aeeeee98..eebde273c947 100644
--- a/app-text/po4a/po4a-0.67.ebuild
+++ b/app-text/po4a/po4a-0.67.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/mquinson/${PN}/releases/download/v${PV}/${P}.tar.gz"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-text/qpdf/qpdf-11.1.0.ebuild b/app-text/qpdf/qpdf-11.1.0-r1.ebuild
similarity index 99%
rename from app-text/qpdf/qpdf-11.1.0.ebuild
rename to app-text/qpdf/qpdf-11.1.0-r1.ebuild
index bd30e1e661fc..f0a13b28829a 100644
--- a/app-text/qpdf/qpdf-11.1.0.ebuild
+++ b/app-text/qpdf/qpdf-11.1.0-r1.ebuild
@@ -52,7 +52,7 @@ src_configure() {
 
 	if use ssl ; then
 		local crypto_provider=$(usex gnutls GNUTLS OPENSSL)
-		myconf+=(
+		mycmakeargs+=(
 			-DDEFAULT_CRYPTO=${crypto_provider}
 			-DREQUIRE_CRYPTO_${crypto_provider}=ON
 		)
diff --git a/app-text/recode/recode-3.7.11.ebuild b/app-text/recode/recode-3.7.11.ebuild
index 84074fbac49b..8a466fea9cdf 100644
--- a/app-text/recode/recode-3.7.11.ebuild
+++ b/app-text/recode/recode-3.7.11.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 
 python_check_deps() {
 	if use test ; then
-		has_version -b "dev-python/cython[${PYTHON_USEDEP}]" || return 1
+		python_has_version "dev-python/cython[${PYTHON_USEDEP}]" || return 1
 	fi
 }
 
diff --git a/app-text/recode/recode-3.7.12.ebuild b/app-text/recode/recode-3.7.12.ebuild
index 7f4e75b9cc71..b4f1454b52ae 100644
--- a/app-text/recode/recode-3.7.12.ebuild
+++ b/app-text/recode/recode-3.7.12.ebuild
@@ -34,9 +34,11 @@ BDEPEND="
 "
 
 python_check_deps() {
-	if use test ; then
-		has_version -b "dev-python/cython[${PYTHON_USEDEP}]" || return 1
-	fi
+	python_has_version "dev-python/cython[${PYTHON_USEDEP}]"
+}
+
+pkg_setup() {
+	use test && python-any-r1_pkg_setup
 }
 
 src_configure() {
diff --git a/app-text/recode/recode-3.7.9.ebuild b/app-text/recode/recode-3.7.9.ebuild
index 31a05a563f10..a3592d9cc9d5 100644
--- a/app-text/recode/recode-3.7.9.ebuild
+++ b/app-text/recode/recode-3.7.9.ebuild
@@ -35,7 +35,7 @@ BDEPEND="
 
 python_check_deps() {
 	if use test ; then
-		has_version -b "dev-python/cython[${PYTHON_USEDEP}]" || return 1
+		python_has_version "dev-python/cython[${PYTHON_USEDEP}]" || return 1
 	fi
 }
 
diff --git a/app-text/rnv/metadata.xml b/app-text/rnv/metadata.xml
index 581faaa017c3..435382f3cbd2 100644
--- a/app-text/rnv/metadata.xml
+++ b/app-text/rnv/metadata.xml
@@ -1,7 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<!-- maintainer-needed -->
+	<maintainer type="person">
+		<email>sping@gentoo.org</email>
+		<name>Sebastian Pipping</name>
+	</maintainer>
 	<upstream>
 		<remote-id type="sourceforge">rnv</remote-id>
 	</upstream>
diff --git a/app-text/rnv/rnv-1.7.11-r1.ebuild b/app-text/rnv/rnv-1.7.11-r1.ebuild
index 1ca31dcce3d1..4d5043c9f5c4 100644
--- a/app-text/rnv/rnv-1.7.11-r1.ebuild
+++ b/app-text/rnv/rnv-1.7.11-r1.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2018 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 inherit unpacker toolchain-funcs
 
 DESCRIPTION="A lightweight Relax NG Compact Syntax validator"
@@ -26,7 +26,9 @@ src_prepare() {
 
 src_configure() {
 	LIBS="-ldl -lm" \
-		econf --with-scm="/usr"
+		econf \
+		--with-scm-inc="/usr/include" \
+		--with-scm-lib="/usr/$(get_libdir)"
 }
 
 src_install() {
diff --git a/app-text/texlive-core/files/texlive-core-2021-slibtool.patch b/app-text/texlive-core/files/texlive-core-2021-slibtool.patch
new file mode 100644
index 000000000000..4b026177b686
--- /dev/null
+++ b/app-text/texlive-core/files/texlive-core-2021-slibtool.patch
@@ -0,0 +1,98 @@
+https://bugs.gentoo.org/775170
+https://tug.org/svn/texlive?view=revision&revision=61639
+--- a/texk/web2c/web2c/Makefile.in
++++ b/texk/web2c/web2c/Makefile.in
+@@ -127,8 +127,7 @@
+ libweb2c_a_OBJECTS = $(am_libweb2c_a_OBJECTS)
+ am_fixwrites_OBJECTS = fixwrites.$(OBJEXT)
+ fixwrites_OBJECTS = $(am_fixwrites_OBJECTS)
+-am__DEPENDENCIES_1 =
+-fixwrites_DEPENDENCIES = $(am__DEPENDENCIES_1)
++fixwrites_DEPENDENCIES = $(web2c_LDADD)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+@@ -138,11 +137,11 @@
+ makecpool_LDADD = $(LDADD)
+ am_splitup_OBJECTS = splitup.$(OBJEXT)
+ splitup_OBJECTS = $(am_splitup_OBJECTS)
+-splitup_DEPENDENCIES = $(am__DEPENDENCIES_1)
++splitup_DEPENDENCIES = $(web2c_LDADD)
+ am_web2c_OBJECTS = web2c-parser.$(OBJEXT) web2c-lexer.$(OBJEXT) \
+ 	main.$(OBJEXT)
+ web2c_OBJECTS = $(am_web2c_OBJECTS)
+-web2c_DEPENDENCIES =
++web2c_DEPENDENCIES = libweb2c.a
+ SCRIPTS = $(dist_noinst_SCRIPTS)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+@@ -416,7 +415,7 @@
+ 	main.c \
+ 	web2c.h
+ 
+-web2c_LDADD = -L. -lweb2c
++web2c_LDADD = libweb2c.a
+ fixwrites_SOURCES = \
+ 	fixwrites.c
+ 
+--- a/texk/web2c/web2c/Makefile.in
++++ b/texk/web2c/web2c/Makefile.in
+@@ -127,7 +127,6 @@
+ libweb2c_a_OBJECTS = $(am_libweb2c_a_OBJECTS)
+ am_fixwrites_OBJECTS = fixwrites.$(OBJEXT)
+ fixwrites_OBJECTS = $(am_fixwrites_OBJECTS)
+-fixwrites_DEPENDENCIES = $(web2c_LDADD)
+ AM_V_lt = $(am__v_lt_@AM_V@)
+ am__v_lt_ = $(am__v_lt_@AM_DEFAULT_V@)
+ am__v_lt_0 = --silent
+@@ -137,11 +136,9 @@
+ makecpool_LDADD = $(LDADD)
+ am_splitup_OBJECTS = splitup.$(OBJEXT)
+ splitup_OBJECTS = $(am_splitup_OBJECTS)
+-splitup_DEPENDENCIES = $(web2c_LDADD)
+ am_web2c_OBJECTS = web2c-parser.$(OBJEXT) web2c-lexer.$(OBJEXT) \
+ 	main.$(OBJEXT)
+ web2c_OBJECTS = $(am_web2c_OBJECTS)
+-web2c_DEPENDENCIES = libweb2c.a
+ SCRIPTS = $(dist_noinst_SCRIPTS)
+ AM_V_P = $(am__v_P_@AM_V@)
+ am__v_P_ = $(am__v_P_@AM_DEFAULT_V@)
+@@ -395,6 +392,7 @@
+ AM_CFLAGS = $(WARNING_CFLAGS)
+ EXTRA_LIBRARIES = libweb2c.a
+ BUILT_SOURCES = w2c/config.h
++#
+ DISTCLEANFILES = w2c/config.h web2c-parser.output
+ noinst_HEADERS = coerce.h
+ dist_noinst_SCRIPTS = convert
+@@ -415,14 +413,17 @@
+ 	main.c \
+ 	web2c.h
+ 
++web2c_DEPENDENCIES = # don't build libweb2c.a in parallel
+ web2c_LDADD = libweb2c.a
+ fixwrites_SOURCES = \
+ 	fixwrites.c
+ 
++fixwrites_DEPENDENCIES = # don't build libweb2c.a in parallel
+ fixwrites_LDADD = $(web2c_LDADD)
+ splitup_SOURCES = \
+ 	splitup.c
+ 
++splitup_DEPENDENCIES = # don't build libweb2c.a in parallel
+ splitup_LDADD = $(web2c_LDADD)
+ makecpool_SOURCES = \
+ 	makecpool.c
+@@ -973,11 +974,8 @@
+ 	fi
+ 
+ $(libweb2c_a_OBJECTS): w2c/config.h
+-
+ $(web2c_OBJECTS): web2c-parser.h stamp-lib
+-
+ $(fixwrites_OBJECTS): stamp-lib
+-
+ $(splitup_OBJECTS): stamp-lib
+ 
+ stamp-lib:
+
diff --git a/app-text/texlive-core/texlive-core-2021-r4.ebuild b/app-text/texlive-core/texlive-core-2021-r4.ebuild
new file mode 100644
index 000000000000..1d9065ebab6c
--- /dev/null
+++ b/app-text/texlive-core/texlive-core-2021-r4.ebuild
@@ -0,0 +1,366 @@
+# 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
+
+	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
+
+	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/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 8fc05b0e1953..2934eb2c044d 100644
Binary files a/dev-cpp/Manifest.gz and b/dev-cpp/Manifest.gz differ
diff --git a/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild b/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild
index 223e2c159caf..2ccb5362aec2 100644
--- a/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild
+++ b/dev-cpp/rapidyaml/rapidyaml-0.4.1.ebuild
@@ -60,6 +60,7 @@ src_prepare() {
 
 src_configure() {
 	local mycmakeargs=(
+		-DGIT=false # don't call git nor fail if missing, not a repo
 		-DRYML_BUILD_API=no # TODO if a python consumer needs it
 		-DRYML_BUILD_TESTS=$(usex test)
 		-DRYML_DBG=$(usex debug)
diff --git a/dev-cpp/tbb/Manifest b/dev-cpp/tbb/Manifest
index b048b94c2114..544f110b44ad 100644
--- a/dev-cpp/tbb/Manifest
+++ b/dev-cpp/tbb/Manifest
@@ -1,3 +1,4 @@
 DIST tbb-2020.3.tar.gz 2639788 BLAKE2B 3e92bccdc8179fc049379ccbb8ad7f615623177abc61d813b1a601020c345137bfd7d4c4600cf5b0d587e5ebef677635c3c8124d06b05fdd3325128ed8c9f84a SHA512 04c4b5501418792827190691d03d20d4dc1fd3cbbcf459a4d40c5c2281d964e658f31f133ad3907b78e17ed04f4ff16728ed89487ed0ce2cb239f23feb34bd87
 DIST tbb-2021.4.0.tar.gz 2452533 BLAKE2B a635c6efa1894c33e2f75c1aa03b6c0f4a86ebef3b58fa42bd25b53d661ed7a9d21f49f121dd3679735f219fbfc35604600bcc72ba60d3602e6de77b0d62e37b SHA512 96da2bc351fd64dfa854f8e6cabc1c4e53af3d55760e99d6f83ad53779c727af333d13d6be0828ed70371cf796498d2063e9dd0e4b2f6451623bb5d28ccbf20b
 DIST tbb-2021.5.0.tar.gz 2463218 BLAKE2B 2d50d312b86318ba4923afe68753b3781f9646cbdb33861f3458301a3a19b7ca3aab6959dca085294dfc743d7f552635f80fb524ec5d780a46f58ffe02e3280d SHA512 0e7b71022e397a6d7abb0cea106847935ae79a1e12a6976f8d038668c6eca8775ed971202c5bd518f7e517092b67af805cc5feb04b5c3a40e9fbf972cc703a46
+DIST tbb-2021.6.0.tar.gz 2566074 BLAKE2B ec5d98d2890828323cefabc75011658d508eab531c9b30030162f6ce367c54a8d70d6c6611c00d93ab3ef041ea1af35f8180768e114611847547447545f70c71 SHA512 c28bd4045e3269d0d9c24dbf360f849d26eaa15e34fa9dd3f5feae0f3440ff74ab1d05154b95549a135e7d9e97fd9a7ff4b4e468b13265e0477bb58f47e856b6
diff --git a/dev-cpp/tbb/tbb-2021.6.0.ebuild b/dev-cpp/tbb/tbb-2021.6.0.ebuild
new file mode 100644
index 000000000000..8314a6dcb3c6
--- /dev/null
+++ b/dev-cpp/tbb/tbb-2021.6.0.ebuild
@@ -0,0 +1,45 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib flag-o-matic
+
+DESCRIPTION="High level abstract threading library"
+HOMEPAGE="https://www.threadingbuildingblocks.org"
+SRC_URI="https://github.com/oneapi-src/oneTBB/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/oneTBB-${PV}"
+
+LICENSE="Apache-2.0"
+# https://github.com/oneapi-src/oneTBB/blob/master/CMakeLists.txt#L53
+# libtbb<SONAME>-libtbbmalloc<SONAME>-libtbbbind<SONAME>
+SLOT="0/12.5-2.5-3.5"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="!kernel_Darwin? ( sys-apps/hwloc:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	# need to verify this is in master
+	"${FILESDIR}"/${PN}-2021.5.0-musl-mallinfo.patch
+	# musl again, should be in.. 2022?
+	"${FILESDIR}"/${PN}-2021.5.0-musl-setcontext.patch
+	"${FILESDIR}"/${PN}-2021.5.0-flags-stripping.patch
+)
+
+src_configure() {
+	# bug #872287
+	filter-flags -D_GLIBCXX_ASSERTIONS
+	append-cppflags -U_GLIBCXX_ASSERTIONS
+
+	local mycmakeargs=(
+		-DTBB_TEST=$(usex test)
+		-DTBB_ENABLE_IPO=OFF
+		-DTBB_STRICT=OFF
+	)
+
+	cmake-multilib_src_configure
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index e894174fb499..c4768ced7243 100644
Binary files a/dev-db/Manifest.gz and b/dev-db/Manifest.gz differ
diff --git a/dev-db/citus/Manifest b/dev-db/citus/Manifest
index 60b874371d85..fc2ba7e24776 100644
--- a/dev-db/citus/Manifest
+++ b/dev-db/citus/Manifest
@@ -1,10 +1,3 @@
-DIST citus-10.0.6.tar.gz 5186554 BLAKE2B b7f4c46cf202bcc1a0d62d797056d5dbee625c4d00f6c0507e95201698bd9d0eceddaf2dd524e0a954a75013fcfb5f42531975ae157d1aa015a27f8adc8d9f25 SHA512 2a839eb2cc907a8294b974ec4f698042546e84757d209ce5e7c52d122f3f2af5036b3a1147d26b50170192649a19cf38d3c2bccfa445e213f604bb21ef84d478
-DIST citus-10.1.3.tar.gz 5281581 BLAKE2B cf119c550174a8b64bfee6497288a10030db7ff8d40e48d4751799d4268618afe9b7dcd72bfbd5b01dc073f6f4af55e8dc338071e3be224d15ded423885bbebd SHA512 2ad9665c5de3214a5ebc08d5df663caa634912dd9db433a43bea96d3932213786d1650a695531a4d00ab8dff7d53078848466d7a6e803bff3ab26f4df3990c91
-DIST citus-10.1.4.tar.gz 5283715 BLAKE2B e19b35734b32541678538b963f1c03a259fa404f373b759a4c08e867325e106689ff711a5db9ba9231e1f9b42e303a49e6d58c8fb18b5ab7d75e19aea4741a0e SHA512 36a19b30d63ea53a8be6a77946d54558f7fd92f2e91b356395f9273e907f24444500c31d77e9693186fc2bd8df7c7e5f62a11ddfbc8795fbde8d700ebe7a9e76
-DIST citus-10.2.4.tar.gz 5535944 BLAKE2B 3820622ec7f60aad5989536fe6dd53b8db75c51dc31ae3a0d023058afaa369f2de29fe49369d7846ad3bd17242fb6ce7784f2832263ba79ca045c75e558e14d7 SHA512 f9d6853333984c23b3f6aaeec156719c8564958e4d446781506f95fd56e48b8df27f1ddfa1cddb085791dccd6a17c07f3df87d84a89e137ba5a6972a656222f2
-DIST citus-10.2.5.tar.gz 5538309 BLAKE2B c8e06b356728a68a948ffd3dd6d3c56c2972ad094922ce03e049999c450cac0c62ebe45f4ecc489d2cb521530b9f1bf566ac9732227646247a7eebd03f3f88cb SHA512 95ee1225c850bc986025f6960cb5784b02f2ac5af8f312f5dd4a270c4ebf46dd60388ba604a9cd4cf2e22f8b7a855bd18654cbe9f701ba7cd35c1576414d185f
 DIST citus-10.2.7.tar.gz 5549985 BLAKE2B cb562437757624cc34f80219e8039fdcaf27ebc4a63b30714beafe5555a85769f44a92d74173fb94085f48d09bedaffc019463ec6db67217f8554154a91e2e74 SHA512 32441e964d97d3a69eed309c8d52f65ae31a3a7b79c6e765e967025c7f6a041420925dfb5fb0835cec1ae66549f59fe256994f4120514ec2e781169b771c85e6
-DIST citus-11.0.2.tar.gz 6002371 BLAKE2B a04f7d2cc927f7586ccb78cb4f007cd42de848770e2ab025e09a95bec62cf2ed16c6af544c6dfc5e2913ba23ef1a4c26928bbfff01aa9258bc21b9d686cda618 SHA512 9050c0401b245b5e5c38fc79389cd33c5b98898ecec86a00e94912cdd6079170550eaffb524fcd04f4c4b42f8d211b4e4b65914e73780b01f321f75c061339ed
-DIST citus-11.0.4.tar.gz 6006098 BLAKE2B 7621d824ce9e1247b8fb813008bb06c3c89d7c3a0cea6720ccbf0b59d3cb80a78a72f1f764dc0480caa3be1f39edad299bb3ad9f0a89abb119e7d6df04c193e6 SHA512 700cadb8014c2e4ef0cc265e3d91ff3bec2334b0c59f4b9c695679da761838a1dd7bd6eff95a019ff6ee5440d336a44969911ad6fb6ca5a295a3005b50497769
 DIST citus-11.0.6.tar.gz 6021221 BLAKE2B 7b19328890b79ce639599cf2f99ee15f6dc7e87a062fbd538b288895a3ec6e4af36eabad0a7111de8b53029670be8d6a66ba692a66101c43120640f4fffc37d4 SHA512 4b5667fcfdc89a171ae8e15095d5e688a1d8b4707d13cd4742f5695f9e57e76190e11c4fe933044a64ac00b0982da91d6a253cd272af6ba58131b787ad4b13ef
-DIST citus-9.5.10.tar.gz 4744848 BLAKE2B e6d9595fe30cb93508007cb4f39933ae57b6f0f1c5ee084ac83b0f5edea0d32dc0e8fd71737e396eb9b77fd5601ae647e29dea5b13e2e7a53a59f96365773466 SHA512 24683c7607de115d1d7fc355b56ff732e5e5f2adcdbebac7ee0d71b8878de3f335f3824be9e02ae9554850c68d7e21bc6d95d581e02ba4fef9da27b2f67f2987
+DIST citus-11.1.1.tar.gz 6354348 BLAKE2B 2cd4da30af0e0deee3a1dc05ef636b850bc9e244aa81920f9a7692cc3ddecd7802d41ebc76070072453001bd1ea620c6863ead538df4d9cca281979132fde917 SHA512 295702b9ff33bb89487fd2bfe46382391fcad457922847575babae78e1866ec5a55f51e9899b42c8a1193fdbac5df2386a60977ecf3b41631472cd7de97abbe8
diff --git a/dev-db/citus/citus-10.0.6.ebuild b/dev-db/citus/citus-10.0.6.ebuild
deleted file mode 100644
index 4bb39ab5f008..000000000000
--- a/dev-db/citus/citus-10.0.6.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 11 12 13 )
-
-inherit postgres-multi
-
-DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
-HOMEPAGE="https://www.citusdata.com/"
-SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE=""
-LICENSE="POSTGRESQL AGPL-3"
-
-KEYWORDS="~amd64"
-
-SLOT=0
-
-RESTRICT="test"
-
-DEPEND="${POSTGRES_DEP}
-	app-arch/lz4
-	app-arch/zstd
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	postgres-multi_foreach econf
-}
diff --git a/dev-db/citus/citus-10.1.3.ebuild b/dev-db/citus/citus-10.1.3.ebuild
deleted file mode 100644
index 7c1f0e8ac75c..000000000000
--- a/dev-db/citus/citus-10.1.3.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 12 13 )
-
-inherit postgres-multi
-
-DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
-HOMEPAGE="https://www.citusdata.com/"
-SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE=""
-LICENSE="POSTGRESQL AGPL-3"
-
-KEYWORDS="~amd64"
-
-SLOT=0
-
-RESTRICT="test"
-
-DEPEND="${POSTGRES_DEP}
-	app-arch/lz4
-	app-arch/zstd
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	postgres-multi_foreach econf
-}
diff --git a/dev-db/citus/citus-10.1.4.ebuild b/dev-db/citus/citus-10.1.4.ebuild
deleted file mode 100644
index 242de20eb0a4..000000000000
--- a/dev-db/citus/citus-10.1.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=7
-
-POSTGRES_COMPAT=( 12 13 )
-
-inherit postgres-multi
-
-DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
-HOMEPAGE="https://www.citusdata.com/"
-SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE=""
-LICENSE="POSTGRESQL AGPL-3"
-
-KEYWORDS="~amd64"
-
-SLOT=0
-
-RESTRICT="test"
-
-DEPEND="${POSTGRES_DEP}
-	app-arch/lz4
-	app-arch/zstd
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	postgres-multi_foreach econf
-}
diff --git a/dev-db/citus/citus-10.2.4.ebuild b/dev-db/citus/citus-10.2.4.ebuild
deleted file mode 100644
index 62d5758baeeb..000000000000
--- a/dev-db/citus/citus-10.2.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=7
-
-POSTGRES_COMPAT=( 12 13 14 )
-
-inherit postgres-multi
-
-DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
-HOMEPAGE="https://www.citusdata.com/"
-SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE=""
-LICENSE="POSTGRESQL AGPL-3"
-
-KEYWORDS="~amd64"
-
-SLOT=0
-
-RESTRICT="test"
-
-DEPEND="${POSTGRES_DEP}
-	app-arch/lz4
-	app-arch/zstd
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	postgres-multi_foreach econf
-}
diff --git a/dev-db/citus/citus-10.2.5.ebuild b/dev-db/citus/citus-10.2.5.ebuild
deleted file mode 100644
index 62d5758baeeb..000000000000
--- a/dev-db/citus/citus-10.2.5.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 12 13 14 )
-
-inherit postgres-multi
-
-DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
-HOMEPAGE="https://www.citusdata.com/"
-SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE=""
-LICENSE="POSTGRESQL AGPL-3"
-
-KEYWORDS="~amd64"
-
-SLOT=0
-
-RESTRICT="test"
-
-DEPEND="${POSTGRES_DEP}
-	app-arch/lz4
-	app-arch/zstd
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	postgres-multi_foreach econf
-}
diff --git a/dev-db/citus/citus-11.0.4.ebuild b/dev-db/citus/citus-11.0.4.ebuild
deleted file mode 100644
index a1add589578c..000000000000
--- a/dev-db/citus/citus-11.0.4.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 13 14 )
-
-inherit postgres-multi
-
-DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
-HOMEPAGE="https://www.citusdata.com/"
-
-MY_PV="${PV/beta0/beta}"
-SRC_URI="https://github.com/citusdata/citus/archive/refs/tags/v${MY_PV}.tar.gz -> ${P}.tar.gz"
-
-S="${WORKDIR}/${PN}-${MY_PV}"
-
-IUSE=""
-LICENSE="POSTGRESQL AGPL-3"
-
-KEYWORDS="~amd64"
-
-SLOT=0
-
-RESTRICT="test"
-
-DEPEND="${POSTGRES_DEP}
-	app-arch/lz4
-	app-arch/zstd
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	postgres-multi_foreach econf
-}
diff --git a/dev-db/citus/citus-11.0.2.ebuild b/dev-db/citus/citus-11.1.1.ebuild
similarity index 100%
rename from dev-db/citus/citus-11.0.2.ebuild
rename to dev-db/citus/citus-11.1.1.ebuild
diff --git a/dev-db/citus/citus-9.5.10.ebuild b/dev-db/citus/citus-9.5.10.ebuild
deleted file mode 100644
index 4bb39ab5f008..000000000000
--- a/dev-db/citus/citus-9.5.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-POSTGRES_COMPAT=( 11 12 13 )
-
-inherit postgres-multi
-
-DESCRIPTION="Open-source postgresql extension for clustering/multi-node setups"
-HOMEPAGE="https://www.citusdata.com/"
-SRC_URI="https://github.com/citusdata/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-IUSE=""
-LICENSE="POSTGRESQL AGPL-3"
-
-KEYWORDS="~amd64"
-
-SLOT=0
-
-RESTRICT="test"
-
-DEPEND="${POSTGRES_DEP}
-	app-arch/lz4
-	app-arch/zstd
-	"
-RDEPEND="${DEPEND}"
-
-src_configure() {
-	postgres-multi_foreach econf
-}
diff --git a/dev-db/redis/Manifest b/dev-db/redis/Manifest
index 554246eb8a0e..a53a39f78f6d 100644
--- a/dev-db/redis/Manifest
+++ b/dev-db/redis/Manifest
@@ -2,3 +2,4 @@ DIST redis-6.0.16.tar.gz 2288647 BLAKE2B f3552cc0d27cbc5cf6556792da9a75d01ff70d3
 DIST redis-6.2.6.tar.gz 2476542 BLAKE2B d139479432171294911d99e7e8c2327dbbc6682ea49de761c4bb4089a2efd814926f2f8823dca1826b4a61dd9ccf79abb22878c9463ac92870481b43d8a7fff7 SHA512 9b947d26fd9e208627ed22d318ab3d0775ab0be46d98db1c1d158feac671b984e75ce33e647d196face9643f80768af47e678be1b4e1ddd3eb56dff467c46022
 DIST redis-6.2.7.tar.gz 2487287 BLAKE2B 06f1b1e16cdf06c38b67c1f1dcccc025da50cc3719688b8c2bf23077d77dd97ea546909043fb65e60478ac3661cc033fa6e8d7a38e361e69eb93ba3db07b7c66 SHA512 d113094b8e31754915db7f0317d9b7969e034af3a7bac2ae0cbfad6cc61ba3aae35e9709c435abc1024a96f914df7a760b3cd18d06c375b541cfa837d1c5b953
 DIST redis-7.0.4.tar.gz 2963216 BLAKE2B 95ad18547b4be0b199fccc4b0f534b00d2f442609b604b02ef83f44cef4283048d1f8b89e383a14208a00842eb3d6655649d32169a2a6586ed6fac1792e19d5a SHA512 7edecfa667b30584666be0a2dbcb2ac25a6764fa5b8db49ab421602ad20272eeab99ccff0b7c2f789c30a0425d80b774515b03c849e517451cbe597d37eb0247
+DIST redis-7.0.5.tar.gz 2968205 BLAKE2B c319a2f656e4bd26637735ef73e58eecc306e202b57d6da3a38150a02d738a414c6696e261b8ab88033e117aee4f02308aab9ca4a5f382d66ec3a10f3e020580 SHA512 16ff920cb8df4d82e78ef34209285024aa98189be8acbca86b10fb3064dcc70eac60206aadece6af08406860ed01a004ce3aaa86be896ea36c7f486686646753
diff --git a/dev-db/redis/redis-7.0.5.ebuild b/dev-db/redis/redis-7.0.5.ebuild
new file mode 100644
index 000000000000..d16e991e2f8b
--- /dev/null
+++ b/dev-db/redis/redis-7.0.5.ebuild
@@ -0,0 +1,187 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# N.B.: It is no clue in porting to Lua eclasses, as upstream have deviated
+# too far from vanilla Lua, adding their own APIs like lua_enablereadonlytable
+
+inherit autotools edo flag-o-matic multiprocessing systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="A persistent caching system, key-value, and data structures database"
+HOMEPAGE="https://redis.io"
+SRC_URI="https://download.redis.io/releases/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="+jemalloc selinux ssl systemd tcmalloc test"
+RESTRICT="!test? ( test )"
+
+COMMON_DEPEND="
+	jemalloc? ( >=dev-libs/jemalloc-5.1:= )
+	ssl? ( dev-libs/openssl:0= )
+	systemd? ( sys-apps/systemd:= )
+	tcmalloc? ( dev-util/google-perftools )
+"
+
+RDEPEND="
+	${COMMON_DEPEND}
+	acct-group/redis
+	acct-user/redis
+	selinux? ( sec-policy/selinux-redis )
+"
+
+BDEPEND="
+	${COMMON_DEPEND}
+	virtual/pkgconfig
+"
+
+# Tcl is only needed in the CHOST test env
+DEPEND="
+	${COMMON_DEPEND}
+	test? (
+		dev-lang/tcl:0=
+		ssl? ( dev-tcltk/tls )
+	)"
+
+REQUIRED_USE="?? ( jemalloc tcmalloc )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-6.2.1-config.patch
+	"${FILESDIR}"/${PN}-5.0-shared.patch
+	"${FILESDIR}"/${PN}-6.2.3-ppc-atomic.patch
+	"${FILESDIR}"/${PN}-sentinel-5.0-config.patch
+	"${FILESDIR}"/${PN}-7.0.4-no-which.patch
+)
+
+src_prepare() {
+	default
+
+	# Append cflag for lua_cjson
+	# https://github.com/antirez/redis/commit/4fdcd213#diff-3ba529ae517f6b57803af0502f52a40bL61
+	append-cflags "-DENABLE_CJSON_GLOBAL"
+
+	# now we will rewrite present Makefiles
+	local makefiles="" MKF
+	for MKF in $(find -name 'Makefile' | cut -b 3-); do
+		mv "${MKF}" "${MKF}.in"
+		sed -i	-e 's:$(CC):@CC@:g' \
+			-e 's:$(CFLAGS):@AM_CFLAGS@:g' \
+			-e 's: $(DEBUG)::g' \
+			-e 's:$(OBJARCH)::g' \
+			-e 's:ARCH:TARCH:g' \
+			-e '/^CCOPT=/s:$: $(LDFLAGS):g' \
+			"${MKF}.in" \
+		|| die "Sed failed for ${MKF}"
+		makefiles+=" ${MKF}"
+	done
+	# autodetection of compiler and settings; generates the modified Makefiles
+	cp "${FILESDIR}"/configure.ac-7.0 configure.ac || die
+
+	sed -i	\
+		-e "/^AC_INIT/s|, __PV__, |, $PV, |" \
+		-e "s:AC_CONFIG_FILES(\[Makefile\]):AC_CONFIG_FILES([${makefiles}]):g" \
+		configure.ac || die "Sed failed for configure.ac"
+	eautoreconf
+}
+
+src_configure() {
+	econf
+
+	# Linenoise can't be built with -std=c99, see https://bugs.gentoo.org/451164
+	# also, don't define ANSI/c99 for lua twice
+	sed -i -e "s:-std=c99::g" deps/linenoise/Makefile deps/Makefile || die
+}
+
+src_compile() {
+	local myconf=""
+
+	if use jemalloc; then
+		myconf+="MALLOC=jemalloc"
+	elif use tcmalloc; then
+		myconf+="MALLOC=tcmalloc"
+	else
+		myconf+="MALLOC=libc"
+	fi
+
+	if use ssl; then
+		myconf+=" BUILD_TLS=yes"
+	fi
+
+	export USE_SYSTEMD=$(usex systemd)
+
+	tc-export AR CC RANLIB
+	emake V=1 ${myconf} AR="${AR}" CC="${CC}" RANLIB="${RANLIB}"
+}
+
+src_test() {
+	local runtestargs=(
+		--clients "$(makeopts_jobs)" # see bug #649868
+
+		--skiptest "Active defrag eval scripts" # see bug #851654
+	)
+
+	if has usersandbox ${FEATURES} || ! has userpriv ${FEATURES}; then
+		ewarn "oom-score-adj related tests will be skipped." \
+			"They are known to fail with FEATURES usersandbox or -userpriv. See bug #756382."
+
+		runtestargs+=(
+			# unit/oom-score-adj was introduced in version 6.2.0
+			--skipunit unit/oom-score-adj # see bug #756382
+
+			# Following test was added in version 7.0.0 to unit/introspection.
+			# It also tries to adjust OOM score.
+			--skiptest "CONFIG SET rollback on apply error"
+		)
+	fi
+
+	if use ssl; then
+		edo ./utils/gen-test-certs.sh
+		runtestargs+=( --tls )
+	fi
+
+	edo ./runtest "${runtestargs[@]}"
+}
+
+src_install() {
+	insinto /etc/redis
+	doins redis.conf sentinel.conf
+	use prefix || fowners -R redis:redis /etc/redis /etc/redis/{redis,sentinel}.conf
+	fperms 0750 /etc/redis
+	fperms 0644 /etc/redis/{redis,sentinel}.conf
+
+	newconfd "${FILESDIR}/redis.confd-r2" redis
+	newinitd "${FILESDIR}/redis.initd-6" redis
+
+	systemd_newunit "${FILESDIR}/redis.service-4" redis.service
+	newtmpfiles "${FILESDIR}/redis.tmpfiles-2" redis.conf
+
+	newconfd "${FILESDIR}/redis-sentinel.confd-r1" redis-sentinel
+	newinitd "${FILESDIR}/redis-sentinel.initd-r1" redis-sentinel
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	dodoc 00-RELEASENOTES BUGS CONTRIBUTING.md MANIFESTO README.md
+
+	dobin src/redis-cli
+	dosbin src/redis-benchmark src/redis-server src/redis-check-aof src/redis-check-rdb
+	fperms 0750 /usr/sbin/redis-benchmark
+	dosym redis-server /usr/sbin/redis-sentinel
+
+	if use prefix; then
+		diropts -m0750
+	else
+		diropts -m0750 -o redis -g redis
+	fi
+	keepdir /var/{log,lib}/redis
+}
+
+pkg_postinst() {
+	tmpfiles_process redis.conf
+
+	ewarn "The default redis configuration file location changed to:"
+	ewarn "  /etc/redis/{redis,sentinel}.conf"
+	ewarn "Please apply your changes to the new configuration files."
+}
diff --git a/dev-erlang/Manifest.gz b/dev-erlang/Manifest.gz
index d4d20a9d26b5..b538ab30bbbc 100644
Binary files a/dev-erlang/Manifest.gz and b/dev-erlang/Manifest.gz differ
diff --git a/dev-erlang/cache_tab/Manifest b/dev-erlang/cache_tab/Manifest
index 628069ce4a38..4e6e57a73376 100644
--- a/dev-erlang/cache_tab/Manifest
+++ b/dev-erlang/cache_tab/Manifest
@@ -1,2 +1 @@
-DIST cache_tab-1.0.29.tar.gz 60908 BLAKE2B 5e2d0e0db382b8a9596ec4728ab99426d070026218c04e3e6e55e41ea22181a6c5362f52bab97b9ffa5ba79ed70d1896684ccc113786573627150d0f3e479a32 SHA512 d47b9e28cf95c8d31256090ebcb4c39eaecf622ed13874f3809beef2e96374a6d14048082b59abddf3ca8d399a59a2dc54e4dfb4cf84e5ceec54276a7dd3f594
 DIST cache_tab-1.0.30.tar.gz 60913 BLAKE2B 8e8b7b3b0e8651f2e20cc1181d1847fbdb7130b8a57ff1446fabf7c098fe3485c0686a5bed1318b0590d8380c2e01d31460f707566f96b296a257ee590cf9f41 SHA512 bc8aaacea404d8a8b9a8fb14bc1eec9ec0c07ba4fac910287f448be66b0b3475b3913297dfce8d9de9fc208d9eb413dd8bf154cd1bd6edf86ee40100629e4553
diff --git a/dev-erlang/cache_tab/cache_tab-1.0.29.ebuild b/dev-erlang/cache_tab/cache_tab-1.0.29.ebuild
deleted file mode 100644
index 5254cd01785a..000000000000
--- a/dev-erlang/cache_tab/cache_tab-1.0.29.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rebar
-
-DESCRIPTION="In-memory cache Erlang and Elixir library"
-HOMEPAGE="https://github.com/processone/cache_tab"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1
-	>=dev-erlang/p1_utils-1.0.23"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/eimp/Manifest b/dev-erlang/eimp/Manifest
index 5d9587abae3d..815fabfb227b 100644
--- a/dev-erlang/eimp/Manifest
+++ b/dev-erlang/eimp/Manifest
@@ -1,2 +1 @@
-DIST eimp-1.0.21.tar.gz 3478113 BLAKE2B 1b2f1cb79edf4b017072872dac7969cb56978e5d2ff1c62f2976a49329793ec0a4c0b747f4f5c562eb202ee8a4f81bf7f466ba6039cc4c3e58542d8bb5aa0d06 SHA512 886b37006226510579044ce8616c367249665e67e2ff553aa5fdda3cd797352e691d4c3d7d3a77b7e558c391244da5ad9df488f2051ee52aa69632e18665339f
 DIST eimp-1.0.22.tar.gz 3478737 BLAKE2B 99eaa3b4ac56376cf472ee7a0e9f898eed972c1802702a7e397df5b3313f3add425d8873a2c1a9cf386809f556c927b573d11e5e24e5c69fd1cb35ffdad72234 SHA512 5426df9a00d5b614ebb236729e2b397d5e72e12e68cbed32550a074b1b86557e1dee6585b917166e5ebf2fc41297329574c181471885638236c82a66a29d2232
diff --git a/dev-erlang/eimp/eimp-1.0.21.ebuild b/dev-erlang/eimp/eimp-1.0.21.ebuild
deleted file mode 100644
index 0ae025a5f2ae..000000000000
--- a/dev-erlang/eimp/eimp-1.0.21.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rebar
-
-DESCRIPTION="Erlang Image Manipulation Process"
-HOMEPAGE="https://github.com/processone/eimp"
-SRC_URI="https://github.com/processone/eimp/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=dev-lang/erlang-17.1
-	>=dev-erlang/p1_utils-1.0.23
-	media-libs/gd[png,jpeg,webp]"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_test() {
-	mkdir -p .eunit/priv/bin || die
-	cp priv/bin/eimp .eunit/priv/bin/ || die
-	rebar_src_test
-}
diff --git a/dev-erlang/esip/Manifest b/dev-erlang/esip/Manifest
index a438f66acab6..e0d6a1c78e1b 100644
--- a/dev-erlang/esip/Manifest
+++ b/dev-erlang/esip/Manifest
@@ -1,2 +1 @@
-DIST esip-1.0.45.tar.gz 90984 BLAKE2B 0e27502d65fd5c2b786ef4bd1e44780167fb6f3fc7030101e691d207f1a3631d7eb57a71091ea355c425534baa18cd9c3792dc9358bab4758a1bce60ff5cf436 SHA512 9d6c1f59b44ae74f555a8d7df09d27627c23aa0d56c0e2ae0778eb6350454ddf9ac4b38db52da066616213e4b428173f9883b83fb33b9b1931dbdea6ddee6ebc
 DIST esip-1.0.47.tar.gz 91238 BLAKE2B 041a04009d4687187699bfb78381dd6baefb503bdbdd4b31efeb81786e3e0a4e47085336888fd481ecf28c4e32c296adef05eba7ff17eb084da14e645773cb31 SHA512 68be1c8cf507180e73f3a16dfd8ca44ffad825c40df0d1874888afa41f3cb89b445b033036d041af29ec3fdbdab7acc68f770124171ba4af73abd0775a03c0ba
diff --git a/dev-erlang/esip/esip-1.0.45.ebuild b/dev-erlang/esip/esip-1.0.45.ebuild
deleted file mode 100644
index ddff8192b50b..000000000000
--- a/dev-erlang/esip/esip-1.0.45.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rebar
-
-DESCRIPTION="ProcessOne SIP server component"
-HOMEPAGE="https://github.com/processone/esip"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-erlang/fast_tls-1.1.13
-	>=dev-erlang/stun-1.0.47
-	>=dev-erlang/p1_utils-1.0.23"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
-	rebar_src_prepare
-	rebar_fix_include_path stun
-
-	# ebin contains lonely .gitignore file asking for removal.
-	rm    "${S}/ebin/examples/.gitignore" || die
-	rmdir "${S}/ebin/examples" || die
-	rmdir "${S}/ebin" || die
-}
diff --git a/dev-erlang/esip/esip-1.0.47.ebuild b/dev-erlang/esip/esip-1.0.47.ebuild
index 9111871df249..e55b0bf04e6c 100644
--- a/dev-erlang/esip/esip-1.0.47.ebuild
+++ b/dev-erlang/esip/esip-1.0.47.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
 
 DEPEND="
 	>=dev-erlang/fast_tls-1.1.15
diff --git a/dev-erlang/ezlib/Manifest b/dev-erlang/ezlib/Manifest
index 33d268b22c83..2f79800cb9ce 100644
--- a/dev-erlang/ezlib/Manifest
+++ b/dev-erlang/ezlib/Manifest
@@ -1,2 +1 @@
-DIST ezlib-1.0.10.tar.gz 50086 BLAKE2B 0b5044790bbc3cf45a63e270293d6e16033ea7630b4ed10a6a8e46069d6c13790343f2e2e67c761baa5675a4fd111a4e371656427e0e475efa467ab40f448063 SHA512 803ed76b5a0e91abc995b9cc8d81a072f58b15b8972dde96e4b8b3d27372dd032b2dfbc10591accc212a0e32690a8488dbf4553e95b436918c22beea4d0543ce
 DIST ezlib-1.0.12.tar.gz 49803 BLAKE2B 6541c51d53924dba646485c7f6ff9640d0b52a62aff817d461d188cad48072a8706de8e81ed9ada84530463e872a95f5cd2263a0e6b0467b793bf37eb19ca688 SHA512 950a76ef6714882909c8c03cb0c21f246fd04bb42b44496b8865a96da54544fad17b2e3f54ef0b744ae32a1b9930f32c5fbcd526833f3736e8e5087483e61233
diff --git a/dev-erlang/ezlib/ezlib-1.0.10.ebuild b/dev-erlang/ezlib/ezlib-1.0.10.ebuild
deleted file mode 100644
index bded88f848e4..000000000000
--- a/dev-erlang/ezlib/ezlib-1.0.10.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rebar
-
-DESCRIPTION="Native zlib driver for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/ezlib"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1:=
-	sys-libs/zlib"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/fast_tls/Manifest b/dev-erlang/fast_tls/Manifest
index f885c8a2b49e..89487595f370 100644
--- a/dev-erlang/fast_tls/Manifest
+++ b/dev-erlang/fast_tls/Manifest
@@ -1,2 +1 @@
-DIST fast_tls-1.1.13.tar.gz 81247 BLAKE2B 10abe181327915f7adce44917afe7c9981da53ccff42aaa776c52bfda574e12e2e102c2d7f3e381ac4ed18a92013be7a7fcf4f1c857b176712ccb033ccb07f0c SHA512 c8e2e3b78c39660de8f14baca3d1187e8cbb11dd1bc271b8655992bcb9bfef00a8e6e8899a95f4eec0d9ad451e2367e6c69150140732d27b7713b5fb20a8b632
 DIST fast_tls-1.1.15.tar.gz 83705 BLAKE2B 234c2e10a0661a46482a3db9da21831b0c3c370daff502d3275efcb69337f70977b6509a3b4c1306bf3687eb611b5efe46927c9702fcbe96e6f92f1b378b8293 SHA512 fcbdb9ffbb61c07fb3706bdae9d6d10f425968e722bcd03e2c86a99ca62d3ff0cb1298bf625adb679c627f38953fd3ef0b4263ae34ea100e9134488d9c55e192
diff --git a/dev-erlang/fast_tls/fast_tls-1.1.13.ebuild b/dev-erlang/fast_tls/fast_tls-1.1.13.ebuild
deleted file mode 100644
index a9dc77f4ea62..000000000000
--- a/dev-erlang/fast_tls/fast_tls-1.1.13.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rebar
-
-DESCRIPTION="TLS/SSL native driver for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/fast_tls"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE=""
-
-DEPEND=">=dev-erlang/p1_utils-1.0.23
-	dev-libs/openssl:0="
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/jiffy/Manifest b/dev-erlang/jiffy/Manifest
index 2a5e38018cc7..5b9480f2d1e9 100644
--- a/dev-erlang/jiffy/Manifest
+++ b/dev-erlang/jiffy/Manifest
@@ -1,3 +1 @@
-DIST jiffy-1.0.5.tar.gz 1896318 BLAKE2B 2ec82545b80d7cfae70a71a5bcb70be1f8c905bc2ab2ec5132d793cdb8050a7bf463eae99771afe9d80fc7911fc0e635c29d2bc236275ac1f564f99685b3fd1d SHA512 607dded2ccb5f27d6608e19a03fece847fc7bf5c7a1d92a7fafa95efcea157612c73807fd6d624445fa68f895ea4456bd851656b952d5e48b58b6fedf606a830
-DIST jiffy-1.0.8.tar.gz 1896454 BLAKE2B 2c47c7a4350ff5e8674b365a8b65d242896165aee6386a2200a51009b686f86eccda6f4e5b48b1c7d3b5b0f2cfafd1aedf723a64f57c5d2988710fcbf56901a1 SHA512 d248d4e41d780a8f676c4fa7eee6fbdc6f9a5a2867c558cb1ce6f1600093b242fad48d86221a37bfdb7bba0142635f577a4ac3e98106558f5a0ca817dd9a0574
 DIST jiffy-1.1.1.tar.gz 1674571 BLAKE2B 62242b23dd826a30cf1c38b2382dc9191f2355ef16305ea1199cb32b811e61153c0627dcb8d564c69f0c38ab8c22b5f3e918bff1aa168eb294c445bd95057ded SHA512 cfa36d77285e53ccce852640a4c780f2c29ad33c7352e3a5b69fec431d6684bac4bf5ac323379a8bb1d1289afa23b6f73d4d5ecf1b025791fd84198d4c066910
diff --git a/dev-erlang/jiffy/jiffy-1.0.5.ebuild b/dev-erlang/jiffy/jiffy-1.0.5.ebuild
deleted file mode 100644
index cf4a6e71e6c5..000000000000
--- a/dev-erlang/jiffy/jiffy-1.0.5.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="JSON NIFs for Erlang"
-HOMEPAGE="https://github.com/davisp/jiffy"
-SRC_URI="https://github.com/davisp/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/jiffy/jiffy-1.0.8.ebuild b/dev-erlang/jiffy/jiffy-1.0.8.ebuild
deleted file mode 100644
index 7003a8f4d816..000000000000
--- a/dev-erlang/jiffy/jiffy-1.0.8.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit rebar
-
-DESCRIPTION="JSON NIFs for Erlang"
-HOMEPAGE="https://github.com/davisp/jiffy"
-SRC_URI="https://github.com/davisp/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/mqtree/Manifest b/dev-erlang/mqtree/Manifest
index ee5a643cbd7d..b0d868c58758 100644
--- a/dev-erlang/mqtree/Manifest
+++ b/dev-erlang/mqtree/Manifest
@@ -1,2 +1 @@
-DIST mqtree-1.0.14.tar.gz 265443 BLAKE2B 01620b5479fae7cde5a05be09a59a91f00209442ccbe472bd9302a06cac9dd2be0c31a762f615a2c8f2375719a4a7869cb90ffdffd97231942d2c60d8816a527 SHA512 5783496ee81b36588b32d1aab20b6e8eeeae687db2ecdd7b61e16d770edf7013fb4ea6f0ea0279ddd8d706baab7526c7dfb7aeaff8e346025bbf2c781781e0e0
 DIST mqtree-1.0.15.tar.gz 265445 BLAKE2B 44b887d3aa7d3ddb93cc42ee11f6612e399f880ab74a005cdae2c1de81ac035976d35f117052d55a1827c5074b494ef1f80d01742868cc7f10a8c94896cefd69 SHA512 e50066c39bb7feb4bea6a0fcff65ec4e73fca3aeeafa85be10ef7fe354e582a037369dc27163e47796f021e8cb70c40c396e5edce0ebf8255d4e452c4df0d4da
diff --git a/dev-erlang/mqtree/mqtree-1.0.14.ebuild b/dev-erlang/mqtree/mqtree-1.0.14.ebuild
deleted file mode 100644
index caced946bd6a..000000000000
--- a/dev-erlang/mqtree/mqtree-1.0.14.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rebar
-
-DESCRIPTION="Index tree for MQTT topic filters"
-HOMEPAGE="https://github.com/processone/mqtree"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.5
-	>=dev-erlang/p1_utils-1.0.23"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md )
diff --git a/dev-erlang/p1_acme/Manifest b/dev-erlang/p1_acme/Manifest
index 74957ee1e410..d83530c8eb81 100644
--- a/dev-erlang/p1_acme/Manifest
+++ b/dev-erlang/p1_acme/Manifest
@@ -1,2 +1 @@
-DIST p1_acme-1.0.16.tar.gz 222562 BLAKE2B a018a05cad971aad1256194f5e4a49911deb9771a93ab0db8390ac1b07b1b008759d2fe978f74538ef4f6f549cf624d96b53e3fa5edbc4b6af629ca024df999f SHA512 f73506ffb2807582d7daadb833b109a3a5b69e4ea861bf0f45b6c66a911bd1e90d9621e49dc565fad965d8325bd987850151d559bd7f81e17b5cbde906b50f4b
 DIST p1_acme-1.0.19.tar.gz 223303 BLAKE2B 48027739d46582c7acc72ea22fe08376dd67295b2f9161782abbb786a421fb976a2447e86cdcbfd30663fb02ac5fec58dc1285096e57c474d93dbc4e9624aa87 SHA512 d0896ca53fd48798f0e3f502a09e9df6ea88e4248968b5273b1a6e0f6735c39d680de251e0f2c49d04271018a5664252771be1746cf9d18ddd9d42e2ddf90b24
diff --git a/dev-erlang/p1_acme/p1_acme-1.0.16.ebuild b/dev-erlang/p1_acme/p1_acme-1.0.16.ebuild
deleted file mode 100644
index f82656eedde5..000000000000
--- a/dev-erlang/p1_acme/p1_acme-1.0.16.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rebar
-
-DESCRIPTION="ACME client library for Erlang"
-HOMEPAGE="https://github.com/processone/p1_acme"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1
-	>=dev-erlang/jiffy-1.0.5
-	>=dev-erlang/yconf-1.0.12
-	>=dev-erlang/idna-6.0.0-r1
-	>=dev-erlang/jose-1.11.1
-	>=dev-erlang/base64url-1.0.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
-	rebar_src_prepare
-	# otherwise it wants to fetch base64url from git
-	sed -ri 's/\+\+ \[\{base64url.*//' rebar.config.script || die
-}
diff --git a/dev-erlang/p1_oauth2/Manifest b/dev-erlang/p1_oauth2/Manifest
index 68b00acde1b7..6bb5b7ea8e3d 100644
--- a/dev-erlang/p1_oauth2/Manifest
+++ b/dev-erlang/p1_oauth2/Manifest
@@ -1,2 +1 @@
-DIST p1_oauth2-0.6.10.tar.gz 214205 BLAKE2B 228a616473ff9c6d7ecd5f7aedad3a971fca2b811938382160c9fe24dc949b52c7c1b023343833cc218dc3269ae742a5617ecf6f831fb93616a200e6169eaecc SHA512 a32fdd8e9c85b1b5729f2dadc3f2f6c84479048d94fc41dbf241baac41c3ccd47b12b9e24dabbaf832ac9182f47673db068c55f92d1e750dba42309c0f8d0c25
 DIST p1_oauth2-0.6.11.tar.gz 214437 BLAKE2B fadea0a18bb526fc97d19ea6e85c3bb47431ae15d19a139c99cb8c05249398509a84c8ceff12efcda7917f0f4ef9b45c932839e7dfc1804bca8646516b149fe2 SHA512 c97fe256ba3d0c3c18d0ad14dd85f28bed7607b0aa8d56a23e1c87694a10669eb1cd6e0abafff7e366974b2160ef5eb8e65dadc60a85963e3aa4334252db8b6e
diff --git a/dev-erlang/p1_oauth2/p1_oauth2-0.6.10.ebuild b/dev-erlang/p1_oauth2/p1_oauth2-0.6.10.ebuild
deleted file mode 100644
index 0b9a69a778f9..000000000000
--- a/dev-erlang/p1_oauth2/p1_oauth2-0.6.10.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rebar
-
-DESCRIPTION="Erlang OAuth 2.0 implementation"
-HOMEPAGE="https://github.com/processone/p1_oauth2"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-CDEPEND=">=dev-lang/erlang-17.1"
-DEPEND="${CDEPEND}
-	test? (
-		>=dev-erlang/meck-0.8.7
-		>=dev-erlang/proper-1.3
-	)"
-RDEPEND="${CDEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
-	rebar_src_prepare
-}
diff --git a/dev-erlang/p1_pgsql/Manifest b/dev-erlang/p1_pgsql/Manifest
index c57e2991c5ee..081f0c9f373a 100644
--- a/dev-erlang/p1_pgsql/Manifest
+++ b/dev-erlang/p1_pgsql/Manifest
@@ -1,2 +1 @@
-DIST p1_pgsql-1.1.16.tar.gz 27160 BLAKE2B 97386712b8aa0a88862bf2dfde59673af437d1ca7ea4bbdbba55a9c6743d816f2120c6801f60ea55c80d39600218e1130b2ea9d751f8a05c1202d6aadeda7bb5 SHA512 faa947855346a802e246e9374059985134bc921c950837c1d615828e3d95923b424e0576a94e42eac965967bf2c9be455d526744c83417f63734b1b0dcc72fd5
 DIST p1_pgsql-1.1.18.tar.gz 27186 BLAKE2B 114e407630f61d4f9b7aed116f5b7f604c2ea2c18a963c6d74ddb65001f7f98556b5bb7f208afbb604b217c145ce3361e242034e6b382fcea9d86f2c44aa8eb0 SHA512 b075475a8729ca4d24d8cf05dc82b17a5c1e05c38d22586fe490c39194640e36145b0732126bb023881d6b258411a87046ab81a25fd85a1d3505d28da0d50122
diff --git a/dev-erlang/p1_pgsql/p1_pgsql-1.1.16.ebuild b/dev-erlang/p1_pgsql/p1_pgsql-1.1.16.ebuild
deleted file mode 100644
index de5650c9d1cd..000000000000
--- a/dev-erlang/p1_pgsql/p1_pgsql-1.1.16.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rebar
-
-DESCRIPTION="Pure Erlang PostgreSQL driver"
-HOMEPAGE="https://github.com/processone/p1_pgsql"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="ErlPL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/p1_utils/Manifest b/dev-erlang/p1_utils/Manifest
index 6652905499dd..6715ecf87260 100644
--- a/dev-erlang/p1_utils/Manifest
+++ b/dev-erlang/p1_utils/Manifest
@@ -1,2 +1 @@
-DIST p1_utils-1.0.23.tar.gz 65338 BLAKE2B 97d2c750b3435c53dfd7cfa61a73f9e7af13aff36fa546bf7b2acee88450e61eb3065c7357701bd652e9aa1d9732dbe033f25b91932b8bbd93381c620189314d SHA512 9fb385641852d100c21e25cb21978436bfac55f17b24c31b983e27c7877274c6a27e9d8084e791633a9d1f4e1bf0b8075307e95384b9698106043a2aac70d62c
 DIST p1_utils-1.0.25.tar.gz 47802 BLAKE2B 6d3b61257eed3b07312a58f3dc966be27f1c8ecec41a78755fa010427dbbe403b82317b991e0759e3286b710161231464e24b407ffa545d7b2ce1d948de154d7 SHA512 e96bcd309dfaf3f80de573b7ad1b7281ee0cb97b0b91f92a5a9c5b5ccc969dce4d6b1adbaef9ff33bf9deb0da8e6b1738fbe3f69235b51a0069e0fda72a16d74
diff --git a/dev-erlang/p1_utils/p1_utils-1.0.23.ebuild b/dev-erlang/p1_utils/p1_utils-1.0.23.ebuild
deleted file mode 100644
index 7f088e660c51..000000000000
--- a/dev-erlang/p1_utils/p1_utils-1.0.23.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rebar
-
-DESCRIPTION="Erlang utility modules from ProcessOne"
-HOMEPAGE="https://github.com/processone/p1_utils"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1:="
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/pkix/Manifest b/dev-erlang/pkix/Manifest
index b360b15a2a1d..1e88c831de32 100644
--- a/dev-erlang/pkix/Manifest
+++ b/dev-erlang/pkix/Manifest
@@ -1,2 +1 @@
-DIST pkix-1.0.8.tar.gz 413346 BLAKE2B 0c159bfc2b40d50739dbdfad1b0c73150e8cea2ebd4e99bc7e5f91edae0982ea0da3c9a34a7f5c04f2d527e599bc4e8e6250be2e0bdd98ea41c0663724e16f66 SHA512 c665aac5c19b38c23510dc1dbd7dff9b1469d39db3df6086290f45b781a40eeb9a060beb236613cbd0ff1e48d27f86d63a1bc02faf51a33b61c8bc5cc1ec98cc
 DIST pkix-1.0.9.tar.gz 406218 BLAKE2B 0c1cbf73206cc8b17f11cb1cb4994ea05c7d6a8cc07d84599b4eb8c1fe68d161eb0c970ad14d23e6183ce65d608d26e21ad860b9026c8a3b7846b2bd7158821a SHA512 bd428814421effdc74c418a376b44716f4f79095550dd1b8431bfb51e8d26262015be0dda7948a9b8f9fc60a0cd0d12289161c8b497134f6413fd1e1efb886ba
diff --git a/dev-erlang/pkix/pkix-1.0.8.ebuild b/dev-erlang/pkix/pkix-1.0.8.ebuild
deleted file mode 100644
index 48437553fd02..000000000000
--- a/dev-erlang/pkix/pkix-1.0.8.ebuild
+++ /dev/null
@@ -1,17 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rebar
-
-DESCRIPTION="PKIX certificates management library for Erlang"
-HOMEPAGE="https://github.com/processone/pkix"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DOCS=( README.md )
diff --git a/dev-erlang/stringprep/Manifest b/dev-erlang/stringprep/Manifest
index 4dd68354ef9f..f60dcf564d69 100644
--- a/dev-erlang/stringprep/Manifest
+++ b/dev-erlang/stringprep/Manifest
@@ -1,2 +1 @@
-DIST stringprep-1.0.27.tar.gz 100037 BLAKE2B 2b54968e0f4c808e28fa22032281fbc93b0b6f2547b87f295b2cd066cfba204dff7fd82040800de2a933b5a9f109206350bfbe276f8ce6d6c110baca6e691e8b SHA512 3bb44c9880eb27ec9d8bcbaac64a0fe74ddcaaad99192c4cd4590ff003e908e00deafe9d463211c25e6cd8c6155fd658613507cc787c0f6376ee0596448f0074
 DIST stringprep-1.0.28.tar.gz 100057 BLAKE2B f9bb2b326bfe8f59771929dc087f019445edcfaf455f530b390ab79ab98df76d2d154329e70eee584ce6851c54cafb1a92c15a1ebf7af3210e5285518f239744 SHA512 1bedef40b38494ff42f551fedb83e47a2938eb29871b8649a76521035f16a7a2575d6524e12dfdfc45379c3cbe50af2988daa9ae9ab82632156514c86e06df7e
diff --git a/dev-erlang/stringprep/stringprep-1.0.27.ebuild b/dev-erlang/stringprep/stringprep-1.0.27.ebuild
deleted file mode 100644
index d0aca4f6af0b..000000000000
--- a/dev-erlang/stringprep/stringprep-1.0.27.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rebar
-
-DESCRIPTION="Fast Stringprep implementation for Erlang and Elixir"
-HOMEPAGE="https://github.com/processone/stringprep"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 tcltk"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1
-	>=dev-erlang/p1_utils-1.0.23"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-erlang/xmpp/Manifest b/dev-erlang/xmpp/Manifest
index 287b9f376026..fc1d718c862a 100644
--- a/dev-erlang/xmpp/Manifest
+++ b/dev-erlang/xmpp/Manifest
@@ -1,2 +1 @@
-DIST xmpp-1.5.6.tar.gz 557828 BLAKE2B c838273125d376d7dd459e98851f60bb88485cec95d0ecbcf05d2e1cc81527d199e7cbc84c7130dfc414d47c8dde7a5c46d69f68840efb46a54c60b919f58f5a SHA512 b02226eb0908a69f3930d6336ac9179750688047fb216dd152eaf3bf2ab6345d41b8a1ba4daf4679bf4816a106e89689ea14e19675e18c6effb9390c2b9b399f
 DIST xmpp-1.5.8.tar.gz 557974 BLAKE2B 63a0a0481ab5f527417aed68e798f46f0562b0e882bb3c91d6dde43b4190901dec49fb0838db3466928a2db9088a1f09b87f8a1a56f4de98682fe304f8fa891e SHA512 0ef76dd65741072276ef3590e4c82456c832dda530f857a30072acc6444532865b716c82e60e972320ddab191ac1fb0a72be2bc71b01a72e16892015381086e3
diff --git a/dev-erlang/xmpp/xmpp-1.5.6.ebuild b/dev-erlang/xmpp/xmpp-1.5.6.ebuild
deleted file mode 100644
index ca1616e45c94..000000000000
--- a/dev-erlang/xmpp/xmpp-1.5.6.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rebar
-
-DESCRIPTION="XMPP parsing and serialization library on top of Fast XML"
-HOMEPAGE="https://github.com/processone/xmpp"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-RDEPEND=">=dev-erlang/ezlib-1.0.10
-	>=dev-erlang/fast_tls-1.1.12
-	>=dev-erlang/fast_xml-1.1.48
-	>=dev-erlang/p1_utils-1.0.23
-	>=dev-erlang/stringprep-1.0.27
-	>=dev-erlang/idna-6.0.0-r1"
-DEPEND="${RDEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
-
-src_prepare() {
-	rebar_src_prepare
-	rebar_fix_include_path fast_xml
-}
diff --git a/dev-erlang/yconf/Manifest b/dev-erlang/yconf/Manifest
index 2bf2e1ddc90a..423d4108664b 100644
--- a/dev-erlang/yconf/Manifest
+++ b/dev-erlang/yconf/Manifest
@@ -1,2 +1 @@
-DIST yconf-1.0.12.tar.gz 223962 BLAKE2B cc77c76a098715e5af3169846e4f82e36e21ed2af4be9bc3912e4f5f778071b1272a937d795032a836925de52271d73e1ca383c3fbf45a23b6d3ed37eb94266f SHA512 2ed4723f5aea39eab9816164395bb31c601e0974f733474af4ca92f72e305f1885b8a3a0bf7949a8a2de1a03845cf65c4443b36ac1d86aa15ec3cf2d7971cd4f
 DIST yconf-1.0.13.tar.gz 223970 BLAKE2B 877094613a89afa3c819b8b8254b83091b3ff302534366ef9e0b321e1b65eb8cb52e03a7074f4836359bb8af566caf6f23ba2b04bfd7fc3a22fc27415b752778 SHA512 1e5df69421a82e8c442e17ed74738a4717e84521570f48a885de3e4fda2cbbc6d7567736d87255050d21e85edf976532ba6659b8a51d3150d1ac5e2c19d89a61
diff --git a/dev-erlang/yconf/yconf-1.0.12.ebuild b/dev-erlang/yconf/yconf-1.0.12.ebuild
deleted file mode 100644
index 1045c13aac4c..000000000000
--- a/dev-erlang/yconf/yconf-1.0.12.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit rebar
-
-DESCRIPTION="YAML configuration processor"
-HOMEPAGE="https://github.com/processone/yconf"
-SRC_URI="https://github.com/processone/${PN}/archive/${PV}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~ppc ~sparc ~x86"
-
-DEPEND=">=dev-lang/erlang-17.1
-	>=dev-erlang/fast_yaml-1.0.32"
-RDEPEND="${DEPEND}"
-
-DOCS=( CHANGELOG.md README.md )
diff --git a/dev-games/Manifest.gz b/dev-games/Manifest.gz
index 363d15d84f42..59f61ed790f9 100644
Binary files a/dev-games/Manifest.gz and b/dev-games/Manifest.gz differ
diff --git a/dev-games/irrlicht-mt-headers/Manifest b/dev-games/irrlicht-mt-headers/Manifest
index e87a0a6b3795..33fa0a497605 100644
--- a/dev-games/irrlicht-mt-headers/Manifest
+++ b/dev-games/irrlicht-mt-headers/Manifest
@@ -1,2 +1,2 @@
-DIST irrlicht-mt-1.9.0.5.tar.gz 1008163 BLAKE2B 54e021767169180590f710addd475b730957a812f33d50d090503c6590c24086ba122541f7154880c0635820dedcd39a00851148f6000f56eb801a5e7893064a SHA512 53a6f7d72b9fc877683e4df4a434180759e946b1d4e375210dc8656e7aa244f675d7795c75f574bc17c5806ba47b9081ee97e94fe28f1dd08dfc34ce3f0005ad
 DIST irrlicht-mt-1.9.0.7.tar.gz 909510 BLAKE2B 15552612e6cd01d35e48a02e7faa6db521bee2472c68c3a0a0696ae8578cd9cf272d30b953ed4e64a4e233638b6e99a77da301c4cbd9d6c65c634d9a7fdf274b SHA512 5b533efde6bca5ff2a6041d88fcf405c3452c0ccc52ca2d5e03072b0b31c16830cf5fe2af06573c71b29022b590f3082fc8997537c73a7e1981911083e7bf855
+DIST irrlicht-mt-1.9.0.8.tar.gz 909733 BLAKE2B 6c85377b5e426a9f4ba06ea60fb0414fb9598c3b66d01d80da8461d53b16bc1c74ea5f949d0419d01f2d4dccabff20410840dc9380cac3cf5b656b2e073a4636 SHA512 3a5cbcd8d13730e08f24a72b4ceb2a6d3ba1cfa4292475915da6413ab8084d0b7f0b5dc34edc152d5bf516730faf43d983433619b0a1fb15540adb5cab00ca10
diff --git a/dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.5.ebuild b/dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.8.ebuild
similarity index 100%
rename from dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.5.ebuild
rename to dev-games/irrlicht-mt-headers/irrlicht-mt-headers-1.9.0.8.ebuild
diff --git a/dev-games/irrlicht-mt/Manifest b/dev-games/irrlicht-mt/Manifest
index e87a0a6b3795..33fa0a497605 100644
--- a/dev-games/irrlicht-mt/Manifest
+++ b/dev-games/irrlicht-mt/Manifest
@@ -1,2 +1,2 @@
-DIST irrlicht-mt-1.9.0.5.tar.gz 1008163 BLAKE2B 54e021767169180590f710addd475b730957a812f33d50d090503c6590c24086ba122541f7154880c0635820dedcd39a00851148f6000f56eb801a5e7893064a SHA512 53a6f7d72b9fc877683e4df4a434180759e946b1d4e375210dc8656e7aa244f675d7795c75f574bc17c5806ba47b9081ee97e94fe28f1dd08dfc34ce3f0005ad
 DIST irrlicht-mt-1.9.0.7.tar.gz 909510 BLAKE2B 15552612e6cd01d35e48a02e7faa6db521bee2472c68c3a0a0696ae8578cd9cf272d30b953ed4e64a4e233638b6e99a77da301c4cbd9d6c65c634d9a7fdf274b SHA512 5b533efde6bca5ff2a6041d88fcf405c3452c0ccc52ca2d5e03072b0b31c16830cf5fe2af06573c71b29022b590f3082fc8997537c73a7e1981911083e7bf855
+DIST irrlicht-mt-1.9.0.8.tar.gz 909733 BLAKE2B 6c85377b5e426a9f4ba06ea60fb0414fb9598c3b66d01d80da8461d53b16bc1c74ea5f949d0419d01f2d4dccabff20410840dc9380cac3cf5b656b2e073a4636 SHA512 3a5cbcd8d13730e08f24a72b4ceb2a6d3ba1cfa4292475915da6413ab8084d0b7f0b5dc34edc152d5bf516730faf43d983433619b0a1fb15540adb5cab00ca10
diff --git a/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.5.ebuild b/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.8.ebuild
similarity index 98%
rename from dev-games/irrlicht-mt/irrlicht-mt-1.9.0.5.ebuild
rename to dev-games/irrlicht-mt/irrlicht-mt-1.9.0.8.ebuild
index 003b1f915491..e5bc5eda8416 100644
--- a/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.5.ebuild
+++ b/dev-games/irrlicht-mt/irrlicht-mt-1.9.0.8.ebuild
@@ -23,6 +23,7 @@ RDEPEND="~dev-games/irrlicht-mt-headers-${PV}
 	media-libs/libjpeg-turbo
 	virtual/opengl
 	x11-libs/libX11
+	x11-libs/libXi
 	x11-libs/libXxf86vm"
 DEPEND="${RDEPEND}
 	x11-base/xorg-proto"
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 7f6956fc7822..790464cba765 100644
Binary files a/dev-java/Manifest.gz and b/dev-java/Manifest.gz differ
diff --git a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
index 2999e8c31357..1d6571243ef9 100644
--- a/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
+++ b/dev-java/commons-digester/commons-digester-2.1-r2.ebuild
@@ -14,7 +14,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Reads XML configuration files to provide initialization of various Java objects"
 HOMEPAGE="https://commons.apache.org/digester/"
-SRC_URI="mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz"
+SRC_URI="mirror://apache/commons/digester/source/${P}-src.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2.1"
diff --git a/dev-java/xerces/xerces-2.12.2.ebuild b/dev-java/xerces/xerces-2.12.2.ebuild
index 1a52c0d15261..74142d24ba0b 100644
--- a/dev-java/xerces/xerces-2.12.2.ebuild
+++ b/dev-java/xerces/xerces-2.12.2.ebuild
@@ -10,7 +10,7 @@ inherit java-pkg-2 java-pkg-simple
 
 DESCRIPTION="Xerces Java XML parser"
 HOMEPAGE="https://xerces.apache.org/xerces2-j/index.html"
-SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.2.12.2.tar.gz"
+SRC_URI="mirror://apache/xerces/j/source/Xerces-J-src.${PV}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="2"
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 3f5500d590f0..bdac475b2c99 100644
Binary files a/dev-lang/Manifest.gz and b/dev-lang/Manifest.gz differ
diff --git a/dev-lang/interprolog/interprolog-2.1.2.ebuild b/dev-lang/interprolog/interprolog-2.1.2.ebuild
index dc9d77efd441..5ad016be357f 100644
--- a/dev-lang/interprolog/interprolog-2.1.2.ebuild
+++ b/dev-lang/interprolog/interprolog-2.1.2.ebuild
@@ -9,7 +9,7 @@ MY_P="${PN}$(ver_rs 1- '')"
 
 DESCRIPTION="InterProlog is a Java front-end and enhancement for Prolog"
 HOMEPAGE="http://www.declarativa.com/interprolog/"
-SRC_URI="http://www.declarativa.com/interprolog/interprolog212.zip"
+SRC_URI="http://www.declarativa.com/interprolog/${MY_P}.zip"
 
 LICENSE="LGPL-2"
 SLOT="0"
diff --git a/dev-lang/rust-bin/Manifest b/dev-lang/rust-bin/Manifest
index 67a97873ca31..8f50e9cd4c63 100644
--- a/dev-lang/rust-bin/Manifest
+++ b/dev-lang/rust-bin/Manifest
@@ -194,9 +194,42 @@ DIST rust-1.63.0-x86_64-unknown-linux-gnu.tar.xz 155435832 BLAKE2B d5427a7380a21
 DIST rust-1.63.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 0b4465f1afbf2f5f9135cf722632ffd7df9ef4e92c65e9ef6d4aede5b1ff392973949a6737e88685033ee571dfefe9b099d477480d7aaec2a329926a87a6f5b2 SHA512 0c8d339204a23000cdebfaee7faaa576673bd8d98111ea187f5e19f03f7231f3bbec8158c5b04d8d903877f1addeebc9f4fdc6b1de0fc0ad2995742987eafb1c
 DIST rust-1.63.0-x86_64-unknown-linux-musl.tar.xz 254705824 BLAKE2B 8d35bbc3ffa53b52d7d7aacc51b90283d9703a40d5623c184a79195799aa3768a34942e235e2002a0b72d76110c0d66fb5ea403f9d0c81021ead52cea2a51e40 SHA512 995530319a14bd6674d5be145e777b7fd482953e62ecf672a29e2c5b4bf567e010d7db4d5c6acef1603d79135e74f21955d9fc13ed7e1c33279d05aae39bdfec
 DIST rust-1.63.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 2681d77ffb4c40305ff532f975a9e31ea72a50fa2a25661ecd721a50f081a4ab3a659b2a06500540dbf21357af098add2a4a4dec63f50d5b3ed4c041fe4b49dd SHA512 012b2cb560e0d2514eb288960e6a3703f9be9a7e611b915f07f1150645b8527fe653d3fbb795ad62c5e431cb4ca175a915710913eb2b9f2912c188d17baa0d14
+DIST rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz 245636524 BLAKE2B 90e405bc6e7f47aec091924bcd7a35017d591936b2697f2b0ddc5271e65fa431cc193a2b392489b6636896fa2d4f3d8f5096d197cfed36e812ea7f3986130c85 SHA512 c163b19a56148646ebbdb10b5b20459a206b4a1c45a2de9ce69f2e45dc5527cc69920f81007ee6fb75080782d534a2a39f7580d0c8cfdcf36ebed971b2513b63
+DIST rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 3ed79e6a5168676c19b9092692576b72b7bee6cc6fc6fc9213d492ac9641974e0bfefd9eee2663852580ee05038becb3045ff4410fe96aa8e529afc4d3652abb SHA512 14e635fbd60512e8d36c50c2c07d510236cc73661a6294f0a01fe260a945581885c60783e72cbcc0d85b87a161e0940b34b496380bbab659c6e5d0dbb4050a4d
+DIST rust-1.64.0-aarch64-unknown-linux-musl.tar.xz 226328036 BLAKE2B 43119c95866b3bd7e1b0832079f4fa23d79f5168e1aeb1d9a984897486cdaabbf035150e5633114c3d87afc8cf47e2d591e7c32961cc7cef99595fec303bc348 SHA512 8af3a7293b73d5f3129a17651cc8009290e5eade4802a872bb2a568444c60b4227a89d419c751fa394bf81a38f553a7418a0abd6ec3234737148d1561b91bace
+DIST rust-1.64.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 4807f2cef672af6be484e5a7368110ebc84d4bb7aa0f97819171c43b066fac041aa341bc5df696347ecdc7e5de37dc8c159ef7308c8a487c105b977edc794a7b SHA512 ec4c9eb3d9207970f19ca9d6b12bfc293786fed57e20a3a9fa25fc6b70a80a12752c6f57c095731edc1fde1c608a94f7d89e89219f8ecd89a13758df891cc0ee
+DIST rust-1.64.0-arm-unknown-linux-gnueabi.tar.xz 207018112 BLAKE2B 1f8d1bb48e5f529b84c99a6941aa0c3c6d49287492b9f63f8e9d5688bd530c67ce9ea2dcd8951a34c96d54d559f4e84cdb569397613bbedba892341fd90817d9 SHA512 07dfe4449359c89719f440da7986f35fdc1873270a8910a708a0f37daef10cf7d8dca7b6b4fb6d741bed490ba12d4e9b455aa1d13d9ae80f22e2b9c879beafac
+DIST rust-1.64.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B d0653612a7e9bd4cf27ae5f7f4152ee0f14fde8d5e20a7b738a6925e395083ac851500e2b65e0a40a5b883fa441f11ec7574a5e40b4964fb38f237bdf0b17349 SHA512 3314a83af0a0fd2dbd73531952002a47d89ef155cf68037b387c5c7afbe7dc69c68bf0fa429eb45a721ae9176a82a876de04091e8fc3929c3c4825ee214c6124
+DIST rust-1.64.0-arm-unknown-linux-gnueabihf.tar.xz 208017632 BLAKE2B fc10f068fb154021391c309f36d2d18bdfe09b3e17d9ac02e8f0c258d87959ce7b62dfab80ebbfc6d0c68fa6beeb25daa7b7b3a7ce763637121c7afdcb32699a SHA512 bac5fe98e68a782683a5df0d199e8ce67d9db9fbe9f590075b34e33c898198d372abd94eeef48330d1a7799fa1396add3b1ffc154281dd5bd276f4409e3b4027
+DIST rust-1.64.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B 210e7de45ab02fd2c83c1978104cedd28daa2499e475143660d5e3a6a4dd4897a866c6df22f929c61da08d2b61df489277fff73492a7e7a7749f2fe293de97df SHA512 221a0a70c03e049d2c6095575a2aabe1d32937123c86550b1f6f1b23734e996ff4bfc167b7e679809e3e383c25f15100772d8f75456e556d4ebd3aa73d789908
+DIST rust-1.64.0-armv7-unknown-linux-gnueabihf.tar.xz 212867232 BLAKE2B b3f9501c4cd68d9ca59d8a5c49cc512c0a97605eb74158c590db4ceabce5ff1aa99373c676d15676627c0631de8b58bfc4ca21463dd1109d6ec6451db909bea4 SHA512 3fc482ed9dd1648ccfd2fb459eb7c738ca26eab396b1a39b316cef10b8663e97b0ec008035936cf5e47f7cf9f8a0416cf09d638af174ffdf5b58b54b2ecb6975
+DIST rust-1.64.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B ba21487ad1a304be6cf2a12446ed674fb67e9d4b1b107ca675af236a45de6647bf96512a70a2e813466e85d388b51c674dc7435c185011ec9572bf28cbf513f6 SHA512 384f09eec47175b2cc40560a6b2ad4e792ab4b78e5c750231a312858882281ef33b40e797ccbb0a0bcb2ea3dfae4703b80941d936eb4cea229166375511b1514
+DIST rust-1.64.0-i686-unknown-linux-gnu.tar.xz 232295664 BLAKE2B 452a13cb499a29167a403b54d86c08fa84b4a10d51d7ef37954bc79f13d0ada0b3a256b32f804977d03b9e31331ef250e160b14f1c8fcdf93876001b9827957a SHA512 763966e449ce46e998f0ed9670d7e6cfae3a7147360c9cb85003cf382e1e01dabc1a448d35a102aafa96105fa65c284ec161b9bfa5061225de6d6acbf40ad480
+DIST rust-1.64.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b6055151a6442c5ae5968a380e3c5e9367307f91bc7304bcbd90d2a9434145682a70416125bb8dfecfcfce5449e6497591034adbfd4b5537601492757915c131 SHA512 1bb9b52aca4fc0f300e31d96e5fe5fbe0bec45a1ed848da66e1c83ef4fea20ebec86478ed94efd13dad3f8c6d52a330356d39a894387b87202e66400268fd4e0
+DIST rust-1.64.0-mips-unknown-linux-gnu.tar.xz 167831852 BLAKE2B 76e00291f2e2b18f2261677c1d6e322f8fef01da96514306b1fefc1a29e7e4fd0e5971614ad5c3a03a9a54321a01954d856b21df032205317c21b37470a6909c SHA512 29965d77a7fd6bcc74862d1c24a5f4843eb1870ece25691afdfa464c66617cb683cc73f8b991dee96d06e5e4791f6b71f7c81cf4f1d97539c3b9cbb15bf490da
+DIST rust-1.64.0-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 81f100c9a788c863b2f2388e7264b8e6b4ea062fd46d6c0e922561f491cf86227c46511ab538d8bc56a9b2d01d2ae19f105966ea00f2ea86592128e4c26b55ae SHA512 41e59d670efc9085c6e3ed59bb8808dc747eebfbd65ed976da04ff70095d91f15b43f8d257a09d2a6ee1cb07c5d1f49081529e0fc8234a26599a28ddaf167f4b
+DIST rust-1.64.0-mips64-unknown-linux-gnuabi64.tar.xz 172953460 BLAKE2B 68aa0d08ba233ebe95c1107574ce9165cc2afc0a43db044b6951055e30f22ed6070f9fe10f0482923f767e39fb99f887da59dcf679c3e9c16345f943b0c3012c SHA512 59250c13e980fc38b6da08faf7713c1c9ea2865793cfb0032a65a499bbfd4f7af94604bbdab4e0fd34a0be6b74db8cdcb8c3859e5c13d8a29d8c953d67a9bc84
+DIST rust-1.64.0-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B eb53e83dde3acdc3cfb84c7285a1373c4059c0c06e4cfe855339ce817a0a8cbea33da9fa0894a9640871003e8058482e46a31b04dd9ad1d8ae8e9ac1b3c72f7b SHA512 2e8438ca78bfd610c8c7b99a4aa2663cfddc611fa4495f490789d7838b80a8f90b9eb7f59171da187fdbc8a17b4ebc20eb69ccdaa75cca4966246e78dd41473d
+DIST rust-1.64.0-mipsel-unknown-linux-gnu.tar.xz 172189848 BLAKE2B aff9136ab374a3e39674c17b1ffa4fb8fe077301284b5dde927e0cf56e51edbb912b40d852aac4ad4d4e39f3ae20e68174dac338af6682735e8a031607652176 SHA512 9283e1e9eeff6c67c49e656709e1a6c6c52329aa913c6024af3aebd889b594f48f0c8172270c579a52d5980f7a42730a6184254b5c8002928f8f93c484dad211
+DIST rust-1.64.0-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 613ac8c773cc6585a99295e2770879cf7a9a56e1ac43256a1d8a56a12bd9b8aa08e49df96819805f4e98230d5c6d106eae837102c21f044e7e0b7756c453c529 SHA512 24d15870efaf03a916d69a358871a427869bc41ce164dcf8968564dc3f213603d0572f34b8ebbcd98d6653ff1e70664baf8c2dbdb32a0779f361338d4d3a0f43
+DIST rust-1.64.0-powerpc-unknown-linux-gnu.tar.xz 204541208 BLAKE2B 5bbd65d8aece3e32bca62d8a8b210cf155a786501c96e509462d0c45b15f19910794ff85ade0c42b575f41bd47f4f3250c011152b968ff1ad000ead6b7a200ad SHA512 13cc41679bf1bdb94d042de18696685087f3bfc84c0f99567b8c9dc6a5796c0f122499254ca8032eced8fa53623133a8b6652e14f398a9cea95ac3364a227f45
+DIST rust-1.64.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B f4ed9d8a006f787d67b7aa18361079724dad1378416fabf18d380a67a45db6475d7da8e5389a057fd117da6af6dc7d891f9e6567af09f91c538ba6459b4e12db SHA512 f616b0e5ef7e0689f33905864c8d48405e18b5ada73c3cb9a8f9a6d80173ee3abf10448403fe7790be902123d55295412ff7af77db4770f6c824439af39e0a20
+DIST rust-1.64.0-powerpc64-unknown-linux-gnu.tar.xz 210911224 BLAKE2B b8726c1036d8de07684a7ed439a7d8365722d1224644a76219df776fc6bb0c97200afbc92a6054cbe0e98127c239cde9c06ef56a73a92b9ff320c135f8c0ecaf SHA512 8ed6150a13dfa136e16e0cee775f8c9d2926569fa17b6b88fb4e9ce1c1a127c8fda828a944e18e2bf184a0ae39a61db478103ad96acb6139e7cb25b69efdffcd
+DIST rust-1.64.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B b8659a6b076db11acf124d73492fd21250df3924323616931cd8a8bfd5bb00ee1c48caf4e2448bd8e0120a3bf838cf73dcb810bfae8f87d487fb507b0ad132af SHA512 c24287ac0d49fda9fdc63421cc1901b8b55fee8b0701436a2d2c809ea03cec666b5a3c941a400bf73f4365576fc2a3bac85060013df76275dcc3dc32d376bbaa
+DIST rust-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz 224504724 BLAKE2B dfe47070e6f9c1812b0d980c98e21c71e3d34ca41d7c4c0995b559a02cf394ec6043500a34f245624588fccd83335c32a4c57bb092b3c079f705ab4d8f1547d9 SHA512 545b1076d7bb3d32775e1a7343cbe1c6feaf5042f7a4524841970846b64251b5bc7be080994f129868f183072fb793f32a8a0ab588ac9b484e25cfac636630b8
+DIST rust-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 757dfda571cca4c2028464701970e66fc0a644cf2eec71b52ad6e499b05b3f4af1a9d4515b7ae116b07d5231b8e81ecc0a9e07c9e6603a5babada41e860f6b83 SHA512 fb22306416bb6b3021e53eebb97cb5f34a64873124b0c25409115feba2c2955082456b47b383e4ddaf3ce440b64547d9eabe444b75a78014aa119f7299bec99d
+DIST rust-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz 191293592 BLAKE2B c32eb7b75b33b1eb53eab0b5823ade30c6dcffd8daddf04b7914a5f48ace80873573392659c5bd5a525cd954a9f078cdefba2873a3a1905f58cf9307360a4791 SHA512 b6e97215a5e8fa6f42cd609dd949f598f69779e8318f3c44e757f7c38fc67588db8169e0f263c7f121cdd3bd8c6cc225a32cc3aa80fcd7f718f9bee6f15cd94c
+DIST rust-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d922b1c72bd0fb7cfa0455f56d8c6ecee491a96e6bc54c0058ff01d8b152c2a87b4ade33f4445f345564fd1a2c9a54b81b52c1a37a32f1f91a78acc82a568567 SHA512 8860237891950bf1b9b958c950194b3617c5a865bdb1ea7834e84f74781b26959fb8a729d2043ee8cd63ee1144e307691b4adaf252d31c72f4e02ba60cea694e
+DIST rust-1.64.0-s390x-unknown-linux-gnu.tar.xz 225451932 BLAKE2B f7043af9d80b814e8b7988be8ddd2e14df361d08d89e96aed93a99b15719288aee064ed496008e486ee424cd8a9fa0edb78b34addd00646c1359d2bf504317ec SHA512 92702533159a4009be38314f03e26d36b45869709a0bc8f6394dddbd1ff61529f928071dadec36ba325cde589c5ac6b649ffc3c6db625473ed54e1686ada1723
+DIST rust-1.64.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 64c74bd0bb84f4c751dc1de20d12bfb9370cdf1db7957db07fa2f58ad692a10b8ee11a5c4bedc2f66f0291a91a1346d00de8e6f7ab57cd151003447aa8481dc9 SHA512 6301908c83618b61543c28026682901a342fb562b1cd1a2f78f8b0a388f06ea42b943bf822a67c2c4b1a2b4236250673a9d5bba95b85e182131a97395bffecbc
+DIST rust-1.64.0-x86_64-unknown-linux-gnu.tar.xz 161922032 BLAKE2B e8a0d13deab59b5f6e50aaf5a9fc39e032b759dadf4a7034f8824677de34940fab0e6e430299379f305f0849556608fc7db207db52bea6523ad83abda4e04624 SHA512 ab687e9142963c5f9d6d577022a0783eea9a3473ff6186950d2c6a15640bf7d3042857eaa1bffc1e472385893eded6e171d7f59dce988752830697398c766bd1
+DIST rust-1.64.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B d13ab08a8ce4b9a92c60ab5b8c21087158b66d9a673b7a960103757a2b12216cab8e7713cda08753a5f5f921aa9c7d571da77a90166d6e7362549a49d6c1a501 SHA512 fda5b45652c0929fea19146dd2c5a895ae4c6db9a1bf448a7364899854ffa06a8eb52b35bfe28c8acdfb1633cd8afe6c5eabd622b7887ed267b1b72220ef4e6f
+DIST rust-1.64.0-x86_64-unknown-linux-musl.tar.xz 265843112 BLAKE2B 2b267b5b9aae610734759a690e36600eeeedab7e0b679e651df269d7b71b147984c1d16cab4658076f05a8a854afc74d83e6e61dac3a8a6bf2b56660d3483285 SHA512 c722ddb6a7bfc5b8767e2a37e697f625b4e775582423720d1b01737ec3269c82e2212f7e5a672a062fa49c8c15c0d2d182ea14dd048cfd9e07704cbc04fd8ef0
+DIST rust-1.64.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 783791aca41910e8074fd1c7f29e6fc1fdf51f80b1515bac99431305dbe6085574b2b2366c087675b6a9d98931a0cff1117cd864f634fdb4dd53792aab8ce5f9 SHA512 a6d0a72e9edbbc1e6caef7a9c0ec46518b95172afa4a33b2258286458d7b9afe72f9de8411a83567520a126b8377777e125cc639bac197a0495f17120fbcc1ad
 DIST rust-src-1.59.0.tar.xz 2861676 BLAKE2B 83c7c9f222cdc5de787243154aec1b62914badbd65c8defd7c0e48dad9018806d7befb0e419204c5a782d83e386609071c11a6e445df80ab593917b58f7712e5 SHA512 006cb2b29e0db69f4f241a6b44b1491f840503d953919722da5924eba4fbc13d09f8f20d35614e4069bc745facecfb20ef771ddc95560c94b5745b66047c5a0e
 DIST rust-src-1.60.0.tar.xz 2898184 BLAKE2B 5810f14110398bc41342ec620a77da34c805b8c2bfb6c45c869c8d41a464b83825936a596f286c9c3f69a7453afd2542eb2971b768c923afdd24444a62359061 SHA512 42a45093bdcfe6ca5fde7701cd17e15438c8f064ac87c5606527b2196258a9285dbd195137ad41c43d77afade34e30061ad36ce58db783fa61037ec146f0e501
 DIST rust-src-1.61.0.tar.xz 2353184 BLAKE2B 6f5671173b89eddc4e1a36e58e5937b832ab6952c2601b16427c614c5e7bc7ab60b28d54f33e9c2578ce2d5b3db641097ddbf912ba0145c4f77a1d14115ed703 SHA512 8eb1462896cfd0c731de4f4be6fe68127bb4faa443c53289a34b92ff7778ee8711281cfe29b2c1367c0b3fdb9f6b7dba21dfbd40b968aebaaa51eb219357b4a3
 DIST rust-src-1.62.0.tar.xz 2380276 BLAKE2B a7425a18fa52157f4a594e4ba804034c7fa9e6fae33ccfa3c4c2125386cfadf0ea1673bd1c41f8d2f712b06ea45f8dd2ca748d45e009dfd06101a05228a27440 SHA512 4795c7d25c28ce875b418e836c004152d9094cd637ef808900dd1afd3f96dbc4435a6a4e042bdf9843271a2195b961f484a21299bc2f60f3f5f1cc3b676c39bf
 DIST rust-src-1.62.1.tar.xz 2381560 BLAKE2B 61bccb515428605ad9f1b4905e04b9e33034379038d8173a95aeb37cce0f3a38d8c5ffe47ddc515a772373f1d864c53421cee931569d8a31feed402095d35129 SHA512 bb566f5457ce949bf5b13a69892e0d4bef7e307d4e5840c1811a243bb35621c60a1d4eac558f3a0e4a76a7a90e4463bec1703758984965eaecb67cf245172b06
 DIST rust-src-1.63.0.tar.xz 2407504 BLAKE2B ddb866da32a56fe3ae4c4b918cb3272283572d59f57592f0af3a49fcd6f7783f2e2df14dd371bcb53998e62b74d39a207a3438afeefd8ab9f837273dc0f699c9 SHA512 9fcde63bbfe07bfdc938f7c5bfa7ab602bf46300b62adef7b8a40db11d3134bf3c354238a1969a98360fde64cd58b64f119f0f4b5329fa3a58a6af23d823032c
+DIST rust-src-1.64.0.tar.xz 2437612 BLAKE2B 9bd5cb64c4ac98ffe60f15bf62517f3ba214ec788d939a27135bca4b770a7a760299ffa43090846e9a83c734a6b2d97102e51f9760f655cb596bda91214012a0 SHA512 a1867ea7a36f669fcde149578dceb8bc7503435d9c740594cd6181e0ea0e4be9d3c8b79f755c0f457bdbc3200149cd94eba17922d00610c5ff6be5fe1f8bd862
diff --git a/dev-lang/rust-bin/metadata.xml b/dev-lang/rust-bin/metadata.xml
index ba87525c4c59..16b12d800039 100644
--- a/dev-lang/rust-bin/metadata.xml
+++ b/dev-lang/rust-bin/metadata.xml
@@ -9,6 +9,7 @@
 		<flag name="clippy">Install clippy, Rust code linter</flag>
 		<flag name="rls">Install rls, Rust Language Server (used with IDEs supporting RLS protocol)</flag>
 		<flag name="rustfmt">Install rustfmt, Rust code formatter</flag>
+		<flag name="rust-analyzer">Install rust-analyzer, A Rust compiler front-end for IDEs (like rls)</flag>
 		<flag name="rust-src">Install rust-src, needed by developer tools and for build-std (cross)</flag>
 	</use>
 </pkgmetadata>
diff --git a/dev-lang/rust-bin/rust-bin-1.63.0.ebuild b/dev-lang/rust-bin/rust-bin-1.63.0.ebuild
index af387d8c12d1..b265137db4d1 100644
--- a/dev-lang/rust-bin/rust-bin-1.63.0.ebuild
+++ b/dev-lang/rust-bin/rust-bin-1.63.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI+=" sparc? ( ${GENTOO_BIN_BASEURI}/${MY_P}-sparc64-unknown-linux-gnu.tar.
 
 LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
 SLOT="stable"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="clippy cpu_flags_x86_sse2 doc prefix rls rust-src rustfmt"
 
 DEPEND=""
diff --git a/dev-lang/rust-bin/rust-bin-1.64.0.ebuild b/dev-lang/rust-bin/rust-bin-1.64.0.ebuild
new file mode 100644
index 000000000000..9e2846e0a8ac
--- /dev/null
+++ b/dev-lang/rust-bin/rust-bin-1.64.0.ebuild
@@ -0,0 +1,226 @@
+# 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-09-22/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 ~ppc ~ppc64 ~riscv ~s390 ~x86"
+IUSE="clippy cpu_flags_x86_sse2 doc prefix rls 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 rls && components="${components},rls-preview,${analysis}"
+	use rustfmt && components="${components},rustfmt-preview"
+	# Rust component 'rust-src' is extracted from separate archive
+	if use rust-src; then
+		einfo "Combining rust and rust-src installers"
+		mv -v "${WORKDIR}/rust-src-${PV}/rust-src" "${S}" || die
+		echo rust-src >> ./components || die
+		components="${components},rust-src"
+	fi
+	./install.sh \
+		--components="${components}" \
+		--disable-verify \
+		--prefix="${ED}/opt/${P}" \
+		--mandir="${ED}/opt/${P}/man" \
+		--disable-ldconfig \
+		|| die
+
+	if use prefix; then
+		local interpreter=$(patchelf --print-interpreter ${EPREFIX}/bin/bash)
+		ebegin "Changing interpreter to ${interpreter} for Gentoo prefix at ${ED}/opt/${P}/bin"
+		find "${ED}/opt/${P}/bin" -type f -print0 | \
+			while IFS=  read -r -d '' filename; do
+				patchelf_for_bin ${filename} ${interpreter} \; || die
+			done
+		eend $?
+	fi
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use rls && symlinks+=( rls )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+	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}"
+		dosym "../../opt/${P}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "../../../opt/${P}/lib" "/usr/lib/rust/lib-bin-${PV}"
+	dosym "../../../opt/${P}/man" "/usr/lib/rust/man-bin-${PV}"
+	dosym "../../opt/${P}/lib/rustlib" "/usr/lib/rustlib-bin-${PV}"
+	dosym "../../../opt/${P}/share/doc/rust" "/usr/share/doc/${P}"
+
+	# musl logic can be improved a bit, but fine as is for now
+	cat <<-_EOF_ > "${T}/50${P}"
+	LDPATH="${EPREFIX}/usr/lib/rust/lib"
+	MANPATH="${EPREFIX}/usr/lib/rust/man"
+	$(use amd64 && usex elibc_musl 'CARGO_TARGET_X86_64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+	$(use arm64 && usex elibc_musl 'CARGO_TARGET_AARCH64_UNKNOWN_LINUX_MUSL_RUSTFLAGS="-C target-feature=-crt-static"' '')
+	_EOF_
+	doenvd "${T}/50${P}"
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${P}"
+	/usr/bin/cargo
+	/usr/bin/rustdoc
+	/usr/bin/rust-gdb
+	/usr/bin/rust-gdbgui
+	/usr/bin/rust-lldb
+	/usr/lib/rustlib
+	/usr/lib/rust/lib
+	/usr/lib/rust/man
+	/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use rls; then
+		echo /usr/bin/rls >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+	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/Manifest b/dev-lang/rust/Manifest
index c74098ee411a..2dab7c6a803c 100644
--- a/dev-lang/rust/Manifest
+++ b/dev-lang/rust/Manifest
@@ -158,6 +158,38 @@ DIST rust-1.62.0-x86_64-unknown-linux-gnu.tar.xz 153662720 BLAKE2B ff19ebb8a0607
 DIST rust-1.62.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B a1602b9cfbdf1b66c479f13b7171cb445068b5f18eae620435b25c3ab1e762e41977e31f02158d259acf16b0c8cdf895af16d6f68904939333b030f21b6c7a01 SHA512 2d79af9fca5a7e19448aeefd330fcc436c3ecb8e617662f144b12303ef2a214a3ae3ec4d9a42f68a4d0d6e343b81b495deddf3df23031aacfbead0c97b083174
 DIST rust-1.62.0-x86_64-unknown-linux-musl.tar.xz 254266584 BLAKE2B f566cdc94726532c50726ccf081eb2b825e52a56c74eb9d9e846f9933dafedef0a8a1b7c485938f96ae9945706192218cc318750738596923329bc23ef770ce1 SHA512 9cd01f0539db8cd344e9dd39fc5ffcd5b65c9c8c95ed692b9f7c23bc19c970c9f0056f8c8bb61813f1402143177a5b1c20bf844e64af8cf0be110e17e30aa4af
 DIST rust-1.62.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 46f38806b5a6b67953c607d4a3074a9177e14245e746771d876530c398ea98019e534a22a099c087ea2386124cc952f0a488e45f8175922b19b42441d6607938 SHA512 bc30af1e75cbfc8b488782af26d91ccee6e3b3220913af8d2ca3fc6beb5790bd81e3348f8da5c0c542bd13ab6c4cee77f50f4ba0d48e9600620034acc2dafe15
+DIST rust-1.63.0-aarch64-unknown-linux-gnu.tar.xz 230083616 BLAKE2B 2b66b809d53cc971c9cd44435c10c4bf0faa20dcc3782b47955d0fac252c370c670f0adb59f51b6842b46277d584c5fd44b94202e57aed078480f5cb6952d815 SHA512 c9f7b885008c58f7aac0edd5b6cd0295d768215e2b26cb1f590206248d468fa78409f42f48d505080ee14e2a59dd887cfc564db5a41e91ed36d738a90961f89e
+DIST rust-1.63.0-aarch64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B a323669f0587c9785c587ac0eac72915e421a61d2b5252c2dcc7f637176d5d425fc8cbcfa6ef848fd0d7acfa17cd430e4d42e8c03729c563dda59aa13e6d5c5b SHA512 be2e1eff9228576b66e0a0434e1edbb4525d0ef66743082afef1ef55565e312e63fed7274d01298128fda0c7ab63827d5aed90f50e184582781a4e10ee311de1
+DIST rust-1.63.0-aarch64-unknown-linux-musl.tar.xz 224541836 BLAKE2B b32b7886ddc5da3af0c6e394ecb167288897b2c44b0108e33aeabb3842ff563c769e635413b092a36246bbcf137d692e94c6ce66cccad34c7e728c4cf4af7bc2 SHA512 e462c8b94defc5ac5dfe923c3a6273c3d414cf576840d46a680a4f333bc34fea874c4ec4363c4e1891a6fe95087bf4a68bba7f316bfed9db6313be989afd7428
+DIST rust-1.63.0-aarch64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B ccac24e85deb6089468b763bce6cd54ec1c5ce506d10c8e84d3e8b0c9ee21946ac575a4aab5205c5a2d8328488641806a7dc1b15bd8cc48f3701630f223580f4 SHA512 9d41f34e507271e26e6ff7ce03d6a215a99971df77b246fa64b3518d70c2ec82142e96c4d0cf9641405065ec672f663316a93fe0e9183bd1e8f5af4de1ef41f1
+DIST rust-1.63.0-arm-unknown-linux-gnueabi.tar.xz 203850320 BLAKE2B 2a0f4e195d6e7ca66119b2bd45d58127b6aa305c77349c06d8ee109066ede59288ce067e222fca12f1414224a74ec9f33e7de1a18bf7b1e91e216e852e574a90 SHA512 d55ee6201bc4c3cd698396f08d4247b7578778b3c82da8ef496512e0f8cb1758009af6286230a1b26849b5f27101a242d7e04851ae41a41f7547589103f5c0ce
+DIST rust-1.63.0-arm-unknown-linux-gnueabi.tar.xz.asc 801 BLAKE2B 26bdf2e38262d3e4b23c72f86325dd1275c08b5ccccd99c82b91a05cf800e3e6a2500bdc6d89a3582311292f6ba1ddd65b8a081b608c83adcb39faa708f8376d SHA512 0f1213cf05bbbf659103c7178f20780fa3ef807cd03417edcb901d6560411c3f96bfeeb0dcf555460675573cfb9d402fa3882d787015ecfbf83765ae9fc35325
+DIST rust-1.63.0-arm-unknown-linux-gnueabihf.tar.xz 204273564 BLAKE2B 4a3730dc3d1cc08c8a0a687328e19e7a78265eb81cc1a3312cc547bd4823951c28ab57ac87919aab346994a6f96ce9803f7429c6b1831e4fdb3a7f7f086a2a87 SHA512 d53bc819c7ca2e5fc116fec5a731d280ac701f19fd9a8707ee5e69fdc41544d3dce17f8cd61f9ad0b59a89409c9859634e5d91444a0361add69c36c3f47a379d
+DIST rust-1.63.0-arm-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B e71f5d6f404a408774f6246fe72596c59255ba1f1b52c4ef6fdef08da63178fefa46966370a1f4e04b95a68b119f166e01d2d2d347f9e4517908e87146a56d83 SHA512 c70a350de8d378ed8dcec42d697143e4cce18dfd176b4fbcea25e7c608ff3db51642ab1be3b13d277d7eeec5a0262aaf9c38527f7f14c02fc64f760d6438efb2
+DIST rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.xz 209545116 BLAKE2B 2cb5610fc665f50505fa8b0d18b88cf79abca6a6b8503d46f76fc58b74e7d58e3b7aa1a790e7ba555b250d0f0bd48acd176ff1cf463eb7f37b34780b04b2c838 SHA512 e809ac29a9b24c82f7d950ebbad5d3c01dafba9554c55716a28e728b0218c6f8b3b7f1e31c277be3946da1a0e4228717d7a1a63db66716c19a79b2c5ac11fb92
+DIST rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.xz.asc 801 BLAKE2B c6f1e717a7cb746dfe3d9b109d77bdf7cd918c2d60491d83b2d7cebf412140b9cae257df850587c16a7b1c8faa16ef029f628c6c2c7e5b6f1d088e1a03c33899 SHA512 c832521179dd7b7cda0e979bfbfe491d3a255cb47f03fe113ac1290540fdc7134ea08a2815c9ec422919579fff3db995aa0e7f72249e2d00d4790a58f1142680
+DIST rust-1.63.0-i686-unknown-linux-gnu.tar.xz 224058112 BLAKE2B 6a83fa3bd0fe2a7f0cdbf8b8c7a6662235f9690177c9ed06af7be969b08959d2c58a8689247cd61a9d9ff765e6946f2bb12b9d278a0701d4764bdf8d141dd4cf SHA512 8441267b1fb1cec3c9a2e226f6f6c5d66cdf9fa2026df272374432c501aefb515b8d21266ddee5297f8570de72c55fa5bf485c5a9790ad7687e5ad1811c72cad
+DIST rust-1.63.0-i686-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 5c2e92bdf15c1dbfdb2715fd4b1874a270e21bedad1c84967c4bf92a2818935dfdfc48673e3b52d991ae9557378a62a5905e8f3005f1bf12f6eb93415cc47b1c SHA512 f42f5e65f76c72f7dd6bfdbc730b3c4da50d1444df2b1282334a6a3e6cb0af175536b037c6a5f1fc4000640756e57a3176315e288fe23ba56abe8a6f4c763525
+DIST rust-1.63.0-mips-unknown-linux-gnu.tar.xz 161238712 BLAKE2B a60f7b8a190fb90e123c18fafde9fbfa6e27bedc849175351ec9871ea705c2a54eae59b5597e71e20d2e63c73065717ccb56eea59ed46d12c13ae4fe8125ae5e SHA512 dc7ec2f92bdcd52af83c71b07df0f31187b8f195e9900ba0ffa3688175cdd22e81c34ef45b5e84c2cb9b47adf990de20a2c9296b46c17cc06176c19e956923cb
+DIST rust-1.63.0-mips-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 7803d7c07170d1a9af4e83add8f9b42caec19f5c8af4163dd541069f8b3f86087a09e4c3447c0faba19d1c2173c2411503856254b34d7c57320be250dd5b72ab SHA512 a9e80d1417353298656b99137a20478265458c95914c9d547bb57905ac9b654127fbf6e7a4292bfe74afd0aaae20730a126910383822d0c75b2da164bf60341e
+DIST rust-1.63.0-mips64-unknown-linux-gnuabi64.tar.xz 166872588 BLAKE2B 3a052d6f4196cbf55feb173e36c22cd3316abf6081d6a94dd6a7ab3a675f447471555b721e162ca15cbc485c4571b647a9257649a1d23b69b9a0ef262827b2d7 SHA512 db23d30021d6f8a5fbec50b6dac13264e3aac003ff0604185999318b47370b4476ce9e6034ab9ab5f4fba03b393898968b8c9a698f2b71bc1f58b452b030d1c4
+DIST rust-1.63.0-mips64-unknown-linux-gnuabi64.tar.xz.asc 801 BLAKE2B f30125c52883076251a22bb8a90fdd642167ebd0688ceb8e349555491824cffbc0873526b0269419fbc6421c5976aab18f5c3bbf35b997b4afc5d48b1e080c03 SHA512 d86940292aa891f7f0fc10d14b5ee386f8481448b6ed26bd8aabf21a7341c0916b08eae0e26bcd1dcc0fad1fbc0d216a767d8eba3dcc2ed47c4bb0aab107ab80
+DIST rust-1.63.0-mipsel-unknown-linux-gnu.tar.xz 165974484 BLAKE2B 4dcbcb3e6255c9266c4476e62aa9a6d31c4ba48b9a830789d9cf245002b4fec762f86fb6713507dfac8227a4e9da32347e5ce9d029d53220f8b3037e2dcf47c5 SHA512 2fb7e3bdc925abfc8efc4ee30f19bf6eb5d5afc803332059cf855eee7ba7c6a85c578701798fd1b9f9b07a4a7b091283406ca02c797fdafc9e437b0ea85de8be
+DIST rust-1.63.0-mipsel-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B c42a76a7902234490f33b520494d85c5000592cb781d97c9def132fce39f3e582cfbe6c868a7dc494ce550228ee0c4195500a17489323c22f9aecc74d4915135 SHA512 62fa9ace175d1359ae61229e6618972ff1db42b8e826113af247fccd67c4f49dd4ad4d93eefa3801a20a164332404f9fa5002c75ede2b81eb277e64d1a29396a
+DIST rust-1.63.0-powerpc-unknown-linux-gnu.tar.xz 184571616 BLAKE2B 452ee709ba25db4569e4ed20f88ea4a14c8b45c85803b065b5bc6e005473c02dc745ae531b8e0c7642dbe50880dd2f9d359520a3f0fc09628327613ed706dd38 SHA512 2dd3ab750044501e882442e54fc78fe73f36758458c6107df7afd55f8333c01a2e69bde181ca1bf3a1529a3a2bf616d4f69708081c494cc1781be5fd2a58df29
+DIST rust-1.63.0-powerpc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 13796a48f4ae628c2242ce4632ebdf4106899aa0713b469e4ad4457f0bad23638626bdf6de6a2f6d1d84b8408872c5a4cc97ae4fa0409458d8bec6eb43adf9a5 SHA512 813601cbe547add62345d4a9ed1a31e364310724c2bddf9f76404095b9fa1ab3c33f9480953d22136635afc8d6f7d4a9df2839f2e3d9d5f74a6594ae3d7f9537
+DIST rust-1.63.0-powerpc64-unknown-linux-gnu.tar.xz 192446060 BLAKE2B 28a6c8a94caab7d23d203e55ad1ad1b689f07ea9d4bdb0a618833b36378ea731ca85f906c8fe0de2727001471fef9b30b8f12a241d9cd257851b2b0a8a94f15b SHA512 42a39558352c1cbdf7c9e9fa1aecae160b43e1bf74ace0df844d95bd43743642be7107bbb60a574de7219da355cf64939509d4f028f32d555a90900e962df6e8
+DIST rust-1.63.0-powerpc64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B ed2a82a7a04f1d831480f7aa32ef8f0524424aec50ae8f75d2c186937b1c3e3bd953306dafa026a492b1792043ccace535f26b4911691d58b27d799585d2f024 SHA512 c740ad1bd86074b27c233167e2a66b20a9e79d2505e6e00b38a1f8053f136218dc21618968c4d709c8c2936311449187ce15d16d078832b7107303b56ba9c55e
+DIST rust-1.63.0-powerpc64le-unknown-linux-gnu.tar.xz 202613736 BLAKE2B eb0fcc0c0a615dc1d48591e9d34bdfcdac5adbe2b5953faa8e11b0147a09a56fac3161e2c0f5c4c0d399a3a9431effdc84b938f00469f262c24f06d1c0489a08 SHA512 9c9927b9c22d8561a9b45b237e64d3afc1725cace695fa6623db65731e9ec2cd56e105949d866f5feb62c6ec717852461ef0153fc9d028fbc5323ef231eba69e
+DIST rust-1.63.0-powerpc64le-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B efdb321cae9af3c3ff8854b52281211c80833f30785004c70df79bb73b094a21fd63687372dd1cb192a2547fcb7d8bbc7c4ae27851695aecce71e085bad34396 SHA512 c876eedce00ef013d2af89218a6ab5108d9ab5e3a60d7afc5afacd39e5a017ab99ef12a0ff954e8861c42a3ff9bc9030077bd9801f575620e015590a82ea0f25
+DIST rust-1.63.0-riscv64gc-unknown-linux-gnu.tar.xz 195670272 BLAKE2B 487ce5fd3dfa59914264953792d8f44433d88d9ca29bb647effda24e170a55470cca35fe653f6706f78e6b0c70265d0735585b17d7108bd62b71cd84e7f1312a SHA512 b6da4a3651b205f819e002157d196b014e4ad9923f854271dd6b306d8c69dc3d619b9a3e51c56ea2d2402566fac775d42719a67952c8f3e93933594aadc67831
+DIST rust-1.63.0-riscv64gc-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 822415e792104724494f29dee1a9730fc0328e00ee613c163d3cc8298fd3f85465d5c31d2c94b479271dde0721690c78056ec3828e14087a5c5b82c0dee0d4b8 SHA512 9b2d8239708baefb075470aeb37d5b62fb934d4074c745d89467d4f9efb91c10b7c999b726c4edef720b58e95e525cc72fa20d4cfbe6d0ba1352f5fca5d1e195
+DIST rust-1.63.0-s390x-unknown-linux-gnu.tar.xz 219060812 BLAKE2B 8087db6ae903fed440bddfe4a07fee35292b16fdb847155cf584dc1a7adbeb4a8f55bd17afeb015dba53c29a05bfbd3f5373b2e30018e4a56d400fdbd1cedc3f SHA512 11bed7ebd8bf977aa34ef9f9dabee8428baede670885b4f268335fe87b81e41b426e94ca60db218e82be2e6e73ec33123c77922bfee7ae9373bfd9227417214c
+DIST rust-1.63.0-s390x-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 3f656cd12927155b4debb68e821d9db3fa880ee49c557246c34390c44ab6e2c456d8b29b1c15c933de868d0884a83b2b419501af06d4244830d59032d5ce82a5 SHA512 521f95024624200c67d556c533d307468007c01a7de37cbd65d4af949275933cfee51334338838f5e4a9136a363b65bec47bcf399ebacff7f5558ae59c1d006c
+DIST rust-1.63.0-x86_64-unknown-linux-gnu.tar.xz 155435832 BLAKE2B d5427a7380a214a7b1ad2f075b162f6f49056a96a3a1153df794025d9a1456083dd3e7ab9eb3c71982982701cc1f8a93405640f8b622fde60819ee022413446f SHA512 9e538980b6a42d14b7ec08bd1a3ddecfea24e5d3068226edf212486bb5a20bfcac22f1f917a06536f6f26dcffedd65c7049870bc3d70b9c972075bcbe58eb8d9
+DIST rust-1.63.0-x86_64-unknown-linux-gnu.tar.xz.asc 801 BLAKE2B 0b4465f1afbf2f5f9135cf722632ffd7df9ef4e92c65e9ef6d4aede5b1ff392973949a6737e88685033ee571dfefe9b099d477480d7aaec2a329926a87a6f5b2 SHA512 0c8d339204a23000cdebfaee7faaa576673bd8d98111ea187f5e19f03f7231f3bbec8158c5b04d8d903877f1addeebc9f4fdc6b1de0fc0ad2995742987eafb1c
+DIST rust-1.63.0-x86_64-unknown-linux-musl.tar.xz 254705824 BLAKE2B 8d35bbc3ffa53b52d7d7aacc51b90283d9703a40d5623c184a79195799aa3768a34942e235e2002a0b72d76110c0d66fb5ea403f9d0c81021ead52cea2a51e40 SHA512 995530319a14bd6674d5be145e777b7fd482953e62ecf672a29e2c5b4bf567e010d7db4d5c6acef1603d79135e74f21955d9fc13ed7e1c33279d05aae39bdfec
+DIST rust-1.63.0-x86_64-unknown-linux-musl.tar.xz.asc 801 BLAKE2B 2681d77ffb4c40305ff532f975a9e31ea72a50fa2a25661ecd721a50f081a4ab3a659b2a06500540dbf21357af098add2a4a4dec63f50d5b3ed4c041fe4b49dd SHA512 012b2cb560e0d2514eb288960e6a3703f9be9a7e611b915f07f1150645b8527fe653d3fbb795ad62c5e431cb4ca175a915710913eb2b9f2912c188d17baa0d14
 DIST rustc-1.59.0-src.tar.xz 128942756 BLAKE2B b28114f14c9a0fec7db56fde79a985360fd8438c3b14eede49ed12e540c2636be960d0fd800c569af193886ac76fe8bf604d5dae59214ae08cb0cc6cc0ca404e SHA512 acace866871d13a55d365f65d7e15c192c3cd33096862571df6317e066b7474d668b95ae281e0244967778c05f1e33966c3c55616218bd25d3770a2b2d4f0365
 DIST rustc-1.59.0-src.tar.xz.asc 801 BLAKE2B 061701c4fdbde930798f9f938ca3642204ae4a2ad9396937ca7d604268813d6d68f4979f20d35abdbbfeec0bb389acd86c9d3d84256db85861f6b11e3dbef80e SHA512 1b90bc01f9d68ba1f70591c4ae707295d7727b790d170a0b757d654684e59d3c26c45b66a21f9ac762debb6867494660c73daaf10be9bd567a38be44c0009f72
 DIST rustc-1.60.0-src.tar.xz 136183048 BLAKE2B 8030f32c21f81af6abc7a282aab1189cb7d680c6bce58c119a1beaad71a3eeb36a696eef46a22d366e2c41a2f9182a9a5aa527426f2c8db05278184c37297dd0 SHA512 d0c113e8c2c67bf10773c9403dc4c4700c4deb2fb287bfec51e565d3473d2b481d8ae2c90b272cd67b3a87d7443ea25a34c7b40ba8cd7106bf5d71126ab141c3
@@ -170,3 +202,5 @@ DIST rustc-1.62.1-src.tar.xz 135644156 BLAKE2B ff8428362153770c57d53cb7eef07b759
 DIST rustc-1.62.1-src.tar.xz.asc 801 BLAKE2B dd0e917f8b587eb8318a9c820df5ee9a052f14e7dea05d8afcb3cf687fa2e362e6d2f4d20fa94a19bdf97227c9ef29548a6e267ffd9113bfdc36cc42f341d8b8 SHA512 698bfd419c218a6cccce04869279708cf6084adc464a64d7dd1c981c0577249cd06b4de132634085c792c838aa1e1beaa11a5a06ea0e5f4c1a6f4e28afe65a3c
 DIST rustc-1.63.0-src.tar.xz 136597192 BLAKE2B 52eb64ee11e7d9724a4c2654f7eea13521959ac5e04a4925eed5c89ec3661a7827146d6f9a9d05c98466bd4b74393af7bb18d9f418c785924f559833434dfe38 SHA512 0dd3cd1546bd9c1438afe0c4694e1ed80507f6b437674682c0474e13f83457e9ced4560ddeee58602e01837140f9e34a9e24c6828643dd6f613e07755af6997c
 DIST rustc-1.63.0-src.tar.xz.asc 801 BLAKE2B b6c133768e368a7aeb0a4612a4c824d13f91ccdca6660feb5774ed6d79537084020780532c882ae3c9e4b6be3d36ceb0652eb134a580293ba8d8be74c4ba3c6e SHA512 f8807d46b9a3ca2a15a60f8062d63b3ee6e3210657cc752c948b3c7aa1626ec63cbd57529d010ad33f07ac47cf70dbf2cb50f200587338f77c631fc9e6786b17
+DIST rustc-1.64.0-src.tar.xz 137841332 BLAKE2B 8acd9e0a4632ba2114018a5cd3f2d544324c601c246658f60a9e0be513c40375434d0a416f0bfd4d24493eae3fec7c9f5bb52d008c88cde14de503a3b6873dd1 SHA512 919f40acd8c6eaaef399aa3248503bea19feb96697ab221aaede9ee789ce340b47cb899d1e0e41a31e5d7756653968a10d2faaa4aee83294c9f1243949b43516
+DIST rustc-1.64.0-src.tar.xz.asc 801 BLAKE2B 69f7bd7600d99794859c6fad4b44f0e98868e4e16041d6fe81d9d09a8435c75abac67a735adb0b81a2d9f85651841d404bc1ef4cd64fccd75e8a25d6d95729d0 SHA512 a831e3941849add1082c5b47b619ea87405b875d6eeb90a35f42742a511d124c29503debd17dcc8c6aa9e03a754ab51c3a15e99192bdd0dd1b8a59af9b6eb0b8
diff --git a/dev-lang/rust/metadata.xml b/dev-lang/rust/metadata.xml
index 99bf9058f4f2..f64700dcc740 100644
--- a/dev-lang/rust/metadata.xml
+++ b/dev-lang/rust/metadata.xml
@@ -18,6 +18,7 @@
 		<flag name="profiler">Build the profiler runtime and rust-demangler tool (needed for '-C profile-generate' or '-C instrument-coverage' codegen opts)</flag>
 		<flag name="rls">Install rls, Rust Language Server (used with IDEs supporting RLS protocol)</flag>
 		<flag name="rustfmt">Install rustfmt, Rust code formatter</flag>
+		<flag name="rust-analyzer">Install rust-analyzer, A Rust compiler front-end for IDEs (like rls)</flag>
 		<flag name="rust-src">Install rust-src, needed by developer tools and for build-std (cross)</flag>
 		<flag name="system-bootstrap">Bootstrap using installed rust compiler</flag>
 		<flag name="system-llvm">Use the system LLVM installation</flag>
diff --git a/dev-lang/rust/rust-1.63.0-r1.ebuild b/dev-lang/rust/rust-1.63.0-r1.ebuild
index b5696d6d71ab..9397a6ae451c 100644
--- a/dev-lang/rust/rust-1.63.0-r1.ebuild
+++ b/dev-lang/rust/rust-1.63.0-r1.ebuild
@@ -19,7 +19,7 @@ else
 	SLOT="stable/${ABI_VER}"
 	MY_P="rustc-${PV}"
 	SRC="${MY_P}-src.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
diff --git a/dev-lang/rust/rust-1.64.0.ebuild b/dev-lang/rust/rust-1.64.0.ebuild
new file mode 100644
index 000000000000..1ff74e470d00
--- /dev/null
+++ b/dev-lang/rust/rust-1.64.0.ebuild
@@ -0,0 +1,775 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit bash-completion-r1 check-reqs estack flag-o-matic llvm multiprocessing \
+	multilib multilib-build python-any-r1 rust-toolchain toolchain-funcs verify-sig
+
+if [[ ${PV} = *beta* ]]; then
+	betaver=${PV//*beta}
+	BETA_SNAPSHOT="${betaver:0:4}-${betaver:4:2}-${betaver:6:2}"
+	MY_P="rustc-beta"
+	SLOT="beta/${PV}"
+	SRC="${BETA_SNAPSHOT}/rustc-beta-src.tar.xz -> rustc-${PV}-src.tar.xz"
+else
+	ABI_VER="$(ver_cut 1-2)"
+	SLOT="stable/${ABI_VER}"
+	MY_P="rustc-${PV}"
+	SRC="${MY_P}-src.tar.xz"
+#	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+RUST_STAGE0_VERSION="1.$(($(ver_cut 2) - 1)).0"
+
+DESCRIPTION="Systems programming language from Mozilla"
+HOMEPAGE="https://www.rust-lang.org/"
+
+SRC_URI="
+	https://static.rust-lang.org/dist/${SRC}
+	verify-sig? ( https://static.rust-lang.org/dist/${SRC}.asc )
+	!system-bootstrap? ( $(rust_all_arch_uris rust-${RUST_STAGE0_VERSION}) )
+"
+
+# keep in sync with llvm ebuild of the same version as bundled one.
+ALL_LLVM_TARGETS=( AArch64 AMDGPU ARM AVR BPF Hexagon Lanai Mips MSP430
+	NVPTX PowerPC RISCV Sparc SystemZ WebAssembly X86 XCore )
+ALL_LLVM_TARGETS=( "${ALL_LLVM_TARGETS[@]/#/llvm_targets_}" )
+LLVM_TARGET_USEDEPS=${ALL_LLVM_TARGETS[@]/%/(-)?}
+
+LICENSE="|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA"
+
+IUSE="clippy cpu_flags_x86_sse2 debug dist doc llvm-libunwind miri nightly parallel-compiler profiler rls rustfmt rust-analyzer rust-src system-bootstrap system-llvm test wasm ${ALL_LLVM_TARGETS[*]}"
+
+# Please keep the LLVM dependency block separate. Since LLVM is slotted,
+# we need to *really* make sure we're not pulling more than one slot
+# simultaneously.
+
+# How to use it:
+# List all the working slots in LLVM_VALID_SLOTS, newest first.
+LLVM_VALID_SLOTS=( 14 )
+LLVM_MAX_SLOT="${LLVM_VALID_SLOTS[0]}"
+
+# splitting usedeps needed to avoid CI/pkgcheck's UncheckableDep limitation
+# (-) usedep needed because we may build with older llvm without that target
+LLVM_DEPEND="|| ( "
+for _s in ${LLVM_VALID_SLOTS[@]}; do
+	LLVM_DEPEND+=" ( "
+	for _x in ${ALL_LLVM_TARGETS[@]}; do
+		LLVM_DEPEND+="
+			${_x}? ( sys-devel/llvm:${_s}[${_x}(-)] )"
+	done
+	LLVM_DEPEND+=" )"
+done
+unset _s _x
+LLVM_DEPEND+=" )
+	<sys-devel/llvm-$(( LLVM_MAX_SLOT + 1 )):=
+	wasm? ( sys-devel/lld )
+"
+
+# to bootstrap we need at least exactly previous version, or same.
+# most of the time previous versions fail to bootstrap with newer
+# for example 1.47.x, requires at least 1.46.x, 1.47.x is ok,
+# but it fails to bootstrap with 1.48.x
+# https://github.com/rust-lang/rust/blob/${PV}/src/stage0.txt
+RUST_DEP_PREV="$(ver_cut 1).$(($(ver_cut 2) - 1))*"
+RUST_DEP_CURR="$(ver_cut 1).$(ver_cut 2)*"
+BOOTSTRAP_DEPEND="||
+	(
+		=dev-lang/rust-"${RUST_DEP_PREV}"
+		=dev-lang/rust-bin-"${RUST_DEP_PREV}"
+		=dev-lang/rust-"${RUST_DEP_CURR}"
+		=dev-lang/rust-bin-"${RUST_DEP_CURR}"
+	)
+"
+
+BDEPEND="${PYTHON_DEPS}
+	app-eselect/eselect-rust
+	|| (
+		>=sys-devel/gcc-4.7
+		>=sys-devel/clang-3.5
+	)
+	system-bootstrap? ( ${BOOTSTRAP_DEPEND} )
+	!system-llvm? (
+		>=dev-util/cmake-3.13.4
+		dev-util/ninja
+	)
+	test? ( sys-devel/gdb )
+	verify-sig? ( sec-keys/openpgp-keys-rust )
+"
+
+DEPEND="
+	>=app-arch/xz-utils-5.2
+	net-misc/curl:=[http2,ssl]
+	sys-libs/zlib:=
+	dev-libs/openssl:0=
+	system-llvm? (
+		${LLVM_DEPEND}
+		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
+	)
+	!system-llvm? (
+		!llvm-libunwind? (
+			elibc_musl? ( sys-libs/libunwind:= )
+		)
+	)
+"
+
+RDEPEND="${DEPEND}
+	app-eselect/eselect-rust
+	sys-apps/lsb-release
+"
+
+REQUIRED_USE="|| ( ${ALL_LLVM_TARGETS[*]} )
+	miri? ( nightly )
+	parallel-compiler? ( nightly )
+	rls? ( rust-src )
+	test? ( ${ALL_LLVM_TARGETS[*]} )
+	wasm? ( llvm_targets_WebAssembly )
+	x86? ( cpu_flags_x86_sse2 )
+"
+
+# we don't use cmake.eclass, but can get a warning
+CMAKE_WARN_UNUSED_CLI=no
+
+QA_FLAGS_IGNORED="
+	usr/lib/${PN}/${PV}/bin/.*
+	usr/lib/${PN}/${PV}/libexec/.*
+	usr/lib/${PN}/${PV}/lib/lib.*.so
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/bin/.*
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
+"
+
+QA_SONAME="
+	usr/lib/${PN}/${PV}/lib/lib.*.so.*
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/lib/lib.*.so
+"
+
+QA_PRESTRIPPED="
+	usr/lib/${PN}/${PV}/lib/rustlib/.*/bin/rust-llvm-dwp
+"
+
+# An rmeta file is custom binary format that contains the metadata for the crate.
+# rmeta files do not support linking, since they do not contain compiled object files.
+# so we can safely silence the warning for this QA check.
+QA_EXECSTACK="usr/lib/${PN}/${PV}/lib/rustlib/*/lib*.rlib:lib.rmeta"
+
+# causes double bootstrap
+RESTRICT="test"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/rust.asc
+
+PATCHES=(
+	"${FILESDIR}"/1.55.0-ignore-broken-and-non-applicable-tests.patch
+	"${FILESDIR}"/1.62.1-musl-dynamic-linking.patch
+	"${FILESDIR}"/1.61.0-gentoo-musl-target-specs.patch
+)
+
+S="${WORKDIR}/${MY_P}-src"
+
+toml_usex() {
+	usex "${1}" true false
+}
+
+bootstrap_rust_version_check() {
+	# never call from pkg_pretend. eselect-rust may be not installed yet.
+	[[ ${MERGE_TYPE} == binary ]] && return
+	local rustc_wanted="$(ver_cut 1).$(($(ver_cut 2) - 1))"
+	local rustc_toonew="$(ver_cut 1).$(($(ver_cut 2) + 1))"
+	local rustc_version=( $(eselect --brief rust show 2>/dev/null) )
+	rustc_version=${rustc_version[0]#rust-bin-}
+	rustc_version=${rustc_version#rust-}
+
+	[[ -z "${rustc_version}" ]] && die "Failed to determine rust version, check 'eselect rust' output"
+
+	if ver_test "${rustc_version}" -lt "${rustc_wanted}" ; then
+		eerror "Rust >=${rustc_wanted} is required"
+		eerror "please run 'eselect rust' and set correct rust version"
+		die "selected rust version is too old"
+	elif ver_test "${rustc_version}" -ge "${rustc_toonew}" ; then
+		eerror "Rust <${rustc_toonew} is required"
+		eerror "please run 'eselect rust' and set correct rust version"
+		die "selected rust version is too new"
+	else
+		einfo "Using rust ${rustc_version} to build"
+	fi
+}
+
+pre_build_checks() {
+	local M=8192
+	# multiply requirements by 1.3 if we are doing x86-multilib
+	if use amd64; then
+		M=$(( $(usex abi_x86_32 13 10) * ${M} / 10 ))
+	fi
+	M=$(( $(usex clippy 128 0) + ${M} ))
+	M=$(( $(usex miri 128 0) + ${M} ))
+	M=$(( $(usex rls 512 0) + ${M} ))
+	M=$(( $(usex rustfmt 256 0) + ${M} ))
+	# add 2G if we compile llvm and 256M per llvm_target
+	if ! use system-llvm; then
+		M=$(( 2048 + ${M} ))
+		local ltarget
+		for ltarget in ${ALL_LLVM_TARGETS[@]}; do
+			M=$(( $(usex ${ltarget} 256 0) + ${M} ))
+		done
+	fi
+	M=$(( $(usex wasm 256 0) + ${M} ))
+	M=$(( $(usex debug 2 1) * ${M} ))
+	eshopts_push -s extglob
+	if is-flagq '-g?(gdb)?([1-9])'; then
+		M=$(( 15 * ${M} / 10 ))
+	fi
+	eshopts_pop
+	M=$(( $(usex system-bootstrap 0 1024) + ${M} ))
+	M=$(( $(usex doc 256 0) + ${M} ))
+	CHECKREQS_DISK_BUILD=${M}M check-reqs_pkg_${EBUILD_PHASE}
+}
+
+llvm_check_deps() {
+	has_version -r "sys-devel/llvm:${LLVM_SLOT}[${LLVM_TARGET_USEDEPS// /,}]"
+}
+
+pkg_pretend() {
+	pre_build_checks
+}
+
+pkg_setup() {
+	pre_build_checks
+	python-any-r1_pkg_setup
+
+	export LIBGIT2_NO_PKG_CONFIG=1 #749381
+
+	use system-bootstrap && bootstrap_rust_version_check
+
+	if use system-llvm; then
+		llvm_pkg_setup
+
+		local llvm_config="$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+		export LLVM_LINK_SHARED=1
+		export RUSTFLAGS="${RUSTFLAGS} -Lnative=$("${llvm_config}" --libdir)"
+	fi
+}
+
+esetup_unwind_hack() {
+	# https://bugs.gentoo.org/870280
+	# this is a hack needed to bootstrap with libgcc_s linked tarball on llvm-libunwind system.
+	# it should trigger for internal bootstrap or system-bootstrap with rust-bin.
+	# the whole idea is for stage0 to bootstrap with fake libgcc_s.
+	# final stage will receive -L${T}/lib but not -lgcc_s args, producing clean compiler.
+	local fakelib="${T}/fakelib"
+	mkdir -p "${fakelib}" || die
+	# we need both symlinks, one for cargo runtime, other for linker.
+	ln -s "${ESYSROOT}/usr/lib/libunwind.so" "${fakelib}/libgcc_s.so.1" || die
+	ln -s "${ESYSROOT}/usr/lib/libunwind.so" "${fakelib}/libgcc_s.so" || die
+	export LD_LIBRARY_PATH="${fakelib}"
+	export RUSTFLAGS+=" -L${fakelib}"
+	# this is a literally magic variable that gets through cargo cache, without it some
+	# crates ignore RUSTFLAGS.
+	# this variable can not contain leading space.
+	export MAGIC_EXTRA_RUSTFLAGS+="${MAGIC_EXTRA_RUSTFLAGS:+ }-L${fakelib}"
+}
+
+src_prepare() {
+	if ! use system-bootstrap; then
+		has_version sys-devel/gcc || esetup_unwind_hack
+		local rust_stage0_root="${WORKDIR}"/rust-stage0
+		local rust_stage0="rust-${RUST_STAGE0_VERSION}-$(rust_abi)"
+
+		"${WORKDIR}/${rust_stage0}"/install.sh --disable-ldconfig \
+			--without=rust-docs --destdir="${rust_stage0_root}" --prefix=/ || die
+	fi
+
+	default
+}
+
+src_configure() {
+	use system-llvm && filter-flags '-flto*' # https://bugs.gentoo.org/862109
+
+	local rust_target="" rust_targets="" arch_cflags use_libcxx="false"
+	local chost_target="$(get_abi_CHOST ${v##*.})"
+
+	# Collect rust target names to compile standard libs for all ABIs.
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_targets+=",\"$(rust_abi ${chost_target})\""
+	done
+	if use elibc_musl; then
+		# we also want to build our -gentoo- target on musl, in addition to
+		# -unknown- one provided by upstream
+		rust_targets+="${rust_targets//-unknown-/-gentoo-}"
+	fi
+	if use wasm; then
+		rust_targets+=",\"wasm32-unknown-unknown\""
+		if use system-llvm; then
+			# un-hardcode rust-lld linker for this target
+			# https://bugs.gentoo.org/715348
+			sed -i '/linker:/ s/rust-lld/wasm-ld/' compiler/rustc_target/src/spec/wasm_base.rs || die
+		fi
+	fi
+	rust_targets="${rust_targets#,}"
+
+	local tools='"cargo"'
+	use clippy && tools+=',"clippy"'
+	use miri && tools+=',"miri"'
+	use profiler && tools+=',"rust-demangler"'
+	use rls && tools+=',"rls","analysis"'
+	use rustfmt && tools+=',"rustfmt"'
+	use rust-analyzer && tools+=',"rust-analyzer"'
+	use rust-src && tools+=',"src"'
+
+	local rust_stage0_root
+	if use system-bootstrap; then
+		local printsysroot
+		printsysroot="$(rustc --print sysroot || die "Can't determine rust's sysroot")"
+		rust_stage0_root="${printsysroot}"
+	else
+		rust_stage0_root="${WORKDIR}"/rust-stage0
+	fi
+	# in case of prefix it will be already prefixed, as --print sysroot returns full path
+	[[ -d ${rust_stage0_root} ]] || die "${rust_stage0_root} is not a directory"
+
+	rust_target="$(rust_abi)"
+
+	# https://bugs.gentoo.org/732632
+	if tc-is-clang; then
+		local clang_slot="$(clang-major-version)"
+		if { has_version "sys-devel/clang:${clang_slot}[default-libcxx]" || is-flagq -stdlib=libc++; }; then
+			use_libcxx="true"
+		fi
+	fi
+
+	local cm_btype="$(usex debug DEBUG RELEASE)"
+	cat <<- _EOF_ > "${S}"/config.toml
+		changelog-seen = 2
+		[llvm]
+		download-ci-llvm = false
+		optimize = $(toml_usex !debug)
+		release-debuginfo = $(toml_usex debug)
+		assertions = $(toml_usex debug)
+		ninja = true
+		targets = "${LLVM_TARGETS// /;}"
+		experimental-targets = ""
+		link-shared = $(toml_usex system-llvm)
+		$(if [[ ${use_libcxx} == true ]]; then
+			echo "use-libcxx = true"
+			echo "static-libstdcpp = false"
+		fi)
+		$(case "${rust_target}" in
+			i586-*-linux-*)
+				# https://github.com/rust-lang/rust/issues/93059
+				echo 'cflags = "-fcf-protection=none"'
+				echo 'cxxflags = "-fcf-protection=none"'
+				echo 'ldflags = "-fcf-protection=none"'
+				;;
+			*)
+				;;
+		esac)
+		[llvm.build-config]
+		CMAKE_VERBOSE_MAKEFILE = "ON"
+		CMAKE_C_FLAGS_${cm_btype} = "${CFLAGS}"
+		CMAKE_CXX_FLAGS_${cm_btype} = "${CXXFLAGS}"
+		CMAKE_EXE_LINKER_FLAGS_${cm_btype} = "${LDFLAGS}"
+		CMAKE_MODULE_LINKER_FLAGS_${cm_btype} = "${LDFLAGS}"
+		CMAKE_SHARED_LINKER_FLAGS_${cm_btype} = "${LDFLAGS}"
+		CMAKE_STATIC_LINKER_FLAGS_${cm_btype} = "${ARFLAGS}"
+		[build]
+		build-stage = 2
+		test-stage = 2
+		doc-stage = 2
+		build = "${rust_target}"
+		host = ["${rust_target}"]
+		target = [${rust_targets}]
+		cargo = "${rust_stage0_root}/bin/cargo"
+		rustc = "${rust_stage0_root}/bin/rustc"
+		rustfmt = "${rust_stage0_root}/bin/rustfmt"
+		docs = $(toml_usex doc)
+		compiler-docs = false
+		submodules = false
+		python = "${EPYTHON}"
+		locked-deps = true
+		vendor = true
+		extended = true
+		tools = [${tools}]
+		verbose = 2
+		sanitizers = false
+		profiler = $(toml_usex profiler)
+		cargo-native-static = false
+		[install]
+		prefix = "${EPREFIX}/usr/lib/${PN}/${PV}"
+		sysconfdir = "etc"
+		docdir = "share/doc/rust"
+		bindir = "bin"
+		libdir = "lib"
+		mandir = "share/man"
+		[rust]
+		# https://github.com/rust-lang/rust/issues/54872
+		codegen-units-std = 1
+		optimize = true
+		debug = $(toml_usex debug)
+		debug-assertions = $(toml_usex debug)
+		debug-assertions-std = $(toml_usex debug)
+		debuginfo-level = $(usex debug 2 0)
+		debuginfo-level-rustc = $(usex debug 2 0)
+		debuginfo-level-std = $(usex debug 2 0)
+		debuginfo-level-tools = $(usex debug 2 0)
+		debuginfo-level-tests = 0
+		backtrace = true
+		incremental = false
+		default-linker = "$(tc-getCC)"
+		parallel-compiler = $(toml_usex parallel-compiler)
+		channel = "$(usex nightly nightly stable)"
+		description = "gentoo"
+		rpath = false
+		verbose-tests = true
+		optimize-tests = $(toml_usex !debug)
+		codegen-tests = true
+		dist-src = false
+		remap-debuginfo = true
+		lld = $(usex system-llvm false $(toml_usex wasm))
+		# only deny warnings if doc+wasm are NOT requested, documenting stage0 wasm std fails without it
+		# https://github.com/rust-lang/rust/issues/74976
+		# https://github.com/rust-lang/rust/issues/76526
+		deny-warnings = $(usex wasm $(usex doc false true) true)
+		backtrace-on-ice = true
+		jemalloc = false
+		[dist]
+		src-tarball = false
+		compression-formats = ["xz"]
+	_EOF_
+
+	for v in $(multilib_get_enabled_abi_pairs); do
+		rust_target=$(rust_abi $(get_abi_CHOST ${v##*.}))
+		arch_cflags="$(get_abi_CFLAGS ${v##*.})"
+
+		export CFLAGS_${rust_target//-/_}="${arch_cflags}"
+
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.${rust_target}]
+			ar = "$(tc-getAR)"
+			cc = "$(tc-getCC)"
+			cxx = "$(tc-getCXX)"
+			linker = "$(tc-getCC)"
+			ranlib = "$(tc-getRANLIB)"
+			llvm-libunwind = "$(usex llvm-libunwind $(usex system-llvm system in-tree) no)"
+		_EOF_
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+			_EOF_
+		fi
+		# by default librustc_target/spec/linux_musl_base.rs sets base.crt_static_default = true;
+		# but we patch it and set to false here as well
+		# also we enable extra -gentoo- vendor triplet target with same settings as above
+		# musl-sysroot needs to be defined because rust treats it like an extra cross target
+		# so HOST still stays -unknown-, but --tagrget xx-gentoo-linux-musl will have stdlib.
+		if use elibc_musl; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				crt-static = false
+				[target.${rust_target//-unknown-/-gentoo-}]
+				musl-root = "${ESYSROOT}/usr"
+				ar = "$(tc-getAR)"
+				cc = "$(tc-getCC)"
+				cxx = "$(tc-getCXX)"
+				linker = "$(tc-getCC)"
+				ranlib = "$(tc-getRANLIB)"
+				llvm-libunwind = "$(usex llvm-libunwind $(usex system-llvm system in-tree) no)"
+			_EOF_
+			if use system-llvm; then
+				cat <<- _EOF_ >> "${S}"/config.toml
+					llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+				_EOF_
+			fi
+
+		fi
+	done
+	if use wasm; then
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.wasm32-unknown-unknown]
+			linker = "$(usex system-llvm lld rust-lld)"
+			# wasm target does not have profiler_builtins https://bugs.gentoo.org/848483
+			profiler = false
+		_EOF_
+	fi
+
+	if [[ -n ${I_KNOW_WHAT_I_AM_DOING_CROSS} ]]; then # whitespace intentionally shifted below
+	# experimental cross support
+	# discussion: https://bugs.gentoo.org/679878
+	# TODO: c*flags, clang, system-llvm, cargo.eclass target support
+	# it would be much better if we could split out stdlib
+	# complilation to separate ebuild and abuse CATEGORY to
+	# just install to /usr/lib/rustlib/<target>
+
+	# extra targets defined as a bash array
+	# spec format:  <LLVM target>:<rust-target>:<CTARGET>
+	# best place would be /etc/portage/env/dev-lang/rust
+	# Example:
+	# RUST_CROSS_TARGETS=(
+	#	"AArch64:aarch64-unknown-linux-gnu:aarch64-unknown-linux-gnu"
+	# )
+	# no extra hand holding is done, no target transformations, all
+	# values are passed as-is with just basic checks, so it's up to user to supply correct values
+	# valid rust targets can be obtained with
+	# 	rustc --print target-list
+	# matching cross toolchain has to be installed
+	# matching LLVM_TARGET has to be enabled for both rust and llvm (if using system one)
+	# only gcc toolchains installed with crossdev are checked for now.
+
+	# BUG: we can't pass host flags to cross compiler, so just filter for now
+	# BUG: this should be more fine-grained.
+	filter-flags '-mcpu=*' '-march=*' '-mtune=*'
+
+	local cross_target_spec
+	for cross_target_spec in "${RUST_CROSS_TARGETS[@]}";do
+		# extracts first element form <LLVM target>:<rust-target>:<CTARGET>
+		local cross_llvm_target="${cross_target_spec%%:*}"
+		# extracts toolchain triples, <rust-target>:<CTARGET>
+		local cross_triples="${cross_target_spec#*:}"
+		# extracts first element after before : separator
+		local cross_rust_target="${cross_triples%%:*}"
+		# extracts last element after : separator
+		local cross_toolchain="${cross_triples##*:}"
+		use llvm_targets_${cross_llvm_target} || die "need llvm_targets_${cross_llvm_target} target enabled"
+		command -v ${cross_toolchain}-gcc > /dev/null 2>&1 || die "need ${cross_toolchain} cross toolchain"
+
+		cat <<- _EOF_ >> "${S}"/config.toml
+			[target.${cross_rust_target}]
+			ar = "${cross_toolchain}-ar"
+			cc = "${cross_toolchain}-gcc"
+			cxx = "${cross_toolchain}-g++"
+			linker = "${cross_toolchain}-gcc"
+			ranlib = "${cross_toolchain}-ranlib"
+		_EOF_
+		if use system-llvm; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				llvm-config = "$(get_llvm_prefix "${LLVM_MAX_SLOT}")/bin/llvm-config"
+			_EOF_
+		fi
+		if [[ "${cross_toolchain}" == *-musl* ]]; then
+			cat <<- _EOF_ >> "${S}"/config.toml
+				musl-root = "$(${cross_toolchain}-gcc -print-sysroot)/usr"
+			_EOF_
+		fi
+
+		# append cross target to "normal" target list
+		# example 'target = ["powerpc64le-unknown-linux-gnu"]'
+		# becomes 'target = ["powerpc64le-unknown-linux-gnu","aarch64-unknown-linux-gnu"]'
+
+		rust_targets="${rust_targets},\"${cross_rust_target}\""
+		sed -i "/^target = \[/ s#\[.*\]#\[${rust_targets}\]#" config.toml || die
+
+		ewarn
+		ewarn "Enabled ${cross_rust_target} rust target"
+		ewarn "Using ${cross_toolchain} cross toolchain"
+		ewarn
+		if ! has_version -b 'sys-devel/binutils[multitarget]' ; then
+			ewarn "'sys-devel/binutils[multitarget]' is not installed"
+			ewarn "'strip' will be unable to strip cross libraries"
+			ewarn "cross targets will be installed with full debug information"
+			ewarn "enable 'multitarget' USE flag for binutils to be able to strip object files"
+			ewarn
+			ewarn "Alternatively llvm-strip can be used, it supports stripping any target"
+			ewarn "define STRIP=\"llvm-strip\" to use it (experimental)"
+			ewarn
+		fi
+	done
+	fi # I_KNOW_WHAT_I_AM_DOING_CROSS
+
+	einfo "Rust configured with the following flags:"
+	echo
+	echo RUSTFLAGS="\"${RUSTFLAGS}\""
+	echo RUSTFLAGS_BOOTSTRAP="\"${RUSTFLAGS_BOOTSTRAP}\""
+	echo RUSTFLAGS_NOT_BOOTSTRAP="\"${RUSTFLAGS_NOT_BOOTSTRAP}\""
+	echo MAGIC_EXTRA_RUSTFLAGS="\"${MAGIC_EXTRA_RUSTFLAGS}\""
+	env | grep "CARGO_TARGET_.*_RUSTFLAGS="
+	env | grep "CFLAGS_.*"
+	echo
+	einfo "config.toml contents:"
+	cat "${S}"/config.toml || die
+	echo
+}
+
+src_compile() {
+	RUST_BACKTRACE=1 "${EPYTHON}" ./x.py build -vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+}
+
+src_test() {
+	# https://rustc-dev-guide.rust-lang.org/tests/intro.html
+
+	# those are basic and codegen tests.
+	local tests=(
+		codegen
+		codegen-units
+		compile-fail
+		incremental
+		mir-opt
+		pretty
+		run-make
+	)
+
+	# fails if llvm is not built with ALL targets.
+	# and known to fail with system llvm sometimes.
+	use system-llvm || tests+=( assembly )
+
+	# fragile/expensive/less important tests
+	# or tests that require extra builds
+	# TODO: instead of skipping, just make some nonfatal.
+	if [[ ${ERUST_RUN_EXTRA_TESTS:-no} != no ]]; then
+		tests+=(
+			rustdoc
+			rustdoc-js
+			rustdoc-js-std
+			rustdoc-ui
+			run-make-fulldeps
+			ui
+			ui-fulldeps
+		)
+	fi
+
+	local i failed=()
+	einfo "rust_src_test: enabled tests ${tests[@]/#/src/test/}"
+	for i in "${tests[@]}"; do
+		local t="src/test/${i}"
+		einfo "rust_src_test: running ${t}"
+		if ! (
+				IFS=$'\n'
+				env $(cat "${S}"/config.env) RUST_BACKTRACE=1 \
+				"${EPYTHON}" ./x.py test -vv --config="${S}"/config.toml \
+				-j$(makeopts_jobs) --no-doc --no-fail-fast "${t}"
+			)
+		then
+				failed+=( "${t}" )
+				eerror "rust_src_test: ${t} failed"
+		fi
+	done
+
+	if [[ ${#failed[@]} -ne 0 ]]; then
+		eerror "rust_src_test: failure summary: ${failed[@]}"
+		die "aborting due to test failures"
+	fi
+}
+
+src_install() {
+	(
+	IFS=$'\n'
+	env $(cat "${S}"/config.env) DESTDIR="${D}" \
+		"${EPYTHON}" ./x.py install	-vv --config="${S}"/config.toml -j$(makeopts_jobs) || die
+	)
+
+	# bug #689562, #689160
+	rm -v "${ED}/usr/lib/${PN}/${PV}/etc/bash_completion.d/cargo" || die
+	rmdir -v "${ED}/usr/lib/${PN}/${PV}"/etc{/bash_completion.d,} || die
+	newbashcomp src/tools/cargo/src/etc/cargo.bashcomp.sh cargo
+
+	local symlinks=(
+		cargo
+		rustc
+		rustdoc
+		rust-gdb
+		rust-gdbgui
+		rust-lldb
+	)
+
+	use clippy && symlinks+=( clippy-driver cargo-clippy )
+	use miri && symlinks+=( miri cargo-miri )
+	use profiler && symlinks+=( rust-demangler )
+	use rls && symlinks+=( rls )
+	use rustfmt && symlinks+=( rustfmt cargo-fmt )
+	use rust-analyzer && symlinks+=( rust-analyzer )
+
+	einfo "installing eselect-rust symlinks and paths: ${symlinks[@]}"
+	local i
+	for i in "${symlinks[@]}"; do
+		# we need realpath on /usr/bin/* symlink return version-appended binary path.
+		# so /usr/bin/rustc should point to /usr/lib/rust/<ver>/bin/rustc-<ver>
+		# need to fix eselect-rust to remove this hack.
+		local ver_i="${i}-${PV}"
+		if [[ -f "${ED}/usr/lib/${PN}/${PV}/bin/${i}" ]]; then
+			einfo "Installing ${i} symlink"
+			ln -v "${ED}/usr/lib/${PN}/${PV}/bin/${i}" "${ED}/usr/lib/${PN}/${PV}/bin/${ver_i}" || die
+		else
+			ewarn "${i} symlink requested, but source file not found"
+			ewarn "please report this"
+		fi
+		dosym "../lib/${PN}/${PV}/bin/${ver_i}" "/usr/bin/${ver_i}"
+	done
+
+	# symlinks to switch components to active rust in eselect
+	dosym "${PV}/lib" "/usr/lib/${PN}/lib-${PV}"
+	dosym "${PV}/libexec" "/usr/lib/${PN}/libexec-${PV}"
+	dosym "${PV}/share/man" "/usr/lib/${PN}/man-${PV}"
+	dosym "rust/${PV}/lib/rustlib" "/usr/lib/rustlib-${PV}"
+	dosym "../../lib/${PN}/${PV}/share/doc/rust" "/usr/share/doc/${P}"
+
+	newenvd - "50${P}" <<-_EOF_
+		LDPATH="${EPREFIX}/usr/lib/rust/lib"
+		MANPATH="${EPREFIX}/usr/lib/rust/man"
+	_EOF_
+
+	rm -rf "${ED}/usr/lib/${PN}/${PV}"/*.old || die
+	rm -rf "${ED}/usr/lib/${PN}/${PV}/doc"/*.old || die
+
+	# note: eselect-rust adds EROOT to all paths below
+	cat <<-_EOF_ > "${T}/provider-${P}"
+		/usr/bin/cargo
+		/usr/bin/rustdoc
+		/usr/bin/rust-gdb
+		/usr/bin/rust-gdbgui
+		/usr/bin/rust-lldb
+		/usr/lib/rustlib
+		/usr/lib/rust/lib
+		/usr/lib/rust/libexec
+		/usr/lib/rust/man
+		/usr/share/doc/rust
+	_EOF_
+
+	if use clippy; then
+		echo /usr/bin/clippy-driver >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-clippy >> "${T}/provider-${P}"
+	fi
+	if use miri; then
+		echo /usr/bin/miri >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-miri >> "${T}/provider-${P}"
+	fi
+	if use profiler; then
+		echo /usr/bin/rust-demangler >> "${T}/provider-${P}"
+	fi
+	if use rls; then
+		echo /usr/bin/rls >> "${T}/provider-${P}"
+	fi
+	if use rustfmt; then
+		echo /usr/bin/rustfmt >> "${T}/provider-${P}"
+		echo /usr/bin/cargo-fmt >> "${T}/provider-${P}"
+	fi
+	if use rust-analyzer; then
+		echo /usr/bin/rust-analyzer >> "${T}/provider-${P}"
+	fi
+
+	insinto /etc/env.d/rust
+	doins "${T}/provider-${P}"
+
+	if use dist; then
+		insinto "/usr/lib/${PN}/${PV}/dist"
+		doins -r "${S}/build/dist/."
+	fi
+}
+
+pkg_postinst() {
+	eselect rust update
+
+	if has_version sys-devel/gdb || has_version dev-util/lldb; then
+		elog "Rust installs a helper script for calling GDB and LLDB,"
+		elog "for your convenience it is installed under /usr/bin/rust-{gdb,lldb}-${PV}."
+	fi
+
+	if has_version app-editors/emacs; then
+		elog "install app-emacs/rust-mode to get emacs support for rust."
+	fi
+
+	if has_version app-editors/gvim || has_version app-editors/vim; then
+		elog "install app-vim/rust-vim to get vim support for rust."
+	fi
+}
+
+pkg_postrm() {
+	eselect rust cleanup
+}
diff --git a/dev-lang/spidermonkey/Manifest b/dev-lang/spidermonkey/Manifest
index 3021af457d1e..5df8900dc4c9 100644
--- a/dev-lang/spidermonkey/Manifest
+++ b/dev-lang/spidermonkey/Manifest
@@ -1,5 +1,5 @@
-DIST firefox-102.2.0esr.source.tar.xz 479840072 BLAKE2B 00975ffc02a11619d971731d53fbd480e9e6940d2cb9bd77c529b790e9734db85cc48b4e70d5acf447d221620feb8e9d9b8d129d07f270acd0d388574b129ee4 SHA512 06d753867ccfe1b2c79148cc60bc816b47a2abfa98219808868e9028bef1763d982ef7012698d06b8959cce79163d7926baf5f9d5ca9daa18c51fbf0efc59993
-DIST firefox-102esr-patches-01j.tar.xz 16572 BLAKE2B 28be4564c6ae20cd44ee4034e61d594bc9d0d5ef06abca81e8d319fc629ee768adb662226acc69454b6875b033bce89b30da3679f3b9a53dbdc97d78f94a2b14 SHA512 36ec59f1ea88513c69bc1b42b47b639510b91cfe59fc80da393bc89c239024af2a9787e33b49e73d380b3c07603ea7b6c95fb435416f25c1baa285b4e0462679
+DIST firefox-102.3.0esr.source.tar.xz 478260896 BLAKE2B c40ddcfefee874f6dff5d175331144461917269e912d959af20aa19cb8bdc57209403d1e5962311614be8fede33733f734c19bb0d32d881421fa1197539dce5f SHA512 35357791f4de8b474780083a22fb52b7846b8012cbf01403f2b9526151d11c196ce0f9fba8e0f16d8235d7259af6fba1bc3acbb5b7e79129a28f390467aa7556
+DIST firefox-102esr-patches-02j.tar.xz 19688 BLAKE2B f26b8dd2613712ab49db34247c432769386ac066238b86c0eea367cebbd167334f822866129d0874efc35da4da686e6185881649b0b3095dede28ec8c658a3b2 SHA512 456cd2b7d9f907080afb5225d353154117624fa938f24dcfae7ada03f5b39572e5d6d6e1a4bba7825465b48f6d38b04e5c0f69556c82d4ebbe1463e11dc809d7
 DIST firefox-68.0-patches-15.tar.xz 16060 BLAKE2B f9e6cd58ea51bed1af90a9d30fd551dc7e939afcd1b4d00de1271bd4bda94021c6f1799fd9945962c14ffa1fd0b6a6429369c4e45efc2000f179b9b2e46971e7 SHA512 9cb2479637dd8b84e0ab68dc0fe144acd2dc74feca282fd3c4b485ca6f0de8190244587622713a5421b243ccda153f738e9a8f463e87e15e93e9b725d943e128
 DIST firefox-68.12.0esr.source.tar.xz 313856956 BLAKE2B eeaa4acc9fabf15ec1b313170a30cee8e1fc10a8b08512b915b83b7d6a81c09b365733ed94638bd434864fd7b0cb8cbf1bc2e43441be69e31117e8e6a099234c SHA512 839b02422e4c87bdb12e0995cd35ca8c1996f3fba00bbb46b419e46b67df5ec48a264cb14632db777ce29166ee4fdcb06e2ee3ce847e64328c58c9a2f9129f4c
 DIST firefox-78.15.0esr.source.tar.xz 330819568 BLAKE2B dc8785613c2f72c55d484642c89c2545765a9efbd609bc7c2cf57b4a3a06a2ea22e6959e42b5b8af867db782e8b2097a67dec858796b744e47008a8e575e2316 SHA512 ac3de735b246ce4f0e1619cd2664321ffa374240ce6843e785d79a350dc30c967996bbcc5e3b301cb3d822ca981cbea116758fc4122f1738d75ddfd1165b6378
@@ -8,7 +8,7 @@ DIST firefox-91.11.0esr.source.tar.xz 384459848 BLAKE2B cff327378a1712d0dfb99e1a
 DIST firefox-91.13.0esr.source.tar.xz 380053584 BLAKE2B 75d0daa512b3a2d41974a0169778be9ef19a100de2bd382add9831860ca93976585a41e760b6a7ec753268fb78f9f61049780fa7961834248bc8157cfdcc2827 SHA512 38b4cc52de21e76d6061e6ba175e1cbfd888a16070aa951f5a44283f2db9d7e94f2504621f0da78feac6e71491a6d0e7038f63dd0ae112dcad700eb02e9aa516
 DIST firefox-91esr-patches-10j.tar.xz 18320 BLAKE2B ec882411eed19bafab8676e3d79f4ae43947bb97c44571c1497bb93a44fcfec99de06ebacbdf8c4944dcecdf949e4f684908d7ce4226cdcec60241e62e75810e SHA512 670a14d852bb74b9074c3fef9310650f71ce1c56314109c49aea02a7a69acc836af60a8beab11da53e21b10a8e6da341fcfa18b68a1dfd33b26978dd63758e9c
 DIST mozjs-60.5.2.tar.bz2 32816585 BLAKE2B 45ac4c9646e1275faf60eeedbf486f802cd106583eb7f640fe2243adc7cbb811dced5cefa94426cceca63468b0112be84078ffcef24cb2b8c1a7b6c8173c0d45 SHA512 5fb73330e7803bdd524fbe7cfdf4e6b72e85d4b22b0c827400317b5d052d1088d36e558ceac376393089e9d03e658b24e69262851fc04a66bbcda47135423dc0
-DIST spidermonkey-102-patches-03j.tar.xz 5208 BLAKE2B e60cd2f201530a1e0f635af2c7be7f966f1c4ed32b5ede834fd89006c3314c82548f970799d50fb379eb5a808edd773d4d92a3df9bda2efbd238bec77bea23f7 SHA512 ad5968e33846fe3012e0f1b1d73d3383ba691e72db71195a80e07ced038916abe07431fb82ed20c08fb806508910ae4c11504cdb4774c0ff31569b7519ed9de4
+DIST spidermonkey-102-patches-04j.tar.xz 3996 BLAKE2B 468697521adacc5d647b04f2228fc4c1a8131bc2523142f2d57f32e321303581ae8f793baae48966ecb27f48bf77eb084f7b2df1c1a0c667e9ed59ae93d786e6 SHA512 201bb779e2373cc00dfadc29a62b593030dfc12eec076114b92927f29f476d3fafdd056112dd1bb1f19f82827f4fe1252141e3998bec719e4196737a316d4ef2
 DIST spidermonkey-60.0-patches-04.tar.xz 4428 BLAKE2B af78049cd9b3ee6a9b689e6253486c4670fd3b506faade7d745dafaa7af329c0bd15cd35e95528a4c96688230f4803130967fb09b97aae2bda0ce0f73acaaf3e SHA512 fb1326a81512146ba98773d4f7e0c4bc1bff0f076897c13f576fcf63b56f6965efeff633eea9160bca9f9bc4546505901084eabc33bc955de0b7ab3d6334387a
 DIST spidermonkey-68.6.0-patches-04.tar.xz 5956 BLAKE2B b1250391a5173e676272d5926b710c06b0e9de1ff03b130a57fdac30f2deefbee3fa92250b37e28087572fe5cce73eb112ef4e1fb0c0401d6ecdb22ab9868998 SHA512 94575b11b4f006c6ee0c8d64b315734a173cecb68e9128ca61ba1a28177e3c149b8cf1f3b3c47a7a263fad8da6196fc0101df87392f016686a827e0cd24fdc74
 DIST spidermonkey-78-patches-04.tar.xz 3408 BLAKE2B f2fdd4882e1e4de1908c458dc8dfedd5665ef7118f19704dabf2b2a80e2fae48813e9bc3d0c3410287e32c21e3f9d09233d8e5d15917f53aa2f60e6190cd9cdb SHA512 87ac83c0ccc05f482913b1fbf043db1878536f935f934362a47283809c0cbfdeff040206a9c18c687384b606ba8a7bd9a7c1fc3c0bcfdd620987990a33ca1fe2
diff --git a/dev-lang/spidermonkey/files/spidermonkey-102-known-test-failures.txt b/dev-lang/spidermonkey/files/spidermonkey-102-known-test-failures.txt
index e3ba380635b8..2585667d7260 100644
--- a/dev-lang/spidermonkey/files/spidermonkey-102-known-test-failures.txt
+++ b/dev-lang/spidermonkey/files/spidermonkey-102-known-test-failures.txt
@@ -1,5 +1,9 @@
-non262/Intl/available-locales-supported.js
-non262/Intl/available-locales-resolved.js
-non262/Intl/DateTimeFormat/fractional-second-digits-append-item.js
-non262/Intl/DateTimeFormat/day-period-hour-cycle.js
 non262/Date/time-zone-etc_localetime.js
+non262/Date/time-zones-imported.js
+non262/Intl/DateTimeFormat/day-period-hour-cycle.js
+non262/Intl/DateTimeFormat/fractional-second-digits-append-item.js
+non262/Intl/DateTimeFormat/timeZone_backward_links.js
+non262/Intl/DateTimeFormat/timeZone_version.js
+non262/Intl/available-locales-resolved.js
+non262/Intl/available-locales-supported.js
+non262/Intl/supportedValuesOf-timeZones-canonical.js
diff --git a/dev-lang/spidermonkey/spidermonkey-102.2.0.ebuild b/dev-lang/spidermonkey/spidermonkey-102.3.0.ebuild
similarity index 97%
rename from dev-lang/spidermonkey/spidermonkey-102.2.0.ebuild
rename to dev-lang/spidermonkey/spidermonkey-102.3.0.ebuild
index d04917ec1b05..db8db6b457db 100644
--- a/dev-lang/spidermonkey/spidermonkey-102.2.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-102.3.0.ebuild
@@ -4,8 +4,8 @@
 EAPI="8"
 
 # Patch version
-FIREFOX_PATCHSET="firefox-102esr-patches-01j.tar.xz"
-SPIDERMONKEY_PATCHSET="spidermonkey-102-patches-03j.tar.xz"
+FIREFOX_PATCHSET="firefox-102esr-patches-02j.tar.xz"
+SPIDERMONKEY_PATCHSET="spidermonkey-102-patches-04j.tar.xz"
 
 LLVM_MAX_SLOT=14
 
@@ -290,11 +290,9 @@ src_configure() {
 		$(use_enable test tests)
 	)
 
-	# Temporary fix against rust-1.63, bgo#870193
-	# if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-	#	myeconfargs+=( --enable-rust-simd )
-	#fi
-	myeconfargs+=( --disable-rust-simd )
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		myeconfargs+=( --enable-rust-simd )
+	fi
 
 	# Modifications to better support ARM, bug 717344
 	if use cpu_flags_arm_neon ; then
diff --git a/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild b/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
index 909743ac2f47..80ef8034aaa8 100644
--- a/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-78.15.0.ebuild
@@ -306,9 +306,11 @@ src_configure() {
 		$(use_enable test tests)
 	)
 
-	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
-		myeconfargs+=( --enable-rust-simd )
-	fi
+	# Breaks with newer (1.63+) Rust.
+	# if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+	#	myeconfargs+=( --enable-rust-simd )
+	#fi
+	myeconfargs+=( --disable-rust-simd )
 
 	# Modifications to better support ARM, bug 717344
 	if use cpu_flags_arm_neon ; then
diff --git a/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild b/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild
index 2fda3ea85f49..13a89a1b6848 100644
--- a/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild
+++ b/dev-lang/spidermonkey/spidermonkey-91.13.0.ebuild
@@ -61,7 +61,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="SpiderMonkey is Mozilla's JavaScript engine written in C and C++"
 HOMEPAGE="https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html "
 
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~mips ~ppc ppc64 ~riscv x86"
 
 SLOT="91"
 LICENSE="MPL-2.0"
diff --git a/dev-lang/typescript/Manifest b/dev-lang/typescript/Manifest
index ec31c9b915e7..bb0c67d1561b 100644
--- a/dev-lang/typescript/Manifest
+++ b/dev-lang/typescript/Manifest
@@ -1 +1,2 @@
 DIST typescript-4.5.4.tgz 11280056 BLAKE2B 0fce858e7b1ec2120de9e2cd0356cb6553a1730f7db58a001920928351c58186124e63b7189e37ce12ea6158744c1203ebed6e20234e1b32e47b07b3f48bcd24 SHA512 56062cd80d90211b86a61b73155eda40976e2768327d39639e02f38e97d6f45a18645eb1bb0d56d2f5bd82108a2df716ac21712bcd42486440bd2d699f87c852
+DIST typescript-4.8.3.tgz 11942311 BLAKE2B a97b8e507eb880bcf21dd6a530f0f84f4f63055860bd453d6b22261c5422b26974c88b248303e6f3ed8102a0529d93360c46ac7dfb616d67ff0dcb7134c75e47 SHA512 8283077e6d349d63daf14bd1fc23d2bf292a7fa75557cc7f769d1ce6615331322ed2ed059465918a8cb2ecd9f43c601d1f1a49667b8efeeb7e3e943c5221c08a
diff --git a/dev-lang/typescript/metadata.xml b/dev-lang/typescript/metadata.xml
index d6dd6505ac4c..c9f2e5b5a6f4 100644
--- a/dev-lang/typescript/metadata.xml
+++ b/dev-lang/typescript/metadata.xml
@@ -1,11 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
-	<upstream>
-		<remote-id type="github">microsoft/TypeScript</remote-id>
-	</upstream>
+  <maintainer type="person">
+    <email>xgqt@gentoo.org</email>
+    <name>Maciej Barć</name>
+  </maintainer>
+  <longdescription>
+    TypeScript is a language for application-scale JavaScript. TypeScript adds
+    optional types to JavaScript that support tools for large-scale JavaScript
+    applications for any browser, for any host, on any OS. TypeScript compiles
+    to readable, standards-based JavaScript
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/microsoft/TypeScript/issues/</bugs-to>
+    <remote-id type="github">microsoft/TypeScript</remote-id>
+  </upstream>
 </pkgmetadata>
diff --git a/dev-lang/typescript/typescript-4.5.4-r1.ebuild b/dev-lang/typescript/typescript-4.5.4-r1.ebuild
new file mode 100644
index 000000000000..02196457057b
--- /dev/null
+++ b/dev-lang/typescript/typescript-4.5.4-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Superset of JavaScript with optional static typing, classes and interfaces"
+HOMEPAGE="https://www.typescriptlang.org/
+	https://github.com/microsoft/TypeScript/"
+SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
+S="${WORKDIR}"/package
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+RDEPEND="net-libs/nodejs"
+BDEPEND=">=net-libs/nodejs-16[npm]"
+
+src_compile() {
+	# Skip, nothing to compile here.
+	:
+}
+
+src_install() {
+	local myopts=(
+		--audit false
+		--color false
+		--foreground-scripts
+		--global
+		--offline
+		--omit dev
+		--prefix "${ED}"/usr
+		--progress false
+		--verbose
+	)
+	npm ${myopts[@]} install "${DISTDIR}"/${P}.tgz || die "npm install failed"
+
+	dodoc *.md *.txt
+}
diff --git a/dev-lang/typescript/typescript-4.5.4.ebuild b/dev-lang/typescript/typescript-4.5.4.ebuild
deleted file mode 100644
index dcbc71b38d89..000000000000
--- a/dev-lang/typescript/typescript-4.5.4.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Superset of JavaScript with optional static typing, classes and interfaces"
-HOMEPAGE="https://www.typescriptlang.org"
-SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64"
-
-DEPEND=""
-RDEPEND="net-libs/nodejs"
-BDEPEND=">=net-libs/nodejs-16[npm]"
-
-S="${WORKDIR}/package"
-
-src_compile() {
-	# nothing to compile here
-	:
-}
-
-src_install() {
-	npm \
-		--audit false \
-		--color false \
-		--foreground-scripts \
-		--global \
-		--offline \
-		--omit dev \
-		--prefix "${ED}"/usr \
-		--progress false \
-		--verbose \
-		install "${DISTDIR}/${P}".tgz || die "npm install failed"
-
-	einstalldocs
-}
diff --git a/dev-lang/typescript/typescript-4.8.3-r1.ebuild b/dev-lang/typescript/typescript-4.8.3-r1.ebuild
new file mode 100644
index 000000000000..02196457057b
--- /dev/null
+++ b/dev-lang/typescript/typescript-4.8.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Superset of JavaScript with optional static typing, classes and interfaces"
+HOMEPAGE="https://www.typescriptlang.org/
+	https://github.com/microsoft/TypeScript/"
+SRC_URI="https://registry.npmjs.org/${PN}/-/${P}.tgz"
+S="${WORKDIR}"/package
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64"
+
+RDEPEND="net-libs/nodejs"
+BDEPEND=">=net-libs/nodejs-16[npm]"
+
+src_compile() {
+	# Skip, nothing to compile here.
+	:
+}
+
+src_install() {
+	local myopts=(
+		--audit false
+		--color false
+		--foreground-scripts
+		--global
+		--offline
+		--omit dev
+		--prefix "${ED}"/usr
+		--progress false
+		--verbose
+	)
+	npm ${myopts[@]} install "${DISTDIR}"/${P}.tgz || die "npm install failed"
+
+	dodoc *.md *.txt
+}
diff --git a/dev-lang/xsb/xsb-4.0.0.ebuild b/dev-lang/xsb/xsb-4.0.0.ebuild
index e33f657a813c..cf7cf74c2ba5 100644
--- a/dev-lang/xsb/xsb-4.0.0.ebuild
+++ b/dev-lang/xsb/xsb-4.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ inherit autotools java-pkg-opt-2
 
 DESCRIPTION="XSB is a logic programming and deductive database system"
 HOMEPAGE="http://xsb.sourceforge.net"
-SRC_URI="mirror://sourceforge/xsb/XSB-4-0-0.tar.gz
+SRC_URI="mirror://sourceforge/xsb/XSB-$(ver_rs 1-3 -).tar.gz
 	https://dev.gentoo.org/~keri/distfiles/xsb/${P}-gentoo-patchset-${PATCHSET_VER}.tar.gz"
 
 LICENSE="GPL-2 LGPL-2"
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 9973ea45c8da..56277d2f55dd 100644
Binary files a/dev-libs/Manifest.gz and b/dev-libs/Manifest.gz differ
diff --git a/dev-libs/expat/expat-2.4.9.ebuild b/dev-libs/expat/expat-2.4.9.ebuild
index f1fa63ba497c..359e275388e4 100644
--- a/dev-libs/expat/expat-2.4.9.ebuild
+++ b/dev-libs/expat/expat-2.4.9.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/libexpat/libexpat/releases/download/R_${PV//\./_}/ex
 
 LICENSE="MIT"
 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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 IUSE="examples static-libs unicode"
 BDEPEND="unicode? ( ${AUTOTOOLS_DEPEND} )"
 
diff --git a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
index 9c62e11a3867..248ec6df2914 100644
--- a/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
+++ b/dev-libs/fcgi/fcgi-2.4.1_pre0910052249-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit autotools
 
 DESCRIPTION="FastCGI Developer's Kit"
 HOMEPAGE="http://www.fastcgi.com/"
-SRC_URI="http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz"
+SRC_URI="http://www.fastcgi.com/dist/fcgi-$(ver_cut 1-3)-SNAP-$(ver_cut 5).tar.gz"
 
 LICENSE="FastCGI"
 SLOT="0"
diff --git a/dev-libs/glib/files/glib-2.74.0-clang-build.patch b/dev-libs/glib/files/glib-2.74.0-clang-build.patch
new file mode 100644
index 000000000000..23bb0630d028
--- /dev/null
+++ b/dev-libs/glib/files/glib-2.74.0-clang-build.patch
@@ -0,0 +1,26 @@
+https://gitlab.gnome.org/GNOME/glib/-/commit/37dba1c425f6c3254e9ce72f1c4b7d0f95c2be3e
+https://bugs.gentoo.org/871174
+
+From: Kjell Ahlstedt <kjellahlstedt@gmail.com>
+Date: Thu, 15 Sep 2022 12:55:18 +0200
+Subject: [PATCH] gio-launch-desktop: Fix the G_STATIC_ASSERT expressions for
+ clang
+
+The clang compiler requires the static_assert expression to be an integral
+constant expression. `"text"` is not, but `sizeof "text"` is.
+
+Fixes #2740
+--- a/gio/gio-launch-desktop.c
++++ b/gio/gio-launch-desktop.c
+@@ -121,8 +121,8 @@ journal_stream_fd (const char *identifier,
+   /* Arbitrary large size for the sending buffer, from systemd */
+   int large_buffer_size = 8 * 1024 * 1024;
+ 
+-  G_STATIC_ASSERT (LOG_EMERG == 0 && "Linux ABI defines LOG_EMERG");
+-  G_STATIC_ASSERT (LOG_DEBUG == 7 && "Linux ABI defines LOG_DEBUG");
++  G_STATIC_ASSERT (LOG_EMERG == 0 && sizeof "Linux ABI defines LOG_EMERG");
++  G_STATIC_ASSERT (LOG_DEBUG == 7 && sizeof "Linux ABI defines LOG_DEBUG");
+ 
+   fd = socket (AF_UNIX, SOCK_STREAM | SOCK_CLOEXEC, 0);
+ 
+GitLab
diff --git a/dev-libs/glib/glib-2.74.0.ebuild b/dev-libs/glib/glib-2.74.0.ebuild
index db17ff43554c..2afacc7da2a4 100644
--- a/dev-libs/glib/glib-2.74.0.ebuild
+++ b/dev-libs/glib/glib-2.74.0.ebuild
@@ -69,6 +69,7 @@ MULTILIB_CHOST_TOOLS=(
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-2.64.1-mark-gdbus-server-auth-test-flaky.patch
+	"${FILESDIR}"/${P}-clang-build.patch
 )
 
 pkg_setup() {
diff --git a/dev-libs/icu-layoutex/Manifest b/dev-libs/icu-layoutex/Manifest
index a466a7e57d4d..0ea38314d953 100644
--- a/dev-libs/icu-layoutex/Manifest
+++ b/dev-libs/icu-layoutex/Manifest
@@ -1,2 +1,3 @@
+DIST icu-72_rc.tar.gz 67042961 BLAKE2B 398eac0c7a8ba9bddf3b6773846e2858f8c37ee8ef93c230de9587c066aaf93fef5b2f56b1e1411b3521158a5fe404828d248ed0f37e4eacc2cccecc7a2dd64d SHA512 23e02b8be0544e6da8fe6455eb20d8bb7a1f555cac26fe4ebc3cf714ed10b86e4277e997d3407241bd0b5e847d1a0325d5980241f8be5e9d139a018ec40fc3ca
 DIST icu4c-71_1-src.tgz 25701340 BLAKE2B 182972d87fe5b69b5e08c39ab9bb0ac7ffc7b36530168b3548faa051cce2b73b9f1c1d23198a4b1c655442155e369da76929e4f54fe4e32265160363428d4916 SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
 DIST icu4c-71_1-src.tgz.asc 659 BLAKE2B ac281e0a9b94bf6bfddee2dd5dc7553836aa50ae84f55478a662d0cd1e116a944de92dd5fd701164d62fb5b8e8effcdb3456a151a6b198d603e2324ccd76e334 SHA512 3371e14f3959defa7fb8d3eb0308084646ed553169b7a845bff89f9a8c1054ef5bee45c26c1834a84cab38fa87710f1585e6c5787be1fe2df356eb5c2ba20aae
diff --git a/dev-libs/icu-layoutex/icu-layoutex-72_rc.ebuild b/dev-libs/icu-layoutex/icu-layoutex-72_rc.ebuild
new file mode 100644
index 000000000000..fe8edba20d39
--- /dev/null
+++ b/dev-libs/icu-layoutex/icu-layoutex-72_rc.ebuild
@@ -0,0 +1,138 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with dev-libs/icu
+
+inherit autotools flag-o-matic multilib-minimal toolchain-funcs
+
+DESCRIPTION="External layout part of International Components for Unicode"
+HOMEPAGE="https://icu.unicode.org/"
+if [[ ${PV} == *_rc* ]] ; then
+	SRC_URI="https://github.com/unicode-org/icu/archive/refs/tags/release-$(ver_rs 1- '-').tar.gz -> ${P/-layoutex}.tar.gz"
+	S="${WORKDIR}"/${PN/-layoutex}-release-$(ver_rs 1- '-')/icu4c/source
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc
+	inherit verify-sig
+
+	SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
+	SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz.asc )"
+	S="${WORKDIR}"/${PN}/source
+
+	KEYWORDS="~alpha ~amd64 ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~sparc ~x86"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-icu )"
+fi
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="debug static-libs test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	~dev-libs/icu-${PV}[${MULTILIB_USEDEP}]
+	dev-libs/icu-le-hb[${MULTILIB_USEDEP}]
+"
+RDEPEND="${DEPEND}"
+BDEPEND+="
+	virtual/pkgconfig
+"
+
+PATCHES=( "${FILESDIR}/${PN}-65.1-remove-bashisms.patch" )
+
+src_prepare() {
+	default
+
+	# Disable renaming as it assumes stable ABI and that consumers
+	# won't use unofficial APIs. We need this despite the configure argument.
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	eautoreconf
+}
+
+src_configure() {
+	# ICU tries to append -std=c++11 without this, so as of 71.1,
+	# despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17,
+	# we still need this.
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		# We want a minimal build as this is just for layoutex
+		# so we disable as much as possible
+		--disable-samples
+		--disable-extras
+		--disable-icuio
+
+		# This is icu-layoutex, so..
+		--enable-layoutex
+
+		$(use_enable debug)
+		$(use_enable static-libs static)
+
+		# Need tools for tests, otherwise get this in configure:
+		# "## Note: you have disabled ICU's tools. This ICU cannot build its own data or tests.
+		# ## Expect build failures in the 'data', 'test', and other directories."
+		# ... although layoutex has no tests right now anyway, but let's keep this
+		# for the future.
+		$(use_enable test tools)
+		$(use_enable test tests)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# icu tries to use clang by default
+	tc-export CC CXX
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	pushd layoutex &>/dev/null || die
+	emake -j1 VERBOSE="1" check
+	popd &>/dev/null || die
+}
+
+multilib_src_install() {
+	pushd layoutex &>/dev/null || die
+	default
+	popd &>/dev/null || die
+}
diff --git a/dev-libs/icu/Manifest b/dev-libs/icu/Manifest
index a466a7e57d4d..0ea38314d953 100644
--- a/dev-libs/icu/Manifest
+++ b/dev-libs/icu/Manifest
@@ -1,2 +1,3 @@
+DIST icu-72_rc.tar.gz 67042961 BLAKE2B 398eac0c7a8ba9bddf3b6773846e2858f8c37ee8ef93c230de9587c066aaf93fef5b2f56b1e1411b3521158a5fe404828d248ed0f37e4eacc2cccecc7a2dd64d SHA512 23e02b8be0544e6da8fe6455eb20d8bb7a1f555cac26fe4ebc3cf714ed10b86e4277e997d3407241bd0b5e847d1a0325d5980241f8be5e9d139a018ec40fc3ca
 DIST icu4c-71_1-src.tgz 25701340 BLAKE2B 182972d87fe5b69b5e08c39ab9bb0ac7ffc7b36530168b3548faa051cce2b73b9f1c1d23198a4b1c655442155e369da76929e4f54fe4e32265160363428d4916 SHA512 1fd2a20aef48369d1f06e2bb74584877b8ad0eb529320b976264ec2db87420bae242715795f372dbc513ea80047bc49077a064e78205cd5e8b33d746fd2a2912
 DIST icu4c-71_1-src.tgz.asc 659 BLAKE2B ac281e0a9b94bf6bfddee2dd5dc7553836aa50ae84f55478a662d0cd1e116a944de92dd5fd701164d62fb5b8e8effcdb3456a151a6b198d603e2324ccd76e334 SHA512 3371e14f3959defa7fb8d3eb0308084646ed553169b7a845bff89f9a8c1054ef5bee45c26c1834a84cab38fa87710f1585e6c5787be1fe2df356eb5c2ba20aae
diff --git a/dev-libs/icu/icu-72_rc.ebuild b/dev-libs/icu/icu-72_rc.ebuild
new file mode 100644
index 000000000000..7c2a950671eb
--- /dev/null
+++ b/dev-libs/icu/icu-72_rc.ebuild
@@ -0,0 +1,165 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Please bump with dev-libs/icu-layoutex
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
+
+DESCRIPTION="International Components for Unicode"
+HOMEPAGE="https://icu.unicode.org/"
+if [[ ${PV} == *_rc* ]] ; then
+	SRC_URI="https://github.com/unicode-org/icu/archive/refs/tags/release-$(ver_rs 1- '-').tar.gz -> ${P}.tar.gz"
+	S="${WORKDIR}"/${PN}-release-$(ver_rs 1- '-')/icu4c/source
+else
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/icu.asc
+	inherit verify-sig
+
+	SRC_URI="https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz"
+	SRC_URI+=" verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-${PV//./-}/icu4c-${PV//./_}-src.tgz.asc )"
+	S="${WORKDIR}"/${PN}/source
+
+	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 ~x86-winnt"
+
+	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-icu )"
+fi
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+IUSE="debug doc examples static-libs test"
+RESTRICT="!test? ( test )"
+
+BDEPEND+="
+	${PYTHON_DEPS}
+	sys-devel/autoconf-archive
+	virtual/pkgconfig
+	doc? ( app-doc/doxygen[dot] )
+"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/icu-config
+)
+
+PATCHES=(
+	"${FILESDIR}/${PN}-65.1-remove-bashisms.patch"
+	"${FILESDIR}/${PN}-64.2-darwin.patch"
+	"${FILESDIR}/${PN}-68.1-nonunicode.patch"
+)
+
+src_prepare() {
+	default
+
+	# Disable renaming as it assumes stable ABI and that consumers
+	# won't use unofficial APIs. We need this despite the configure argument.
+	sed -i \
+		-e "s/#define U_DISABLE_RENAMING 0/#define U_DISABLE_RENAMING 1/" \
+		common/unicode/uconfig.h || die
+
+	# Fix linking of icudata
+	sed -i \
+		-e "s:LDFLAGSICUDT=-nodefaultlibs -nostdlib:LDFLAGSICUDT=:" \
+		config/mh-linux || die
+
+	# Append doxygen configuration to configure
+	sed -i \
+		-e 's:icudefs.mk:icudefs.mk Doxyfile:' \
+		configure.ac || die
+
+	eautoreconf
+}
+
+src_configure() {
+	MAKEOPTS+=" VERBOSE=1"
+
+	# ICU tries to append -std=c++11 without this, so as of 71.1,
+	# despite GCC 9+ using c++14 (or gnu++14) and GCC 11+ using gnu++17,
+	# we still need this.
+	append-cxxflags -std=c++14
+
+	if tc-is-cross-compiler; then
+		mkdir "${WORKDIR}"/host || die
+		pushd "${WORKDIR}"/host >/dev/null || die
+
+		CFLAGS="" CXXFLAGS="" ASFLAGS="" LDFLAGS="" \
+		CC="$(tc-getBUILD_CC)" CXX="$(tc-getBUILD_CXX)" AR="$(tc-getBUILD_AR)" \
+		RANLIB="$(tc-getBUILD_RANLIB)" LD="$(tc-getBUILD_LD)" \
+		"${S}"/configure --disable-renaming --disable-debug \
+			--disable-samples --enable-static || die
+		emake
+
+		popd >/dev/null || die
+	fi
+
+	multilib-minimal_src_configure
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--disable-renaming
+		--disable-samples
+		--disable-layoutex
+		$(use_enable debug)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		$(multilib_native_use_enable examples samples)
+	)
+
+	tc-is-cross-compiler && myeconfargs+=(
+		--with-cross-build="${WORKDIR}"/host
+	)
+
+	# Work around cross-endian testing failures with LTO #757681
+	if tc-is-cross-compiler && is-flagq '-flto*' ; then
+		myeconfargs+=( --disable-strict )
+	fi
+
+	# ICU tries to use clang by default
+	tc-export CC CXX
+
+	# Make sure we configure with the same shell as we run icu-config
+	# with, or ECHO_N, ECHO_T and ECHO_C will be wrongly defined
+	export CONFIG_SHELL="${EPREFIX}/bin/sh"
+	# Probably have no /bin/sh in prefix-chain
+	[[ -x ${CONFIG_SHELL} ]] || CONFIG_SHELL="${BASH}"
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_compile() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		doxygen -u Doxyfile || die
+		doxygen Doxyfile || die
+	fi
+}
+
+multilib_src_test() {
+	# INTLTEST_OPTS: intltest options
+	#   -e: Exhaustive testing
+	#   -l: Reporting of memory leaks
+	#   -v: Increased verbosity
+	# IOTEST_OPTS: iotest options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	# CINTLTST_OPTS: cintltst options
+	#   -e: Exhaustive testing
+	#   -v: Increased verbosity
+	emake -j1 check
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi && use doc; then
+		docinto html
+		dodoc -r doc/html/*
+	fi
+}
+
+multilib_src_install_all() {
+	local HTML_DOCS=( ../readme.html )
+	einstalldocs
+}
diff --git a/dev-libs/inih/Manifest b/dev-libs/inih/Manifest
index 82898e33779a..99f535bd88e4 100644
--- a/dev-libs/inih/Manifest
+++ b/dev-libs/inih/Manifest
@@ -1,2 +1 @@
-DIST inih-55.tar.gz 18219 BLAKE2B 28b5e04e54e31b3e0392b44799a2c2e75c1fe00527491a857480b7e960302f2438d29652b131dae5147487c863d93f577b67aeff3ab5f863546d3661628d8236 SHA512 bcbef361a4400da017dbed811ad21672b58512d2b2b537cc0058cdeca709dd0d5a9def4045ce1c1972873c3d3d35182123337e4388676f6f0d16e8dbff967b0f
 DIST inih-56.tar.gz 18458 BLAKE2B 51935959a9eb4e393b17302f0932a232963883680f10d404c63d5f2ebbd3bf0b740f44edfa1b2541d0e130016eb853ebedf68a1c40797f658496e2a8c966af3d SHA512 ff3e0910990f73e5b21fddc84737ab346279f201c86c7ad864c6cad9de5bde57c3e0a433b9b8f3585b7d86feaae2ea074185f92891dcadc98c274c1c0745d2d2
diff --git a/dev-libs/inih/inih-55.ebuild b/dev-libs/inih/inih-55.ebuild
deleted file mode 100644
index 8f9886c0171b..000000000000
--- a/dev-libs/inih/inih-55.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Tests not wired up to meson and don't seem to be intended for downstream use yet
-# e.g. hardcoding gcc, just a shell script
-
-inherit meson-multilib
-
-DESCRIPTION="inih (INI not invented here) simple .INI file parser"
-HOMEPAGE="https://github.com/benhoyt/inih"
-
-SRC_URI="https://github.com/benhoyt/inih/archive/r${PV}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-S="${WORKDIR}/inih-r${PV}"
-
-LICENSE="BSD"
-SLOT="0"
-
-DOCS=( README.md )
-
-multilib_src_configure() {
-	local emesonargs=(
-		-Ddefault_library=shared
-		-Ddistro_install=true
-		-Dwith_INIReader=true
-	)
-
-	meson_src_configure
-}
diff --git a/dev-libs/leatherman/Manifest b/dev-libs/leatherman/Manifest
index 4ac2a94c10d1..d56b570c462e 100644
--- a/dev-libs/leatherman/Manifest
+++ b/dev-libs/leatherman/Manifest
@@ -1,3 +1,2 @@
-DIST leatherman-1.12.6.tar.gz 818106 BLAKE2B 056ea52c355cf178e16be03f2a4fb54bf0e6aece4045545e7e45c50664e711db2bb756f56c9cd33a6dfe1de24c4ecb98766d4bd158ffb7757958274ba38f76db SHA512 4e2a1ee2e7226224f115648a78bc3e4798ef0528ef32e01d1e7ebcbeb1250fd6ed88001c9db21456feeef3bd6ff201b0fd68fd5feb2671a66d13519dd3454386
 DIST leatherman-1.12.7.tar.gz 815838 BLAKE2B 21284f5128c9264b751011b1d68c6baf553037612cab39cc339920091ae42980f6c3920f5b339d4cba31a40b190fa73d779f45dcc30b78e866708c3178ac6699 SHA512 dd763bf89d8356aa00805817af7029ee77452a9210b6aded16ac1434f233fbba9b41014ab55a076773f50da6d16e1cffae50e2a23d1c4b336df9cc88c05ede56
 DIST leatherman-1.12.8.tar.gz 815817 BLAKE2B b0844527a470c0e54983d49abc84a7331a07f3cac76919f56e58a01d60b794e422f3ef8342e046c483a83c428d2c80ff8e8d6b71375f45ddb03a5721e63c7aef SHA512 c6096a7c0e95fb43c6998f26e8f28157f46b78af4eaf2caaa1caae832d2f23aa7591e3a29a17f24bc9b993421645d37d44249fd8cae15a3d18b40d614acd23ad
diff --git a/dev-libs/leatherman/leatherman-1.12.6-r1.ebuild b/dev-libs/leatherman/leatherman-1.12.6-r1.ebuild
deleted file mode 100644
index 00b2695e08b3..000000000000
--- a/dev-libs/leatherman/leatherman-1.12.6-r1.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 cmake
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm ~hppa ppc ppc64 sparc x86"
-IUSE="debug static-libs test"
-#RESTRICT="!test? ( test )"
-RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-
-RDEPEND="dev-libs/boost:=[nls]
-	net-misc/curl"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/portage-sandbox-test-fix.patch
-	"${FILESDIR}"/1.12.2-shared_nowide.patch
-)
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	# vendored boost lib conflicts with boost 1.73 and above
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DLEATHERMAN_ENABLE_TESTING=$(usex test)
-		# We depend on Boost with nls, so this is always true
-		-DLEATHERMAN_USE_ICU=ON
-
-		-DLEATHERMAN_SHARED=$(usex !static-libs)
-	)
-
-	if use debug; then
-		mycmakeargs+=(
-			-DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test || die
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/dev-libs/leatherman/leatherman-1.12.6-r2.ebuild b/dev-libs/leatherman/leatherman-1.12.6-r2.ebuild
deleted file mode 100644
index 94708b8922ab..000000000000
--- a/dev-libs/leatherman/leatherman-1.12.6-r2.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="A C++ toolkit"
-HOMEPAGE="https://github.com/puppetlabs/leatherman"
-SRC_URI="https://github.com/puppetlabs/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86"
-IUSE="debug static-libs test"
-#RESTRICT="!test? ( test )"
-RESTRICT="test"  # restricted til we don't need the shared_nowide patch
-
-RDEPEND="dev-libs/boost:=[nls]
-	net-misc/curl"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/portage-sandbox-test-fix.patch
-	"${FILESDIR}"/1.12.2-shared_nowide.patch
-)
-
-src_prepare() {
-	sed -i 's/\-Werror\ //g' "cmake/cflags.cmake" || die
-	# vendored boost lib conflicts with boost 1.73 and above
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DCMAKE_VERBOSE_MAKEFILE=ON
-		-DCMAKE_BUILD_TYPE=None
-		-DLEATHERMAN_ENABLE_TESTING=$(usex test)
-		# We depend on Boost with nls, so this is always true
-		-DLEATHERMAN_USE_ICU=ON
-
-		-DLEATHERMAN_SHARED=$(usex !static-libs)
-	)
-
-	if use debug; then
-		mycmakeargs+=(
-			-DCMAKE_BUILD_TYPE=Debug
-		)
-	fi
-
-	cmake_src_configure
-	cd "${BUILD_DIR}"
-	eapply "${FILESDIR}"/${P}-SIGSTKSZ.patch
-}
-
-src_test() {
-	"${WORKDIR}/${P}"_build/bin/leatherman_test || die
-}
-
-src_install() {
-	cmake_src_install
-}
diff --git a/dev-libs/libassuan/Manifest b/dev-libs/libassuan/Manifest
index 29c8687e0d4e..6b903682dc78 100644
--- a/dev-libs/libassuan/Manifest
+++ b/dev-libs/libassuan/Manifest
@@ -1,3 +1 @@
-DIST libassuan-2.5.3.tar.bz2 572348 BLAKE2B ae3a5a9a03e85d62cf87271cd4a0718a2b89a4f90ea814837913e4b2bb6e5af9746e766d99685cc0cc3a801efaee597e491a2bc03d42ac26059580ea4680fd7a SHA512 e7ccb651ea75b07b2e687d48d86d0ab83cba8e2af7f30da2aec794808e13e6ec93f21d607db50d3431f1c23cb3a07a2793b71170e69fa2f5a82cffb81961f617
-DIST libassuan-2.5.4.tar.bz2 574039 BLAKE2B 2eec42c47840741a4726fc35c3ed04300e5fbcd37f808b121534aeaa04d0d0f609a30ad48cfbe33a81ee4b2ebbb822b9a48a5c602268f1b802bf5d7d19d72e9c SHA512 764993d5311c24f0c0f970016e903e1a16783a2050c42072dbc1bc4f350f119e53b0be17ed6df25a0086bc9f8c25ee4f3134330577968480997263f95e05594f
 DIST libassuan-2.5.5.tar.bz2 572263 BLAKE2B 24952e97c757b97c387ab4c2c4bf7b040f2874e9326c129805c7f5326fa14d80e083b0842e336a635531a2c8d4a66d428c816bae6b175f1c4518add1ffa3554d SHA512 70117f77aa43bbbe0ed28da5ef23834c026780a74076a92ec775e30f851badb423e9a2cb9e8d142c94e4f6f8a794988c1b788fd4bd2271e562071adf0ab16403
diff --git a/dev-libs/libassuan/libassuan-2.5.3.ebuild b/dev-libs/libassuan/libassuan-2.5.3.ebuild
deleted file mode 100644
index 345ce33518f8..000000000000
--- a/dev-libs/libassuan/libassuan-2.5.3.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool
-
-DESCRIPTION="IPC library used by GnuPG and GPGME"
-HOMEPAGE="https://www.gnupg.org/related_software/libassuan/index.en.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Note: On each bump, update dep bounds on each version from configure.ac!
-RDEPEND=">=dev-libs/libgpg-error-1.8"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		elibtoolize
-
-		# fix standards conflict
-		sed -i \
-			-e '/_XOPEN_SOURCE/s/500/600/' \
-			-e 's/_XOPEN_SOURCE_EXTENDED/_NO&/' \
-			-e 's/__EXTENSIONS__/_NO&/' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# ppl need to use libassuan-config for --cflags and --libs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libassuan/libassuan-2.5.4.ebuild b/dev-libs/libassuan/libassuan-2.5.4.ebuild
deleted file mode 100644
index bdc2724f1d1c..000000000000
--- a/dev-libs/libassuan/libassuan-2.5.4.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool
-
-DESCRIPTION="IPC library used by GnuPG and GPGME"
-HOMEPAGE="https://www.gnupg.org/related_software/libassuan/index.en.html"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-# Note: On each bump, update dep bounds on each version from configure.ac!
-RDEPEND=">=dev-libs/libgpg-error-1.17"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		elibtoolize
-
-		# fix standards conflict
-		sed -i \
-			-e '/_XOPEN_SOURCE/s/500/600/' \
-			-e 's/_XOPEN_SOURCE_EXTENDED/_NO&/' \
-			-e 's/__EXTENSIONS__/_NO&/' \
-			configure || die
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		--disable-static
-		GPG_ERROR_CONFIG="${ESYSROOT}/usr/bin/${CHOST}-gpg-error-config"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# ppl need to use libassuan-config for --cflags and --libs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libgpg-error/Manifest b/dev-libs/libgpg-error/Manifest
index 942639a59c70..230fc5c9a47a 100644
--- a/dev-libs/libgpg-error/Manifest
+++ b/dev-libs/libgpg-error/Manifest
@@ -1,3 +1 @@
-DIST libgpg-error-1.42.tar.bz2 973996 BLAKE2B eb3381ec7106cfe5dca333391f473e97b03df83f247d3067e9f933ed7206f826e59d2b74b8c28d41e785ffe1c2980b680470064eb2fa2ff1ee3d8fa8be5b81a8 SHA512 f6d95712a874edefc39a7746062c8037a62801a550560c5b2eab08b5b86987c1de5be60eba5fcb56d35a37db109aa32d07b7eff2bb99800c1c47d2227421a8f4
-DIST libgpg-error-1.44.tar.bz2 1014475 BLAKE2B dc101769510bc9edff38048216a961df8b08373a0b6d04b13c882bbcb43c4d0e05ecfdfd7788c89b5799082f4d15386efac5eb1762a48ae1ab70b554d0bfbb36 SHA512 a0eef310b9d44532d1ae6e7266226ea3e82d908aa31f775a026e56a7f8303b78adfdceb3ae5a40f7d242987635e764c539a024ce8dc0d66590e1a3fa50f6b784
 DIST libgpg-error-1.45.tar.bz2 1015954 BLAKE2B 277892df6691ff2807335954fa786c1d452d58e6f15aa2f73bffd1ddc97b9276646afe8831c0b67107ac768e0590f046030da6d370eb2871e94154f50dabf67b SHA512 882f2dd617e89137d7a9d61b60488dac32321dd4fdb699e9687b6bd9380c056c027da502837f4482289c0fe00e7de01210e804428f05a0843ae2ca23fdcc6457
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch b/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch
deleted file mode 100644
index 2919a9d73be0..000000000000
--- a/dev-libs/libgpg-error/files/libgpg-error-1.37-remove_broken_check.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-This breaks our multilib builds:
-
-  Confirm gpg-error-config works... no
-  ***  Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log
-
---- libgpg-error-1.37/src/Makefile.am
-+++ libgpg-error-1.37/src/Makefile.am
-@@ -338,14 +338,6 @@
- 	cp gpg-error.h gpgrt.h
- 
- gpg-error-config: gpgrt-config gpg-error-config-old
--	@echo $(ECHO_N) "Confirm gpg-error-config works... $(ECHO_C)"
--	@if ./gpg-error-config-test.sh --old-new; then \
--	  echo "good";                                         \
--	else                                                   \
--	  echo "no";                                           \
--	  echo "***  Please report to <https://bugs.gnupg.org> with gpg-error-config-test.log"; \
--	  exit 1; \
--	fi
- 	cp gpg-error-config-old $@
- 
- install-data-local:
diff --git a/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch b/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch
deleted file mode 100644
index 78d98dd7b3d1..000000000000
--- a/dev-libs/libgpg-error/files/libgpg-error-1.42-cross_compile.patch
+++ /dev/null
@@ -1,32 +0,0 @@
-From 33593864cd54143db594c4237bba41e14179061c Mon Sep 17 00:00:00 2001
-From: David Michael <fedora.dm0@gmail.com>
-Date: Fri, 26 Mar 2021 16:06:50 +0900
-Subject: [PATCH] build: Fix generation of lock-obj-pub.native.h for cross
- build.
-
-* src/gen-lock-obj.sh: Capture echo output with quotes.
-
---
-
-Fixes-commit: 99ae862a96a569724f49a604ebb7d3f6d2c2d374
-Signed-off-by: David Michael <fedora.dm0@gmail.com>
----
- src/gen-lock-obj.sh | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/gen-lock-obj.sh b/src/gen-lock-obj.sh
-index a710f0c..258eec6 100755
---- a/src/gen-lock-obj.sh
-+++ b/src/gen-lock-obj.sh
-@@ -38,7 +38,7 @@
- #     AWK=gawk ./gen-lock-obj.sh
- #
- 
--if test -n `echo -n`; then
-+if test -n "`echo -n`"; then
-     ECHO_C='\c'
-     ECHO_N=''
- else
--- 
-2.11.0
-
diff --git a/dev-libs/libgpg-error/libgpg-error-1.42.ebuild b/dev-libs/libgpg-error/libgpg-error-1.42.ebuild
deleted file mode 100644
index 2168705cf76b..000000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.42.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal toolchain-funcs prefix
-
-DESCRIPTION="Contains error handling functions used by GnuPG software"
-HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp nls static-libs"
-
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gpg-error-config
-)
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/gpg-error.h
-	/usr/include/gpgrt.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.37-remove_broken_check.patch"
-	"${FILESDIR}/${P}-cross_compile.patch"
-)
-
-src_prepare() {
-	default
-
-	if use prefix ; then
-		# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
-		sed -i -e 's/solaris\*/disabled/' configure.ac || die
-	fi
-
-	# only necessary for as long as we run eautoreconf, configure.ac
-	# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
-	# not a pure /bin/sh script, so it fails on some hosts
-	hprefixify -w 1 autogen.sh
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(multilib_is_native_abi || echo --disable-languages)
-		$(use_enable common-lisp languages)
-		$(use_enable nls)
-		# required for sys-power/suspend[crypt], bug 751568
-		$(use_enable static-libs static)
-		--enable-threads
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libgpg-error/libgpg-error-1.44.ebuild b/dev-libs/libgpg-error/libgpg-error-1.44.ebuild
deleted file mode 100644
index 5347656622a7..000000000000
--- a/dev-libs/libgpg-error/libgpg-error-1.44.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools multilib-minimal toolchain-funcs prefix
-
-DESCRIPTION="Contains error handling functions used by GnuPG software"
-HOMEPAGE="https://www.gnupg.org/related_software/libgpg-error"
-SRC_URI="mirror://gnupg/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="common-lisp nls static-libs"
-
-RDEPEND="nls? ( >=virtual/libintl-0-r1[${MULTILIB_USEDEP}] )"
-DEPEND="${RDEPEND}"
-BDEPEND="nls? ( sys-devel/gettext )"
-
-MULTILIB_CHOST_TOOLS=(
-	/usr/bin/gpg-error-config
-)
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/gpg-error.h
-	/usr/include/gpgrt.h
-)
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.44-remove_broken_check.patch"
-)
-
-src_prepare() {
-	default
-
-	if use prefix ; then
-		# don't hardcode /usr/xpg4/bin/sh as shell on Solaris
-		sed -i -e 's/solaris\*/disabled/' configure.ac || die
-	fi
-
-	# only necessary for as long as we run eautoreconf, configure.ac
-	# uses ./autogen.sh to generate PACKAGE_VERSION, but autogen.sh is
-	# not a pure /bin/sh script, so it fails on some hosts
-	hprefixify -w 1 autogen.sh
-	eautoreconf
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		$(multilib_is_native_abi || echo --disable-languages)
-		$(use_enable common-lisp languages)
-		$(use_enable nls)
-		# required for sys-power/suspend[crypt], bug 751568
-		$(use_enable static-libs static)
-		--enable-threads
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-		$("${S}/configure" --help | grep -o -- '--without-.*-prefix')
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/libtasn1/Manifest b/dev-libs/libtasn1/Manifest
index 0716ca996bc6..002fb8ad17a3 100644
--- a/dev-libs/libtasn1/Manifest
+++ b/dev-libs/libtasn1/Manifest
@@ -1,3 +1,2 @@
-DIST libtasn1-4.18.0.tar.gz 1724441 BLAKE2B b5f93a7575dde46741b6fc97183105efbc934e44041735241ba40ecd578c94637741df193dfab0d97e0348e2dde34b8b89a33ed616afa0bf64db6dbddebf1786 SHA512 4f2f4afc7561fda7a1f1c6c525c3c3b08228a1a4aa8c3d3d5e02e993d8f83ccee1dd0f1b201cec0fbfc97043d4b1d7a95ffd34d65422a38b85b931ac7a015831
 DIST libtasn1-4.19.0.tar.gz 1786576 BLAKE2B 6e8232590cd87da3bfd9182ed44eccdfbdfcc85e88d8cf19fffdb3d600e04694b77079b95bbd822d2c3fff29458ddae0f0440f9c1c19c711923a2507bd19270f SHA512 287f5eddfb5e21762d9f14d11997e56b953b980b2b03a97ed4cd6d37909bda1ed7d2cdff9da5d270a21d863ab7e54be6b85c05f1075ac5d8f0198997cf335ef4
 DIST libtasn1-4.19.0.tar.gz.sig 228 BLAKE2B f45b8c53844fad4d1044ef6915d88337affb0287973a0ffab2d77a6a61c850cebdea6904f077fcc13a8bc29ba7cbbef7cdf2a5e325c8180d574020eb3cb9f432 SHA512 e0417625f8df22c6421914bf2d4f19d7f27260c24c04f50e59669681f326debe06ddef9dc5a2e20fda50feb30bbbf3f41597e64961257304ec2c407aa76d107e
diff --git a/dev-libs/libtasn1/libtasn1-4.18.0.ebuild b/dev-libs/libtasn1/libtasn1-4.18.0.ebuild
deleted file mode 100644
index f6bf3c887b59..000000000000
--- a/dev-libs/libtasn1/libtasn1-4.18.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal libtool
-
-DESCRIPTION="ASN.1 library"
-HOMEPAGE="https://www.gnu.org/software/libtasn1/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3 LGPL-2.1"
-SLOT="0/6" # subslot = libtasn1 soname version
-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="static-libs test valgrind"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="sys-apps/help2man
-	virtual/yacc
-	test? ( valgrind? ( dev-util/valgrind ) )"
-
-DOCS=(
-	AUTHORS
-	ChangeLog
-	NEWS
-	README.md
-	THANKS
-)
-
-src_prepare() {
-	default
-	elibtoolize  # for Solaris shared library
-}
-
-multilib_src_configure() {
-	# -fanalyzer substantially slows down the build and isn't useful for
-	# us. It's useful for upstream as it's static analysis, but it's not
-	# useful when just getting something built.
-	export gl_cv_warn_c__fanalyzer=no
-
-	local myeconfargs=(
-		$(use_enable static-libs static)
-		$(multilib_native_use_enable valgrind valgrind-tests)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	find "${ED}" -type f -name '*.la' -delete || die
-}
diff --git a/dev-libs/mathjax/mathjax-2.7.7.ebuild b/dev-libs/mathjax/mathjax-2.7.7.ebuild
index ddbeca772756..ae0030683dc3 100644
--- a/dev-libs/mathjax/mathjax-2.7.7.ebuild
+++ b/dev-libs/mathjax/mathjax-2.7.7.ebuild
@@ -12,7 +12,7 @@ S="${WORKDIR}"/MathJax-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="doc examples"
 
 RDEPEND="doc? ( app-doc/mathjax-docs:${SLOT} )"
diff --git a/dev-libs/mpfr/mpfr-4.1.0-r1.ebuild b/dev-libs/mpfr/mpfr-4.1.0-r1.ebuild
deleted file mode 100644
index e0e4244da6ac..000000000000
--- a/dev-libs/mpfr/mpfr-4.1.0-r1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal
-
-DESCRIPTION="Library for multiple-precision floating-point computations with exact rounding"
-HOMEPAGE="https://www.mpfr.org/ https://gitlab.inria.fr/mpfr"
-SRC_URI="https://www.mpfr.org/mpfr-${PV}/${P}.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0/6" # libmpfr.so version
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs"
-
-RDEPEND=">=dev-libs/gmp-5.0.0:=[${MULTILIB_USEDEP},static-libs?]"
-DEPEND="${RDEPEND}"
-
-HTML_DOCS=( doc/FAQ.html )
-
-multilib_src_configure() {
-	# Make sure mpfr doesn't go probing toolchains it shouldn't #476336#19
-	ECONF_SOURCE=${S} \
-		user_redefine_cc=yes \
-		econf $(use_enable static-libs static)
-}
-
-multilib_src_install_all() {
-	rm "${ED}"/usr/share/doc/"${P}"/COPYING*
-	use static-libs || find "${ED}"/usr -name '*.la' -delete
-}
diff --git a/dev-libs/nettle/Manifest b/dev-libs/nettle/Manifest
index 8b1bd2e7be1d..0af8615e994e 100644
--- a/dev-libs/nettle/Manifest
+++ b/dev-libs/nettle/Manifest
@@ -1,5 +1,3 @@
 DIST nettle-3.7.3.tar.gz 2383985 BLAKE2B 8d8efbbff98fc1f3eff3296681d3d72346e78392f356aebfe80138ae6ae1ebf3695bd7f74b906beef0cf3625ba6d84bdb43c0f6707f54f4d98870d50c90ac9a3 SHA512 9901eba305421adff6d551ac7f478dff3f68a339d444c776724ab0b977fe6be792b1d2950c8705acbe76bd924fd6d898a65eded546777884be3b436d0e052437
 DIST nettle-3.8.1.tar.gz 2406251 BLAKE2B 22b4ec81645b579504356597ba87b637e46285682020c90e03ecaea386ac9b48eaf91ee76ae3b86b6060be355de20c320ab3b74958074ad23fc08ad9ab6a4cbb SHA512 a405da3438d185d96917b03b00abb9ab43e04f58f770f657f716c25d64bb258ee170a71328e74736caa7121f50c0c89d3cc840c1201d2a92cfaf1357d24bdc6a
 DIST nettle-3.8.1.tar.gz.sig 374 BLAKE2B e2bfce4aaa1be114fb9bf8724f25db75c69c3b98538df46e9b1428ce615f7db3b9e9f9240d232fddac195db4568439b3f58989c20beca82aa6db79f4956db547 SHA512 978304b1faa5adc3b0d6ea7e9597af6154ad5d6e328913ac19184ece94771fdb2a7d5ce0af535ae8d28cb6ccd94fb3d4ef2613c0356df9e08b5d4c26ea646e09
-DIST nettle-3.8.tar.gz 2404258 BLAKE2B 4e74104d04ccce2d0a531b703e4d4c2e8da24d5b7ac4d769d1bc5011fb5fbe8a016a6de84e0af9804c8b259b163fb77729181d64b81b3af4e8a0c2037e52087c SHA512 af3a910bd661ed9691b1bd66b0f8147aaebdc92ae6ab47640675df263409ecb8d25f0403fcc7dc6471264b9df0a47c025244404f0691ef58c133762f64b67610
-DIST nettle-3.8.tar.gz.sig 374 BLAKE2B 8fd841116bf99a1d7535359ee56972ddda33c9551c1327bf30ec1a6842104d3429a8fdab7a044c0d32c7689f28abdf75f46b9bec3daf78f58167c3e0a5b91da9 SHA512 cbcfb6088a88cbbc573fe477f73db750f3379a4778e4ddf1158768c5d09b12ea0ff65f4f6552f3cb3d18c851199870827f76836bcc8df61ffc35ef67bf98f3b3
diff --git a/dev-libs/nettle/nettle-3.8.ebuild b/dev-libs/nettle/nettle-3.8.ebuild
deleted file mode 100644
index 95a23319516d..000000000000
--- a/dev-libs/nettle/nettle-3.8.ebuild
+++ /dev/null
@@ -1,81 +0,0 @@
-# Copyright 1999-2022 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/nettle.asc
-inherit multilib-build multilib-minimal toolchain-funcs verify-sig
-
-DESCRIPTION="Low-level cryptographic library"
-HOMEPAGE="http://www.lysator.liu.se/~nisse/nettle/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
-SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.gz.sig )"
-
-LICENSE="|| ( LGPL-3 LGPL-2.1 )"
-# Subslot = libnettle - libhogweed soname version
-SLOT="0/8-6"
-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="+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul"
-# The arm64 crypto option controls AES, SHA1, and SHA2 usage.
-REQUIRED_USE="cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 )
-	cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 )
-	cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 )"
-
-DEPEND="gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}"
-BDEPEND="doc? ( sys-apps/texinfo )
-	verify-sig? ( sec-keys/openpgp-keys-nettle )"
-
-MULTILIB_WRAPPED_HEADERS=(
-	/usr/include/nettle/version.h
-)
-
-DOCS=()
-HTML_DOCS=()
-
-src_prepare() {
-	default
-
-	# I do not see in config.sub reference to sunldsolaris.
-	# if someone complains readd
-	# -e 's/solaris\*)/sunldsolaris*)/' \
-	sed -e '/CFLAGS=/s: -ggdb3::' \
-		-i configure.ac configure || die
-
-	if use doc ; then
-		DOCS+=( nettle.pdf )
-		HTML_DOCS+=( nettle.html )
-	fi
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		CC_FOR_BUILD="$(tc-getBUILD_CC)"
-
-		$(tc-is-static-only && echo --disable-shared)
-
-		# Intrinsics
-		$(use_enable cpu_flags_arm_neon arm-neon)
-		$(use_enable cpu_flags_arm_aes arm64-crypto)
-		$(use_enable cpu_flags_ppc_altivec power-altivec)
-		$(use_enable cpu_flags_x86_aes x86-aesni)
-		$(use_enable cpu_flags_x86_sha x86-sha-ni)
-		$(use_enable cpu_flags_x86_pclmul x86-pclmul)
-		# TODO: PPC crypto flag?
-		--disable-power-crypto-ext
-		# TODO: cpu_flags_s390?
-		--disable-s390x-vf
-		--disable-s390x-msa
-
-		$(use_enable asm assembler)
-		$(multilib_native_use_enable doc documentation)
-		$(use_enable gmp public-key)
-		$(use_enable static-libs static)
-		--disable-fat
-
-		# openssl is just used for benchmarks (bug #427526)
-		--disable-openssl
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-}
diff --git a/dev-libs/nss/nss-3.79.1.ebuild b/dev-libs/nss/nss-3.79.1.ebuild
index 7aec0ea7eb78..26d71716e527 100644
--- a/dev-libs/nss/nss-3.79.1.ebuild
+++ b/dev-libs/nss/nss-3.79.1.ebuild
@@ -15,7 +15,7 @@ SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/$
 
 LICENSE="|| ( MPL-2.0 GPL-2 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 ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
 IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
 RESTRICT="!test? ( test )"
 # pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
diff --git a/dev-libs/nsync/Manifest b/dev-libs/nsync/Manifest
index eae75e833d61..4779ea248761 100644
--- a/dev-libs/nsync/Manifest
+++ b/dev-libs/nsync/Manifest
@@ -1 +1,2 @@
 DIST nsync-1.24.0.tar.gz 155132 BLAKE2B 9a914b408faf8fff96a57fd3868c34aa96b4243ef2acd30dbdbe1fc90a1818d58ffc96bc6d016f5539c0e266fc1fb633952edba0a51b115904c9d6b06a35f7f8 SHA512 14dd582488072123a353c967664ed9a3f636865bb35e64d7256dcc809539129fa47c7979a4009fd45c9341cac537a4ca6b4b617ba2cae1d3995a7c251376339f
+DIST nsync-1.25.0.tar.gz 155250 BLAKE2B e30e9a72d999e589a1422014f81fbab29f61802b0ebeb9f08793d3a4d50fb5f66e404558cb7f46f2a2c499c1804cd013c12604038222121680988c85b7e186ff SHA512 8e7a3b99237fb68bf3fd85490394e3fe2b73ff805b1bc885549856908599b98c86600c71888d19d9d36a56caa91cad176a1e9fc413686e5018cefe3908364c6b
diff --git a/dev-libs/nsync/nsync-1.25.0.ebuild b/dev-libs/nsync/nsync-1.25.0.ebuild
new file mode 100644
index 000000000000..9f9a537adafb
--- /dev/null
+++ b/dev-libs/nsync/nsync-1.25.0.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake
+
+DESCRIPTION="C library that exports various synchronization primitives, such as mutexes"
+HOMEPAGE="https://github.com/google/nsync"
+SRC_URI="https://github.com/google/nsync/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+src_configure() {
+	local mycmakeargs=(
+		-DNSYNC_ENABLE_TESTS=$(usex test)
+	)
+	cmake_src_configure
+}
diff --git a/dev-libs/rccl/Manifest b/dev-libs/rccl/Manifest
index b50fab6d5c7b..801fbb23f13b 100644
--- a/dev-libs/rccl/Manifest
+++ b/dev-libs/rccl/Manifest
@@ -1,3 +1,4 @@
 DIST rccl-4.0.0.tar.gz 741814 BLAKE2B c20178e45fb7787ef7f5e20326f91f11a1b2a575277b5f28591b0be6efa6730c3509b11255372648f1df50e33b5e593dbe9c3334c5001f39423fc70acfa49d07 SHA512 d25754895d7b5695e46031642c2550cf2b6b5c42628d8381a23d6d1a48699a14a4fdf842205a14b96bdd1339341f9e558492ef9366a63036d8a8a7011d2c1b05
 DIST rccl-4.3.0.tar.gz 836631 BLAKE2B c7fede9cf92d3e75b79da2874c0a1e45c5fd4ad9d24b11c9870e9fdef8d571a286cbf54ae0a033f2aec3d21b06cafc2b1c097aaf87ecd628f0c33e9267103be1 SHA512 1a27e6441955f01c853861f83743da2fc9597978c3ff99f238734d4bafb1e277d626811b72c6a12563d69b2b8265960b8a2566df618921557837035b92993f0e
 DIST rccl-5.0.2.tar.gz 888060 BLAKE2B f75d83b0f52487b4f7a2d30763ae4fb0d216fc353e62de981057cb855d5b26c7b846622c76330029c1ed5bd195695308bcef5c67d39526032dfee254084a40f7 SHA512 ee62720926008f67fcae0fc9a6ace23ca593a156f74fce6012ff2a6fcffdc2e2dc70d48cd3830b217e68449ba3e677b4005d20bd4554aeccf17cba56713cb00f
+DIST rccl-5.1.3.tar.gz 908274 BLAKE2B 46bff7b6e3d60d5884ccd7e19c54b2f47f90a337a8fdc6dca1a3cfee147e3652e1f912642cc134d4a82bf8daabd9f1391edff139d0517ab1078bd3d9650481d7 SHA512 20deb27c7ef3e6b6b73409950ac0d51286b4634f7002ce36a9a02cdd1d5b1f2db51f6decf773af83364c94f58cc96837da25299f5f5494fc15d8559a1b3c7fcc
diff --git a/dev-libs/rccl/files/rccl-5.1.3-remove-chrpath.patch b/dev-libs/rccl/files/rccl-5.1.3-remove-chrpath.patch
new file mode 100644
index 000000000000..26bad572c7d8
--- /dev/null
+++ b/dev-libs/rccl/files/rccl-5.1.3-remove-chrpath.patch
@@ -0,0 +1,32 @@
+Manually chrpath not needed in CMakeLists since CMAKE_SKIP_RPATH=On
+So chrpath dependency is not needed
+===================================================================
+--- rccl-rocm-5.1.3.orig/test/CMakeLists.txt
++++ rccl-rocm-5.1.3/test/CMakeLists.txt
+@@ -5,11 +5,6 @@ if(BUILD_TESTS)
+ 
+   message("Going to build unit tests (Installed in /test/UnitTests)")
+ 
+-  find_program(CHRPATH chrpath)
+-  if(NOT CHRPATH)
+-      message(FATAL_ERROR "chrpath is required for UnitTests. Please install (e.g. sudo apt-get install chrpath)")
+-  endif()
+-
+   include_directories(${GTEST_INCLUDE_DIRS})
+ 
+   if(BUILD_ALLREDUCE_ONLY)
+@@ -88,14 +83,6 @@ if(BUILD_TESTS)
+   # HIPCC adds /opt/rocm/lib as RPATH, even though the install process is supposed to
+   # remove RPATH.  It also occurs before any user-specified rpath, which effectively overrides the user rpath.
+   #  As a work-around, set the correct RPATH for the unit test executable as a post-install step
+-  if (CMAKE_INSTALL_PREFIX MATCHES "${ROCM_PATH}")
+-    # install_prefix/CMAKE_INSTALL_PREFIX was not explicitly specified, so look in build/release
+-    add_custom_command( TARGET UnitTests POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_BINARY_DIR}:${ROCM_PATH}/lib ${CMAKE_BINARY_DIR}/test/UnitTests)
+-    add_custom_command( TARGET UnitTestsMultiProcess POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_BINARY_DIR}:${ROCM_PATH}/lib ${CMAKE_BINARY_DIR}/test/UnitTestsMultiProcess)
+-  else()
+-    add_custom_command( TARGET UnitTests POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_INSTALL_PREFIX}/lib:${ROCM_PATH}/lib ${CMAKE_INSTALL_PREFIX}/test/UnitTests)
+-    add_custom_command( TARGET UnitTestsMultiProcess POST_BUILD COMMAND chrpath ARGS -r ${CMAKE_INSTALL_PREFIX}/lib:${ROCM_PATH}/lib ${CMAKE_INSTALL_PREFIX}/test/UnitTestsMultiProcess)
+-  endif()
+ else()
+   message("Not building unit tests")
+ endif()
diff --git a/dev-libs/rccl/rccl-5.1.3.ebuild b/dev-libs/rccl/rccl-5.1.3.ebuild
new file mode 100644
index 000000000000..b7256c9d8ed4
--- /dev/null
+++ b/dev-libs/rccl/rccl-5.1.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake edo rocm
+
+DESCRIPTION="ROCm Communication Collectives Library (RCCL)"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rccl"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-${PV}.tar.gz -> rccl-${PV}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="test"
+
+RDEPEND="dev-util/hip
+dev-util/rocm-smi:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/cmake-3.22
+	>=dev-util/rocm-cmake-5.0.2-r1
+	test? ( dev-cpp/gtest )"
+
+RESTRICT="!test? ( test )"
+S="${WORKDIR}/rccl-rocm-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.0.2-change_install_location.patch"
+	"${FILESDIR}/${PN}-5.1.3-remove-chrpath.patch"
+)
+
+src_configure() {
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DSKIP_RPATH=On
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TESTS=$(usex test ON OFF)
+		-Wno-dev
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	LD_LIBRARY_PATH="${BUILD_DIR}" edob test/UnitTests
+}
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-libxml2.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-libxml2.patch
new file mode 100644
index 000000000000..df8d992c62d8
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-libxml2.patch
@@ -0,0 +1,225 @@
+https://sourceforge.net/p/xmlrpc-c/code/3151
+https://bugs.gentoo.org/870253
+--- a/common.mk
++++ b/common.mk
+@@ -281,7 +281,7 @@
+         -L$(BLDDIR)/lib/expat/xmlparse -lxmlrpc_xmlparse \
+         -L$(BLDDIR)/lib/expat/xmltok   -lxmlrpc_xmltok
+ else
+-  LDLIBS_XML = $(shell xml2-config --libs)
++  LDLIBS_XML = $(shell ${PKG_CONFIG} libxml-2.0 --libs)
+ endif
+ 
+ # LIBXMLRPC_UTIL_LIBDEP is the string of linker options you need on the link
+--- a/configure
++++ b/configure
+@@ -628,9 +628,8 @@
+ CC_WARN_FLAGS
+ CXX_COMPILER_GNU
+ C_COMPILER_GNU
++HAVE_LIBWWW_SSL_DEFINE
+ ENABLE_LIBXML2_BACKEND
+-have_xml2_config
+-HAVE_LIBWWW_SSL_DEFINE
+ HAVE_ABYSS_OPENSSL_DEFINE
+ MUST_BUILD_ABYSS_OPENSSL
+ HAVE_OPENSSL
+@@ -781,8 +780,8 @@
+ enable_cplusplus
+ enable_abyss_threads
+ enable_abyss_openssl
++enable_libxml2_backend
+ with_libwww_ssl
+-enable_libxml2_backend
+ '
+       ac_precious_vars='build_alias
+ host_alias
+@@ -6053,62 +6053,39 @@
+ fi
+
+
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for Libxml2 library" >&5
++$as_echo_n "checking for Libxml2 library... " >&6; }
++
++if ${PKG_CONFIG} libxml-2.0; then
++  HAVE_LIBXML2=yes
++else
++  HAVE_LIBXML2=no
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $HAVE_LIBXML2" >&5
++$as_echo "$HAVE_LIBXML2" >&6; }
++
++# Check whether --enable-libxml2-backend was given.
++if test "${enable_libxml2_backend+set}" = set; then :
++  enableval=$enable_libxml2_backend;
++else
++  enable_libxml2_backend=no
++fi
++
++{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libxml2 backend" >&5
++$as_echo_n "checking whether to build the libxml2 backend... " >&6; }
++{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libxml2_backend" >&5
++$as_echo "$enable_libxml2_backend" >&6; }
++
++if test $enable_libxml2_backend = yes; then
++  if test $HAVE_LIBXML2 = no; then
++    as_fn_error $? "You specified --enable-libxml2_backend, but don't appear to have libxml2 installed (no pkg-config file for it in your pkg-config search path), so we cannot not build for libxml2" "$LINENO" 5
++  fi
++fi
++
++ENABLE_LIBXML2_BACKEND=$enable_libxml2_backend
++
++
+-# Check whether --enable-libxml2-backend was given.
+-if test "${enable_libxml2_backend+set}" = set; then :
+-  enableval=$enable_libxml2_backend;
+-else
+-  enable_libxml2_backend=no
+-fi
+-
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to build the libxml2 backend" >&5
+-$as_echo_n "checking whether to build the libxml2 backend... " >&6; }
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $enable_libxml2_backend" >&5
+-$as_echo "$enable_libxml2_backend" >&6; }
+-
+-if test $enable_libxml2_backend = yes; then
+-  # Extract the first word of "xml2-config", so it can be a program name with args.
+-set dummy xml2-config; ac_word=$2
+-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+-$as_echo_n "checking for $ac_word... " >&6; }
+-if ${ac_cv_prog_have_xml2_config+:} false; then :
+-  $as_echo_n "(cached) " >&6
+-else
+-  if test -n "$have_xml2_config"; then
+-  ac_cv_prog_have_xml2_config="$have_xml2_config" # Let the user override the test.
+-else
+-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+-for as_dir in $PATH
+-do
+-  IFS=$as_save_IFS
+-  test -z "$as_dir" && as_dir=.
+-    for ac_exec_ext in '' $ac_executable_extensions; do
+-  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+-    ac_cv_prog_have_xml2_config="yes"
+-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+-    break 2
+-  fi
+-done
+-  done
+-IFS=$as_save_IFS
+-
+-  test -z "$ac_cv_prog_have_xml2_config" && ac_cv_prog_have_xml2_config="no"
+-fi
+-fi
+-have_xml2_config=$ac_cv_prog_have_xml2_config
+-if test -n "$have_xml2_config"; then
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_xml2_config" >&5
+-$as_echo "$have_xml2_config" >&6; }
+-else
+-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+-$as_echo "no" >&6; }
+-fi
+-
+-
+-  if test $have_xml2_config = no; then
+-    as_fn_error $? "You specified --enable-libxml2_backend, but don't appear to have libxml2 installed (no working xml2-config in your command search path), so we cannot not build for libxml2" "$LINENO" 5
+-  fi
+-fi
+-ENABLE_LIBXML2_BACKEND=$enable_libxml2_backend
+ 
+ 
+ C_COMPILER_GNU=$ac_cv_c_compiler_gnu
+--- a/configure.in
++++ b/configure.in
+@@ -742,6 +742,36 @@
+ 
+ 
+ dnl =======================================================================
++dnl Finding Libxml2
++dnl =======================================================================
++
++AC_MSG_CHECKING(for Libxml2 library)
++
++if ${PKG_CONFIG} libxml-2.0; then
++  HAVE_LIBXML2=yes
++else
++  HAVE_LIBXML2=no
++fi
++
++AC_MSG_RESULT($HAVE_LIBXML2)
++
++AC_ARG_ENABLE(libxml2-backend,
++  [  --enable-libxml2-backend  Use libxml2 instead of built-in expat], ,
++enable_libxml2_backend=no)
++AC_MSG_CHECKING(whether to build the libxml2 backend)
++AC_MSG_RESULT($enable_libxml2_backend)
++
++if test $enable_libxml2_backend = yes; then
++  if test $HAVE_LIBXML2 = no; then
++    AC_MSG_ERROR([You specified --enable-libxml2_backend, but don't appear to have libxml2 installed (no pkg-config file for it in your pkg-config search path), so we cannot not build for libxml2])
++  fi
++fi
++
++ENABLE_LIBXML2_BACKEND=$enable_libxml2_backend
++AC_SUBST(ENABLE_LIBXML2_BACKEND)
++
++
++dnl =======================================================================
+ dnl Checks for build options.
+ dnl =======================================================================
+ 
+@@ -763,22 +793,6 @@
+ fi
+ AC_SUBST(HAVE_LIBWWW_SSL_DEFINE)
+ 
+-dnl Check to see if we should build the libxml2 backend.
+-AC_ARG_ENABLE(libxml2-backend,
+-  [  --enable-libxml2-backend  Use libxml2 instead of built-in expat], ,
+-enable_libxml2_backend=no)
+-AC_MSG_CHECKING(whether to build the libxml2 backend)
+-AC_MSG_RESULT($enable_libxml2_backend)
+-
+-if test $enable_libxml2_backend = yes; then
+-  AC_CHECK_PROG(have_xml2_config, xml2-config, yes, no)
+-  if test $have_xml2_config = no; then
+-    AC_MSG_ERROR([You specified --enable-libxml2_backend, but don't appear to have libxml2 installed (no working xml2-config in your command search path), so we cannot not build for libxml2])
+-  fi
+-fi
+-ENABLE_LIBXML2_BACKEND=$enable_libxml2_backend
+-AC_SUBST(ENABLE_LIBXML2_BACKEND)
+-
+ dnl =======================================================================
+ dnl Compiler information
+ dnl =======================================================================
+--- a/src/Makefile
++++ b/src/Makefile
+@@ -68,7 +68,7 @@
+ 
+ ifeq ($(ENABLE_LIBXML2_BACKEND),yes)
+   XMLRPC_XML_PARSER = xmlrpc_libxml2
+-  XML_PARSER_LIBDEP = $(shell xml2-config --libs)
++  XML_PARSER_LIBDEP = $(shell ${PKG_CONFIG} libxml-2.0 --libs)
+   XML_PARSER_LIBDEP_DEP =
+   XML_PKGCONFIG_REQ = libxml-2.0
+ else
+@@ -276,7 +276,7 @@
+   -Isrcdir/lib/util/include \
+ 
+ ifeq ($(ENABLE_LIBXML2_BACKEND),yes)
+-  LIBXML_INCLUDES = $(shell xml2-config --cflags)
++  LIBXML_INCLUDES = $(shell ${PKG_CONFIG} libxml-2.0 --cflags)
+ else
+   LIBXML_INCLUDES = -Isrcdir/lib/expat/xmlparse
+ endif
+--- a/src/cpp/Makefile
++++ b/src/cpp/Makefile
+@@ -46,7 +46,7 @@
+ endif
+ 
+ ifeq ($(ENABLE_LIBXML2_BACKEND),yes)
+-  XML_PARSER_LIBDEP = $(shell xml2-config --libs)
++  XML_PARSER_LIBDEP = $(shell ${PKG_CONFIG} libxml-2.0 --libs)
+ else
+   XML_PARSER_LIBDEP = \
+     -L$(BLDDIR)/lib/expat/xmlparse -lxmlrpc_xmlparse \
diff --git a/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-openssl.patch b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-openssl.patch
new file mode 100644
index 000000000000..b39ae428f29b
--- /dev/null
+++ b/dev-libs/xmlrpc-c/files/xmlrpc-c-1.51.06-pkg-config-openssl.patch
@@ -0,0 +1,46 @@
+https://sourceforge.net/p/xmlrpc-c/code/3152
+https://bugs.gentoo.org/870253
+--- a/configure
++++ b/configure
+@@ -5974,11 +5974,11 @@
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for OpenSSL library" >&5
+ $as_echo_n "checking for OpenSSL library... " >&6; }
+
+-if pkg-config openssl; then
+-  HAVE_OPENSSL=yes
+-  OPENSSL_LDADD=$(pkg-config openssl --libs)
+-
+-  OPENSSL_CFLAGS=$(pkg-config openssl --cflags)
++if ${PKG_CONFIG} openssl; then
++  HAVE_OPENSSL=yes
++  OPENSSL_LDADD=$(${PKG_CONFIG} openssl --libs)
++ 
++  OPENSSL_CFLAGS=$(${PKG_CONFIG} openssl --cflags)
+
+ else
+   HAVE_OPENSSL=no
+
+--- a/config.mk.in
++++ b/config.mk.in
+@@ -59,6 +59,8 @@
+ C_COMPILER_GNU = @C_COMPILER_GNU@
+ CXX_COMPILER_GNU = @CXX_COMPILER_GNU@
+ 
++PKG_CONFIG ?= pkg-config
++
+ # Stuff 'configure' figured out via AC_CANONICAL_HOST macro in configure.in
+ # and config.guess program and 'configure' command options:
+
+--- a/lib/openssl/Makefile
++++ b/lib/openssl/Makefile
+@@ -25,8 +25,8 @@
+ 
+ MAJ := 1
+ 
+-OPENSSL_INCLUDES := $(shell pkg-config openssl --cflags)
+-OPENSSL_LIBS     := $(shell pkg-config openssl --libs)
++OPENSSL_INCLUDES := $(shell $(PKG_CONFIG) openssl --cflags)
++OPENSSL_LIBS     := $(shell $(PKG_CONFIG) openssl --libs)
+ 
+ include $(SRCDIR)/common.mk
+ 
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r3.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r3.ebuild
new file mode 100644
index 000000000000..2f376e845193
--- /dev/null
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.51.06-r3.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
+# 1. Only the "Super Stable" series is released as a tarball
+# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
+# Because of this, we are following the "Super Stable" release channel
+
+DESCRIPTION="A lightweight RPC library based on XML and HTTP"
+HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0/4.51"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( abyss curl cxx )"
+
+RDEPEND="
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+	libxml2? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.51.06-pkg-config-libxml2.patch
+	"${FILESDIR}"/${PN}-1.51.06-pkg-config-openssl.patch
+)
+
+pkg_setup() {
+	use curl || ewarn "Curl support disabled: No client library will be built"
+}
+
+src_prepare() {
+	sed -i \
+		-e "/CFLAGS_COMMON/s|-g -O3$||" \
+		-e "/CXXFLAGS_COMMON/s|-g$||" \
+		common.mk || die
+
+	default
+
+	# Out-of-source install phase is broken
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	tc-export PKG_CONFIG
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-libwww-client \
+		--disable-wininet-client \
+		--without-libwww-ssl \
+		$(use_enable abyss abyss-server) \
+		$(use_enable cgi cgi-server) \
+		$(use_enable curl curl-client) \
+		$(use_enable cxx cplusplus) \
+		$(use_enable libxml2 libxml2-backend) \
+		$(use_enable threads abyss-threads)
+}
+
+multilib_src_compile() {
+	default_src_compile
+	# Tools building is broken in this release
+	#multilib_is_native_abi && use tools && emake -rC "${S}"/tools
+}
+
+multilib_src_test() {
+	# Needed for tests, bug #836469
+	cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die
+	default_src_test
+}
+
+#multilib_src_install_all() {
+#	# Tools building is broken in this release
+#	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
+#}
diff --git a/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r1.ebuild b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r1.ebuild
new file mode 100644
index 000000000000..c473a0e5f5f2
--- /dev/null
+++ b/dev-libs/xmlrpc-c/xmlrpc-c-1.54.05-r1.ebuild
@@ -0,0 +1,88 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit multilib-minimal toolchain-funcs
+
+# Upstream maintains 3 release channels: http://xmlrpc-c.sourceforge.net/release.html
+# 1. Only the "Super Stable" series is released as a tarball
+# 2. SVN tagging of releases seems spotty: http://svn.code.sf.net/p/xmlrpc-c/code/release_number/
+# Because of this, we are following the "Super Stable" release channel
+
+DESCRIPTION="A lightweight RPC library based on XML and HTTP"
+HOMEPAGE="http://xmlrpc-c.sourceforge.net/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tgz"
+
+LICENSE="BSD"
+SLOT="0/4.54"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+
+IUSE="abyss +cgi +curl +cxx +libxml2 threads test"
+
+RESTRICT="!test? ( test )"
+
+REQUIRED_USE="test? ( abyss curl cxx )"
+
+RDEPEND="
+	sys-libs/ncurses:0=[${MULTILIB_USEDEP}]
+	sys-libs/readline:0=[${MULTILIB_USEDEP}]
+	curl? ( net-misc/curl[${MULTILIB_USEDEP}] )
+	libxml2? ( dev-libs/libxml2[${MULTILIB_USEDEP}] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.51.06-pkg-config-libxml2.patch
+	"${FILESDIR}"/${PN}-1.51.06-pkg-config-openssl.patch
+)
+
+pkg_setup() {
+	use curl || ewarn "Curl support disabled: No client library will be built"
+}
+
+src_prepare() {
+	sed -i \
+		-e "/CFLAGS_COMMON/s|-g -O3$||" \
+		-e "/CXXFLAGS_COMMON/s|-g$||" \
+		common.mk || die
+
+	default
+
+	# Out-of-source install phase is broken
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	tc-export PKG_CONFIG
+
+	ECONF_SOURCE="${S}" \
+	econf \
+		--disable-libwww-client \
+		--disable-wininet-client \
+		--without-libwww-ssl \
+		$(use_enable abyss abyss-server) \
+		$(use_enable cgi cgi-server) \
+		$(use_enable curl curl-client) \
+		$(use_enable cxx cplusplus) \
+		$(use_enable libxml2 libxml2-backend) \
+		$(use_enable threads abyss-threads)
+}
+
+multilib_src_compile() {
+	default_src_compile
+	# Tools building is broken in this release
+	#multilib_is_native_abi && use tools && emake -rC "${S}"/tools
+}
+
+multilib_src_test() {
+	# Needed for tests, bug #836469
+	cp "${BUILD_DIR}"/include/xmlrpc-c/config.h "${S}"/include/xmlrpc-c || die
+	default_src_test
+}
+
+#multilib_src_install_all() {
+#	# Tools building is broken in this release
+#	#use tools && emake DESTDIR="${D}" -rC "${S}"/tools install
+#}
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index b53d54b4b69d..0d8d3b6f3014 100644
Binary files a/dev-lisp/Manifest.gz and b/dev-lisp/Manifest.gz differ
diff --git a/dev-lisp/sbcl/metadata.xml b/dev-lisp/sbcl/metadata.xml
index 7522a07cf0f5..3f09daa0f10b 100644
--- a/dev-lisp/sbcl/metadata.xml
+++ b/dev-lisp/sbcl/metadata.xml
@@ -23,8 +23,8 @@
 	available for the x86 and amd64 platforms using an NPTL enabled
 	GLIBC. SBCL 0.8.17 and later support Unicode.
 	</longdescription>
-    <use>
-	    <flag name="capstone">Enable disassembly support with <pkg>dev-libs/capstone</pkg></flag>
+	<use>
+		<flag name="capstone">Enable disassembly support with <pkg>dev-libs/capstone</pkg></flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">sbcl</remote-id>
diff --git a/dev-ml/Manifest.gz b/dev-ml/Manifest.gz
index 3beac4408a15..16c278402340 100644
Binary files a/dev-ml/Manifest.gz and b/dev-ml/Manifest.gz differ
diff --git a/dev-ml/batteries/Manifest b/dev-ml/batteries/Manifest
index 6f2029dda661..1b62bb6f9c84 100644
--- a/dev-ml/batteries/Manifest
+++ b/dev-ml/batteries/Manifest
@@ -1 +1,2 @@
 DIST batteries-3.4.0.tar.gz 827778 BLAKE2B 569ce623ceb4272de784400540969a08d569a9b42e281f8001f046733a0fab6f50f4c195b8a8eec7f2e63209a1b882d6703843f76ec9adbfeb42d11e09b31f81 SHA512 e7a6e258430ec5bb97a1e83c7eb666c970db8bce82de4bf809797cf5e330ea987fe685008c4adb0ac4787c4cc6a1be06f6eae5a7ca856a1a0f83aa35716c23bd
+DIST batteries-3.5.1.tar.gz 835112 BLAKE2B 29602093e5d3789a2b80e1c36e2d5b29d9c286c1bcd272f84d71660eb2014b7dea82c25543c17656987f5d0870628a4af83eaace30f7edef960f8956b26eeb91 SHA512 36c8561079aa9fefc864c2f03bd8ae20aa05987bb67e7a9beac3ab4f440dbf7d44f141c172b05fddb1a5b618fc55a27962bb45fc39bd7b3a15d56e0ed3ff3870
diff --git a/dev-ml/batteries/batteries-3.5.1.ebuild b/dev-ml/batteries/batteries-3.5.1.ebuild
new file mode 100644
index 000000000000..3ba6fc834d33
--- /dev/null
+++ b/dev-ml/batteries/batteries-3.5.1.ebuild
@@ -0,0 +1,31 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit findlib
+
+DESCRIPTION="A community-maintained standard library extension"
+HOMEPAGE="https://github.com/ocaml-batteries-team/batteries-included/"
+SRC_URI="https://github.com/ocaml-batteries-team/batteries-included/archive/v${PV}.tar.gz
+	-> ${P}.tar.gz"
+S="${WORKDIR}"/batteries-included-${PV}
+
+LICENSE="LGPL-2.1-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+RESTRICT="test"
+
+RDEPEND="
+	${DEPEND}
+	dev-ml/num:=
+"
+BDEPEND="dev-ml/ocamlbuild"
+
+src_compile() {
+	emake BATTERIES_NATIVE=$(usex ocamlopt yes no)
+}
+
+src_install() {
+	findlib_src_install BATTERIES_NATIVE=$(usex ocamlopt yes no)
+}
diff --git a/dev-ml/pprint/Manifest b/dev-ml/pprint/Manifest
index 3a38bd294900..f570a9b665e2 100644
--- a/dev-ml/pprint/Manifest
+++ b/dev-ml/pprint/Manifest
@@ -1 +1,2 @@
 DIST pprint-20211129.tar.gz 42778 BLAKE2B b5becf959d750e07ecf12c58cf6f41ff10f841d8034e9f89544b28e81eefdf564e2144a102fa918256736bb092de454eba13dfa38363e1ed230742eb95817e9d SHA512 12133735f558075f1ecdcec16cc11f7237dd82883c542645c479f534acd8ed6935f05a3f9aad8e330c329520852bdff6d420d632636bd9004a4d0aade762cae6
+DIST pprint-20220103.tar.gz 47809 BLAKE2B c581370be13f45d2d97a9fe7a6f7e81fc033a33a2f1740dcc808ce388356554506c00393efb05937b5833ae19fbf01c1fc9d013024d11724ef323110925bce88 SHA512 1c4d85e529414dc2d52602fae7e44ca036d2d35e9ce1906fd88b0f8a8d0ba1527042b0e5117fdeb51237b2311020a711065a917cc158b63e2ac932c97fa28406
diff --git a/dev-ml/pprint/pprint-20220103.ebuild b/dev-ml/pprint/pprint-20220103.ebuild
new file mode 100644
index 000000000000..1b02c9dd5c4e
--- /dev/null
+++ b/dev-ml/pprint/pprint-20220103.ebuild
@@ -0,0 +1,15 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="A pretty-printing combinator library and rendering engine"
+HOMEPAGE="https://github.com/fpottier/pprint/"
+SRC_URI="https://github.com/fpottier/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2 LGPL-2-with-linking-exception"
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~x86"
+IUSE="+ocamlopt"
diff --git a/dev-ml/spawn/Manifest b/dev-ml/spawn/Manifest
index 8fec981a8019..2561a39aa399 100644
--- a/dev-ml/spawn/Manifest
+++ b/dev-ml/spawn/Manifest
@@ -1,2 +1,3 @@
 DIST spawn-0.13.0.tar.gz 13048 BLAKE2B f64815c99b3ee7a0e4a18c33012df658e57d7973101ced83aa509c2dfa6455b59b110cc61477da0750305fb8b81ed4a1436a6a7418313185644ea531745a80da SHA512 897ffec4a4c15c819e4429f6b71427005d6b40df6039e6c7f0b1ca4b4e35b24304dc56e27ce88bd81f5b61f936444f5d6e80ea14483991067aa6ee072f4a90dc
 DIST spawn-0.15.0.tar.gz 15808 BLAKE2B 72c29c012c3aa700b345e6c5b5a5b8bed4576c721cd9fa435c652e0605cc88bb545247e5a8284b7603e22ca5ab27d36042c6d8020742fc5e9e7b762167a9f864 SHA512 3a775b57a73efee6adbc30b32fa779f27d11c7008a46f90fdb9da6288533e2d83fc49dbcd770c087f2e4560c5586ff72a9a2985d8929955773cc10d83f126013
+DIST spawn-0.15.1.tar.gz 15861 BLAKE2B 95478f0f575688ba66dc69229463c6cf029c39e6edf8cead2d38dfa0fc01bacf85d63f09d6d084d96a2537c55b02184ce69166be12628a8046c7e007222f648c SHA512 efdb31d5ec5ea36d0bc80224d4ee04e46ce3428d1662870e6cebece92bc313d6eebee378802c0c059dd6e0cafea515308c31b7dfaf04a098eb4566583c1e9ed4
diff --git a/dev-ml/spawn/spawn-0.15.1.ebuild b/dev-ml/spawn/spawn-0.15.1.ebuild
new file mode 100644
index 000000000000..3d2f2b12da2e
--- /dev/null
+++ b/dev-ml/spawn/spawn-0.15.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="Spawning sub-processes"
+HOMEPAGE="https://github.com/janestreet/spawn"
+SRC_URI="https://github.com/janestreet/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0/$(ver_cut 1-2)"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="+ocamlopt test"
+RESTRICT="!test? ( test )"
+
+BDEPEND="test? ( dev-ml/ppx_expect )"
diff --git a/dev-ml/yojson/Manifest b/dev-ml/yojson/Manifest
index 411b2a92266e..de9acdd856c1 100644
--- a/dev-ml/yojson/Manifest
+++ b/dev-ml/yojson/Manifest
@@ -1,2 +1,3 @@
 DIST yojson-1.7.0.tar.gz 29704 BLAKE2B edbd7f66d69a85880fc8ee9bb25a993744a310887024f7af63665ba8f5067f1b9383ec4d6dd5f4ca3376d698665a8f605c078f7597ddd4e71857c1a20143c2e5 SHA512 25eedb64e4bf7c7e8d5a5a115812cd502540afbdeb7c947da3a14e5968aa0a7db8ab402425662571d8935b9cd6a19796ce81dd80a65dc614f156626c60e7036e
 DIST yojson-2.0.0.tar.gz 44446 BLAKE2B 3b221a016ba418cc6a413921f0d7f2bc239b9a84953bbe9bec2601b159442f3e8bebdf48447367660fec3b3929ea0c08453778e491ce17f9044f505e49d587a6 SHA512 9196e117bb712b970351d12a8d7eae345eef2c92e70e627b58bb95ee49cd58e8a51e6eb5746e2468c15133d53a448ccd229a0568227de0cc8d2eed8b1985609b
+DIST yojson-2.0.2.tar.gz 46731 BLAKE2B adca246c055efe04b63e694b7735fc81a714ae3b3ab164152797cc1eff1e483976b80ff31d0ac90f9d4ac234304ec805abb118bb231d0479bc738ddeb56a236c SHA512 61e8084d66d62d05a7802ee82a414807a76959ce6e0b14fd01f1c9c71ea69976d8a2cf3d5718e4059da4161786136a08624cd8470693ef2893b862efa7d6ffd2
diff --git a/dev-ml/yojson/yojson-2.0.2.ebuild b/dev-ml/yojson/yojson-2.0.2.ebuild
new file mode 100644
index 000000000000..23350f1a6c06
--- /dev/null
+++ b/dev-ml/yojson/yojson-2.0.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit dune
+
+DESCRIPTION="JSON parsing and pretty-printing library for OCaml"
+HOMEPAGE="https://github.com/ocaml-community/yojson"
+SRC_URI="https://github.com/ocaml-community/yojson/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0/${PV}"
+KEYWORDS="~amd64"
+IUSE="examples +ocamlopt test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-lang/ocaml-4.02.3:=[ocamlopt?]
+	>=dev-ml/seq-0.2.2:=[ocamlopt?]
+"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-ml/cppo-1.6.1
+	test? ( dev-ml/alcotest )"
+
+src_prepare() {
+	default
+	# let's not build this
+	rm bench/dune yojson-bench.opam || die
+}
+
+src_install() {
+	dune_src_install
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+}
diff --git a/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.110.0.ebuild b/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.110.0.ebuild
index 366ebd16c3b2..df39e64a983b 100644
--- a/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.110.0.ebuild
+++ b/dev-perl/ExtUtils-CChecker/ExtUtils-CChecker-0.110.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="Configure-time utilities for using C headers"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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 ~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-ExtUtils-CBuilder
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index feffa85ba4a0..7222d00f2604 100644
Binary files a/dev-perl/Manifest.gz and b/dev-perl/Manifest.gz differ
diff --git a/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.270.0.ebuild b/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.270.0.ebuild
index dea4a3d57d51..898f40e07b67 100644
--- a/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.270.0.ebuild
+++ b/dev-perl/Syntax-Keyword-Try/Syntax-Keyword-Try-0.270.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="a try/catch/finally syntax for Perl"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 
 RDEPEND="dev-perl/XS-Parse-Keyword"
 BDEPEND="${RDEPEND}
diff --git a/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.250.0.ebuild b/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.250.0.ebuild
index 2f65d4a08d28..d7e5cd4d5edf 100644
--- a/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.250.0.ebuild
+++ b/dev-perl/XS-Parse-Keyword/XS-Parse-Keyword-0.250.0.ebuild
@@ -9,7 +9,7 @@ inherit perl-module
 
 DESCRIPTION="XS functions to assist in parsing keyword syntax"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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 ~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-php/Manifest.gz b/dev-php/Manifest.gz
index c8cf06074bd4..9c4d393e0457 100644
Binary files a/dev-php/Manifest.gz and b/dev-php/Manifest.gz differ
diff --git a/dev-php/mockery/mockery-0.9.0-r1.ebuild b/dev-php/mockery/mockery-0.9.0-r1.ebuild
index 72490762ba9e..33c4ee18e58d 100644
--- a/dev-php/mockery/mockery-0.9.0-r1.ebuild
+++ b/dev-php/mockery/mockery-0.9.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6
@@ -9,7 +9,7 @@ inherit php-pear-r2
 
 DESCRIPTION="Simple yet flexible PHP mock object framework for use in unit testing"
 HOMEPAGE="https://github.com/padraic/mockery"
-SRC_URI="http://${PHP_PEAR_URI}/get/${PEAR_P}.tgz"
+SRC_URI="http://${PHP_PEAR_DOMAIN}/get/${PEAR_P}.tgz"
 
 LICENSE="BSD"
 SLOT="0"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index ea16ab492bed..dfa609d11c14 100644
Binary files a/dev-python/Manifest.gz and b/dev-python/Manifest.gz differ
diff --git a/dev-python/MechanicalSoup/Manifest b/dev-python/MechanicalSoup/Manifest
index 32f0e612a905..d4203bb62d6a 100644
--- a/dev-python/MechanicalSoup/Manifest
+++ b/dev-python/MechanicalSoup/Manifest
@@ -1 +1,2 @@
 DIST MechanicalSoup-1.1.0.tar.gz 49270 BLAKE2B 947b35d819dc69508595adcfe5a0c8e6bd34888c995e9c3931613498ee1ca840ce16a14359aacbf9d40aa4f9ae59d45d14da5a150e3ce39ae7e72f587c94820e SHA512 26eaa54bcd1c0aac26504d7c482ed001830a1c79bf48a3055cef92348e9336887bef86cda68281911032159a3404a1f4ee8de9b6516d7d767cfd6b3b380c4ebe
+DIST MechanicalSoup-1.2.0.tar.gz 49669 BLAKE2B a9791fd2d389c8a553ed0acce179094770651553b7aaf299ec6779509b4ffb1bb97a4a4afe01af3e4ccb56cf100b5bacc39e9aedf1143a9eb6f4b98dbb020062 SHA512 5857274e07c678dc0e19ad4fef828ccf41bb846edad566c2da9914144ced8802efd546265efac792acbb885b29cab5cde4ac3cd2002826a8bb31f91004eb2caa
diff --git a/dev-python/MechanicalSoup/MechanicalSoup-1.2.0.ebuild b/dev-python/MechanicalSoup/MechanicalSoup-1.2.0.ebuild
new file mode 100644
index 000000000000..c44576b3c1e6
--- /dev/null
+++ b/dev-python/MechanicalSoup/MechanicalSoup-1.2.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A Python library for automating interaction with websites"
+HOMEPAGE="
+	https://github.com/MechanicalSoup/MechanicalSoup/
+	https://pypi.org/project/MechanicalSoup/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+IUSE="examples"
+
+RDEPEND="
+	>=dev-python/beautifulsoup4-4.7[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		>=dev-python/requests-mock-1.3.0[${PYTHON_USEDEP}]
+		dev-python/pytest-httpbin[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs
+
+python_prepare_all() {
+	# Override pytest options to skip coverage and flake8
+	sed -e '/^addopts =/d' -i setup.cfg || die
+	distutils-r1_python_prepare_all
+}
+
+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/PyPDF2/Manifest b/dev-python/PyPDF2/Manifest
index 1cb39d6d1666..bd1de2f51492 100644
--- a/dev-python/PyPDF2/Manifest
+++ b/dev-python/PyPDF2/Manifest
@@ -3,5 +3,6 @@ DIST PyPDF2-2.10.4.gh.tar.gz 6435008 BLAKE2B 00f4b2f65198026715186dbf1ced15e825c
 DIST PyPDF2-2.10.5.gh.tar.gz 6443691 BLAKE2B 6b60ea4d1a044ee5f20718744118f5739a4271a0552960e2760c4904f57201ed8426d4cb81ce5f5d2170b84958e1b17ea3de843137e669ed7b202a49db8654c2 SHA512 cf07448b2ea4397f1bf5b2d563956bda218e9031b4396e86c2d689d518c7c2b17920771dbdf0e5ed6013dd96d957add12d3f4fbdf3a8bd3262a1fae38ae741d8
 DIST PyPDF2-2.10.6.gh.tar.gz 6443648 BLAKE2B 4b5282363dea4bcec65ee6fddec787a95055ae900636b75c118fa3f2a4f5afc73807425b611c81cff6a580d4109c4df14083a1f64d7d6c373a1cd6ff9cb92fb3 SHA512 c158e6eec44429bdc103cd7f0e358289a14de92dc1d23b77f58e45a7a9851e9072fab3c8c5710f1755fdc5093380d3756db4fd12d0bdc8461cb9119d499fe012
 DIST PyPDF2-2.10.8.gh.tar.gz 6444481 BLAKE2B 888cfb7977dd34c5b7d12d0fc9d2e81aaa76b837036e98537fc0829dedb6193ea4f5e9c40d2a677b036f9fc2ff09adb47afde8ad7d1e5e037613e1dda93c8faf SHA512 29bcadfb8e7fd9285ffe7b5d706cd43bec3ce9b80425232d77b834010513cd9907bf65d90e820ee1d0718be0ed384a7ff3e097c4d16d614d6cd89e272e767174
+DIST PyPDF2-2.10.9.gh.tar.gz 6448504 BLAKE2B 5508ce0b2b0d3cb00f1057a4e52dafde3ff0dbf5eaa79be46e9d20a5041b76968fd46ba74b86f15e9fb2948f2c053fd1f722f11806cfbed552d241a768d01f00 SHA512 43aec1a381e97b26145b7c8e3414a4cab33d0d03520be73b3e5e4c9565db10e9bfd764280b56f328ec5931cc41d1a6f558b29d59d0930d92de8da00b52e2f7da
 DIST PyPDF2-sample-files-b6f4ff3de00745783d79f25cb8803901d1f20d28.gh.tar.gz 5522867 BLAKE2B 9a6cb3b92032f9ec697b972b1a257b2c2528d36cd4a7e40092ac6dbf0a4955c5b204b8c82d37f9bad4a19fccddf0070b095ee2f3b56de22d738ed3d8a3b555c0 SHA512 74aad38060f441ace87f6650de152a28f4a251e4f47574a8d46066857c8fbbb187cd3cd275caa198dce2c1557e90664b288f071995c2bbb9bf13a341210313e8
 DIST PyPDF2-sample-files-bedcbe077c4898e1b97c6c6f81d937f5048b4630.gh.tar.gz 7198720 BLAKE2B 91d177e7329fd137322972a3a38841cb0611de7f839071fe2fa5ecff0343cbffdf6976f42f4a779f520a8a2bac2d6573c5cd65bf2f1bc68395077e6e9c7322d9 SHA512 0cdaee85f1da12cf678165f06c8d351aa0808137d25f68c07f19f1bd3c929eeb52e604041dfaa0df94665379aeb7d19a43426d724a5e6602b7e4fbe7a62e753d
diff --git a/dev-python/PyPDF2/PyPDF2-2.10.9.ebuild b/dev-python/PyPDF2/PyPDF2-2.10.9.ebuild
new file mode 100644
index 000000000000..66b49dd2cca4
--- /dev/null
+++ b/dev-python/PyPDF2/PyPDF2-2.10.9.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+SAMPLE_COMMIT=bedcbe077c4898e1b97c6c6f81d937f5048b4630
+DESCRIPTION="Python library to work with PDF files"
+HOMEPAGE="
+	https://pypi.org/project/PyPDF2/
+	https://github.com/py-pdf/PyPDF2/
+"
+SRC_URI="
+	https://github.com/py-pdf/PyPDF2/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
+	)
+"
+
+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}"/* "${P}"/sample-files/ || die
+	fi
+}
diff --git a/dev-python/aiohttp/Manifest b/dev-python/aiohttp/Manifest
index 7c1042028406..aa09c3538b38 100644
--- a/dev-python/aiohttp/Manifest
+++ b/dev-python/aiohttp/Manifest
@@ -1 +1,2 @@
 DIST aiohttp-3.8.1.tar.gz 7324180 BLAKE2B 99f85b8510782a31de2d2f6c8efa65ef5c5cde600a5c5f49d6362d5833a0443b9adcaed9beb27c5d8502aca37af154b06017f48836b73d4c61d78204b62b7f05 SHA512 3611549393e50c8d30426aee9ddd23794a71ddefe4384eb549049b93e452fafb38de7ad900737213b61fbe717bd85035a780c1622593eae250328f17d484a0a7
+DIST aiohttp-3.8.3.tar.gz 7337480 BLAKE2B 28d2b5bf6dd6f19506127747511e006c22fcb59959ab090bdc53ca5ee0f7f186aedb0c8b4103c2ea52399dc998fa2e6d3f872239223cf72629a1168e3950f1f8 SHA512 248c232604c91442b2fc9fa55fbf7df8e3af56dcf4cd9c516414a3a738c5c60a8a06395cd9c6e2c8ea9884728aea757423735c7b9be889e6f17e3ee6395a2f64
diff --git a/dev-python/aiohttp/aiohttp-3.8.3.ebuild b/dev-python/aiohttp/aiohttp-3.8.3.ebuild
new file mode 100644
index 000000000000..357bff009c56
--- /dev/null
+++ b/dev-python/aiohttp/aiohttp-3.8.3.ebuild
@@ -0,0 +1,111 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="HTTP client/server for asyncio"
+HOMEPAGE="
+	https://github.com/aio-libs/aiohttp/
+	https://pypi.org/project/aiohttp/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	app-arch/brotli[python,${PYTHON_USEDEP}]
+	>=dev-python/aiosignal-1.1.2[${PYTHON_USEDEP}]
+	>=dev-python/async-timeout-4.0.0_alpha3[${PYTHON_USEDEP}]
+	>=dev-python/attrs-17.3.0[${PYTHON_USEDEP}]
+	>=dev-python/charset_normalizer-2.0[${PYTHON_USEDEP}]
+	>=dev-python/frozenlist-1.1.1[${PYTHON_USEDEP}]
+	>=dev-python/multidict-4.5.0[${PYTHON_USEDEP}]
+	>=dev-python/yarl-1.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		app-arch/brotli[python,${PYTHON_USEDEP}]
+		dev-python/async_generator[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		www-servers/gunicorn[${PYTHON_USEDEP}]
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		dev-python/re-assert[${PYTHON_USEDEP}]
+		!hppa? ( !ia64? (
+			dev-python/trustme[${PYTHON_USEDEP}]
+		) )
+	)
+"
+
+DOCS=( CHANGES.rst CONTRIBUTORS.txt README.rst )
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	'>=dev-python/alabaster-0.6.2' \
+	'dev-python/sphinxcontrib-asyncio' \
+	'dev-python/sphinxcontrib-blockdiag' \
+	'dev-python/sphinxcontrib-newsfeed' \
+	'dev-python/sphinxcontrib-spelling' \
+	'dev-python/sphinx' \
+	'dev-python/sphinx-aiohttp-theme'
+
+src_prepare() {
+	# increase the timeout a little
+	sed -e '/abs_tol=/s/0.001/0.01/' -i tests/test_helpers.py || die
+
+	# xfail_strict fails on py3.10
+	sed -i -e '/--cov/d' -e '/xfail_strict/d' setup.cfg || die
+
+	# which(1)...
+	sed -i -e 's:which:command -v:' Makefile || die
+
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	# workaround missing files
+	mkdir requirements tools || die
+	> requirements/cython.txt || die
+	> tools/gen.py || die
+	chmod +x tools/gen.py || die
+	# force rehashing first
+	emake requirements/.hash/cython.txt.hash
+	> .update-pip || die
+	> .install-cython || die
+	emake cythonize
+}
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# proxy is not packaged
+		tests/test_proxy_functional.py
+	)
+
+	local EPYTEST_DESELECT=(
+		# Internet
+		tests/test_client_session.py::test_client_session_timeout_zero
+	)
+
+	case ${EPYTHON} in
+		pypy3)
+			EPYTEST_DESELECT+=(
+				# C extensions are not used on PyPy3
+				tests/test_http_parser.py::test_c_parser_loaded
+			)
+			;;
+	esac
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=pytest_mock,xdist.plugin,pytest_forked
+	rm -rf aiohttp || die
+	epytest -n "$(makeopts_jobs)" --forked
+}
diff --git a/dev-python/apsw/apsw-3.39.2.1-r1.ebuild b/dev-python/apsw/apsw-3.39.2.1-r1.ebuild
index a8edc30d8529..2e0e6c51a7da 100644
--- a/dev-python/apsw/apsw-3.39.2.1-r1.ebuild
+++ b/dev-python/apsw/apsw-3.39.2.1-r1.ebuild
@@ -30,10 +30,11 @@ RDEPEND="
 	${DEPEND}
 "
 
-python_compile() {
-	# Needed for e.g. bug #851741
-	# Enable column-metadata to match dev-db/sqlite
-	distutils-r1_python_compile --enable=load_extension,column_metadata
+src_configure() {
+	cat >> setup.cfg <<-EOF || die
+		[build_ext]
+		enable=load_extension,column_metadata
+	EOF
 }
 
 python_test() {
diff --git a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild
index 26a326d0d3ba..8d805c38c984 100644
--- a/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild
+++ b/dev-python/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="cpu_flags_x86_sse2"
 
 DEPEND="
diff --git a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild
index dfdf08ce4462..81333afeec08 100644
--- a/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild
+++ b/dev-python/argon2-cffi/argon2-cffi-21.3.0-r2.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/argon2-cffi-bindings-21.2.0[${PYTHON_USEDEP}]
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index efbfc5d3572f..348d4652d017 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1 +1,2 @@
 DIST aws-sam-translator-1.50.0.gh.tar.gz 1103467 BLAKE2B 8d9408b7e92a5c515da47075a0722c937223e73dfa99d92d6daf91997a2edf4e1854afb88f7020fdab3457453d1c54ea77cf7e3466ec71ede36bfb3fc9c469fa SHA512 2f8f494218a1ac018893de59e7bede88b73ce446b29cc818d9309275851b080608656f69c422a9b49c885a6e6cbe7f34826f31cf4da9f2ee0667a1663dbee32a
+DIST aws-sam-translator-1.51.0.gh.tar.gz 1107033 BLAKE2B be5d46fa4caa7619c0b959eeec65d0902fdb197369c84c930618398a9b4110c2b1e281c80e63c659be266bb6b2f191495c40578fde73ab31c93bd05906bd55e3 SHA512 d21f3d0b3d4947ad25811f0274e5807089a8d1e2aab76310a80a92f48cfe9ac683bcecea3c833692948f94934be5662cf7585aab0a4a949fcf368901d2e1b9a8
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.51.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.51.0.ebuild
new file mode 100644
index 000000000000..4194237c6fc3
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.51.0.ebuild
@@ -0,0 +1,59 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+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
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/serverless-application-model-${PV}"
+
+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/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	tests/validator/test_validator_api.py::TestValidatorApi::test_errors_13_error_definitionuri
+	tests/unit/test_region_configuration.py::TestRegionConfiguration::test_is_service_supported_positive_4_ec2
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_success_one_app
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sar_throttling_doesnt_stop_processing
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_sleep_between_sar_checks
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_transform_template_translate::test_unexpected_sar_error_stops_processing
+	tests/plugins/application/test_serverless_app_plugin.py::TestServerlessAppPlugin_on_before_and_on_after_transform_template::test_time_limit_exceeds_between_combined_sar_calls
+)
+
+python_prepare_all() {
+	# remove pytest-cov dependency
+	sed -i -e '/addopts/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
+}
diff --git a/dev-python/awxkit/Manifest b/dev-python/awxkit/Manifest
index d7f042468575..934bc7c2f4dc 100644
--- a/dev-python/awxkit/Manifest
+++ b/dev-python/awxkit/Manifest
@@ -3,3 +3,4 @@ DIST awxkit-21.2.0.gh.tar.gz 16531568 BLAKE2B aa6677408415b2abd6a8d0f3286e2147f0
 DIST awxkit-21.3.0.gh.tar.gz 15808522 BLAKE2B 0c8f563601e8140af763ef88d9c69232b1c5b5de726962c210883af78d400286f7a415971311a7543b150d165c10cadbfbbd11d58ea8b9336efe9db7a7d29493 SHA512 05f2996a51aedc059041d72a50c21b3dd161c958ac869e4c9d36b45ae483e2e4c6a743e8ba336acde8108fa43d9eec0131d76a8ef3cf0dbeec1416dc8317c698
 DIST awxkit-21.4.0.gh.tar.gz 16058858 BLAKE2B 215b18809bd1050c6e93a03711fd8cb1b96299c2f335d01e7c40ea54ee9aaefab652f86826914e908ff4a19a02e79a61fc13edd5533c6b619366f76aa7fcfa46 SHA512 fc4513e7adcbf75aa801dfedb1f92a08e1dbe804a0a8b18809ec5ef98dd42bdf08856c486a9781cc6d34a932a86d587a90eac28099016e956c7468078d44d3ba
 DIST awxkit-21.5.0.gh.tar.gz 16077945 BLAKE2B 06e4b67fd49f9f11d65c4209ef70732e4dc33613c1875f4827421da200d2e7a7eaf8774c14a8f7713ce9227fc477103b114f6d2c170ed180e1cd101c59ca4c4a SHA512 7d90e1cc8133c3e5dca3a73e718c6449fc75e85fe7a1e1e28c971bc4883d249ed2e17124b5d1de06fd0adac358e49a3987620cc5d274bd666a78bc5cd75577fc
+DIST awxkit-21.6.0.gh.tar.gz 16088139 BLAKE2B f23c0fb89380e6d716fe5e36afd6cf9f79ab07aedb6ed7dc081a21f09fa8f8e2ed5fd6199f26759c4fdd08db6459b6cd80affa00d18e06ea5bc897957bb65edc SHA512 87c6ba1343a17faa4e4d70b76b9ec4b04b74a6f1ff02e44b02838a21d5242ebb25daaa379e0e1d3ff8d59782f7ce0d30c17cf3984d34d74ed8fd3f9dac316097
diff --git a/dev-python/awxkit/awxkit-21.6.0.ebuild b/dev-python/awxkit/awxkit-21.6.0.ebuild
new file mode 100644
index 000000000000..539f927196c4
--- /dev/null
+++ b/dev-python/awxkit/awxkit-21.6.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Command line interface for Ansible AWX"
+HOMEPAGE="
+	https://github.com/ansible/awx/
+	https://pypi.org/project/awxkit/
+"
+SRC_URI="https://github.com/ansible/awx/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/awx-${PV}/awxkit"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/urllib3[${PYTHON_USEDEP}]
+	dev-python/websocket-client[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+	sed -e 's|websocket-client==[[:digit:]\.]*|websocket-client|' \
+		-e "/'clean'/d" \
+		-i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/backcall/backcall-0.2.0-r1.ebuild b/dev-python/backcall/backcall-0.2.0-r1.ebuild
index cdd11a8d5655..e895cf1552e6 100644
--- a/dev-python/backcall/backcall-0.2.0-r1.ebuild
+++ b/dev-python/backcall/backcall-0.2.0-r1.ebuild
@@ -14,6 +14,6 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index db7d691cf1ad..7438cbb0949a 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -8,3 +8,4 @@ DIST boto3-1.24.69.gh.tar.gz 536008 BLAKE2B 2a7c031423bac668110c0fdc17c66085c81c
 DIST boto3-1.24.70.gh.tar.gz 536364 BLAKE2B b93c882f93093e453c82ea0cea298ccaeb9159271b8fc933bc884f1cc2fae14131a28cacfecf0c0f931c77d03d92acdac23a16acbdf4ceb1da0dca6859048616 SHA512 d7fbf4fdf44adf723d1325cb80c44c3e78df4d8c30b106d8256cdaf39bab442498c40624e2d9fb8f53af278518bb897bb9b2b040552f5420a82914f9083ec6bf
 DIST boto3-1.24.74.gh.tar.gz 537890 BLAKE2B 5aa5b9fb754b9f0a1da6d05fb8419235617fa0cf50b2759c7b725cdface764921922366a1536c49ba5e283c3af10b2b987bfb3ef48f4b20882116957e6534f59 SHA512 5acbce2c828f268ca04dc5c38d192b9578ae7a16f8144262f8cb19b5364be5c39397e725cf4daed35405d31ac70907c271305320502f88ffb1f0dcfb49f3be0f
 DIST boto3-1.24.75.gh.tar.gz 537974 BLAKE2B 00fbaca566c9dc782fa03f11c050477c32a19a1bc5c9e5e6472c99e12844b21e60493b1c1767c4943d600238366d2c30cfb2e67a3e275ce946a5eba6bce4a37c SHA512 0ba05ffa829b59eb983cb75724646f233aa969f032099854c76c736a5aac2a1328f2ec596033d8809d9347b5e7cec4f95ce639b743156fc2c40ee898485875d3
+DIST boto3-1.24.78.gh.tar.gz 538770 BLAKE2B ee690bceb7b04a8ef9bd4c3bea2abfa342ec7f5aa5cd60e03f2982f3dfb31a4f38847c687591677442abeb0a7197cb3e1125b3b1674223f165f31eb841968551 SHA512 002b366344be86bf1dccda41d4ae8d2421405de860dcc6e0a6b2889508026f91cfe7bbbfcaca55a59893233e1f7e756527dd0dcc2694f7fc8c9928601ae44fa4
diff --git a/dev-python/boto3/boto3-1.24.78.ebuild b/dev-python/boto3/boto3-1.24.78.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.24.78.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..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 0dff3952afc4..1135466ba7ee 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -8,3 +8,4 @@ DIST botocore-1.27.69.gh.tar.gz 9598373 BLAKE2B 678cfea9cee9c9dbdae1fc7d23ef8530
 DIST botocore-1.27.70.gh.tar.gz 9601647 BLAKE2B 2d980a26ee0ebf6ead3a8c41f69ae02726e5984948c20855dc2428c0f0c5c775ef6cdc38544aba3e4abad7ed69b9e1929103cc990d0d2ceb95c547d7c17b0b9d SHA512 24a3066abd1b57060d4ddf89b011a238ae3bdb65b08bb1f6ea6de7e54ddc78d809d7f7ec532b95ac9583f5ffec83e7d40a531fd088a486b132fe1fb044b4ebbb
 DIST botocore-1.27.74.gh.tar.gz 9626080 BLAKE2B 05f039078c207c3878f189147ac2cf838bf51d2f69d3417440cf71b10ddf952414cfbdb1c21c0ba52ee0397f3dd720b8a4e0aa6090bb77cb12ff11a370f20aed SHA512 56a78879a2315f7a5a7d809f4e6e6885dfd0d085715494448dbd0b36029c5eba00c48a12a7f49af121a22363a1680591bcc82d220cc4e34e6cb02a2404df5877
 DIST botocore-1.27.75.gh.tar.gz 9628845 BLAKE2B dcce68d2d24e621d8d56d2f3417a5bbc93465d8cb889ae2243693b4e0363941a8993026b748f8b752ff7df21a4d37f507400dfaefc254c6abdeeb3e7fb3a7689 SHA512 1868ecdab142a08a3ca664dc87a9b5d15032b688b573d8deb6203e31883c4bf998059b219a5a76ddcd37fa01e44a1cc8a16ba020555921bbf12bbba7316f95fb
+DIST botocore-1.27.78.gh.tar.gz 9639497 BLAKE2B 38b3286227941216db66453201b73366ab28722f6f6e08388419b9db7bd4b25aad2c379cee6438ecc0c25fdbb732827117954454280e4aa367f1d579352f464d SHA512 bf182ac90c0d392a32f2d117145d2cbcf019ddbd3fed1205228a9b5721b08296f8948668c47b07feab6eb2ad2cf65f92a31d782c5ff3ecdf727466f7889c466d
diff --git a/dev-python/botocore/botocore-1.27.78.ebuild b/dev-python/botocore/botocore-1.27.78.ebuild
new file mode 100644
index 000000000000..d1a6948e70e5
--- /dev/null
+++ b/dev-python/botocore/botocore-1.27.78.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..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
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild b/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild
index dbb41eddded4..8c050cdb8e11 100644
--- a/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild
+++ b/dev-python/canonicaljson/canonicaljson-1.6.2.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/python-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 RDEPEND="dev-python/simplejson[${PYTHON_USEDEP}]"
 
diff --git a/dev-python/cfn-lint/Manifest b/dev-python/cfn-lint/Manifest
index 435824a2e40b..f14d4a7e5de6 100644
--- a/dev-python/cfn-lint/Manifest
+++ b/dev-python/cfn-lint/Manifest
@@ -2,3 +2,4 @@ DIST cfn-lint-0.62.0.gh.tar.gz 9610430 BLAKE2B fdeed685abab1bb701698b02ba961d046
 DIST cfn-lint-0.63.2.gh.tar.gz 9672817 BLAKE2B dcd445c2372bf044bc4eab4b33056d2113914cdeeb1a2b376643cc4bbb3d92dcfdaaf2e6aa5f0d0473be00b42ecea0eda2a5ae3fa493d4e648be12db81b9d9e7 SHA512 d9bff0c43f7c2b710536fb7212e3d78d3827d7838ef8246767625c3de1a2ee0e5056df42b6b94e0efd7e7b2933d477a9962e0e3d53a78a3cca774fd52706a330
 DIST cfn-lint-0.64.1.gh.tar.gz 9792758 BLAKE2B 95bc86fa41c17498575abfd4eb7e16d9e8a8dfc36d4304aa216890773e52d1e43f4deb178f2bd69c8edc445a417ca37ef53069ac9d398ccf27e3b9a6d90ee8c9 SHA512 edd7296e74db943c6ae818c2ae8f5220c4d8834eb7858c474e38f7852c1a7839b89ba949c105a3d2044f4b952e56fdc9e7a08493ed74e06b29ec9c0ea0b48a6a
 DIST cfn-lint-0.65.0.gh.tar.gz 9807118 BLAKE2B abafc4fac788ba0af80359997b92cd60089472dee51952fc3029485a87be8e8fb9deb1599610471216ee8da103f7198808f9122727182005140c527672a921f8 SHA512 68eeb18914fb92cdacea9f80d4564937eba92b645f62a3fc22e874001554837ac3107741d4134cc8b1d880eaca38a560a92631c6ae3dfb2c412ad6fcb3f91cab
+DIST cfn-lint-0.65.1.gh.tar.gz 9670213 BLAKE2B 22a627dc417f8df76fef9228eb4139210f693b0f5723e70f0dcb3651a18c921e8f174b8c97709016b2c184f3e12e03e49ad7e7a720415ad5cb820aecdfba4616 SHA512 391db28d47caa5cb66f3994944766f9ba6a0500ac5c8c474cef0a60e44236aedde7bceefb78cbc48cef3109ddf9206960a212df3ebdf7eb82b84940ca7202b7c
diff --git a/dev-python/cfn-lint/cfn-lint-0.65.1.ebuild b/dev-python/cfn-lint/cfn-lint-0.65.1.ebuild
new file mode 100644
index 000000000000..d9b9960e1574
--- /dev/null
+++ b/dev-python/cfn-lint/cfn-lint-0.65.1.ebuild
@@ -0,0 +1,54 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+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.51.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[${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_2
+	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/configupdater/configupdater-3.1.1.ebuild b/dev-python/configupdater/configupdater-3.1.1.ebuild
index afbd1fb542fb..9926c1b04fd4 100644
--- a/dev-python/configupdater/configupdater-3.1.1.ebuild
+++ b/dev-python/configupdater/configupdater-3.1.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT PSF-2 PYTHON"
 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index 18a5cd807d74..7ac7d3164dbe 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,2 +1,3 @@
 DIST dask-2022.8.1.gh.tar.gz 8759920 BLAKE2B bc84706772072a1df2a1c0089f9bc1332a0110430f1c6f2e120e76f565b0666fb0f7f9ac6c25da356f2825e0cd8dfa5b2ef7998d3a231aefc41a5ce09980a22a SHA512 ba042cf069b88c752a371a6ea2df69dd75dabd934befa2d91f4e1e754ad197a14369935452125a621d14527e0d6a0a3a2abdee8f127aa05c6c812116cb27dc3e
 DIST dask-2022.9.0.gh.tar.gz 8762083 BLAKE2B 60c7a37124b61b49fc06a754b5842695fd63d234e087ec44a40793aeb330034e0d5e3caaedd239fd498a9b01c2bc450f62cdc22848bfd654bfdab6a07d9be7de SHA512 a88f71b9e8cdc69ce3a4babbc2434f830110df284d56eec37cadb6b81add3cd5f2e751ea5e9b390d112d16ee0952c296368851889fec202e3601c2fcf8f52a97
+DIST dask-2022.9.1.gh.tar.gz 8766675 BLAKE2B da4735dd860b96d691bbe3782ce04fb4e53a265984dc52593ecd1cbd1a1e536ad2677998e01bcfa99d783255ce053a44c4ed4cb0ce83128520755c20530bca3f SHA512 944d333bbe2f946b85173d289e287737816359a959b61d9bf2b9ef0f75173482a2912355fd71f8a8aa29e58f5b66a91909dc53c1cd269ab2bc569bad62a67f6c
diff --git a/dev-python/dask/dask-2022.9.1.ebuild b/dev-python/dask/dask-2022.9.1.ebuild
new file mode 100644
index 000000000000..6ad6f0bd45e1
--- /dev/null
+++ b/dev-python/dask/dask-2022.9.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Task scheduling and blocked algorithms for parallel processing"
+HOMEPAGE="
+	https://www.dask.org/
+	https://github.com/dask/dask/
+	https://pypi.org/project/dask/
+"
+SRC_URI="
+	https://github.com/dask/dask/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-python/cloudpickle-0.2.2[${PYTHON_USEDEP}]
+	>=dev-python/fsspec-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/numpy-1.15.1[${PYTHON_USEDEP}]
+	>=dev-python/pandas-0.25.0[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-0.3.10[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.3.1[${PYTHON_USEDEP}]
+	>=dev-python/toolz-0.8.2[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/toolz[${PYTHON_USEDEP}]
+	test? (
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/numexpr[${PYTHON_USEDEP}]
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# another test relying on -Werror
+	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
+	# TODO
+	dask/array/tests/test_reductions.py::test_mean_func_does_not_warn
+	dask/tests/test_config.py::test__get_paths
+	dask/array/tests/test_linalg.py::test_solve_assume_a
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>0-float-5-1-True]"
+	"dask/dataframe/tests/test_dataframe.py::test_repartition_npartitions[<lambda>1-float-5-1-True]"
+)
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/debugpy/debugpy-1.6.3.ebuild b/dev-python/debugpy/debugpy-1.6.3.ebuild
index 4c731f772480..76923ba042f7 100644
--- a/dev-python/debugpy/debugpy-1.6.3.ebuild
+++ b/dev-python/debugpy/debugpy-1.6.3.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # This is completely broken
 RESTRICT="test"
diff --git a/dev-python/fastjsonschema/fastjsonschema-2.16.2.ebuild b/dev-python/fastjsonschema/fastjsonschema-2.16.2.ebuild
index 4d2f3bd44cd4..30d3fd50572e 100644
--- a/dev-python/fastjsonschema/fastjsonschema-2.16.2.ebuild
+++ b/dev-python/fastjsonschema/fastjsonschema-2.16.2.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/flask-compress/Manifest b/dev-python/flask-compress/Manifest
index 4bddeea9673e..2e8c64992fa7 100644
--- a/dev-python/flask-compress/Manifest
+++ b/dev-python/flask-compress/Manifest
@@ -1 +1,2 @@
 DIST Flask-Compress-1.12.tar.gz 12581 BLAKE2B 5c925c19756730beaf5ac24b492e8bffcf7dd7c80df3c8440a8dfeca67e9756c50839246081b01b2da8c4b05839ee35b21b30f8e007734bbfcc1f056770ef3de SHA512 5712aff44aaaa379656e03f7b63fdef727721245cb9329e698a2e25aefca21a77202f5eb0c5f5828395647c694a5b417778a7b5db9eb592753a979d3994603a5
+DIST Flask-Compress-1.13.tar.gz 12675 BLAKE2B 252c63500e5ba2adbe857a52fcffe2dc8280198c79210d64ae8439c8e0daaeaa4e295002a5fdacb6724971018f7e3322c00bab85bfd0ad2291f53103f01f3ee1 SHA512 e910971f94966f14d4657f7fa1c92a4e73ca7afd08959ed5d5694228851f06e614873f3202d19c6a06be2c277136f097d88eb578773dd7b5e9130456c9828ed0
diff --git a/dev-python/flask-compress/flask-compress-1.13.ebuild b/dev-python/flask-compress/flask-compress-1.13.ebuild
new file mode 100644
index 000000000000..4464bc0c4ec8
--- /dev/null
+++ b/dev-python/flask-compress/flask-compress-1.13.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_PN="Flask-Compress"
+MY_P="${MY_PN}-${PV}"
+
+DESCRIPTION="Compress responses in your Flask app with gzip"
+HOMEPAGE="
+	https://github.com/colour-science/flask-compress/
+	https://pypi.org/project/Flask-Compress/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	app-arch/brotli[python,${PYTHON_USEDEP}]
+	dev-python/flask[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/fonttools/Manifest b/dev-python/fonttools/Manifest
index a9c69d56827f..cf91244a6d0d 100644
--- a/dev-python/fonttools/Manifest
+++ b/dev-python/fonttools/Manifest
@@ -1,2 +1,3 @@
 DIST fonttools-4.36.0.gh.tar.gz 3567028 BLAKE2B 45c2481680a314e101ed3a14915585b503a15853937846a5ceadd15e524f053663e0c6876bb105b0f2593ac790029da48cbede8139be98809764e5a6e3e2b11a SHA512 48a07548f72e9818292c1552675fce94b8ecb876172cd7adb429426c1d987f54a6e0482b7847e48c3b9854821567023cce402c613488d9e17277eff8a615d3c2
 DIST fonttools-4.37.2.gh.tar.gz 3593663 BLAKE2B d0e6e7beb370a8611f6c92cb3c0d253cda1a946985dee12d1e911a33d45415e15ecdadd2be3eef3d121ffc27a450ed19bcea7c5b19f562af206ea6207b0c7dee SHA512 5850c31f68a6a7e1476644938ccb69d1213eb218a966a67c72f41fbbbc63cf5ed2f9638ce9497fd0702308ebf5637fc471b32a44b2ebcfbb9f4d3c2898dd626b
+DIST fonttools-4.37.3.gh.tar.gz 3594598 BLAKE2B bd2c347e1542c2be4136c75804d95ddc1514c4b131f6754467e4229928391f607d206b6edff1fbce62d270801adac3d53fa187a06983dec6d44c699029a8e47e SHA512 7e8f9d68d59e6e842f2cc7acabd4188a1f5b1beb3437148ecb4ced1144eca5ae6af64c501b8ffedb780c72d84c73d7363d7d6ef3b3fc829bad27cba0c15c5ca9
diff --git a/dev-python/fonttools/fonttools-4.37.3.ebuild b/dev-python/fonttools/fonttools-4.37.3.ebuild
new file mode 100644
index 000000000000..75d1f33eb4b3
--- /dev/null
+++ b/dev-python/fonttools/fonttools-4.37.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+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
+	)
+"
+
+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/frozendict/frozendict-2.3.4.ebuild b/dev-python/frozendict/frozendict-2.3.4.ebuild
index f1e01464495c..9ba0f0bd0a42 100644
--- a/dev-python/frozendict/frozendict-2.3.4.ebuild
+++ b/dev-python/frozendict/frozendict-2.3.4.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/python-${P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/google-api-python-client/Manifest b/dev-python/google-api-python-client/Manifest
index aa7ed30661a6..139a12ca7480 100644
--- a/dev-python/google-api-python-client/Manifest
+++ b/dev-python/google-api-python-client/Manifest
@@ -1,3 +1,4 @@
 DIST google-api-python-client-2.57.0.gh.tar.gz 33298709 BLAKE2B 6c50bdcfc38180ece5f8202b0f3adcfc446cc0b057122aee7f706401248b7d860d9227c444b26faea49de5e4147010765edc5e54271907f6490e6f0d9fe0ac1e SHA512 f96c40b21f4191e5a06a4068b65c952d9d2bef3849a6aa821232c60dfc8b6c6598606b596c750cc87928871367cbbcb24af46b5626d602915ccf7a7f316988ba
 DIST google-api-python-client-2.58.0.gh.tar.gz 33498127 BLAKE2B c00ecad1e863e5abb92cfbbbf57778b63ceaf73ae4cfb00ddf4fd0ed31656a28e475b91a02c03a6231790c2f3ab3e3243d131a97ed0f51151946568f5b56e18c SHA512 00c1606fadb46a6f4f60939135e9fd2840b267cd962630e4cd2d123588e9bdc8c0ed397d9e038ae91a2f31b732eb7698476fc1cf2322771b5720c11a97321b00
 DIST google-api-python-client-2.60.0.gh.tar.gz 33586321 BLAKE2B 01bb4dcf8a9b90a65c4e58ded91a7c03c525c15d29dc5b63011e1d1b8281ea68c04526af29d7853f4b7e16681c2482970f3b95faa190522ddf2f0ad3dd4e5e50 SHA512 7cae2e66ae7a41d25e551a5e9b14757d62c0212fe18640b4c1b8f51ff9e0150cfb9a2492de67530c7d24d6d09231d365520c3c06ffb342ba4a68a1a07b69b27d
+DIST google-api-python-client-2.62.0.gh.tar.gz 34525876 BLAKE2B 0f2bcd7588a6635511d3851f0a0881761d9cf905a83b406aaa824ef1ac86a3f9af9df2f90193b30852028b804fd30d8aa6214a5be83e26401a626ce3156e884f SHA512 4348bce74db02f74bd386d0276de2e2ec0126e7c1b79bea962056612f868d2b2306c51663ca293672db750460bd3722a66fb22139d14f30adcd3e0d455a2118a
diff --git a/dev-python/google-api-python-client/google-api-python-client-2.62.0.ebuild b/dev-python/google-api-python-client/google-api-python-client-2.62.0.ebuild
new file mode 100644
index 000000000000..7e8aaa05d6d4
--- /dev/null
+++ b/dev-python/google-api-python-client/google-api-python-client-2.62.0.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google API Client for Python"
+HOMEPAGE="
+	https://github.com/googleapis/google-api-python-client/
+	https://pypi.org/project/google-api-python-client/
+"
+SRC_URI="
+	https://github.com/googleapis/google-api-python-client/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/httplib2-0.15[${PYTHON_USEDEP}]
+	<dev-python/httplib2-1[${PYTHON_USEDEP}]
+	>=dev-python/google-api-core-2.3.1[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.35.0[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-httplib2-0.1.0[${PYTHON_USEDEP}]
+	>=dev-python/uritemplate-3.0.0[${PYTHON_USEDEP}]
+	<dev-python/uritemplate-5[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/oauth2client[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# require Internet access (and credentials)
+		tests/test_discovery.py::DiscoveryErrors::test_credentials_and_credentials_file_mutually_exclusive
+		tests/test_discovery.py::DiscoveryFromDocument::test_api_endpoint_override_from_client_options_mapping_object
+	)
+
+	epytest tests
+}
diff --git a/dev-python/google-auth/Manifest b/dev-python/google-auth/Manifest
index 9e61492a6b08..2c84cc04a336 100644
--- a/dev-python/google-auth/Manifest
+++ b/dev-python/google-auth/Manifest
@@ -1 +1,2 @@
 DIST google-auth-2.11.0.tar.gz 205568 BLAKE2B 76f43804c117006141e46291eaa35b49e73f4eec81307b7c3c6fdf82faf1a1f3101ef1a652c5dff05ca6686ded0859c6a3bee8d38cd584fd5cacef9598aae9b1 SHA512 0b2c8653184d95b1f0981326721a8604bee6737e2e4fb68c12d695c74e03406e6d189b00740c34ee74d6ae4032581bd099018f8eaf1d65759e4c5fa4127305cf
+DIST google-auth-2.11.1.tar.gz 205716 BLAKE2B 06cf90b915c82bb53795427fc971c6a979baa34d3e32d43db20c0df86df9ef39d0ee80c4026dd502ff1d5233f1d80b0a4fa9750aafe9f0d427013a2d8ad34054 SHA512 f89fc2ec2d130156132f7e7290f4237ee9adf832f6b1914a39ea7d56943bb26fa02e940e826eb9c4e5351aa91ebf03cc5969c25e5020a89a09ea8f92535a0c07
diff --git a/dev-python/google-auth/google-auth-2.11.1.ebuild b/dev-python/google-auth/google-auth-2.11.1.ebuild
new file mode 100644
index 000000000000..de5188c8fdb8
--- /dev/null
+++ b/dev-python/google-auth/google-auth-2.11.1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Google Authentication Library"
+HOMEPAGE="
+	https://github.com/googleapis/google-auth-library-python/
+	https://pypi.org/project/google-auth/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	<dev-python/cachetools-6.0.0[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.2.1[${PYTHON_USEDEP}]
+	>=dev-python/rsa-3.1.4[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	!dev-python/namespace-google
+"
+BDEPEND="
+	test? (
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/freezegun[${PYTHON_USEDEP}]
+		dev-python/grpcio[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		dev-python/pyopenssl[${PYTHON_USEDEP}]
+		dev-python/pytest-localserver[${PYTHON_USEDEP}]
+		dev-python/pyu2f[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/urllib3[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# these are compatibility tests with oauth2client
+	# disable them to unblock removal of that package
+	tests/test__oauth2client.py
+)
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
diff --git a/dev-python/hatch-fancy-pypi-readme/Manifest b/dev-python/hatch-fancy-pypi-readme/Manifest
index 172765ae3b7b..bf73e6338d45 100644
--- a/dev-python/hatch-fancy-pypi-readme/Manifest
+++ b/dev-python/hatch-fancy-pypi-readme/Manifest
@@ -1 +1,2 @@
 DIST hatch-fancy-pypi-readme-22.3.0.gh.tar.gz 22107 BLAKE2B 7358a35ed9176d5107d406c1f99cfcf17ce409224dcad55ac845087e2fd6cc9ab88e5ea929e3b1304bbff6464cbbbd0b0d9716bcfe199dcd887c809cd6a9356a SHA512 93fe293ddce6dde450bc427d8fa492cf2b1f7d4a0e2d754873f765f588a962ca2c7c48b515ba613503bed6100b302ed91bbedb4d6a9f8d7bc10ab4b1418164e8
+DIST hatch-fancy-pypi-readme-22.7.0.gh.tar.gz 25457 BLAKE2B 7426e6d8407b6b137524e651fdd4637980cdd781735c79df5172d3c9c45e5b7f07957e2591cc84c7eb750ac494770a68a8a7590dc7131eeb48c44bdb5a9995ac SHA512 4c6a02ac3774ee87f1cd725fae341739c3037aae772361e5664539fd0d8c09ba359245ddc925e028387a0359856979e35588d23824a66584a10f9fcac108b7d4
diff --git a/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.7.0.ebuild b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.7.0.ebuild
new file mode 100644
index 000000000000..f954065f6873
--- /dev/null
+++ b/dev-python/hatch-fancy-pypi-readme/hatch-fancy-pypi-readme-22.7.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Fancy PyPI READMEs with Hatch"
+HOMEPAGE="
+	https://pypi.org/project/hatch-fancy-pypi-readme/
+	https://github.com/hynek/hatch-fancy-pypi-readme/
+"
+SRC_URI="
+	https://github.com/hynek/hatch-fancy-pypi-readme/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/hatchling[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# fails without Internet (via pip)
+	tests/test_end_to_end.py
+)
diff --git a/dev-python/html2text/html2text-2020.1.16-r2.ebuild b/dev-python/html2text/html2text-2020.1.16-r2.ebuild
index 7e7517e4c0a9..520b38d8765a 100644
--- a/dev-python/html2text/html2text-2020.1.16-r2.ebuild
+++ b/dev-python/html2text/html2text-2020.1.16-r2.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~ppc ~sparc x86"
+KEYWORDS="amd64 ~arm ~ppc ~ppc64 ~sparc x86"
 
 DOCS=( AUTHORS.rst ChangeLog.rst README.md )
 
diff --git a/dev-python/humanize/Manifest b/dev-python/humanize/Manifest
index ff2a404fbbb7..479ee58eebdf 100644
--- a/dev-python/humanize/Manifest
+++ b/dev-python/humanize/Manifest
@@ -1 +1,2 @@
 DIST humanize-4.3.0.tar.gz 78035 BLAKE2B 03cea639879165453becc41f62e7b6e34a62ac3a74c37141e0c3f7e9d855b2727710ab5ac231a3829d03c413b297449dccbfc8b804b3f5ddcd402dd813adbf57 SHA512 b8713fa9ec2c2210f93e06436a5bef390937b85ccd0bc95520e53d5c0f49354b94a7957ef50dd9e391d8377d1faf43003c47028b19cef42885fd083cbda1ac46
+DIST humanize-4.4.0.tar.gz 78519 BLAKE2B f61b654e201995479ace22b5aac106b08304ed9212cf5c6c7f87731d861c42c5e0243f7bb0b7f2c29b870421fa81fba0c36e4ead90ff90f207bc984286ac119a SHA512 bbbd386d9af82d9db0f2edc4653928654203c4239419232abfc15c51ccd865b355366549c46651e1291d4222ca8b2a297ffc0fce3cc32be4ae2f904ae308a8e4
diff --git a/dev-python/humanize/humanize-4.4.0.ebuild b/dev-python/humanize/humanize-4.4.0.ebuild
new file mode 100644
index 000000000000..b471878fc311
--- /dev/null
+++ b/dev-python/humanize/humanize-4.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Common humanization utilities"
+HOMEPAGE="
+	https://github.com/python-humanize/humanize/
+	https://pypi.org/project/humanize/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		dev-python/freezegun[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 18929650288f..dfe265a31710 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -1,3 +1,4 @@
 DIST hypothesis-6.54.3.gh.tar.gz 9325211 BLAKE2B e0d6bc21057b50676ef98d1c9721b82c30986670758b2a7bfd1b101cc8d42258bf0d61887867445aafe13b8064c47d64583ab492e21b6fea510ef0c26fe01782 SHA512 288c5ea9c1dd8ee0839c11385f52ba8b8122f408aa11c6d2416460233ef78890e3014e659ef4312da4822da3abe2dd9163f68d2711556800e805ae41280aa132
 DIST hypothesis-6.54.4.gh.tar.gz 9325437 BLAKE2B 2000c806a0c791d1eb353a829e5e96d53e935d360fd450b3807186121fec4dfd171b8821e08b6c23b0cbea8d24b0d88c32126281173a0de2f12b29d09ec2d62b SHA512 7e5b70cc2df874163205e3d35f3f5e6a71319e779b35f1596c69222373e9b766a143ccf37aa1699de6b98827978e44ccbca0b1e30e6ffe29c8b68c83bb3af869
 DIST hypothesis-6.54.5.gh.tar.gz 9325448 BLAKE2B b4cb8a413ad96f11f4dbf4a1a529e389dbca45561264cf0922721a25009d1065fdce21064faf53bd7aad2f589c159b52d899aa7b12c12da68beae8c9186c0505 SHA512 37205ea28b44537409a94592e466376e9612f84a8501ad2ff5504fc648e062555ffb600416bdd1f9a74f39ba39729defd581025e0611c501839721721f7cf6e3
+DIST hypothesis-6.54.6.gh.tar.gz 9325898 BLAKE2B 01dde1d57192ede0a732ba2a50954fb6b1a1532e584715186f813977b2f22fd3411ec489874da67e687ca470ac58340dc45b821923ab01b03888c44a7882c0c0 SHA512 d678d0936c7906c839c29ad6c08154a067f8be2e18344139051ecc4b5c737f5088d2775a25758da2e29b74574b47c5f817643ccb762db851bc2b25e4fdbb3259
diff --git a/dev-python/hypothesis/hypothesis-6.54.6.ebuild b/dev-python/hypothesis/hypothesis-6.54.6.ebuild
new file mode 100644
index 000000000000..c45634356c75
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.54.6.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/ini2toml/ini2toml-0.11-r1.ebuild b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
index 521cfe233644..92b16077626a 100644
--- a/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
+++ b/dev-python/ini2toml/ini2toml-0.11-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MPL-2.0"
 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-20.7[${PYTHON_USEDEP}]
diff --git a/dev-python/ipykernel/Manifest b/dev-python/ipykernel/Manifest
index aa487bec888b..958c13679d61 100644
--- a/dev-python/ipykernel/Manifest
+++ b/dev-python/ipykernel/Manifest
@@ -1,2 +1,3 @@
 DIST ipykernel-6.15.1.tar.gz 133140 BLAKE2B 7d63b55f2b8d883234258106b8239cf77031336ce6e7e38234490a031fc4a56861788210fdb2acd0f895e4df43257b0339ef1592e12d33b441e4ba9061acbd08 SHA512 10f2390a4edafea89fcc049d5e07ef542418a3a7b076efec1f02bc0a787e01280624cc543bb60604478cae63b58a86d031b549a6f872c7a8530043d670dbdc0e
 DIST ipykernel-6.15.2.tar.gz 133297 BLAKE2B 05b92074dba2324a2bbbe58fb459f455e47236fcbed711b63c3bfd83978b1e80a7fe079c08fbfb031d9f182d2b24a265705f6540b6c87ee933b641beaee53f9d SHA512 14f1f819d67f16e9c5ea5705ce9c1827bd1ae44f742ca809c4402ef64b229e902f9a724c0609cbf225da595f4ed48cd14348f3c887d70bc18c4b017ec01de720
+DIST ipykernel-6.15.3.tar.gz 136470 BLAKE2B 45279a6cfc85c3c2bafe9913b78077a3212bc61b961824f449cdf6ed6a34fe777e0fef1585bc7e4062f4e73124efd24a1c6a16e4168a03d31420836105c3ba55 SHA512 52e9b20b4b9ce691a42a64f535b41b9567a9849c87c0c9903d0b14dc6a00c57ab42d93b6bca8d955be8a31354722268006ce8b576664eb8a4b7f6a3400164c1d
diff --git a/dev-python/ipykernel/ipykernel-6.15.3.ebuild b/dev-python/ipykernel/ipykernel-6.15.3.ebuild
new file mode 100644
index 000000000000..5526cde6276c
--- /dev/null
+++ b/dev-python/ipykernel/ipykernel-6.15.3.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="IPython Kernel for Jupyter"
+HOMEPAGE="https://github.com/ipython/ipykernel"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	>=dev-python/debugpy-1.0[${PYTHON_USEDEP}]
+	>=dev-python/ipython-7.23.1[${PYTHON_USEDEP}]
+	>=dev-python/jupyter_client-6.1.12[${PYTHON_USEDEP}]
+	>=dev-python/matplotlib-inline-0.1[${PYTHON_USEDEP}]
+	dev-python/nest_asyncio[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/psutil[${PYTHON_USEDEP}]
+	>=dev-python/pyzmq-17[${PYTHON_USEDEP}]
+	>=dev-python/traitlets-5.1.0[${PYTHON_USEDEP}]
+	>=www-servers/tornado-6.1[${PYTHON_USEDEP}]
+"
+# RDEPEND seems specifically needed in BDEPEND, at least jupyter
+# bug #816486
+BDEPEND="
+	${RDEPEND}
+	test? (
+		dev-python/flaky[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/ipyparallel[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# TODO
+	ipykernel/inprocess/tests/test_kernel.py::InProcessKernelTestCase::test_pylab
+	ipykernel/tests/test_debugger.py::test_attach_debug
+	ipykernel/tests/test_debugger.py::test_breakpoint_in_cell_with_leading_empty_lines
+	ipykernel/tests/test_debugger.py::test_rich_inspect_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_rich_inspect_not_at_breakpoint
+	ipykernel/tests/test_debugger.py::test_set_breakpoints
+	ipykernel/tests/test_debugger.py::test_stop_on_breakpoint
+)
+
+src_prepare() {
+	sed -i -e 's:^TIMEOUT = .*:TIMEOUT = 120:' ipykernel/tests/*.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	# Use python3 in kernel.json configuration, bug #784764
+	sed -i -e '/python3.[0-9]\+/s//python3/' \
+		"${BUILD_DIR}/install${EPREFIX}/usr/share/jupyter/kernels/python3/kernel.json" || die
+}
diff --git a/dev-python/jaraco-text/jaraco-text-3.9.1.ebuild b/dev-python/jaraco-text/jaraco-text-3.9.1.ebuild
index 0d3d2c246668..db7762d5350e 100644
--- a/dev-python/jaraco-text/jaraco-text-3.9.1.ebuild
+++ b/dev-python/jaraco-text/jaraco-text-3.9.1.ebuild
@@ -20,7 +20,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/jaraco-context-4.1.1-r1[${PYTHON_USEDEP}]
diff --git a/dev-python/jq/Manifest b/dev-python/jq/Manifest
index 02bcefef6d13..7ba7a5b87da2 100644
--- a/dev-python/jq/Manifest
+++ b/dev-python/jq/Manifest
@@ -1,5 +1,6 @@
 DIST jq-1.2.1.gh.tar.gz 10321 BLAKE2B 8bc2c88ae553dd53137c11d4f599e01398d21811a02b4f33f81aeeafa9009f58a56074c0bcadcc6382d86d2c7ada792d442f9c660787e131d0e85c95fb7cab32 SHA512 0b6dda04c0b3c63a5bf41f8a73dedc3cd889683f3e89c99cbf258c839f35f66d19a6da5cf4096148cd17a3fb1a58ba0e10d052ce46a1a18af845910e00ff5d86
 DIST jq-1.2.2.gh.tar.gz 10436 BLAKE2B 09514ce3a9afa8df4e61b29fc17f0d875db046ddc98332f13d702defd443e4e2ac1c612042eab82e620298d236a548625f5578d04dbeb681858bc10243c878a1 SHA512 632c5ebaf2607cc609ee4cfbdc0d68dff96e6daff916d77381f1596f3b1ca494c962cc56127376ef21fb931ab1333b666b01a599b97eab8a94416d1caec65248
 DIST jq-1.2.3.gh.tar.gz 10457 BLAKE2B 72ebe4137d21bfd06dce337da1c7bcbfaa10ea55d06d128c901daa605557d7f6bd3bc219242127dfd36908089f312a6120306028bccb66e03274194e179175ee SHA512 c942c6cd6a49d677bc9095c8192819c40bf7751e6dff4e9bde5af97398dd1ddc62e3492ab936cbe458d7cffbfab3b421d5db7654c5d02af48bffbac99e7c159b
+DIST jq-1.3.0.gh.tar.gz 2648187 BLAKE2B 61b6d4dbb2163477d09e69c25e0bec98780f39088d4e689a7e13ed8d64749c2e238f2bf7d1f6c47f3cebe1c94a1e5fa5322a988ce251e8417aac77c789975064 SHA512 cf3c1ac7954d36d808b9f9841ff7f71835e3324f6f8eb09ef3a66b446b47a354d8ff090dc3529b9936ec5d7a33ba5163354d3534f0dfc0cb467222a990e58fb5
 DIST jq-1.6.tar.gz 1750584 BLAKE2B c9be1314e9d027247de63492ee362e996ef85faf45a47ee421cad95ebde9188bff8d3fc7db64e717ab922e1052f3b1c1500f5589fc5b2199ab66effb000e442d SHA512 5da71f53c325257f1f546a2520fe47828b495c953270df25ea0e37741463fdda72f0ba4d5b05b25114ec30f27a559344c2b024bacabf610759f4e3e9efadb480
 DIST onig-6.9.4.tar.gz 908702 BLAKE2B e6e9939f284569408ba01b8551960bc939bbfdca425f8470499f5bb83ead7b6b09898f6f6a09d5d8c26d74d5416f6e5e9e2f00fbe7aa9eb820edb8aa4a3050cc SHA512 ed8f42f6893966c0ee3c168b4fdbcb04b2286ad69ecab43a754c1dbc8fc4656e01319991d776d7144b6a3f90d050781b321432278d83c74c9565c2743851c85b
diff --git a/dev-python/jq/jq-1.3.0.ebuild b/dev-python/jq/jq-1.3.0.ebuild
new file mode 100644
index 000000000000..ac51a3e9eea3
--- /dev/null
+++ b/dev-python/jq/jq-1.3.0.ebuild
@@ -0,0 +1,28 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+inherit distutils-r1
+
+DESCRIPTION="Python bindings for jq"
+HOMEPAGE="https://github.com/mwilliamson/jq.py"
+SRC_URI="
+	https://github.com/mwilliamson/jq.py/archive/${PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/jq.py-${PV}"
+
+LICENSE="BSD-2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="dev-python/cython[${PYTHON_USEDEP}]"
+
+distutils_enable_tests pytest
+
+python_compile() {
+	# Cython compilation isn't part of setup.py, so do it manually
+	"${EPYTHON}" -m cython -3 jq.pyx -o jq.c || die
+	distutils-r1_python_compile
+}
diff --git a/dev-python/jsonschema-spec/Manifest b/dev-python/jsonschema-spec/Manifest
index 738a8b87f272..6aee67b3ad7f 100644
--- a/dev-python/jsonschema-spec/Manifest
+++ b/dev-python/jsonschema-spec/Manifest
@@ -1 +1,2 @@
 DIST jsonschema-spec-0.1.1.gh.tar.gz 21747 BLAKE2B 441f34c62da2d22699379035e20f2ed78a974413ea9c2f80b753cc2b41d978351c69aaa50750139e622d075c4c3979dc43b888bea111a0f4b31fa9d37822a1fa SHA512 b1bdd03c6fc022877d0801d859abe0dd19e066afe2a1eab6c650a8741a50473e74945ddde429508e5dccf379a84b25fbd60c49fdc310aa770bed52b63e60e397
+DIST jsonschema-spec-0.1.2.gh.tar.gz 21782 BLAKE2B 238f035e75ec45edade5fd00269d2fc208a73208d1e07586490728b8c97819d6fddd9b909d2af00e63ebc4c141cb8dbaaf8e3e7ce88c3ff58ada2ba147c1e2c9 SHA512 0cba83a14e88d4fe2fcce9e4d39fa4284f23366a1f8acab16fa4b7b824d0c02bf04429d61c51a39a7a188c4e2b79f4481bba14ca688edee71beb0060e16617e0
diff --git a/dev-python/jsonschema-spec/jsonschema-spec-0.1.2.ebuild b/dev-python/jsonschema-spec/jsonschema-spec-0.1.2.ebuild
new file mode 100644
index 000000000000..1a6a4f949102
--- /dev/null
+++ b/dev-python/jsonschema-spec/jsonschema-spec-0.1.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="JSONSchema Spec with object-oriented paths"
+HOMEPAGE="
+	https://pypi.org/project/jsonschema-spec/
+	https://github.com/p1c2u/jsonschema-spec/
+"
+SRC_URI="
+	https://github.com/p1c2u/jsonschema-spec/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
+	dev-python/pathable[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
+	dev-python/pathable[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/--cov/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index e8fd34096232..ea2ad57af626 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -1,3 +1,4 @@
 DIST keyring-23.8.2.gh.tar.gz 45987 BLAKE2B 3a8faf6487c2d4dd76e549585a236e4744e5a4d23a778515425e7e78c7161717c2d16b8f268fbc8b8c59d6fb3fb39fc789b0dd92363b6d61073047af8d99b804 SHA512 af5c764d355c548d1f1364006dbaf6ee366a7dbbda9649145dafa5d610a4691ab4488151c054359e26a467312653601ddf722bddf35deae309067355337eddec
 DIST keyring-23.9.0.gh.tar.gz 46610 BLAKE2B 31581974d40d4fd0febd576db3967f29a09e9d9251c59fa2d0198cb80f3ec49d043fdde4002f3893cffce6936f4e9e2186457f870ba97e65a22c70a2741e17d3 SHA512 c8432d61ef94a56cd3aafa3f766cc1488585cadbea757eb63ba3d73a0b373ac949a27edba4b282ffb8629fcd9a3a6c0b0acea90dd377bf3f2fe5a290b82e4b44
 DIST keyring-23.9.1.gh.tar.gz 46768 BLAKE2B 4b1acd33f53244a8932efbd54a8edc065071cf2ce2049d590a7804b171b90719fb18d982aa7bea217f76beab80e2cce5d4ff4f5440d23342879aed5ee79d7c82 SHA512 e384c4e592b2c4b9b6505c1fe22d9192c6d577add52e874490833dadaf1aba9dfc708593762471de0f5995bc6bb35f61ba541590a152528b489128fca629c623
+DIST keyring-23.9.3.gh.tar.gz 46913 BLAKE2B d55425c8e18f65362aab531b707e261b0990ab9c4f890286a63964fd2b29380ad9e2c19eae4c723848e3fcfff0eb6d3dcd4377e7151fa2dc5731987f2b468121 SHA512 8ee5da4f464fae90237f246037e2c675740dfda4945d6afcf2e5a4fdaf076766442590db92f9d32bda2dc820446a95a6e8ee3ccbccdb9c09e6c71bbd0e52f5b1
diff --git a/dev-python/keyring/keyring-23.9.3.ebuild b/dev-python/keyring/keyring-23.9.3.ebuild
new file mode 100644
index 000000000000..a90ebe22521a
--- /dev/null
+++ b/dev-python/keyring/keyring-23.9.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="
+	https://github.com/jaraco/keyring/
+	https://pypi.org/project/keyring/
+"
+SRC_URI="
+	https://github.com/jaraco/keyring/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
+	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# this test fails if importlib-metadata returns more than one
+	# entry, i.e. when keyring is installed already
+	tests/test_packaging.py::test_entry_point
+)
+
+EPYTEST_IGNORE=(
+	# apparently does not unlock the keyring properly
+	tests/backends/test_libsecret.py
+	# hangs
+	tests/backends/test_kwallet.py
+)
diff --git a/dev-python/libvirt-python/Manifest b/dev-python/libvirt-python/Manifest
index 25fa524e0841..3511d0e4d5ff 100644
--- a/dev-python/libvirt-python/Manifest
+++ b/dev-python/libvirt-python/Manifest
@@ -1,18 +1,6 @@
-DIST libvirt-python-7.10.0.tar.gz 218394 BLAKE2B be1b64489503ca2e8bcaafc516ab228052b4e3e486aef1ef5310a95051a9549fe262feb009356f3735a3656e7b445ef6943b1932373be3618c36445042da8565 SHA512 db3c6ccffa3c2f38b788964f7a9cedee3e8de64fb5ecb65ac859eeac1450bea1ade8a7259a6035d7ee25af7d861b2e87f6eba24c21cab3f483c1a97318181d7e
-DIST libvirt-python-7.10.0.tar.gz.asc 833 BLAKE2B cf9d661bafd7e2ee52e895d3b5aa7d569226f90b4924a95c4178fb724847bfdcd085b04ae33a315480b20115318604809bc4a7edce5c801fd1286581cd8989a5 SHA512 f36d47b4b78daa1e848954acb3032750fc9bec58723b9bd04c48ca1a9b45e1a0252b85adef239080f6aef199c836d04db283510b099c69792e1c4b403c7d3685
 DIST libvirt-python-7.7.0.tar.gz 217406 BLAKE2B 4e3e887f9778ca817028d9147913618dcbdc83d05ce01b05b80661bb4cc823de6dc0e9d9b0837bf344774e5a8cdbaec7d4a7e55ce902b2867159795b85800cdc SHA512 07aa75a19dc94f3bde49b1af50fa73a6c920059b3b9ca943354c59f174d756aa5d1dca1394844dc3197b6a22c440028d347480a17858bc18fe1b5b19cf7d797f
 DIST libvirt-python-7.7.0.tar.gz.asc 833 BLAKE2B 159f5b5ec60d3b7966f3f99c185eddb8d2d03480b203473ae47e6139b21f8a4ee8bb8ba28ccacb88ad42c7b47d45862ccb48c90151203fb4e2295f355984e538 SHA512 b58579e648b82ec51de5f15e30dee39f7c42edf47ade4ad6f580bef21191f649b03eb05906bf31baa19afb6fadb57662c5326edb53b056a7235308d9c3bd551d
-DIST libvirt-python-8.0.0.tar.gz 218832 BLAKE2B be86e423607f90fb9e93fdb3b1ea768eed078ef3a4a05c5ee258ad48f650aeb15314ce9c0c45b3e986a18b81ae69c705c6cbe02d429fd71eb9dd7b9118fe91a3 SHA512 9eb85ae3048274a239908b658c0dacf0588538b356fc59c388900bca7164612d7370f3dddd2eb4c81e88fff7671118517bf0f5fd4382c5a88102212349dff4ec
-DIST libvirt-python-8.0.0.tar.gz.asc 833 BLAKE2B 12aec1acbf41811d9aa33a99038e1987624a2964579ef8ec236ba63fa8507cbe47d17e654221753a8d53af7d44ec53c2daca54f3b2dce18d8aea3e6d1012beaa SHA512 d6652f5d694a2b12d595fd78eb8ebc4f03ee02d20ed06187edfca5611b4784469af1cfd8c3ba009b799e7adf500775ede9d9c53544b995a072dc599797460d16
-DIST libvirt-python-8.1.0.tar.gz 221567 BLAKE2B aaf296f60c991c2877a2bb4ed47f1f2c4f75dd16b6831f53baab23883030cf20675ea61f636f0483e0c9a2f362638c860dd68eeb23b5ad82f43c66cd5f91b825 SHA512 507742d7b6503fdab45dad0b1e3b320f49a5cb01c1e0077f777bf41d53d2e6be4df0671e379d9a69330623ae362b725c7511d44d2c48489b21a657cf17efbd93
-DIST libvirt-python-8.1.0.tar.gz.asc 833 BLAKE2B a4fb10816ee50c1979926db87fa85e838e6caf74d086b612f07fb37730003030c16ce9f538fa8765a705b9a51d398e0284410a53aed31ac3452af4a4e5aae30e SHA512 2ca4bf7393f60267e0d7d32dcc50219847a86dbde76e1a83a9723c07133ff90d930dde32f454631c474fd36ac3837ccf94629576ddfb93288dfdb2490ce20724
 DIST libvirt-python-8.2.0.tar.gz 223589 BLAKE2B 6c8d39e6af1167aa24a1c0710177188aa0a73e54d9dbd6015d6a3b60726b78c45442fc756e68c61d54352a5fa9466f538ff986712e775bc54d46c885bcbcc8da SHA512 8d3eceb36651dbb903f51ec198dcf6bcd4dc3d3b31ce6a41df10928bbbf43b32a2f80c006c1fb9fc3e1cf2d7ffed95efc1209e0d20018135fb32c50876987d58
 DIST libvirt-python-8.2.0.tar.gz.asc 833 BLAKE2B 262a8072b58b19f871a72ed81d8dcab907130ce6f25f6478c72e6f3e7d8d51226fda1844a37baf82667d2f35ef3e64e84e47de1d33217a356ea1d78fec6aa548 SHA512 11ea846816a3300940b9792a5a778c633bb2d9e0523f442588ae82f8fb46ecc0256267b2efece655331112e3912c9bfcf46247555e48d1861999d1363f6034b1
-DIST libvirt-python-8.3.0.tar.gz 231579 BLAKE2B 0bd169b66f490e100eab95f94f412d27836a302d57c4771a35154995122fa23a4b9f8c836b622bbb1d7790664ab5c8c25f7158b2c11dcbfcf48ebf6bb6dc32db SHA512 8b50e4142f14e60bc50065bb3708bb04deb3f72061b056492cca52b866bf86f0b7b47e2f8de39d4f8898cf860f7247d0cb243eb2ad6a9329b27fc890f727ebd8
-DIST libvirt-python-8.3.0.tar.gz.asc 833 BLAKE2B bb19bef914e39d04b6580dcce1813bc21c5213a2b4c88d44686eeecc9ffc9383db3bab62d46840138a9a9e80d6429662aec43d586dddc041bca4543ff49c465b SHA512 65d417a6849614f94a59dca94cb258b7de487fbc409cd2cfc8c3e9cbdc76ae83c6c2c40a0cf4c12877d2fa78bbcf371512ca6f71973466d2151be690a8b4422c
-DIST libvirt-python-8.4.0.tar.gz 231985 BLAKE2B 64d37074e04cdb02332987dc46e6dd7b38dbc8fa4de0e6e1cbde1caba370f5eed650c4a135f6101c355f189a91fbba82dcac3d50f8c0d0678ce4def448a4b168 SHA512 6c831ae45549ab0c4d720826e2f5cb219eaab0943b8c71fe70c02fd49097fb5565ee6f651b19e34f72d6b0133bf3b4bb8bfe56b37723b24eaf336f65ab0a5865
-DIST libvirt-python-8.4.0.tar.gz.asc 833 BLAKE2B fa6f5e10ca3e06c017e9988e676dd2beca2bcb88f4d55d7a1740d42b4ea56ff0cdb4fd7698392ce1eead7a81fafcc1475eb6270329f56e191a4a4551120e982b SHA512 855869856ff41338c4ed1b707db4a0ace97a60e51d19183a0c1f904695b8a367249ae6266a45d79449443325cc85485db89dc73b09ac318c206cc03ab36ef179
-DIST libvirt-python-8.5.0.tar.gz 235414 BLAKE2B 616c8415f94a6c53b9bcd6ff7433993a3d40eb49ff13eaf81eee52c52806fb1d281216e8bd591deeee6058e2cb5161310d0ae1217467cd1f0525c00d7252214d SHA512 0e922301243200229c01659e57b4abad69a85931ea3ffcb70b117f313971d266d036dc6c1dbe42d48380d5ad9ed72326603101eb33d6a68dd6b7253a6e197aff
-DIST libvirt-python-8.5.0.tar.gz.asc 833 BLAKE2B 5b3c37ee02d6a5cefcc81945b9f4c67f19d297f03ad16e2666e87c3ea54ac609d774d3bb90a47e4098914460fd0928f66641f52185fe367cad9794636a809836 SHA512 4fae1d23f7ef2fccb38dee397173f3571b64969672cbe297e3622b9a0194e4a434329de543e886a4a20a9e1e0e3f1fec10a08d924ec0e728b9e29a44877c7e24
 DIST libvirt-python-8.7.0.tar.gz 236343 BLAKE2B 563cd1a18f06c0210465905267c46b3e5c598a9dcb208f468660d40988a4f6d80e61feed3702d830d465769eebb2c4d6604ef9449700923795c0485c36e38680 SHA512 f7883964875657a11c6756e31fda59eadba8394b71dda04df366aac85b163f3ffb379054bace38922d10d0b8972d1e1210d1513498cfd5cd8f0b76d6985ee945
 DIST libvirt-python-8.7.0.tar.gz.asc 833 BLAKE2B 5386780d75114c21105d012fd0ec2fd22fdd979dd6cdaea59f578eff4c0616e377da52d8aec05f337b837fda663ce8afb6d670e960ee65146679cd8c9a60b12b SHA512 499324c7cb520edbd1778a16434de43be062545255abb271832a636ff1ce9f4ba87e90226a181e081d084fccd6c190acc15763fecfc89e80093845589c12f535
diff --git a/dev-python/libvirt-python/libvirt-python-7.10.0.ebuild b/dev-python/libvirt-python/libvirt-python-7.10.0.ebuild
deleted file mode 100644
index 6dbe00052c00..000000000000
--- a/dev-python/libvirt-python/libvirt-python-7.10.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-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 ~arm64 ~ppc64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests setup.py
-
-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/libvirt-python/libvirt-python-8.0.0.ebuild b/dev-python/libvirt-python/libvirt-python-8.0.0.ebuild
deleted file mode 100644
index 6000240c3d04..000000000000
--- a/dev-python/libvirt-python/libvirt-python-8.0.0.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-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 ~arm64 ~ppc64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests setup.py
-
-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/libvirt-python/libvirt-python-8.1.0.ebuild b/dev-python/libvirt-python/libvirt-python-8.1.0.ebuild
deleted file mode 100644
index 13e15986dc34..000000000000
--- a/dev-python/libvirt-python/libvirt-python-8.1.0.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Please bump with app-emulation/libvirt!
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-DISTUTILS_USE_SETUPTOOLS=no
-
-MY_P="${P/_rc/-rc}"
-
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} = *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-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 ~arm64 ~ppc64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-LICENSE="LGPL-2"
-SLOT="0"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/libvirt.org.asc
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-		dev-python/pytest[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests setup.py
-
-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/libvirt-python/libvirt-python-8.3.0.ebuild b/dev-python/libvirt-python/libvirt-python-8.3.0.ebuild
deleted file mode 100644
index cd3ceb1cc71e..000000000000
--- a/dev-python/libvirt-python/libvirt-python-8.3.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-MY_P="${P/_rc/-rc}"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-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 ~arm64 ~ppc64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests pytest
-
-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/libvirt-python/libvirt-python-8.4.0.ebuild b/dev-python/libvirt-python/libvirt-python-8.4.0.ebuild
deleted file mode 100644
index 59818c6c51d9..000000000000
--- a/dev-python/libvirt-python/libvirt-python-8.4.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-MY_P="${P/_rc/-rc}"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-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 ~arm64 ~ppc64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests pytest
-
-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/libvirt-python/libvirt-python-8.5.0.ebuild b/dev-python/libvirt-python/libvirt-python-8.5.0.ebuild
deleted file mode 100644
index 59818c6c51d9..000000000000
--- a/dev-python/libvirt-python/libvirt-python-8.5.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Packages which get releases together:
-# app-emacs/nxml-libvirt-schemas
-# dev-python/libvirt-python
-# dev-perl/Sys-Virt
-# app-emulation/libvirt
-# Please bump them together!
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-MY_P="${P/_rc/-rc}"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/libvirt.org.asc
-inherit distutils-r1 verify-sig
-
-if [[ ${PV} == *9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://gitlab.com/libvirt/libvirt-python.git"
-	RDEPEND="app-emulation/libvirt:=[-python(-)]"
-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 ~arm64 ~ppc64 ~x86"
-	RDEPEND="app-emulation/libvirt:0/${PV}"
-fi
-S="${WORKDIR}/${P%_rc*}"
-
-DESCRIPTION="libvirt Python bindings"
-HOMEPAGE="https://www.libvirt.org"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="examples test"
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	virtual/pkgconfig
-	test? (
-		dev-python/lxml[${PYTHON_USEDEP}]
-	)
-	verify-sig? ( sec-keys/openpgp-keys-libvirt )
-"
-
-distutils_enable_tests pytest
-
-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/mapbox_earcut/mapbox_earcut-1.0.0.ebuild b/dev-python/mapbox_earcut/mapbox_earcut-1.0.0.ebuild
index 2bd337492c06..4fc8129e31ae 100644
--- a/dev-python/mapbox_earcut/mapbox_earcut-1.0.0.ebuild
+++ b/dev-python/mapbox_earcut/mapbox_earcut-1.0.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=setuptools
 
 inherit distutils-r1
diff --git a/dev-python/marshmallow/Manifest b/dev-python/marshmallow/Manifest
index 859ff8808e31..46b9f8e09c4b 100644
--- a/dev-python/marshmallow/Manifest
+++ b/dev-python/marshmallow/Manifest
@@ -1,3 +1,4 @@
 DIST marshmallow-3.16.0.tar.gz 180106 BLAKE2B c3d9b9c1645e7df103940b8e637f3de027f23e5da4a6ebd25412fef9d2d61483ec934af5c37f781121928a7b2f98b44793a8671173a5c548936ce0bbd0d2290d SHA512 5d3c7babff9117261afb902090bffcdba4eee2984d13862f4974fc043c6e56420707a6d3aba4a6046d947ef9414386c24895fc9a2538e36e505692e76d70f409
 DIST marshmallow-3.17.0.gh.tar.gz 180037 BLAKE2B 17fa577a969d82555312b362b41e6c61c209566ba418c9aa14ef1195b7317477a9e7c7d669e5643bee0d12454fee79bcf35a9eb625ad499347299e6727afb6bc SHA512 3fceb6dcb3df7339d0c002ac90ed9960bdcc174b29ad0fc3222a435d3980b892ae07c1080483b7a5a71455a475ae1086869432cefab898a1008ad33c7efc1f99
 DIST marshmallow-3.17.1.gh.tar.gz 180094 BLAKE2B 7c4dc60923ef95bdd0d77da4d6c643193944ca02115fd12529fa564860acee3ec495f1b402f5bee6b4a90fe6100e766cc0959918aed57b232e9ff2e5d2500602 SHA512 f72f969fba2136cfe288fea93a6db791b99f163f5b5af3498c6dbef9150abd5ce66b9678b1ba6538c3add530272b13c197a57d2e35cf148a5d21bf12feafcdd4
+DIST marshmallow-3.18.0.gh.tar.gz 181535 BLAKE2B 6c808157038cf33d2906fbf2f4aa8a605adfe8301da56ba8f7df782e2970bae7f5e040aa8c9c9bda134b6e7e13d50a9bec1f8e715e06b8543742e2cd142d099d SHA512 25ee09faf93d5ae25b35089881a644cf409edbca3134ad092ad150b166604151c3474bfcd2ae07d29b066e89e67df643e65d9fece4bbad8b11af07554a0ceaf6
diff --git a/dev-python/marshmallow/marshmallow-3.18.0.ebuild b/dev-python/marshmallow/marshmallow-3.18.0.ebuild
new file mode 100644
index 000000000000..f924d3b5509e
--- /dev/null
+++ b/dev-python/marshmallow/marshmallow-3.18.0.ebuild
@@ -0,0 +1,36 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A library for converting to and from native Python datatypes"
+HOMEPAGE="
+	https://github.com/marshmallow-code/marshmallow/
+	https://pypi.org/project/marshmallow/
+"
+SRC_URI="
+	https://github.com/marshmallow-code/marshmallow/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-0.17[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/simplejson[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mkdocs-redirects/Manifest b/dev-python/mkdocs-redirects/Manifest
index b7b71b9ecdb5..1e95435c2015 100644
--- a/dev-python/mkdocs-redirects/Manifest
+++ b/dev-python/mkdocs-redirects/Manifest
@@ -1,2 +1,3 @@
 DIST mkdocs-redirects-1.0.5.gh.tar.gz 6624 BLAKE2B 2f974dcf2dc438d3d8e2289793150b0a5a0394027552a8f3878f83fc0ab78b0e1c38f29bcd155adccf40e5259e93e81b419741784584f924f5eb18a0059f3107 SHA512 3365f19792438262528236cb9531f12ef31bf368d849387855a58b6427cbe7be6b55292fe5174804f42b29acf0a921ce9987e8b3a7ed3870444fcf94d4a52df6
 DIST mkdocs-redirects-1.1.0.gh.tar.gz 7000 BLAKE2B 7bb98549613926fd7ff3fd9ddf6469703589bb38051358baffc2989bc496df38b270f859f9f40a21d688a7a453d0a4d1532af339d4e43d1144324729ab84824f SHA512 4ccda56bc26fd005ed0a1b0651c65883ad1f87912fc1c61fa9089a0e84bf1d124e943d1fae6f5bac4a521676419dcd8d409524926334f2ea5ae8b0d2f2d4ee52
+DIST mkdocs-redirects-1.2.0.gh.tar.gz 7434 BLAKE2B cba7252865135c66ca467473e5c373b1779131dc0fdea47092d97d97d4222e6e9b38f9b312f0341af90b8a05a24c3c33250b060c2b3029d49dc970da0b2fc48e SHA512 e26260277f56005d8fab3a7e6d05187796356909d7ab4f8d6cd6edd535b0ee944e49faf5b6366269bfface1a855f399e3d95275a5f0967134f6c8e1256bef220
diff --git a/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
new file mode 100644
index 000000000000..a1097be70143
--- /dev/null
+++ b/dev-python/mkdocs-redirects/mkdocs-redirects-1.2.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Plugin for Mkdocs page redirects"
+HOMEPAGE="
+	https://github.com/mkdocs/mkdocs-redirects
+	https://pypi.org/project/mkdocs-redirects/
+"
+SRC_URI="
+	https://github.com/mkdocs/mkdocs-redirects/archive/refs/tags/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/mkdocs-1.0.4[${PYTHON_USEDEP}]
+	<dev-python/mkdocs-2[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	dev-python/twine[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/mpmath/mpmath-1.2.1.ebuild b/dev-python/mpmath/mpmath-1.2.1.ebuild
index 61e5f809bfab..ce52a1a904b7 100644
--- a/dev-python/mpmath/mpmath-1.2.1.ebuild
+++ b/dev-python/mpmath/mpmath-1.2.1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=7
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 inherit distutils-r1 virtualx
 
diff --git a/dev-python/netcdf4-python/netcdf4-python-1.5.8.ebuild b/dev-python/netcdf4-python/netcdf4-python-1.5.8.ebuild
index a818d058a960..07ca567327db 100644
--- a/dev-python/netcdf4-python/netcdf4-python-1.5.8.ebuild
+++ b/dev-python/netcdf4-python/netcdf4-python-1.5.8.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1 optfeature
 
 MY_PN="netCDF4"
diff --git a/dev-python/openapi-core/Manifest b/dev-python/openapi-core/Manifest
index 7128faa27623..630d6d32635d 100644
--- a/dev-python/openapi-core/Manifest
+++ b/dev-python/openapi-core/Manifest
@@ -1,2 +1,3 @@
 DIST openapi-core-0.14.2.gh.tar.gz 57519 BLAKE2B 06dfd284612ca11a271f075444db9b859ca5416e31594680d6b32abec1fe917105f213209d1bfcb9664b265ea3d62839579134e8e104754075cd692d1ba7a99a SHA512 19a2508d56053214993abed7d173d17b55a80dac6421681d7c64082f910bf9cb03c99d4006a2cd883d51d54f11a18f90188f141a78b9d69a9a031c284a14f8f1
 DIST openapi-core-0.14.5.gh.tar.gz 57645 BLAKE2B c5c9c308b93a37e32708677cc7c7a2ccb9ec3f018390e56a251224b6b8776943ccd0ddfb560cdc3f1182cb32a9b2817878a0d4dda3906c179db9841853caf7ac SHA512 69d9fb2cc21dfdb939beae45b1c681faf9f8e3366b36e5907b00be65ac669ec40e3ae3fe910fb2c4f6c70d1412e6a67e4e4e47e3cf2c424716da4c813223295e
+DIST openapi-core-0.15.0.gh.tar.gz 73274 BLAKE2B 8bae95a3a70438702d6a49c06954dba610766b945076357cc32382b59efbbf2d839a282b41b3d96f75b25e8864c0b9f9bfec1eecd8056e205bda5d62fbc6abc4 SHA512 3e9327fdf7d8b84d29627bfcb9a7c7e471ddf8cb06c5b2ffd3518fadcb872738cdfc5365558c51b8e0526bfbe5a841b9bc9598d630c6c6ddf141dc9c6681c3d6
diff --git a/dev-python/openapi-core/openapi-core-0.15.0.ebuild b/dev-python/openapi-core/openapi-core-0.15.0.ebuild
new file mode 100644
index 000000000000..af9428866296
--- /dev/null
+++ b/dev-python/openapi-core/openapi-core-0.15.0.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Client-side and server-side support for the OpenAPI Specification v3"
+HOMEPAGE="
+	https://github.com/p1c2u/openapi-core/
+	https://pypi.org/project/openapi-core/
+"
+SRC_URI="
+	https://github.com/p1c2u/openapi-core/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	>=dev-python/pathable-0.4.0[${PYTHON_USEDEP}]
+	dev-python/isodate[${PYTHON_USEDEP}]
+	dev-python/more-itertools[${PYTHON_USEDEP}]
+	dev-python/parse[${PYTHON_USEDEP}]
+	<dev-python/openapi-schema-validator-0.3[${PYTHON_USEDEP}]
+	<dev-python/openapi-spec-validator-0.5[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/flask[${PYTHON_USEDEP}]
+		dev-python/responses[${PYTHON_USEDEP}]
+		dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+		dev-python/webob[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# falcon is not packaged
+	tests/integration/contrib/falcon
+
+	# TODO: these tests fail to collect
+	tests/integration/validation/test_security_override.py
+	tests/integration/validation/test_read_only_write_only.py
+
+	# unhappy about modern django
+	tests/integration/contrib/django/test_django_project.py
+	tests/unit/contrib/django/test_django.py
+)
+
+src_prepare() {
+	sed -i -e '/--cov/d' pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/openapi-schema-validator/Manifest b/dev-python/openapi-schema-validator/Manifest
index c4d757e499ae..022baf2e9b0b 100644
--- a/dev-python/openapi-schema-validator/Manifest
+++ b/dev-python/openapi-schema-validator/Manifest
@@ -2,3 +2,4 @@ DIST openapi-schema-validator-0.2.3.gh.tar.gz 25501 BLAKE2B d961cabca647f59d4d41
 DIST openapi-schema-validator-0.3.0.gh.tar.gz 27083 BLAKE2B 288f5d18874625c69eccf9be6442258ff8af735795eac0ee0449e5976584b1af22c1ea771bb79b4fa68623e60d417b140737e0d1ee85791027393650f0c1f747 SHA512 003ea97a1cac598eb3728d96291d8be56c6ba9e2d3cd4f77c1258962f67b460a887f4473fed39587870583e13a83403623c3b2f96fa8d02345583cd3bdaf008b
 DIST openapi-schema-validator-0.3.1.gh.tar.gz 23232 BLAKE2B d02f9004d7baf96e76fb035e212efbdb773f1d7685c8b73107d887ad1cdf2496afd4232bd4fbb263597106b6a7e7d0eb7e6efbe64f422ca11ff228d5f2f51fdb SHA512 72564409e80c8dd8578ba2a363865623aa03b8b2324abd37bea31c503632a367bacf81d8de801579b80347906d2b24c14371c9b37b70176e0bf51ca8c6b9e071
 DIST openapi-schema-validator-0.3.3.gh.tar.gz 16389 BLAKE2B af700555fd3a21e85cd7205dc549c305c5830bf8b3d3e36f8755153a12e0e6cd8db08cd75350760608db4f38774f369b51b239e47bb7dc6352a7559bf39ef02b SHA512 a621573f7d840bd6e8eb096a820a5ebdf4a07f186f2babda2128b34c66bd8249262d017cdeddec61d9984947666b73cb23a7ac419afd5ae892c14b7b754db57b
+DIST openapi-schema-validator-0.3.4.gh.tar.gz 16593 BLAKE2B 17882dff25d1bed05efa74792930a357d82cb404bbf746a6f348e9813b4af86842da1523a8e3dfaec1426c82efff6b0bddbfca89c8569ba36a4324ab4e5a418b SHA512 714f93594c875a04194a6980dc5e092866609787e424ef480d42da93c114e3b658a5efef13f78ed3db35f6e7399d7dda8adbc1d3bb8606512aa4f135edeaeb75
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.4.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.4.ebuild
new file mode 100644
index 000000000000..79fa33f1e09d
--- /dev/null
+++ b/dev-python/openapi-schema-validator/openapi-schema-validator-0.3.4.ebuild
@@ -0,0 +1,38 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="OpenAPI schema validation for Python"
+HOMEPAGE="
+	https://github.com/p1c2u/openapi-schema-validator/
+	https://pypi.org/project/openapi-schema-validator/
+"
+SRC_URI="
+	https://github.com/p1c2u/openapi-schema-validator/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/isodate[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
+	dev-python/rfc3339-validator[${PYTHON_USEDEP}]
+	dev-python/strict-rfc3339[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/--cov/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pandas/Manifest b/dev-python/pandas/Manifest
index 65dc7f7acf85..77b66ec4ccdd 100644
--- a/dev-python/pandas/Manifest
+++ b/dev-python/pandas/Manifest
@@ -1,2 +1,3 @@
 DIST pandas-1.4.3.tar.gz 4941520 BLAKE2B b134f7c04c2478b7105214ed62e9adcaed98ffb4179a785f7887850d66702bf0f185d60a3da6de6226742529008bac614b494453dca929e477960ff3b43ef93d SHA512 d8d7575ce2b813361641d4e438844e03ed79179f5dcc56f2e4923bfeceab6f825a9bcc419e9492ee5e0272ea7c9bb9eeab6a0e242a880a87999df2a492436d8e
 DIST pandas-1.4.4.tar.gz 4949620 BLAKE2B 7ce236ae28ed6c6857a3acf6936aad2b1dc53a048986809d8dedbb9595dd2234bacbe114b74d8a171a6b31254372ea262566b134e7b5b24d5d4666938c7e6154 SHA512 a12e92dd751ed2342d9291724833732cdadbc9791e59533b9efded570b9893bacbe2f10e6bc70d673adb9356dcb0ae3d64d8a1dfe6ae8a3c70e474556ded4d91
+DIST pandas-1.5.0.tar.gz 5191537 BLAKE2B c7dec1d0197e6ac860667177f0f255bb327dbd48fe4501280d578b93f4496e61c0847dc478effeb8c5729d7a9d3e8a643c01db095a9843d6d211a9420f94d42c SHA512 8d340da1e0dff9b64c8993359b35ddcfc796fa15fee1bf1a27ea5a12e33f8b20d45bfac0ff9275b16ff0d4f7855a73962629e06c62bc08ca5e21b4ef1ea29ec2
diff --git a/dev-python/pandas/pandas-1.5.0.ebuild b/dev-python/pandas/pandas-1.5.0.ebuild
new file mode 100644
index 000000000000..c4c60fd4f595
--- /dev/null
+++ b/dev-python/pandas/pandas-1.5.0.ebuild
@@ -0,0 +1,201 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_REQ_USE="threads(+)"
+
+VIRTUALX_REQUIRED="manual"
+
+inherit distutils-r1 multiprocessing optfeature virtualx
+
+DESCRIPTION="Powerful data structures for data analysis and statistics"
+HOMEPAGE="https://pandas.pydata.org/
+	https://github.com/pandas-dev/pandas/"
+SRC_URI="
+	https://github.com/pandas-dev/pandas/releases/download/v${PV}/${P}.tar.gz
+"
+S="${WORKDIR}/${P/_/}"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="doc full-support minimal test X"
+RESTRICT="!test? ( test )"
+
+RECOMMENDED_DEPEND="
+	>=dev-python/bottleneck-1.2.1[${PYTHON_USEDEP}]
+	>=dev-python/numexpr-2.7.0[${PYTHON_USEDEP}]
+"
+
+# TODO: add pandas-gbq to the tree
+OPTIONAL_DEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/blosc[${PYTHON_USEDEP}]
+	|| (
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+	)
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	|| (
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+	)
+	>=dev-python/pytables-3.2.1[${PYTHON_USEDEP}]
+	>=dev-python/xarray-0.12.3[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	>=dev-python/xlrd-1.2.0[${PYTHON_USEDEP}]
+	>=dev-python/xlwt-1.3.0[${PYTHON_USEDEP}]
+	!hppa? (
+		dev-python/statsmodels[${PYTHON_USEDEP}]
+		>=dev-python/scipy-1.1[${PYTHON_USEDEP}]
+	)
+	X? (
+		|| (
+			dev-python/PyQt5[${PYTHON_USEDEP}]
+			x11-misc/xclip
+			x11-misc/xsel
+		)
+	)
+"
+COMMON_DEPEND="
+	>=dev-python/numpy-1.21.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-2.8.1-r3[${PYTHON_USEDEP}]
+	>=dev-python/pytz-2020.1[${PYTHON_USEDEP}]
+"
+DEPEND="
+	${COMMON_DEPEND}
+	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
+	doc? (
+		${VIRTUALX_DEPEND}
+		app-text/pandoc
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		dev-python/html5lib[${PYTHON_USEDEP}]
+		dev-python/ipython[${PYTHON_USEDEP}]
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/matplotlib[${PYTHON_USEDEP}]
+		dev-python/nbsphinx[${PYTHON_USEDEP}]
+		>=dev-python/numpydoc-0.9.1[${PYTHON_USEDEP}]
+		>=dev-python/openpyxl-1.6.1[${PYTHON_USEDEP}]
+		>=dev-python/pytables-3.0.0[${PYTHON_USEDEP}]
+		dev-python/pytz[${PYTHON_USEDEP}]
+		dev-python/rpy[${PYTHON_USEDEP}]
+		dev-python/sphinx[${PYTHON_USEDEP}]
+		dev-python/xlrd[${PYTHON_USEDEP}]
+		dev-python/xlwt[${PYTHON_USEDEP}]
+		dev-python/scipy[${PYTHON_USEDEP}]
+		x11-misc/xclip
+	)
+	test? (
+		${VIRTUALX_DEPEND}
+		${RECOMMENDED_DEPEND}
+		${OPTIONAL_DEPEND}
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5.5.3[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/pymysql[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-xdist-1.31[${PYTHON_USEDEP}]
+		dev-python/psycopg:2[${PYTHON_USEDEP}]
+		dev-python/xlsxwriter[${PYTHON_USEDEP}]
+		x11-misc/xclip
+		x11-misc/xsel
+	)
+"
+# dev-python/statsmodels invokes a circular dep
+#  hence rm from doc? ( ), again
+RDEPEND="
+	${COMMON_DEPEND}
+	!minimal? ( ${RECOMMENDED_DEPEND} )
+	full-support? ( ${OPTIONAL_DEPEND} )
+"
+
+python_prepare_all() {
+	# Prevent un-needed download during build
+	sed -e "/^              'sphinx.ext.intersphinx',/d" \
+		-i doc/source/conf.py || die
+
+	# requires package installed
+	sed -e '/extra_compile_args =/s:"-Werror"::' \
+		-i setup.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_compile() {
+	distutils-r1_python_compile -j1
+}
+
+python_compile_all() {
+	# To build docs the need be located in $BUILD_DIR,
+	# else PYTHONPATH points to unusable modules.
+	if use doc; then
+		cd "${BUILD_DIR}"/lib || die
+		cp -ar "${S}"/doc . && cd doc || die
+		LANG=C PYTHONPATH=. virtx ${EPYTHON} make.py html
+	fi
+}
+
+src_test() {
+	virtx distutils-r1_src_test
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# test for rounding errors, fails if we have better precision
+		# e.g. on amd64 with FMA or on arm64
+		# https://github.com/pandas-dev/pandas/issues/38921
+		pandas/tests/window/test_rolling.py::test_rolling_var_numerical_issues
+
+		# TODO
+		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated
+		pandas/tests/api/test_api.py::TestTesting::test_util_testing_deprecated_direct
+		pandas/tests/io/test_clipboard.py::TestClipboard::test_raw_roundtrip
+
+		# TODO: xdist?
+		pandas/tests/test_expressions.py::TestExpressions::test_run_binary
+
+		# TODO: these require a running db server
+		pandas/tests/io/test_sql.py::TestMySQLAlchemy
+		pandas/tests/io/test_sql.py::TestMySQLAlchemyConn
+		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemy
+		pandas/tests/io/test_sql.py::TestPostgreSQLAlchemyConn
+	)
+
+	local -x LC_ALL=C.UTF-8
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	"${EPYTHON}" -c "import pandas; pandas.show_versions()" || die
+	epytest pandas --skip-slow --skip-network -m "not single" \
+		-n "$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)")" ||
+		die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+	if use doc; then
+		dodoc -r "${BUILD_DIR}"/lib/doc/build/html
+		einfo "An initial build of docs is absent of references to statsmodels"
+		einfo "due to circular dependency. To have them included, emerge"
+		einfo "statsmodels next and re-emerge pandas with USE doc"
+	fi
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature "accelerating certain types of NaN evaluations, using specialized cython routines to achieve large speedups." dev-python/bottleneck
+	optfeature "accelerating certain numerical operations, using multiple cores as well as smart chunking and caching to achieve large speedups" ">=dev-python/numexpr-2.1"
+	optfeature "needed for pandas.io.html.read_html" dev-python/beautifulsoup4 dev-python/html5lib dev-python/lxml
+	optfeature "for msgpack compression using blosc" dev-python/blosc
+	optfeature "Template engine for conditional HTML formatting" dev-python/jinja
+	optfeature "Plotting support" dev-python/matplotlib
+	optfeature "Needed for Excel I/O" ">=dev-python/openpyxl-3.0.0" dev-python/xlsxwriter dev-python/xlrd dev-python/xlwt
+	optfeature "necessary for HDF5-based storage" ">=dev-python/pytables-3.2.1"
+	optfeature "R I/O support" dev-python/rpy
+	optfeature "Needed for parts of pandas.stats" dev-python/statsmodels
+	optfeature "SQL database support" ">=dev-python/sqlalchemy-1.3.0"
+	optfeature "miscellaneous statistical functions" dev-python/scipy
+	optfeature "necessary to use pandas.io.clipboard.read_clipboard support" dev-python/PyQt5 dev-python/pygtk x11-misc/xclip x11-misc/xsel
+}
diff --git a/dev-python/pathlib2/pathlib2-2.3.7_p1.ebuild b/dev-python/pathlib2/pathlib2-2.3.7_p1.ebuild
index 93343f82a684..0d7f9427607f 100644
--- a/dev-python/pathlib2/pathlib2-2.3.7_p1.ebuild
+++ b/dev-python/pathlib2/pathlib2-2.3.7_p1.ebuild
@@ -23,6 +23,6 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 distutils_enable_tests pytest
diff --git a/dev-python/pebble/Manifest b/dev-python/pebble/Manifest
index 0c183abbb064..9428ad777603 100644
--- a/dev-python/pebble/Manifest
+++ b/dev-python/pebble/Manifest
@@ -1 +1,2 @@
 DIST Pebble-4.6.3.tar.gz 25888 BLAKE2B 71f9e4c77d7dcc841f8c3a5e9d3df764727c27fc1ee5bb8250e33d49ce006ee94c11309f469f2ebb79aa720fd58ac2741b240aaad8f6d3c18be68189f180b639 SHA512 92cbb5ac01cc6fe57055facb6bcb6a64e19eb5eb3a3ae5fead32d4dd1001a3c70fbf85ef832dffc6b6bb81af6b1c275e12a61eda421176548a7bd5a928056313
+DIST Pebble-5.0.0.tar.gz 28958 BLAKE2B ef7c221850dcaf50c1767c92ef1f59ee8fd8cd754f6a12e0bf3f9682c8e5fc4291e42ea4fad0f00cdced577f83b4501bdf1d4a3a90966b3751e8eac87b01a3bd SHA512 cf0dd7ea4d28c3574d069eb3ec3c3caa470d457fa5c446ad449761994ab138864415a88b7b25f83ddfa1c667ce9980b83bbde2da04345f4e0d226e59806ce38b
diff --git a/dev-python/pebble/pebble-5.0.0.ebuild b/dev-python/pebble/pebble-5.0.0.ebuild
new file mode 100644
index 000000000000..b1830f4e238c
--- /dev/null
+++ b/dev-python/pebble/pebble-5.0.0.ebuild
@@ -0,0 +1,25 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_P=${P^}
+DESCRIPTION="Threading and multiprocessing eye-candy"
+HOMEPAGE="
+	https://pebble.readthedocs.io/
+	https://github.com/noxdafox/pebble/
+	https://pypi.org/project/Pebble/
+"
+SRC_URI="mirror://pypi/${MY_P::1}/${PN^}/${MY_P}.tar.gz"
+S=${WORKDIR}/${P^}
+
+LICENSE="LGPL-3+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_tests pytest
diff --git a/dev-python/peewee/Manifest b/dev-python/peewee/Manifest
index f4ed9b86087d..d7d0dfa5ad8b 100644
--- a/dev-python/peewee/Manifest
+++ b/dev-python/peewee/Manifest
@@ -1,2 +1,3 @@
 DIST peewee-3.15.1.gh.tar.gz 903784 BLAKE2B 2570f12089728dd56bbcdf8715b7874fe11bed4790b80780b5850445188305a98695cbaac2e7a9b1cd53d9ae601a6a1be796219386dfa07da45610013151062d SHA512 eabfa7ae532fc6d392c7c89844ac28533787dd1a8e08ba797d6f0c5f70b9e60d74e3ca98e1a1e71e66744a7b48a3544c228289d7ac415619bfd81da15d6cf0fc
 DIST peewee-3.15.2.gh.tar.gz 905707 BLAKE2B 7441586c8da5080a50964a4d8e5c73f28b8e1adeb45b4ced675c70f55cb3264460014dbab36f097fbacfc2fce8cf3f42ef36a6c1737a671ecd8bfede6af82c8e SHA512 6fa574161cdd224104bb428b9935574d3dc69ec574e5887ab68c7686d63af856787e3411e27703773c0e2f75f51915da569538662a908c225ace3c14c78892b9
+DIST peewee-3.15.3.gh.tar.gz 906883 BLAKE2B 4cc76b4288e8b8e36b4df2f42e31c8eeec314b2af28612d272699e6cc79d836fdc8800f18883e721fd98ca04bf58b0ed26ba61ab36280d28a32d1ca18ab6577c SHA512 bf297423178fca432add6e1ef2aba41ebd87d2bdc34e47872b5c35573dd9eedd42a290cad53dfce68e0bc0e07bb537064c25bf6b43b43d678302d6345eaa35a4
diff --git a/dev-python/peewee/peewee-3.15.3.ebuild b/dev-python/peewee/peewee-3.15.3.ebuild
new file mode 100644
index 000000000000..82b01219bc7a
--- /dev/null
+++ b/dev-python/peewee/peewee-3.15.3.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..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/pickleshare/pickleshare-0.7.5.ebuild b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
index babf1152b1d3..94b98c8f945a 100644
--- a/dev-python/pickleshare/pickleshare-0.7.5.ebuild
+++ b/dev-python/pickleshare/pickleshare-0.7.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/path-py-6.2[${PYTHON_USEDEP}]"
diff --git a/dev-python/pikepdf/Manifest b/dev-python/pikepdf/Manifest
index 9a64dfa2a5f2..7db1637396bd 100644
--- a/dev-python/pikepdf/Manifest
+++ b/dev-python/pikepdf/Manifest
@@ -1,3 +1,4 @@
 DIST pikepdf-5.5.0.gh.tar.gz 2901781 BLAKE2B 8bc04627b781a65965c0679f2cccc8c7849d1f4e25008a50ee5965b4a4cb6c3c26f86d478a916228a37039a0fc062257cbf08db01e62ea877de208f7a64772e9 SHA512 61e802d52b3bce83ca1d0543a025e5390223bd856e1033a0df8ac63f457dc0b1473cf2c64965d857ceccde472d2d513fb335db6604c184cdcf2231129dfa5e38
 DIST pikepdf-5.6.1.gh.tar.gz 2905150 BLAKE2B 35c06251debb935b88f13e27f42f80b36275575d7848409bb19fa380be7429b785b8fea36e7d882a49df2e40e6c34fcc3d900b1b362f5ccf600780291f43d1f7 SHA512 add8edb16cba2081c479739ec215dc8c96a1896a159febb5bc2f74c2da1e8cf83b12a1302e1ad2ce8ab6fbf01a16104f8efb9c7a764fa1eedbc795dc45a71dfe
 DIST pikepdf-6.0.1.gh.tar.gz 2905054 BLAKE2B 8f633b6c359fd912a5ee2af52050e46ddc8b593ed70b8f5730fc6db8244f2ad630b175e6c2391d600e8229820dbd6dfbf52cc19124a6a69fa8e25fbc62a6c6c0 SHA512 9b44f94b5354b21036d5e6cd84d8a90b0193f63f0fe8e3e19b59febb4450380ea69a59a62af8ffec185a7ecd0542d3fcce926756c648ddb20552ed0762972193
+DIST pikepdf-6.0.2.gh.tar.gz 2905158 BLAKE2B b80bee6690513ebd43b590ec5addb40f81a31b27adab77e04f0fd521e0a23a5bc974c6026163f1c9faf23f0d9e2b004961d93a19fab20a43bdf27b0a69597413 SHA512 8c1213535d503f388de6845d28f430947630717f8c299e6a384204de38e2f5f1a5858a0307abd5a34a2f4d79787bdab0e1be286a99ce91b64fc0fcf3f3553d89
diff --git a/dev-python/pikepdf/pikepdf-6.0.2.ebuild b/dev-python/pikepdf/pikepdf-6.0.2.ebuild
new file mode 100644
index 000000000000..0bf44a4e158d
--- /dev/null
+++ b/dev-python/pikepdf/pikepdf-6.0.2.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+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"
+KEYWORDS="~amd64 ~x86"
+
+DEPEND="
+	>=app-text/qpdf-11.0.0:0=
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/deprecation[${PYTHON_USEDEP}]
+	>=dev-python/lxml-4.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pillow-9[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/pybind11-2.9.1[${PYTHON_USEDEP}]
+	>=dev-python/setuptools_scm-7.0.5[${PYTHON_USEDEP}]
+	dev-python/setuptools_scm_git_archive[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	test? (
+		>=dev-python/attrs-20.2.0[${PYTHON_USEDEP}]
+		>=dev-python/hypothesis-5[${PYTHON_USEDEP}]
+		>=dev-python/pillow-5.0.0[${PYTHON_USEDEP},jpeg,lcms,tiff]
+		>=dev-python/psutil-5[${PYTHON_USEDEP}]
+		>=dev-python/pytest-6[${PYTHON_USEDEP}]
+		>=dev-python/pytest-timeout-1.4.2[${PYTHON_USEDEP}]
+		>=dev-python/python-dateutil-2.8.0[${PYTHON_USEDEP}]
+		>=dev-python/python-xmp-toolkit-2.0.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/-n auto/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/prompt_toolkit/prompt_toolkit-3.0.31.ebuild b/dev-python/prompt_toolkit/prompt_toolkit-3.0.31.ebuild
index daef0b2a5e76..3e2881b39eed 100644
--- a/dev-python/prompt_toolkit/prompt_toolkit-3.0.31.ebuild
+++ b/dev-python/prompt_toolkit/prompt_toolkit-3.0.31.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/pycollada/pycollada-0.7.2.ebuild b/dev-python/pycollada/pycollada-0.7.2.ebuild
index c04b5fb114c6..10420926170d 100644
--- a/dev-python/pycollada/pycollada-0.7.2.ebuild
+++ b/dev-python/pycollada/pycollada-0.7.2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 inherit distutils-r1
 
 DESCRIPTION="Python library for reading and writing COLLADA documents"
diff --git a/dev-python/pydevd/pydevd-2.8.0-r1.ebuild b/dev-python/pydevd/pydevd-2.8.0-r1.ebuild
index a4da1a2f06b0..26d973b1c209 100644
--- a/dev-python/pydevd/pydevd-2.8.0-r1.ebuild
+++ b/dev-python/pydevd/pydevd-2.8.0-r1.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/PyDev.Debugger-${MY_P}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # After removing and recompiling the prebuilt lib the tests fail?
 # For some reason the test suite is executing a slightly different gdb command
diff --git a/dev-python/pyjwt/Manifest b/dev-python/pyjwt/Manifest
index dca287789b78..04e2bd2ec591 100644
--- a/dev-python/pyjwt/Manifest
+++ b/dev-python/pyjwt/Manifest
@@ -1 +1,2 @@
 DIST PyJWT-2.4.0.tar.gz 66327 BLAKE2B bc78ceebe3fedd4216420c34034de96dc6af488b4b50d20a03073753cfe94d059cda3e118f79cc3718253f56bb977b5b86543d1cd1ab7346a4095d0c2c6855b2 SHA512 6c60afe62f9341c0fd889be227cd9e44260bc88696a93d0c3398547e159001f04e402d207d2230641f0f3d37cfd7e6f9e50a42dadfb011d7087c32a864c792a4
+DIST PyJWT-2.5.0.tar.gz 72538 BLAKE2B 1ad7aff8d1e37a86fb70be9661fad4f0b8ac515e592b78761b89c7b53230ddf8042ad3b6841676026124b01167caa8303481c6a0a301e2bff4e2beab2245312f SHA512 8a638880a25e3dd3b0284deddbbd20df59cfd13693f1228dd00d37579a7d4b70faaa3c4c0a13dfcffac3b5894a10f50187383e393659b7b2aa438dd5ba4b496b
diff --git a/dev-python/pyjwt/pyjwt-2.5.0.ebuild b/dev-python/pyjwt/pyjwt-2.5.0.ebuild
new file mode 100644
index 000000000000..979dd67cc701
--- /dev/null
+++ b/dev-python/pyjwt/pyjwt-2.5.0.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+MY_PN="PyJWT"
+DESCRIPTION="JSON Web Token implementation in Python"
+HOMEPAGE="
+	https://github.com/jpadilla/pyjwt/
+	https://pypi.org/project/PyJWT/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
+S=${WORKDIR}/${MY_PN}-${PV}
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	!dev-python/python-jwt
+"
+BDEPEND="
+	test? (
+		>=dev-python/cryptography-3.3.1[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+pkg_postinst() {
+	optfeature "cryptography" dev-python/cryptography
+}
diff --git a/dev-python/pymacaroons/pymacaroons-0.13.0.ebuild b/dev-python/pymacaroons/pymacaroons-0.13.0.ebuild
index 223a0c3db03f..a2bee30a6ff0 100644
--- a/dev-python/pymacaroons/pymacaroons-0.13.0.ebuild
+++ b/dev-python/pymacaroons/pymacaroons-0.13.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="https://github.com/ecordell/pymacaroons/archive/v${PV}.tar.gz -> ${P}.g
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="test"
 
 RESTRICT="!test? ( test )"
diff --git a/dev-python/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 5f61f35b51dc..fb4e17dbf0e2 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1 +1,2 @@
 DIST pyopencl-2022.1.6.tar.gz 455424 BLAKE2B 03c46bebc4d6093489b0a1501267d5d67b73e9e7fe50f73cec3dd752fbb699adab63e08d60f3a54c8fd215cbb82c81353d28e875b953686b05e188df78cfe237 SHA512 a1e404c4c5f95d111690c969ae5c5d34f0deca2c8b93a5ce4d90e003031af7eb94a7708f878170a9b6e001b899d321f7dfdaa6f7545af3237d30d237d44bb45f
+DIST pyopencl-2022.2.3.tar.gz 468218 BLAKE2B d747014c4cdb4d4303aa03fa16606f032b193497cf20909fd9e449f3c02e3d61dce55e44e93e769e4ec8f9c5f859c8d0a0f13bca1f1350dd7a29f6d92bcc3429 SHA512 b16feaa6d8a00cebb4f8c87d2aabed3472c45484eb5ecd530cb8e3478cfc9a41386203ab8cac0450b211f3330c36b3c52846e73a31e346784182f2ca9e6f4123
diff --git a/dev-python/pyopencl/pyopencl-2022.2.3.ebuild b/dev-python/pyopencl/pyopencl-2022.2.3.ebuild
new file mode 100644
index 000000000000..e966b7e97d34
--- /dev/null
+++ b/dev-python/pyopencl/pyopencl-2022.2.3.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Python wrapper for OpenCL"
+HOMEPAGE="https://mathema.tician.de/software/pyopencl/
+	https://pypi.org/project/pyopencl/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+IUSE="examples opengl"
+
+COMMON=">=virtual/opencl-2"
+# libglvnd is only needed for the headers
+DEPEND="${COMMON}
+	opengl? ( media-libs/libglvnd )"
+RDEPEND="${COMMON}
+	>=dev-python/mako-0.3.6[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.2.0[${PYTHON_USEDEP}]
+	>=dev-python/pytools-2021.2.7[${PYTHON_USEDEP}]"
+BDEPEND="dev-python/numpy[${PYTHON_USEDEP}]
+	>=dev-python/pybind11-2.5.0[${PYTHON_USEDEP}]
+	test? ( dev-libs/pocl )"
+
+distutils_enable_tests pytest
+
+python_configure_all() {
+	local myconf=()
+	if use opengl; then
+		myconf+=(--cl-enable-gl)
+	fi
+
+	"${EPYTHON}" configure.py \
+		"${myconf[@]}"
+}
+
+python_test() {
+	# Use dev-libs/pocl for testing; ignore any other OpenCL devices that might be present
+	local -x PYOPENCL_TEST="portable:pthread"
+	# Set the number of threads to match MAKEOPTS
+	local -x POCL_MAX_PTHREAD_COUNT=$(makeopts_jobs)
+	# Change to the 'test' directory so that python does not try to import pyopencl from the source directory
+	# (Importing from the source directory fails, because the compiled '_cl' module is only in the build directory)
+	pushd test >/dev/null || die
+	epytest
+	popd >/dev/null || die
+}
+
+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/pyproject-fmt/pyproject-fmt-0.3.5.ebuild b/dev-python/pyproject-fmt/pyproject-fmt-0.3.5.ebuild
index 30bd4cbb503c..c34979ce992d 100644
--- a/dev-python/pyproject-fmt/pyproject-fmt-0.3.5.ebuild
+++ b/dev-python/pyproject-fmt/pyproject-fmt-0.3.5.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 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
diff --git a/dev-python/pytest-httpserver/Manifest b/dev-python/pytest-httpserver/Manifest
index 60ec99968c1e..abf39ebef705 100644
--- a/dev-python/pytest-httpserver/Manifest
+++ b/dev-python/pytest-httpserver/Manifest
@@ -1 +1,2 @@
 DIST pytest-httpserver-1.0.5.gh.tar.gz 80395 BLAKE2B 68c075032c57f25854d390f73bf61b7efbe18f78d7f0b2a2a3be10d586ca9cc3ce4a1b390a2ba0da1e88558513782388069c419dae4908a0581e8d583f452bee SHA512 8275475bb044d54769e906571520fafbb9f6fa32fc003f4a00f72b9ff9930e4b80ee84564df1521569cc2a15f5d371c6315129263bc167d0621141004d509a25
+DIST pytest-httpserver-1.0.6.gh.tar.gz 83737 BLAKE2B d0db97227bcb3336a4bd944cf26e2d3e96132baee5991cdff901a1f546174e977b6472458911fc6b92bb13b6d3dae499e0bf3507be265385601e838c4781f0a3 SHA512 5eacfbf159f3a09d73f54da8f3ff885b8d2138e430af27df6039a30e63d7ebcbcf088efe8e7fa56ed50b66ea5b7e3ad7a61c0e8a57d5cb100c2a063df7b6f5c4
diff --git a/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild b/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
new file mode 100644
index 000000000000..06a43e694073
--- /dev/null
+++ b/dev-python/pytest-httpserver/pytest-httpserver-1.0.6.ebuild
@@ -0,0 +1,43 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="HTTP server for pytest to test HTTP clients"
+HOMEPAGE="
+	https://github.com/csernazs/pytest-httpserver/
+	https://pypi.org/project/pytest-httpserver/
+"
+SRC_URI="
+	https://github.com/csernazs/pytest-httpserver/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local EPYTEST_IGNORE=(
+		# tests from building release artifacts
+		tests/test_release.py
+	)
+
+	epytest -p no:localserver
+}
diff --git a/dev-python/python-email-validator/python-email-validator-1.3.0.ebuild b/dev-python/python-email-validator/python-email-validator-1.3.0.ebuild
index d1d134328779..af09ff733c10 100644
--- a/dev-python/python-email-validator/python-email-validator-1.3.0.ebuild
+++ b/dev-python/python-email-validator/python-email-validator-1.3.0.ebuild
@@ -19,7 +19,7 @@ SRC_URI="
 "
 
 LICENSE="CC0-1.0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 SLOT="0"
 
 RDEPEND="
diff --git a/dev-python/python-ldap/Manifest b/dev-python/python-ldap/Manifest
index c276eb8a1010..2b2a05fdf169 100644
--- a/dev-python/python-ldap/Manifest
+++ b/dev-python/python-ldap/Manifest
@@ -1 +1,2 @@
 DIST python-ldap-3.4.2.gh.tar.gz 377981 BLAKE2B 6efa768dd035f8867abacfd9cc1b9ceca1a468c79550d2529130bd8eaf7546e4474d5798cf9090a9a74f05286ca30a33b8e54821292b8aa2e27358f93d72cb7b SHA512 3a68dd2c160d7d74061d9c9eb060be6faeec1f607f3853722f969d7d1dc76c7da160aa20a4c139feb4d2eba6dbf2e2cfb02551cabd6fbf413654f32f73e94c15
+DIST python-ldap-3.4.3.gh.tar.gz 378215 BLAKE2B d5c165e668ed8bf1415e06e28e306bb757dea71ee7cc1ad380c35a5d911767fd08e249577aef0e5e888c1e9129072f93f499560e8b70e6848fbad4d7f9bb95a6 SHA512 a52403b7d9fc4d114b995640ff34f5aefd313d36cea5ff6de73ea9f46036694ebd43cd9d11382daf3be9da887f62c6675b49d684c05a7d5f0c93d446b16d1981
diff --git a/dev-python/python-ldap/python-ldap-3.4.3.ebuild b/dev-python/python-ldap/python-ldap-3.4.3.ebuild
new file mode 100644
index 000000000000..d4561b4d2481
--- /dev/null
+++ b/dev-python/python-ldap/python-ldap-3.4.3.ebuild
@@ -0,0 +1,79 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Various LDAP-related Python modules"
+HOMEPAGE="
+	https://www.python-ldap.org/en/latest/
+	https://pypi.org/project/python-ldap/
+	https://github.com/python-ldap/python-ldap/
+"
+SRC_URI="
+	https://github.com/python-ldap/python-ldap/archive/${P}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S=${WORKDIR}/${PN}-${P}
+
+LICENSE="MIT PSF-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-solaris"
+IUSE="examples sasl ssl"
+
+RDEPEND="
+	>=dev-python/pyasn1-0.3.7[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-modules-0.1.5[${PYTHON_USEDEP}]
+	net-nds/openldap:=[sasl?,ssl?]
+"
+# We do not link against cyrus-sasl but we use some
+# of its headers during the build.
+DEPEND="
+	net-nds/openldap:=[sasl?,ssl?]
+	sasl? ( >=dev-libs/cyrus-sasl-2.1 )
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx Doc
+
+python_prepare_all() {
+	if ! use sasl; then
+		sed -i 's/HAVE_SASL//g' setup.cfg || die
+	fi
+	if ! use ssl; then
+		sed -i 's/HAVE_TLS//g' setup.cfg || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	# Run all tests which don't require slapd
+	local EPYTEST_IGNORE=(
+		t_bind.py
+		t_cext.py
+		t_edit.py
+		t_ldapobject.py
+		t_ldap_options.py
+		t_ldap_sasl.py
+		t_ldap_schema_subentry.py
+		t_ldap_syncrepl.py
+		t_slapdobject.py
+	)
+	pushd Tests >/dev/null || die
+	epytest
+	popd > /dev/null || die
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r Demo/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/pyupgrade/Manifest b/dev-python/pyupgrade/Manifest
index 566b76a4fb2b..a204959f7420 100644
--- a/dev-python/pyupgrade/Manifest
+++ b/dev-python/pyupgrade/Manifest
@@ -1,2 +1 @@
-DIST pyupgrade-2.37.3.gh.tar.gz 64041 BLAKE2B 531ac8038c7084a4e46bac15d8da056d04496d979beb1fa98ab0832fab50425f412e3b17de3a52a24264acf489af9a9dde6094dd8a5939877269b38d1997d9ad SHA512 dd7e31c2e586d412902d25f30102dc7d229f76f4735e61ad9c77ad59642c2c2ed65d937cc5c6cde9bd50a1a2dad99d06a97c88fb6b0bd034cbc139685045f738
 DIST pyupgrade-2.38.0.gh.tar.gz 63620 BLAKE2B 73f551e92a6d68e0e1e2b1f21a3afd0f26ece7889450135fe7c68ad3ce094799cba669547965ff3c5589f1e667568e8dcf60709e8d1b3699fd36680494b79f96 SHA512 c65534c59f1810730cd039375678c648565023e1fbb03df4bd14846be95757b33d712c51197f54009e907da647a04700dd8d8ff1094188ef7ba0dbf2352084cf
diff --git a/dev-python/pyupgrade/pyupgrade-2.37.3.ebuild b/dev-python/pyupgrade/pyupgrade-2.37.3.ebuild
deleted file mode 100644
index eb59646e97ec..000000000000
--- a/dev-python/pyupgrade/pyupgrade-2.37.3.ebuild
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..11} )
-inherit distutils-r1
-
-DESCRIPTION="Tool + pre-commit hook to automatically upgrade syntax for newer Pythons"
-HOMEPAGE="https://github.com/asottile/pyupgrade"
-SRC_URI="https://github.com/asottile/pyupgrade/archive/refs/tags/v${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="dev-python/tokenize-rt[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
diff --git a/dev-python/pyzmq/Manifest b/dev-python/pyzmq/Manifest
index a92fe62bdc42..6a155b7c8df1 100644
--- a/dev-python/pyzmq/Manifest
+++ b/dev-python/pyzmq/Manifest
@@ -1 +1,2 @@
 DIST pyzmq-23.2.1.gh.tar.gz 402170 BLAKE2B 4cedd065cecbabc0e18928423e853a38953cd1f360fc326573c60bf69ffefadf3bed556d9d71eedf824e646ae23640d14b6aa8938c397c367be32cc36d300e38 SHA512 4ba236b87db062b245a04530de5b1e8385491107ae8de465f6f664c75ab8a929d57491eb3f8dddf31ff1db7b1eee89a6892a9a844bc285096cc9960704b36c9c
+DIST pyzmq-24.0.1.gh.tar.gz 404000 BLAKE2B 01928ba3c64a5afce8e7a97821658da2067a5f6c36c0173ab2f818e83a729939f346ef67bb9a39251abf365f5772abdf7e9e62afb4cc434b5603f474485a7427 SHA512 d4b6346e780f356941a624321f1619771fb2f0ef9f65a3c0a03e837ef081ece7ed59c03f57e8647ab1cd38cfc7404d597dd294768f9e9b890115b9eebc085484
diff --git a/dev-python/pyzmq/pyzmq-24.0.1.ebuild b/dev-python/pyzmq/pyzmq-24.0.1.ebuild
new file mode 100644
index 000000000000..d68843bf062b
--- /dev/null
+++ b/dev-python/pyzmq/pyzmq-24.0.1.ebuild
@@ -0,0 +1,81 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+# TODO: Find out exactly where this error comes from
+# error: '<' not supported between instances of 'str' and 'int'
+#DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="threads(+)"
+
+inherit flag-o-matic distutils-r1 toolchain-funcs
+
+DESCRIPTION="Lightweight and super-fast messaging library built on top of the ZeroMQ library"
+HOMEPAGE="
+	https://zeromq.org/languages/python/
+	https://pypi.org/project/pyzmq/
+	https://github.com/zeromq/pyzmq/"
+SRC_URI="
+	https://github.com/zeromq/pyzmq/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz"
+
+LICENSE="LGPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="+draft"
+
+DEPEND="
+	>=net-libs/zeromq-4.2.2-r2:=[drafts]
+"
+# it uses cffi backend for pypy, cython backend for cpython
+RDEPEND="${DEPEND}
+	$(python_gen_cond_dep '
+		dev-python/py[${PYTHON_USEDEP}]
+		dev-python/cffi:=[${PYTHON_USEDEP}]
+	' pypy3)
+"
+BDEPEND="
+	$(python_gen_cond_dep '
+		dev-python/cython[${PYTHON_USEDEP}]
+	' 'python*')
+	test? (
+		dev-python/pytest-rerunfailures[${PYTHON_USEDEP}]
+		>=www-servers/tornado-5.0.2[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-23.2.0-libdir.patch
+)
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	"dev-python/numpydoc"
+
+python_configure_all() {
+	tc-export CC
+	append-cppflags -DZMQ_BUILD_DRAFT_API=$(usex draft '1' '0')
+}
+
+python_compile() {
+	esetup.py cython --force
+	ZMQ_PREFIX="${EPREFIX}/usr" distutils-r1_python_compile
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		zmq/tests/test_constants.py::TestConstants::test_draft
+		zmq/tests/test_cython.py::test_cython
+
+		# hangs often
+		zmq/tests/test_log.py::TestPubLog::test_blank_root_topic
+	)
+	local EPYTEST_IGNORE=(
+		zmq/tests/test_mypy.py
+	)
+
+	cd "${BUILD_DIR}/lib" || die
+	epytest -p no:flaky
+}
diff --git a/dev-python/qtsass/Manifest b/dev-python/qtsass/Manifest
index 798ccadae8f8..aa31f27434de 100644
--- a/dev-python/qtsass/Manifest
+++ b/dev-python/qtsass/Manifest
@@ -1,2 +1,3 @@
 DIST qtsass-0.3.0.tar.gz 27880 BLAKE2B 07f71e794392ee23db901b1ae74e4c8a8888040b3e5b0681e05e2aa22ec2bdc958e588e2ee9ca9e5fdb4d341827b7c39a4ceb589ed4c669454cae78ee9747883 SHA512 fc3e082a01b35d1e7cada22cd5bea2aed37d4d3dd5a036d3d6d7621fb64ac61fdb3f2358f377f69e2cc5678798069af1d7cce04c4bcb9edf390d5162d308389c
 DIST qtsass-0.3.1.gh.tar.gz 28048 BLAKE2B d9f59898fcf7b825b515047f8a4e7db3dbd29c3133bbf1d65c5423b49ac2963786b83c0edefc1a596145f034e143362176d6fca965fa0899d6857073223e0d26 SHA512 7d7f65048d9944e80009edc2dcd9e4cd673e35d672d4424a4de5af7982604891452ecb7fb78e50bfc4f0cd3b5060eccad9db18bdd38c9900d9a3013753237e94
+DIST qtsass-0.3.2.gh.tar.gz 28601 BLAKE2B a02a21fb80d977cff09d3af74f50b68f341163997b68bb0eddf8aa5011b523992ef33f8d7afb8ee8361261c9ae7c45c5a141cfc957fdd3e10dc07ceafac06101 SHA512 2939ac9b2536148541abda4f3ea2750e814054c70a96614880453bf1443643e463fda9d2d308b3051461f88b4cf53046fc2ea057b62a2190b70a4b3f6daf033b
diff --git a/dev-python/qtsass/qtsass-0.3.2.ebuild b/dev-python/qtsass/qtsass-0.3.2.ebuild
new file mode 100644
index 000000000000..295f07dc7a26
--- /dev/null
+++ b/dev-python/qtsass/qtsass-0.3.2.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1
+
+DESCRIPTION="Compile SASS files to Qt stylesheets"
+HOMEPAGE="https://github.com/spyder-ide/qtsass"
+SRC_URI="https://github.com/spyder-ide/${PN}/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="dev-python/libsass[${PYTHON_USEDEP}]"
+
+BDEPEND="test? (
+	dev-python/flaky[${PYTHON_USEDEP}]
+)"
+
+distutils_enable_tests pytest
diff --git a/dev-python/rapidfuzz/Manifest b/dev-python/rapidfuzz/Manifest
index 3b7b068f2c6b..f1d4562c8239 100644
--- a/dev-python/rapidfuzz/Manifest
+++ b/dev-python/rapidfuzz/Manifest
@@ -1 +1,2 @@
+DIST rapidfuzz-2.10.0.tar.gz 782698 BLAKE2B f2b4ead136162fd3592b16978a58cd3a2d66489f05aefdf58fd137ebf34f347368f437b3ee836b36122b00863f0c238c8191307f6b586676db59ebfa2d370e1c SHA512 b704a535021924e436a1cebe397e747d3e39b6a4ec12718bbb2a91c326d1977c51bd7ca9a4b2c2d380fdc27ea76b1549d61dea511ed86054aceb1d2180716627
 DIST rapidfuzz-2.9.0.tar.gz 780939 BLAKE2B c43dfd89d18dc1f5b4738930f1d0d9c4956f66479217b4400844b50636e2b0bb13f15d8b9a6edc0ce30fc943f35a44dad802ecf90107556ed2dee7f70fcc16ac SHA512 b8f83cc35e84a4ed95e2086eb7bfbc6e7e2e25a05accc965092b8b51012c79e86e2af15397577bb91aadfa9a257a62d6f3d6bb9bf928a9c767d53468904a12be
diff --git a/dev-python/rapidfuzz/rapidfuzz-2.10.0.ebuild b/dev-python/rapidfuzz/rapidfuzz-2.10.0.ebuild
new file mode 100644
index 000000000000..878047045596
--- /dev/null
+++ b/dev-python/rapidfuzz/rapidfuzz-2.10.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# custom wrapper over setuptools
+DISTUTILS_USE_PEP517=standalone
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Rapid fuzzy string matching in Python using various string metrics"
+HOMEPAGE="
+	https://github.com/maxbachmann/RapidFuzz/
+	https://pypi.org/project/rapidfuzz/
+"
+SRC_URI="
+	mirror://pypi/${PN::1}/${PN}/${P}.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64"
+
+RDEPEND="
+	<dev-python/jarowinkler-2[${PYTHON_USEDEP}]
+"
+# all these are header-only libraries
+DEPEND="
+	>=dev-cpp/taskflow-3.0.0
+	>=dev-cpp/jarowinkler-cpp-1.0.0
+	>=dev-cpp/rapidfuzz-cpp-1.0.1
+	dev-python/numpy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/rapidfuzz_capi[${PYTHON_USEDEP}]
+	>=dev-python/scikit-build-0.13.0[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	test? (
+		dev-python/hypothesis[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export RAPIDFUZZ_BUILD_EXTENSION=1
diff --git a/dev-python/retworkx/retworkx-0.11.0.ebuild b/dev-python/retworkx/retworkx-0.11.0-r1.ebuild
similarity index 94%
rename from dev-python/retworkx/retworkx-0.11.0.ebuild
rename to dev-python/retworkx/retworkx-0.11.0-r1.ebuild
index f1f70f80289c..046997461e90 100644
--- a/dev-python/retworkx/retworkx-0.11.0.ebuild
+++ b/dev-python/retworkx/retworkx-0.11.0-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 
 # Generated with https://github.com/gentoo/cargo-ebuild.
 CRATES="
@@ -85,17 +85,17 @@ LICENSE="Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 MIT"
 SLOT="0"
 KEYWORDS="~amd64"
 
-BDEPEND="dev-python/setuptools-rust
+BDEPEND="dev-python/setuptools-rust[${PYTHON_USEDEP}]
 	test? (
 		dev-python/fixtures[${PYTHON_USEDEP}]
-		>=dev-python/testtools-2.5.0[${PYTHON_USEDEP}]
+		dev-python/graphviz[${PYTHON_USEDEP}]
 		>=dev-python/networkx-2.5[${PYTHON_USEDEP}]
 		dev-python/stestr[${PYTHON_USEDEP}]
+		>=dev-python/testtools-2.5.0[${PYTHON_USEDEP}]
 		media-gfx/graphviz[gts]
-		dev-python/graphviz[${PYTHON_USEDEP}]
 	)"
 
-RDEPEND=">=dev-python/numpy-1.16.0"
+RDEPEND=">=dev-python/numpy-1.16.0[${PYTHON_USEDEP}]"
 
 # Libraries built with rust do not use CFLAGS and LDFLAGS.
 QA_FLAGS_IGNORED="usr/lib.*/py.*/site-packages/retworkx/retworkx.*\\.so"
diff --git a/dev-python/setuptools-rust/Manifest b/dev-python/setuptools-rust/Manifest
index c76faf726f6d..bdf55d730cbc 100644
--- a/dev-python/setuptools-rust/Manifest
+++ b/dev-python/setuptools-rust/Manifest
@@ -1,3 +1,4 @@
+DIST autocfg-1.1.0.crate 13272 BLAKE2B 7724055c337d562103f191f4e36cab469e578f0c51cc24d33624dea155d108a07578703766341fd6a4cc1ef52acda406e7dba1650d59115f18261281e5b40203 SHA512 df972c09abbdc0b6cb6bb55b1e29c7fed706ece38a62613d9e275bac46a19574a7f96f0152cccb0239efea04ee90083a146b58b15307696c4c81878cd12de28f
 DIST bitflags-1.3.2.crate 23021 BLAKE2B eb990bb27b2bdeb66fd7212ce582cb36e1c616debbac85df642d0c82b25439e6bf9b1e811fac76b59e58ea3c1bbea6170d03a61e8f9a395e4334a0e2e2987eda SHA512 3c698f757b5cc62f815f9a1cce365c3d2dd88e4db71f331dff8bba86c2865f755b81cb4c9bfc59bd86b7643b0943f9e09a7c4f8ad75eb2ab0e714803d0129f62
 DIST byteorder-1.4.3.crate 22512 BLAKE2B d39c546ba7346df315297fc53da4bfc77ecb1f38567ddb788549ee31cae2719a8bc0b7d1f1705abb3cff033aa57af004987d90748f5a31765273b3223a011c0d SHA512 8c8000eb8ecf40351c9ce36a3a8acd7a02f81786d1b11aab85adfeffa0f2267ed74df29b2ca5d1d38128484d1d3cad2b673aa0d0441dcd0620dfd3934bb888fa
 DIST cfg-if-1.0.0.crate 7934 BLAKE2B e99a5589c11d79d77a4537b34ce0a45d37b981c123b79b807cea836c89fc3926d693458893baca2882448d3d44e3f64e06141f6d916b748daa10b8cc1ae16d1b SHA512 0fb16a8882fd30e86b62c5143b1cb18ab564e84e75bd1f28fd12f24ffdc4a42e0d2e012a99abb606c12efe3c11061ff5bf8e24ab053e550ae083f7d90f6576ff
@@ -22,6 +23,7 @@ DIST log-0.4.14.crate 34582 BLAKE2B ddfba35947ae1f5905cd9ecb9eb862a78af6f00ee8b8
 DIST mac-0.1.1.crate 4838 BLAKE2B c87e9f9283f179acd28c189d02d9d3de0ec99f9cfbefa590daa2880c275894951c5b0b935b652ab6c8c0172ac59e87f52fd49b787b230e6730365dc076d17578 SHA512 dbc6def04c482911ace311f34be79992fa04042c7ce36b71459b5af5c1c43e9fa66b6b40f63f8c3647daba287bf1c1be9b1a8031ead1d855f99a988898c96f1a
 DIST markup5ever-0.10.1.crate 34668 BLAKE2B a13f39ba93a26a558a8f03ebbbaa98bf2c7caa4fd393be3e307acd5b59a6d91fa8fbf4deff234266cd55772d5047145cc80c5a215ff8eb5b2fddb88468ae4fb2 SHA512 447b0f44ea8b786688127aba1b6eed826dc0127658d293c22db74864381b5e7bc0584243dcc0ee19929d3e757521167c13a108155ed5c8e78375cb0fd3c6f7b7
 DIST matches-0.1.9.crate 2246 BLAKE2B de155202636c6a03ed68cdb21e8ef96e19b45be040a82943d2d7e5192c0ab5c253ab6d65f0b30b2689e21da79cba684af5be6e63c48266681aceba356f6eea41 SHA512 6a2809687d30ff04ea97bf9d1610d746e097699a4c3625ffd1b7b1e4a9673ece9d559058c9f760b99d6ab509024f7b338e7cfa6fe767499c983efa98bfb98305
+DIST memoffset-0.6.5.crate 7686 BLAKE2B 9a797388702389076c426052c3d54dc62802d5db8bc5c9c83990429f2ffaec4fab4c7dd3f09cd0704d1ea555e87976563bb43408ba54b5e66ce7e406d4604009 SHA512 11bdd9185b99dfee8e659e051b09ee301c7142a372a8117864745a5085c015436d2efbb1478192886f09cbc562529e209d2e3325d94938a64bc75b1d91d2bf3f
 DIST new_debug_unreachable-1.0.4.crate 2561 BLAKE2B 5c9831b04e2a44b2dd27816df0a331a8108991a84ebdfefe4e42f325ec3519ee50e89a99d490020a65a3d75acc371316c2253d2c6382453a0b15f4c3d5b96520 SHA512 6f964bb322aa8f2ff92078381dd720527600c6449e237b703278cbcf47b39a2581fddfc2f34ebb7cf31229e33d58de48bb5050e083fec6dad9aefddc1d771c85
 DIST nodrop-0.1.14.crate 7667 BLAKE2B 83aa728540908d2d2d9f82c18282d9a9d74ea01b5b836d83cd3f03d225ddbef9fd3fd13460895d744158af74fccf13b7edcd5bb1bc127c696e613de673e25863 SHA512 f583ef6104aa087e13c66a183d451d4cf350560476ca959ce4e0e8308db26ac9f31166c25aca3d50ccd972266d7595d89767655504566a4131a54607e8ed9376
 DIST once_cell-1.10.0.crate 30414 BLAKE2B 4161622dc9dab4748a1b96777da263523f23329808506faea7938160f0d5ca07b5edd31f385b14b88dd2fc34c58063df4d40a34a479573750a369512dc956992 SHA512 f6b5ce5e68923296d2041f83ac037f10ad7b9e94fc607c71332e8ee942a02c29534c2073cecdb132c7e1d91428e9d9687fbf05393ca0abbf7e15db50bb3b74ab
@@ -38,10 +40,15 @@ DIST precomputed-hash-0.1.1.crate 1640 BLAKE2B 64a37ef3edd317f771e833bb394f7c19b
 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 pyo3-0.16.5.crate 363266 BLAKE2B 3162d9a3da37b5579a91dbd42d3e200c480b5e3fb3a2ec208735045cb78a8418f6810a72ec24452f24d00961c72a58ccac4f5ca9a567c92c0a82ca37173de442 SHA512 068019c76b1fc3de2e100c6cdf084df24587094aac3479cb1d906f7fc95ab6296cfe4d0d211a1c5696261be5e0e0e96776f5bc5535faf8243432f93e4d2537f9
+DIST pyo3-0.17.1.crate 394706 BLAKE2B 30d4d6285c977f0eb3581dd89e4d2cdb2c9badce3729c03f7f8f41bc0be9253bf4ef0d30b0c137007fb26cad02e17efdfbbe6d248829edf111be0ecf9c25a2fb SHA512 d5e28c9931abd06050e7dbf261024aeaf7a81b079b27cfdd610a2be08ee2e64c60f0c4d90eee28565a98a6ee34ba228e7085b7fecc85dfc504b66a6cf77dcfca
 DIST pyo3-build-config-0.16.5.crate 28880 BLAKE2B b821818831e410dc75df12f9f9625986ceea97d00f3160fc8cbf7315f003f94bad425bcfb3db73cca07ec62de47b763196e019e37d16beed9d5cf7386c05ca6c SHA512 91a9eb743b05808ccb5816a631e381167b16707515a68bbc43c04dee333c2537fd03ca1ae4a02b26738c79baa695b5dfa603753eee58e9002ac6b33320d275c6
+DIST pyo3-build-config-0.17.1.crate 29232 BLAKE2B 76e95012c0c2713f41bd70c49ef06f5e48ee6d89cce158902eb7d2c805c241e6cadfbac426de35bd3078307f120814d06a39fd227e093982807e825b868a3308 SHA512 1ec2d8069a8eb247b3e152adb47f675ba3d05aaecf13f7d3a580bac128339b9220f9dcf9f984009e0e8d4b9e11415d0b563c0087fcdd1499acbe8d263b3330bd
 DIST pyo3-ffi-0.16.5.crate 60737 BLAKE2B 84907201cf48e57a6b692a9261d67d005d0b773965116dd22d679eff2a3a02ee4f59678dde896635052e62c55ee2703f30726a65651a0f38fdcb31e8c95e3059 SHA512 8b4a486dfd204ea5c394b6832f5e2ead5cd88bc2a943bbc156fcf70e8212be6fa96af5c9ce06ce28a2d0e702fee858f26b49094070e00be658ffe3fa84265496
+DIST pyo3-ffi-0.17.1.crate 62851 BLAKE2B f23c29b4ba41ef59dc0723fbf4622e3a1f32ca127cf76d72f5e4f8988da448bbe9a7a324fbb57233e5ac1369e60b1ed0ef02f7ebb1576a31447fe060919c63d0 SHA512 f67462e48b8acb8a9b01c93f9100a37b45801271598398a106d7fc7bf9721c51ba114fe6d0b919b2199e29fdc8a0945a79ba18d766d1f22a536ff75ed5902235
 DIST pyo3-macros-0.16.5.crate 8456 BLAKE2B c37f31ebcea08fec38849ac52e6a52613b07e7532d7c79889ad52693461a0966e69a6cf29d4c2c8da19bce7e7d05e8c103dddccbb41667c69b28bb15cd388230 SHA512 c4f4993ab67d2f8fc6f1fe5c0eeffc00c10024e201c64fb49f3075f5c33af63d2d455f7696b094fe9786091469a27c5472cb11aea3e9c3b73404578ba76a93fc
+DIST pyo3-macros-0.17.1.crate 7229 BLAKE2B ef54df6d41d309dfd6bee907e83c63c53352b0a5fdc910bb1617b999bf5cc316c0ec81e504200d72b69ea9819e2da3e74027106f6ae08d8de751b91bc4fee7c6 SHA512 2958728e8d9d5c99ad785aee9755bca4ae6bf8b5b8e13af4a00a4fce9250af51d64093aaef8f19c8861557eb8f6448de75c55b1c637968d481241ff2ae8abc3e
 DIST pyo3-macros-backend-0.16.5.crate 49221 BLAKE2B 690f5e90074f44478b7701203b8a7b63f1fd83ab20c7458fbafa17e61ff34053c8f81d22151a30aa78980bc983a73cb1e56b2cdc5a55c5d8ab9b7e3941ab7503 SHA512 c85a1f53311355e96284cffc40d181aa65d63f9fffcdf8fa33fa989b771bb1b412ab118c9d3b08b1f686936797edb24c61c000dc59bbc5c69aacccf70b035b4f
+DIST pyo3-macros-backend-0.17.1.crate 49872 BLAKE2B 91d58229cdb012bfa701816d091309cf02e397a80e91663f050a800868cc7a7e54128c27c3b7a82467487c3c84b341baecaa2a36d0154a14602a272aa634421c SHA512 e4b706a80c9239d23c8c3b125d17e6f66ec64a442294d2cba3f21b50bd8ed839e6ef8816bacf9dcd9c5a15d4e0660f0594b4c1a213ffa3b59b19630720b76948
 DIST quote-1.0.16.crate 27566 BLAKE2B 3352f4ed2158cb8d29947d5435b7414ed223088887718f9d258f1f5d555034a4fbb79cbfb3cb772be4868be366853feabec777fba7f275ac36d8091eb3b371c7 SHA512 489f4dcaa8a8a2041b39fc8fc815fa7943c0a456881283398e4eb65f7b50f220a6e5493d60d1d5019a48b189ca217fd8c62056b552bf94b9329ec963cce01c74
 DIST rand-0.7.3.crate 112246 BLAKE2B ecc7c1bd70ac874c03bd8b7faa3016bb2d5ee5c19603280a12a45a81598f706e445971ee081e6ca410ab6f0f5f7a06d9315848cd556a2d8522a82024f6ff91e4 SHA512 f9b68ef9446f1ca2c8092c50990f15c1b4cb5529eeeac4df8d69755e0b7253c663c587775e7cb0a7298c31edb444975dda34926759306541f6d43d0d3cf57b7e
 DIST rand_chacha-0.2.2.crate 13267 BLAKE2B 7908867ceac98243ade22e1b38f1903fe0249324484d91c948a5058a1e099e5213f325c5ba3400898c8319158ed69f4ed064164f235470856a8191bd990d5a10 SHA512 1e2117442e4ffdd834dcbf0ea1829e73202c0ff9041d5969d81a59330242145f2753f2a56de2fdbff65f26cf0d227c7d08b2094ab2f946b764aef88106a6ac84
@@ -56,6 +63,7 @@ DIST semver-1.0.6.crate 29941 BLAKE2B 1aad12eb93534a0a72fa1645a71fe4cc03121a2215
 DIST serde-1.0.136.crate 76158 BLAKE2B 44603c8eede428dce4211350497a443385ff0ddb0b43799170411110fd8908a56e9df801c72695723f4fcff5eb33384bcf92ef58eecb9c4924d5d9cc30e2f6c9 SHA512 d043ccfd6a1dc9a114a1a95530a63ed9342688d31d3aadeec600a9a9d47aad328be35b6f80080400ea4bb3f820ddd18cc5ce1e6ea1db28e02752962061e71019
 DIST servo_arc-0.1.1.crate 9817 BLAKE2B 88586ca0c969df8bfb3a04ba4a689606995876434877a2cd48a72b26451deb6fdcf65273aa9b03948adcbc66b2450301840910e5c4162b993535d69585c62128 SHA512 59d531dcf7a9191b8462ce395e713194994714b65275c0af412186f862be169d0c6fc5d86603332a1aacd8af9ace934dc78531b9cb576cf8179ec35709225447
 DIST setuptools-rust-1.5.1.gh.tar.gz 293895 BLAKE2B 039e1fc36e4d1d49bf930c01c124cb98a5e0d6d913ba6b96bea9121457a855446e3ac3a3b3be471fcf4fb8849e38ff7dc41a9f4ddc400f78f723ba3e0bfed571 SHA512 0a763f371b88f3d22ff0dced8dc23d29534130a70133b63fa9097f7466957e13ee1ac812bbdea1a46ac3effb39a2d4349f1314e6cb0d20dfba407e07d37c7c14
+DIST setuptools-rust-1.5.2.gh.tar.gz 294274 BLAKE2B b0de905facd0fe110c25c037980826b09d64bab625be0a5be53ff981d37b02bba2b0aa3458ff0a95cdb1fb4ecdbafe08236167b76c1606c534dd8a4e04d68287 SHA512 e80d1296fd09c24b644d821e981261153ff19ae62d978fc8ee81c78e440d215f9d1e91e33d758effb94fcb64985937445940f2e2f032ad1b8c2aa39be79cf19d
 DIST siphasher-0.3.10.crate 9889 BLAKE2B e5dd6d265340b4c9e4266ab1ff3a20f1fb87fd493b2d7b5fba32d26421cc858b38929e4ab96941d0c055375b8acebbd04236d994cadca324500ed05064b9bfc9 SHA512 f90425a2cccc9575d377bb92a765d34653ddef1ac12b7c63dc6d700aaa74b525787e11609061c2d3e44ea56fe0e4b8f93f7b13f0279b5de2e0f710c5caffd4ce
 DIST smallvec-1.8.0.crate 27992 BLAKE2B d02897eb4d3901805be86cafd5d3dc6768b31c2ee4d0a9d7eb455e2a21be2864ea83589f4ffde102dbbafb66e3c197707af770b5ef184b8e244d992189644b84 SHA512 17687cfa6aaf95a1df063adc3a412a7c41918a0d003eaac90f7d9e859fb8fa1d652eedee17a4cb3aaae9b33a2043f89e796519e3a7a3992b292f04049bf80b0c
 DIST stable_deref_trait-1.2.0.crate 8054 BLAKE2B 287a65c3e5b47213544a43e57c60a54add60b4c2e3c8d042407d860cc950ba7ca01a2e67ce56aed6744992b61ec1f9aed3321e3d88482e33129548b7d51df205 SHA512 a13cfb22723f1f2cf089b2d07d657846f50c37bc0438d1a76096bea30214cad226b7a422c21f9e191ce87071da8a141d61882aedf9e0203a5fffdfda86a5fb03
diff --git a/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild b/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild
new file mode 100644
index 000000000000..91a6267c3443
--- /dev/null
+++ b/dev-python/setuptools-rust/setuptools-rust-1.5.2.ebuild
@@ -0,0 +1,159 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CARGO_OPTIONAL=yes
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+CRATES="
+	autocfg-1.1.0
+	bitflags-1.3.2
+	byteorder-1.4.3
+	cfg-if-1.0.0
+	convert_case-0.4.0
+	cssparser-0.27.2
+	cssparser-macros-0.6.0
+	derive_more-0.99.17
+	dtoa-0.4.8
+	dtoa-short-0.3.3
+	futf-0.1.5
+	fxhash-0.2.1
+	getrandom-0.1.16
+	html5ever-0.25.1
+	indoc-1.0.4
+	instant-0.1.12
+	itoa-0.4.8
+	kuchiki-0.8.1
+	lazy_static-1.4.0
+	libc-0.2.121
+	lock_api-0.4.6
+	log-0.4.14
+	mac-0.1.1
+	markup5ever-0.10.1
+	matches-0.1.9
+	memoffset-0.6.5
+	new_debug_unreachable-1.0.4
+	nodrop-0.1.14
+	once_cell-1.10.0
+	parking_lot-0.11.2
+	parking_lot_core-0.8.5
+	phf-0.8.0
+	phf_codegen-0.8.0
+	phf_generator-0.8.0
+	phf_macros-0.8.0
+	phf_shared-0.10.0
+	phf_shared-0.8.0
+	ppv-lite86-0.2.16
+	precomputed-hash-0.1.1
+	proc-macro2-1.0.36
+	proc-macro-hack-0.5.19
+	pyo3-0.17.1
+	pyo3-build-config-0.17.1
+	pyo3-ffi-0.17.1
+	pyo3-macros-0.17.1
+	pyo3-macros-backend-0.17.1
+	quote-1.0.16
+	rand-0.7.3
+	rand_chacha-0.2.2
+	rand_core-0.5.1
+	rand_hc-0.2.0
+	rand_pcg-0.2.1
+	redox_syscall-0.2.11
+	rustc_version-0.4.0
+	scopeguard-1.1.0
+	selectors-0.22.0
+	semver-1.0.6
+	serde-1.0.136
+	servo_arc-0.1.1
+	siphasher-0.3.10
+	smallvec-1.8.0
+	stable_deref_trait-1.2.0
+	string_cache-0.8.3
+	string_cache_codegen-0.5.1
+	syn-1.0.89
+	target-lexicon-0.12.3
+	tendril-0.4.3
+	thin-slice-0.1.1
+	unicode-xid-0.2.2
+	unindent-0.1.8
+	utf-8-0.7.6
+	wasi-0.9.0+wasi-snapshot-preview1
+	winapi-0.3.9
+	winapi-i686-pc-windows-gnu-0.4.0
+	winapi-x86_64-pc-windows-gnu-0.4.0
+"
+
+inherit distutils-r1 cargo
+
+DESCRIPTION="A plugin for setuptools to build Rust Python extensions"
+HOMEPAGE="
+	https://github.com/PyO3/setuptools-rust/
+	https://pypi.org/project/setuptools-rust/
+"
+SRC_URI="
+	https://github.com/PyO3/setuptools-rust/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+	test? ( $(cargo_crate_uris ${CRATES}) )
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	virtual/rust
+	<dev-python/semantic_version-3[${PYTHON_USEDEP}]
+	>=dev-python/semantic_version-2.8.2[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-3.7.4.3[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/setuptools-62.4[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+		$(python_gen_cond_dep '
+			dev-python/cffi[${PYTHON_USEDEP}]
+		' 'python*')
+		dev-python/lxml[${PYTHON_USEDEP}]
+		dev-python/pytest[${PYTHON_USEDEP}]
+	)
+"
+
+src_unpack() {
+	cargo_src_unpack
+}
+
+python_test() {
+	local examples=(
+		html-py-ever
+		namespace_package
+		rust_with_cffi
+	)
+	for example_dir in ${examples[@]}; do
+		pushd examples/${example_dir} >/dev/null || die
+		einfo "Running ${example_dir} test"
+		esetup.py build --build-lib=build/lib
+
+		case ${example_dir} in
+			html-py-ever)
+				pushd tests >/dev/null || die
+				local -x PYTHONPATH=../build/lib
+				${EPYTHON} run_all.py || die "Tests failed with ${EPYTHON}"
+				popd >/dev/null || die
+				;;
+			*)
+				pushd build/lib >/dev/null || die
+				epytest ../../tests
+				popd >/dev/null || die
+				;;
+		esac
+
+		rm -rf build || die
+		popd >/dev/null || die
+	done
+}
diff --git a/dev-python/signedjson/signedjson-1.1.4.ebuild b/dev-python/signedjson/signedjson-1.1.4.ebuild
index c4cb90c641c4..8c361d0b228f 100644
--- a/dev-python/signedjson/signedjson-1.1.4.ebuild
+++ b/dev-python/signedjson/signedjson-1.1.4.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/python-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 RDEPEND="
 	dev-python/canonicaljson[${PYTHON_USEDEP}]
diff --git a/dev-python/sphinx-pytest/Manifest b/dev-python/sphinx-pytest/Manifest
index b3a82425fd6e..c0b125e21dc2 100644
--- a/dev-python/sphinx-pytest/Manifest
+++ b/dev-python/sphinx-pytest/Manifest
@@ -1,2 +1,3 @@
 DIST sphinx-pytest-0.0.3.gh.tar.gz 5898 BLAKE2B 08fe98b3add1d76454c30a11f4d82bd04123e44fa5c28d420401014e5aef11354541781c0ba43a5d95c0c6fd35b12742ecf630005faae68125f5c6686c19ef59 SHA512 f1ee23fd5f320b5b4ac48638d509963638322374136d98516a17075e0d5b05cfa64107541c80daad424dfcd9e769a95dd5aa8d7f86d8ded214c9a3cdf901cf1f
 DIST sphinx-pytest-0.0.4.gh.tar.gz 6196 BLAKE2B 24b8be165a58b15a845f076b33fb7a2525afefa7fd8bf836ac679280d271716ff02bf3adfa9b485507bc3f8a6cb91b0458a0b5bdb62bf8920c09eb20468e8949 SHA512 25bf3fafddf02aed8b2478dc2beafa251027652d03f31bbac67eb98913e359f9497a9018561aff0fdaf568ece4bcfa15705dcfa2fd3734f4db6c613b24d6a568
+DIST sphinx-pytest-0.0.5.gh.tar.gz 6228 BLAKE2B bb619ce79411a611fecf778ac095da0e7557bc419b7395efbc4dc2163699425898005fabadc083b74ac2cab8f207dcf8969f5c551c975d6354063962141c907b SHA512 e1af518cc5535ecacae612f11c7fb1200965a1999d9eb2643ba14b222fc4e93c257ef6600b37b9de4075bf3e5e703db60e7350cd5159fcf4ba21abec28bceb66
diff --git a/dev-python/sphinx-pytest/sphinx-pytest-0.0.5.ebuild b/dev-python/sphinx-pytest/sphinx-pytest-0.0.5.ebuild
new file mode 100644
index 000000000000..729dc3cc684d
--- /dev/null
+++ b/dev-python/sphinx-pytest/sphinx-pytest-0.0.5.ebuild
@@ -0,0 +1,30 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Helpful pytest fixtures for Sphinx extensions"
+HOMEPAGE="
+	https://github.com/chrisjsewell/sphinx-pytest/
+	https://pypi.org/project/sphinx_pytest/
+"
+SRC_URI="
+	https://github.com/chrisjsewell/sphinx-pytest/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/pytest[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/sympy/Manifest b/dev-python/sympy/Manifest
index cf033c6a34e9..f900d530e633 100644
--- a/dev-python/sympy/Manifest
+++ b/dev-python/sympy/Manifest
@@ -1,3 +1,2 @@
 DIST sympy-1.10.1.tar.gz 7666681 BLAKE2B e522e71058ebc8bdf3c016e3067bae9138e9a9a15ea658cba1fd35a04ce58246b5c3d7ab9c231d7071ed20b588ecfaa9275f383825b511a40c9821eadb53dd44 SHA512 7b6d5718826951bb1e477a78c3de8b95b8edda103981ad03c9f0da125ad35d72d8e5b5716d478ac4f00810939f1dc35786cc2e0a6b75cffb098cc1be9d8f7168
 DIST sympy-1.11.1.gh.tar.gz 13462495 BLAKE2B a45320d087057595d3574490c6dc07bcdf7870543e9adcbaca9abe293d84875c123bbc91a7263a87b0b71568dece4e1304b6bf76f60ae64e353520f0ca686b1f SHA512 6cc720b673cf31a2e8f56a5cae24ec15024ea43dee92196adb0a87f28561b5d2404fbbfd3d55a8414930a31d4d0f4a731d458ad528c8cbb03c37555f5c14ce4a
-DIST sympy-1.11.tar.gz 13462278 BLAKE2B 8129ac3b3a02930f05d3e9b8bbf3d224be9a92743a4ae5c518d34bd8bb2bffee1ceb3bac8b24423752d82cfdebaed7f72b51a8383a48080b7c3f8c7ce1e49c3d SHA512 4ecebe3ed363c0ccc365df0b7ffbafdde7d8a3012feda4e9c4b54b77f4b73b46cac949070d0e7ddd2ec350c18eb54a11f6abd6cd40e476eed0f1ded18c99fc09
diff --git a/dev-python/sympy/sympy-1.11.ebuild b/dev-python/sympy/sympy-1.11.ebuild
deleted file mode 100644
index b75ed090fb89..000000000000
--- a/dev-python/sympy/sympy-1.11.ebuild
+++ /dev/null
@@ -1,66 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Computer Algebra System in pure Python"
-HOMEPAGE="https://www.sympy.org/"
-SRC_URI="https://github.com/sympy/sympy/archive/${P}.tar.gz"
-S="${WORKDIR}/${PN}-${P}"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="aesara examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs"
-
-RDEPEND="
-	dev-python/mpmath[${PYTHON_USEDEP}]
-	dev-python/pexpect[${PYTHON_USEDEP}]
-	aesara? ( dev-python/aesara[${PYTHON_USEDEP}] )
-	imaging? ( dev-python/pillow[${PYTHON_USEDEP}] )
-	ipython? ( dev-python/ipython[${PYTHON_USEDEP}] )
-	latex? (
-		virtual/latex-base
-		dev-texlive/texlive-fontsextra
-		png? ( app-text/dvipng )
-		pdf? ( app-text/ghostscript-gpl )
-	)
-	mathml? ( dev-libs/libxml2:2[${PYTHON_USEDEP}] )
-	opengl? ( dev-python/pyopengl[${PYTHON_USEDEP}] )
-	pyglet? ( dev-python/pyglet[${PYTHON_USEDEP}] )
-	symengine? ( dev-python/symengine[${PYTHON_USEDEP}] )
-	texmacs? ( app-office/texmacs )
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	esetup.py test
-}
-
-python_install_all() {
-	local DOCS=( AUTHORS README.md )
-
-	if use examples; then
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-
-	distutils-r1_python_install_all
-
-	if use texmacs; then
-		exeinto /usr/libexec/TeXmacs/bin/
-		doexe data/TeXmacs/bin/tm_sympy
-		insinto /usr/share/TeXmacs/plugins/sympy/
-		doins -r data/TeXmacs/progs
-	fi
-}
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index 78bbcb10f9a9..b63e79787328 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1 +1,2 @@
 DIST tenacity-8.0.1.tar.gz 37492 BLAKE2B 10438b3877862baa88d164837b201773c287e7ce11b6213c677c227cbddda02434b423c0f331746495e68ab130ff9a9c720cccd2def3efa8ca6df8eef441eee9 SHA512 b5a615306e25c93d2734d408cc73f4db5361d92b713c1e7bbb57cd7bf635f82c5ccffafe9c0a6bc0da4057d11c92012d2337a5e4f15465bf4e6839d1fa97b877
+DIST tenacity-8.1.0.tar.gz 37658 BLAKE2B 4f9e2ea44ac0f0ed8b694b0f60e938fadbcf65bd989e9d641f7a40750f499aa9635a70d80e406aa2ebf436ebd37cde0d88e8ecb6cb3436ba755c2d921541c8e8 SHA512 194312e80233d6edcdf30496a355b272a4de4809bbe187948a7ce9c1382958845d12401498569f2b8d4251ede2857317820779f13a65bb2e69dcb97dde9bb501
diff --git a/dev-python/tenacity/tenacity-8.1.0.ebuild b/dev-python/tenacity/tenacity-8.1.0.ebuild
new file mode 100644
index 000000000000..f26d4e37358c
--- /dev/null
+++ b/dev-python/tenacity/tenacity-8.1.0.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="General-purpose retrying library"
+HOMEPAGE="
+	https://github.com/jd/tenacity/
+	https://pypi.org/project/tenacity/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+	test? (
+		www-servers/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/termcolor/Manifest b/dev-python/termcolor/Manifest
index 954e1615bdbb..9b8c6b6de279 100644
--- a/dev-python/termcolor/Manifest
+++ b/dev-python/termcolor/Manifest
@@ -1,2 +1,3 @@
 DIST termcolor-1.1.0.tar.gz 3912 BLAKE2B 8d661a708eff02894b6e390befddaef1c9d14f78f0c7d10ac332fa149f7892109f77bd279c9a488a3aa4070569c92f0ce847e3911d419ff549a10555b34534fb SHA512 4bd06bf4405a9ef6c005cd4d159ef602f7fc7fccb3e57586da1187c402f4d0b9051ef930cae423065c51ff4be8a22ceae556a61a6b3c8c519d623c066c340b53
 DIST termcolor-2.0.0.tar.gz 9701 BLAKE2B 3c1d81b21788c07870724ca162828037eee11b2c472fbe4cf9c60583155a0eb665c59bbab824882038f453d539b2c3c8518b51e373deb9755205b41b517d8ed3 SHA512 3b5f937c94ba3c0eac04073851fa53123262b3de4e081635069ebd2115b51cf37f88bf129f19d356886487cbeda381921022e52b560b7cbc8a9d935bc902dc6e
+DIST termcolor-2.0.1.tar.gz 9693 BLAKE2B 68592597da70957bd3f03a9a76e546ab17f7c437d00aca53325a617b02c5600679c9912c0ca8d9f7ade03a042cd657e86b1e12a588ec1eeafdfa57f3f5f16372 SHA512 e49f05e587fb420aa373d1644d66e4832a701385fc1da85470fa0d811770f73908ca139e1c1e9cb968cbc74285b038833f371854edc6e20bc22059b31ef1a1ed
diff --git a/dev-python/termcolor/termcolor-2.0.1.ebuild b/dev-python/termcolor/termcolor-2.0.1.ebuild
new file mode 100644
index 000000000000..61b84954a4c0
--- /dev/null
+++ b/dev-python/termcolor/termcolor-2.0.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="ANSI Color formatting for output in terminal"
+HOMEPAGE="
+	https://github.com/termcolor/termcolor/
+	https://pypi.org/project/termcolor/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/traitlets/Manifest b/dev-python/traitlets/Manifest
index b7344c520625..2bbfaef6844c 100644
--- a/dev-python/traitlets/Manifest
+++ b/dev-python/traitlets/Manifest
@@ -1 +1,2 @@
 DIST traitlets-5.3.0.tar.gz 136916 BLAKE2B 72f1a8ec9524a2a77046e592206ca0fd5c788daf67c673b8335f840272ce49b6b82735b272d29e1a507096dc2c65b82350b1ccbf925864a643918ff813e8a888 SHA512 1c6c74b18b1a4d37fb61f466b9018b5612a8cf8b7a52c58bf0d3f576d0a94487f73c9d1005458d2b56ac9e86083bb5f1ef67e107ceced1009fda442f1fc9aa44
+DIST traitlets-5.4.0.tar.gz 134340 BLAKE2B 56950fe680a4f4ede970e310894105a5df102799a383a5e55baa6d76d6059b31eb0b255491b1c294801dbf2a25118934f1167e8e12c397dc16e3896b7d180d49 SHA512 0059bdaa3c1efebdd645b95d5f7c596f8db65b76d659d57636ae3ec53119eaf6b6ac978002c5e4d59bbf6a0ad0ddd5a15c731404550f17c151e7a7612dfc92ff
diff --git a/dev-python/traitlets/traitlets-5.4.0.ebuild b/dev-python/traitlets/traitlets-5.4.0.ebuild
new file mode 100644
index 000000000000..08fe26572c56
--- /dev/null
+++ b/dev-python/traitlets/traitlets-5.4.0.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="A configuration system for Python applications"
+HOMEPAGE="
+	https://github.com/ipython/traitlets/
+	https://pypi.org/project/traitlets/
+"
+SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+distutils_enable_sphinx docs/source \
+	dev-python/sphinx_rtd_theme
+distutils_enable_tests pytest
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/treq/treq-22.2.0-r1.ebuild b/dev-python/treq/treq-22.2.0-r1.ebuild
index c2314d897ea1..02970f97aa02 100644
--- a/dev-python/treq/treq-22.2.0-r1.ebuild
+++ b/dev-python/treq/treq-22.2.0-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE="doc test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/trimesh/Manifest b/dev-python/trimesh/Manifest
index 8e5b0e993d50..0cb2c8a5655f 100644
--- a/dev-python/trimesh/Manifest
+++ b/dev-python/trimesh/Manifest
@@ -1,3 +1,4 @@
 DIST trimesh-3.13.5.gh.tar.gz 11961925 BLAKE2B 8a4b069f2df49c9ca6121cd3ea446f959a4d5df16b2eafca039b7bc55f04830e054a1c03e012e25594ccda415fedf26b0ab3ae1dbe5e5d1b019bf9e899703169 SHA512 dd4bd7051d48f382ec3e96e55156a6d4cc554a097133d8deb033b9fbcf6f50cf446539484c2a0858243728bc3a7bb6973876919d900a7deb2ff1a6bd11dc397c
 DIST trimesh-3.14.0.gh.tar.gz 11962245 BLAKE2B 56ae1d987f43b6945191c80be6ac0a47cad51de370b4d4033baeec69b0aafa54ce4282e622d7f29a4906efde5ce7af2b13b8567b98a519eab8edf791de90f355 SHA512 495f90fe37bbeb339b7db4dbd366bac126a43e956ec18ec77c9ee697e7d8155f0c048f8e5280230684cb602b26a4be1be1e74335db94f4272b50816ab937e2ca
 DIST trimesh-3.14.1.gh.tar.gz 11961899 BLAKE2B eab37c94da03cfdefa2f4bff78a1a1cdd2a4c5d3d5da7ef5f462de331c7c2dbaaabbc53a0033ca95a3b4d9d61e072af2f2b689d291e32a89531ca2b5e9d8f8e2 SHA512 e8c43275552d2ddf2e6c1d7582c67f34d7bdaddd5df2cfac9a3758eac12a7fc8bc41748465317eb4e983d7d2d9d51209ab85bfa781022227c0be57618991e9b4
+DIST trimesh-3.15.1.gh.tar.gz 11956148 BLAKE2B 6b0486f779c440baa701f19c5ced085f6f4dcf93704720d8158dc216d1b8e0b46c7549c0adbebee83e34fe2b0eda42da44c61848a9f11bac9d66736566d58c9c SHA512 04459bbb99a1a12cb0a3626d7a1b465b612b7b36690b7c1e6f0dd358794a46a9f64d3465021271846112abc69b0b4f4465bf0b045deb194c28272a4680e65e65
diff --git a/dev-python/trimesh/trimesh-3.15.1.ebuild b/dev-python/trimesh/trimesh-3.15.1.ebuild
new file mode 100644
index 000000000000..11e1a73dfac5
--- /dev/null
+++ b/dev-python/trimesh/trimesh-3.15.1.ebuild
@@ -0,0 +1,65 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1 multiprocessing optfeature
+
+DESCRIPTION="Python library for loading and using triangular meshes"
+HOMEPAGE="
+	https://trimsh.org/
+	https://github.com/mikedh/trimesh/
+	https://pypi.org/project/trimesh/
+"
+SRC_URI="
+	https://github.com/mikedh/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/chardet[${PYTHON_USEDEP}]
+	dev-python/colorlog[${PYTHON_USEDEP}]
+	dev-python/jsonschema[${PYTHON_USEDEP}]
+	dev-python/lxml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	dev-python/networkx[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/pycollada[${PYTHON_USEDEP}]
+	dev-python/pyglet[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/setuptools[${PYTHON_USEDEP}]
+	>=dev-python/shapely-1.8.2[${PYTHON_USEDEP}]
+	dev-python/svg-path[${PYTHON_USEDEP}]
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/xxhash[${PYTHON_USEDEP}]
+	sci-libs/rtree[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	epytest -n "$(makeopts_jobs)"
+}
+
+pkg_postinst() {
+	optfeature_header "${PN} functionality can be extended by installing the following packages:"
+	optfeature "making GUI applications with 3D stuff" dev-python/glooey
+	optfeature "2D triangulations of polygons" dev-python/mapbox_earcut
+	optfeature "loading a number of additional mesh formats" dev-python/meshio
+	optfeature "figuring out how much memory we have" dev-python/psutil
+	optfeature "marching cubes and other nice stuff" sci-libs/scikit-image
+}
diff --git a/dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild b/dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild
index c08e3106639c..fc1813251aeb 100644
--- a/dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild
+++ b/dev-python/unpaddedbase64/unpaddedbase64-2.1.0.ebuild
@@ -19,6 +19,6 @@ S="${WORKDIR}/python-${P}"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 
 distutils_enable_tests unittest
diff --git a/dev-python/untangle/untangle-1.2.1-r1.ebuild b/dev-python/untangle/untangle-1.2.1-r1.ebuild
index 5eb51b75d48f..b9b232cfde96 100644
--- a/dev-python/untangle/untangle-1.2.1-r1.ebuild
+++ b/dev-python/untangle/untangle-1.2.1-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/uvloop/Manifest b/dev-python/uvloop/Manifest
index 0a77f108a5fa..a033afc048d9 100644
--- a/dev-python/uvloop/Manifest
+++ b/dev-python/uvloop/Manifest
@@ -1,2 +1,3 @@
 DIST uvloop-0.15.3.tar.gz 2094066 BLAKE2B 77ae4634ee31211dba13f41aede4480d70271e042a30a1268e9ad18f5de2b296b84931fb6b2022d2351f33521a84264f74cbc30caa5ff84b0f429bc9f1d426a0 SHA512 5687371a13509bdac0ef7a5ca0f7c78b54d0d9225cbf68cebc6d4fdf3807c2e3346579f5440eb0ff6578088780cc5efb09fba114da0bc0e60ad3f607d9df652f
 DIST uvloop-0.16.0.tar.gz 2129067 BLAKE2B 8a5a5c760b1036428483d2cf1f509784aa61cb69388720775c9555bdb0ce19341cb58fc051ab6f92066a3478acf729513dafafd79f31115b064bf1d3660479de SHA512 dd6dcec38f7f94dc0cf0123302fd6fe404428196b452a80a8258a207654e3f67e210233be3d649668c22b48390232d0347706b1d87fb50016287142c742b806d
+DIST uvloop-0.17.0.tar.gz 2279973 BLAKE2B 7ccbf3b8e723e36c1010a70e256de0ad1a9728fe10b3538e05c57157b16ea7e5369347c855cd1460e49f89197ebb05628c4b6fcd7e50c623b1aaa5890ac64b5f SHA512 861d7f28ad879ecbfa40d53b9626e38660f02618fd433edbd5a8ea5100a17ade042a26549def04bc23f928aca3adc83d62503f0548038cd400284f5654003ee4
diff --git a/dev-python/uvloop/uvloop-0.17.0.ebuild b/dev-python/uvloop/uvloop-0.17.0.ebuild
new file mode 100644
index 000000000000..0bb5e8c8a40a
--- /dev/null
+++ b/dev-python/uvloop/uvloop-0.17.0.ebuild
@@ -0,0 +1,82 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Ultra-fast implementation of asyncio event loop on top of libuv"
+HOMEPAGE="
+	https://github.com/magicstack/uvloop/
+	https://pypi.org/project/uvloop/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc ~x86"
+LICENSE="MIT"
+SLOT="0"
+IUSE="examples"
+
+DEPEND="
+	>=dev-libs/libuv-1.11.0:=
+"
+RDEPEND="
+	${DEPEND}
+"
+BDEPEND="
+	>=dev-python/cython-0.29.32[${PYTHON_USEDEP}]
+	test? (
+		dev-python/aiohttp[${PYTHON_USEDEP}]
+		>=dev-python/pyopenssl-22.0.0[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	rm -r vendor || die
+	cat <<-EOF >> setup.cfg || die
+		[build_ext]
+		use_system_libuv=True
+		cython_always=True
+	EOF
+
+	# flake8 only
+	#rm tests/test_sourcecode.py || die
+	# force cythonization
+	rm uvloop/loop.c || die
+	# hangs
+	#sed -i -e 's:test_remote_shutdown_receives_trailing_data:_&:' \
+	#	tests/test_tcp.py || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local EPYTEST_IGNORE=(
+		# linting
+		tests/test_sourcecode.py
+	)
+	local EPYTEST_DESELECT=(
+		# TODO: expects some... cython_helper?
+		tests/test_libuv_api.py::Test_UV_libuv::test_libuv_get_loop_t_ptr
+		# unhappy about sandbox injecting its envvars
+		tests/test_process.py::Test_UV_Process::test_process_env_2
+		tests/test_process.py::Test_AIO_Process::test_process_env_2
+		# hangs
+		tests/test_tcp.py::Test_AIO_TCPSSL::test_remote_shutdown_receives_trailing_data
+	)
+
+	rm -rf uvloop || die
+	epytest -s
+}
+
+python_install_all() {
+	use examples && dodoc -r examples
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/wcmatch/Manifest b/dev-python/wcmatch/Manifest
index 106502d62cf3..56830604ca0d 100644
--- a/dev-python/wcmatch/Manifest
+++ b/dev-python/wcmatch/Manifest
@@ -1 +1,2 @@
+DIST wcmatch-8.4.1.gh.tar.gz 117065 BLAKE2B 6528170503507aa9742a0e0878f7cfe2586408471acde82ffbf1011fbf48cbed6a45d580436cb6a63a54a81d1c237544a48112eb4c06f923752eb09521d7f8a5 SHA512 6bc8d59b678a40e28eee7816f3b447fe3396f52e982df8e0b5e26472b4ffd1342f58edc41850386954783e6d07f1d66d9372cc1495f048b9a542b572b1d8e20f
 DIST wcmatch-8.4.gh.tar.gz 116596 BLAKE2B cdfbc243fa62f4854490510a563163f99dac09eed16248fa7a72d0a2a7b96484fab4edf3ba497e96a46dca1f734b9c1b098da4d71784775f51b48fcfa5b8a24c SHA512 92478a769be129f9997ef75a384b9978d0647bbd7f2212aa058f1438e698a0a77d069871daf20889455f6e9bb73266d4e312f29f61c704a708fa48fa565d7614
diff --git a/dev-python/wcmatch/wcmatch-8.4.1.ebuild b/dev-python/wcmatch/wcmatch-8.4.1.ebuild
new file mode 100644
index 000000000000..42be0b6abeee
--- /dev/null
+++ b/dev-python/wcmatch/wcmatch-8.4.1.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=hatchling
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	>=dev-python/mkdocs_pymdownx_material_extras-2.0
+	dev-python/mkdocs-material
+	dev-python/mkdocs-git-revision-date-localized-plugin
+	dev-python/mkdocs-minify-plugin
+	dev-python/pyspelling
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="Wildcard/glob file name matcher"
+HOMEPAGE="
+	https://github.com/facelessuser/wcmatch/
+	https://pypi.org/project/wcmatch/
+"
+SRC_URI="
+	https://github.com/facelessuser/wcmatch/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/bracex-2.1.1[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-vcs/git
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# tests require some files in homedir
+	> "${HOME}"/test1.txt || die
+	> "${HOME}"/test2.txt || die
+
+	# mkdocs-git-revision-date-localized-plugin needs git repo
+	if use doc; then
+		git init || die
+		git config --global user.email "larry@gentoo.org" || die
+		git config --global user.name "Larry the Cow" || die
+		git add . || die
+		git commit -m 'init' || die
+	fi
+
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/xarray/Manifest b/dev-python/xarray/Manifest
index 83ffaa877fbd..1e93d52b801d 100644
--- a/dev-python/xarray/Manifest
+++ b/dev-python/xarray/Manifest
@@ -1,2 +1 @@
-DIST xarray-2022.3.0.tar.gz 2943007 BLAKE2B 4c323573835c00275b9c293157c78e42d14f2736c07dc06c61643052992b9c75d624cdf9a93487094fbffd9577662388807b661d388032add3b2e2ca3a63b812 SHA512 c088b985a852c57dcef14d8a5107987c0c33f17bde1d9d639d30ac826d906639ce0ee4fe8345c65a5479b944057af045fe50c2d2ea932356aceb0718f55cd24a
 DIST xarray-2022.6.0.tar.gz 3013166 BLAKE2B 4f2c17595ec904508e5f9c1d6ffead45be527b7f2ab73383126d57c7894712e924b605a86f890b0fec4ff45d1a263ce27fa324febf83f703ad36079e68f69663 SHA512 415bd84246d6d2b8aebf316ac9ef82ca7afeacce718349b75479c0aa693e2866dfe236e6dcaf41cae68afd7a99408f5027c938e6b7f447f5323e076b804f5165
diff --git a/dev-python/xarray/files/xarray-0.19.0-riscv_tests_datetime.patch b/dev-python/xarray/files/xarray-0.19.0-riscv_tests_datetime.patch
deleted file mode 100644
index 1f356e95b561..000000000000
--- a/dev-python/xarray/files/xarray-0.19.0-riscv_tests_datetime.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-These tests are x86{_64}-centric because they rely on a specific result of
-casting a float64 NaN to int64, which is undefined in the C standard.
-See https://github.com/numpy/numpy/issues/8325 for details.
-
---- a/xarray/tests/__init__.py
-+++ b/xarray/tests/__init__.py
-@@ -40,6 +40,12 @@
- )
- 
- 
-+riscv_xfail = pytest.mark.xfail(
-+    "riscv" in platform.machine(),
-+    reason="expected failure on RISC-V",
-+)
-+
-+
- def _importorskip(modname, minversion=None):
-     try:
-         mod = importlib.import_module(modname)
---- a/xarray/tests/test_backends.py
-+++ b/xarray/tests/test_backends.py
-@@ -71,6 +71,7 @@
-     requires_scipy,
-     requires_scipy_or_netCDF4,
-     requires_zarr,
-+    riscv_xfail,
- )
- from .test_coding_times import (
-     _ALL_CALENDARS,
-@@ -492,6 +493,7 @@
-             assert actual["x"].encoding["_Encoding"] == "ascii"
- 
-     @arm_xfail
-+    @riscv_xfail
-     def test_roundtrip_numpy_datetime_data(self):
-         times = pd.to_datetime(["2000-01-01", "2000-01-02", "NaT"])
-         expected = Dataset({"t": ("t", times), "t0": times[0]})
---- a/xarray/tests/test_coding_times.py
-+++ b/xarray/tests/test_coding_times.py
-@@ -36,6 +36,7 @@
-     requires_cftime,
-     requires_cftime_1_4_1,
-     requires_dask,
-+    riscv_xfail,
- )
- 
- _NON_STANDARD_CALENDARS_SET = {
-@@ -466,6 +467,7 @@
- 
- 
- @arm_xfail
-+@riscv_xfail
- @requires_cftime
- @pytest.mark.parametrize(
-     ["num_dates", "units", "expected_list"],
---- a/xarray/tests/test_duck_array_ops.py
-+++ b/xarray/tests/test_duck_array_ops.py
-@@ -38,6 +38,7 @@
-     requires_bottleneck,
-     requires_cftime,
-     requires_dask,
-+    riscv_xfail,
- )
- 
- 
-@@ -280,6 +281,7 @@
- 
- 
- @arm_xfail
-+@riscv_xfail
- @pytest.mark.filterwarnings("ignore::RuntimeWarning")
- @pytest.mark.parametrize("dask", [False, True] if has_dask else [False])
- def test_datetime_mean(dask):
diff --git a/dev-python/xarray/xarray-2022.3.0.ebuild b/dev-python/xarray/xarray-2022.3.0.ebuild
deleted file mode 100644
index 6394aa2d7491..000000000000
--- a/dev-python/xarray/xarray-2022.3.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_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit distutils-r1
-
-DESCRIPTION="N-D labeled arrays and datasets in Python"
-HOMEPAGE="https://xarray.pydata.org/"
-SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
-
-RDEPEND="
-	>=dev-python/numpy-1.18[${PYTHON_USEDEP}]
-	>=dev-python/pandas-1.1[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]"
-# note: most of test dependencies are optional
-BDEPEND="
-	test? (
-		dev-python/bottleneck[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/matplotlib[${PYTHON_USEDEP}]
-		dev-python/toolz[${PYTHON_USEDEP}]
-		!hppa? ( >=dev-python/scipy-1.4[${PYTHON_USEDEP}] )
-	)"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.19.0-riscv_tests_datetime.patch
-)
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# warning-targeted tests are fragile and not important to end users
-	xarray/tests/test_backends.py::test_no_warning_from_dask_effective_get
-)
diff --git a/dev-python/xarray/xarray-2022.6.0.ebuild b/dev-python/xarray/xarray-2022.6.0.ebuild
index 16575cf4dbd0..d29dce1b169d 100644
--- a/dev-python/xarray/xarray-2022.6.0.ebuild
+++ b/dev-python/xarray/xarray-2022.6.0.ebuild
@@ -14,7 +14,7 @@ SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="amd64 arm arm64 ~hppa ~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"
 
 RDEPEND="
 	>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
diff --git a/dev-python/zope-hookable/Manifest b/dev-python/zope-hookable/Manifest
index f68460b1feec..7045767c2261 100644
--- a/dev-python/zope-hookable/Manifest
+++ b/dev-python/zope-hookable/Manifest
@@ -1 +1,2 @@
 DIST zope.hookable-5.1.0.tar.gz 21922 BLAKE2B c8bb0c6fb20718127fc2b3d7a2654035a14f87a52b41331ec3d564fe7dd175a977911e1a5847e544e30eeeb473b1fdb5d75ece7ece4b5a4212fec8f6d85a3d44 SHA512 af63fd7c83bbaf2c6c1faaefc7081a9a739b835fb5f1fe48f8f6b66a82596d52d0559df8de1beceb129578ee2ed9711ee05a9aa2dd0eec98dca6db40b45a4665
+DIST zope.hookable-5.2.tar.gz 24004 BLAKE2B f1b64a906a849442437a3829d509210280066b41bc97fbedcd02b462fa9c7761910a7a71ed00430679f7c3ec9648c8a9ab5e88d4e8143018e44194d56611353a SHA512 b04107acedcc245fa99a59de71ffeaabe270ec15eaac32df1f5433ca16ea568d60c272349c8c8d7e512dfadef4fc8fcebf63a62ee9c8607fc02505a4457e1ed3
diff --git a/dev-python/zope-hookable/zope-hookable-5.2.ebuild b/dev-python/zope-hookable/zope-hookable-5.2.ebuild
new file mode 100644
index 000000000000..04174bc95162
--- /dev/null
+++ b/dev-python/zope-hookable/zope-hookable-5.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+MY_PN=${PN/-/.}
+MY_P=${MY_PN}-${PV}
+
+DESCRIPTION="Efficient creation of 'hookable' objects"
+HOMEPAGE="
+	https://pypi.org/project/zope.hookable/
+	https://github.com/zopefoundation/zope.hookable/
+"
+SRC_URI="mirror://pypi/${MY_PN:0:1}/${MY_PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="ZPL"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/zope-testing[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+src_prepare() {
+	# strip rdep specific to namespaces
+	sed -i -e "/'setuptools'/d" setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_compile() {
+	distutils-r1_python_compile
+	find "${BUILD_DIR}" -name '*.pth' -delete || die
+}
+
+python_test() {
+	eunittest -s "${BUILD_DIR}/install$(python_get_sitedir)/zope/hookable/tests"
+}
diff --git a/dev-qt/Manifest.gz b/dev-qt/Manifest.gz
index c74de17d2096..bee45d0cae31 100644
Binary files a/dev-qt/Manifest.gz and b/dev-qt/Manifest.gz differ
diff --git a/dev-qt/qtlocation/qtlocation-5.15.5.ebuild b/dev-qt/qtlocation/qtlocation-5.15.5.ebuild
index 0e27ef20621e..dec94bbf5378 100644
--- a/dev-qt/qtlocation/qtlocation-5.15.5.ebuild
+++ b/dev-qt/qtlocation/qtlocation-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Location (places, maps, navigation) library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 fi
 
 IUSE=""
diff --git a/dev-qt/qtspeech/qtspeech-5.15.5.ebuild b/dev-qt/qtspeech/qtspeech-5.15.5.ebuild
index a73f0796dd13..e6c79caf8289 100644
--- a/dev-qt/qtspeech/qtspeech-5.15.5.ebuild
+++ b/dev-qt/qtspeech/qtspeech-5.15.5.ebuild
@@ -9,7 +9,7 @@ inherit qt5-build
 DESCRIPTION="Text-to-speech library for the Qt5 framework"
 
 if [[ ${QT5_BUILD_TYPE} == release ]]; then
-	KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
 fi
 
 IUSE="alsa flite"
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index f03cab6d4f58..44fe95f74bdc 100644
Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ
diff --git a/dev-util/Tensile/Manifest b/dev-util/Tensile/Manifest
index c3e8f48bab20..3b51748fa904 100644
--- a/dev-util/Tensile/Manifest
+++ b/dev-util/Tensile/Manifest
@@ -1,3 +1,4 @@
 DIST Tensile-5.0.2-PR1419.patch.gz 43754 BLAKE2B 3b1d7333ed0115f77816806e7735e25d897dbae3f7a40ece61d655c8f016d9d1c804b586b4e0e75661e20c517f5937a61d5ead25a545f0ce2e4a178bcbb3e7be SHA512 0154d8e14d335f4ecd86e5db335289f8662cede7e5d4b93bf6c56d8e48c1d7d0457271c078c9abbbca1f4aa91f028f6ce6a89efb783ba0207d0f39fd5de8a42c
 DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47
 DIST rocm-Tensile-5.0.2.tar.gz 14362090 BLAKE2B d44c3135496db41c4eb2545f6054c84493e89ef6357da881dae6859763338417e7a9e142cdce7e2de0536684bb641049ad0440964adbe68d03ca329f01efabc9 SHA512 f5ab7d7cbc5ba25498a02a6b7c07d5a9a548edcd44b439b92c8718072382adc18ae78274db1a7174e06436ac1396f3b4edafc7f491a2c87086c368e7270e64e3
+DIST rocm-Tensile-5.1.3.tar.gz 14357517 BLAKE2B 7c5881cc2b1d25db39f54a99f9f0a08395a5f7a58deebe74d9868e8f7044db5ae2f3907196adf16dc6abeba0f1f47f5cce5c8900891276daff8e4ad614cf3b94 SHA512 4405cb6de65c1da1fd93910fc901402a24e996ff04eccadf483c25d8eb518e03ea9bbf00e372dd5fe377696e71c39355603095f3c5fc1e26d311ed15d8e3b734
diff --git a/dev-util/Tensile/Tensile-5.0.2-r2.ebuild b/dev-util/Tensile/Tensile-5.0.2-r2.ebuild
index 38854fd0c269..22d3a6cee451 100644
--- a/dev-util/Tensile/Tensile-5.0.2-r2.ebuild
+++ b/dev-util/Tensile/Tensile-5.0.2-r2.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-PYTHON_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( python3_{8..11} )
 DISTUTILS_USE_PEP517=setuptools
 inherit distutils-r1 prefix
 
diff --git a/dev-util/Tensile/Tensile-5.1.3.ebuild b/dev-util/Tensile/Tensile-5.1.3.ebuild
new file mode 100644
index 000000000000..f2a39a52dbbb
--- /dev/null
+++ b/dev-util/Tensile/Tensile-5.1.3.ebuild
@@ -0,0 +1,86 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+inherit distutils-r1 llvm prefix
+
+LLVM_MAX_SLOT=14
+
+DESCRIPTION="Stretching GPU performance for GEMMs and tensor contractions"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/Tensile"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-${PV}.tar.gz -> rocm-Tensile-${PV}.tar.gz
+		https://github.com/littlewu2508/littlewu2508.github.io/raw/main/gentoo-distfiles/${PN}-5.0.2-PR1419.patch.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+# Not compatible with recent versions of pytest
+RESTRICT="test"
+
+RDEPEND="${PYTHON_DEPS}
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/msgpack[${PYTHON_USEDEP}]
+	>=dev-util/rocm-smi-4.3.0
+	>=sys-devel/clang-14.0.6-r1:${LLVM_MAX_SLOT}=
+"
+DEPEND="${RDEPEND}
+	dev-util/hip
+"
+
+PATCHES=( "${FILESDIR}"/${PN}-4.3.0-output-commands.patch
+		  "${FILESDIR}"/${PN}-5.0.2-gfx1031.patch
+		  "${FILESDIR}"/${PN}-5.0.2-fix-arch-parse.patch
+		  "${FILESDIR}"/${PN}-5.0.2-use-ninja.patch
+	  )
+
+CMAKE_USE_DIR="${WORKDIR}/Source"
+
+src_prepare() {
+	distutils-r1_src_prepare
+	sed -e "s,\@LLVM_PATH\@,$(get_llvm_prefix ${LLVM_MAX_SLOT}),g" "${FILESDIR}"/${PN}-5.1.3-gentoopath.patch > "${S}"/gentoopath.patch || die
+	eapply $(prefixify_ro "${S}"/gentoopath.patch)
+
+	pushd ${PN} || die
+
+	sed -e "/ROCM_SMI_ROOT/s,lib,$(get_libdir)," \
+		-i Source/cmake/FindROCmSMI.cmake || die
+	sed -r -e "/TENSILE_USE_LLVM/s/ON/OFF/" \
+		-i Source/CMakeLists.txt || die
+	sed -e "/chmod 755/d" -i Source/TensileCreateLibrary.cmake || die # remove chmod 755 on
+	sed -e "s,\${Tensile_ROOT}/bin/,,g" -i Source/TensileCreateLibrary.cmake cmake/TensileConfig.cmake || die # ${Tensile_ROOT}/bin does not exists; call command directly
+
+	local Tensile_share_dir="\"${EPREFIX}/usr/share/${PN}\""
+	sed -e "/HipClangVersion/s/0,0,0/$(hipconfig -v)/" -i Common.py || die
+
+	sed -e "s,os.path.dirname(os.path.realpath(__file__)),${Tensile_share_dir},g" -i ReplacementKernels.py Common.py ${PN}.py || die
+
+	sed -e "s|os\.path\.dirname.*$|\"${EPREFIX}/usr/share/Tensile/Source\", end='')|" -i __init__.py || die
+
+	popd || die
+
+	sed -e "/package_data/d" -e "/data_files/d" -i setup.py || die
+}
+
+python_install() {
+	distutils-r1_python_install
+
+	python_moduleinto Tensile
+	pushd Tensile || die
+	python_domodule Components
+	python_newexe Utilities/merge.py ${PN}-merge
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	pushd ${PN} || die
+	insinto /usr/share/${PN}
+	doins -r Configs Perf ReplacementKernels ReplacementKernels-cov3 Source CustomKernels
+	insinto /usr/$(get_libdir)/cmake/${PN}
+	doins cmake/*.cmake
+}
diff --git a/dev-util/Tensile/files/Tensile-5.1.3-gentoopath.patch b/dev-util/Tensile/files/Tensile-5.1.3-gentoopath.patch
new file mode 100644
index 000000000000..2f41bf3aa715
--- /dev/null
+++ b/dev-util/Tensile/files/Tensile-5.1.3-gentoopath.patch
@@ -0,0 +1,75 @@
+Fix incorrect path in scripts and CMakeLists, in order to build tensile_client 
+===================================================================
+--- Tensile-rocm-5.0.2.orig/Tensile/Source/client/CMakeLists.txt
++++ Tensile-rocm-5.0.2/Tensile/Source/client/CMakeLists.txt
+@@ -56,3 +56,5 @@ endif()
+ foreach(arch IN LISTS TENSILE_GPU_ARCHS)
+     target_link_libraries(tensile_client PRIVATE "--amdgpu-target=${arch}")
+ endforeach(arch)
++
++target_link_libraries(tensile_client PRIVATE LLVMSupport)
+Index: Tensile-rocm-5.0.2/Tensile/Source/lib/CMakeLists.txt
+===================================================================
+--- Tensile-rocm-5.0.2.orig/Tensile/Source/lib/CMakeLists.txt
++++ Tensile-rocm-5.0.2/Tensile/Source/lib/CMakeLists.txt
+@@ -47,7 +47,7 @@ set(tensile_sources  ${tensile_sources}
+     )
+ 
+ if(TENSILE_USE_LLVM)
+-    find_package(LLVM 13.0 QUIET CONFIG)
++    find_package(LLVM PATHS @LLVM_PATH@ QUIET CONFIG)
+     if(NOT LLVM_FOUND)
+         find_package(LLVM 12.0 QUIET CONFIG)
+         if(NOT LLVM_FOUND)
+Index: Tensile-rocm-5.0.2/Tensile/Common.py
+===================================================================
+--- Tensile-rocm-5.0.2.orig/Tensile/Common.py
++++ Tensile-rocm-5.0.2/Tensile/Common.py
+@@ -1873,7 +1873,7 @@ def assignGlobalParameters( config ):
+     else:
+       print2(" %24s: %8s (unspecified)" % (key, defaultValue))
+ 
+-  globalParameters["ROCmPath"] = "/opt/rocm"
++  globalParameters["ROCmPath"] = "@GENTOO_PORTAGE_EPREFIX@/usr"
+   if "ROCM_PATH" in os.environ:
+     globalParameters["ROCmPath"] = os.environ.get("ROCM_PATH")
+   if "TENSILE_ROCM_PATH" in os.environ:
+Index: Tensile-rocm-5.0.2/Tensile/ClientWriter.py
+===================================================================
+--- Tensile-rocm-5.0.2.orig/Tensile/ClientWriter.py
++++ Tensile-rocm-5.0.2/Tensile/ClientWriter.py
+@@ -205,7 +205,7 @@ def getBuildClientLibraryScript(buildPat
+   import io
+   runScriptFile = io.StringIO()
+ 
+-  callCreateLibraryCmd = globalParameters["ScriptPath"] + "/bin/TensileCreateLibrary"
++  callCreateLibraryCmd = "TensileCreateLibrary"
+ 
+ 
+   if globalParameters["MergeFiles"]:
+Index: Tensile-rocm-5.0.2/Tensile/GenerateSummations.py
+===================================================================
+--- Tensile-rocm-5.0.2.orig/Tensile/GenerateSummations.py
++++ Tensile-rocm-5.0.2/Tensile/GenerateSummations.py
+@@ -57,7 +57,7 @@ def createLibraryForBenchmark(logicPath,
+     Selection.
+     """
+ 
+-    pythonExePath = os.path.join(os.path.dirname(os.path.realpath(__file__)), "bin", "TensileCreateLibrary")
++    pythonExePath = "TensileCreateLibrary"
+     args = [pythonExePath, \
+         "--merge-files", "--new-client-only", "--no-short-file-names", "--no-library-print-debug", \
+         "--architecture=all", "--code-object-version=V3", "--cxx-compiler=hipcc", "--library-format=yaml", \
+Index: Tensile-rocm-5.0.2/HostLibraryTests/CMakeLists.txt
+===================================================================
+--- Tensile-rocm-5.0.2.orig/HostLibraryTests/CMakeLists.txt
++++ Tensile-rocm-5.0.2/HostLibraryTests/CMakeLists.txt
+@@ -135,7 +135,7 @@ set(test_sources ${test_sources}
+ )
+ 
+ if(TENSILE_USE_LLVM)
+-    find_package(LLVM 13.0 QUIET CONFIG)
++    find_package(LLVM PATHS @LLVM_PATH@ QUIET CONFIG)
+     if(NOT LLVM_FOUND)
+         find_package(LLVM 12.0 QUIET CONFIG)
+         if(NOT LLVM_FOUND)
diff --git a/dev-util/android-studio/Manifest b/dev-util/android-studio/Manifest
index 3ba700c9db99..e7d3040a9ecc 100644
--- a/dev-util/android-studio/Manifest
+++ b/dev-util/android-studio/Manifest
@@ -1,2 +1,2 @@
-DIST android-studio-2020.3.1.24-linux.tar.gz 980631631 BLAKE2B 11968ea566b8f03810752ecc1d50068420830fee04df16f579e88bc94e4bd25e7d2c731df608dd27a983e8d0a27b3622d4c73902bde0fc134915f2a3bbf3189b SHA512 a03305b3540a0473b93e0e30ae82a1b7cc77c9aefd6abf96b352092ce5c51012a6be0d55af1b406a62b9bcf3c4b83ec980d0ca1232d22031a97b0f455060f2b4
 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
diff --git a/dev-util/android-studio/android-studio-2020.3.1.24.ebuild b/dev-util/android-studio/android-studio-2020.3.1.24.ebuild
deleted file mode 100644
index 17e178391136..000000000000
--- a/dev-util/android-studio/android-studio-2020.3.1.24.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit desktop eutils
-
-RESTRICT="strip"
-
-QA_PREBUILT="
-	opt/${PN}/bin/*
-	opt/${PN}/jre/bin/*
-	opt/${PN}/jre/lib/*
-	opt/${PN}/jre/lib/jli/*
-	opt/${PN}/jre/lib/server/*
-	opt/${PN}/lib/pty4j-native/linux/*/*
-	opt/${PN}/plugins/android-ndk/resources/lldb/android/*/*
-	opt/${PN}/plugins/android-ndk/resources/lldb/bin/*
-	opt/${PN}/plugins/android-ndk/resources/lldb/lib64/*
-	opt/${PN}/plugins/android-ndk/resources/lldb/lib/python3.8/lib-dynload/*
-	opt/${PN}/plugins/android/resources/installer/*/*
-	opt/${PN}/plugins/android/resources/layoutlib/data/linux/lib64/*
-	opt/${PN}/plugins/android/resources/perfetto/*/*
-	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/resources/transport/*/*
-	opt/${PN}/plugins/c-plugin/bin/clang/linux/*
-	opt/${PN}/plugins/webp/lib/libwebp/linux/*
-"
-
-DESCRIPTION="Android development environment based on IntelliJ IDEA"
-HOMEPAGE="http://developer.android.com/sdk/installing/studio.html"
-SRC_URI="https://redirector.gvt1.com/edgedl/android/studio/ide-zips/${PV}/${P}-linux.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="selinux"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-android )
-	>=app-arch/bzip2-1.0.6-r4
-	>=dev-libs/expat-2.1.0-r3
-	>=dev-libs/libffi-3.0.13-r1
-	>=media-libs/fontconfig-2.10.92
-	>=media-libs/freetype-2.5.5
-	>=media-libs/libpng-1.2.51
-	>=media-libs/mesa-10.2.8[X(+)]
-	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
-	sys-libs/ncurses-compat:5[tinfo]
-	>=sys-libs/zlib-1.2.8-r1
-	>=x11-libs/libX11-1.6.2
-	>=x11-libs/libXau-1.0.7-r1
-	>=x11-libs/libXdamage-1.1.4-r1
-	>=x11-libs/libXdmcp-1.1.1-r1
-	>=x11-libs/libXext-1.3.2
-	>=x11-libs/libXfixes-5.0.1
-	>=x11-libs/libXrender-0.9.8
-	>=x11-libs/libXxf86vm-1.1.3
-	>=x11-libs/libdrm-2.4.46
-	>=x11-libs/libxcb-1.9.1
-	>=x11-libs/libxshmfence-1.1
-	virtual/libcrypt:=
-	!!<dev-util/android-studio-2020.3.1.24
-"
-
-S=${WORKDIR}/${PN}
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	local dir="/opt/${PN}"
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{fsnotifier{,64},printenv.py,restart.py,format.sh,inspect.sh,studio.sh}
-	fperms -R 755 "${dir}"/bin/lldb
-	fperms -R 755 "${dir}"/plugins/{android-ndk/resources/lldb,c-plugin/bin}
-	fperms -R 755 "${dir}"/jre/bin
-	fperms 755 ${dir}/jre/lib/jexec
-	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"
-}
diff --git a/dev-util/android-studio/android-studio-2021.3.1.16.ebuild b/dev-util/android-studio/android-studio-2021.3.1.16.ebuild
new file mode 100644
index 000000000000..6ac0460a99b0
--- /dev/null
+++ b/dev-util/android-studio/android-studio-2021.3.1.16.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 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}/jre/bin/*
+	opt/${PN}/jre/lib/*
+	opt/${PN}/jre/lib/jli/*
+	opt/${PN}/jre/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/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"
+#SRC_URI="https://redirector.gvt1.com/edgedl/android/studio/ide-zips/${PV}/${PN}-${PV}-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-r3
+	>=dev-libs/expat-2.4.8
+	>=dev-libs/libffi-3.4.2-r2
+	>=media-libs/fontconfig-2.14.0-r1
+	>=media-libs/freetype-2.12.1-r1
+	>=media-libs/libpng-1.6.37-r2
+	>=media-libs/mesa-22.1.3[X(+)]
+	|| ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify )
+	sys-libs/ncurses-compat:5[tinfo]
+	>=sys-libs/zlib-1.2.12-r3
+	>=x11-libs/libX11-1.8.1
+	>=x11-libs/libXau-1.0.9-r1
+	>=x11-libs/libXdamage-1.1.5
+	>=x11-libs/libXdmcp-1.1.3-r1
+	>=x11-libs/libXext-1.3.4
+	>=x11-libs/libXfixes-6.0.0
+	>=x11-libs/libXrender-0.9.10-r2
+	>=x11-libs/libXxf86vm-1.1.4-r2
+	>=x11-libs/libdrm-2.4.112
+	>=x11-libs/libxcb-1.15-r1
+	>=x11-libs/libxshmfence-1.3-r2
+	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,studio.sh,printenv.py,restart.py}
+	fperms -R 755 "${dir}"/bin/{helpers,lldb}
+	fperms -R 755 "${dir}"/jre/bin
+	fperms 755 "${dir}"/jre/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"
+}
+
+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 "		~/Android/"
+	elog ""
+	elog "Also, if there are no other programs using Gradle, remove:"
+	elog ""
+	elog "		~/.gradle/"
+}
diff --git a/dev-util/bazel/Manifest b/dev-util/bazel/Manifest
index 187f2c4ce9fe..4182cf2b0f1e 100644
--- a/dev-util/bazel/Manifest
+++ b/dev-util/bazel/Manifest
@@ -1,3 +1,4 @@
 DIST bazel-3.7.2-dist.zip 313677756 BLAKE2B cd6363762c68d25739a6bf6c13f10e191302a10b6fb7d97455effbc678d4f0b644c76115cad478aad7c09f703d9e594f4bdb8669ed6ab97d6a559a27723c510c SHA512 e8746ef5ec22feb95e9dbbddb3fb56cf8f49c80f326fc2a4e0ce2619607826fac22f46bfb995daee55bf9ffabb9d646b8454be2bce7b479da5cf2a7e5b3be62b
 DIST bazel-4.2.2-dist.zip 279304631 BLAKE2B 2a32838e50b63c4b6400aced10085c6c9aacf28641ea555a44b9c4ed8991fc29658b4d420b26179e8eed0e00cfe7391e8eec84c7851f17493c74d1c5682427af SHA512 123f73dc87053e37705bb729f82bd722d6d2799fe106f79c51cf5566fb2771d824108cbe275aad55ae590b970c549008b433704cbf1245394769e950796eb8db
 DIST bazel-5.0.0-dist.zip 235894565 BLAKE2B 3798eb9111772809f0345e0c74bef38d8f9d44a7f20844f20aad187a2e177f4999ffa0e1cc1719e4284cdc7c72295bb903d32ce56821c72ee2908f4d939d0769 SHA512 2a9a972d1cce6b50f959fec3d37506914208169c8aa36e5ec5f9a27942e9beff1080a544a18e9bd5eb13dc434c1864cda0594e6da5b78c2f41085abf808c22d7
+DIST bazel-5.1.1-dist.zip 236073335 BLAKE2B dacc98db99a4877bcda743058f8d34c276d893bec14a595155587f9d0a2716caf106e1d08917f8103b9c15c45433285cce2063f15a2653d3d1a4a6b67242876f SHA512 84e2f72df1838fc88a39853afc510bca835fea28590e9aac2138b5416d2f8d9aefd082c81012a2066194fdc440b00b44f9f188b5c896461acebfeb9cd40efc7c
diff --git a/dev-util/bazel/bazel-5.0.0.ebuild b/dev-util/bazel/bazel-5.0.0.ebuild
index 36ee3e954ac0..a5719c639bc3 100644
--- a/dev-util/bazel/bazel-5.0.0.ebuild
+++ b/dev-util/bazel/bazel-5.0.0.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.z
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="examples tools"
 # strip corrupts the bazel binary
 # test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
diff --git a/dev-util/bazel/bazel-5.1.1.ebuild b/dev-util/bazel/bazel-5.1.1.ebuild
new file mode 100644
index 000000000000..36ee3e954ac0
--- /dev/null
+++ b/dev-util/bazel/bazel-5.1.1.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit bash-completion-r1 bazel java-pkg-2 multiprocessing
+
+DESCRIPTION="Fast and correct automated build system"
+HOMEPAGE="https://bazel.build/"
+
+SRC_URI="https://github.com/bazelbuild/bazel/releases/download/${PV}/${P}-dist.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="examples tools"
+# strip corrupts the bazel binary
+# test fails with network-sandbox: An error occurred during the fetch of repository 'io_bazel_skydoc' (bug 690794)
+RESTRICT="strip test"
+RDEPEND=">=virtual/jre-11:*"
+DEPEND="
+	virtual/jdk:11
+	app-arch/unzip
+	app-arch/zip"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	if has ccache ${FEATURES}; then
+		ewarn "${PN} usually fails to compile with ccache, you have been warned"
+	fi
+	java-pkg-2_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack ${P}-dist.zip
+}
+
+src_prepare() {
+	default
+
+	# F: fopen_wr
+	# S: deny
+	# P: /proc/self/setgroups
+	# A: /proc/self/setgroups
+	# R: /proc/24939/setgroups
+	# C: /usr/lib/systemd/systemd
+	addpredict /proc
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+	export EXTRA_BAZEL_ARGS="--jobs=$(makeopts_jobs) $(bazel_get_flags)
+		--java_runtime_version=local_jdk
+		--tool_java_runtime_version=local_jdk"
+	VERBOSE=yes ./compile.sh || die "Failed compiling bazel"
+
+	./scripts/generate_bash_completion.sh \
+		--bazel=output/bazel \
+		--output=bazel-complete.bash \
+		--prepend=scripts/bazel-complete-header.bash \
+		--prepend=scripts/bazel-complete-template.bash || die "Failed to generate bash completions"
+}
+
+src_test() {
+	output/bazel test \
+		--verbose_failures \
+		--spawn_strategy=standalone \
+		--genrule_strategy=standalone \
+		--verbose_test_summary \
+		examples/cpp:hello-success_test || die
+	output/bazel shutdown
+}
+
+src_install() {
+	dobin output/bazel
+	newbashcomp bazel-complete.bash ${PN}
+	bashcomp_alias ${PN} ibazel
+	insinto /usr/share/zsh/site-functions
+	doins scripts/zsh_completion/_bazel
+
+	if use examples; then
+		docinto examples
+		dodoc -r examples/*
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	# could really build tools but I don't know which ones
+	# are actually used
+	if use tools; then
+		docinto tools
+		dodoc -r tools/*
+		docompress -x /usr/share/doc/${PF}/tools
+		docompress -x /usr/share/doc/${PF}/tools/build_defs/pkg/testdata
+	fi
+}
diff --git a/dev-util/bpftrace/Manifest b/dev-util/bpftrace/Manifest
index f594b9b845c0..308364d6afc1 100644
--- a/dev-util/bpftrace/Manifest
+++ b/dev-util/bpftrace/Manifest
@@ -1,2 +1,3 @@
 DIST bpftrace-0.14.1-llvm14.patch.gz 7377 BLAKE2B 69b3b74bce74a8d4d8d9cc74de352dc33875ae905d8a88c776bbe80862a4f4ac2d450bcb6190da8be880bcc8fb751e3b8172df5454f31dc4bcd3e41edb02e396 SHA512 3269132981a7d2c0263fe9003bbcd2348e186ca0cdc95ada368331fc6e2495ae126c7bd68676438ccb575aafdafa3d17604a28fdc11d8b629eeaee130c1fd614
 DIST bpftrace-0.15.0.tar.gz 1006735 BLAKE2B 3ef4bb5f13aa6dea5140b5362e6fc3de21baa1192e2218307895bf29ddeba8d69543e32c2b769bf3456076095ba661b66e1625f2696631d22628311d7f6ec1a4 SHA512 916e9afeab301e62472e570ef77a3b9b27b43251880b64f1c5f151583c59a6c61e9ede50f3607044b27c5a6ce1a654f290153bf3f9237ebc0a823b5e6356187a
+DIST bpftrace-0.16.0.gh.tar.gz 1023480 BLAKE2B 20fa877adeaada655462004142a80f107f82a3fa73fd7a7675a477d45ecd3a28115af5d612da2b06e2d760cfa3e574583e4cc4d62f4175c49ecc9d9b3fcceb6e SHA512 52ca4fea4e2f8d2cbf0f9f1bc69af0ee3408201f019006dd2e838b9458cfc01761eba3df24c39e05cf93220d85d0cecc69bb44ec72f9f44cec0eb94479bff734
diff --git a/dev-util/bpftrace/bpftrace-0.16.0.ebuild b/dev-util/bpftrace/bpftrace-0.16.0.ebuild
new file mode 100644
index 000000000000..b6ef7864928b
--- /dev/null
+++ b/dev-util/bpftrace/bpftrace-0.16.0.ebuild
@@ -0,0 +1,92 @@
+# Copyright 2019-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+LLVM_MAX_SLOT=16
+
+inherit llvm linux-info cmake
+
+DESCRIPTION="High-level tracing language for eBPF"
+HOMEPAGE="https://github.com/iovisor/bpftrace"
+MY_PV="${PV//_/}"
+SRC_URI="https://github.com/iovisor/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}/${PN}-${MY_PV:-${PV}}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+IUSE="fuzzing test"
+
+# lots of fixing needed
+RESTRICT="test"
+
+RDEPEND="
+	>=dev-libs/libbpf-1.0:=
+	>=dev-util/bcc-0.25.0:=
+	dev-util/systemtap
+	<sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_BPF(+)]
+	sys-libs/binutils-libs:=
+	virtual/libelf:=
+"
+DEPEND="
+	${COMMON_DEPEND}
+	dev-libs/cereal:=
+	test? ( dev-cpp/gtest )
+"
+BDEPEND="
+	sys-apps/sed
+	app-arch/xz-utils
+	sys-devel/flex
+	sys-devel/bison
+	virtual/pkgconfig
+"
+
+QA_DT_NEEDED="
+	/usr/lib.*/libbpftraceresources.so
+	/usr/lib.*/libcxxdemangler_llvm.so
+"
+
+PATCHES=(
+	"${FILESDIR}/bpftrace-0.16.0-install-libs.patch"
+	"${FILESDIR}/bpftrace-0.15.0-dont-compress-man.patch"
+	"${FILESDIR}/bpftrace-0.11.4-old-kernels.patch"
+	"${FILESDIR}/bpftrace-0.16.0-link.patch"
+)
+
+pkg_pretend() {
+	local CONFIG_CHECK="
+		~BPF
+		~BPF_EVENTS
+		~BPF_JIT
+		~BPF_SYSCALL
+		~FTRACE_SYSCALLS
+		~HAVE_EBPF_JIT
+	"
+
+	check_extra_config
+}
+
+pkg_setup() {
+	llvm_pkg_setup
+}
+
+src_configure() {
+	local -a mycmakeargs=(
+		-DSTATIC_LINKING:BOOL=OFF
+		# bug 809362, 754648
+		-DBUILD_TESTING:BOOL=$(usex test)
+		-DBUILD_FUZZ:BOOL=$(usex fuzzing)
+		-DENABLE_MAN:BOOL=OFF
+	)
+
+	cmake_src_configure
+}
+
+src_install() {
+	cmake_src_install
+	# bug 809362
+	dostrip -x /usr/bin/bpftrace
+	doman man/man8/*.?
+}
diff --git a/dev-util/bpftrace/files/bpftrace-0.16.0-install-libs.patch b/dev-util/bpftrace/files/bpftrace-0.16.0-install-libs.patch
new file mode 100644
index 000000000000..290c1065b2ce
--- /dev/null
+++ b/dev-util/bpftrace/files/bpftrace-0.16.0-install-libs.patch
@@ -0,0 +1,210 @@
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index e63bc83c..ada1d370 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -114,9 +114,10 @@ find_package(FLEX REQUIRED)
+ bison_target(bison_parser src/parser.yy ${CMAKE_BINARY_DIR}/parser.tab.cc VERBOSE)
+ flex_target(flex_lexer src/lexer.l ${CMAKE_BINARY_DIR}/lex.yy.cc)
+ add_flex_bison_dependency(flex_lexer bison_parser)
+-add_library(parser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
+-target_compile_options(parser PRIVATE "-w")
+-target_include_directories(parser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
++add_library(bpftraceparser ${BISON_bison_parser_OUTPUTS} ${FLEX_flex_lexer_OUTPUTS})
++target_compile_options(bpftraceparser PRIVATE "-w")
++target_include_directories(bpftraceparser PUBLIC src src/ast ${CMAKE_BINARY_DIR})
++install(TARGETS bpftraceparser LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ include(CheckSymbolExists)
+ set(CMAKE_REQUIRED_DEFINITIONS -D_GNU_SOURCE)
+diff --git a/resources/CMakeLists.txt b/resources/CMakeLists.txt
+index a95c60a1..f5c4d676 100644
+--- a/resources/CMakeLists.txt
++++ b/resources/CMakeLists.txt
+@@ -1,6 +1,7 @@
+-add_library(resources headers.cpp)
++add_library(bpftraceresources headers.cpp)
+ 
+-target_include_directories(resources PUBLIC ../src)
++target_include_directories(bpftraceresources PUBLIC ../src)
++install(TARGETS bpftraceresources LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ function(embed_headers output)
+   file(WRITE ${output} "#include \"headers.h\"\n\nnamespace bpftrace {\n")
+diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
+index 09b8c1e0..b9e9ac44 100644
+--- a/src/CMakeLists.txt
++++ b/src/CMakeLists.txt
+@@ -42,7 +42,7 @@ add_library(runtime
+   ${BFD_DISASM_SRC}
+ )
+ # Ensure flex+bison outputs are built first
+-add_dependencies(runtime parser)
++add_dependencies(runtime bpftraceparser)
+ 
+ add_library(libbpftrace
+   build_info.cpp
+@@ -59,6 +59,7 @@ add_executable(${BPFTRACE}
+ )
+ 
+ install(TARGETS ${BPFTRACE} DESTINATION ${CMAKE_INSTALL_BINDIR})
++install(TARGETS libbpftrace LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ target_link_libraries(${BPFTRACE} libbpftrace)
+ 
+ if (BUILD_FUZZ)
+@@ -111,6 +112,7 @@ target_include_directories(runtime PRIVATE ${CMAKE_BINARY_DIR})
+ target_include_directories(runtime PRIVATE ${CMAKE_SOURCE_DIR}/src)
+ target_include_directories(runtime PRIVATE ${CMAKE_SOURCE_DIR}/src/ast)
+ target_compile_definitions(runtime PRIVATE ${BPFTRACE_FLAGS})
++install(TARGETS runtime LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ target_compile_definitions(libbpftrace PRIVATE ${BPFTRACE_FLAGS})
+ 
+ # Linking
+@@ -123,7 +125,8 @@ if(STATIC_LINKING)
+ endif(STATIC_LINKING)
+ 
+ 
+-target_link_libraries(libbpftrace parser resources runtime aot ast arch cxxdemangler_llvm)
++target_link_libraries(libbpftrace bpftraceparser bpftraceresources
++  runtime aot bpftraceast bpftracearch cxxdemangler_llvm)
+ 
+ if (LIBBPF_BTF_DUMP_FOUND)
+   target_link_libraries(runtime ${LIBBPF_LIBRARIES})
+@@ -168,6 +171,7 @@ if(STATIC_LINKING)
+   target_link_libraries(runtime LIBELF)
+ else()
+   target_link_libraries(runtime ${LIBELF_LIBRARIES})
++  target_link_libraries(runtime ${LIBBPF_LIBRARIES})
+ endif(STATIC_LINKING)
+ 
+ if (LIBDW_FOUND)
+diff --git a/src/aot/CMakeLists.txt b/src/aot/CMakeLists.txt
+index c776d204..a1d0d75e 100644
+--- a/src/aot/CMakeLists.txt
++++ b/src/aot/CMakeLists.txt
+@@ -1,8 +1,9 @@
+ add_library(aot aot.cpp)
+-add_dependencies(aot parser)
++add_dependencies(aot bpftraceparser)
+ target_include_directories(aot PUBLIC ${CMAKE_SOURCE_DIR}/src)
+ target_include_directories(aot PUBLIC ${CMAKE_BINARY_DIR})
+ target_compile_definitions(aot PRIVATE ${BPFTRACE_FLAGS})
++install(TARGETS aot LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+ # Only build aotrt if supported bcc is used
+ # (https://github.com/iovisor/bcc/commit/719191867a25ce07dc96f7faf9b8ccedadc7ec44)
+@@ -11,7 +12,7 @@ if(NOT LIBBCC_BPF_CONTAINS_RUNTIME)
+ endif()
+ 
+ add_executable(bpftrace-aotrt aot_main.cpp)
+-target_link_libraries(bpftrace-aotrt aot runtime arch ast_defs cxxdemangler_stdlib)
++target_link_libraries(bpftrace-aotrt aot runtime bpftracearch ast_defs cxxdemangler_stdlib)
+ install(TARGETS bpftrace-aotrt DESTINATION ${CMAKE_INSTALL_BINDIR})
+ 
+ if(LIBPCAP_FOUND)
+diff --git a/src/arch/CMakeLists.txt b/src/arch/CMakeLists.txt
+index 127c3528..4e05d40a 100644
+--- a/src/arch/CMakeLists.txt
++++ b/src/arch/CMakeLists.txt
+@@ -1,17 +1,19 @@
+ if(CMAKE_SYSTEM_PROCESSOR STREQUAL "aarch64")
+-    add_library(arch aarch64.cpp)
++    add_library(bpftracearch aarch64.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64" OR
+        CMAKE_SYSTEM_PROCESSOR STREQUAL "ppc64le")
+-    add_library(arch ppc64.cpp)
++    add_library(bpftracearch ppc64.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "s390" OR
+        CMAKE_SYSTEM_PROCESSOR STREQUAL "s390x")
+-    add_library(arch s390.cpp)
++    add_library(bpftracearch s390.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "x86_64")
+-    add_library(arch x86_64.cpp)
++    add_library(bpftracearch x86_64.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "mips64")
+-    add_library(arch mips64.cpp)
++    add_library(bpftracearch mips64.cpp)
+ elseif(CMAKE_SYSTEM_PROCESSOR STREQUAL "riscv64")
+-    add_library(arch riscv64.cpp)
++    add_library(bpftracearch riscv64.cpp)
+ else()
+   message(FATAL_ERROR "Unsupported architecture: ${CMAKE_SYSTEM_PROCESSOR}")
+ endif()
++
++install(TARGETS bpftracearch LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/src/ast/CMakeLists.txt b/src/ast/CMakeLists.txt
+index 014295cd..c35f6ac6 100644
+--- a/src/ast/CMakeLists.txt
++++ b/src/ast/CMakeLists.txt
+@@ -1,6 +1,6 @@
+ add_library(ast_defs ast.cpp)
+ 
+-add_library(ast
++add_library(bpftraceast
+   async_event_types.cpp
+   attachpoint_parser.cpp
+   int_parser.cpp
+@@ -20,11 +20,13 @@ add_library(ast
+ target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src)
+ target_include_directories(ast_defs PUBLIC ${CMAKE_SOURCE_DIR}/src/ast)
+ target_include_directories(ast_defs PUBLIC ${CMAKE_BINARY_DIR})
+-target_link_libraries(ast ast_defs arch bpforc parser)
++target_link_libraries(bpftraceast ast_defs bpftracearch bpforc bpftraceparser)
++install(TARGETS ast_defs LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS bpftraceast LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+ 
+-add_dependencies(ast_defs parser)
++add_dependencies(ast_defs bpftraceparser)
+ 
+-target_compile_definitions(ast PRIVATE ${BPFTRACE_FLAGS})
++target_compile_definitions(bpftraceast PRIVATE ${BPFTRACE_FLAGS})
+ 
+ if (STATIC_LINKING)
+   set(clang_libs
+@@ -55,11 +57,11 @@ if (STATIC_LINKING)
+ 
+ 
+   if(EMBED_USE_LLVM)
+-    target_link_libraries(ast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group")
++    target_link_libraries(bpftraceast "-Wl,--start-group" ${CLANG_EMBEDDED_CMAKE_TARGETS} ${LLVM_EMBEDDED_CMAKE_TARGETS} "-Wl,--end-group")
+   else()
+     llvm_map_components_to_libnames(llvm_libs ${llvm_lib_names})
+-    target_link_libraries(ast ${clang_libs})
+-    target_link_libraries(ast ${llvm_libs})
++    target_link_libraries(bpftraceast ${clang_libs})
++    target_link_libraries(bpftraceast ${llvm_libs})
+   endif()
+ 
+   if(STATIC_LIBC)
+@@ -69,13 +71,13 @@ if (STATIC_LINKING)
+ else()
+   find_library(found_LLVM LLVM HINTS ${LLVM_LIBRARY_DIRS})
+   if(found_LLVM)
+-    target_link_libraries(ast LLVM)
++    target_link_libraries(bpftraceast LLVM)
+   else()
+     llvm_map_components_to_libnames(_llvm_libs bpfcodegen ipo irreader mcjit orcjit ${LLVM_TARGETS_TO_BUILD})
+     llvm_expand_dependencies(llvm_libs ${_llvm_libs})
+-    target_link_libraries(ast ${llvm_libs})
++    target_link_libraries(bpftraceast ${llvm_libs})
+   endif()
+-  target_link_libraries(ast libclang)
++  target_link_libraries(bpftraceast libclang)
+ endif()
+ 
+ add_subdirectory(bpforc)
+diff --git a/src/ast/bpforc/CMakeLists.txt b/src/ast/bpforc/CMakeLists.txt
+index 3f6dbefa..8ccfbb2b 100644
+--- a/src/ast/bpforc/CMakeLists.txt
++++ b/src/ast/bpforc/CMakeLists.txt
+@@ -1 +1,2 @@
+ add_library(bpforc bpforc.cpp)
++install(TARGETS bpforc LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
+diff --git a/src/cxxdemangler/CMakeLists.txt b/src/cxxdemangler/CMakeLists.txt
+index 04cfcdd9..5677aa4b 100644
+--- a/src/cxxdemangler/CMakeLists.txt
++++ b/src/cxxdemangler/CMakeLists.txt
+@@ -1,2 +1,4 @@
+ add_library(cxxdemangler_stdlib cxxdemangler_stdlib.cpp)
+ add_library(cxxdemangler_llvm cxxdemangler_llvm.cpp)
++install(TARGETS cxxdemangler_stdlib LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
++install(TARGETS cxxdemangler_llvm LIBRARY DESTINATION ${CMAKE_INSTALL_LIBDIR})
diff --git a/dev-util/bpftrace/files/bpftrace-0.16.0-link.patch b/dev-util/bpftrace/files/bpftrace-0.16.0-link.patch
new file mode 100644
index 000000000000..e69de29bb2d1
diff --git a/dev-util/buildbot-badges/Manifest b/dev-util/buildbot-badges/Manifest
index 85e38daeb3d2..88f41c531d80 100644
--- a/dev-util/buildbot-badges/Manifest
+++ b/dev-util/buildbot-badges/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-badges-3.4.0.tar.gz 3966 BLAKE2B cb94a63dec1e16bb52f5f84174d204137e7da582d3a62effa2d298fbc5f1c25541a8a96d8366efac650488b3810b37eadf9e650db277d6d04c33c1ff9cab32b1 SHA512 3b440b9d36f4e5d310886fd4b0e11607574d312093ce8c9654f07650c2ccf90b27c078c950fb7008f9d834d1cf4f15813c113b85c2d0d1181fac370f7a3472f6
 DIST buildbot-badges-3.5.0.tar.gz 3962 BLAKE2B 48f4865136845300e447835c348736ee15a3d520db03b4e6e70b45366e723f10eeff3d7e37a1f166682374dc6c1dabb051ad6f15c9730da969a846b606bc5730 SHA512 7817e0c2127892ee32a8c14e1f4204d724ce1c584f15c55b77902cdadfe9c2ff0e0df92d282fd8157aebcab067605c56ac776c7f8e37dae0a53672c14e002e19
 DIST buildbot-badges-3.6.0.tar.gz 3964 BLAKE2B e11db574b7245396c6532a3427b7494fbfcb68762b7a76b3f63ec49a2f460a2e1d8023ea1d54d7a27714990b9c8d2a0895442c41d8b65584e178f2af02b4ade3 SHA512 d133efad8d7171d122279f4e32fd7b0fa7d84bdeb66660d40b175d94d64f4344044dda186d2f1f6d5d2f2f6654461f7333339c90450a51843ce6314b457edc75
+DIST buildbot-badges-3.6.1.tar.gz 3967 BLAKE2B 07763a458c0eb32db13fd7b39a20186c2772ff53ea30e3b199f0dd64008346c218d550b10b238b63deb2ee64064b3f1fb19c95013f6647ec4992b8fee12ca2e5 SHA512 4326f49c2d69d86e9c49250c261c59d67553d6cb63098f19c391f3bfb83c4f99ea783d2351930fcfed40fe83dbfc8466294d77609e39e79e76c6c7b42e557c0f
diff --git a/dev-util/buildbot-badges/buildbot-badges-3.6.1.ebuild b/dev-util/buildbot-badges/buildbot-badges-3.6.1.ebuild
new file mode 100644
index 000000000000..37e3828ead37
--- /dev/null
+++ b/dev-util/buildbot-badges/buildbot-badges-3.6.1.ebuild
@@ -0,0 +1,33 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot badges plugin produces an image in SVG or PNG format..."
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-grid-view/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+	dev-python/cairocffi[${PYTHON_USEDEP}]
+	media-gfx/cairosvg[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	dev-python/klein[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/buildbot-console-view/Manifest b/dev-util/buildbot-console-view/Manifest
index 5d1301cd4595..d69bbcae4ab3 100644
--- a/dev-util/buildbot-console-view/Manifest
+++ b/dev-util/buildbot-console-view/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-console-view-3.4.0.tar.gz 18732 BLAKE2B caeb78d4d3cc616edafccc5f78c1104469f77ead6ec31e7b9a741e43cb8d7140f8c44b57449bd6d97e35912787cbbeee5617bdf90ce7a15ebd023721160edc06 SHA512 072a4ca8d5677e68d2893684d68d4742d7a5546e128ae99bbec0385772a5df6c885bb62b855484543a42c95471aa828f8f3375770fc079997e5183cf3eda9db8
 DIST buildbot-console-view-3.5.0.tar.gz 18741 BLAKE2B a2c4043bdc9eef6189cc15617212aefd7cbdf6db6d4c547c191e0a07bacc9d0cb3e9898867af207d969b294ab15664132636dec4a3c16e620fea9872ae4d0f57 SHA512 4a86a2e803dd4547b3cc3018e1284e4fa9eaf1b29ccb78035a1823fd44fd873acb0a746882e8b961f10e8dc533043383c4a6e60622027a248c10766dab7ac266
 DIST buildbot-console-view-3.6.0.tar.gz 18728 BLAKE2B 0a206e80a311deed2666a297394b7d4e31e47c703fed2040d2d6340be0cb81a6977ac54e2d215dcad02b14ec21db58dd6e677a9d2155e84110cdf37d99ae1401 SHA512 8d03b0c640b72d986e48bc5cfd1decf91f4b7bd46889d16a76ea71972e17f9504b377762e1c589448431d7c26446c01208b5f8e1b63c86bdbfb6dbc063b94472
+DIST buildbot-console-view-3.6.1.tar.gz 18731 BLAKE2B b572b0c2bedfb1149056237a5b7417c933cdd75b8a723edcb5b37cbf33c8d6d1c1fa5d490955a119eb6ca6df7317b89182c45462ceebb310d3b78f44712f4d33 SHA512 3489579c02db7f2b02aaeab8d9cc2eb60d72e5a12eca51c63cf10491c683ba7b99069de6ca2348fcf44dd6ce81d58d437a7d03749815a3fad55162e50df912e0
diff --git a/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.ebuild b/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.ebuild
new file mode 100644
index 000000000000..5b7624cd297c
--- /dev/null
+++ b/dev-util/buildbot-console-view/buildbot-console-view-3.6.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot console-view plugin"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-console-view/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-grid-view/Manifest b/dev-util/buildbot-grid-view/Manifest
index b6bf765623cc..e3acccf5f678 100644
--- a/dev-util/buildbot-grid-view/Manifest
+++ b/dev-util/buildbot-grid-view/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-grid-view-3.4.0.tar.gz 13698 BLAKE2B bc819f87db76ec217dd91cf1f43d2ad18e1aa27c661f37db893946b22e87a3de752f67fe04df8a10499e0659b618e24c3a15de18dd3f3e93523cdf4234d6907f SHA512 69369694e993365644416ea8223b546e147930dac41c74d000e8b1419e6b889158999cdf5cfb7079c3456a9135071f2d1983472faaed82ad410e7cd873c8c77f
 DIST buildbot-grid-view-3.5.0.tar.gz 13704 BLAKE2B 3b577c4108abb65677015a29f9af1410588f962a572e31518ac981e937e6a9bb9c7ce7f4435d573d82c5b337331eed2e9dee5c3e0722ebda6591d19e2b30b76f SHA512 a97c5df81b7ff670b26f170895a5a59b9324b7bc1c3714d58c9294848067b0387c93c295db91fd735a3aaa68bd70875aae45b8d6c1549592ad2b066c40ddc2f1
 DIST buildbot-grid-view-3.6.0.tar.gz 13701 BLAKE2B c877439926a6862aba51d4ef7d4326f66967bbd9c43dff44554c9346d0beb4b890c5e9cdd20998ca9796ab86030445776ff67f85ce27e87b1fdefaeaf0895d98 SHA512 6810b5be3649e38648b1205742bb24f1d63eded41f5fb420dd3f65734fba74a1ad350d68cf750f6be752f178e6d09dba56d5b42f46c20808212f72c8c4d7326d
+DIST buildbot-grid-view-3.6.1.tar.gz 13706 BLAKE2B 808d663b397459c7dd2d537a1a6eab2a0cc839ef0ba42bf56722ee53628bc9e6d41d03f549f0adb0fa92b0b8f416ca8c0a4bc310d67b4b06823eefe33b1ed02b SHA512 7605a5af1428ff08c96751f9c93fddd7b54f57a8879b85c270338e94eeb4ed55ddcfb7066519a2a3ff6d07b537a6ac28bb388b48eecb81c477aa1b6fbaa361dd
diff --git a/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.ebuild b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.ebuild
new file mode 100644
index 000000000000..32ac344a514e
--- /dev/null
+++ b/dev-util/buildbot-grid-view/buildbot-grid-view-3.6.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot grid view web interface"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-grid-view/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/buildbot-pkg/Manifest b/dev-util/buildbot-pkg/Manifest
index 1f6ac023bbde..a8516f134d5f 100644
--- a/dev-util/buildbot-pkg/Manifest
+++ b/dev-util/buildbot-pkg/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-pkg-3.4.0.tar.gz 4809 BLAKE2B 6d3e549e7b44b5ad95bb7520ef8765828da587e3940a9f352ede63346b3303127313fe4b71338ff65ef9ab2c0ac6258793bd9ef664153a0b45b0b6d7d2d92943 SHA512 ca1ef22fb6113bfe0106360ba1eacb167a8335ba15f94a0635bc4d00f999818704f8cfebd7889b6b3df5e1ca7ab79b96f4656e481d6b1f25f5fb7404af0d7ff6
 DIST buildbot-pkg-3.5.0.tar.gz 4806 BLAKE2B 41e217bc029bb8dbdb0f95218640d57d9f9ecabfbc0310118898042bbb543d9d4e5ba88075e934a9be9b1653e2a3d3d1e159547b832f9cde08c262713a817968 SHA512 08b3ec93dfbef87d90cfd4b7b1402003df785ceff8c43bf0320de79ff0efcb74f4cb4f0ec736e0d7231b54a82761d40df66e21540f1756fe74f68bb550850b1c
 DIST buildbot-pkg-3.6.0.tar.gz 4807 BLAKE2B 3b632ef4c0c1f2dc9c39fbe37ba6165a01162e41e77e28c08b9c820425cceac08d20193e0cc74d83c35cb6ff89e9576194cf35b8cac803e9b1f04076c9f96532 SHA512 0145a7ff7dddfb139f502193e0b04ab10a39b325ae65ca01c0f0d88c251c18798ebe4713a3ff1aa376c72aa8d3155a5edb58055a50f5f9ccd1bb43de0ff8e63e
+DIST buildbot-pkg-3.6.1.tar.gz 4807 BLAKE2B d492d0ca36fa8634e877bbc56ffd06ff6a7bb477c98bde2e3586dfc64f4b9d394ec1e5bb1a113aad9d2905277805b9f8737babcad669e2b73abb67d156d3126c SHA512 5833581b4551dc204a52a8356bdb110d57a9de022c33b09b7efdc14f5f4a7c0b0e26f9f9a6a076945aec3a5b7089c040ddaaad8d94c6e0217c2cb6b7742c1ac2
diff --git a/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild b/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild
new file mode 100644
index 000000000000..4d4e95e9196c
--- /dev/null
+++ b/dev-util/buildbot-pkg/buildbot-pkg-3.6.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot common www build tools for packaging releases"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-pkg/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+# No real integration tests for this pkg.
+# all tests are related to making releases and final checks for distribution
+RESTRICT="test"
+
+RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
+
+src_prepare() {
+	sed -e "/version/s/=.*$/=\"${MY_PV}\",/" -i setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-util/buildbot-waterfall-view/Manifest b/dev-util/buildbot-waterfall-view/Manifest
index 7db967201afc..5b654f46230f 100644
--- a/dev-util/buildbot-waterfall-view/Manifest
+++ b/dev-util/buildbot-waterfall-view/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-waterfall-view-3.4.0.tar.gz 192456 BLAKE2B 7375e22b86b4dfe2cde88d4190accea50bf49c9615358ec55b341e6720551b4605015938ed15bfac6bf80805a32457081389bd150d762e90132af4f18295cfe5 SHA512 a9a381e8b520919f71011083face8760f864f5bbe5080446c64c0a63c38d787e486cddd20c3548b01d78534a206221ed2bec85bb78681fe3dceaef2bc1f172d9
 DIST buildbot-waterfall-view-3.5.0.tar.gz 192440 BLAKE2B 46ef4e839dabb5006c740c6f04235b123be420b4d0108cf59bab075fde3dbf6bbe0b4fdfc37fd8606da3696d15f45ee4363f8c35434f944af70f884e2de1edff SHA512 381ce3bb976aa0e1cadd541af44ab0bf1450a3e47351a55b32bda24ad824dbba0f075ee8204a3f26c3ab62a5a615c6ca5027b1894852f8d5308fb27b64e9c177
 DIST buildbot-waterfall-view-3.6.0.tar.gz 193903 BLAKE2B 3029015580dedd9003ae7b723ce79b335d58fd198c4d294483377c34bb88eaade53cd704652c240670c1bab488ab60056e03aba698dcb294f09fe62def59d5f8 SHA512 520e5e1653ceb92a4eb144530fa3cc6d893c4baae15f5ffcc29f2bc66ef02f1a41d287b3d85864a5ddf0a127c0fcf2d19a0ae136e39e394228713112487af8c2
+DIST buildbot-waterfall-view-3.6.1.tar.gz 193914 BLAKE2B 401dd8b1c042fe2dc5bc1c696607d3c0ab3188975757feb8a242049fb73c28f1f5f4dc1dc027ccf37f7a942e1a7d3093b917c1c3a4f81d5181bf8f8dffff6196 SHA512 f1bf080fa7b8e1dc17d52367e1e3dc3e4224c2de6db128bc2f061c338ef69c88732b39d487dcf92d06e2855902d6f078d76e97ddd0d38e348d4e83d0728ad634
diff --git a/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.ebuild b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.ebuild
new file mode 100644
index 000000000000..591aebc7cf5b
--- /dev/null
+++ b/dev-util/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot waterfall-view plugin"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-waterfall-view/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	dev-python/mock[${PYTHON_USEDEP}]
+"
+BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot-worker/Manifest b/dev-util/buildbot-worker/Manifest
index f922e58e8ae9..79bd8d18300c 100644
--- a/dev-util/buildbot-worker/Manifest
+++ b/dev-util/buildbot-worker/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-worker-3.4.0.tar.gz 102910 BLAKE2B c38a806e8d0475a8c18176310f628b829fc359f013b315e82715e71071213fe4a0cdf38273ad7df39a66675f4ebc9fb1881fb990290f2bbedf4c8777ec93d4dc SHA512 411a2bf496622c2b9a3e0dea1ea8a71b347566010086c57ffc5d1114546cc5052af39a8ff7b10ffe6e7afdb6fc8ff73a9ffba23b96a76ff1cc0e3eff81cc59a7
 DIST buildbot-worker-3.5.0.tar.gz 111349 BLAKE2B 90d193fb89ac65ca03274e0ad5c7fde8fc478bb932ccc4240495437f79171d49f623f50731c7619336386b7d1d7df3f955e10bf006ad86b8dcf294d75c874774 SHA512 1df67b6332753f91179863cca76b0578e4f36954e0aa4eb9c28f98d6451d6972e247849fb9d4e20b753b5702d100406b306ce4982181510ad81de0d35a9828ed
 DIST buildbot-worker-3.6.0.tar.gz 120158 BLAKE2B c762237d802f6eff1c6b74f0ed364ecf085d762c80f6cc90edc1fed0084c7bf6a0b74b6fcaf8611b9c21b6249bde547d5a10bc7ff5b4588d138b2ebf76e823a3 SHA512 6b5f50694fe1559dacba599f8641c6b370cad4b68c8182e8a6e31528ffbeeed81c405fd764e3718003913fe5fe8d9faa920a2ad81373fbd028cbf046ed0d3136
+DIST buildbot-worker-3.6.1.tar.gz 120224 BLAKE2B 010893b7b4e5710654299b2541c4cdcdad47b3b763dbc7e2336e5480c841908e04d8350c7cb42edd9ea99d16fd26f36a524a6d6bec8c0f933665a02ded369f89 SHA512 f1e3bf7c0da2f31dd446dc16487e32fddaecc0c2f9c17c469146707322a3d7bb2cc77db4f6145c62530bce58dd61aa19e008e944a7f39a17dc66f1317ee26e1b
diff --git a/dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild b/dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild
new file mode 100644
index 000000000000..e2d1ed832b13
--- /dev/null
+++ b/dev-util/buildbot-worker/buildbot-worker-3.6.1.ebuild
@@ -0,0 +1,141 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+inherit readme.gentoo-r1 systemd distutils-r1
+
+MY_V="${PV/_p/.post}"
+MY_P="${PN}-${MY_V}"
+
+DESCRIPTION="BuildBot Worker (slave) Daemon"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-worker/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	>=dev-python/msgpack-0.6.0[${PYTHON_USEDEP}]
+	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
+	dev-python/future[${PYTHON_USEDEP}]
+	!<dev-util/buildbot-1.0.0
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+	)
+"
+
+DOC_CONTENTS="The \"buildbot\" user and the \"buildbot_worker\" init script has been added
+to support starting buildbot_worker through Gentoo's init system. To use this,
+execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+Set up your build worker following the documentation, make sure the
+resulting directories are owned by the \"buildbot\" user and point
+\"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
+The scripts can	run as a different user if desired."
+
+src_prepare() {
+	# Remove shipped windows start script
+	sed -e "/'buildbot_worker_windows_service=buildbot_worker.scripts.windows_service:HandleCommandLine',/d" \
+		-i setup.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}"
+}
+
+python_install_all() {
+
+	distutils-r1_python_install_all
+
+	doman docs/buildbot-worker.1
+
+	newconfd "${FILESDIR}/buildbot_worker.confd2" buildbot_worker
+	newinitd "${FILESDIR}/buildbot_worker.initd2" buildbot_worker
+	systemd_dounit "${FILESDIR}/buildbot_worker.target"
+	systemd_newunit "${FILESDIR}/buildbot_worker_at.service" "buildbot_worker@.service"
+	systemd_install_serviced "${FILESDIR}/buildbot_worker_at.service.conf" "buildbot_worker@.service"
+
+	dodir /var/lib/buildbot_worker
+	cp "${FILESDIR}/buildbot.tac.sample" "${D}/var/lib/buildbot_worker"|| die "Install failed!"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "More than one instance of a buildbot_worker can be run simultaneously."
+		ewarn " Note that \"BASEDIR\" in the buildbot_worker configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildbot_worker instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildbot_worker /etc/init.d/buildbot_worker.myinstance"
+		ewarn "    rc-update add buildbot_worker.myinstance default"
+		ewarn "    /etc/init.d/buildbot_worker.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildbot_worker@myinstance.service"
+		ewarn "    systemctl enable buildbot_worker.target"
+		ewarn "    systemctl start buildbot_worker.target"
+	fi
+}
+
+pkg_config() {
+	local buildworker_path="/var/lib/buildbot_worker"
+	local log_path="/var/log/buildbot_worker"
+
+	einfo "This will prepare a new buildbot_worker instance in ${buildworker_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildworker_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	if [[ ! -d "${instance_path}" ]]; then
+		mkdir --parents "${instance_path}" || die "Unable to create directory ${buildworker_path}"
+	fi
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	cp "${buildworker_path}/buildbot.tac.sample" "${instance_path}/buildbot.tac" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildbot_worker" "/etc/init.d/buildbot_worker.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildbot_worker instance at ${instance_path}."
+	einfo "To change the default settings edit the buildbot.tac file in this directory."
+}
diff --git a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
index 6fb30ec0ecab..e22995dc22fa 100644
--- a/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
+++ b/dev-util/buildbot-worker/buildbot-worker-9999.ebuild
@@ -44,6 +44,14 @@ resulting directories are owned by the \"buildbot\" user and point
 \"${ROOT}/etc/conf.d/buildbot_worker.myinstance\" at the right location.
 The scripts can	run as a different user if desired."
 
+src_prepare() {
+	# Remove shipped windows start script
+	sed -e "/'buildbot_worker_windows_service=buildbot_worker.scripts.windows_service:HandleCommandLine',/d" \
+		-i setup.py || die
+
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	"${EPYTHON}" -m twisted.trial buildbot_worker || die "Tests failed with ${EPYTHON}"
 }
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.confd2 b/dev-util/buildbot-worker/files/buildbot_worker.confd2
index f14e3210ca99..2ce321f522c4 100644
--- a/dev-util/buildbot-worker/files/buildbot_worker.confd2
+++ b/dev-util/buildbot-worker/files/buildbot_worker.confd2
@@ -10,5 +10,5 @@ TWISTD_OPTS=""
 
 # Optional specific python version to run in
 # (if not the system default version)
-# ie: RUNTIME_PYTHON="/usr/bin/python2.7"
+# ie: RUNTIME_PYTHON="/usr/bin/python3.8"
 RUNTIME_PYTHON=""
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.service b/dev-util/buildbot-worker/files/buildbot_worker.service
new file mode 100644
index 000000000000..e75a2d51e4f3
--- /dev/null
+++ b/dev-util/buildbot-worker/files/buildbot_worker.service
@@ -0,0 +1,12 @@
+[Unit]
+Description=buildbot worker (slave) instances
+After=local-fs.target network.target
+
+[Service]
+Type=forking
+User=buildbot
+ExecStart=/usr/bin/buildbot_worker start /var/lib/buildbot_worker
+ExecStop=/usr/bin/buildbot_worker stop /var/lib/buildbot_worker
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-util/buildbot-worker/files/buildbot_worker.target b/dev-util/buildbot-worker/files/buildbot_worker.target
new file mode 100644
index 000000000000..4a2b3e2d52f3
--- /dev/null
+++ b/dev-util/buildbot-worker/files/buildbot_worker.target
@@ -0,0 +1,5 @@
+[Unit]
+Description=Buildbot-Worker target that allows to start or stop all buildbot_worker@*.service instances
+
+[Install]
+WantedBy=multi-user.target
diff --git a/dev-util/buildbot-worker/files/buildbot_worker_at.service b/dev-util/buildbot-worker/files/buildbot_worker_at.service
new file mode 100644
index 000000000000..6b8849920f79
--- /dev/null
+++ b/dev-util/buildbot-worker/files/buildbot_worker_at.service
@@ -0,0 +1,14 @@
+[Unit]
+Description=buildbot-worker daemon
+After=local-fs.target network.target
+PartOf=buildbot_worker.target
+
+[Service]
+Environment=BASEDIR=/var/lib/buildbot_worker
+Type=forking
+User=buildbot
+ExecStart=/usr/bin/buildbot-worker start ${BASEDIR}/%i
+ExecStop=/usr/bin/buildbot-worker stop ${BASEDIR}/%i
+
+[Install]
+WantedBy=buildbot_worker.target
diff --git a/dev-util/buildbot-worker/files/buildbot_worker_at.service.conf b/dev-util/buildbot-worker/files/buildbot_worker_at.service.conf
new file mode 100644
index 000000000000..8d37f9412e7d
--- /dev/null
+++ b/dev-util/buildbot-worker/files/buildbot_worker_at.service.conf
@@ -0,0 +1,5 @@
+# Uncomment the following lines to configure the base directory for all buildmaster instances.
+
+#[Service]
+#Environment=BASEDIR=/var/lib/buildbot_worker
+
diff --git a/dev-util/buildbot-wsgi-dashboards/Manifest b/dev-util/buildbot-wsgi-dashboards/Manifest
index e677fd23fdb7..ff13d27b3231 100644
--- a/dev-util/buildbot-wsgi-dashboards/Manifest
+++ b/dev-util/buildbot-wsgi-dashboards/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-wsgi-dashboards-3.4.0.tar.gz 5583 BLAKE2B 0eed4a375330d58bd6caf95f8cdc2ebfaebc9c123450461d4e0f938745bb1b6afe0e9786bd886c6e6cb6a522da2b645bf1ad3237b2049f86bc1bca83829b15a1 SHA512 56411bb34a1f40d02a814e8d33dcd3c6de65627728c3bb9cad776c43c48707e648ccdbb4a58cbfb8ed080c219fc37252304c88ab363eb6deb6057b2debde1071
 DIST buildbot-wsgi-dashboards-3.5.0.tar.gz 5585 BLAKE2B 94c365d4140de539a0ea85b78e24acd5d789fe022eb5ff2474ebc07554d139d964c9625b684b312b2134c3fd4bf3a6628178ac72d52283bb6fcfd7b7820d51f1 SHA512 d233273c05f9c2f6d81091dd620469dd19377848d5958c26cc746b6340ea9451c49aff8f8a36986741b3775fcc60065e0fbc402183f60f43d4afce238b907fd0
 DIST buildbot-wsgi-dashboards-3.6.0.tar.gz 5585 BLAKE2B 91de620cdb911b75ad745549e6fa7d1589206d8b17878b1779b40b84633dc9788d3dca46a34866c40d2403ed1a16c20d6159d0f0ce69d3e10f35d132cba06f35 SHA512 8377ef27f46b65ebb5e5dc638cab0e251070b940386b4681ea410562e6eaef04d4a76bfd3be229c081edb2f9df01c1385aad34a7763dcd5ce607fb0061b741e4
+DIST buildbot-wsgi-dashboards-3.6.1.tar.gz 5584 BLAKE2B f0b82de52022c3a8a0d0747aa4ade67345af177be70a8767d66163fe98ceff63e0b297ba547619de874a66e381b721c48d864361fdb82a818f2450c339d687cc SHA512 7ecd4fd71786258deab1fb1d96b4999ef929df4486d09404cb1bc3d1a7f831c90f8253f5bf0474258ba472ac9e8f960f4c4eb1f7993a0a8070eaa68e3bbbb4e9
diff --git a/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.ebuild b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.ebuild
new file mode 100644
index 000000000000..b67bfb3e65bf
--- /dev/null
+++ b/dev-util/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="Buildbot plugin to integrate flask or bottle dashboards to buildbot UI"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-wsgi-dashboards/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+BDEPEND="
+	~dev-util/buildbot-${PV}[${PYTHON_USEDEP}]
+	~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+"
diff --git a/dev-util/buildbot-www/Manifest b/dev-util/buildbot-www/Manifest
index 53d1c2e0ebf7..ed19ccd2e562 100644
--- a/dev-util/buildbot-www/Manifest
+++ b/dev-util/buildbot-www/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-www-3.4.0.tar.gz 3182445 BLAKE2B 350606158ae68aba1b82c43d202e6140f433905e9913c7f4fcd3f4ebd328f7b70940f0a4e76a4a1f89731f6364dd285f08052bd1d96badac4e69cd1e16643d4e SHA512 7be83f35b6042accae77db1133d54282d0d27ce15a9b34220cc015255935d7463c1a327ee289740325bbb73d6a6a162f384da2b3cc731719e7f99a911faf86cd
 DIST buildbot-www-3.5.0.tar.gz 3182531 BLAKE2B dcdd6487eff9d9a0429554d79f9ee83a9086dee3524b49fa8362085dddb969e088373a843a9d872e16d18350e1623ba65258799b9b93327e218f760540ece4fa SHA512 f40101624cf14f88f2796855845d13ee81471d7a1b4911461747aa073735352f21294c17f3a011229c5e1c99867013ff4b306bf32c2c37b3c57d530a6fccc01e
 DIST buildbot-www-3.6.0.tar.gz 3210526 BLAKE2B ab54213c457a9f5777075d00adb96863b4327cbbbc489c97609f29182fb8630cc77479ffa7e324d0d20e453bbcdc70f8ad0537a8bf55fd23d8410b8003e1399f SHA512 77a0671caa5c8a240301c7f3a2c2a26ecc69924546b7b7e641577e0f46c84380a80de43271dced0fa24a24b58b32d485d70d9af1d41a31af78af22a380653910
+DIST buildbot-www-3.6.1.tar.gz 3210526 BLAKE2B 6db8be32ee85cab63ad3f92d0e24042ed1ebece3b7be1b67e6f72240f61f3af2c31f1b3b31315db0d7ca18dddab1351eacffb92e762d1f1d68ce414349e52eee SHA512 d2fb3f97412e4a1b21fe7637458dffa8e8e005693ad2275222e908d35551ec64f89a88e696859a09f64b2b5be5fbdb386fbd71324356dbe8c2adc92b1c6b9f01
diff --git a/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild b/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild
new file mode 100644
index 000000000000..7834a034d6b5
--- /dev/null
+++ b/dev-util/buildbot-www/buildbot-www-3.6.1.ebuild
@@ -0,0 +1,26 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot base web interface, use with buildbot-{console-view,waterfall-view}..."
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot-www/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+RDEPEND="~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]"
+BDEPEND="${RDEPEND}"
diff --git a/dev-util/buildbot/Manifest b/dev-util/buildbot/Manifest
index 2a4093a0408e..ad7526384cac 100644
--- a/dev-util/buildbot/Manifest
+++ b/dev-util/buildbot/Manifest
@@ -1,3 +1,4 @@
 DIST buildbot-3.4.0.tar.gz 2446868 BLAKE2B a58b268fd4569105f1c0ba48c9ed86210a3fee4725f167d6b6847960bbb56a092d0c0db427ecf5932a91d44065da8843fbb4046d289800a019b0b1d8b1f53fea SHA512 92e5085862ac37a6c3c059870a3998fbaac2019c48384295f3e209788ea14bddff6704f1b987a8f3b1550c1b0255d228f8a0b2a20b5cb760b22a513db465863b
 DIST buildbot-3.5.0.tar.gz 2450653 BLAKE2B 0e923f2a3a334241b25c6a151b397356d7ba81ab2ff19c17c50a5996494d0f99fa198b63aa18a27ab60c5ad53c0154494bf4dea4e2bd306f4b709858a64dc3c4 SHA512 9730305540db3cdf166fdfc071142061926bbb895aa941046ad25e8350d3c161d4175f3518cd8a3ab51f320b0a5980517e5e53d9f5ddc342492ee56a0f6f266f
 DIST buildbot-3.6.0.tar.gz 2458029 BLAKE2B 5f41702d4d61fbcbfa878c6febbb89a38da2648403c4fdcab24bde246adc225e9ac3f72eb7dc893e03763f00c2d3548c31b2d6597904032e4b75e660bb1faf72 SHA512 c0bec931d08adb1eec51114619d2a085fbef224944a4c0acf3ab396f84d846fd620b84379affee238d02dd90ca1294fdb2b7fb8ea6e82d95c4cfeae93a0b5e73
+DIST buildbot-3.6.1.tar.gz 2458176 BLAKE2B 4587ed222e2fae424f3c4f275e67e72bf25b0ce88231a29f931582d82fbe93a846f85b14bdc64740939466ccdc3f15dab3774244aa5c0a293250b52b542014ea SHA512 62a993d1acd8bc5cc916f009909b4b099d9f64007fe790dc219104f248bb21e0ab8f1771c354ef61e6d8ba497451cdef5e7a7de17a87cfd1e941b3b49fbf2206
diff --git a/dev-util/buildbot/buildbot-3.6.1.ebuild b/dev-util/buildbot/buildbot-3.6.1.ebuild
new file mode 100644
index 000000000000..9ca1baf06d21
--- /dev/null
+++ b/dev-util/buildbot/buildbot-3.6.1.ebuild
@@ -0,0 +1,181 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="sqlite"
+PYTHON_COMPAT=( python3_{8..10} )
+inherit readme.gentoo-r1 systemd distutils-r1
+
+MY_PV="${PV/_p/.post}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="BuildBot build automation system"
+HOMEPAGE="https://buildbot.net/
+	https://github.com/buildbot/buildbot
+	https://pypi.org/project/buildbot/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux"
+
+IUSE="crypt docker examples irc test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	acct-user/buildbot
+	>=dev-python/twisted-18.7.0[${PYTHON_USEDEP}]
+	>=dev-python/jinja-2.1[${PYTHON_USEDEP}]
+	>=dev-python/zope-interface-4.1.1[${PYTHON_USEDEP}]
+	>=dev-python/sqlalchemy-1.3.0[${PYTHON_USEDEP}]
+	<dev-python/sqlalchemy-1.5.0[${PYTHON_USEDEP}]
+	>=dev-python/alembic-1.6.0[${PYTHON_USEDEP}]
+	>=dev-python/python-dateutil-1.5[${PYTHON_USEDEP}]
+	>=dev-python/txaio-2.2.2[${PYTHON_USEDEP}]
+	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
+	dev-python/pyjwt[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	crypt? (
+		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
+		dev-python/service_identity[${PYTHON_USEDEP}]
+		|| (
+			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},ssl(-)]
+			>=dev-python/twisted-18.7.0[${PYTHON_USEDEP},crypt(-)]
+		)
+		dev-python/idna[${PYTHON_USEDEP}]
+	)
+	irc? (
+		dev-python/txrequests[${PYTHON_USEDEP}]
+	)
+	docker? (
+		>=dev-python/docker-py-2.2.0[${PYTHON_USEDEP}]
+		dev-python/requests[${PYTHON_USEDEP}]
+	)
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		dev-python/treq[${PYTHON_USEDEP}]
+		dev-python/txrequests[${PYTHON_USEDEP}]
+		dev-python/pypugjs[${PYTHON_USEDEP}]
+		>=dev-python/boto3-1.12.48[${PYTHON_USEDEP}]
+		dev-python/moto[${PYTHON_USEDEP}]
+		>=dev-python/mock-2.0.0[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+		dev-python/lz4[${PYTHON_USEDEP}]
+		dev-python/ldap3[${PYTHON_USEDEP}]
+		~dev-util/buildbot-pkg-${PV}[${PYTHON_USEDEP}]
+		dev-util/buildbot-worker[${PYTHON_USEDEP}]
+		~dev-util/buildbot-www-${PV}[${PYTHON_USEDEP}]
+	)"
+
+DOC_CONTENTS="The \"buildbot\" user and the \"buildmaster\" init script has been added
+to support starting buildbot through Gentoo's init system. To use this,
+execute \"emerge --config =${CATEGORY}/${PF}\" to create a new instance.
+The scripts can	run as a different user if desired."
+
+src_prepare() {
+	# disable all warnings as errors
+	sed -e "/warnings.filterwarnings('error')/d" -i buildbot/test/__init__.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	"${EPYTHON}" -m twisted.trial buildbot || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+	distutils-r1_src_install
+
+	doman docs/buildbot.1
+
+	if use examples; then
+		dodoc -r docs/examples
+	fi
+
+	newconfd "${FILESDIR}/buildmaster.confd" buildmaster
+	newinitd "${FILESDIR}/buildmaster.initd" buildmaster
+	systemd_dounit "${FILESDIR}/buildmaster.target"
+	systemd_newunit "${FILESDIR}/buildmaster_at.service" "buildmaster@.service"
+	systemd_install_serviced "${FILESDIR}/buildmaster_at.service.conf" "buildmaster@.service"
+
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		ewarn
+		ewarn "Starting with buildbot-0.8.12-r2, more than one instance of buildmaster"
+		ewarn "can be run simultaneously. Note that \"BASEDIR\" in the buildbot configuration file"
+		ewarn "is now the common base directory for all instances. If you are migrating from an older"
+		ewarn "version, make sure that you copy the current contents of \"BASEDIR\" to a subdirectory."
+		ewarn "The name of the subdirectory corresponds to the name of the buildmaster instance."
+		ewarn "In order to start the service running OpenRC-based systems need to link to the init file:"
+		ewarn "    ln --symbolic --relative /etc/init.d/buildmaster /etc/init.d/buildmaster.myinstance"
+		ewarn "    rc-update add buildmaster.myinstance default"
+		ewarn "    /etc/init.d/buildmaster.myinstance start"
+		ewarn "Systems using systemd can do the following:"
+		ewarn "    systemctl enable buildmaster@myinstance.service"
+		ewarn "    systemctl enable buildmaster.target"
+		ewarn "    systemctl start buildmaster.target"
+		elog
+		elog "Upstream recommends the following when upgrading:"
+		elog "Each time you install a new version of Buildbot, you should run the"
+		elog "\"buildbot upgrade-master\" command on each of your pre-existing build masters."
+		elog "This will add files and fix (or at least detect) incompatibilities between"
+		elog "your old config and the new code."
+	fi
+	elog
+	elog "In order to create a new instance of buildmaster, execute:"
+	elog "    emerge --config =${CATEGORY}/${PF}"
+}
+
+pkg_config() {
+	local buildmaster_path="/var/lib/buildmaster"
+	local log_path="/var/log/buildmaster"
+
+	einfo "This will prepare a new buildmaster instance in ${buildmaster_path}."
+	einfo "Press Control-C to abort."
+
+	einfo "Enter the name for the new instance: "
+	read instance_name
+	[[ -z "${instance_name}" ]] && die "Invalid instance name"
+
+	local instance_path="${buildmaster_path}/${instance_name}"
+	local instance_log_path="${log_path}/${instance_name}"
+
+	if [[ -e "${instance_path}" ]]; then
+		eerror "The instance with the specified name already exists:"
+		eerror "${instance_path}"
+		die "Instance already exists"
+	fi
+
+	local buildbot="/usr/bin/buildbot"
+	if [[ ! -d "${buildmaster_path}" ]]; then
+		mkdir --parents "${buildmaster_path}" || die "Unable to create directory ${buildmaster_path}"
+	fi
+	"${buildbot}" create-master "${instance_path}" &>/dev/null || die "Creating instance failed"
+	chown --recursive buildbot:buildbot "${instance_path}" || die "Setting permissions for instance failed"
+	mv "${instance_path}/master.cfg.sample" "${instance_path}/master.cfg" \
+		|| die "Moving sample configuration failed"
+	ln --symbolic --relative "/etc/init.d/buildmaster" "/etc/init.d/buildmaster.${instance_name}" \
+		|| die "Unable to create link to init file"
+
+	if [[ ! -d "${instance_log_path}" ]]; then
+		mkdir --parents "${instance_log_path}" || die "Unable to create directory ${instance_log_path}"
+		chown --recursive buildbot:buildbot "${instance_log_path}" \
+			|| die "Setting permissions for instance failed"
+	fi
+	ln --symbolic --relative "${instance_log_path}/twistd.log" "${instance_path}/twistd.log" \
+		|| die "Unable to create link to log file"
+
+	einfo "Successfully created a buildmaster instance at ${instance_path}."
+	einfo "To change the default settings edit the master.cfg file in this directory."
+}
diff --git a/dev-util/buildbot/buildbot-9999.ebuild b/dev-util/buildbot/buildbot-9999.ebuild
index b0ebb30b9273..17faf70a4028 100644
--- a/dev-util/buildbot/buildbot-9999.ebuild
+++ b/dev-util/buildbot/buildbot-9999.ebuild
@@ -33,7 +33,7 @@ RDEPEND="
 	>=dev-python/autobahn-0.16.0[${PYTHON_USEDEP}]
 	dev-python/pyjwt[${PYTHON_USEDEP}]
 	dev-python/pyyaml[${PYTHON_USEDEP}]
-	~dev-util/buildbot-worker-${PV}[${PYTHON_USEDEP}]
+	dev-util/buildbot-worker[${PYTHON_USEDEP}]
 	crypt? (
 		>=dev-python/pyopenssl-16.0.0[${PYTHON_USEDEP}]
 		dev-python/service_identity[${PYTHON_USEDEP}]
diff --git a/dev-util/buildbot/files/buildmaster.confd b/dev-util/buildbot/files/buildmaster.confd
index eb3185aef358..9bb2eb0328d9 100644
--- a/dev-util/buildbot/files/buildmaster.confd
+++ b/dev-util/buildbot/files/buildmaster.confd
@@ -11,5 +11,5 @@ TWISTD_OPTS=""
 
 # Optional specific python version to run in
 # (if not the system default version)
-# ie: RUNTIME_PYTHON="/usr/bin/python2.7"
+# ie: RUNTIME_PYTHON="/usr/bin/python3.8"
 RUNTIME_PYTHON=""
diff --git a/dev-util/ccache/Manifest b/dev-util/ccache/Manifest
index 92a864aa4108..b00c2ab50f9a 100644
--- a/dev-util/ccache/Manifest
+++ b/dev-util/ccache/Manifest
@@ -1,9 +1,3 @@
 DIST ccache-4.5.1.tar.xz 513008 BLAKE2B 637b6d36c169bc742efd165569879a47405c2884918ed3731186e8176c926fa0e8e9cd648756d501ae3b741c671e2399cfdb0bc216410bc64826d4fe00d69498 SHA512 267dcc6b41270eeffe029d13e58eca3399540037cc19dc58bb5ebeb7dcc51b201fbde91c9824eaee5b14fbf28bb7304b78d1340118bc72e56b80ff148575bc56
-DIST ccache-4.6.1.tar.xz 529040 BLAKE2B b4c1cae8b0c836c9e562488c79524ddbba4c995946e16f87c9b856e32961b454dd205bacdb030c283477be66d357b0fb5e67c9ad38715359b73f714aa73baee9 SHA512 361427ccecd74e8c25ca6a98ef3d3c125d81862196767eb383f6f8159fed8e1695cd5bc8731cb591c23c55352f0114a088b32a673717711efbfbb178a6c08c82
-DIST ccache-4.6.1.tar.xz.asc 833 BLAKE2B 2f9ca555a014cfc9dbc354f43d4db0d79f89a6f84c57a7b9452324854abb39cd21af1071404278c694212f38c3975c7fa702f7cc475e44f75e9b132e53088d5d SHA512 5494844f99232c5bc21f52db461f2a03d706e38bd73e147ebda89a4ce57fc2b80a920e42f7de539b9a5837ac8b515b309a29e045e479910c95a95d3c839b837d
-DIST ccache-4.6.2.tar.xz 530952 BLAKE2B ef0fec6438ea69b109e918decb5e4a768ae0a5350e124b18cf700af7d307ed7a46509d02a9499aee87ed76a8fe5b9e4523ffec1fcc37b9b0a5ad56e5e713f8b8 SHA512 324c09c7cc76425552fd88e7483527c20ae977c817de1f0dff8a0102ae98f1c35d5e08c8a49c83ad76f6564ea912d9a500948051baa028139074913a6e07e452
-DIST ccache-4.6.2.tar.xz.asc 833 BLAKE2B dc4103d15808f044e47e27967df0b3ac063e40c4a40175958c99cf2609549657f4eec761f7d1103d8995ed7a86ad844cadd411fc4a4928901d78191f2dbe291b SHA512 66f42af7fb43ce1e701adaf911829d6690388e69249e6d97e0f51c31510f4198c22a7fdf68489f7b59fa07d311b2391be02d0a6702e8d890401318e4bfafd900
 DIST ccache-4.6.3.tar.xz 531184 BLAKE2B b23c22876cd3f31bcd67b9120fd5e605441508478f40267d654a281c00e28e3021b135cda04ace6da9fb39d3c144c92a259e69287be73043730240f32982b6a9 SHA512 b8cee0a466e76d5551c9785836c66ac5a98b51624e9f919adf820265ec19c3429c99ed332aecdafcd03cf32c71074121c63ec56762259921c3762a011be24966
 DIST ccache-4.6.3.tar.xz.asc 833 BLAKE2B 064d7bdf474540992180372c4c011b5bdeb98834803abcdec474f0988cac0339281c388545f9d28ae22b740268c338e092d618c0a4664c62c307d9a9ec1dff5e SHA512 ecba59c8089848737f37ef9bae4f631fae7eb2fedfc62879cd181ce37d412fbd883cc9dee52850757258009d75ef06477441cbf17d39db7b9d955300737e7f89
-DIST ccache-4.6.tar.xz 526084 BLAKE2B 2e43d0a3a004117e8c535ecb2f09c1273f5bec2b3704710abbc3034749438df33ef27db37d5bfbd48d83d60bdd3f738d3dbf356eff21166fee03780969dd1f24 SHA512 3a53fedfa91034ee876e1a4a672de25498fe53c6c80901bd4976049eb35e0479275ceb6627f0e8cf76d677d041d216f731daf4bad142e454e775b5e7f05e3e4e
-DIST ccache-4.6.tar.xz.asc 833 BLAKE2B e0fc7677087006e3c6ac2bb7285915a56f233b4058c738c9d5967d29baf62b1b072ad2da4bf12f076440c68f39be77333d001d68703c32e26bd88a42b9e3ce71 SHA512 af09ffcdbba5e1e26047c7692dd0cf61f07869720d5849f59cbc0fe0f61c11aa419226d4d05061d23b5a03e8ec995e4d0e5af398af096bd19dbe35bf460eee0c
diff --git a/dev-util/ccache/ccache-4.6-r1.ebuild b/dev-util/ccache/ccache-4.6-r1.ebuild
deleted file mode 100644
index 046476bcf614..000000000000
--- a/dev-util/ccache/ccache-4.6-r1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 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/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
-	redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND=" doc? ( dev-ruby/asciidoctor )
-	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-4.0-objdump.patch
-	"${FILESDIR}"/${PN}-4.6-avoid-run-user.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_configure() {
-	# Mainly used in tests
-	tc-export CC OBJDUMP
-
-	# Avoid dependency on libstdc++.so. Useful for cases when
-	# we would like to use ccache to build older gcc which injects
-	# into ccache locally built (possibly outdated) libstdc++
-	# See bug #761220 for examples.
-	#
-	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
-	use static-c++ && append-ldflags -static-libstdc++
-
-	local mycmakeargs=(
-		-DENABLE_DOCUMENTATION=$(usex doc)
-		-DENABLE_TESTING=$(usex test)
-		-DZSTD_FROM_INTERNET=OFF
-		-DREDIS_STORAGE_BACKEND=$(usex redis)
-	)
-
-	use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]] ; then
-		eselect compiler-shadow update ccache
-	fi
-}
diff --git a/dev-util/ccache/ccache-4.6.1.ebuild b/dev-util/ccache/ccache-4.6.1.ebuild
deleted file mode 100644
index 95ae40faf2de..000000000000
--- a/dev-util/ccache/ccache-4.6.1.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 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/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
-	redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND=" doc? ( dev-ruby/asciidoctor )
-	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-4.0-objdump.patch
-	"${FILESDIR}"/${PN}-4.6.1-avoid-run-user.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_configure() {
-	# Mainly used in tests
-	tc-export CC OBJDUMP
-
-	# Avoid dependency on libstdc++.so. Useful for cases when
-	# we would like to use ccache to build older gcc which injects
-	# into ccache locally built (possibly outdated) libstdc++
-	# See bug #761220 for examples.
-	#
-	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
-	use static-c++ && append-ldflags -static-libstdc++
-
-	local mycmakeargs=(
-		-DENABLE_DOCUMENTATION=$(usex doc)
-		-DENABLE_TESTING=$(usex test)
-		-DZSTD_FROM_INTERNET=OFF
-		-DREDIS_STORAGE_BACKEND=$(usex redis)
-	)
-
-	use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]] ; then
-		eselect compiler-shadow update ccache
-	fi
-}
diff --git a/dev-util/ccache/ccache-4.6.2.ebuild b/dev-util/ccache/ccache-4.6.2.ebuild
deleted file mode 100644
index e6fd6165c15d..000000000000
--- a/dev-util/ccache/ccache-4.6.2.ebuild
+++ /dev/null
@@ -1,93 +0,0 @@
-# Copyright 1999-2022 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/joelrosdahl.asc
-inherit cmake toolchain-funcs flag-o-matic verify-sig
-
-DESCRIPTION="Fast compiler cache"
-HOMEPAGE="https://ccache.dev/"
-SRC_URI="https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz"
-SRC_URI+=" verify-sig? ( https://github.com/ccache/ccache/releases/download/v${PV}/${P}.tar.xz.asc )"
-
-LICENSE="GPL-3 LGPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-# Enable 'static-c++' by default to make 'gcc' ebuild Just Work: bug #761220
-IUSE="doc redis +static-c++ test"
-RESTRICT="!test? ( test )"
-
-DEPEND="app-arch/zstd:=
-	redis? ( dev-libs/hiredis:= )"
-RDEPEND="${DEPEND}
-	dev-util/shadowman
-	sys-apps/gentoo-functions"
-# Needed for eselect calls in pkg_*
-IDEPEND="dev-util/shadowman"
-
-# clang-specific tests use dev-libs/elfutils to compare objects for equality.
-# Let's pull in the dependency unconditionally.
-DEPEND+=" test? ( dev-libs/elfutils )"
-BDEPEND=" doc? ( dev-ruby/asciidoctor )
-	verify-sig? ( sec-keys/openpgp-keys-joelrosdahl )"
-
-DOCS=( doc/{AUTHORS,MANUAL,NEWS}.adoc CONTRIBUTING.md README.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-nvcc-test.patch
-	"${FILESDIR}"/${PN}-4.0-objdump.patch
-	"${FILESDIR}"/${PN}-4.6.2-avoid-run-user.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	sed \
-		-e "/^EPREFIX=/s:'':'${EPREFIX}':" \
-		"${FILESDIR}"/ccache-config-3 > ccache-config || die
-}
-
-src_configure() {
-	# Mainly used in tests
-	tc-export CC OBJDUMP
-
-	# Avoid dependency on libstdc++.so. Useful for cases when
-	# we would like to use ccache to build older gcc which injects
-	# into ccache locally built (possibly outdated) libstdc++
-	# See bug #761220 for examples.
-	#
-	# Ideally gcc should not use LD_PRELOAD to avoid this type of failure.
-	use static-c++ && append-ldflags -static-libstdc++
-
-	local mycmakeargs=(
-		-DENABLE_DOCUMENTATION=$(usex doc)
-		-DENABLE_TESTING=$(usex test)
-		-DZSTD_FROM_INTERNET=OFF
-		-DREDIS_STORAGE_BACKEND=$(usex redis)
-	)
-
-	use redis && mycmakeargs+=( -DHIREDIS_FROM_INTERNET_DEFAULT=OFF )
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	dobin ccache-config
-	insinto /usr/share/shadowman/tools
-	newins - ccache <<<"${EPREFIX}/usr/lib/ccache/bin"
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} && -z ${ROOT} ]] ; then
-		eselect compiler-shadow remove ccache
-	fi
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} ]] ; then
-		eselect compiler-shadow update ccache
-	fi
-}
diff --git a/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch
deleted file mode 100644
index cfdd09f79e66..000000000000
--- a/dev-util/ccache/files/ccache-4.6-avoid-run-user.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Gentoo's sandbox does not whitelist this path by default yet.
-
-(4.1 update:
-https://github.com/ccache/ccache/issues/984
-https://github.com/ccache/ccache/issues/1044
-https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
-https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
-... gets us closer, but not there yet.)
-
-https://bugs.gentoo.org/837362 for 4.6 issue.
---- a/src/Config.cpp
-+++ b/src/Config.cpp
-@@ -1031,14 +1031,5 @@ Config::check_key_tables_consistency()
- std::string
- Config::default_temporary_dir(const std::string& cache_dir)
- {
--  static const std::string run_user_tmp_dir = [] {
--#ifdef HAVE_GETEUID
--    auto dir = FMT("/run/user/{}/ccache-tmp", geteuid());
--    if (Util::create_dir(dir)) {
--      return dir;
--    }
--#endif
--    return std::string();
--  }();
--  return !run_user_tmp_dir.empty() ? run_user_tmp_dir : cache_dir + "/tmp";
-+  return cache_dir + "/tmp";
- }
diff --git a/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch b/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch
deleted file mode 100644
index 9dce69c63518..000000000000
--- a/dev-util/ccache/files/ccache-4.6.1-avoid-run-user.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-Gentoo's sandbox does not whitelist this path by default yet.
-
-(4.1 update:
-https://github.com/ccache/ccache/issues/984
-https://github.com/ccache/ccache/issues/1044
-https://github.com/ccache/ccache/commit/a0edd4294f6a5a2d3f0c7b01273736f975f250e1
-https://github.com/ccache/ccache/commit/ef2e922f9642f943199138447b29ec53fa63ea68
-... gets us closer, but not there yet.)
-
-https://bugs.gentoo.org/837362 for 4.6 issue.
---- a/src/Config.cpp
-+++ b/src/Config.cpp
-@@ -1039,14 +1039,5 @@ Config::check_key_tables_consistency()
- std::string
- Config::default_temporary_dir(const std::string& cache_dir)
- {
--  static const std::string run_user_tmp_dir = [] {
--#ifdef HAVE_GETEUID
--    auto dir = FMT("/run/user/{}/ccache-tmp", geteuid());
--    if (Util::create_dir(dir) && access(dir.c_str(), W_OK) == 0) {
--      return dir;
--    }
--#endif
--    return std::string();
--  }();
--  return !run_user_tmp_dir.empty() ? run_user_tmp_dir : cache_dir + "/tmp";
-+  return cache_dir + "/tmp";
- }
diff --git a/dev-util/cmake/Manifest b/dev-util/cmake/Manifest
index eeb6d5a25a23..c78232995d72 100644
--- a/dev-util/cmake/Manifest
+++ b/dev-util/cmake/Manifest
@@ -1,10 +1,6 @@
 DIST cmake-3.23.3-SHA-256.txt 1452 BLAKE2B aa2e2dfb2757210688a5a9131ca1fffdf6617a52219d373fd908c08e52b7d77f0e980086561a083cabaf8d9f3e24b15064bb74ad2737fcbfe11c8aba5814eb4e SHA512 22808c050e8927867fc5d2daa6999d9eed53e99015f89d1f5bef61397d1b2a9888728e86fdca8716c47f8133e02b3fa726d0cc97c0bb4ab5f5ff16a1fc0ae82f
 DIST cmake-3.23.3-SHA-256.txt.asc 833 BLAKE2B 10f61d7cfaa5c86d0e372f33d9ba0dbe7ae9cbfe17669107167b3ae72d0e337c63fb1c27a528dcda804323a1f0d4843b630e15427c33e0f5d5c568e27cea769d SHA512 75ff4b25fdd71bc05a7d6fec3c72ec5b8d6ed7ac980d533e6c820855c74a1a58f52d53c1a454dffe1a15568445c4c1c805891997e5709567c9e7709ba1c5e4d9
 DIST cmake-3.23.3.tar.gz 9988050 BLAKE2B 55105ce380e5e9f1839fc38cc0eaefe505d58bffa60feab9813a36c7cac92f4fb6aa6b6aaad899f1e8d58cfa5ececb9e7335a470244ccc06848d833b1eddf224 SHA512 75f86abe60ef28ba9bd06546c0c24578921621fb4be942171e629366a759cf1469e430945addc85f8ce977920883c063ed26de1b78fd24dfd98d0eb604800632
-DIST cmake-3.24.1-SHA-256.txt 1646 BLAKE2B 0b72b78803e6b6e8055f68895203bcf8e4dfd0fdac43113bcece89d022ae38428c8363e12182f23954ae529a3e98d64c16770ad53f597a6d4100a72053ce10f5 SHA512 6302a8f3370f94415af6a2a1852b15f56fb58a67f895b3d99c6f2a084dd99437a94cf48bccdebed5b96e20aa9f52daff87e1037f1c62aff21b7a138f051375cc
-DIST cmake-3.24.1-SHA-256.txt.asc 833 BLAKE2B 2e77922c732e654b40a40043b85ec4794886107cc09765d0a80ea05efad08711046bafd5ae341fb16904129cc7af75e6f4d2d1103e767a9147cca6a6a975b1fd SHA512 b04a73cc483d51d5eafab7153b53e366220db2bad4b1d78fea9aec82e667434b8a27ae522be96b5f6a38e43c84aa3475f86c55c088a6149b03ec98c682b3cc4a
-DIST cmake-3.24.1-docs.tar.xz 491808 BLAKE2B 5bafdcb5b705581fbb63e9733d37ca10b8fa1803ea471afb723e26421989cb3b204952640438db11425e3bb536267bbb3e0bb6e618bee2cd4662517201aa1196 SHA512 8181dd4cbf066d42af620ee265cbd6eac0d2edf744706ec63909ac819458c1dd3f118129f54255e1f27a61af6a0ae4d72a2dc066ca5fd3e747962b9a8b3f9bee
-DIST cmake-3.24.1.tar.gz 10392868 BLAKE2B 628e2610c01af8e03eb7a201ae56a6e909c63314a993d2066f363d6181cfd2d0a0e5c09e9f74ad5ae3d226e15c2b04be250dc9bf1a273158fa3073bcc05c3a8e SHA512 67bfafcf9ceba617d7ebbb0ac88b689a2d90ab51fea4a83bd073ee082fb55de8962ce7fb283f3db5f455d286f2199843ffa595a1de207d4fa3e4472d951eb289
 DIST cmake-3.24.2-SHA-256.txt 1646 BLAKE2B 3c48226c96844c5ddd8567637a61eca697425021735d5dc8613a1fd7a68887f6707b6030c1e4476af5e4bdb4830cc4ff3d8708f4bdf557ba94508086e0447030 SHA512 f7500d8c9a500c9ad2679a68d6343cbbbae1483014ab2cd48a056e1e9591b6edd0d712e9ff5441e19c05284696e6c52ebdc3cf1efc61432f2764da7703816b49
 DIST cmake-3.24.2-SHA-256.txt.asc 833 BLAKE2B fe6a3caa3db7b6be186e49ee5d86706f2cda9a45858bc964be5407f577195d0af74c10e66ea30faa0a35280f1c9f927732f9cc7fcb9dae8e521882955b6ef617 SHA512 a0fa1a002f2f23e8b3b8fb2689905ac618ca423b96f904bee172d6a62e6fb0c0a46394ce57474be9c9810e1d09abf3b192f595cb0e92d5c62d11b60f0c572b82
 DIST cmake-3.24.2-docs.tar.xz 492188 BLAKE2B 64e0d69ce8e739e6622b0cfde8956cb2bf67f9bf412b8d98afa1657bd30d8a2a1cf874e6422c78c222199616aac85d472ef398c83da29d5d64516384e9ed69aa SHA512 d0ef81dfe37ac2a225fe795fd3e6780e3b8fd5caa472a14ff8d036917172efd13126897c7a2a78d8269aa20e4f35c7b9be7bed14ecbfb24df332c332a4ff16c4
diff --git a/dev-util/cmake/cmake-3.24.1.ebuild b/dev-util/cmake/cmake-3.24.1.ebuild
deleted file mode 100644
index 9491df325a39..000000000000
--- a/dev-util/cmake/cmake-3.24.1.ebuild
+++ /dev/null
@@ -1,293 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# Generate using https://github.com/thesamesam/sam-gentoo-scripts/blob/main/niche/generate-cmake-docs
-# Set to 1 if prebuilt, 0 if not
-# (the construct below is to allow overriding from env for script)
-: ${CMAKE_DOCS_PREBUILT:=1}
-
-CMAKE_DOCS_PREBUILT_DEV=sam
-CMAKE_DOCS_VERSION=$(ver_cut 1-3)
-# Default to generating docs (inc. man pages) if no prebuilt; overridden later
-# See bug #784815
-CMAKE_DOCS_USEFLAG="+doc"
-
-# TODO RunCMake.LinkWhatYouUse fails consistently w/ ninja
-# ... but seems fine as of 3.22.3?
-# TODO ... but bootstrap sometimes(?) fails with ninja now. bug #834759.
-CMAKE_MAKEFILE_GENERATOR="emake"
-CMAKE_REMOVE_MODULES_LIST=( none )
-inherit bash-completion-r1 cmake elisp-common flag-o-matic multiprocessing \
-	toolchain-funcs virtualx xdg-utils
-
-MY_P="${P/_/-}"
-
-DESCRIPTION="Cross platform Make"
-HOMEPAGE="https://cmake.org/"
-if [[ ${PV} == 9999 ]] ; then
-	CMAKE_DOCS_PREBUILT=0
-
-	EGIT_REPO_URI="https://gitlab.kitware.com/cmake/cmake.git"
-	inherit git-r3
-else
-	SRC_URI="https://cmake.org/files/v$(ver_cut 1-2)/${MY_P}.tar.gz"
-
-	if [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		SRC_URI+=" !doc? ( https://dev.gentoo.org/~${CMAKE_DOCS_PREBUILT_DEV}/distfiles/${CATEGORY}/${PN}/${PN}-${CMAKE_DOCS_VERSION}-docs.tar.xz )"
-	fi
-
-	if [[ ${PV} != *_rc* ]] ; then
-		VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bradking.asc
-		inherit verify-sig
-
-		SRC_URI+=" verify-sig? (
-			https://github.com/Kitware/CMake/releases/download/v$(ver_cut 1-3)/${MY_P}-SHA-256.txt
-			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"
-
-		BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bradking )"
-	fi
-fi
-
-[[ ${CMAKE_DOCS_PREBUILT} == 1 ]] && CMAKE_DOCS_USEFLAG="doc"
-
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="CMake"
-SLOT="0"
-IUSE="${CMAKE_DOCS_USEFLAG} emacs ncurses qt5 test"
-RESTRICT="!test? ( test )"
-
-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
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND+="
-	doc? (
-		dev-python/requests
-		dev-python/sphinx
-	)
-	test? ( app-arch/libarchive[zstd] )
-"
-
-SITEFILE="50${PN}-gentoo.el"
-
-PATCHES=(
-	# Prefix
-	"${FILESDIR}"/${PN}-3.16.0_rc4-darwin-bundle.patch
-	"${FILESDIR}"/${PN}-3.14.0_rc3-prefix-dirs.patch
-	"${FILESDIR}"/${PN}-3.19.1-darwin-gcc.patch
-
-	# Handle gentoo packaging in find modules
-	"${FILESDIR}"/${PN}-3.17.0_rc1-FindBLAS.patch
-	# Next patch needs to be reworked
-	#"${FILESDIR}"/${PN}-3.17.0_rc1-FindLAPACK.patch
-	"${FILESDIR}"/${PN}-3.5.2-FindQt4.patch
-
-	# Respect python eclasses
-	"${FILESDIR}"/${PN}-2.8.10.2-FindPythonLibs.patch
-	"${FILESDIR}"/${PN}-3.9.0_rc2-FindPythonInterp.patch
-
-	"${FILESDIR}"/${PN}-3.18.0-filter_distcc_warning.patch # bug 691544
-
-	# upstream fixes (can usually be removed with a version bump)
-)
-
-cmake_src_bootstrap() {
-	# disable running of cmake in bootstrap command
-	sed -i \
-		-e '/"${cmake_bootstrap_dir}\/cmake"/s/^/#DONOTRUN /' \
-		bootstrap || die "sed failed"
-
-	# execinfo.h on Solaris isn't quite what it is on Darwin
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		sed -i -e 's/execinfo\.h/blablabla.h/' \
-			Source/kwsys/CMakeLists.txt || die
-	fi
-
-	# bootstrap script isn't exactly /bin/sh compatible
-	tc-env_build ${CONFIG_SHELL:-sh} ./bootstrap \
-		--prefix="${T}/cmakestrap/" \
-		--parallel=$(makeopts_jobs "${MAKEOPTS}" "$(get_nproc)") \
-		|| die "Bootstrap failed"
-}
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	elif ! use verify-sig || [[ ${PV} == *_rc* ]] ; then
-		default
-	else
-		cd "${DISTDIR}" || die
-
-		# See https://mgorny.pl/articles/verify-sig-by-example.html#verifying-using-a-checksum-file-with-a-detached-signature
-		verify-sig_verify_detached ${MY_P}-SHA-256.txt{,.asc}
-		verify-sig_verify_unsigned_checksums ${MY_P}-SHA-256.txt sha256 ${MY_P}.tar.gz
-
-		cd "${WORKDIR}" || die
-
-		default
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		# Disable Xcode hooks, bug #652134
-		sed -i -e 's/cm\(\|Global\|Local\)XCode[^.]\+\.\(cxx\|h\)//' \
-			Source/CMakeLists.txt || die
-		sed -i -e '/define CMAKE_USE_XCODE/s/XCODE/NO_XCODE/' \
-			-e '/cmGlobalXCodeGenerator.h/d' \
-			Source/cmake.cxx || die
-
-		# Disable isysroot usage with GCC, we've properly instructed
-		# where things are via GCC configuration and ldwrapper
-		sed -i -e '/cmake_gnu_set_sysroot_flag/d' \
-			Modules/Platform/Apple-GNU-*.cmake || die
-		# Disable isysroot usage with clang as well
-		sed -i -e '/_SYSROOT_FLAG/d' \
-			Modules/Platform/Apple-Clang.cmake || die
-		# Don't set a POSIX standard, system headers don't like that, #757426
-		sed -i -e 's/^#if !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmLoadCommandCommand.cxx \
-			Source/cmStandardLexer.h \
-			Source/cmSystemTools.cxx \
-			Source/cmTimestamp.cxx
-		sed -i -e 's/^#if !defined(_POSIX_C_SOURCE) && !defined(_WIN32) && !defined(__sun)/& \&\& !defined(__APPLE__)/' \
-			Source/cmStandardLexer.h
-	fi
-
-	# Add gcc libs to the default link paths
-	sed -i \
-		-e "s|@GENTOO_PORTAGE_GCCLIBDIR@|${EPREFIX}/usr/${CHOST}/lib/|g" \
-		-e "$(usex prefix-guest "s|@GENTOO_HOST@||" "/@GENTOO_HOST@/d")" \
-		-e "s|@GENTOO_PORTAGE_EPREFIX@|${EPREFIX}/|g" \
-		Modules/Platform/{UnixPaths,Darwin}.cmake || die "sed failed"
-
-	if ! has_version -b \>=${CATEGORY}/${PN}-3.13 || ! cmake --version &>/dev/null ; then
-		CMAKE_BINARY="${S}/Bootstrap.cmk/cmake"
-		cmake_src_bootstrap
-	fi
-}
-
-src_configure() {
-	# Fix linking on Solaris
-	[[ ${CHOST} == *-solaris* ]] && append-ldflags -lsocket -lnsl
-
-	# ODR warnings, bug #858335
-	# https://gitlab.kitware.com/cmake/cmake/-/issues/20740
-	filter-lto
-
-	local mycmakeargs=(
-		-DCMAKE_USE_SYSTEM_LIBRARIES=ON
-		-DCMAKE_DOC_DIR=/share/doc/${PF}
-		-DCMAKE_MAN_DIR=/share/man
-		-DCMAKE_DATA_DIR=/share/${PN}
-		-DSPHINX_MAN=$(usex doc)
-		-DSPHINX_HTML=$(usex doc)
-		-DBUILD_CursesDialog="$(usex ncurses)"
-		-DBUILD_TESTING=$(usex test)
-	)
-	use qt5 && mycmakeargs+=( -DBUILD_QtDialog=ON )
-
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use emacs && elisp-compile Auxiliary/cmake-mode.el
-}
-
-src_test() {
-	# Fix OutDir and SelectLibraryConfigurations tests
-	# these are altered thanks to our eclass
-	sed -i -e 's:^#_cmake_modify_IGNORE ::g' \
-		"${S}"/Tests/{OutDir,CMakeOnly/SelectLibraryConfigurations}/CMakeLists.txt \
-		|| die
-
-	pushd "${BUILD_DIR}" > /dev/null || die
-
-	# Excluded tests:
-	#    BootstrapTest: we actualy bootstrap it every time so why test it.
-	#    BundleUtilities: bundle creation broken
-	#    CMakeOnly.AllFindModules: pthread issues
-	#    CTest.updatecvs: which fails to commit as root
-	#    Fortran: requires fortran
-	#    RunCMake.CompilerLauncher: also requires fortran
-	#    RunCMake.CPack_RPM: breaks if app-arch/rpm is installed because
-	#        debugedit binary is not in the expected location
-	#    RunCMake.CPack_DEB: breaks if app-arch/dpkg is installed because
-	#        it can't find a deb package that owns libc
-	#    TestUpload, which requires network access
-	#    RunCMake.CMP0125, known failure reported upstream (bug #829414)
-	local myctestargs=(
-		--output-on-failure
-		-E "(BootstrapTest|BundleUtilities|CMakeOnly.AllFindModules|CompileOptions|CTest.UpdateCVS|Fortran|RunCMake.CompilerLauncher|RunCMake.CPack_(DEB|RPM)|TestUpload|RunCMake.CMP0125)" \
-	)
-
-	virtx cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# If USE=doc, there'll be newly generated docs which we install instead.
-	if ! use doc && [[ ${CMAKE_DOCS_PREBUILT} == 1 ]] ; then
-		doman "${WORKDIR}"/${PN}-${CMAKE_DOCS_VERSION}-docs/man*/*.[0-8]
-	fi
-
-	if use emacs; then
-		elisp-install ${PN} Auxiliary/cmake-mode.el Auxiliary/cmake-mode.elc
-		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
-	fi
-
-	insinto /usr/share/vim/vimfiles/syntax
-	doins Auxiliary/vim/syntax/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/indent
-	doins Auxiliary/vim/indent/cmake.vim
-
-	insinto /usr/share/vim/vimfiles/ftdetect
-	doins "${FILESDIR}/${PN}.vim"
-
-	dobashcomp Auxiliary/bash-completion/{${PN},ctest,cpack}
-}
-
-pkg_postinst() {
-	use emacs && elisp-site-regen
-
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-
-	if use qt5; then
-		xdg_icon_cache_update
-		xdg_desktop_database_update
-		xdg_mimeinfo_database_update
-	fi
-}
diff --git a/dev-util/ctags/Manifest b/dev-util/ctags/Manifest
index 8e9fd7251f04..6c822f910f6c 100644
--- a/dev-util/ctags/Manifest
+++ b/dev-util/ctags/Manifest
@@ -1,3 +1,2 @@
-DIST ctags-20190331.tar.gz 1537104 BLAKE2B 354ddf48cdc9421e70d9d37ec7251e51f7f78564dc4f6236d12e2e18519369c39c22585830fd301b7eff4898d550b824776541198b8c4a31425711776b14fde4 SHA512 414faef7628ecaa66fcd5f172781a32194e1d58637dded1f7e55c138239ad777796bb1510bd447af3ad8243b7178e6f4859139305b0c0efe298182408f34524c
 DIST ctags-20211017.0.tar.gz 2542128 BLAKE2B cade7149cb2fd0645f9b7ecd37c8b9acdeae7037fde2bb74aa94d67f04963327429b83dcf5cd658f082bd8ce4c407f69f4924da5f768bec029b4075997bbd882 SHA512 85bfb4d40c1d9045b4ba4dc280ee7108ee2fd4572c92794d5bdc854f3511dad1ecf282428e61161773f7bfaca725d774593a0e83fc767a1bb2e12b229a19bec0
 DIST ctags-20220828.0.tar.gz 2952276 BLAKE2B 2ec3a01646cfb89446604af65387bb5cbf17188177505000f5803a9a535f59799961e8144d3ab36b23114fc093cb487589f52e7186b60041ff3bf2a439f77dab SHA512 4c1289dab24edded85c7ae31c06b0cad5b8f08f7f709a0bdacdf5f9d8ccf722c820d6fef6d46298bb06c48256e80f594dbf2456b91d1c50b3509ce4d3fe3ae9c
diff --git a/dev-util/ctags/ctags-20190331-r1.ebuild b/dev-util/ctags/ctags-20190331-r1.ebuild
deleted file mode 100644
index 7eb5ec5879da..000000000000
--- a/dev-util/ctags/ctags-20190331-r1.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit autotools
-
-COMMITHASH="95975bd157cc1326120977ce530f0477bcbf43b1"
-
-DESCRIPTION="Exuberant Ctags creates tags files for code browsing in editors"
-HOMEPAGE="https://ctags.io/ https://github.com/universal-ctags/ctags"
-SRC_URI="https://github.com/universal-ctags/ctags/archive/${COMMITHASH}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-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"
-IUSE="json xml yaml"
-
-CDEPEND="
-	json? ( dev-libs/jansson:= )
-	xml? ( dev-libs/libxml2:2 )
-	yaml? ( dev-libs/libyaml )"
-
-RDEPEND="
-	${CDEPEND}
-	app-eselect/eselect-ctags"
-
-DEPEND="
-	${CDEPEND}
-	dev-python/docutils
-	virtual/pkgconfig"
-
-S="${WORKDIR}/${PN}-${COMMITHASH}"
-
-src_prepare() {
-	default
-	./misc/dist-test-cases > makefiles/test-cases.mak || die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable json) \
-		$(use_enable xml) \
-		$(use_enable yaml) \
-		--disable-readlib \
-		--disable-etags \
-		--enable-tmpdir="${EPREFIX}"/tmp
-}
-
-src_install() {
-	emake prefix="${ED}"/usr mandir="${ED}"/usr/share/man install
-
-	# namepace collision with X/Emacs-provided /usr/bin/ctags -- we
-	# rename ctags to exuberant-ctags (Mandrake does this also).
-	mv "${ED}"/usr/bin/{ctags,exuberant-ctags} || die
-	mv "${ED}"/usr/share/man/man1/{ctags,exuberant-ctags}.1 || die
-}
-
-pkg_postinst() {
-	eselect ctags update
-
-	if [[ -z "$REPLACING_VERSIONS" ]]; then
-		elog "You can set the version to be started by /usr/bin/ctags through"
-		elog "the ctags eselect module. \"man ctags.eselect\" for details."
-	fi
-}
-
-pkg_postrm() {
-	eselect ctags update
-}
diff --git a/dev-util/ctags/ctags-20220828.0.ebuild b/dev-util/ctags/ctags-20220828.0-r1.ebuild
similarity index 95%
rename from dev-util/ctags/ctags-20220828.0.ebuild
rename to dev-util/ctags/ctags-20220828.0-r1.ebuild
index ceadc8424f8a..22b038adf5a8 100644
--- a/dev-util/ctags/ctags-20220828.0.ebuild
+++ b/dev-util/ctags/ctags-20220828.0-r1.ebuild
@@ -21,12 +21,13 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="json pcre test xml yaml"
+IUSE="json pcre seccomp test xml yaml"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	json? ( dev-libs/jansson:= )
 	pcre? ( dev-libs/libpcre2 )
+	seccomp? ( sys-libs/libseccomp )
 	xml? ( dev-libs/libxml2:2 )
 	yaml? ( dev-libs/libyaml )
 "
@@ -57,6 +58,7 @@ src_configure() {
 	econf \
 		$(use_enable json) \
 		$(use_enable pcre pcre2) \
+		$(use_enable seccomp) \
 		$(use_enable xml) \
 		$(use_enable yaml) \
 		--disable-etags \
diff --git a/dev-util/ctags/ctags-99999999.ebuild b/dev-util/ctags/ctags-99999999.ebuild
index ceadc8424f8a..22b038adf5a8 100644
--- a/dev-util/ctags/ctags-99999999.ebuild
+++ b/dev-util/ctags/ctags-99999999.ebuild
@@ -21,12 +21,13 @@ fi
 
 LICENSE="GPL-2+"
 SLOT="0"
-IUSE="json pcre test xml yaml"
+IUSE="json pcre seccomp test xml yaml"
 RESTRICT="!test? ( test )"
 
 DEPEND="
 	json? ( dev-libs/jansson:= )
 	pcre? ( dev-libs/libpcre2 )
+	seccomp? ( sys-libs/libseccomp )
 	xml? ( dev-libs/libxml2:2 )
 	yaml? ( dev-libs/libyaml )
 "
@@ -57,6 +58,7 @@ src_configure() {
 	econf \
 		$(use_enable json) \
 		$(use_enable pcre pcre2) \
+		$(use_enable seccomp) \
 		$(use_enable xml) \
 		$(use_enable yaml) \
 		--disable-etags \
diff --git a/dev-util/difftastic/Manifest b/dev-util/difftastic/Manifest
index 7a8209cb765f..fba8e32da0c0 100644
--- a/dev-util/difftastic/Manifest
+++ b/dev-util/difftastic/Manifest
@@ -20,6 +20,7 @@ DIST ctor-0.1.22.crate 9311 BLAKE2B a13fb97cf767fae19486ca8b970f1712bfcf4ec9edda
 DIST diff-0.1.12.crate 10223 BLAKE2B 369f305661f1da31207f3801ed1841dbce12451ac9c3e9d3736f7158ece433af9b2e42c29063e5d93bb86b1d300e503caa9c3ce7dd0b25553f91d72a9eea5298 SHA512 0e81331c0424e9369963e23894a6412b65a3ed4f3154ccc184fc84cf1c5985b81c586a6b34e8c6c0e5c3afba38fb15277cfd89e7f50c85bd5d8d4d24ba670d16
 DIST difftastic-0.34.0.gh.tar.gz 26757611 BLAKE2B 29d929c3ac471e956b8f34dc8170e02dbc7cf1b41a5b2477836120e400e6dc76524c7a5afff51e7469138517ed256ac00822c6d95ad09eef8ba0649c0fd18333 SHA512 b394d6cec02eaf9adaab4780639f1a93a8709aa2e4d9d83b526c17dcac709c38789974fac9d4c56e39f558c20b496059ea468993ffba3571283fba61114e4a5b
 DIST difftastic-0.35.0.gh.tar.gz 26842590 BLAKE2B 813886175ab24c1398e72f180114bd456eca61ce6e9112ce33bd28e16696e023c5f8822a435e1df07167f0bd82014a1d905fa0925a7794df5f85249e4f448c23 SHA512 356d1a5cb91eb016099ceaae4ce21b95fd2bbf7021e043277fa354f379a0ebcfd43a7c1f459d6509aa5112acab3529cd7f66491ce2c7a5cc1d7688bd635fc436
+DIST difftastic-0.36.1.gh.tar.gz 28809971 BLAKE2B 2715e8f01e00de4608917b5e865f9d568ab5d48f3db529b1e6ba743355aa9262f4ecd6ca644860c5a47121ee99619a55c3a8ff143c545be5fefda8605767bec9 SHA512 68f954658fb0d979ea5deca9ec6d0a49466b19e54e9db030af76f72e4fb092156b91844ae40073c9bb2c6f3656f7fd25bfc7600cb30f85a3121a57705b8e7d40
 DIST either-1.6.1.crate 13641 BLAKE2B e5f40c40a5edb6dcb07a10bf79183cbe42438f1f70f3932dce72f6f6e91f75f24d17d82bc447507def4dad4345ffc9dd9162dde778afb253bdb1218e91887949 SHA512 4bfe56920e30cbc8eb4f90162db618f7dca653b42db35ab6a7045d3fd9a24ceb1778b1f79613850bdb1a87ad3794fa0d73015e46c48d513f368d8c3776fc9ddf
 DIST env_logger-0.7.1.crate 32281 BLAKE2B 6f1894c64f301ca4b687270c911dbe230f674662aa0561b97c4d2537886e404664b5773d4e223e2018047c222a951232c3cb52ec5bddbfb6665e34c3e7ea52f5 SHA512 604060d2ee83ab337a2d20d6784d1b7541534d2fd9e1662fc5c709fa681672a9db5e34d00face864b56ae321962e644ebe29fbb6d68a0d556419cf5d71c6149f
 DIST errno-0.2.8.crate 9276 BLAKE2B b73738deb47d1f76ec91ffd15558126d32312647b82677290725669edb01b8f34a503172fad6518ebf0ffb1633ef0afaf0750982b9384a9fb87833d31721c9a8 SHA512 1f513743224cd9a9b7e4caaf33dab075a4a79efa90c9f46c9edfb0c8600daccd3ad2677ba2116621e19fcf8be456954da5d611cbcea4b6f1410f7731828b50d1
diff --git a/dev-util/difftastic/difftastic-0.36.1.ebuild b/dev-util/difftastic/difftastic-0.36.1.ebuild
new file mode 100644
index 000000000000..75a3ce21b10b
--- /dev/null
+++ b/dev-util/difftastic/difftastic-0.36.1.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Auto-Generated by cargo-ebuild 0.5.2
+
+EAPI=8
+
+CRATES="
+	aho-corasick-0.7.18
+	ansi_term-0.12.1
+	archery-0.4.0
+	atty-0.2.14
+	autocfg-1.1.0
+	bitflags-1.3.2
+	bumpalo-3.9.1
+	bytecount-0.6.2
+	cc-1.0.73
+	cfg-if-1.0.0
+	clap-3.1.18
+	clap_lex-0.2.0
+	const_format-0.2.23
+	const_format_proc_macros-0.2.22
+	crossbeam-channel-0.5.4
+	crossbeam-deque-0.8.1
+	crossbeam-epoch-0.9.8
+	crossbeam-utils-0.8.8
+	ctor-0.1.22
+	diff-0.1.12
+	either-1.6.1
+	env_logger-0.7.1
+	errno-0.2.8
+	errno-dragonfly-0.1.2
+	fixedbitset-0.4.1
+	fnv-1.0.7
+	hashbrown-0.11.2
+	hermit-abi-0.1.19
+	humantime-1.3.0
+	indexmap-1.7.0
+	io-lifetimes-0.7.3
+	itertools-0.10.3
+	lazy_static-1.4.0
+	libc-0.2.126
+	libmimalloc-sys-0.1.24
+	linux-raw-sys-0.0.46
+	log-0.4.17
+	memchr-2.5.0
+	memoffset-0.6.5
+	mimalloc-0.1.28
+	minimal-lexical-0.2.1
+	nom-7.1.1
+	num_cpus-1.13.1
+	once_cell-1.12.0
+	os_str_bytes-6.0.1
+	output_vt100-0.1.3
+	owo-colors-3.4.0
+	petgraph-0.6.1
+	pretty_assertions-1.2.1
+	pretty_env_logger-0.4.0
+	proc-macro2-1.0.39
+	quick-error-1.2.3
+	quote-1.0.18
+	radix-heap-0.4.2
+	rayon-1.5.3
+	rayon-core-1.9.3
+	regex-1.5.6
+	regex-syntax-0.6.26
+	rpds-0.10.0
+	rustc-hash-1.1.0
+	rustix-0.35.9
+	same-file-1.0.6
+	scopeguard-1.1.0
+	static_assertions-1.1.0
+	strsim-0.10.0
+	syn-1.0.95
+	term_size-0.3.2
+	termcolor-1.1.3
+	terminal_size-0.1.17
+	terminal_size-0.2.1
+	textwrap-0.15.0
+	tree-sitter-0.20.6
+	tree_magic_mini-3.0.3
+	typed-arena-2.0.1
+	unicode-ident-1.0.0
+	unicode-width-0.1.9
+	unicode-xid-0.2.3
+	version_check-0.9.4
+	walkdir-2.3.2
+	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_aarch64_msvc-0.36.1
+	windows_i686_gnu-0.36.1
+	windows_i686_msvc-0.36.1
+	windows_x86_64_gnu-0.36.1
+	windows_x86_64_msvc-0.36.1
+	wu-diff-0.1.2
+"
+
+inherit cargo
+
+DESCRIPTION="A structural diff that understands syntax."
+# Double check the homepage as the cargo_metadata crate
+# does not provide this value so instead repository is used
+HOMEPAGE="https://github.com/wilfred/difftastic"
+SRC_URI="
+	$(cargo_crate_uris ${CRATES})
+	https://github.com/Wilfred/${PN}/archive/refs/tags/${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="Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 Unlicense ZLIB"
+SLOT="0"
+KEYWORDS="~amd64"
+
+QA_FLAGS_IGNORED="usr/bin/difft"
+
+DOCS=(
+	CHANGELOG.md
+	README.md
+	manual/
+)
+
+src_prepare() {
+	rm manual/.gitignore || die
+	default
+}
+
+src_install() {
+	cargo_src_install
+	dodoc -r "${DOCS[@]}"
+}
diff --git a/dev-util/idea-community/Manifest b/dev-util/idea-community/Manifest
index a352fcc9fab8..fb24e6134e3f 100644
--- a/dev-util/idea-community/Manifest
+++ b/dev-util/idea-community/Manifest
@@ -1,3 +1 @@
 DIST idea-community-2022.2.2.tar.gz 862373757 BLAKE2B ac9c22831397f18099d42a3f4a75f7a8dcebc851e73ed08398821eb481b629cb446e8e60a14e5bcec76e72f75197e9a9ee887141e61bc0bb9953d15771bd7e0f SHA512 4ce495eed028f9d08187d1b1fb0760864511e573aee2d1ddc5502abcc494761e15a9a5227172c8d21153f8ab7107a01948d053803b98de09dcf82ead8e1cb819
-DIST ideaIC-2.1.222.3739.54.tar.gz 683283861 BLAKE2B 00c61adc4518c83197ff5c7fd125824feff2e733359114cb1a39cad6dd9e7102263a4c1a6d0d0f125e47dc86ac4bf4bd45f139718529102b9de33908de86d8b5 SHA512 e87e8b686e9e3bdf2d7f7c93e476a5cbd9460bab61872abc7b8d61139a1580a9f6b0e30e4c302e0adb3b1cd06176bc3bc13fee8ee1fe33f87606756fd8fc677e
-DIST jbr-11_0_13-linux-x64-b1751.21.tar.gz 295860296 BLAKE2B cd6edd69fa34896a388ec929d5f53ebc1f078ceebbed8d4e414a19eb91e004e8f53cbae95c2e3b191c39aa89b307bc8a1854b8a86ca2129eb3997c62705563bf SHA512 7d97e520b67197718951609370e90a1e08ef1daca1433373ff6e34fc9c6f4f005478b142190ef5dab46f14e85440f9daca5c662348bbca5207fc2f8d7892361f
diff --git a/dev-util/idea-community/idea-community-2022.2.1.222.3739.54.ebuild b/dev-util/idea-community/idea-community-2022.2.1.222.3739.54.ebuild
deleted file mode 100644
index c2c898b77b91..000000000000
--- a/dev-util/idea-community/idea-community-2022.2.1.222.3739.54.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-inherit desktop wrapper
-
-SLOT="0"
-PV_STRING="$(ver_cut 2-6)"
-MY_PV="$(ver_cut 1-3)"
-
-MY_PN="idea"
-# Using the most recent Jetbrains Runtime binaries available at the time of writing
-# ( jre 11.0.10 build 1304.4  )
-JRE11_BASE="11_0_13"
-JRE11_VER="1751.21"
-IDEA_VER="2.151348410.2082789468.1660859635-1531039212.1660859635"
-
-# distinguish settings for official stable releases and EAP-version releases
-if [[ "$(ver_cut 7)"x = "prex" ]]
-then
-	# upstream EAP
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}.tar.gz?_ga=${IDEA_VER}"
-else
-	# upstream stable
-	KEYWORDS="~amd64 ~arm64"
-	SRC_URI="https://download.jetbrains.com/idea/${MY_PN}IC-${MY_PV}-no-jbr.tar.gz?_ga=${IDEA_VER} -> ${MY_PN}IC-${PV_STRING}.tar.gz
-		amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz -> jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz )"
-fi
-
-DESCRIPTION="A complete toolset for web, mobile and enterprise development"
-HOMEPAGE="https://www.jetbrains.com/idea"
-
-LICENSE="Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1
-	codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0
-	GPL-2 GPL-2-with-classpath-exception ISC
-	JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT
-	MPL-1.0 MPL-1.1 OFL ZLIB"
-
-DEPEND="
-	|| (
-		>=dev-java/openjdk-11.0.13_p8:11
-		>=dev-java/openjdk-bin-11.0.13_p8-r1:11
-	)"
-RDEPEND="${DEPEND}
-	sys-libs/glibc
-	media-libs/harfbuzz
-	dev-java/jansi-native
-	dev-libs/libdbusmenu"
-
-BDEPEND="dev-util/patchelf"
-RESTRICT="splitdebug"
-S="${WORKDIR}/${MY_PN}-IC-$(ver_cut 4-6)"
-
-QA_PREBUILT="opt/${PN}-${MY_PV}/*"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-jdk.patch"
-)
-
-src_unpack() {
-	default_src_unpack
-	mkdir jre64 && cd jre64 && unpack jbr-${JRE11_BASE}-linux-x64-b${JRE11_VER}.tar.gz
-}
-
-src_prepare() {
-
-	default_src_prepare
-
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	PLUGIN_DIR="${S}/${JRE_DIR}/lib/"
-
-	# rm LLDBFrontEnd after licensing questions with Gentoo License Team
-	rm -vf "${S}"/plugins/Kotlin/bin/linux/LLDBFrontend
-	rm -vf ${PLUGIN_DIR}/libavplugin*
-	rm -vf "${S}"/plugins/maven/lib/maven3/lib/jansi-native/*/libjansi*
-	rm -vrf "${S}"/lib/pty4j-native/linux/ppc64le
-	rm -vf "${S}"/bin/libdbm64*
-	rm -vf "${S}"/lib/pty4j-native/linux/mips64el/libpty.so
-	rm -vf "${S}"/plugins/cwm-plugin/quiche-native/linux-aarch64/libquiche.so
-
-	if [[ -d "${S}"/"${JRE_DIR}" ]]; then
-		for file in "${PLUGIN_DIR}"/{libfxplugins.so,libjfxmedia.so}
-		do
-			if [[ -f "$file" ]]; then
-			  patchelf --set-rpath '$ORIGIN' $file || die
-			fi
-		done
-	fi
-
-	if use arm64; then
-		patchelf --replace-needed libc.so libc.so.6 "${S}"/lib/pty4j-native/linux/aarch64/libpty.so || die "Unable to patch libpty for libc"
-	else
-		rm -vf "${S}"/lib/pty4j-native/linux/{aarch64,arm,x86}/libpty.so
-	fi
-
-	sed -i \
-		-e "\$a\\\\" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$a# Disable automatic updates as these are handled through Gentoo's" \
-		-e "\$a# package manager. See bug #704494" \
-		-e "\$a#-----------------------------------------------------------------------" \
-		-e "\$aide.no.platform.update=Gentoo"  bin/idea.properties
-
-	eapply_user
-}
-
-src_install() {
-	local dir="/opt/${PN}-${MY_PV}"
-
-	insinto "${dir}"
-	doins -r *
-	fperms 755 "${dir}"/bin/{format.sh,idea.sh,inspect.sh,restart.py,fsnotifier}
-	if use amd64; then
-		JRE_DIR=jre64
-	else
-		JRE_DIR=jre
-	fi
-
-	JRE_BINARIES="jaotc java javapackager jjs jrunscript keytool pack200 rmid rmiregistry unpack200"
-	if [[ -d ${JRE_DIR} ]]; then
-		for jrebin in $JRE_BINARIES; do
-			fperms 755 "${dir}"/"${JRE_DIR}"/bin/"${jrebin}"
-		done
-	fi
-
-	make_wrapper "${PN}" "${dir}/bin/${MY_PN}.sh"
-	newicon "bin/${MY_PN}.png" "${PN}.png"
-	make_desktop_entry "${PN}" "IntelliJ Idea Community" "${PN}" "Development;IDE;"
-
-	# 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-idea-inotify-watches.conf" || die
-
-	# remove bundled harfbuzz
-	rm -f "${D}"/lib/libharfbuzz.so || die
-}
diff --git a/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild b/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild
deleted file mode 100644
index d325a89554c8..000000000000
--- a/dev-util/pkgdev/pkgdev-0.2.1-r1.ebuild
+++ /dev/null
@@ -1,65 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_IN_SOURCE_BUILD=1
-inherit distutils-r1
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/pkgcore/pkgdev.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos"
-fi
-
-DESCRIPTION="Collection of tools for Gentoo development"
-HOMEPAGE="https://github.com/pkgcore/pkgdev"
-
-LICENSE="BSD MIT"
-SLOT="0"
-
-if [[ ${PV} == *9999 ]] ; then
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/dev.txt
-	RDEPEND="
-		~dev-python/snakeoil-9999[${PYTHON_USEDEP}]
-		~dev-util/pkgcheck-9999[${PYTHON_USEDEP}]
-		~sys-apps/pkgcore-9999[${PYTHON_USEDEP}]
-	"
-else
-	# https://github.com/pkgcore/pkgdev/blob/main/requirements/install.txt
-	RDEPEND="
-		>=dev-python/snakeoil-0.9.6[${PYTHON_USEDEP}]
-		>=dev-util/pkgcheck-0.10.0[${PYTHON_USEDEP}]
-		>=sys-apps/pkgcore-0.12.0[${PYTHON_USEDEP}]
-	"
-fi
-
-# Uses pytest but we want to use the setup.py runner to get generated modules
-BDEPEND+="test? ( dev-python/pytest )"
-RDEPEND+="dev-vcs/git"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-signoff-example.patch
-)
-
-distutils_enable_sphinx doc
-distutils_enable_tests setup.py
-
-python_compile_all() {
-	# We'll generate man pages ourselves
-	# Revisit when a release is made
-	# to pregenerate them, making USE=doc
-	# for generating the real HTML docs only.
-	use doc && emake -C doc man
-
-	# HTML pages only
-	sphinx_compile_all
-}
-
-python_install_all() {
-	use doc && doman doc/_build/man/*
-	distutils-r1_python_install_all
-}
diff --git a/dev-util/seer/Manifest b/dev-util/seer/Manifest
index 83f801fad2df..760520b623bc 100644
--- a/dev-util/seer/Manifest
+++ b/dev-util/seer/Manifest
@@ -1,2 +1 @@
 DIST seer-1.10.tar.gz 367629 BLAKE2B e09ed500103428d5aee7138beb2cf8b2dafa167e2c6e3e60d0a5e26be358945af8544a9165dda835b2ec44264da4d16a3a44398000392263d690c6080cad914f SHA512 b691b433e206c78b121a48578ac632f236ca8734f9ee6c5e9c0eb3503ac11ee786595d66ef15c46e7ae5b31a58b444b7631cea2ef67389f0be7e292c7d2279ef
-DIST seer-1.9.tar.gz 337520 BLAKE2B 2c5a68cbc9a0530596501d2c92dfaccfe69f9b7fadc033efcb64b66a60a8f67e6e7bc06173bd5fd844ba104364328d30c017187143b2e1ea957b5a59fb3a7723 SHA512 e23a389d624488db445477687ea2129f8ef7364ea22229be6a79653878a73d328a3a7cde0233c951129dbc7478b0b5e3cfe37b694fe3eece030e37ad6a7ce87d
diff --git a/dev-util/seer/seer-1.9-r2.ebuild b/dev-util/seer/seer-1.9-r2.ebuild
deleted file mode 100644
index b5ad9e01cc7a..000000000000
--- a/dev-util/seer/seer-1.9-r2.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 cmake desktop xdg
-
-DESCRIPTION="A GUI frontend to gdb"
-HOMEPAGE="https://github.com/epasveer/seer"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/epasveer/seer"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/epasveer/seer/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-
-	KEYWORDS="~amd64"
-fi
-
-S="${WORKDIR}"/${P}/src
-
-LICENSE="GPL-3"
-SLOT="0"
-
-DEPEND="
-	dev-qt/qtcharts:5
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtprintsupport:5
-	dev-qt/qtwidgets:5
-"
-RDEPEND="
-	${DEPEND}
-	sys-devel/gdb
-"
-
-src_install() {
-	cmake_src_install
-
-	domenu resources/seergdb.desktop
-
-	local size
-	for size in 32 64 128 256 512 ; do
-		newicon -s ${size} resources/seergdb_${size}x${size}.png seergdb.png
-	done
-}
diff --git a/dev-util/strace/Manifest b/dev-util/strace/Manifest
index 8c888d075c97..f38d7189451c 100644
--- a/dev-util/strace/Manifest
+++ b/dev-util/strace/Manifest
@@ -1,3 +1,2 @@
 DIST strace-5.17.tar.xz 2281220 BLAKE2B 27e7dc19302c58144b0a7d8de41f717760b8e3cde4ab56892045727597bbfc894bf8f137aee476548c2d16d1e9c8005f931f31a5d2f8bfc4ce5565c2aa01f1ec SHA512 1b63cf7e6e339333b9d24fa20232409192abc815f2ebe2e336ef4acc039cd06c976b3c12e9ce993491a0e6b86c26b90ceba962f580e894b1ff5ab9863bdfcc44
-DIST strace-5.18.tar.xz 2307412 BLAKE2B 658d17d2137344550ea3c2ece54708387c3b78020dbade45a7ef04905dc9d4703fa8d44802cca5a9448d096a7210d0178d8d78caab7e504fa998d1f9a0b59c65 SHA512 99418b84a5e2049cb6fe32eed19ddcb61bbefb25220550c67d92cd7bc3d44ae5d87ac228b3e1c207166b9bfdae55c624a0f4e603004599fb7ea3143bbccc749e
 DIST strace-5.19.tar.xz 2353276 BLAKE2B 44b9a87f36e66481d8ac2107efbc389fa64c47b2ae7b1cc728241baa1c7d2d5d4d9410622763eb1247b415cad9afdd9f61552d2545388cadf5a33b568ed09af2 SHA512 1ea1c6e12d05bf145bc3c74f8d06b08dfc3eae3a5a21bfe8ab080053dc4c2da8a95be5956652ea62bb083462015a55f9bc1d1023919dcf2929a05211b7dde963
diff --git a/dev-util/strace/strace-5.18.ebuild b/dev-util/strace/strace-5.18.ebuild
deleted file mode 100644
index 8d532b61c6c1..000000000000
--- a/dev-util/strace/strace-5.18.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools 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
-
-	eautoreconf
-
-	if [[ ! -e configure ]] ; then
-		# git generation
-		sed /autoreconf/d -i bootstrap || die
-		./bootstrap || die
-		eautoreconf
-		[[ ! -e CREDITS ]] && cp CREDITS{.in,}
-	fi
-
-	# 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-util/uglifyjs/Manifest b/dev-util/uglifyjs/Manifest
index 3f17193adc61..1d9c68f00fcf 100644
--- a/dev-util/uglifyjs/Manifest
+++ b/dev-util/uglifyjs/Manifest
@@ -1,3 +1,3 @@
 DIST uglifyjs-3.16.1.tar.gz 519333 BLAKE2B 6e4978aa776256be575ea91fd6cd584fe8885886300db1b77cc889af5112615175cd40d527ac6356d653e60ab3ed404670355f80e0391da538313b494bb1104b SHA512 e0ef3e2b82cb6f211120b1d66132b5b5b13bc48dd946d7e7bbeddd1bee16330c9a3541d07f51b6eddf9036b0e520a527849ddc3cf6de467331b42f1fba37e66e
-DIST uglifyjs-3.16.3.tar.gz 527549 BLAKE2B 9fa89b62d2b38a543c07d5e02c8e07228eadbf1d577e96491961af1e5bbead5e8268536cf3e2c64b5a6274d7badb22ea926b87e9faddc9ed8b1d83642b69267d SHA512 173eacc7914fd4dba2671018760f0c1fb7c9d695c199003b80cdaa6ef8bda303efe647c0abbc3a7a95156512a6d2b99058340cc70a124758683d5c3829fed3bc
 DIST uglifyjs-3.17.0.tar.gz 531823 BLAKE2B 5163b392a22431a5f622fccfbb2eaa005eb4c42650446bc55c94ddf564b4c629ecad4a62ed6499f7aaab2ebe05b08ab0de7b56a18db74cb284497ea661edcace SHA512 0af47bfa5f10432edb8eb5245ef194ce73db49e3e35db094c8faa8cb7a22bf89e5b9b8933b2f23113a02537f61e4e3dd3a4eeb22bf65602ee50ff78cf28bfdf9
+DIST uglifyjs-3.17.1.tar.gz 535821 BLAKE2B 43a09eff7073b00d45aef714c22bfd291dba22a0074c16d04bbd06a51bd99b480e5d8d8ac3afd187a65f895fcda2af855cd338dabeaf4cee0b8c048307fcf6c2 SHA512 87ae4b99acbdefb3ca99b653bfe321920e8910da50a2ee094b360bd411b2412a5d64afc1730f89d1afdfa30f4c28cb7830dcb4f9e8a14a64174a384efd4c88d4
diff --git a/dev-util/uglifyjs/uglifyjs-3.16.3.ebuild b/dev-util/uglifyjs/uglifyjs-3.17.1.ebuild
similarity index 100%
rename from dev-util/uglifyjs/uglifyjs-3.16.3.ebuild
rename to dev-util/uglifyjs/uglifyjs-3.17.1.ebuild
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 9472d4fdfbc8..773ed9bc8ded 100644
Binary files a/games-action/Manifest.gz and b/games-action/Manifest.gz differ
diff --git a/games-action/beathazardultra/beathazardultra-20130308-r2.ebuild b/games-action/beathazardultra/beathazardultra-20130308-r2.ebuild
index 0e9ccb93a7b9..ebc38cdf81e3 100644
--- a/games-action/beathazardultra/beathazardultra-20130308-r2.ebuild
+++ b/games-action/beathazardultra/beathazardultra-20130308-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # TODO: unbundle allegro[gtk...] (no multilib on amd64 and 5.0.9 soname)
@@ -9,7 +9,7 @@ inherit desktop unpacker wrapper
 
 DESCRIPTION="Intense music-driven arcade shooter powered by your music"
 HOMEPAGE="http://www.coldbeamgames.com/"
-SRC_URI="beathazard-installer_03-08-13"
+SRC_URI="beathazard-installer_${PV:4:2}-${PV:6:2}-${PV:2:2}"
 S="${WORKDIR}"/data
 
 LICENSE="all-rights-reserved"
diff --git a/games-action/minetest/Manifest b/games-action/minetest/Manifest
index c35862e90e11..d0e808804a78 100644
--- a/games-action/minetest/Manifest
+++ b/games-action/minetest/Manifest
@@ -1 +1,2 @@
 DIST minetest-5.6.0.tar.gz 9922682 BLAKE2B 10787b9bbc397d3d214b22640a830fc429bd8292541e0b71b50d05d483f87469cedf03fcf7a898bd83486c55911439a9804eab2bca58cd464a69adaa76b4f820 SHA512 e87c4036f17a61d3e623b2f48e3611ba1bc0177b5d58330fe6e64a74075c78ab7cd5eb7b855097ce98819112a54857324237f7d3b81ec504a1f608444e74a630
+DIST minetest-5.6.1.tar.gz 9924663 BLAKE2B 509b8073a4e82ecff008f692ebdd7a8f35ff5222ba1095937d24870404cca848b80891887837e03d86c117568f9bbee1f92fb958640e06107230673e79d7f813 SHA512 15d2ce3b1150f077ff933a04f0ba8e02c71ee60a0edb636d1511d4e90244a34a14d7e5c4b47bee4de96cd179249a5a6963d7a092084f46c0fa54c9ff431a5265
diff --git a/games-action/minetest/minetest-5.6.1.ebuild b/games-action/minetest/minetest-5.6.1.ebuild
new file mode 100644
index 000000000000..12b9726f46c3
--- /dev/null
+++ b/games-action/minetest/minetest-5.6.1.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_BUILD_TYPE="Release"
+LUA_COMPAT=( lua5-1 luajit )
+
+inherit cmake flag-o-matic lua-single systemd xdg
+
+DESCRIPTION="A free open-source voxel game engine with easy modding and game creation"
+HOMEPAGE="https://www.minetest.net"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+IUSE="+client +curl doc leveldb ncurses nls postgres prometheus redis +server +sound spatial test"
+
+REQUIRED_USE="${LUA_REQUIRED_USE}
+	|| ( client server )"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="${LUA_DEPS}
+	$(lua_gen_impl_dep 'deprecated' lua5-1)
+	app-arch/zstd
+	dev-db/sqlite:3
+	dev-libs/gmp:0=
+	dev-libs/jsoncpp:=
+	sys-libs/zlib
+	client? (
+		>=dev-games/irrlicht-mt-1.9.0.8
+		media-libs/freetype:2
+		media-libs/libpng:0=
+		media-libs/libjpeg-turbo
+		virtual/opengl
+		x11-libs/libX11
+		x11-libs/libXxf86vm
+		sound? (
+			media-libs/libvorbis
+			media-libs/openal
+		)
+	)
+	curl? ( net-misc/curl )
+	leveldb? ( dev-libs/leveldb:= )
+	ncurses? ( sys-libs/ncurses:0= )
+	nls? ( virtual/libintl )
+	postgres? ( >=dev-db/postgresql-9.5:= )
+	prometheus? ( dev-cpp/prometheus-cpp )
+	redis? ( dev-libs/hiredis:= )
+	server? (
+		acct-group/minetest
+		acct-user/minetest
+		>=dev-games/irrlicht-mt-headers-1.9.0.8
+	)
+	spatial? ( sci-libs/libspatialindex:= )"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	doc? (
+		app-doc/doxygen
+		media-gfx/graphviz
+	)
+	nls? ( sys-devel/gettext )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-5.4.1-system_puc_lua.patch
+	"${FILESDIR}"/${PN}-5.6.0-no_upstream_optflags.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+
+	# remove bundled libraries other than bitop
+	rm -rf lib/{gmp,jsoncpp,lua} || die
+
+	# To avoid TEXTRELs on riscv
+	append-flags -fPIC
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_CLIENT=$(usex client)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_UNITTESTS=$(usex test)
+		-DCUSTOM_BINDIR="${EPREFIX}/usr/bin"
+		-DCUSTOM_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_EXAMPLE_CONF_DIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DCUSTOM_LOCALEDIR="${EPREFIX}/usr/share/${PN}/locale"
+		-DCUSTOM_MANDIR="${EPREFIX}/usr/share/man"
+		-DCUSTOM_SHAREDIR="${EPREFIX}/usr/share/${PN}"
+		-DENABLE_CURL=$(usex curl)
+		-DENABLE_CURSES=$(usex ncurses)
+		-DENABLE_GETTEXT=$(usex nls)
+		-DENABLE_GLES=no
+		-DENABLE_LEVELDB=$(usex leveldb)
+		-DENABLE_LUAJIT=$(usex lua_single_target_luajit)
+		-DENABLE_POSTGRESQL=$(usex postgres)
+		-DENABLE_PROMETHEUS=$(usex prometheus)
+		-DENABLE_REDIS=$(usex redis)
+		-DENABLE_SPATIAL=$(usex spatial)
+		-DENABLE_SOUND=$(usex sound)
+		-DENABLE_SYSTEM_GMP=1
+		-DENABLE_SYSTEM_JSONCPP=1
+		-DRUN_IN_PLACE=0
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use doc; then
+		cmake_src_compile doc
+		HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		keepdir /etc/minetest
+		fowners root:minetest /etc/minetest
+		fperms 2750 /etc/minetest
+
+		keepdir /var/log/minetest
+		fowners minetest:minetest /var/log/minetest
+
+		newconfd "${FILESDIR}"/minetestserver.confd minetest-server
+		newinitd "${FILESDIR}"/minetestserver.initd minetest-server
+
+		systemd_newunit "${FILESDIR}"/minetestserver_default.service minetest-server.service
+		systemd_newunit "${FILESDIR}"/minetestserver_template.service minetest-server@.service
+
+		insinto /etc/logrotate.d
+		newins "${FILESDIR}"/minetestserver.logrotate minetest-server
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+}
diff --git a/games-action/polymc/Manifest b/games-action/polymc/Manifest
index ec41e2572d21..a1bac66848dd 100644
--- a/games-action/polymc/Manifest
+++ b/games-action/polymc/Manifest
@@ -1,2 +1 @@
-DIST polymc-1.4.1.tar.gz 5771113 BLAKE2B d55907770d913c814015c4337c0442cb3fdaf92815f3e2f1f496b7869b6da8ee2295260efc3df67e7407ee27d300c4e89900603281e69163c07df216193c05d9 SHA512 170d03b61d3e9edbe1a0b27812e52fb90963d09769327f2d95eab6c4b7c88291136f47a44b7c206808fcc2e0e9ddf4aeb3a3f267ccbdc6b70b44d91c4642bf75
 DIST polymc-1.4.2.tar.gz 5766773 BLAKE2B 0d40f2b1fc6df28089d874a2de949b24a719936b0961fa08a0e909a82931b411926464328ada8ec05c148ba39e405ff9f4d336fc4ade316725756e235231eb60 SHA512 6212752a176e0d3414f66b013b46adc500c5d9e7fa250646aaf9b6bd42b9cbaa7c23282c7da6105e37d6ae77f790cd0036ad4e07b8aa50b611d41045035bc533
diff --git a/games-action/polymc/metadata.xml b/games-action/polymc/metadata.xml
index f704149126f6..7ba4aabb75f4 100644
--- a/games-action/polymc/metadata.xml
+++ b/games-action/polymc/metadata.xml
@@ -25,5 +25,6 @@
   <longdescription>PolyMC is a multi-instance Minecraft launcher focused on user freedom, redistributability, and simplicity.</longdescription>
   <use>
     <flag name="lto">Enable link-time optimization</flag>
+    <flag name="qt6">Build with Qt6 support instead of the default Qt5</flag>
   </use>
 </pkgmetadata>
diff --git a/games-action/polymc/polymc-1.4.1-r2.ebuild b/games-action/polymc/polymc-1.4.1-r2.ebuild
deleted file mode 100644
index 826e2e11a7aa..000000000000
--- a/games-action/polymc/polymc-1.4.1-r2.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake java-pkg-2 optfeature xdg
-
-HOMEPAGE="https://polymc.org/ https://github.com/PolyMC/PolyMC"
-DESCRIPTION="A custom, open source Minecraft launcher"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-
-	EGIT_REPO_URI="
-		https://github.com/PolyMC/PolyMC
-		https://github.com/PolyMC/libnbtplusplus
-	"
-
-	EGIT_SUBMODULES=( 'depends/libnbtplusplus' )
-else
-	MY_PN="PolyMC"
-
-	# Let's use the vendored tarball to avoid dealing with the submodules directly
-	SRC_URI="
-		https://github.com/PolyMC/PolyMC/releases/download/${PV}/${MY_PN}-${PV}.tar.gz -> ${P}.tar.gz
-	"
-
-	# The PolyMC's files are unpacked to ${WORKDIR}/PolyMC-${PV}
-	S="${WORKDIR}/${MY_PN}-${PV}"
-
-	KEYWORDS="~amd64"
-fi
-
-# Apache-2.0 for MultiMC (PolyMC is forked from it)
-# GPL-3 for PolyMC
-# LGPL-3 for libnbtplusplus
-# See the rest of PolyMC's libraries at https://github.com/PolyMC/PolyMC/tree/develop/libraries
-LICENSE="Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT"
-
-SLOT="0"
-
-IUSE="debug lto test"
-REQUIRED_USE="
-	lto? ( !debug )
-"
-
-RESTRICT="!test? ( test )"
-
-MIN_QT="5.12.0"
-QT_SLOT=5
-
-QT_DEPS="
-	>=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qtcore-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qtgui-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qttest-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qtxml-${MIN_QT}:${QT_SLOT}
-"
-
-# Required at both build-time and run-time
-COMMON_DEPENDS="
-	${QT_DEPS}
-	>=dev-libs/quazip-1.3:=[qt5(+)]
-	sys-libs/zlib
-"
-
-BDEPEND="
-	app-text/scdoc
-	kde-frameworks/extra-cmake-modules:5
-"
-
-DEPEND="
-	${COMMON_DEPENDS}
-	media-libs/libglvnd
-	>=virtual/jdk-1.8.0:*
-"
-
-# At run-time we don't depend on JDK, only JRE
-# And we need more than just the GL headers
-RDEPEND="
-	${COMMON_DEPENDS}
-	>=virtual/jre-1.8.0:*
-	virtual/opengl
-"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-include_QDebug.patch
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Prevent conflicting with the user's flags
-	# See https://bugs.gentoo.org/848765 for more info
-	sed -i -e 's/-Werror//' -e 's/-D_FORTIFY_SOURCE=2//' CMakeLists.txt || die 'Failed to remove -Werror and -D_FORTIFY_SOURCE via sed'
-}
-
-src_configure(){
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="/usr"
-		# Resulting binary is named polymc
-		-DLauncher_APP_BINARY_NAME="${PN}"
-		# Force Qt5 to avoid accidentaly building the Qt6 version and breaking things
-		-DLauncher_QT_VERSION_MAJOR=${QT_SLOT}
-
-		-DENABLE_LTO=$(usex lto)
-		-DBUILD_TESTING=$(usex test)
-	)
-
-	if use debug; then
-		CMAKE_BUILD_TYPE=Debug
-	else
-		CMAKE_BUILD_TYPE=Release
-	fi
-
-	cmake_src_configure
-}
-
-src_compile(){
-	cmake_src_compile
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# https://github.com/PolyMC/PolyMC/issues/227
-	optfeature "old Minecraft (<= 1.12.2) support" x11-apps/xrandr
-
-	optfeature "built-in MangoHud support" games-util/mangohud
-	optfeature "built-in Feral Gamemode support" games-util/gamemode
-}
diff --git a/games-action/polymc/polymc-1.4.2-r1.ebuild b/games-action/polymc/polymc-1.4.2-r2.ebuild
similarity index 98%
rename from games-action/polymc/polymc-1.4.2-r1.ebuild
rename to games-action/polymc/polymc-1.4.2-r2.ebuild
index 0f99fa720844..cfd8180bf564 100644
--- a/games-action/polymc/polymc-1.4.2-r1.ebuild
+++ b/games-action/polymc/polymc-1.4.2-r2.ebuild
@@ -81,6 +81,9 @@ DEPEND="
 # And we need more than just the GL headers
 RDEPEND="
 	${COMMON_DEPENDS}
+
+	>=dev-qt/qtsvg-${MIN_QT}:${QT_SLOT}
+
 	>=virtual/jre-1.8.0:*
 	virtual/opengl
 "
diff --git a/games-action/polymc/polymc-9999.ebuild b/games-action/polymc/polymc-9999.ebuild
index 0f99fa720844..5f9c909ad33a 100644
--- a/games-action/polymc/polymc-9999.ebuild
+++ b/games-action/polymc/polymc-9999.ebuild
@@ -39,30 +39,40 @@ LICENSE="Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+ MIT"
 
 SLOT="0"
 
-IUSE="debug lto test"
+IUSE="debug lto qt6 test"
 REQUIRED_USE="
 	lto? ( !debug )
 "
 
 RESTRICT="!test? ( test )"
 
-MIN_QT="5.12.0"
-QT_SLOT=5
+MIN_QT_5_VERSION="5.12.0"
+MIN_QT_6_VERSION="6.0.0"
 
 QT_DEPS="
-	>=dev-qt/qtconcurrent-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qtcore-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qtgui-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qtnetwork-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qttest-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qtwidgets-${MIN_QT}:${QT_SLOT}
-	>=dev-qt/qtxml-${MIN_QT}:${QT_SLOT}
+	!qt6? (
+		>=dev-qt/qtconcurrent-${MIN_QT_5_VERSION}:5
+		>=dev-qt/qtcore-${MIN_QT_5_VERSION}:5
+		>=dev-qt/qtgui-${MIN_QT_5_VERSION}:5
+		>=dev-qt/qtnetwork-${MIN_QT_5_VERSION}:5
+		>=dev-qt/qttest-${MIN_QT_5_VERSION}:5
+		>=dev-qt/qtwidgets-${MIN_QT_5_VERSION}:5
+		>=dev-qt/qtxml-${MIN_QT_5_VERSION}:5
+	)
+
+	qt6? (
+		>=dev-qt/qtbase-${MIN_QT_6_VERSION}:6[concurrent,gui,network,widgets,xml(+)]
+		>=dev-qt/qt5compat-${MIN_QT_6_VERSION}:6
+	)
 "
 
 # Required at both build-time and run-time
 COMMON_DEPENDS="
 	${QT_DEPS}
-	>=dev-libs/quazip-1.3:=[qt5(+)]
+
+	!qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] )
+	 qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] )
+
 	sys-libs/zlib
 "
 
@@ -81,6 +91,10 @@ DEPEND="
 # And we need more than just the GL headers
 RDEPEND="
 	${COMMON_DEPENDS}
+
+	!qt6? ( >=dev-qt/qtsvg-${MIN_QT_5_VERSION}:5 )
+	 qt6? ( >=dev-qt/qtsvg-${MIN_QT_6_VERSION}:6 )
+
 	>=virtual/jre-1.8.0:*
 	virtual/opengl
 "
@@ -102,8 +116,7 @@ src_configure(){
 		-DCMAKE_INSTALL_PREFIX="/usr"
 		# Resulting binary is named polymc
 		-DLauncher_APP_BINARY_NAME="${PN}"
-		# Force Qt5 to avoid accidentaly building the Qt6 version and breaking things
-		-DLauncher_QT_VERSION_MAJOR=${QT_SLOT}
+		-DLauncher_QT_VERSION_MAJOR=$(usex qt6 6 5)
 
 		-DENABLE_LTO=$(usex lto)
 		-DBUILD_TESTING=$(usex test)
diff --git a/games-arcade/Manifest.gz b/games-arcade/Manifest.gz
index 1d03135845b2..088191a06705 100644
Binary files a/games-arcade/Manifest.gz and b/games-arcade/Manifest.gz differ
diff --git a/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild b/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild
index c07c88732b43..1ff2a004605f 100644
--- a/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild
+++ b/games-arcade/holotz-castle/holotz-castle-1.3.14-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ inherit desktop toolchain-funcs
 
 DESCRIPTION="2D platform game"
 HOMEPAGE="https://wiki.gentoo.org/wiki/No_homepage"
-SRC_URI="https://dev.gentoo.org/~chewi/distfiles/holotz-castle-1.3.14-src.tar.gz"
+SRC_URI="https://dev.gentoo.org/~chewi/distfiles/${P}-src.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 55331a451543..2a9867437cec 100644
Binary files a/games-emulation/Manifest.gz and b/games-emulation/Manifest.gz differ
diff --git a/games-emulation/pcsx2/Manifest b/games-emulation/pcsx2/Manifest
index bb30d90e594a..3a8dfeb3dde4 100644
--- a/games-emulation/pcsx2/Manifest
+++ b/games-emulation/pcsx2/Manifest
@@ -1 +1,4 @@
 DIST pcsx2-1.6.0.tar.gz 17963332 BLAKE2B d1370fd089e1f8716a3365b9f499fef9418c4a9464e701cf0dbac8296cf59a2c6fc9b85ed680c514d8128da7b5c47aa8a067d48cac9eb0482ef2ba5f9234e60e SHA512 0a3e01a25384719fc72b636a1e9cf1cd966d0c978c1c3adfb46d6b3f76f43a25f90ef63d27a1d8092cdf444c5dc7560ce807ca81908d11ade9715e7eaaad6253
+DIST pcsx2-1.7.3329.tar.gz 19379924 BLAKE2B ec1313d97ab9f8bb5c735e73a3174071ccbd8499857835145dcd057f96cf51b60f3677a64c155916e5b6d33960d3e0d8c300714b6149ce4326e747e672c97406 SHA512 cfdd129c93e04f3ddc0a685483683cf5d4c239f9e7a059fd838ebe6cc8c2f3f819c26f45a8fe2a256030fdbd6273599d6e95813980eafbd301dac27689c2182a
+DIST pcsx2-glslang-c9706bdda0.tar.gz 3433325 BLAKE2B f2449a6c8b05e47367164d09036ae2302f0f28ec83c2e2f401426f52fbd4edf55f717f01eea2cbfe7554e1004b89ffdebc34ec21a95809fcbc719f69e65e8487 SHA512 5ff0902e95592525b2671788bf27717c85d0876b31e96374eff5128f9bf7caf93bb636e4d5e1916a5d641715a780172308403bd49305d9a07cf66358d7e6407c
+DIST pcsx2-vulkan-headers-9f4c61a314.tar.gz 1554220 BLAKE2B 7f7fa093e8af30919dd743768e6d882fa40800fecedf1183a45568dbb81207ffdf9eed1beadba98160c61bac89a24182794a601a2dce0c91cf54e16d0080cb69 SHA512 8b5fa5bcf6bd8ae5fb44000e4b842d86c014e9d8dae9bff988f86ec359fc27db3f71dc96253ceb2f31da4db41a6585034bb185f68da5446e91293bb0c2bbf993
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-clang16.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-clang16.patch
new file mode 100644
index 000000000000..331101ed6a1c
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-clang16.patch
@@ -0,0 +1,19 @@
+https://bugs.gentoo.org/870412
+--- a/3rdparty/cpuinfo/src/api.c
++++ b/3rdparty/cpuinfo/src/api.c
+@@ -78 +78 @@
+-const struct cpuinfo_uarch_info* cpuinfo_get_uarchs() {
++const struct cpuinfo_uarch_info* cpuinfo_get_uarchs(void) {
+--- a/cmake/FindPCAP.cmake
++++ b/cmake/FindPCAP.cmake
+@@ -47 +47 @@
+-check_c_source_compiles("int main() { return 0; }" PCAP_LINKS_SOLO)
++check_c_source_compiles("int main(void) { return 0; }" PCAP_LINKS_SOLO)
+@@ -55 +55 @@
+-		check_c_source_compiles("int main() { return 0; }" PCAP_NEEDS_THREADS)
++		check_c_source_compiles("int main(void) { return 0; }" PCAP_NEEDS_THREADS)
+--- a/tests/ctest/CMakeLists.txt
++++ b/tests/ctest/CMakeLists.txt
+@@ -20 +20 @@
+-	int main() {
++	int main(void) {
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch
new file mode 100644
index 000000000000..1047105d646a
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-lto.patch
@@ -0,0 +1,21 @@
+Lazy fix for -Werror=odr and don't rely on the CMAKE macro to
+pass -fno-lto to the problematic FastJmp.cpp source with lto.
+--- a/common/CMakeLists.txt
++++ b/common/CMakeLists.txt
+@@ -268,3 +268,3 @@
+ 
+-if (USE_GCC AND CMAKE_INTERPROCEDURAL_OPTIMIZATION)
++if (USE_GCC)
+ 	# GCC LTO doesn't work with asm statements
+--- a/pcsx2/PAD/Linux/Device.h
++++ b/pcsx2/PAD/Linux/Device.h
+@@ -31,3 +31,3 @@
+ 
+-enum DeviceType
++enum PADDeviceType
+ {
+@@ -101,3 +101,3 @@
+ 	DeviceAPI api;
+-	DeviceType type;
++	PADDeviceType type;
+ 
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch
new file mode 100644
index 000000000000..95d2ff38a8c2
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-musl.patch
@@ -0,0 +1,9 @@
+--- a/pcsx2/USB/qemu-usb/iov.h
++++ b/pcsx2/USB/qemu-usb/iov.h
+@@ -17,5 +17,5 @@
+ #define IOV_H
+ 
+-#if !defined(_BITS_UIO_H) && !defined(__iovec_defined) /* /usr/include/bits/uio.h */
++#if !defined(_BITS_UIO_H) && !defined(__iovec_defined) && !defined(__DEFINED_struct_iovec)
+ struct iovec
+ {
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch
new file mode 100644
index 000000000000..9ef82985dc99
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-qt6.patch
@@ -0,0 +1,10 @@
+https://github.com/PCSX2/pcsx2/commit/6386be09c2e disabled PACKAGE_MODE
+for reasons that make no sense as far as installing from an ebuild goes.
+
+Skip the error and handle the rest from the ebuild.
+--- a/pcsx2-qt/CMakeLists.txt
++++ b/pcsx2-qt/CMakeLists.txt
+@@ -7,3 +7,2 @@
+ if (PACKAGE_MODE)
+-	message(FATAL_ERROR "Package mode is not supported for Qt builds.")
+ else()
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch
new file mode 100644
index 000000000000..450329522183
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-unbundle.patch
@@ -0,0 +1,41 @@
+Adjust to unbundle a few extras.
+
+zstd changes only needed because of https://bugs.gentoo.org/872254
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -54,3 +54,4 @@
+ 	set(gtest_force_shared_crt ON CACHE BOOL "" FORCE)
+-	add_subdirectory(3rdparty/gtest EXCLUDE_FROM_ALL)
++	find_package(GTest REQUIRED)
++	alias_library(gtest_main GTest::gtest_main)
+ 	add_subdirectory(tests/ctest)
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -177,3 +177,3 @@
+ set(ACTUALLY_ENABLE_TESTS ${ENABLE_TESTS})
+-if(ENABLE_TESTS)
++if(0)
+ 	if(NOT EXISTS "${CMAKE_SOURCE_DIR}/3rdparty/gtest/CMakeLists.txt")
+@@ -210,7 +210,4 @@
+ find_optional_system_library(ryml 3rdparty/rapidyaml/rapidyaml 0.4.0)
+-find_optional_system_library(zstd 3rdparty/zstd 1.4.5)
+-if (${zstd_TYPE} STREQUAL System)
+-	alias_library(Zstd::Zstd zstd::libzstd_shared)
+-	alias_library(pcsx2-zstd zstd::libzstd_shared)
+-endif()
++pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)
++alias_library(Zstd::Zstd PkgConfig::zstd)
+ find_optional_system_library(libzip 3rdparty/libzip 1.8.0)
+@@ -243,3 +240,4 @@
+ add_subdirectory(3rdparty/lzma EXCLUDE_FROM_ALL)
+-add_subdirectory(3rdparty/libchdr EXCLUDE_FROM_ALL)
++pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)
++alias_library(chdr-static PkgConfig::chdr)
+ 
+@@ -269,5 +267,3 @@
+ if(CUBEB_API)
+-	add_subdirectory(3rdparty/cubeb EXCLUDE_FROM_ALL)
+-	target_compile_options(cubeb PRIVATE "-w")
+-	target_compile_options(speex PRIVATE "-w")
++	find_package(cubeb REQUIRED)
+ endif()
diff --git a/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch b/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch
new file mode 100644
index 000000000000..d00f9553993d
--- /dev/null
+++ b/games-emulation/pcsx2/files/pcsx2-1.7.3329-wx-vs-sdl.patch
@@ -0,0 +1,9 @@
+This check is unnecessary, bit dodgy (ldd+grep), and requires -DSDL2_API=1
+/only/ if wxGTK was built with USE=sdl or else get a cmake unused options
+warning. Test code also fails with -Werror=strict-prototypes (clang16).
+--- a/cmake/SearchForStuff.cmake
++++ b/cmake/SearchForStuff.cmake
+@@ -191,3 +191,2 @@
+ if(NOT PCSX2_CORE)
+-	WX_vs_SDL()
+ endif()
diff --git a/games-emulation/pcsx2/metadata.xml b/games-emulation/pcsx2/metadata.xml
index 0d8f2efac4cd..40c13d5f12ff 100644
--- a/games-emulation/pcsx2/metadata.xml
+++ b/games-emulation/pcsx2/metadata.xml
@@ -13,6 +13,10 @@
 		<email>games@gentoo.org</email>
 		<name>Gentoo Games Project</name>
 	</maintainer>
+	<use>
+		<flag name="qt6">Add support for the Qt 6 application and UI framework</flag>
+		<flag name="vulkan">Enable support for Vulkan</flag>
+	</use>
 	<upstream>
 		<bugs-to>https://github.com/PCSX2/pcsx2/issues</bugs-to>
 		<remote-id type="github">PCSX2/pcsx2</remote-id>
diff --git a/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
new file mode 100644
index 000000000000..b5e09ffc395f
--- /dev/null
+++ b/games-emulation/pcsx2/pcsx2-1.7.3329.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+WX_GTK_VER="3.0-gtk3"
+inherit cmake fcaps flag-o-matic wxwidgets
+
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+	HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+	SRC_URI="
+		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		vulkan? (
+			https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+			https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
+		)"
+	KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
+HOMEPAGE="https://pcsx2.net/"
+
+LICENSE="
+	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 GPL-2+ LGPL-2.1+
+	LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
+SLOT="0"
+IUSE="cpu_flags_x86_sse4_1 pulseaudio qt6 test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	app-arch/xz-utils
+	app-arch/zstd:=
+	dev-cpp/rapidyaml:=
+	dev-libs/libaio
+	dev-libs/libchdr
+	>=dev-libs/libfmt-7.1.3:=
+	dev-libs/libzip:=[zstd]
+	media-libs/cubeb
+	media-libs/harfbuzz
+	media-libs/libglvnd
+	media-libs/libpng:=
+	media-libs/libsamplerate
+	>=media-libs/libsdl2-2.0.22[haptic,joystick]
+	media-libs/libsoundtouch:=
+	net-libs/libpcap
+	sys-libs/zlib:=
+	virtual/libudev:=
+	x11-libs/libX11
+	x11-libs/libXrandr
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets]
+		dev-qt/qtsvg:6
+		net-misc/curl
+	)
+	!qt6? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[wayland?]
+		x11-libs/wxGTK:${WX_GTK_VER}[X]
+		pulseaudio? ( media-libs/libpulse )
+	)
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+	test? ( dev-cpp/gtest )"
+BDEPEND="
+	dev-lang/perl
+	qt6? ( dev-qt/qttools[linguist] )
+	!qt6? ( sys-devel/gettext )"
+
+FILECAPS=(
+	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.7.0-crcs.patch
+	"${FILESDIR}"/${PN}-1.7.3329-clang16.patch
+	"${FILESDIR}"/${PN}-1.7.3329-lto.patch
+	"${FILESDIR}"/${PN}-1.7.3329-musl.patch
+	"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
+	"${FILESDIR}"/${PN}-1.7.3329-unbundle.patch
+	"${FILESDIR}"/${PN}-1.7.3329-wx-vs-sdl.patch
+)
+
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		local EGIT_SUBMODULES=()
+		if use vulkan; then
+			EGIT_SUBMODULES+=(
+				3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h
+				3rdparty/vulkan-headers # to keep in sync with glslang
+			)
+		fi
+		git-r3_src_unpack
+	else
+		default
+		if use vulkan; then
+			rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
+			mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
+			mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die
+		fi
+	fi
+}
+
+src_prepare() {
+	cmake_src_prepare
+
+	# qt6 build doesn't support PACKAGE_MODE and need to set resources location
+	sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/PCSX2\";|" \
+		-i pcsx2/Frontend/CommonHost.cpp || die
+
+	# pulseaudio is only used for usb-mic and without qt6, not for audio output
+	{ use pulseaudio && use !qt6; } || :> cmake/FindPulseAudio.cmake || die
+
+	# GS tests currently fail to build with qt6
+	use !qt6 || sed -i '/add_subdirectory(GS)/d' tests/ctest/CMakeLists.txt || die
+
+	if [[ ${PV} != 9999 ]]; then
+		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+			-i cmake/Pcsx2Utils.cmake || die
+
+		# delete all 3rdparty/* except known-used ones in non-live
+		local keep=(
+			cpuinfo glad imgui include jpgd lzma simpleini xbyak
+			$(usev vulkan 'glslang vulkan-headers')
+		)
+		find 3rdparty -mindepth 1 -maxdepth 1 -type d \
+			-not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die
+	fi
+}
+
+src_configure() {
+	use qt6 || setup-wxwidgets
+
+	# for bundled glslang (bug #858374)
+	use vulkan && append-flags -fno-strict-aliasing
+
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_BUILD_DATE=yes
+		-DDISABLE_PCSX2_WRAPPER=yes
+		-DDISABLE_SETCAP=yes
+		-DENABLE_TESTS=$(usex test)
+		-DPACKAGE_MODE=yes
+		-DQT_BUILD=$(usex qt6)
+		-DUSE_SYSTEM_LIBS=yes
+		-DUSE_VTUNE=no
+		-DUSE_VULKAN=$(usex vulkan)
+		-DWAYLAND_API=$(usex wayland)
+		-DXDG_STD=yes
+
+		# sse4.1 is the bare minimum required, -m is required at build time
+		# (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp)
+		# https://github.com/PCSX2/pcsx2/pull/4329
+		-DARCH_FLAG=-msse4.1
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	cmake_build unittests
+}
+
+src_install() {
+	cmake_src_install
+
+	use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	local replacing_old
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1
+	then
+		replacing_old=
+		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case"
+		elog "it is recommended to backup your save states and memory cards before use."
+		elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'."
+	fi
+
+	if [[ ${PV} != 9999 && ( ! ${REPLACING_VERSIONS} || -v replacing_old ) ]]; then
+		[[ -v replacing_old ]] && elog
+		elog "${PN}-1.7.x is a development branch using a nightly release model"
+		elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting old and lacks"
+		elog "many notable features (e.g. native 64bit builds). Given it may be a long"
+		elog "time before there is a new stable, Gentoo will carry and update 1.7.x"
+		elog "roughly every months."
+		elog
+		elog "Please report an issue if feel a picked nightly release needs to be"
+		elog "updated ahead of time or masked (notably for handling regressions)."
+	fi
+}
diff --git a/games-emulation/pcsx2/pcsx2-9999.ebuild b/games-emulation/pcsx2/pcsx2-9999.ebuild
index 00afde986d44..b5e09ffc395f 100644
--- a/games-emulation/pcsx2/pcsx2-9999.ebuild
+++ b/games-emulation/pcsx2/pcsx2-9999.ebuild
@@ -1,108 +1,202 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 WX_GTK_VER="3.0-gtk3"
-inherit cmake fcaps git-r3 toolchain-funcs wxwidgets
+inherit cmake fcaps flag-o-matic wxwidgets
 
-DESCRIPTION="A PlayStation 2 emulator"
+if [[ ${PV} == 9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/PCSX2/pcsx2.git"
+else
+	HASH_GLSLANG=c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5
+	HASH_VULKAN=9f4c61a31435a7a90a314fc68aeb386c92a09c0f
+	SRC_URI="
+		https://github.com/PCSX2/pcsx2/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz
+		vulkan? (
+			https://github.com/KhronosGroup/glslang/archive/${HASH_GLSLANG}.tar.gz -> ${PN}-glslang-${HASH_GLSLANG::10}.tar.gz
+			https://github.com/KhronosGroup/Vulkan-Headers/archive/${HASH_VULKAN}.tar.gz -> ${PN}-vulkan-headers-${HASH_VULKAN::10}.tar.gz
+		)"
+	KEYWORDS="-* ~amd64"
+fi
+
+DESCRIPTION="PlayStation 2 emulator"
 HOMEPAGE="https://pcsx2.net/"
-EGIT_REPO_URI="https://github.com/PCSX2/${PN}.git"
-EGIT_SUBMODULES=(
-	3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h
-	3rdparty/imgui/imgui # not made to be system-wide
-	3rdparty/vulkan-headers # to keep in sync with glslang
-)
 
-LICENSE="GPL-3 Apache-2.0 OFL-1.1" # TODO: needs review for a full list
+LICENSE="
+	GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 GPL-2+ LGPL-2.1+
+	LGPL-3+ MIT OFL-1.1 ZLIB public-domain"
 SLOT="0"
-KEYWORDS=""
-IUSE="pulseaudio test"
-
+IUSE="cpu_flags_x86_sse4_1 pulseaudio qt6 test vulkan wayland"
+REQUIRED_USE="cpu_flags_x86_sse4_1" # dies at runtime if no support
 RESTRICT="!test? ( test )"
 
 RDEPEND="
 	app-arch/xz-utils
 	app-arch/zstd:=
 	dev-cpp/rapidyaml:=
-	dev-libs/glib:2
 	dev-libs/libaio
 	dev-libs/libchdr
 	>=dev-libs/libfmt-7.1.3:=
-	dev-libs/libxml2:2
 	dev-libs/libzip:=[zstd]
-	media-libs/alsa-lib
 	media-libs/cubeb
-	media-libs/freetype
+	media-libs/harfbuzz
 	media-libs/libglvnd
 	media-libs/libpng:=
 	media-libs/libsamplerate
-	media-libs/libsdl2[haptic,joystick,sound]
+	>=media-libs/libsdl2-2.0.22[haptic,joystick]
 	media-libs/libsoundtouch:=
 	net-libs/libpcap
-	sys-libs/zlib
+	sys-libs/zlib:=
 	virtual/libudev:=
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libICE
 	x11-libs/libX11
-	x11-libs/libXext
 	x11-libs/libXrandr
-	x11-libs/wxGTK:${WX_GTK_VER}[X]
-	pulseaudio? ( media-sound/pulseaudio )
-"
+	qt6? (
+		dev-qt/qtbase:6[gui,network,widgets]
+		dev-qt/qtsvg:6
+		net-misc/curl
+	)
+	!qt6? (
+		dev-libs/glib:2
+		x11-libs/gdk-pixbuf:2
+		x11-libs/gtk+:3[wayland?]
+		x11-libs/wxGTK:${WX_GTK_VER}[X]
+		pulseaudio? ( media-libs/libpulse )
+	)
+	vulkan? ( media-libs/vulkan-loader )
+	wayland? ( dev-libs/wayland )"
 DEPEND="
 	${RDEPEND}
-	x11-base/xorg-proto"
-BDEPEND="test? ( dev-cpp/gtest )"
+	x11-base/xorg-proto
+	test? ( dev-cpp/gtest )"
+BDEPEND="
+	dev-lang/perl
+	qt6? ( dev-qt/qttools[linguist] )
+	!qt6? ( sys-devel/gettext )"
 
 FILECAPS=(
-	-m 755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
+	-m 0755 "CAP_NET_RAW+eip CAP_NET_ADMIN+eip" usr/bin/pcsx2
 )
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.7.0-crcs.patch
+	"${FILESDIR}"/${PN}-1.7.3329-clang16.patch
+	"${FILESDIR}"/${PN}-1.7.3329-lto.patch
+	"${FILESDIR}"/${PN}-1.7.3329-musl.patch
+	"${FILESDIR}"/${PN}-1.7.3329-qt6.patch
+	"${FILESDIR}"/${PN}-1.7.3329-unbundle.patch
+	"${FILESDIR}"/${PN}-1.7.3329-wx-vs-sdl.patch
 )
 
+src_unpack() {
+	if [[ ${PV} == 9999 ]]; then
+		local EGIT_SUBMODULES=()
+		if use vulkan; then
+			EGIT_SUBMODULES+=(
+				3rdparty/glslang/glslang # needs StandAlone/ResourceLimits.h
+				3rdparty/vulkan-headers # to keep in sync with glslang
+			)
+		fi
+		git-r3_src_unpack
+	else
+		default
+		if use vulkan; then
+			rmdir "${S}"/3rdparty/{glslang/glslang,vulkan-headers} || die
+			mv glslang-${HASH_GLSLANG} "${S}"/3rdparty/glslang/glslang || die
+			mv Vulkan-Headers-${HASH_VULKAN} "${S}"/3rdparty/vulkan-headers || die
+		fi
+	fi
+}
+
 src_prepare() {
 	cmake_src_prepare
 
-	# unbundle, use sed over patch for less chances to break -9999
-	# note: gentoo's zstd lacks a cmake module which upstream tries to use
-	sed -e '/add_subdir.*cubeb/c\find_package(cubeb REQUIRED)' \
-		-e '/add_subdir.*libchdr/c\pkg_check_modules(chdr REQUIRED IMPORTED_TARGET libchdr)\nalias_library(chdr-static PkgConfig::chdr)' \
-		-e '/system_library.*zstd/,/endif()/c\pkg_check_modules(zstd REQUIRED IMPORTED_TARGET libzstd)\nalias_library(Zstd::Zstd PkgConfig::zstd)' \
-		-e '/compile_options(\(cubeb\|chdr-static\|speex\)/d' \
-		-i cmake/SearchForStuff.cmake || die
+	# qt6 build doesn't support PACKAGE_MODE and need to set resources location
+	sed -e "/EmuFolders::AppRoot =/s|=.*|= \"${EPREFIX}/usr/share/PCSX2\";|" \
+		-i pcsx2/Frontend/CommonHost.cpp || die
+
+	# pulseaudio is only used for usb-mic and without qt6, not for audio output
+	{ use pulseaudio && use !qt6; } || :> cmake/FindPulseAudio.cmake || die
+
+	# GS tests currently fail to build with qt6
+	use !qt6 || sed -i '/add_subdirectory(GS)/d' tests/ctest/CMakeLists.txt || die
 
-	# pulseaudio is only used for usb-mic, not audio output
-	use pulseaudio || > cmake/FindPulseAudio.cmake || die
+	if [[ ${PV} != 9999 ]]; then
+		sed -e '/set(PCSX2_GIT_TAG "")/s/""/"v'${PV}'"/' \
+			-i cmake/Pcsx2Utils.cmake || die
+
+		# delete all 3rdparty/* except known-used ones in non-live
+		local keep=(
+			cpuinfo glad imgui include jpgd lzma simpleini xbyak
+			$(usev vulkan 'glslang vulkan-headers')
+		)
+		find 3rdparty -mindepth 1 -maxdepth 1 -type d \
+			-not \( -false ${keep[*]/#/-o -name } \) -exec rm -r {} + || die
+	fi
 }
 
 src_configure() {
-	# Build with ld.gold fails
-	# https://github.com/PCSX2/pcsx2/issues/1671
-	tc-ld-disable-gold
+	use qt6 || setup-wxwidgets
+
+	# for bundled glslang (bug #858374)
+	use vulkan && append-flags -fno-strict-aliasing
 
-	# pcsx2 build scripts will force CMAKE_BUILD_TYPE=Devel
-	# if it something other than "Devel|Debug|Release"
-	local CMAKE_BUILD_TYPE="Release"
 	local mycmakeargs=(
-		-DBUILD_SHARED_LIBS=FALSE
-		-DDISABLE_ADVANCE_SIMD=TRUE
-		-DDISABLE_BUILD_DATE=TRUE
-		-DDISABLE_PCSX2_WRAPPER=TRUE
-		-DDISABLE_SETCAP=TRUE
+		-DBUILD_SHARED_LIBS=no
+		-DDISABLE_BUILD_DATE=yes
+		-DDISABLE_PCSX2_WRAPPER=yes
+		-DDISABLE_SETCAP=yes
 		-DENABLE_TESTS=$(usex test)
-		-DPACKAGE_MODE=TRUE
-		-DQT_BUILD=FALSE # TODO when qt6 is in tree
-		-DSDL2_API=TRUE # conditionally needed if wxGTK[sdl], cmake/ApiValidation.cmake
-		-DUSE_SYSTEM_LIBS=TRUE
-		-DUSE_VTUNE=FALSE
-		-DXDG_STD=TRUE
+		-DPACKAGE_MODE=yes
+		-DQT_BUILD=$(usex qt6)
+		-DUSE_SYSTEM_LIBS=yes
+		-DUSE_VTUNE=no
+		-DUSE_VULKAN=$(usex vulkan)
+		-DWAYLAND_API=$(usex wayland)
+		-DXDG_STD=yes
+
+		# sse4.1 is the bare minimum required, -m is required at build time
+		# (see PCSX2Base.h) and it dies if no support at runtime (AppInit.cpp)
+		# https://github.com/PCSX2/pcsx2/pull/4329
+		-DARCH_FLAG=-msse4.1
 	)
 
-	setup-wxwidgets
 	cmake_src_configure
 }
+
+src_test() {
+	cmake_build unittests
+}
+
+src_install() {
+	cmake_src_install
+
+	use qt6 && newbin "${BUILD_DIR}"/pcsx2-qt/pcsx2-qt pcsx2
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+
+	local replacing_old
+	if [[ ${REPLACING_VERSIONS##* } ]] &&
+		ver_test ${REPLACING_VERSIONS##* } -lt 1.6.1
+	then
+		replacing_old=
+		elog ">=${PN}-1.7 has received several changes since <=${PN}-1.6.0, just-in-case"
+		elog "it is recommended to backup your save states and memory cards before use."
+		elog "Note that the executable was also renamed from 'PCSX2' to 'pcsx2'."
+	fi
+
+	if [[ ${PV} != 9999 && ( ! ${REPLACING_VERSIONS} || -v replacing_old ) ]]; then
+		[[ -v replacing_old ]] && elog
+		elog "${PN}-1.7.x is a development branch using a nightly release model"
+		elog "(new 'release' every 1-2 days). Stable 1.6.0 is getting old and lacks"
+		elog "many notable features (e.g. native 64bit builds). Given it may be a long"
+		elog "time before there is a new stable, Gentoo will carry and update 1.7.x"
+		elog "roughly every months."
+		elog
+		elog "Please report an issue if feel a picked nightly release needs to be"
+		elog "updated ahead of time or masked (notably for handling regressions)."
+	fi
+}
diff --git a/games-engines/Manifest.gz b/games-engines/Manifest.gz
index 8393e82da147..c9e4d5216899 100644
Binary files a/games-engines/Manifest.gz and b/games-engines/Manifest.gz differ
diff --git a/games-engines/xzip/xzip-1.8.2-r3.ebuild b/games-engines/xzip/xzip-1.8.2-r3.ebuild
index c6cb0d735cdb..50bfddd967c0 100644
--- a/games-engines/xzip/xzip-1.8.2-r3.ebuild
+++ b/games-engines/xzip/xzip-1.8.2-r3.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="X interface to Z-code based text games"
 HOMEPAGE="https://www.eblong.com/zarf/xzip.html"
-SRC_URI="https://www.eblong.com/zarf/ftp/xzip182.tar.Z"
+SRC_URI="https://www.eblong.com/zarf/ftp/xzip$(ver_rs 1-3 '').tar.Z"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/games-fps/Manifest.gz b/games-fps/Manifest.gz
index 01d68c68297a..a9d9d1d0b3e9 100644
Binary files a/games-fps/Manifest.gz and b/games-fps/Manifest.gz differ
diff --git a/games-fps/quake1-rally/quake1-rally-1.2-r1.ebuild b/games-fps/quake1-rally/quake1-rally-1.2-r1.ebuild
index 5b4137c84763..8623924bac22 100644
--- a/games-fps/quake1-rally/quake1-rally-1.2-r1.ebuild
+++ b/games-fps/quake1-rally/quake1-rally-1.2-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit edos2unix
 
 DESCRIPTION="TC which turns Quake into a Rally racing game"
 HOMEPAGE="http://wiki.quakeworld.nu/Quake_Rally"
-SRC_URI="http://ehall.freeshell.org/quake/qr12.zip
+SRC_URI="http://ehall.freeshell.org/quake/qr$(ver_rs 1-2 '').zip
 	http://ehall.freeshell.org/quake/qrlo1.zip"
 S="${WORKDIR}"
 
diff --git a/games-misc/Manifest.gz b/games-misc/Manifest.gz
index 756444fa3598..861d331bd098 100644
Binary files a/games-misc/Manifest.gz and b/games-misc/Manifest.gz differ
diff --git a/games-misc/bsd-games/bsd-games-2.17_p28-r2.ebuild b/games-misc/bsd-games/bsd-games-2.17_p28-r2.ebuild
index 585d54cb4beb..2a23ecde1cb4 100644
--- a/games-misc/bsd-games/bsd-games-2.17_p28-r2.ebuild
+++ b/games-misc/bsd-games/bsd-games-2.17_p28-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -9,7 +9,7 @@ DEB_PATCH_VER=28
 DESCRIPTION="Collection of games from NetBSD"
 HOMEPAGE="https://www.polyomino.org.uk/computer/software/bsd-games/"
 #SRC_URI="https://www.polyomino.org.uk/computer/software/bsd-games/${PN}-$(ver_cut 1-2).tar.gz"
-SRC_URI="http://deb.debian.org/debian/pool/main/b/bsdgames/bsdgames_2.17.orig.tar.gz"
+SRC_URI="http://deb.debian.org/debian/pool/main/b/bsdgames/bsdgames_$(ver_cut 1-2).orig.tar.gz"
 SRC_URI+=" mirror://debian/pool/main/b/bsdgames/bsdgames_$(ver_cut 1-2)-${DEB_PATCH_VER}.debian.tar.xz"
 S="${WORKDIR}/${PN}-$(ver_cut 1-2)"
 
diff --git a/games-puzzle/Manifest.gz b/games-puzzle/Manifest.gz
index 5effd3f359d4..ad41007d3faa 100644
Binary files a/games-puzzle/Manifest.gz and b/games-puzzle/Manifest.gz differ
diff --git a/games-puzzle/tanglet/tanglet-1.6.1.1.ebuild b/games-puzzle/tanglet/tanglet-1.6.1.1.ebuild
index 65f7fae82093..c8c0548f7c17 100644
--- a/games-puzzle/tanglet/tanglet-1.6.1.1.ebuild
+++ b/games-puzzle/tanglet/tanglet-1.6.1.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -7,7 +7,7 @@ inherit qmake-utils xdg
 
 DESCRIPTION="Single player word finding game based on Boggle"
 HOMEPAGE="https://gottcode.org/tanglet/"
-SRC_URI="https://gottcode.org/tanglet/tanglet-1.6.1.1-src.tar.bz2"
+SRC_URI="https://gottcode.org/tanglet/${P}-src.tar.bz2"
 
 LICENSE="GPL-3"
 SLOT="0"
diff --git a/games-puzzle/xlogical/xlogical-1.0.8.ebuild b/games-puzzle/xlogical/xlogical-1.0.8.ebuild
index d0cd804016ba..33d120bea420 100644
--- a/games-puzzle/xlogical/xlogical-1.0.8.ebuild
+++ b/games-puzzle/xlogical/xlogical-1.0.8.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~arm64 ~x86"
 
 RDEPEND="
 	acct-group/gamestat
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index e06941a980fb..c72ceda0f206 100644
Binary files a/games-server/Manifest.gz and b/games-server/Manifest.gz differ
diff --git a/games-server/mtavc/mtavc-0.5-r2.ebuild b/games-server/mtavc/mtavc-0.5-r2.ebuild
index cef256bf4f5e..cd7e1af8d121 100644
--- a/games-server/mtavc/mtavc-0.5-r2.ebuild
+++ b/games-server/mtavc/mtavc-0.5-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
 DESCRIPTION="dedicated server for GTA3 multiplayer"
 HOMEPAGE="http://mtavc.com/"
-SRC_URI="http://files.gonnaplay.com/201/MTAServer0_5-linux.tar.gz"
+SRC_URI="http://files.gonnaplay.com/201/MTAServer$(ver_rs 0-1 '_')-linux.tar.gz"
 S="${WORKDIR}"
 
 LICENSE="MTA-0.5"
diff --git a/games-util/Manifest.gz b/games-util/Manifest.gz
index b5f8dcf28995..762a5ee5ac4e 100644
Binary files a/games-util/Manifest.gz and b/games-util/Manifest.gz differ
diff --git a/games-util/libstrangle/libstrangle-0.1.1_p20220222-r1.ebuild b/games-util/libstrangle/libstrangle-0.1.1_p20220222-r1.ebuild
index edb24350dc18..c39f31b01542 100644
--- a/games-util/libstrangle/libstrangle-0.1.1_p20220222-r1.ebuild
+++ b/games-util/libstrangle/libstrangle-0.1.1_p20220222-r1.ebuild
@@ -3,7 +3,7 @@
 
 EAPI=8
 
-inherit multilib multilib-minimal toolchain-funcs
+inherit multilib-minimal toolchain-funcs
 
 STRANGLE_COMMIT="0273e318e3b0cc759155db8729ad74266b74cb9b"
 
@@ -15,6 +15,7 @@ S="${WORKDIR}/${PN}-${STRANGLE_COMMIT}"
 LICENSE="GPL-3+"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
+IUSE="+abi_x86_32"
 
 RDEPEND="
 	sys-apps/grep[pcre]
@@ -58,8 +59,3 @@ multilib_src_install_all() {
 	emake DESTDIR="${D}" prefix="${EPREFIX}"/usr install-common
 	einstalldocs
 }
-
-pkg_postinst() {
-	has_multilib_profile && use amd64 && use !abi_x86_32 &&
-		ewarn "Note that USE=abi_x86_32 is needed for 32bit games (common with steam / wine)"
-}
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index e8f460cfb9d4..5d54552dd521 100644
Binary files a/gnome-extra/Manifest.gz and b/gnome-extra/Manifest.gz differ
diff --git a/gnome-extra/gnome-shell-extension-pop-shell/metadata.xml b/gnome-extra/gnome-shell-extension-pop-shell/metadata.xml
index f465f3241b19..3279d0e9f2c1 100644
--- a/gnome-extra/gnome-shell-extension-pop-shell/metadata.xml
+++ b/gnome-extra/gnome-shell-extension-pop-shell/metadata.xml
@@ -1,10 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<maintainer type="person">
-		<email>gyakovlev@gentoo.org</email>
-		<name>Georgy Yakovlev</name>
-	</maintainer>
+	<!-- maintainer-needed -->
 	<upstream>
 		<remote-id type="github">pop-os/shell</remote-id>
 	</upstream>
diff --git a/gnome-extra/nemo-fileroller/nemo-fileroller-5.2.0.ebuild b/gnome-extra/nemo-fileroller/nemo-fileroller-5.2.0.ebuild
index 7ace849bd382..cf4bda76aceb 100644
--- a/gnome-extra/nemo-fileroller/nemo-fileroller-5.2.0.ebuild
+++ b/gnome-extra/nemo-fileroller/nemo-fileroller-5.2.0.ebuild
@@ -7,7 +7,7 @@ inherit meson
 
 DESCRIPTION="Nemo file-roller integration"
 HOMEPAGE="https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/nemo-extensions"
-SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/5.2.0.tar.gz -> nemo-extensions-5.2.0.tar.gz"
+SRC_URI="https://github.com/linuxmint/nemo-extensions/archive/${PV}.tar.gz -> nemo-extensions-${PV}.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
@@ -22,4 +22,4 @@ RDEPEND="
 	app-arch/file-roller
 "
 
-S="${WORKDIR}/nemo-extensions-5.2.0/${PN}"
+S="${WORKDIR}/nemo-extensions-${PV}/${PN}"
diff --git a/gnome-extra/yelp-xsl/Manifest b/gnome-extra/yelp-xsl/Manifest
index 26c325e1b525..421c2e68cbe7 100644
--- a/gnome-extra/yelp-xsl/Manifest
+++ b/gnome-extra/yelp-xsl/Manifest
@@ -1 +1,2 @@
 DIST yelp-xsl-42.0.tar.xz 663824 BLAKE2B bf1ceae255a6166cda81be57e0cae14c25e4668d70e16bafb3aeaf0958b2393c4c6be8a4575b24fc7560fdddd60c3790b89890015d13f4124445f037549781de SHA512 70d86bedd00fd38ffefb82962b591b710aa6ba59f9a12c968d5c47afeed9f4afecfb5e1228fbaba3acab5d5673cb6511d3d51674f7602f5001835d9c134fedda
+DIST yelp-xsl-42.1.tar.xz 667448 BLAKE2B 45f19a6cc7a0ff9f3f31e0f33935d757c07e403c77d2adfa20fda46a7f22da5b6196e7dc40a3e83ef0604f6c681c5ca99d5565d070d3fdcbf732312aa73d34c8 SHA512 90c7cc244dba038d6fcc1344adf950640a0affb8e5a1a6945a776d3308bf9b5071320856968f7a31688855a18a872f63553bd643b7776801cc68b182b455fc10
diff --git a/gnome-extra/yelp-xsl/yelp-xsl-42.1.ebuild b/gnome-extra/yelp-xsl/yelp-xsl-42.1.ebuild
new file mode 100644
index 000000000000..c54bc133810f
--- /dev/null
+++ b/gnome-extra/yelp-xsl/yelp-xsl-42.1.ebuild
@@ -0,0 +1,24 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome2
+
+DESCRIPTION="XSL stylesheets for yelp"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/yelp-xsl"
+
+LICENSE="GPL-2+ LGPL-2.1+ MIT FDL-1.1+"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-libs/libxml2-2.6.12:=
+	>=dev-libs/libxslt-1.1.8:=
+"
+RDEPEND="${DEPEND}"
+BDEPEND="
+	>=dev-util/itstool-1.2.0
+	>=sys-devel/gettext-0.19.8
+	virtual/awk
+	virtual/pkgconfig
+"
diff --git a/gnome-extra/yelp/Manifest b/gnome-extra/yelp/Manifest
index 35fbec65c029..11d14c22b404 100644
--- a/gnome-extra/yelp/Manifest
+++ b/gnome-extra/yelp/Manifest
@@ -1 +1,2 @@
 DIST yelp-42.1.tar.xz 1512620 BLAKE2B a0ba02a560c19e516c42f77a34f3296dd6dd9d3dba9b34b2243a2c7689b7117cd82dea8e169ec7001ba15860c74f1c7ace061094516391b38f5054b566e613b2 SHA512 3c8150503e828c8d2994b7af6f7c673b696b01f4a82abcbbc0395909a0e0eb2d64a9e445a5b1683a0c9aa0abc7040cc563917e55b126879ce7c4dda117bbf3db
+DIST yelp-42.2.tar.xz 1506136 BLAKE2B dbde815af6902eebae0e6dcdb12e0e0c8981fa64608e6ba3c8950b908b13981c335011ee2e2240e8a96c4aff3f8b682d630ea34215918374e231220eb87e0f2b SHA512 7fd8da347b3cdb9b24a31eebe14c4964c5e41956caa2b79e70d6ea0c829d94f8428bbd96a2472c02d56673ca0ed1c75f7c6f874a59c4eea0b1440918a99969f4
diff --git a/gnome-extra/yelp/yelp-42.2.ebuild b/gnome-extra/yelp/yelp-42.2.ebuild
new file mode 100644
index 000000000000..db120a9de577
--- /dev/null
+++ b/gnome-extra/yelp/yelp-42.2.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+GNOME2_EAUTORECONF="yes"
+
+inherit gnome2
+
+DESCRIPTION="Help browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Yelp"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+
+RDEPEND="
+	app-arch/bzip2:=
+	>=app-arch/xz-utils-4.9:=
+	dev-db/sqlite:3=
+	>=dev-libs/glib-2.67.4:2
+	>=dev-libs/libxml2-2.6.5:2
+	>=dev-libs/libxslt-1.1.4
+	>=gnome-extra/yelp-xsl-41.0
+	>=net-libs/webkit-gtk-2.19.2:4
+	>=x11-libs/gtk+-3.13.3:3
+	>=gui-libs/libhandy-1.5.0:1
+	x11-themes/adwaita-icon-theme
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-libs/appstream-glib
+	>=dev-util/gtk-doc-am-1.13
+	dev-util/glib-utils
+	dev-util/itstool
+	>=sys-devel/gettext-0.19.8
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	# Fix compatibility with Gentoo's sys-apps/man
+	# https://bugzilla.gnome.org/show_bug.cgi?id=648854
+	"${FILESDIR}"/${PN}-3.20.0-man-compatibility.patch # needs eautoreconf
+)
+
+src_configure() {
+	gnome2_src_configure \
+		--disable-static \
+		--with-webkit2gtk-4-0 \
+		--enable-bz2 \
+		--enable-lzma \
+		APPSTREAM_UTIL=$(type -P true)
+}
+
+src_install() {
+	gnome2_src_install
+	exeinto /usr/libexec/
+	doexe "${S}"/libyelp/yelp-groff
+}
diff --git a/gui-wm/Manifest.gz b/gui-wm/Manifest.gz
index c2735cd34db8..b4b4804bebce 100644
Binary files a/gui-wm/Manifest.gz and b/gui-wm/Manifest.gz differ
diff --git a/gui-wm/gamescope/Manifest b/gui-wm/gamescope/Manifest
index 19fd9a53722a..6c03e4db5cdf 100644
--- a/gui-wm/gamescope/Manifest
+++ b/gui-wm/gamescope/Manifest
@@ -1 +1 @@
-DIST gamescope-3.11.43.tar.gz 193497 BLAKE2B 2b7f14b24d395f2bd19c15113a6ae414ec54dd6e840f7c377117ea268f267fd0f27e3197b214726decdecb0bc6a00ec6b6aceeb7e9cb87bf54509c76c31ebf9a SHA512 406555ea37adb3b53b43017b45719ece91f21c4419fa7348c4e47bb18bfda6606755853f013ddef0fc9938499ff72b47efc34b525395801c807735d21eec57ce
+DIST gamescope-3.11.45.2.tar.gz 197744 BLAKE2B c717f8018d9535f3eecd68122773ab695f50ab6422467d1a89c59052b053063cc189bb91e2f0c52a59e13821b52dca57ecf457a32ad9d7f6b5f10cc00f5d93e2 SHA512 c78013a129f9ca5ada2f8ba15a5f64a7306d950b0aacbefad81ff69ba5de685de30ec7421398c8c59163a32ac7b83576a093658f71e5c45126a2de6fb107076c
diff --git a/gui-wm/gamescope/gamescope-3.11.43.ebuild b/gui-wm/gamescope/gamescope-3.11.45.2.ebuild
similarity index 93%
rename from gui-wm/gamescope/gamescope-3.11.43.ebuild
rename to gui-wm/gamescope/gamescope-3.11.45.2.ebuild
index 4922750b401d..ea21c3332aa2 100644
--- a/gui-wm/gamescope/gamescope-3.11.43.ebuild
+++ b/gui-wm/gamescope/gamescope-3.11.45.2.ebuild
@@ -5,7 +5,8 @@ EAPI=8
 
 inherit fcaps meson
 
-MY_PV="${PV//_/-}"
+MY_PV=$(ver_rs 3 -)
+MY_PV="${MY_PV//_/-}"
 DESCRIPTION="Efficient micro-compositor for running games"
 HOMEPAGE="https://github.com/Plagman/gamescope"
 SRC_URI="https://github.com/Plagman/${PN}/archive/refs/tags/${MY_PV}.tar.gz -> ${P}.tar.gz"
@@ -16,13 +17,13 @@ IUSE="pipewire"
 
 RDEPEND="
 	=dev-libs/libliftoff-0.3*
-	dev-libs/wayland
+	>=dev-libs/wayland-1.21
 	>=dev-libs/wayland-protocols-1.17
 	=gui-libs/wlroots-0.15*[X]
 	media-libs/libsdl2[video]
 	media-libs/vulkan-loader
 	sys-libs/libcap
-	x11-libs/libdrm
+	>=x11-libs/libdrm-2.4.109
 	x11-libs/libX11
 	x11-libs/libXcomposite
 	x11-libs/libXdamage
diff --git a/mail-mta/Manifest.gz b/mail-mta/Manifest.gz
index 5bf7e75d98e3..ebff72b2d8a0 100644
Binary files a/mail-mta/Manifest.gz and b/mail-mta/Manifest.gz differ
diff --git a/mail-mta/proton-mail-bridge/Manifest b/mail-mta/proton-mail-bridge/Manifest
new file mode 100644
index 000000000000..dbdfa8254ea8
--- /dev/null
+++ b/mail-mta/proton-mail-bridge/Manifest
@@ -0,0 +1,2 @@
+DIST proton-mail-bridge-2.3.0-deps.tar.xz 237367120 BLAKE2B 819ffc216017db8a02a189fdb1b4c78e26d38f1cde94bbc556e8603047e396ce0de3caa2b3cf18392a30fbaab525c305f6f0193fb1210baeb48f6a346ae2ba94 SHA512 63076459bf1e8c17775439a5ef1e22482684e0f37a45a4b6f9469c851e66b984f1bce5c19c1d4bfa8cbf5f9ae4fe21a5a20d8304254cdc4f215120dfe5b254e7
+DIST proton-mail-bridge-2.3.0.tar.gz 5059969 BLAKE2B 3871ec75e69ce2976a3b588c9cb32dc61d5c6eaf28a8a7941fb91babbe74cf73f101a3fa9d87c999c659847a42b0a3d93298d6c692a06cfe2716a31fcbb0d469 SHA512 3e3a64d945577a4efc1cb1e9a3b029465f64fab37e80fa7d58e7ea94ba316281596e91a6b49fc37168a0275921f3f79567f58eb926a1d77fcc0b8b39a3cf8f5c
diff --git a/mail-mta/protonmail-bridge/files/protonmail-bridge.service b/mail-mta/proton-mail-bridge/files/proton-mail-bridge.service
similarity index 59%
rename from mail-mta/protonmail-bridge/files/protonmail-bridge.service
rename to mail-mta/proton-mail-bridge/files/proton-mail-bridge.service
index 8e4c71adfd0d..21f0ad1650dd 100644
--- a/mail-mta/protonmail-bridge/files/protonmail-bridge.service
+++ b/mail-mta/proton-mail-bridge/files/proton-mail-bridge.service
@@ -1,9 +1,9 @@
 [Unit]
-Description=ProtonMail IMAP/SMTP bridge
-Documentation=https://protonmail.com/bridge/
+Description=Proton Mail IMAP/SMTP bridge
+Documentation=https://proton.me/mail/bridge/
 
 [Service]
-ExecStart=/usr/bin/protonmail-bridge --no-window
+ExecStart=/usr/bin/proton-mail-bridge --no-window
 Restart=on-failure
 
 # Hardening
diff --git a/mail-mta/protonmail-bridge/metadata.xml b/mail-mta/proton-mail-bridge/metadata.xml
similarity index 100%
rename from mail-mta/protonmail-bridge/metadata.xml
rename to mail-mta/proton-mail-bridge/metadata.xml
diff --git a/mail-mta/protonmail-bridge/protonmail-bridge-2.2.2.ebuild b/mail-mta/proton-mail-bridge/proton-mail-bridge-2.3.0.ebuild
similarity index 98%
rename from mail-mta/protonmail-bridge/protonmail-bridge-2.2.2.ebuild
rename to mail-mta/proton-mail-bridge/proton-mail-bridge-2.3.0.ebuild
index 3eb8df2b3026..79f180fa1513 100644
--- a/mail-mta/protonmail-bridge/protonmail-bridge-2.2.2.ebuild
+++ b/mail-mta/proton-mail-bridge/proton-mail-bridge-2.3.0.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 
 inherit go-module systemd xdg-utils
 
-MY_PN="proton-bridge"
+MY_PN="${PN/-mail/}"
 MY_P="${MY_PN}-${PV}"
 
 DESCRIPTION="Serves ProtonMail to IMAP/SMTP clients"
diff --git a/mail-mta/protonmail-bridge/Manifest b/mail-mta/protonmail-bridge/Manifest
deleted file mode 100644
index da2998d1cc62..000000000000
--- a/mail-mta/protonmail-bridge/Manifest
+++ /dev/null
@@ -1,2 +0,0 @@
-DIST protonmail-bridge-2.2.2-deps.tar.xz 237555984 BLAKE2B b069b1b9015e0a96cc0f5558216058c23c1488a67abc29363f4111f9175eac9f204f5f14b54a090040e6d340d4aeb69d1e3b1e59685c3dcef9499ae93526f411 SHA512 8ae9bd6bdbc8a16d7cb0e5a3405ef3dca1737f7b3b5e53b9f954618eadfccd94c5ca1a3994a20745f234e81dbace28bc2df0489e28dbf6dc322b508a11acf813
-DIST protonmail-bridge-2.2.2.tar.gz 5057358 BLAKE2B f2b585ec16c1b6864e4a23436f30c36253beed0453a1068f52f19af8b47b7b626ec779795486ce3719716b5785b2a3c60fbe62ed192b724c6d88ceb507abc590 SHA512 c17ce614ab1074ddeeb9842ce98e6c9cbcb57f44a0bc75cdf74b9a7085257768824a549a9ae5870dcb45243655a90f0956600912c69fc1e826c58d36e8ee19fe
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 1459d83d48e4..b8d05ebb676f 100644
Binary files a/media-gfx/Manifest.gz and b/media-gfx/Manifest.gz differ
diff --git a/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild b/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
deleted file mode 100644
index 897007275eb7..000000000000
--- a/media-gfx/graphicsmagick/graphicsmagick-1.3.38.ebuild
+++ /dev/null
@@ -1,151 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools toolchain-funcs
-
-MY_P=${P/graphicsm/GraphicsM}
-DESCRIPTION="Collection of tools and libraries for many image formats"
-HOMEPAGE="http://www.graphicsmagick.org/ https://hg.osdn.net/view/graphicsmagick/GM"
-
-if [[ ${PV} == 9999 ]] ; then
-	inherit mercurial
-	EHG_REPO_URI="http://hg.code.sf.net/p/${PN}/code"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/bobfriesenhahn.asc
-	inherit verify-sig
-	SRC_URI="mirror://sourceforge/${PN}/${MY_P}.tar.xz"
-	SRC_URI+=" verify-sig? ( mirror://sourceforge/${PN}/${MY_P}.tar.xz.sig )"
-	S="${WORKDIR}/${MY_P}"
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn )"
-fi
-
-LICENSE="MIT"
-SLOT="0/${PV%.*}"
-
-IUSE="bzip2 +cxx debug dynamic-loading fpx heif imagemagick jbig jpeg jpegxl lcms lzma"
-IUSE+=" openmp perl png postscript q16 q32 static-libs svg threads tiff truetype"
-IUSE+=" webp wmf X zlib"
-
-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? ( virtual/jpeg )
-	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 )
-	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/libXext
-	)
-	zlib? ( sys-libs/zlib )"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.3.36-flags.patch
-	"${FILESDIR}"/${PN}-1.3.19-perl.patch
-)
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	local depth=8
-
-	use q16 && depth=16
-	use q32 && depth=32
-
-	local myeconfargs=(
-		--enable-largefile
-		--enable-shared
-		$(use_enable static-libs static)
-		$(use_enable debug prof)
-		$(use_enable debug gcov)
-		$(use_enable imagemagick magick-compat)
-		$(use_enable openmp)
-		$(use_with threads)
-		$(use_with dynamic-loading modules)
-		--with-quantum-depth=${depth}
-		--without-frozenpaths
-		$(use_with cxx magick-plus-plus)
-		$(use_with heif)
-		$(use_with jpegxl jxl)
-		$(use_with perl)
-		--with-perl-options=INSTALLDIRS=vendor
-		$(use_with bzip2 bzlib)
-		$(use_with postscript dps)
-		$(use_with fpx)
-		$(use_with jbig)
-		$(use_with webp)
-		$(use_with jpeg)
-		--without-jp2
-		$(use_with lcms lcms2)
-		$(use_with lzma)
-		$(use_with png)
-		$(use_with tiff)
-		$(use_with truetype ttf)
-		$(use_with wmf)
-		--with-fontpath="${EPREFIX}"/usr/share/fonts
-		--with-gs-font-dir="${EPREFIX}"/usr/share/fonts/urw-fonts
-		--with-windows-font-dir="${EPREFIX}"/usr/share/fonts/corefonts
-		$(use_with svg xml)
-		$(use_with zlib)
-		$(use_with X x)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	default
-
-	use perl && emake perl-build
-}
-
-src_test() {
-	unset DISPLAY # some perl tests fail when DISPLAY is set
-
-	default
-}
-
-src_install() {
-	default
-
-	if use perl ; then
-		emake -C PerlMagick DESTDIR="${D}" install
-
-		find "${ED}" -type f -name perllocal.pod -exec rm -f {} + || die
-		find "${ED}" -depth -mindepth 1 -type d -empty -exec rm -rf {} + || die
-	fi
-
-	find "${ED}" -name '*.la' -exec sed -i -e "/^dependency_libs/s:=.*:='':" {} + || die
-}
diff --git a/media-gfx/sxiv/sxiv-26.ebuild b/media-gfx/sxiv/sxiv-26.ebuild
index 49baff22c64b..65a298e1cf21 100644
--- a/media-gfx/sxiv/sxiv-26.ebuild
+++ b/media-gfx/sxiv/sxiv-26.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ fi
 DESCRIPTION="Simple (or small or suckless) X Image Viewer"
 HOMEPAGE="https://github.com/muennich/sxiv/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ public-domain"
 SLOT="0"
 IUSE="exif gif +jpeg +png webp"
 
diff --git a/media-gfx/sxiv/sxiv-9999.ebuild b/media-gfx/sxiv/sxiv-9999.ebuild
index 3493cc50aa7c..587eeb6bcc32 100644
--- a/media-gfx/sxiv/sxiv-9999.ebuild
+++ b/media-gfx/sxiv/sxiv-9999.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -16,7 +16,7 @@ fi
 DESCRIPTION="Simple (or small or suckless) X Image Viewer"
 HOMEPAGE="https://github.com/muennich/sxiv/"
 
-LICENSE="GPL-2"
+LICENSE="GPL-2+ public-domain"
 SLOT="0"
 IUSE="exif gif +jpeg +png webp"
 
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 061a371a06da..94621698544d 100644
Binary files a/media-libs/Manifest.gz and b/media-libs/Manifest.gz differ
diff --git a/media-libs/libcdaudio/files/libcdaudio-0.99.12-m4-testprogram-fix.patch b/media-libs/libcdaudio/files/libcdaudio-0.99.12-m4-testprogram-fix.patch
new file mode 100644
index 000000000000..491b330d196a
--- /dev/null
+++ b/media-libs/libcdaudio/files/libcdaudio-0.99.12-m4-testprogram-fix.patch
@@ -0,0 +1,10 @@
+--- a/libcdaudio.m4
++++ b/libcdaudio.m4
+@@ -68,6 +68,7 @@
+ #include <cdaudio.h>
+ #include <stdio.h>
+ #include <stdlib.h>
++#include <string.h>
+ 
+ char* my_strdup (char *str)
+ {
diff --git a/media-libs/libcdaudio/libcdaudio-0.99.12-r4.ebuild b/media-libs/libcdaudio/libcdaudio-0.99.12-r4.ebuild
new file mode 100644
index 000000000000..4f8d95f04e0d
--- /dev/null
+++ b/media-libs/libcdaudio/libcdaudio-0.99.12-r4.ebuild
@@ -0,0 +1,29 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Library of cd audio related routines"
+HOMEPAGE="http://libcdaudio.sourceforge.net/"
+SRC_URI="mirror://sourceforge/libcdaudio/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
+IUSE=""
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.99-CAN-2005-0706.patch
+	"${FILESDIR}"/${P}-bug245649.patch
+	"${FILESDIR}"/${P}-libdir-fix.patch
+	"${FILESDIR}"/${P}-m4-testprogram-fix.patch
+)
+
+src_configure() {
+	econf --enable-threads --disable-static
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-libs/mesa/Manifest b/media-libs/mesa/Manifest
index b31b5a657ed9..294371137a5f 100644
--- a/media-libs/mesa/Manifest
+++ b/media-libs/mesa/Manifest
@@ -1,2 +1,2 @@
-DIST mesa-22.1.3.tar.xz 16016520 BLAKE2B 3f9838022914b4ecc8882bc648bdd99a81aab2c6ebd4d9a3ce74655d6ec718d09abc6424bdb4b84a5430dcc51113d67bfd3368af4a3f390d3c574733b8ade4b0 SHA512 e7348839eb37de89c90d21277a7cbb42ee673ad6c656177853f6d35db99556dbac29867712222342d902b4fa67df5687c9d543bad99c81bcd0ecfb7f08f37480
 DIST mesa-22.1.7.tar.xz 16109944 BLAKE2B 0d4724068eff0ad242e81808ff94b73e1b5da810d27706b5a594ad77875b54562db6d9f752b61bcfff773b26bbc64b751d4dd13cfa256106d3114377ea668d26 SHA512 447e87359445edce231761d94b316b2aa20e9ab58e4b59d75cbb1696dd0900e7164c32bebc3b75700b4070570b456f7a8cf0914181371754a52427d34e4b9120
+DIST mesa-22.2.0.tar.xz 16298808 BLAKE2B 3f1526626edad49a7d1551283eaab38d905cdd4c70b487538cc2c4de50a4959e396340abe9acb32742ca83fee0a64fcce646c7fcd67d3650eacee8398c289126 SHA512 13a21b9ed6b0a5dfd0293b73df271a929c3155d83e8beb3d958fe18d79277f3611bf5b26a1186d446f4e1479a36bb13d0a13d6ac68937989fe7a0d917e12171e
diff --git a/media-libs/mesa/mesa-22.1.7.ebuild b/media-libs/mesa/mesa-22.1.7.ebuild
index 97c13b468175..cf4769ac91fa 100644
--- a/media-libs/mesa/mesa-22.1.7.ebuild
+++ b/media-libs/mesa/mesa-22.1.7.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
diff --git a/media-libs/mesa/mesa-22.1.3.ebuild b/media-libs/mesa/mesa-22.2.0.ebuild
similarity index 90%
rename from media-libs/mesa/mesa-22.1.3.ebuild
rename to media-libs/mesa/mesa-22.2.0.ebuild
index c84d6c68b8c4..b67f1493125c 100644
--- a/media-libs/mesa/mesa-22.1.3.ebuild
+++ b/media-libs/mesa/mesa-22.2.0.ebuild
@@ -17,7 +17,7 @@ if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://archive.mesa3d.org/${MY_P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris"
 fi
 
 LICENSE="MIT"
@@ -25,14 +25,15 @@ SLOT="0"
 RESTRICT="!test? ( test )"
 
 RADEON_CARDS="r300 r600 radeon radeonsi"
-VIDEO_CARDS="${RADEON_CARDS} freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
+VIDEO_CARDS="${RADEON_CARDS} d3d12 freedreno intel lima nouveau panfrost v3d vc4 virgl vivante vmware"
 for card in ${VIDEO_CARDS}; do
 	IUSE_VIDEO_CARDS+=" video_cards_${card}"
 done
 
 IUSE="${IUSE_VIDEO_CARDS}
 	cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm
-	lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan
+	lm-sensors opencl osmesa +proprietary-codecs selinux
+	test unwind vaapi valgrind vdpau vulkan
 	vulkan-overlay wayland +X xa xvmc zink +zstd"
 
 REQUIRED_USE="
@@ -109,12 +110,12 @@ RDEPEND="${RDEPEND}
 # 1. List all the working slots (with min versions) in ||, newest first.
 # 2. Update the := to specify *max* version, e.g. < 10.
 # 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="14"
+LLVM_MAX_SLOT="15"
 LLVM_DEPSTR="
 	|| (
+		sys-devel/llvm:15[${MULTILIB_USEDEP}]
 		sys-devel/llvm:14[${MULTILIB_USEDEP}]
 		sys-devel/llvm:13[${MULTILIB_USEDEP}]
-		sys-devel/llvm:12[${MULTILIB_USEDEP}]
 	)
 	<sys-devel/llvm-$((LLVM_MAX_SLOT + 1)):=[${MULTILIB_USEDEP}]
 "
@@ -176,6 +177,7 @@ RDEPEND="${RDEPEND}
 unset {LLVM,CLANG}_DEPSTR{,_AMDGPU}
 
 DEPEND="${RDEPEND}
+	video_cards_d3d12? ( dev-util/directx-headers[${MULTILIB_USEDEP}] )
 	valgrind? ( dev-util/valgrind )
 	wayland? ( >=dev-libs/wayland-protocols-1.24 )
 	X? (
@@ -223,11 +225,12 @@ llvm_check_deps() {
 
 pkg_pretend() {
 	if use vulkan; then
-		if ! use video_cards_freedreno &&
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_freedreno &&
 		   ! use video_cards_intel &&
 		   ! use video_cards_radeonsi &&
 		   ! use video_cards_v3d; then
-			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain freedreno, intel, radeonsi, or v3d"
+			ewarn "Ignoring USE=vulkan     since VIDEO_CARDS does not contain d3d12, freedreno, intel, radeonsi, or v3d"
 		fi
 	fi
 
@@ -239,19 +242,21 @@ pkg_pretend() {
 	fi
 
 	if use vaapi; then
-		if ! use video_cards_r600 &&
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r600 &&
 		   ! use video_cards_radeonsi &&
 		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain r600, radeonsi, or nouveau"
+			ewarn "Ignoring USE=vaapi      since VIDEO_CARDS does not contain d3d12, r600, radeonsi, or nouveau"
 		fi
 	fi
 
 	if use vdpau; then
-		if ! use video_cards_r300 &&
+		if ! use video_cards_d3d12 &&
+		   ! use video_cards_r300 &&
 		   ! use video_cards_r600 &&
 		   ! use video_cards_radeonsi &&
 		   ! use video_cards_nouveau; then
-			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain r300, r600, radeonsi, or nouveau"
+			ewarn "Ignoring USE=vdpau      since VIDEO_CARDS does not contain d3d12, r300, r600, radeonsi, or nouveau"
 		fi
 	fi
 
@@ -329,7 +334,8 @@ multilib_src_configure() {
 		emesonargs+=(-Dgallium-nine=false)
 	fi
 
-	if use video_cards_r600 ||
+	if use video_cards_d3d12 ||
+	   use video_cards_r600 ||
 	   use video_cards_radeonsi ||
 	   use video_cards_nouveau; then
 		emesonargs+=($(meson_feature vaapi gallium-va))
@@ -338,7 +344,12 @@ multilib_src_configure() {
 		emesonargs+=(-Dgallium-va=disabled)
 	fi
 
-	if use video_cards_r300 ||
+	if use video_cards_d3d12; then
+		emesonargs+=($(meson_feature vaapi gallium-d3d12-video))
+	fi
+
+	if use video_cards_d3d12 ||
+	   use video_cards_r300 ||
 	   use video_cards_r600 ||
 	   use video_cards_radeonsi ||
 	   use video_cards_nouveau; then
@@ -375,6 +386,7 @@ multilib_src_configure() {
 	gallium_enable video_cards_freedreno freedreno
 	gallium_enable video_cards_intel crocus i915 iris
 	gallium_enable video_cards_lima lima
+	gallium_enable video_cards_d3d12 d3d12
 	gallium_enable video_cards_nouveau nouveau
 	gallium_enable video_cards_panfrost panfrost
 	gallium_enable video_cards_v3d v3d
@@ -400,6 +412,7 @@ multilib_src_configure() {
 	if use vulkan; then
 		vulkan_enable video_cards_freedreno freedreno
 		vulkan_enable video_cards_intel intel
+		vulkan_enable video_cards_d3d12 microsoft-experimental
 		vulkan_enable video_cards_radeonsi amd
 		vulkan_enable video_cards_v3d broadcom
 	fi
@@ -432,6 +445,7 @@ multilib_src_configure() {
 		$(meson_feature zstd)
 		$(meson_use cpu_flags_x86_sse2 sse2)
 		-Dvalgrind=$(usex valgrind auto disabled)
+		-Dvideo-codecs=$(usex proprietary-codecs "h264dec,h264enc,h265dec,h265enc,vc1dec" "")
 		-Dgallium-drivers=$(driver_list "${GALLIUM_DRIVERS[*]}")
 		-Dvulkan-drivers=$(driver_list "${VULKAN_DRIVERS[*]}")
 		--buildtype $(usex debug debug plain)
diff --git a/media-libs/mesa/mesa-9999.ebuild b/media-libs/mesa/mesa-9999.ebuild
index 830e5bfd10f3..b67f1493125c 100644
--- a/media-libs/mesa/mesa-9999.ebuild
+++ b/media-libs/mesa/mesa-9999.ebuild
@@ -110,9 +110,10 @@ RDEPEND="${RDEPEND}
 # 1. List all the working slots (with min versions) in ||, newest first.
 # 2. Update the := to specify *max* version, e.g. < 10.
 # 3. Specify LLVM_MAX_SLOT, e.g. 9.
-LLVM_MAX_SLOT="14"
+LLVM_MAX_SLOT="15"
 LLVM_DEPSTR="
 	|| (
+		sys-devel/llvm:15[${MULTILIB_USEDEP}]
 		sys-devel/llvm:14[${MULTILIB_USEDEP}]
 		sys-devel/llvm:13[${MULTILIB_USEDEP}]
 	)
diff --git a/media-libs/openal/openal-1.22.2.ebuild b/media-libs/openal/openal-1.22.2.ebuild
deleted file mode 100644
index fcd183194ebd..000000000000
--- a/media-libs/openal/openal-1.22.2.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake-multilib
-
-MY_P="${PN}-soft-${PV}"
-
-DESCRIPTION="A software implementation of the OpenAL 3D audio API"
-HOMEPAGE="https://www.openal-soft.org/"
-SRC_URI="https://www.openal-soft.org/openal-releases/${MY_P}.tar.bz2"
-
-# See https://github.com/kcat/openal-soft/blob/e0097c18b82d5da37248c4823fde48b6e0002cdd/BSD-3Clause
-# Some components are under BSD
-LICENSE="LGPL-2+ BSD"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
-IUSE="
-	alsa coreaudio debug jack oss portaudio pulseaudio sdl sndio qt5
-	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
-	cpu_flags_arm_neon
-"
-
-RDEPEND="
-	alsa? ( media-libs/alsa-lib[${MULTILIB_USEDEP}] )
-	jack? ( virtual/jack[${MULTILIB_USEDEP}] )
-	portaudio? ( media-libs/portaudio[${MULTILIB_USEDEP}] )
-	pulseaudio? ( media-sound/pulseaudio[${MULTILIB_USEDEP}] )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	sdl? ( media-libs/libsdl2[${MULTILIB_USEDEP}] )
-	sndio? ( media-sound/sndio:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}
-	oss? ( virtual/os-headers )"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( alsoftrc.sample docs/env-vars.txt docs/hrtf.txt ChangeLog README.md )
-
-src_configure() {
-	# -DEXAMPLES=OFF to avoid FFmpeg dependency wrt #481670
-	my_configure() {
-		local mycmakeargs=(
-			-DALSOFT_REQUIRE_ALSA=$(usex alsa)
-			-DALSOFT_REQUIRE_COREAUDIO=$(usex coreaudio)
-			-DALSOFT_REQUIRE_JACK=$(usex jack)
-			-DALSOFT_REQUIRE_OSS=$(usex oss)
-			-DALSOFT_REQUIRE_PORTAUDIO=$(usex portaudio)
-			-DALSOFT_REQUIRE_PULSEAUDIO=$(usex pulseaudio)
-			-DALSOFT_REQUIRE_SDL2=$(usex sdl)
-			# See bug #809314 for getting both options for sndio
-			-DALSOFT_{BACKEND,REQUIRE}_SNDIO=$(usex sndio)
-			-DALSOFT_UTILS=$(multilib_is_native_abi && echo "ON" || echo "OFF")
-			-DALSOFT_NO_CONFIG_UTIL=$(usex qt5 "$(multilib_is_native_abi && echo "OFF" || echo "ON")" ON)
-			-DALSOFT_EXAMPLES=OFF
-		)
-
-		# Avoid unused variable warnings, bug #738240
-		if use amd64 || use x86 ; then
-			mycmakeargs+=(
-				-DALSOFT_CPUEXT_SSE=$(usex cpu_flags_x86_sse)
-				-DALSOFT_CPUEXT_SSE2=$(usex cpu_flags_x86_sse2)
-				-DALSOFT_CPUEXT_SSE4_1=$(usex cpu_flags_x86_sse4_1)
-			)
-		fi
-
-		if use arm || use arm64 ; then
-			mycmakeargs+=(
-				-DALSOFT_CPUEXT_NEON=$(usex cpu_flags_arm_neon)
-			)
-		fi
-
-		cmake_src_configure
-	}
-
-	multilib_parallel_foreach_abi my_configure
-}
diff --git a/media-libs/suil/Manifest b/media-libs/suil/Manifest
index 704e77dd7a2e..7c2877e7ee80 100644
--- a/media-libs/suil/Manifest
+++ b/media-libs/suil/Manifest
@@ -1,3 +1 @@
-DIST suil-0.10.12.tar.bz2 339666 BLAKE2B f70bbc18f5fa1a9263fe5c0a9241e966e124a855273bc6fe863375aef8505193e49b67d3b9d7ff6d4e4cf50cb6c2cb2b2d53dccab06005f82725e024cc8347d5 SHA512 f2b9ca36cc35d6b51c6e4ae144d61b1ba5e3b51113cca48d0535f6346ff918bdc7e299f0036ea1431c0ef59b1a02f1f4086a95db552d0a06bffb54567ab4a278
-DIST suil-0.10.14.tar.xz 33620 BLAKE2B 8ad873ade71ee6f5ba9c8560e116d8de86d8a919c24eed83ba2ff5fa5a968a4a30fdecb00c21c9f267eb22aadcef954872fab9122903826d812e3ad71c7bcd69 SHA512 fd44ac4dd465aa9e678d00cf9d7ca7ac1a18f1045e6d61c2f542a0bec7f8783230740f9a3a28d11b76cbee71cc7d4baa261112b83936a264083faeda9c02379e
 DIST suil-0.10.16.tar.xz 33744 BLAKE2B 614217013b39215f4b6d9414451a55fbca42dd038c6bc961d3769660707bf2da45432c97628edef8dacb8630437bcb304d10616ced2fd9cf9a6a4d094f196f6c SHA512 9b1dac07b017934a93f70d514ec477785683e7ed5949b62a2c4ad139c1e84265399f54d3140dcf0e542d20a0919286aacb52103c91e2f6fc7ebd707db2d98ac4
diff --git a/media-libs/suil/suil-0.10.12.ebuild b/media-libs/suil/suil-0.10.12.ebuild
deleted file mode 100644
index f5a16245b610..000000000000
--- a/media-libs/suil/suil-0.10.12.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
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit python-any-r1 waf-utils
-
-DESCRIPTION="Lightweight C library for loading and wrapping LV2 plugin UIs"
-HOMEPAGE="http://drobilla.net/software/suil/"
-SRC_URI="http://download.drobilla.net/${P}.tar.bz2"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="amd64 ~arm64 ppc ppc64 ~riscv x86"
-IUSE="doc gtk qt5"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-		dev-python/sphinx_lv2_theme
-	)
-"
-CDEPEND="
-	media-libs/lv2
-	gtk? ( x11-libs/gtk+:2 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)"
-RDEPEND="${CDEPEND}"
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-src_prepare() {
-	default
-	sed -i -e 's/^.*run_ldconfig/#\0/' wscript || die
-}
-
-src_configure() {
-	waf-utils_src_configure \
-		--mandir="${EPREFIX}/usr/share/man" \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}" \
-		$(usex gtk '' --no-gtk) \
-		$(usex qt5 '' --no-qt5) \
-		$(usex doc --docs '')
-}
diff --git a/media-libs/suil/suil-0.10.14.ebuild b/media-libs/suil/suil-0.10.14.ebuild
deleted file mode 100644
index 951d4de5215c..000000000000
--- a/media-libs/suil/suil-0.10.14.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE='threads(+)'
-
-inherit meson python-any-r1
-
-DESCRIPTION="Lightweight C library for loading and wrapping LV2 plugin UIs"
-HOMEPAGE="http://drobilla.net/software/suil/"
-SRC_URI="http://download.drobilla.net/${P}.tar.xz"
-
-LICENSE="ISC"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-IUSE="doc gtk qt5"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-python/sphinx
-		dev-python/sphinx_lv2_theme
-	)
-"
-CDEPEND="
-	media-libs/lv2
-	gtk? ( x11-libs/gtk+:2 )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-	)"
-RDEPEND="${CDEPEND}"
-DEPEND="
-	${CDEPEND}
-	${PYTHON_DEPS}
-"
-
-DOCS=( AUTHORS NEWS README.md )
-
-src_prepare() {
-	default
-
-	# fix doc installation path
-	sed -iE "s%install_dir: docdir / 'suil-0',%install_dir: docdir / '${PF}',%g" doc/c/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature doc docs)
-		$(meson_feature gtk gtk3)
-		$(meson_feature qt5)
-	)
-
-	meson_src_configure
-}
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 36b2838efcd0..b28a52578ca5 100644
Binary files a/media-sound/Manifest.gz and b/media-sound/Manifest.gz differ
diff --git a/media-sound/darkice/darkice-1.4.ebuild b/media-sound/darkice/darkice-1.4.ebuild
index d5296f02e46e..3cc45f126b10 100644
--- a/media-sound/darkice/darkice-1.4.ebuild
+++ b/media-sound/darkice/darkice-1.4.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,10 +12,9 @@ SRC_URI="https://github.com/rafael2k/${PN}/releases/download/v${PV}/${P}.tar.gz"
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="amd64 ~hppa ppc sparc x86"
-IUSE="aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
+IUSE="aac alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis"
 
 RDEPEND="aac? ( media-libs/faac )
-	aacplus? ( media-libs/libaacplus )
 	alsa? ( media-libs/alsa-lib )
 	jack? ( virtual/jack )
 	libsamplerate? ( media-libs/libsamplerate )
@@ -26,7 +25,7 @@ RDEPEND="aac? ( media-libs/faac )
 	vorbis? ( media-libs/libvorbis )"
 DEPEND="${RDEPEND}"
 
-REQUIRED_USE="|| ( aac aacplus mp3 opus twolame vorbis )
+REQUIRED_USE="|| ( aac mp3 opus twolame vorbis )
 		|| ( alsa jack pulseaudio )"
 
 DOCS=( AUTHORS ChangeLog FAQ NEWS README TODO )
@@ -42,7 +41,7 @@ src_configure() {
 	local myeconfargs=(
 		$(use_enable debug)
 		$(use_with aac faac)
-		$(use_with aacplus)
+		--without-aacplus
 		$(use_with alsa)
 		$(use_with jack)
 		$(use_with libsamplerate samplerate)
diff --git a/media-sound/darkice/metadata.xml b/media-sound/darkice/metadata.xml
index 3d179b2827ce..12ca22f989d4 100644
--- a/media-sound/darkice/metadata.xml
+++ b/media-sound/darkice/metadata.xml
@@ -6,7 +6,6 @@
 		<name>Gentoo Sound project</name>
 	</maintainer>
 	<use>
-		<flag name="aacplus">AAC+ encoding via <pkg>media-libs/libaacplus</pkg></flag>
 		<flag name="twolame">Build with twolame support</flag>
 	</use>
 	<upstream>
diff --git a/media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild b/media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild
index 97c9f5b329de..e555833d4e50 100644
--- a/media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild
+++ b/media-sound/deadbeef/deadbeef-1.9.1-r2.ebuild
@@ -66,6 +66,7 @@ BDEPEND="
 
 PATCHES=(
 	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
+	"${FILESDIR}/deadbeef-musl.patch" # 870187
 )
 
 src_prepare() {
diff --git a/media-sound/deadbeef/deadbeef-1.9.1-r3.ebuild b/media-sound/deadbeef/deadbeef-1.9.1-r3.ebuild
new file mode 100644
index 000000000000..a4a08e5811cc
--- /dev/null
+++ b/media-sound/deadbeef/deadbeef-1.9.1-r3.ebuild
@@ -0,0 +1,192 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools xdg flag-o-matic toolchain-funcs plocale
+
+DESCRIPTION="DeaDBeeF is a modular audio player similar to foobar2000"
+HOMEPAGE="https://deadbeef.sourceforge.io/"
+SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
+
+LICENSE="
+	GPL-2
+	LGPL-2.1
+	wavpack? ( BSD )
+"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv ~x86"
+IUSE="aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm libsamplerate mp3 musepack nls notify +nullout opus oss pulseaudio sc68 shellexec +supereq threads vorbis wavpack"
+
+REQUIRED_USE="
+	|| ( alsa oss pulseaudio nullout )
+"
+
+DEPEND="
+	x11-libs/gtk+:3
+	net-misc/curl:=
+	dev-libs/jansson:=
+	aac? ( media-libs/faad2 )
+	alsa? ( media-libs/alsa-lib )
+	cdda? (
+		dev-libs/libcdio:=
+		media-libs/libcddb
+		dev-libs/libcdio-paranoia:=
+	)
+	cover? (
+		media-libs/imlib2[jpeg,png]
+	)
+	dts? ( media-libs/libdca )
+	ffmpeg? ( media-video/ffmpeg )
+	flac? (
+		media-libs/flac:=
+		media-libs/libogg
+	)
+	libsamplerate? ( media-libs/libsamplerate )
+	mp3? ( media-sound/mpg123 )
+	musepack? ( media-sound/musepack-tools )
+	nls? ( virtual/libintl )
+	notify? (
+		sys-apps/dbus
+	)
+	opus? ( media-libs/opusfile )
+	pulseaudio? ( media-sound/pulseaudio )
+	vorbis? ( media-libs/libvorbis )
+	wavpack? ( media-sound/wavpack )
+	dev-libs/libdispatch
+"
+
+RDEPEND="${DEPEND}"
+BDEPEND="
+	dev-util/intltool
+	sys-devel/gettext
+	sys-devel/clang
+	sys-devel/llvm
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
+	"${FILESDIR}/deadbeef-musl.patch" # 870187
+)
+
+src_prepare() {
+	default
+
+	drop_from_linguas() {
+		sed "/${1}/d" -i "${S}/po/LINGUAS" || die
+	}
+
+	drop_and_stub() {
+		rm -rf "${1}"
+		mkdir "${1}"
+		cat > "${1}/Makefile.in" <<-EOF
+			all: nothing
+			install: nothing
+			nothing:
+		EOF
+	}
+
+	plocale_for_each_disabled_locale drop_from_linguas || die
+
+	eautopoint --force
+	eautoreconf
+
+	# Get rid of bundled gettext.
+	drop_and_stub "${S}/intl"
+
+	# Plugins that are undesired for whatever reason, candidates for unbundling and such.
+	for i in adplug alac dumb ffap mms gme mono2stereo psf shn sid soundtouch wma; do
+		drop_and_stub "${S}/plugins/${i}"
+	done
+
+	rm -rf "${S}/plugins/rg_scanner/ebur128"
+}
+
+src_configure () {
+	if ! tc-is-clang; then
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+
+		strip-unsupported-flags
+	fi
+
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	tc-export CC CXX LD AR NM OBJDUMP RANLIB PKG_CONFIG
+
+	local myconf=(
+		"--disable-staticlink"
+		"--disable-portable"
+		"--disable-rpath"
+
+		"--disable-libmad"
+		"--disable-gtk2"
+		"--disable-adplug"
+		"--disable-coreaudio"
+		"--disable-dumb"
+		"--disable-alac"
+		"--disable-ffap"
+		"--disable-gme"
+		"--disable-mms"
+		"--disable-mono2stereo"
+		"--disable-psf"
+		"--disable-rgscanner"
+		"--disable-shn"
+		"--disable-sid"
+		"--disable-sndfile"
+		"--disable-soundtouch"
+		"--disable-tta"
+		"--disable-vfs-zip"
+		"--disable-vtx"
+		"--disable-wildmidi"
+		"--disable-wma"
+
+		"$(use_enable alsa)"
+		"$(use_enable oss)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable mp3)"
+		"$(use_enable mp3 libmpg123)"
+		"$(use_enable nls)"
+		"$(use_enable vorbis)"
+		"$(use_enable threads)"
+		"$(use_enable flac)"
+		"$(use_enable supereq)"
+		"$(use_enable cdda)"
+		"$(use_enable cdda cdda-paranoia)"
+		"$(use_enable aac)"
+		"$(use_enable cover artwork)"
+		"$(use_enable cover artwork-network)"
+		"$(use_enable dts dca)"
+		"$(use_enable ffmpeg)"
+		"$(use_enable converter)"
+		"$(use_enable musepack)"
+		"$(use_enable notify)"
+		"$(use_enable nullout)"
+		"$(use_enable opus)"
+		"$(use_enable pulseaudio pulse)"
+		"$(use_enable sc68)"
+		"$(use_enable shellexec)"
+		"$(use_enable shellexec shellexecui)"
+		"$(use_enable lastfm lfm)"
+		"$(use_enable libsamplerate src)"
+		"$(use_enable wavpack)"
+
+		"--enable-gtk3"
+		"--enable-vfs-curl"
+		"--enable-shared"
+		"--enable-m3u"
+		"--enable-pltbrowser"
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/media-sound/deadbeef/files/deadbeef-musl.patch b/media-sound/deadbeef/files/deadbeef-musl.patch
new file mode 100644
index 000000000000..a62827243e9f
--- /dev/null
+++ b/media-sound/deadbeef/files/deadbeef-musl.patch
@@ -0,0 +1,27 @@
+https://github.com/DeaDBeeF-Player/deadbeef/commit/6864a5779fd6beb21507357736e0c988748cec5a
+
+Bug: https://bugs.gentoo.org/870187
+
+From 6864a5779fd6beb21507357736e0c988748cec5a Mon Sep 17 00:00:00 2001
+From: orbea <orbea@riseup.net>
+Date: Wed, 21 Sep 2022 08:36:46 -0700
+Subject: [PATCH] Fix the build with musl
+
+Fixes: https://github.com/DeaDBeeF-Player/deadbeef/issues/2858
+---
+ threading_pthread.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/threading_pthread.c b/threading_pthread.c
+index 004eb6bdc..8d5f4c31c 100644
+--- a/threading_pthread.c
++++ b/threading_pthread.c
+@@ -97,7 +97,7 @@ thread_start_low_priority (void (*fn)(void *ctx), void *ctx) {
+         pthread_cancel (tid);
+         return 0;
+     }
+-    return tid;
++    return (intptr_t)tid;
+ #else
+     return thread_start (fn, ctx);
+ #endif
diff --git a/media-sound/deadbeef/metadata.xml b/media-sound/deadbeef/metadata.xml
index 8d086b986004..acd56395e578 100644
--- a/media-sound/deadbeef/metadata.xml
+++ b/media-sound/deadbeef/metadata.xml
@@ -13,6 +13,7 @@
 		<flag name="cover">Support for cover art</flag>
 		<flag name="hotkeys">Keyboard shortcuts support</flag>
 		<flag name="lastfm">last.fm/AudioScrobbler protocol support</flag>
+		<flag name="libsamplerate">Support the Secret Rabbit Code resampler</flag>
 		<flag name="notify">Desktop notifications support</flag>
 		<flag name="nullout">Dummy output driver</flag>
 		<flag name="sc68">Atari ST and Amiga music player</flag>
diff --git a/media-sound/picard/picard-2.8.3.ebuild b/media-sound/picard/picard-2.8.3.ebuild
index e50d604072d8..6ee75852aa3a 100644
--- a/media-sound/picard/picard-2.8.3.ebuild
+++ b/media-sound/picard/picard-2.8.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} = *9999* ]]; then
 	inherit git-r3
 else
 	SRC_URI="https://musicbrainz.osuosl.org/pub/musicbrainz/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~x86"
 	S="${WORKDIR}/${PN}-release-${PV}"
 fi
 
diff --git a/media-sound/rawrec/rawrec-0.9.991.ebuild b/media-sound/rawrec/rawrec-0.9.991.ebuild
index 940ba0cdbc25..9f32c4413301 100644
--- a/media-sound/rawrec/rawrec-0.9.991.ebuild
+++ b/media-sound/rawrec/rawrec-0.9.991.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit flag-o-matic toolchain-funcs
+inherit toolchain-funcs
 
 DESCRIPTION="CLI program to play and record audiofiles"
 HOMEPAGE="http://rawrec.sourceforge.net"
diff --git a/media-sound/sndio/sndio-1.8.0-r1.ebuild b/media-sound/sndio/sndio-1.8.0-r1.ebuild
index a8ad1d19994b..707930361c9d 100644
--- a/media-sound/sndio/sndio-1.8.0-r1.ebuild
+++ b/media-sound/sndio/sndio-1.8.0-r1.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == "9999" ]]; then
 	EGIT_MIN_CLONE_TYPE="single+tags"
 else
 	SRC_URI="http://www.sndio.org/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~sparc x86"
 fi
 
 LICENSE="ISC"
diff --git a/media-sound/zynaddsubfx/Manifest b/media-sound/zynaddsubfx/Manifest
index 64dfea5bacae..899fdbeb6639 100644
--- a/media-sound/zynaddsubfx/Manifest
+++ b/media-sound/zynaddsubfx/Manifest
@@ -1,2 +1 @@
-DIST zynaddsubfx-3.0.5.tar.bz2 8141703 BLAKE2B 61f28a62d5ef8c17b5e38febb8ad1ecd40c80f87b26d90804131b97b57534adf5ad96a1f54980b75fd5e71185e2d5376a7df35696c7bcfd593b5d8e34bd2e386 SHA512 1e4d5a6393937e6c7103e6d0e97df76f2d129350854c2f338aa888591091b1508c63e9b52c8e5a176e282ff2f6b72c6a87de54875c412771aff26e8ece2c84e8
 DIST zynaddsubfx-3.0.6.tar.bz2 10001014 BLAKE2B 4adbeffb9bc0bd77bf81a6734f5c26fc676426e644e27cebb8e54e8d74d869c0e1b468782cd1a64aacef8f9b788d434a8d30a194944650eea03c4fd146ee7bf7 SHA512 86311f00d97e20c7eb22a46c99736c56765ed9737e728ef380a324e4a92c731086ed74f5d7bfeae104b690ab1ee1b40bfb8f240bc4c46f8afd47308ec48cbcea
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch
deleted file mode 100644
index 8fbcf9aca56a..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-cmake.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-Fix missing CMake include
-
-Authored by:  Simon van der Veldt 2020-09-30
-Committed by:  Mark McCurry 2020-10-03
-
---- a/src/Nio/CMakeLists.txt
-+++ b/src/Nio/CMakeLists.txt
-@@ -21,6 +21,7 @@
- add_definitions(-DIN_DEFAULT="${DefaultInput}")
- 
- if(JackEnable)
-+    include(CheckIncludeFiles)
-     include_directories(${JACK_INCLUDE_DIR})
-     list(APPEND zynaddsubfx_nio_SRCS JackEngine.cpp JackMultiEngine.cpp)
-     list(APPEND zynaddsubfx_nio_lib ${JACK_LIBRARIES})
diff --git a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-docs.patch b/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-docs.patch
deleted file mode 100644
index 44060eaf4824..000000000000
--- a/media-sound/zynaddsubfx/files/zynaddsubfx-3.0.5-docs.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -28,9 +28,6 @@ include(CTestConfig.cmake)
- add_subdirectory(src)
- add_subdirectory(doc) # Doxygen only
-
--install(FILES AUTHORS.txt COPYING HISTORY.txt README.adoc
--	DESTINATION share/doc/zynaddsubfx
--	)
- install(FILES zynaddsubfx-jack-multi.desktop zynaddsubfx-jack.desktop zynaddsubfx-alsa.desktop zynaddsubfx-oss.desktop
-     DESTINATION share/applications)
- install(FILES zynaddsubfx.svg
diff --git a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild b/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
deleted file mode 100644
index 36d58edcadf9..000000000000
--- a/media-sound/zynaddsubfx/zynaddsubfx-3.0.5.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake flag-o-matic
-
-DESCRIPTION="Software synthesizer capable of making a countless number of instruments"
-HOMEPAGE="http://zynaddsubfx.sourceforge.net/"
-SRC_URI="mirror://sourceforge/zynaddsubfx/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~ppc x86"
-IUSE="alsa doc dssi +fltk jack lash portaudio"
-
-REQUIRED_USE="|| ( alsa jack portaudio )"
-
-BDEPEND="
-	virtual/pkgconfig
-	doc? ( app-doc/doxygen )
-"
-DEPEND="
-	>=dev-libs/mxml-2.2.1
-	media-libs/liblo
-	sci-libs/fftw:3.0
-	sys-libs/zlib
-	alsa? ( media-libs/alsa-lib )
-	dssi? ( media-libs/dssi )
-	fltk? (
-		>=x11-libs/fltk-1.3:1
-		x11-libs/libX11
-		x11-libs/libXpm
-	)
-	jack? ( virtual/jack )
-	lash? ( media-sound/lash )
-	portaudio? ( media-libs/portaudio )
-"
-RDEPEND="${DEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-docs.patch
-	"${FILESDIR}"/${P}-cmake.patch # bug 761823
-)
-
-DOCS=( ChangeLog HISTORY.txt README.adoc )
-
-src_prepare() {
-	cmake_src_prepare
-
-	if ! use dssi; then
-		sed -i -e '/pkg_search_module.*DSSI/s/^/#DONT/' src/CMakeLists.txt || die
-	fi
-	if ! use jack; then
-		sed -e '/pkg_check_modules.*JACK/s/^/#DONT/' -i {rtosc,src}/CMakeLists.txt || die
-	fi
-	if ! use lash; then
-		sed -i -e '/pkg_search_module.*LASH/s/^/#DONT/' src/CMakeLists.txt || die
-	fi
-	if ! use portaudio; then
-		sed -i -e '/pkg_check_modules.*PORTAUDIO/s/^/#DONT/' src/CMakeLists.txt || die
-	fi
-
-	# FIXME upstream: sandbox error
-	sed -i -e '/add_subdirectory(bash-completion)/d' doc/CMakeLists.txt || die
-}
-
-src_configure() {
-	append-cxxflags -std=c++11
-
-	local mycmakeargs=(
-		-DPluginLibDir=$(get_libdir)
-		$(cmake_use_find_package alsa Alsa)
-		$(cmake_use_find_package doc Doxygen)
-		$(cmake_use_find_package fltk FLTK)
-	)
-	cmake_src_configure
-}
-
-src_compile() {
-	cmake_src_compile
-	use doc && cmake_src_compile doc
-}
-
-src_install() {
-	use doc && local HTML_DOCS=( "${BUILD_DIR}"/doc/html/. )
-	cmake_src_install
-	insinto /usr/share/${PN}
-	doins -r instruments/*
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index 9ff2688bcb8e..44394064e630 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 7e8bc7ab76e6..06b8e245b859 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Sep 2022 16:39:49 +0000
+Fri, 23 Sep 2022 04:39:52 +0000
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 082679ccc953..06b8e245b859 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Sep 2022 16:39:50 +0000
+Fri, 23 Sep 2022 04:39:52 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 5f1515454138..49db3812d147 100644
Binary files a/metadata/md5-cache/Manifest.gz and b/metadata/md5-cache/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 37e815fa6dd2..8e2a33617a25 100644
Binary files a/metadata/md5-cache/app-accessibility/Manifest.gz and b/metadata/md5-cache/app-accessibility/Manifest.gz differ
diff --git a/metadata/md5-cache/app-accessibility/nfbtrans-7.74-r2 b/metadata/md5-cache/app-accessibility/nfbtrans-7.74-r2
index cbf1d8960ee4..5032bc0f667c 100644
--- a/metadata/md5-cache/app-accessibility/nfbtrans-7.74-r2
+++ b/metadata/md5-cache/app-accessibility/nfbtrans-7.74-r2
@@ -9,4 +9,4 @@ LICENSE=public-domain
 SLOT=0
 SRC_URI=http://www.nfb.org/Images/nfb/Products_Technology/nfbtr774.zip
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f4d1aea039510bd20c1877fc49252e10
+_md5_=4ec0a19d2065bcf2a58e577f91db5395
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index bc7603946f4f..184dd8792e90 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-lint-6.4.0 b/metadata/md5-cache/app-admin/ansible-lint-6.4.0
deleted file mode 100644
index 0838f76e3206..000000000000
--- a/metadata/md5-cache/app-admin/ansible-lint-6.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools_scm-3.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools_scm_git_archive-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( >=dev-python/flaky-3.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-plus-0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-xdist-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=app-admin/ansible-core-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Checks ansible playbooks for practices and behaviour that can be improved
-EAPI=8
-HOMEPAGE=https://github.com/ansible/ansible-lint
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~riscv
-LICENSE=MIT
-RDEPEND=>=app-admin/ansible-core-2.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ansible-compat-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/enrich-1.2.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-4.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rich-9.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ruamel-yaml-0.15.37[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wcmatch-7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/yamllint-1.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ansible/ansible-lint/archive/refs/tags/v6.4.0.tar.gz -> ansible-lint-6.4.0.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7cd73238fbaf5b7eafad6d46a9a423e6
diff --git a/metadata/md5-cache/app-admin/ansible-lint-6.6.0 b/metadata/md5-cache/app-admin/ansible-lint-6.6.1
similarity index 98%
rename from metadata/md5-cache/app-admin/ansible-lint-6.6.0
rename to metadata/md5-cache/app-admin/ansible-lint-6.6.1
index 28a707fde0fc..2c0d129c2726 100644
--- a/metadata/md5-cache/app-admin/ansible-lint-6.6.0
+++ b/metadata/md5-cache/app-admin/ansible-lint-6.6.1
@@ -11,6 +11,6 @@ RDEPEND=>=app-admin/ansible-core-2.12.0[python_targets_python3_8(-)?,python_targ
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://github.com/ansible/ansible-lint/archive/refs/tags/v6.6.0.tar.gz -> ansible-lint-6.6.0.gh.tar.gz
+SRC_URI=https://github.com/ansible/ansible-lint/archive/refs/tags/v6.6.1.tar.gz -> ansible-lint-6.6.1.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e8b2da02821d9198c2e9a8f57e9a8688
+_md5_=16e5c83f05db756caac3a9c96af43b32
diff --git a/metadata/md5-cache/app-admin/awscli-1.25.79 b/metadata/md5-cache/app-admin/awscli-1.25.79
new file mode 100644
index 000000000000..3a5ea27d5cd0
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.25.79
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.27.78[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.27.78[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.25.79.tar.gz -> aws-cli-1.25.79.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d3e40343c65019dc8ca8907cf3ccfe5a
diff --git a/metadata/md5-cache/app-admin/djbdns-logparse-0.0.1 b/metadata/md5-cache/app-admin/djbdns-logparse-0.0.1
new file mode 100644
index 000000000000..bd32057f5496
--- /dev/null
+++ b/metadata/md5-cache/app-admin/djbdns-logparse-0.0.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( sys-process/daemontools ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Make tinydns and dnscache logs human-readable
+EAPI=8
+HOMEPAGE=http://michael.orlitzky.com/code/djbdns-logparse.xhtml
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=AGPL-3+
+RDEPEND=sys-process/daemontools python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=http://michael.orlitzky.com/code/releases/djbdns-logparse-0.0.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b5ab63965374a326fa3128a3d23be027
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.10-r1 b/metadata/md5-cache/app-admin/sudo-1.9.10-r1
deleted file mode 100644
index 219fe5ad8184..000000000000
--- a/metadata/md5-cache/app-admin/sudo-1.9.10-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-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 ) 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=7
-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 ) 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.10.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.10.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.10.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.10.tar.gz.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=291521f65a7b3c886bcf21da8c433c8e
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.11_p2 b/metadata/md5-cache/app-admin/sudo-1.9.11_p2
deleted file mode 100644
index fbe369b92f1f..000000000000
--- a/metadata/md5-cache/app-admin/sudo-1.9.11_p2
+++ /dev/null
@@ -1,16 +0,0 @@
-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 ) 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 ) 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.11p2.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.11p2.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.11p2.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.11p2.tar.gz.sig )
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=c8468dd9e5db6dc8b9b10074b3864101
diff --git a/metadata/md5-cache/app-admin/sudo-1.9.11_p3 b/metadata/md5-cache/app-admin/sudo-1.9.11_p3-r1
similarity index 75%
rename from metadata/md5-cache/app-admin/sudo-1.9.11_p3
rename to metadata/md5-cache/app-admin/sudo-1.9.11_p3-r1
index f2aea944bc0a..87f8f5169002 100644
--- a/metadata/md5-cache/app-admin/sudo-1.9.11_p3
+++ b/metadata/md5-cache/app-admin/sudo-1.9.11_p3-r1
@@ -1,6 +1,6 @@
 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 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] )
+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/
@@ -8,9 +8,9 @@ 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 ) 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
+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.11p3.tar.gz ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.11p3.tar.gz verify-sig? ( https://www.sudo.ws/sudo/dist/sudo-1.9.11p3.tar.gz.sig ftp://ftp.sudo.ws/pub/sudo/sudo-1.9.11p3.tar.gz.sig )
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=3a80bcd9f2cafb0ef8e559975f665ce5
+_md5_=f812abf28e391fafea4465d609707b7b
diff --git a/metadata/md5-cache/app-admin/sudo-9999 b/metadata/md5-cache/app-admin/sudo-9999
index e31216b98e38..44d3c47bebab 100644
--- a/metadata/md5-cache/app-admin/sudo-9999
+++ b/metadata/md5-cache/app-admin/sudo-9999
@@ -1,6 +1,6 @@
 BDEPEND=sys-devel/bison virtual/pkgconfig >=app-portage/elt-patches-20170815 dev-vcs/mercurial
 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 ) skey? ( >=sys-auth/skey-1.1.5-r1 ) ssl? ( dev-libs/openssl:0= ) sssd? ( sys-auth/sssd[sudo] )
+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/
@@ -8,8 +8,8 @@ INHERIT=pam libtool tmpfiles toolchain-funcs mercurial
 IUSE=gcrypt ldap nls offensive pam sasl +secure-path selinux +sendmail skey ssl sssd
 LICENSE=ISC BSD
 PROPERTIES=live
-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 ) 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
+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
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	mercurial	53b96197cb26db4afb5056f1bbfa4845	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c8468dd9e5db6dc8b9b10074b3864101
+_md5_=a36fba36cb9a635a3bee2b76ff149557
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index 86cc56c1e3ab..8d2df32bf4cc 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/zstd-1.5.2-r1 b/metadata/md5-cache/app-arch/zstd-1.5.2-r2
similarity index 85%
rename from metadata/md5-cache/app-arch/zstd-1.5.2-r1
rename to metadata/md5-cache/app-arch/zstd-1.5.2-r2
index 059e062869f2..dfc6a59507c6 100644
--- a/metadata/md5-cache/app-arch/zstd-1.5.2-r1
+++ b/metadata/md5-cache/app-arch/zstd-1.5.2-r2
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
+DEPEND=app-arch/xz-utils sys-libs/zlib lz4? ( app-arch/lz4 )
 DESCRIPTION=zstd fast compression library
 EAPI=8
 HOMEPAGE=https://facebook.github.io/zstd/
@@ -7,8 +7,8 @@ INHERIT=multilib-minimal toolchain-funcs usr-ldscript
 IUSE=lz4 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
 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 ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( BSD GPL-2 )
-RDEPEND=app-arch/xz-utils lz4? ( app-arch/lz4 )
+RDEPEND=app-arch/xz-utils sys-libs/zlib lz4? ( app-arch/lz4 )
 SLOT=0/1
 SRC_URI=https://github.com/facebook/zstd/archive/v1.5.2.tar.gz -> zstd-1.5.2.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=90a3bec48a5dfce535d69411dcae66c1
+_md5_=66fdb45f3f422420db9b1fecf8266746
diff --git a/metadata/md5-cache/app-cdr/Manifest.gz b/metadata/md5-cache/app-cdr/Manifest.gz
index 74340d5fd63d..f25d242ce9f1 100644
Binary files a/metadata/md5-cache/app-cdr/Manifest.gz and b/metadata/md5-cache/app-cdr/Manifest.gz differ
diff --git a/metadata/md5-cache/app-cdr/kcdemu-0.8.0 b/metadata/md5-cache/app-cdr/kcdemu-0.8.0
index 3b4c5c883b13..383ac36ff4d3 100644
--- a/metadata/md5-cache/app-cdr/kcdemu-0.8.0
+++ b/metadata/md5-cache/app-cdr/kcdemu-0.8.0
@@ -12,4 +12,4 @@ RDEPEND=>=dev-qt/qtdbus-5.12.3:5 >=dev-qt/qtgui-5.12.3:5 >=dev-qt/qtwidgets-5.12
 SLOT=5
 SRC_URI=mirror://sourceforge/project/kde-cdemu-manager/kde_cdemu-0.8.0.tar.bz2
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	6f19455c3ec51029d40be1fdc6cdb8e0	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=be113861172dd5ccfa156678f743ab7d
+_md5_=4811fda3ceacdcf7cf80a5a8ef08e342
diff --git a/metadata/md5-cache/app-containers/Manifest.gz b/metadata/md5-cache/app-containers/Manifest.gz
index 40a57afb83d3..bbfb63892190 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/docker-registry-2.8.1 b/metadata/md5-cache/app-containers/docker-registry-2.8.1
new file mode 100644
index 000000000000..1e7e407717be
--- /dev/null
+++ b/metadata/md5-cache/app-containers/docker-registry-2.8.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-lang/go-1.10 virtual/pkgconfig
+DEFINED_PHASES=compile install prepare unpack
+DEPEND=acct-group/registry acct-user/registry
+DESCRIPTION=Docker Registry 2.0
+EAPI=7
+HOMEPAGE=https://github.com/docker/distribution
+INHERIT=golang-vcs-snapshot systemd
+KEYWORDS=amd64 ~arm64
+LICENSE=Apache-2.0 BSD BSD-2 CC-BY-SA-4.0 MIT ZLIB
+RDEPEND=acct-group/registry acct-user/registry
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/docker/distribution/archive/v2.8.1.tar.gz -> docker-registry-2.8.1.tar.gz
+_eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	6864f899c6843043ba23620fcd4a908c	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=c34de40841fe31307552b736fe9d2e2a
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 2933edf0a25b..23f09676b663 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/gnupg-2.2.35 b/metadata/md5-cache/app-crypt/gnupg-2.2.35
deleted file mode 100644
index 28d1a8a03e91..000000000000
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.35
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) tofu? ( >=dev-db/sqlite-3.7 )
-DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
-EAPI=7
-HOMEPAGE=https://gnupg.org/
-INHERIT=flag-o-matic systemd toolchain-funcs verify-sig
-IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.35.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.2.35.tar.bz2.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a2620d112037536a56875dc414cc8847
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.35-r1 b/metadata/md5-cache/app-crypt/gnupg-2.2.35-r1
deleted file mode 100644
index cb19fff73989..000000000000
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.35-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) tofu? ( >=dev-db/sqlite-3.7 )
-DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
-EAPI=7
-HOMEPAGE=https://gnupg.org/
-INHERIT=flag-o-matic systemd toolchain-funcs verify-sig
-IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.35.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.2.35.tar.bz2.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3ed89e0e3b83310956dd4e4ba4b34a0c
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.36 b/metadata/md5-cache/app-crypt/gnupg-2.2.36
deleted file mode 100644
index c286abbf7ab9..000000000000
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.36
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) tofu? ( >=dev-db/sqlite-3.7 )
-DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
-EAPI=8
-HOMEPAGE=https://gnupg.org/
-INHERIT=flag-o-matic systemd toolchain-funcs verify-sig
-IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.36.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.2.36.tar.bz2.sig )
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=08cc3b41bc2435a6213a493a34fea0a6
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.37 b/metadata/md5-cache/app-crypt/gnupg-2.2.37
deleted file mode 100644
index 466aea0e4a1d..000000000000
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.37
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) tofu? ( >=dev-db/sqlite-3.7 )
-DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
-EAPI=8
-HOMEPAGE=https://gnupg.org/
-INHERIT=flag-o-matic systemd toolchain-funcs verify-sig
-IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.37.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.2.37.tar.bz2.sig )
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=08cc3b41bc2435a6213a493a34fea0a6
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.38 b/metadata/md5-cache/app-crypt/gnupg-2.2.38
deleted file mode 100644
index 534057e86f37..000000000000
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.38
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) tofu? ( >=dev-db/sqlite-3.7 )
-DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
-EAPI=8
-HOMEPAGE=https://gnupg.org/
-INHERIT=flag-o-matic systemd toolchain-funcs verify-sig
-IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl test tofu tools usb user-socket wks-server verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+
-RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgpg-error-1.29 >=dev-libs/libksba-1.3.5 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) ssl? ( >=net-libs/gnutls-3.0:0= ) tofu? ( >=dev-db/sqlite-3.7 ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.38.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.2.38.tar.bz2.sig )
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=9286682a5121e343a9181eba31acfc97
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.3.6 b/metadata/md5-cache/app-crypt/gnupg-2.3.6
deleted file mode 100644
index e59ae785261b..000000000000
--- a/metadata/md5-cache/app-crypt/gnupg-2.3.6
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.9.1:= >=dev-libs/libgpg-error-1.41 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) tofu? ( >=dev-db/sqlite-3.27 ) tpm? ( >=app-crypt/tpm2-tss-2.4.0:= ) ssl? ( >=net-libs/gnutls-3.0:0= )
-DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
-EAPI=7
-HOMEPAGE=https://gnupg.org/
-INHERIT=flag-o-matic systemd toolchain-funcs verify-sig
-IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server 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=GPL-3+
-RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.9.1:= >=dev-libs/libgpg-error-1.41 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) tofu? ( >=dev-db/sqlite-3.27 ) tpm? ( >=app-crypt/tpm2-tss-2.4.0:= ) ssl? ( >=net-libs/gnutls-3.0:0= ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
-REQUIRED_USE=test? ( tofu )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.3.6.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.3.6.tar.bz2.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=353d5107bf35a79e9dfa0c9878d47f3c
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.3.6-r1 b/metadata/md5-cache/app-crypt/gnupg-2.3.6-r1
deleted file mode 100644
index df8966a601e7..000000000000
--- a/metadata/md5-cache/app-crypt/gnupg-2.3.6-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( sys-apps/texinfo ) nls? ( sys-devel/gettext ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.9.1:= >=dev-libs/libgpg-error-1.41 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) tofu? ( >=dev-db/sqlite-3.27 ) tpm? ( >=app-crypt/tpm2-tss-2.4.0:= ) ssl? ( >=net-libs/gnutls-3.0:0= )
-DESCRIPTION=The GNU Privacy Guard, a GPL OpenPGP implementation
-EAPI=7
-HOMEPAGE=https://gnupg.org/
-INHERIT=flag-o-matic systemd toolchain-funcs verify-sig
-IUSE=bzip2 doc ldap nls readline selinux +smartcard ssl test +tofu tpm tools usb user-socket wks-server 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=GPL-3+
-RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.9.1:= >=dev-libs/libgpg-error-1.41 >=dev-libs/libksba-1.3.4 >=dev-libs/npth-1.2 >=net-misc/curl-7.10 sys-libs/zlib bzip2? ( app-arch/bzip2 ) ldap? ( net-nds/openldap:= ) readline? ( sys-libs/readline:0= ) smartcard? ( usb? ( virtual/libusb:1 ) ) tofu? ( >=dev-db/sqlite-3.27 ) tpm? ( >=app-crypt/tpm2-tss-2.4.0:= ) ssl? ( >=net-libs/gnutls-3.0:0= ) app-crypt/pinentry nls? ( virtual/libintl ) selinux? ( sec-policy/selinux-gpg ) wks-server? ( virtual/mta )
-REQUIRED_USE=test? ( tofu )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnupg/gnupg/gnupg-2.3.6.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.3.6.tar.bz2.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a098c0da6a8ddb2fa43b240ddf205e1a
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.18.0 b/metadata/md5-cache/app-crypt/gpgme-1.18.0
deleted file mode 100644
index 83a4a3da94e9..000000000000
--- a/metadata/md5-cache/app-crypt/gpgme-1.18.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python? ( dev-lang/swig ) verify-sig? ( sec-keys/openpgp-keys-gnupg ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) qt5? ( dev-qt/qtcore:5 ) test? ( qt5? ( dev-qt/qttest:5 ) )
-DESCRIPTION=GnuPG Made Easy is a library for making GnuPG easier to use
-EAPI=8
-HOMEPAGE=https://www.gnupg.org/related_software/gpgme
-INHERIT=distutils-r1 libtool flag-o-matic qmake-utils toolchain-funcs verify-sig
-IUSE=common-lisp static-libs +cxx python qt5 test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 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=GPL-2 LGPL-2.1
-RDEPEND=>=app-crypt/gnupg-2 >=dev-libs/libassuan-2.5.3:= >=dev-libs/libgpg-error-1.36:= python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ) qt5? ( dev-qt/qtcore:5 )
-REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
-RESTRICT=!test? ( test )
-SLOT=1/11.6.15.1
-SRC_URI=mirror://gnupg/gpgme/gpgme-1.18.0.tar.bz2 verify-sig? ( mirror://gnupg/gpgme/gpgme-1.18.0.tar.bz2.sig )
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=26b417bbd6b01930361bd9c98a564099
diff --git a/metadata/md5-cache/app-dicts/Manifest.gz b/metadata/md5-cache/app-dicts/Manifest.gz
index ea4fa4aad3fb..49c6d06534b5 100644
Binary files a/metadata/md5-cache/app-dicts/Manifest.gz and b/metadata/md5-cache/app-dicts/Manifest.gz differ
diff --git a/metadata/md5-cache/app-dicts/myspell-de-2017.01.12-r1 b/metadata/md5-cache/app-dicts/myspell-de-2017.01.12-r1
new file mode 100644
index 000000000000..972b5255ed90
--- /dev/null
+++ b/metadata/md5-cache/app-dicts/myspell-de-2017.01.12-r1
@@ -0,0 +1,14 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=install prepare unpack
+DESCRIPTION=German (AT,CH,DE) dictionaries for myspell/hunspell
+EAPI=8
+HOMEPAGE=https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries
+INHERIT=myspell-r2
+IUSE=+l10n_de l10n_de-AT l10n_de-CH l10n_de-DE
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-3 GPL-2 LGPL-3+
+REQUIRED_USE=|| ( l10n_de l10n_de-AT l10n_de-CH l10n_de-DE )
+SLOT=0
+SRC_URI=l10n_de? ( https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries/2017-01.12/@@download/file/dict-de_AT-frami_2017-01-12.oxt https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries/2017-01.12/@@download/file/dict-de_CH-frami_2017-01-12.oxt https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries/2017-01-12/@@download/file/dict-de_DE-frami_2017-01-12.oxt ) l10n_de-AT? ( https://extensions.libreoffice.org/extensions/german-de-at-frami-dictionaries/2017-01.12/@@download/file/dict-de_AT-frami_2017-01-12.oxt ) l10n_de-CH? ( https://extensions.libreoffice.org/extensions/german-de-ch-frami-dictionaries/2017-01.12/@@download/file/dict-de_CH-frami_2017-01-12.oxt ) l10n_de-DE? ( https://extensions.libreoffice.org/extensions/german-de-de-frami-dictionaries/2017-01-12/@@download/file/dict-de_DE-frami_2017-01-12.oxt )
+_eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
+_md5_=bdbe11ba3262ee92237d2ef7e0a55a5c
diff --git a/metadata/md5-cache/app-dicts/myspell-de_1901-20170622 b/metadata/md5-cache/app-dicts/myspell-de_1901-20170622
index 8f5dad3ea30a..63ddecbd235c 100644
--- a/metadata/md5-cache/app-dicts/myspell-de_1901-20170622
+++ b/metadata/md5-cache/app-dicts/myspell-de_1901-20170622
@@ -9,4 +9,4 @@ LICENSE=LGPL-3
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/assets/downloads/z/dict-de-de-1901-oldspell-2017-06-22.oxt
 _eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=0e09f9a6ee3851a21882b213d8c76bc4
+_md5_=89452e5c40428cc6095f9386ac2ff0c3
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20210601-r2 b/metadata/md5-cache/app-dicts/myspell-en-20210601-r2
index d45fcb00c3f6..a18c8e530418 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20210601-r2
+++ b/metadata/md5-cache/app-dicts/myspell-en-20210601-r2
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/assets/downloads/41/dict-en-20210601.oxt
 _eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=c9237b8cc34f7863ca757fec8facaad4
+_md5_=ff4d98365365f7cc8b756d8027e83bf2
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20220701 b/metadata/md5-cache/app-dicts/myspell-en-20220701
index edbfe756c4a8..1a080c3f766a 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20220701
+++ b/metadata/md5-cache/app-dicts/myspell-en-20220701
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/assets/downloads/41/1656659156/dict-en-20220701_lo.oxt
 _eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=4465fef231989d6c15124c06cca5e892
+_md5_=ec12a7166b31d7f6896bbd95f0ff5654
diff --git a/metadata/md5-cache/app-dicts/myspell-en-20220801 b/metadata/md5-cache/app-dicts/myspell-en-20220801
index fa04e71da33d..dc9de4c243c5 100644
--- a/metadata/md5-cache/app-dicts/myspell-en-20220801
+++ b/metadata/md5-cache/app-dicts/myspell-en-20220801
@@ -11,4 +11,4 @@ REQUIRED_USE=|| ( l10n_en l10n_en-AU l10n_en-CA l10n_en-GB l10n_en-US l10n_en-ZA
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/assets/downloads/41/1659325608/dict-en-20220801_lo.oxt
 _eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=96b3e65e8719cf1c6927a6f10ed154bc
+_md5_=32389b4f857247ef4df7bb6f96a0c5ec
diff --git a/metadata/md5-cache/app-dicts/myspell-is-20140808 b/metadata/md5-cache/app-dicts/myspell-is-20140818
similarity index 92%
rename from metadata/md5-cache/app-dicts/myspell-is-20140808
rename to metadata/md5-cache/app-dicts/myspell-is-20140818
index 1a869fc1f214..a2c7628e447b 100644
--- a/metadata/md5-cache/app-dicts/myspell-is-20140808
+++ b/metadata/md5-cache/app-dicts/myspell-is-20140818
@@ -9,4 +9,4 @@ LICENSE=CC-BY-SA-3.0
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/assets/downloads/z/hunspell-is-2014-08-18.oxt
 _eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=5d2084ea6082df9773ad777b858cbf15
+_md5_=0630c6242a9c1e10362ed9e7111f19ee
diff --git a/metadata/md5-cache/app-dicts/myspell-lt-1.3-r1 b/metadata/md5-cache/app-dicts/myspell-lt-1.3-r1
index fe12a55ae621..b4354e0bc326 100644
--- a/metadata/md5-cache/app-dicts/myspell-lt-1.3-r1
+++ b/metadata/md5-cache/app-dicts/myspell-lt-1.3-r1
@@ -9,4 +9,4 @@ LICENSE=BSD
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/assets/downloads/z/openoffice-spellcheck-lt-1-3.oxt
 _eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=838662760fd20e4fe043f2c608135095
+_md5_=e07ce141c15ecde95ac467fe7a12361f
diff --git a/metadata/md5-cache/app-dicts/myspell-sk-20200501 b/metadata/md5-cache/app-dicts/myspell-sk-20200501
index 9fa232f1741c..0bcabcce139a 100644
--- a/metadata/md5-cache/app-dicts/myspell-sk-20200501
+++ b/metadata/md5-cache/app-dicts/myspell-sk-20200501
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/assets/downloads/84/slovak-dictionaries-2020-05.oxt
 _eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=dfe138704bc344d2372e426b04251e24
+_md5_=706f936a8ae073c7956c4b57e9a18627
diff --git a/metadata/md5-cache/app-dicts/myspell-tr-1.2 b/metadata/md5-cache/app-dicts/myspell-tr-1.2
index acf3d708c45e..8f1c6f4969ed 100644
--- a/metadata/md5-cache/app-dicts/myspell-tr-1.2
+++ b/metadata/md5-cache/app-dicts/myspell-tr-1.2
@@ -9,4 +9,4 @@ LICENSE=LGPL-3+
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/assets/downloads/z/oo-turkish-dict-v1-2.oxt
 _eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=4836b2cf71fa3f940e9c404147cd644a
+_md5_=4785d2b528d66ca424cd6d25aa7e688f
diff --git a/metadata/md5-cache/app-dicts/myspell-uk-5.3.1 b/metadata/md5-cache/app-dicts/myspell-uk-5.3.1
index 29eebfc0ec83..09968a121df5 100644
--- a/metadata/md5-cache/app-dicts/myspell-uk-5.3.1
+++ b/metadata/md5-cache/app-dicts/myspell-uk-5.3.1
@@ -9,4 +9,4 @@ LICENSE=GPL-3 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/assets/downloads/521/dict-uk_UA-5.3.1.oxt
 _eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=f6b4fa9a1636162843c58ada55e25638
+_md5_=8314262f84f5e863b5f3a6fd57602d6c
diff --git a/metadata/md5-cache/app-dicts/myspell-uk-5.8.0 b/metadata/md5-cache/app-dicts/myspell-uk-5.8.0
index 7392cfad3c8f..dde4db89b9e5 100644
--- a/metadata/md5-cache/app-dicts/myspell-uk-5.8.0
+++ b/metadata/md5-cache/app-dicts/myspell-uk-5.8.0
@@ -9,4 +9,4 @@ LICENSE=GPL-3 LGPL-2.1 MPL-1.1
 SLOT=0
 SRC_URI=https://extensions.libreoffice.org/assets/downloads/521/1655471128/dict-uk_UA-5.8.0.oxt
 _eclasses_=myspell-r2	f5e1b4abe7064f57dc0b2f962e66a100
-_md5_=7f97578f0283ca517b1a51de01a6e121
+_md5_=c0a453f9af9043f765b1fd1fe8494ef6
diff --git a/metadata/md5-cache/app-doc/Manifest.gz b/metadata/md5-cache/app-doc/Manifest.gz
index 99368bba3b01..bc1053729473 100644
Binary files a/metadata/md5-cache/app-doc/Manifest.gz and b/metadata/md5-cache/app-doc/Manifest.gz differ
diff --git a/metadata/md5-cache/app-doc/mathjax-docs-2.7.7 b/metadata/md5-cache/app-doc/mathjax-docs-2.7.7
index b64091d4d346..505e1a7c9d2a 100644
--- a/metadata/md5-cache/app-doc/mathjax-docs-2.7.7
+++ b/metadata/md5-cache/app-doc/mathjax-docs-2.7.7
@@ -4,9 +4,9 @@ DESCRIPTION=MathJax documentation
 EAPI=7
 HOMEPAGE=https://www.mathjax.org/
 INHERIT=python-any-r1 python-utils-r1 vcs-clean
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=https://github.com/mathjax/MathJax-docs/archive/9d711f40638202b02f2154d7f05ea35088ff9388.tar.gz -> mathjax-docs-2.7.7.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3
-_md5_=e741eab08348799542d15b75f7242680
+_md5_=0f6d8e7b4f3df3c2517b8a2019e1c309
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 8ed5b56baa81..407d324b41be 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/nano-6.2 b/metadata/md5-cache/app-editors/nano-6.2
deleted file mode 100644
index b38bb981b52f..000000000000
--- a/metadata/md5-cache/app-editors/nano-6.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=nls? ( sys-devel/gettext ) virtual/pkgconfig
-DEFINED_PHASES=configure install prepare
-DEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) ) static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:=[static-libs(+)] magic? ( sys-apps/file[static-libs(+)] ) nls? ( virtual/libintl ) )
-DESCRIPTION=GNU GPL'd Pico clone with more functionality
-EAPI=8
-HOMEPAGE=https://www.nano-editor.org/ https://wiki.gentoo.org/wiki/Nano/Basics_Guide
-INHERIT=flag-o-matic
-IUSE=debug justify magic minimal ncurses nls +spell +split-usr static unicode
-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=GPL-3
-RDEPEND=!static? ( >=sys-libs/ncurses-5.9-r1:=[unicode(+)?] sys-libs/ncurses:= magic? ( sys-apps/file ) nls? ( virtual/libintl ) )
-REQUIRED_USE=magic? ( !minimal )
-SLOT=0
-SRC_URI=https://www.nano-editor.org/dist/v6/nano-6.2.tar.gz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=23c57a4beaf3e03fd53b5383a8a33d93
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index baf47278135d..a37c6a023765 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/nxml-libvirt-schemas-8.4.0 b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.4.0
deleted file mode 100644
index 694aa62f8f83..000000000000
--- a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.4.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-text/trang >=app-editors/emacs-23.1:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=Extension for nxml-mode with libvirt schemas
-EAPI=8
-HOMEPAGE=https://www.libvirt.org/
-INHERIT=elisp
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=app-editors/emacs-23.1:*
-SLOT=0
-SRC_URI=https://libvirt.org/sources/libvirt-8.4.0.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=de2635fd9f179dc2c588d1e709153fe2
diff --git a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.5.0 b/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.5.0
deleted file mode 100644
index 230fc546064b..000000000000
--- a/metadata/md5-cache/app-emacs/nxml-libvirt-schemas-8.5.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-text/trang >=app-editors/emacs-23.1:*
-DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
-DESCRIPTION=Extension for nxml-mode with libvirt schemas
-EAPI=8
-HOMEPAGE=https://www.libvirt.org/
-INHERIT=elisp
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1+
-RDEPEND=>=app-editors/emacs-23.1:*
-SLOT=0
-SRC_URI=https://libvirt.org/sources/libvirt-8.5.0.tar.xz
-_eclasses_=elisp	c1c17e9c24d72d3bd58c611de8116fb6	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
-_md5_=de2635fd9f179dc2c588d1e709153fe2
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index c3f9cf590313..8b7a3707925e 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/diskimage-builder-3.23.1 b/metadata/md5-cache/app-emulation/diskimage-builder-3.23.1
index 222cd10ba28b..b06a6b11e143 100644
--- a/metadata/md5-cache/app-emulation/diskimage-builder-3.23.1
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-3.23.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-2.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/Babel-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/networkx-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 SLOT=0
 SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-3.23.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=79f798ac592d4e61bc5153611258127f
+_md5_=e59bd285f0f5188e941534a617c82361
diff --git a/metadata/md5-cache/app-emulation/diskimage-builder-3.25.0 b/metadata/md5-cache/app-emulation/diskimage-builder-3.25.0
new file mode 100644
index 000000000000..101cdb199b0f
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/diskimage-builder-3.25.0
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=Golden Disk Image builder
+EAPI=8
+HOMEPAGE=http://docs.openstack.org/developer/diskimage-builder/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/pbr-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/pbr-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/Babel-2.3.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !~dev-python/Babel-2.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/networkx-1.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/six-1.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/stevedore-1.20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] app-emulation/qemu sys-block/parted sys-fs/multipath-tools sys-fs/dosfstools sys-apps/gptfdisk !dev-python/dib-utils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/d/diskimage-builder/diskimage-builder-3.25.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=79f798ac592d4e61bc5153611258127f
diff --git a/metadata/md5-cache/app-emulation/libvirt-7.10.0-r3 b/metadata/md5-cache/app-emulation/libvirt-7.10.0-r3
deleted file mode 100644
index febc6708a405..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-7.10.0-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) >=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 prepare setup test unpack
-DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/readline:= 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:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) 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:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=7
-HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
-INHERIT=meson bash-completion-r1 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 lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/readline:= 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:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) 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:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) virtual/tmpfiles
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/7.10.0
-SRC_URI=https://libvirt.org/sources/libvirt-7.10.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-7.10.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=b41df842e8e6d1fc6a94e901e14f89fc
diff --git a/metadata/md5-cache/app-emulation/libvirt-8.0.0-r2 b/metadata/md5-cache/app-emulation/libvirt-8.0.0-r2
deleted file mode 100644
index 318d31e1e3e5..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-8.0.0-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) >=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 prepare setup test unpack
-DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/readline:= 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:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) 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:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=7
-HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
-INHERIT=meson bash-completion-r1 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 lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/readline:= 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:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) 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:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) virtual/tmpfiles
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/8.0.0
-SRC_URI=https://libvirt.org/sources/libvirt-8.0.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-8.0.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=66e6fca51e92a4d2cceec36e2f54a82f
diff --git a/metadata/md5-cache/app-emulation/libvirt-8.1.0 b/metadata/md5-cache/app-emulation/libvirt-8.1.0
deleted file mode 100644
index 326fab11eed4..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-8.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) >=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 prepare setup test unpack
-DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/readline:= 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:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) 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:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=7
-HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
-INHERIT=meson bash-completion-r1 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 lxc nfs nls numa openvz parted pcap policykit +qemu rbd sasl selinux +udev virtualbox +virt-network wireshark-plugins xen zfs verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.48.0 dev-libs/libgcrypt:0 dev-libs/libnl:3 >=dev-libs/libxml2-2.7.6 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-1.0.25:0= net-libs/libssh2 net-libs/libtirpc >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext sys-libs/readline:= 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:0= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( sys-block/open-iscsi ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( net-libs/libssh ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.0.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 dev-libs/yajl ) rbd? ( sys-cluster/ceph ) sasl? ( dev-libs/cyrus-sasl ) 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:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) virtual/tmpfiles
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/8.1.0
-SRC_URI=https://libvirt.org/sources/libvirt-8.1.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-8.1.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=77c2a702ee2cbe9d92bd381cfc9e74a7
diff --git a/metadata/md5-cache/app-emulation/libvirt-8.3.0 b/metadata/md5-cache/app-emulation/libvirt-8.3.0
deleted file mode 100644
index 6efbf8a8d164..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-8.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) >=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 prepare setup test unpack
-DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) 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.7:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 >=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 ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=8
-HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
-INHERIT=meson bash-completion-r1 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 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2.1
-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.7:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 >=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
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/8.3.0
-SRC_URI=https://libvirt.org/sources/libvirt-8.3.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-8.3.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=e09a0af33617187180f7c7fa2912e060
diff --git a/metadata/md5-cache/app-emulation/libvirt-8.4.0 b/metadata/md5-cache/app-emulation/libvirt-8.4.0
deleted file mode 100644
index 626336f68740..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-8.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) >=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 prepare setup test unpack
-DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) 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.7:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 >=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 ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=8
-HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
-INHERIT=meson bash-completion-r1 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
-LICENSE=LGPL-2.1
-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.7:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 >=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
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/8.4.0
-SRC_URI=https://libvirt.org/sources/libvirt-8.4.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-8.4.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=920efaed583db869b4ed9c65f3f60bb7
diff --git a/metadata/md5-cache/app-emulation/libvirt-8.5.0 b/metadata/md5-cache/app-emulation/libvirt-8.5.0
deleted file mode 100644
index eb6747972246..000000000000
--- a/metadata/md5-cache/app-emulation/libvirt-8.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) >=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 prepare setup test unpack
-DEPEND=app-text/xhtml1 dev-lang/perl dev-libs/libxslt dev-perl/XML-XPath dev-python/docutils virtual/pkgconfig net-libs/rpcsvc-proto bash-completion? ( >=app-shells/bash-completion-2.0 ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) 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.7:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 >=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 ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
-DESCRIPTION=C toolkit to manipulate virtual machines
-EAPI=8
-HOMEPAGE=https://www.libvirt.org/ https://gitlab.com/libvirt/libvirt/
-INHERIT=meson bash-completion-r1 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
-LICENSE=LGPL-2.1
-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.7:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[-device-mapper-only(-)] ) 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[-device-mapper-only(-)] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-2.11 >=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
-REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
-SLOT=0/8.5.0
-SRC_URI=https://libvirt.org/sources/libvirt-8.5.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-8.5.0.tar.xz.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=9e2e2ba3fb56a5840ac2523573db4057
diff --git a/metadata/md5-cache/app-emulation/protontricks-1.9.2 b/metadata/md5-cache/app-emulation/protontricks-1.9.2
new file mode 100644
index 000000000000..eea0c0d6001c
--- /dev/null
+++ b/metadata/md5-cache/app-emulation/protontricks-1.9.2
@@ -0,0 +1,16 @@
+BDEPEND=python_single_target_pypy3? ( dev-python/setuptools_scm[python_targets_pypy3(-)] ) python_single_target_python3_8? ( dev-python/setuptools_scm[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools_scm[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools_scm[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools_scm[python_targets_python3_11(-)] ) test? ( app-emulation/winetricks python_single_target_pypy3? ( dev-python/setuptools[python_targets_pypy3(-)] dev-python/vdf[python_targets_pypy3(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] dev-python/vdf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] dev-python/vdf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] dev-python/vdf[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] dev-python/vdf[python_targets_python3_11(-)] ) gui? ( gnome-extra/zenity || ( app-emulation/winetricks[gtk] app-emulation/winetricks[kde] ) ) python_single_target_pypy3? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)] ) python_single_target_python3_8? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/pytest-7.1.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/pytest-7.1.2[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/pytest-7.1.2[python_targets_python3_11(-)] ) ) python_single_target_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_pypy3? ( >=dev-python/gpep517-8[python_targets_pypy3(-)] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)] dev-python/wheel[python_targets_pypy3(-)] ) python_single_target_python3_8? ( >=dev-python/gpep517-8[python_targets_python3_8(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)] dev-python/wheel[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/gpep517-8[python_targets_python3_9(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_9(-)] dev-python/wheel[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/gpep517-8[python_targets_python3_10(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_10(-)] dev-python/wheel[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/gpep517-8[python_targets_python3_11(-)] >=dev-python/setuptools-62.6.0[python_targets_python3_11(-)] dev-python/wheel[python_targets_python3_11(-)] )
+DEFINED_PHASES=compile configure install postinst postrm prepare setup test
+DESCRIPTION=app-emulation/winetricks wrapper for Proton (Steam Play) games
+EAPI=8
+HOMEPAGE=https://github.com/Matoking/protontricks
+INHERIT=distutils-r1 xdg-utils
+IUSE=+gui test python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64
+LICENSE=GPL-3
+RDEPEND=app-emulation/winetricks python_single_target_pypy3? ( dev-python/setuptools[python_targets_pypy3(-)] dev-python/vdf[python_targets_pypy3(-)] ) python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] dev-python/vdf[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] dev-python/vdf[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] dev-python/vdf[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/setuptools[python_targets_python3_11(-)] dev-python/vdf[python_targets_python3_11(-)] ) gui? ( gnome-extra/zenity || ( app-emulation/winetricks[gtk] app-emulation/winetricks[kde] ) ) python_single_target_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=^^ ( python_single_target_pypy3 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/protontricks/protontricks-1.9.2.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=c19b260ac756f9281a500ffd1dc9f439
diff --git a/metadata/md5-cache/app-emulation/ruffle-0_p20220816 b/metadata/md5-cache/app-emulation/ruffle-0_p20220816
index 591685813b6a..fbc847282acc 100644
--- a/metadata/md5-cache/app-emulation/ruffle-0_p20220816
+++ b/metadata/md5-cache/app-emulation/ruffle-0_p20220816
@@ -13,4 +13,4 @@ RDEPEND=dev-libs/glib:2 dev-libs/openssl:= media-libs/alsa-lib sys-libs/zlib:= x
 SLOT=0
 SRC_URI=https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-2022-08-16.tar.gz -> ruffle-nightly-2022-08-16.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/ahash/0.7.6/download -> ahash-0.7.6.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/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.2/download -> android_system_properties-0.1.2.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.61/download -> anyhow-1.0.61.crate https://crates.io/api/v1/crates/approx/0.5.1/download -> approx-0.5.1.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.crate https://crates.io/api/v1/crates/ash/0.37.0+1.3.209/download -> ash-0.37.0+1.3.209.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/atk-sys/0.15.1/download -> atk-sys-0.15.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bindgen/0.59.2/download -> bindgen-0.59.2.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/bitflags_serde_shim/0.2.2/download -> bitflags_serde_shim-0.2.2.crate https://crates.io/api/v1/crates/bitstream-io/1.5.0/download -> bitstream-io-1.5.0.crate https://crates.io/api/v1/crates/bitvec/0.19.6/download -> bitvec-0.19.6.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.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/build_const/0.2.2/download -> build_const-0.2.2.crate https://crates.io/api/v1/crates/bumpalo/3.10.0/download -> bumpalo-3.10.0.crate https://crates.io/api/v1/crates/bytemuck/1.12.0/download -> bytemuck-1.12.0.crate https://crates.io/api/v1/crates/bytemuck_derive/1.2.0/download -> bytemuck_derive-1.2.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.2.0/download -> bytes-1.2.0.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/cairo-sys-rs/0.15.1/download -> cairo-sys-rs-0.15.1.crate https://crates.io/api/v1/crates/calloop/0.9.3/download -> calloop-0.9.3.crate https://crates.io/api/v1/crates/castaway/0.1.2/download -> castaway-0.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/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-expr/0.10.3/download -> cfg-expr-0.10.3.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/cfg_aliases/0.1.1/download -> cfg_aliases-0.1.1.crate https://crates.io/api/v1/crates/chrono/0.4.20/download -> chrono-0.4.20.crate https://crates.io/api/v1/crates/clang-sys/1.3.3/download -> clang-sys-1.3.3.crate https://crates.io/api/v1/crates/clap/3.2.17/download -> clap-3.2.17.crate https://crates.io/api/v1/crates/clap_derive/3.2.17/download -> clap_derive-3.2.17.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/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/cocoa/0.24.0/download -> cocoa-0.24.0.crate https://crates.io/api/v1/crates/cocoa-foundation/0.1.0/download -> cocoa-foundation-0.1.0.crate https://crates.io/api/v1/crates/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/combine/4.6.4/download -> combine-4.6.4.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/console/0.15.0/download -> console-0.15.0.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/convert_case/0.5.0/download -> convert_case-0.5.0.crate https://crates.io/api/v1/crates/cookie-factory/0.3.2/download -> cookie-factory-0.3.2.crate https://crates.io/api/v1/crates/copyless/0.1.5/download -> copyless-0.1.5.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/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-graphics/0.22.3/download -> core-graphics-0.22.3.crate https://crates.io/api/v1/crates/core-graphics-types/0.1.1/download -> core-graphics-types-0.1.1.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.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.10/download -> coreaudio-sys-0.2.10.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.2/download -> cpufeatures-0.2.2.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.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.10/download -> crossbeam-epoch-0.9.10.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.11/download -> crossbeam-utils-0.8.11.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/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/ctor/0.1.22/download -> ctor-0.1.22.crate https://crates.io/api/v1/crates/cty/0.2.2/download -> cty-0.2.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/d3d12/0.5.0/download -> d3d12-0.5.0.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/deflate/1.0.0/download -> deflate-1.0.0.crate https://crates.io/api/v1/crates/derive-try-from-primitive/1.0.0/download -> derive-try-from-primitive-1.0.0.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.3/download -> digest-0.10.3.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/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.5.0/download -> dlib-0.5.0.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/either/1.7.0/download -> either-1.7.0.crate https://crates.io/api/v1/crates/embed-resource/1.7.3/download -> embed-resource-1.7.3.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.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/enum-map/2.4.1/download -> enum-map-2.4.1.crate https://crates.io/api/v1/crates/enum-map-derive/0.10.0/download -> enum-map-derive-0.10.0.crate https://crates.io/api/v1/crates/enumset/1.0.11/download -> enumset-1.0.11.crate https://crates.io/api/v1/crates/enumset_derive/0.6.0/download -> enumset_derive-0.6.0.crate https://crates.io/api/v1/crates/env_logger/0.9.0/download -> env_logger-0.9.0.crate https://crates.io/api/v1/crates/euclid/0.22.7/download -> euclid-0.22.7.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/exr/1.4.2/download -> exr-1.4.2.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/float_next_after/0.1.5/download -> float_next_after-0.1.5.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/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/funty/1.1.0/download -> funty-1.1.0.crate https://crates.io/api/v1/crates/futures/0.3.23/download -> futures-0.3.23.crate https://crates.io/api/v1/crates/futures-channel/0.3.23/download -> futures-channel-0.3.23.crate https://crates.io/api/v1/crates/futures-core/0.3.23/download -> futures-core-0.3.23.crate https://crates.io/api/v1/crates/futures-executor/0.3.23/download -> futures-executor-0.3.23.crate https://crates.io/api/v1/crates/futures-io/0.3.23/download -> futures-io-0.3.23.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.23/download -> futures-macro-0.3.23.crate https://crates.io/api/v1/crates/futures-sink/0.3.23/download -> futures-sink-0.3.23.crate https://crates.io/api/v1/crates/futures-task/0.3.23/download -> futures-task-0.3.23.crate https://crates.io/api/v1/crates/futures-util/0.3.23/download -> futures-util-0.3.23.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/gdk-pixbuf-sys/0.15.10/download -> gdk-pixbuf-sys-0.15.10.crate https://crates.io/api/v1/crates/gdk-sys/0.15.1/download -> gdk-sys-0.15.1.crate https://crates.io/api/v1/crates/generational-arena/0.2.8/download -> generational-arena-0.2.8.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/gif/0.11.4/download -> gif-0.11.4.crate https://crates.io/api/v1/crates/gio-sys/0.15.10/download -> gio-sys-0.15.10.crate https://crates.io/api/v1/crates/glib-sys/0.15.10/download -> glib-sys-0.15.10.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/glow/0.11.2/download -> glow-0.11.2.crate https://crates.io/api/v1/crates/gobject-sys/0.15.10/download -> gobject-sys-0.15.10.crate https://crates.io/api/v1/crates/gpu-alloc/0.5.3/download -> gpu-alloc-0.5.3.crate https://crates.io/api/v1/crates/gpu-alloc-types/0.2.0/download -> gpu-alloc-types-0.2.0.crate https://crates.io/api/v1/crates/gpu-descriptor/0.2.2/download -> gpu-descriptor-0.2.2.crate https://crates.io/api/v1/crates/gpu-descriptor-types/0.1.1/download -> gpu-descriptor-types-0.1.1.crate https://crates.io/api/v1/crates/gtk-sys/0.15.3/download -> gtk-sys-0.15.3.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.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/heck/0.4.0/download -> heck-0.4.0.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/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/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/image/0.24.3/download -> image-0.24.3.crate https://crates.io/api/v1/crates/indexmap/1.9.1/download -> indexmap-1.9.1.crate https://crates.io/api/v1/crates/indicatif/0.17.0/download -> indicatif-0.17.0.crate https://crates.io/api/v1/crates/inflate/0.4.5/download -> inflate-0.4.5.crate https://crates.io/api/v1/crates/inplace_it/0.3.4/download -> inplace_it-0.3.4.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/isahc/1.7.2/download -> isahc-1.7.2.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.2/download -> itoa-1.0.2.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.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/jpeg-decoder/0.2.6/download -> jpeg-decoder-0.2.6.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/khronos-egl/4.1.0/download -> khronos-egl-4.1.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/lebe/0.5.1/download -> lebe-0.5.1.crate https://crates.io/api/v1/crates/lexical-core/0.7.6/download -> lexical-core-0.7.6.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/libflate/1.2.0/download -> libflate-1.2.0.crate https://crates.io/api/v1/crates/libflate_lz77/1.1.0/download -> libflate_lz77-1.1.0.crate https://crates.io/api/v1/crates/libloading/0.7.3/download -> libloading-0.7.3.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.7+1.45.0/download -> libnghttp2-sys-0.1.7+1.45.0.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/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/lyon/1.0.0/download -> lyon-1.0.0.crate https://crates.io/api/v1/crates/lyon_algorithms/1.0.0/download -> lyon_algorithms-1.0.0.crate https://crates.io/api/v1/crates/lyon_geom/1.0.1/download -> lyon_geom-1.0.1.crate https://crates.io/api/v1/crates/lyon_path/1.0.0/download -> lyon_path-1.0.0.crate https://crates.io/api/v1/crates/lyon_tessellation/1.0.1/download -> lyon_tessellation-1.0.1.crate https://crates.io/api/v1/crates/lzma-rs/0.2.0/download -> lzma-rs-0.2.0.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/matches/0.1.9/download -> matches-0.1.9.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.3.1/download -> memmap2-0.3.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/metal/0.24.0/download -> metal-0.24.0.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/minimp3/0.5.1/download -> minimp3-0.5.1.crate https://crates.io/api/v1/crates/minimp3-sys/0.3.2/download -> minimp3-sys-0.3.2.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/mio/0.8.4/download -> mio-0.8.4.crate https://crates.io/api/v1/crates/naga/0.9.0/download -> naga-0.9.0.crate https://crates.io/api/v1/crates/nanorand/0.7.0/download -> nanorand-0.7.0.crate https://crates.io/api/v1/crates/ndk/0.5.0/download -> ndk-0.5.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.5.2/download -> ndk-glue-0.5.2.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.2.2/download -> ndk-sys-0.2.2.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.22.3/download -> nix-0.22.3.crate https://crates.io/api/v1/crates/nix/0.23.1/download -> nix-0.23.1.crate https://crates.io/api/v1/crates/nom/6.1.2/download -> nom-6.1.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-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-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.13.1/download -> num_cpus-1.13.1.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/number_prefix/0.4.0/download -> number_prefix-0.4.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_exception/0.1.2/download -> objc_exception-0.1.2.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/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/once_cell/1.13.0/download -> once_cell-1.13.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/os_str_bytes/6.2.0/download -> os_str_bytes-6.2.0.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/pango-sys/0.15.10/download -> pango-sys-0.15.10.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/0.12.1/download -> parking_lot-0.12.1.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/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.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/peeking_take_while/0.1.2/download -> peeking_take_while-0.1.2.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/1.0.11/download -> pin-project-1.0.11.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.11/download -> pin-project-internal-1.0.11.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.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/png/0.17.5/download -> png-0.17.5.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/pretty_assertions/1.2.1/download -> pretty_assertions-1.2.1.crate https://crates.io/api/v1/crates/primal-check/0.3.1/download -> primal-check-0.3.1.crate https://crates.io/api/v1/crates/proc-macro-crate/1.1.3/download -> proc-macro-crate-1.1.3.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.43/download -> proc-macro2-1.0.43.crate https://crates.io/api/v1/crates/profiling/1.0.6/download -> profiling-1.0.6.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/radium/0.5.3/download -> radium-0.5.3.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.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/range-alloc/0.1.2/download -> range-alloc-0.1.2.crate https://crates.io/api/v1/crates/raw-window-handle/0.4.3/download -> raw-window-handle-0.4.3.crate https://crates.io/api/v1/crates/raw-window-handle/0.5.0/download -> raw-window-handle-0.5.0.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.15/download -> redox_syscall-0.2.15.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.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/regress/0.4.1/download -> regress-0.4.1.crate https://crates.io/api/v1/crates/renderdoc-sys/0.7.1/download -> renderdoc-sys-0.7.1.crate https://crates.io/api/v1/crates/rfd/0.10.0/download -> rfd-0.10.0.crate https://crates.io/api/v1/crates/rle-decode-fast/1.0.3/download -> rle-decode-fast-1.0.3.crate https://crates.io/api/v1/crates/ron/0.7.1/download -> ron-0.7.1.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_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustdct/0.7.0/download -> rustdct-0.7.0.crate https://crates.io/api/v1/crates/rustfft/6.0.1/download -> rustfft-6.0.1.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/safe_arch/0.6.0/download -> safe_arch-0.6.0.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/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.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/semver/1.0.12/download -> semver-1.0.12.crate https://crates.io/api/v1/crates/serde/1.0.143/download -> serde-1.0.143.crate https://crates.io/api/v1/crates/serde_derive/1.0.143/download -> serde_derive-1.0.143.crate https://crates.io/api/v1/crates/serde_json/1.0.83/download -> serde_json-1.0.83.crate https://crates.io/api/v1/crates/sha2/0.10.2/download -> sha2-0.10.2.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/slice-deque/0.3.0/download -> slice-deque-0.3.0.crate https://crates.io/api/v1/crates/slotmap/1.0.6/download -> slotmap-1.0.6.crate https://crates.io/api/v1/crates/sluice/0.5.5/download -> sluice-0.5.5.crate https://crates.io/api/v1/crates/smallvec/1.9.0/download -> smallvec-1.9.0.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.15.4/download -> smithay-client-toolkit-0.15.4.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/spin/0.9.4/download -> spin-0.9.4.crate https://crates.io/api/v1/crates/spirv/0.2.0+1.5.4/download -> spirv-0.2.0+1.5.4.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/stdweb/0.1.3/download -> stdweb-0.1.3.crate https://crates.io/api/v1/crates/strength_reduce/0.2.3/download -> strength_reduce-0.2.3.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/symphonia/0.5.1/download -> symphonia-0.5.1.crate https://crates.io/api/v1/crates/symphonia-bundle-mp3/0.5.1/download -> symphonia-bundle-mp3-0.5.1.crate https://crates.io/api/v1/crates/symphonia-core/0.5.1/download -> symphonia-core-0.5.1.crate https://crates.io/api/v1/crates/symphonia-metadata/0.5.1/download -> symphonia-metadata-0.5.1.crate https://crates.io/api/v1/crates/syn/1.0.99/download -> syn-1.0.99.crate https://crates.io/api/v1/crates/synstructure/0.12.6/download -> synstructure-0.12.6.crate https://crates.io/api/v1/crates/system-deps/6.0.2/download -> system-deps-6.0.2.crate https://crates.io/api/v1/crates/tap/1.0.1/download -> tap-1.0.1.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/textwrap/0.15.0/download -> textwrap-0.15.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/threadpool/1.8.1/download -> threadpool-1.8.1.crate https://crates.io/api/v1/crates/tiff/0.7.3/download -> tiff-0.7.3.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.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tracing/0.1.35/download -> tracing-0.1.35.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.22/download -> tracing-attributes-0.1.22.crate https://crates.io/api/v1/crates/tracing-core/0.1.28/download -> tracing-core-0.1.28.crate https://crates.io/api/v1/crates/tracing-futures/0.2.5/download -> tracing-futures-0.2.5.crate https://crates.io/api/v1/crates/transpose/0.2.1/download -> transpose-0.2.1.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.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.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-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.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-compare/0.1.0/download -> version-compare-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/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.1/download -> vswhom-sys-0.1.1.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.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.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-futures/0.4.32/download -> wasm-bindgen-futures-0.4.32.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/wayland-client/0.29.4/download -> wayland-client-0.29.4.crate https://crates.io/api/v1/crates/wayland-commons/0.29.4/download -> wayland-commons-0.29.4.crate https://crates.io/api/v1/crates/wayland-cursor/0.29.4/download -> wayland-cursor-0.29.4.crate https://crates.io/api/v1/crates/wayland-protocols/0.29.4/download -> wayland-protocols-0.29.4.crate https://crates.io/api/v1/crates/wayland-scanner/0.29.4/download -> wayland-scanner-0.29.4.crate https://crates.io/api/v1/crates/wayland-sys/0.29.4/download -> wayland-sys-0.29.4.crate https://crates.io/api/v1/crates/weak-table/0.3.2/download -> weak-table-0.3.2.crate https://crates.io/api/v1/crates/web-sys/0.3.58/download -> web-sys-0.3.58.crate https://crates.io/api/v1/crates/webbrowser/0.7.1/download -> webbrowser-0.7.1.crate https://crates.io/api/v1/crates/weezl/0.1.7/download -> weezl-0.1.7.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/wgpu/0.13.1/download -> wgpu-0.13.1.crate https://crates.io/api/v1/crates/wgpu-core/0.13.2/download -> wgpu-core-0.13.2.crate https://crates.io/api/v1/crates/wgpu-hal/0.13.2/download -> wgpu-hal-0.13.2.crate https://crates.io/api/v1/crates/wgpu-types/0.13.2/download -> wgpu-types-0.13.2.crate https://crates.io/api/v1/crates/wide/0.7.4/download -> wide-0.7.4.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.37.0/download -> windows-0.37.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_aarch64_msvc/0.37.0/download -> windows_aarch64_msvc-0.37.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.37.0/download -> windows_i686_gnu-0.37.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.37.0/download -> windows_i686_msvc-0.37.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.37.0/download -> windows_x86_64_gnu-0.37.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.37.0/download -> windows_x86_64_msvc-0.37.0.crate https://crates.io/api/v1/crates/winit/0.26.1/download -> winit-0.26.1.crate https://crates.io/api/v1/crates/winreg/0.10.1/download -> winreg-0.10.1.crate https://crates.io/api/v1/crates/wyz/0.2.0/download -> wyz-0.2.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/x11-dl/2.19.1/download -> x11-dl-2.19.1.crate https://crates.io/api/v1/crates/xcb/0.8.2/download -> xcb-0.8.2.crate https://crates.io/api/v1/crates/xcursor/0.3.4/download -> xcursor-0.3.4.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://github.com/RustAudio/dasp/archive/f05a703d247bb504d7e812b51e95f3765d9c5e94.tar.gz -> dasp-f05a703d247bb504d7e812b51e95f3765d9c5e94.tar.gz https://github.com/ruffle-rs/gc-arena/archive/4882182850be9df64565509d8489587a2f60171c.tar.gz -> gc-arena-4882182850be9df64565509d8489587a2f60171c.tar.gz https://github.com/ruffle-rs/h263-rs/archive/023e14c73e565c4c778d41f66cfbac5ece6419b2.tar.gz -> h263-rs-023e14c73e565c4c778d41f66cfbac5ece6419b2.tar.gz https://github.com/ruffle-rs/nellymoser/archive/4a33521c29a918950df8ae9fe07e527ac65553f5.tar.gz -> nellymoser-4a33521c29a918950df8ae9fe07e527ac65553f5.tar.gz https://github.com/ruffle-rs/nihav-vp6/archive/9416fcc9fc8aab8f4681aa9093b42922214abbd3.tar.gz -> nihav-vp6-9416fcc9fc8aab8f4681aa9093b42922214abbd3.tar.gz https://github.com/ruffle-rs/quick-xml/archive/8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz -> quick-xml-8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz https://github.com/ruffle-rs/rust-flash-lso/archive/19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz -> rust-flash-lso-19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=399f1437de5654e85657522c71ec17e4
+_md5_=c937ee6713147eeb4f4949c96a5b598c
diff --git a/metadata/md5-cache/app-emulation/ruffle-0_p20220914 b/metadata/md5-cache/app-emulation/ruffle-0_p20220914
index 878afa1d3f0a..86633dc65a0b 100644
--- a/metadata/md5-cache/app-emulation/ruffle-0_p20220914
+++ b/metadata/md5-cache/app-emulation/ruffle-0_p20220914
@@ -13,4 +13,4 @@ RDEPEND=dev-libs/glib:2 dev-libs/openssl:= media-libs/alsa-lib sys-libs/zlib:= x
 SLOT=0
 SRC_URI=https://github.com/ruffle-rs/ruffle/archive/refs/tags/nightly-2022-09-14.tar.gz -> ruffle-nightly-2022-09-14.tar.gz 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/adler32/1.2.0/download -> adler32-1.2.0.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.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/aliasable/0.1.3/download -> aliasable-0.1.3.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.2/download -> android_system_properties-0.1.2.crate https://crates.io/api/v1/crates/anyhow/1.0.64/download -> anyhow-1.0.64.crate https://crates.io/api/v1/crates/approx/0.5.1/download -> approx-0.5.1.crate https://crates.io/api/v1/crates/arrayvec/0.5.2/download -> arrayvec-0.5.2.crate https://crates.io/api/v1/crates/arrayvec/0.7.2/download -> arrayvec-0.7.2.crate https://crates.io/api/v1/crates/ash/0.37.0+1.3.209/download -> ash-0.37.0+1.3.209.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/atk-sys/0.15.1/download -> atk-sys-0.15.1.crate https://crates.io/api/v1/crates/atty/0.2.14/download -> atty-0.2.14.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/base64/0.13.0/download -> base64-0.13.0.crate https://crates.io/api/v1/crates/bindgen/0.59.2/download -> bindgen-0.59.2.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/bitflags_serde_shim/0.2.2/download -> bitflags_serde_shim-0.2.2.crate https://crates.io/api/v1/crates/bitstream-io/1.5.0/download -> bitstream-io-1.5.0.crate https://crates.io/api/v1/crates/bitvec/0.19.6/download -> bitvec-0.19.6.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.2/download -> block-buffer-0.10.2.crate https://crates.io/api/v1/crates/bstr/0.2.17/download -> bstr-0.2.17.crate https://crates.io/api/v1/crates/build_const/0.2.2/download -> build_const-0.2.2.crate https://crates.io/api/v1/crates/bumpalo/3.11.0/download -> bumpalo-3.11.0.crate https://crates.io/api/v1/crates/bytemuck/1.12.1/download -> bytemuck-1.12.1.crate https://crates.io/api/v1/crates/bytemuck_derive/1.2.1/download -> bytemuck_derive-1.2.1.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.2.0/download -> bytes-1.2.0.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/cairo-sys-rs/0.15.1/download -> cairo-sys-rs-0.15.1.crate https://crates.io/api/v1/crates/calloop/0.9.3/download -> calloop-0.9.3.crate https://crates.io/api/v1/crates/castaway/0.1.2/download -> castaway-0.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/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-expr/0.10.3/download -> cfg-expr-0.10.3.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/cfg_aliases/0.1.1/download -> cfg_aliases-0.1.1.crate https://crates.io/api/v1/crates/chrono/0.4.20/download -> chrono-0.4.20.crate https://crates.io/api/v1/crates/clang-sys/1.3.3/download -> clang-sys-1.3.3.crate https://crates.io/api/v1/crates/clap/3.2.20/download -> clap-3.2.20.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/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/cocoa/0.24.0/download -> cocoa-0.24.0.crate https://crates.io/api/v1/crates/cocoa-foundation/0.1.0/download -> cocoa-foundation-0.1.0.crate https://crates.io/api/v1/crates/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/combine/4.6.4/download -> combine-4.6.4.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/console/0.15.0/download -> console-0.15.0.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/convert_case/0.6.0/download -> convert_case-0.6.0.crate https://crates.io/api/v1/crates/cookie-factory/0.3.2/download -> cookie-factory-0.3.2.crate https://crates.io/api/v1/crates/copyless/0.1.5/download -> copyless-0.1.5.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/core-graphics/0.19.2/download -> core-graphics-0.19.2.crate https://crates.io/api/v1/crates/core-graphics/0.22.3/download -> core-graphics-0.22.3.crate https://crates.io/api/v1/crates/core-graphics-types/0.1.1/download -> core-graphics-types-0.1.1.crate https://crates.io/api/v1/crates/core-video-sys/0.1.4/download -> core-video-sys-0.1.4.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.10/download -> coreaudio-sys-0.2.10.crate https://crates.io/api/v1/crates/cpal/0.14.0/download -> cpal-0.14.0.crate https://crates.io/api/v1/crates/cpufeatures/0.2.2/download -> cpufeatures-0.2.2.crate https://crates.io/api/v1/crates/crc/1.8.1/download -> crc-1.8.1.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.10/download -> crossbeam-epoch-0.9.10.crate https://crates.io/api/v1/crates/crossbeam-utils/0.8.11/download -> crossbeam-utils-0.8.11.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/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/ctor/0.1.22/download -> ctor-0.1.22.crate https://crates.io/api/v1/crates/cty/0.2.2/download -> cty-0.2.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/d3d12/0.5.0/download -> d3d12-0.5.0.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/deflate/1.0.0/download -> deflate-1.0.0.crate https://crates.io/api/v1/crates/derive-try-from-primitive/1.0.0/download -> derive-try-from-primitive-1.0.0.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.3/download -> digest-0.10.3.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/dispatch/0.2.0/download -> dispatch-0.2.0.crate https://crates.io/api/v1/crates/dlib/0.5.0/download -> dlib-0.5.0.crate https://crates.io/api/v1/crates/downcast-rs/1.2.0/download -> downcast-rs-1.2.0.crate https://crates.io/api/v1/crates/either/1.7.0/download -> either-1.7.0.crate https://crates.io/api/v1/crates/embed-resource/1.7.3/download -> embed-resource-1.7.3.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.31/download -> encoding_rs-0.8.31.crate https://crates.io/api/v1/crates/enum-map/2.4.1/download -> enum-map-2.4.1.crate https://crates.io/api/v1/crates/enum-map-derive/0.10.0/download -> enum-map-derive-0.10.0.crate https://crates.io/api/v1/crates/enumset/1.0.11/download -> enumset-1.0.11.crate https://crates.io/api/v1/crates/enumset_derive/0.6.0/download -> enumset_derive-0.6.0.crate https://crates.io/api/v1/crates/env_logger/0.9.0/download -> env_logger-0.9.0.crate https://crates.io/api/v1/crates/euclid/0.22.7/download -> euclid-0.22.7.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/exr/1.4.2/download -> exr-1.4.2.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/float_next_after/0.1.5/download -> float_next_after-0.1.5.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/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/funty/1.1.0/download -> funty-1.1.0.crate https://crates.io/api/v1/crates/futures/0.3.24/download -> futures-0.3.24.crate https://crates.io/api/v1/crates/futures-channel/0.3.24/download -> futures-channel-0.3.24.crate https://crates.io/api/v1/crates/futures-core/0.3.24/download -> futures-core-0.3.24.crate https://crates.io/api/v1/crates/futures-executor/0.3.24/download -> futures-executor-0.3.24.crate https://crates.io/api/v1/crates/futures-io/0.3.24/download -> futures-io-0.3.24.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.24/download -> futures-macro-0.3.24.crate https://crates.io/api/v1/crates/futures-sink/0.3.24/download -> futures-sink-0.3.24.crate https://crates.io/api/v1/crates/futures-task/0.3.24/download -> futures-task-0.3.24.crate https://crates.io/api/v1/crates/futures-util/0.3.24/download -> futures-util-0.3.24.crate https://crates.io/api/v1/crates/fxhash/0.2.1/download -> fxhash-0.2.1.crate https://crates.io/api/v1/crates/gdk-pixbuf-sys/0.15.10/download -> gdk-pixbuf-sys-0.15.10.crate https://crates.io/api/v1/crates/gdk-sys/0.15.1/download -> gdk-sys-0.15.1.crate https://crates.io/api/v1/crates/generational-arena/0.2.8/download -> generational-arena-0.2.8.crate https://crates.io/api/v1/crates/generic-array/0.14.5/download -> generic-array-0.14.5.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/gif/0.11.4/download -> gif-0.11.4.crate https://crates.io/api/v1/crates/gio-sys/0.15.10/download -> gio-sys-0.15.10.crate https://crates.io/api/v1/crates/glib-sys/0.15.10/download -> glib-sys-0.15.10.crate https://crates.io/api/v1/crates/glob/0.3.0/download -> glob-0.3.0.crate https://crates.io/api/v1/crates/glow/0.11.2/download -> glow-0.11.2.crate https://crates.io/api/v1/crates/gobject-sys/0.15.10/download -> gobject-sys-0.15.10.crate https://crates.io/api/v1/crates/gpu-alloc/0.5.3/download -> gpu-alloc-0.5.3.crate https://crates.io/api/v1/crates/gpu-alloc-types/0.2.0/download -> gpu-alloc-types-0.2.0.crate https://crates.io/api/v1/crates/gpu-descriptor/0.2.2/download -> gpu-descriptor-0.2.2.crate https://crates.io/api/v1/crates/gpu-descriptor-types/0.1.1/download -> gpu-descriptor-types-0.1.1.crate https://crates.io/api/v1/crates/gtk-sys/0.15.3/download -> gtk-sys-0.15.3.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.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/heck/0.4.0/download -> heck-0.4.0.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/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/humantime/2.1.0/download -> humantime-2.1.0.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.3.0/download -> idna-0.3.0.crate https://crates.io/api/v1/crates/image/0.24.3/download -> image-0.24.3.crate https://crates.io/api/v1/crates/indexmap/1.9.1/download -> indexmap-1.9.1.crate https://crates.io/api/v1/crates/indicatif/0.17.0/download -> indicatif-0.17.0.crate https://crates.io/api/v1/crates/inflate/0.4.5/download -> inflate-0.4.5.crate https://crates.io/api/v1/crates/inplace_it/0.3.4/download -> inplace_it-0.3.4.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/isahc/1.7.2/download -> isahc-1.7.2.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.2/download -> itoa-1.0.2.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.24/download -> jobserver-0.1.24.crate https://crates.io/api/v1/crates/jpeg-decoder/0.2.6/download -> jpeg-decoder-0.2.6.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/khronos-egl/4.1.0/download -> khronos-egl-4.1.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/lebe/0.5.1/download -> lebe-0.5.1.crate https://crates.io/api/v1/crates/lexical-core/0.7.6/download -> lexical-core-0.7.6.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/libflate/1.2.0/download -> libflate-1.2.0.crate https://crates.io/api/v1/crates/libflate_lz77/1.1.0/download -> libflate_lz77-1.1.0.crate https://crates.io/api/v1/crates/libloading/0.7.3/download -> libloading-0.7.3.crate https://crates.io/api/v1/crates/libnghttp2-sys/0.1.7+1.45.0/download -> libnghttp2-sys-0.1.7+1.45.0.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/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/lyon/1.0.0/download -> lyon-1.0.0.crate https://crates.io/api/v1/crates/lyon_algorithms/1.0.0/download -> lyon_algorithms-1.0.0.crate https://crates.io/api/v1/crates/lyon_geom/1.0.1/download -> lyon_geom-1.0.1.crate https://crates.io/api/v1/crates/lyon_path/1.0.0/download -> lyon_path-1.0.0.crate https://crates.io/api/v1/crates/lyon_tessellation/1.0.1/download -> lyon_tessellation-1.0.1.crate https://crates.io/api/v1/crates/lzma-rs/0.2.0/download -> lzma-rs-0.2.0.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/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memmap2/0.3.1/download -> memmap2-0.3.1.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/metal/0.24.0/download -> metal-0.24.0.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/minimp3/0.5.1/download -> minimp3-0.5.1.crate https://crates.io/api/v1/crates/minimp3-sys/0.3.2/download -> minimp3-sys-0.3.2.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/mio/0.8.4/download -> mio-0.8.4.crate https://crates.io/api/v1/crates/naga/0.9.0/download -> naga-0.9.0.crate https://crates.io/api/v1/crates/nanorand/0.7.0/download -> nanorand-0.7.0.crate https://crates.io/api/v1/crates/ndk/0.5.0/download -> ndk-0.5.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/0.7.0/download -> ndk-0.7.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.5.2/download -> ndk-glue-0.5.2.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.2.2/download -> ndk-sys-0.2.2.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/ndk-sys/0.4.0/download -> ndk-sys-0.4.0.crate https://crates.io/api/v1/crates/nix/0.22.3/download -> nix-0.22.3.crate https://crates.io/api/v1/crates/nix/0.23.1/download -> nix-0.23.1.crate https://crates.io/api/v1/crates/nom/6.1.2/download -> nom-6.1.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-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-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.13.1/download -> num_cpus-1.13.1.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/number_prefix/0.4.0/download -> number_prefix-0.4.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_exception/0.1.2/download -> objc_exception-0.1.2.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/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/once_cell/1.14.0/download -> once_cell-1.14.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/os_str_bytes/6.2.0/download -> os_str_bytes-6.2.0.crate https://crates.io/api/v1/crates/ouroboros/0.15.4/download -> ouroboros-0.15.4.crate https://crates.io/api/v1/crates/ouroboros_macro/0.15.4/download -> ouroboros_macro-0.15.4.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/pango-sys/0.15.10/download -> pango-sys-0.15.10.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/0.12.1/download -> parking_lot-0.12.1.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/parking_lot_core/0.9.3/download -> parking_lot_core-0.9.3.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/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/pin-project/1.0.11/download -> pin-project-1.0.11.crate https://crates.io/api/v1/crates/pin-project-internal/1.0.11/download -> pin-project-internal-1.0.11.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.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/png/0.17.6/download -> png-0.17.6.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.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/primal-check/0.3.1/download -> primal-check-0.3.1.crate https://crates.io/api/v1/crates/proc-macro-crate/1.1.3/download -> proc-macro-crate-1.1.3.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.43/download -> proc-macro2-1.0.43.crate https://crates.io/api/v1/crates/profiling/1.0.6/download -> profiling-1.0.6.crate https://crates.io/api/v1/crates/quote/1.0.21/download -> quote-1.0.21.crate https://crates.io/api/v1/crates/radium/0.5.3/download -> radium-0.5.3.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.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/range-alloc/0.1.2/download -> range-alloc-0.1.2.crate https://crates.io/api/v1/crates/raw-window-handle/0.4.3/download -> raw-window-handle-0.4.3.crate https://crates.io/api/v1/crates/raw-window-handle/0.5.0/download -> raw-window-handle-0.5.0.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.15/download -> redox_syscall-0.2.15.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.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/regress/0.4.1/download -> regress-0.4.1.crate https://crates.io/api/v1/crates/renderdoc-sys/0.7.1/download -> renderdoc-sys-0.7.1.crate https://crates.io/api/v1/crates/rfd/0.10.0/download -> rfd-0.10.0.crate https://crates.io/api/v1/crates/rle-decode-fast/1.0.3/download -> rle-decode-fast-1.0.3.crate https://crates.io/api/v1/crates/ron/0.7.1/download -> ron-0.7.1.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_version/0.4.0/download -> rustc_version-0.4.0.crate https://crates.io/api/v1/crates/rustdct/0.7.0/download -> rustdct-0.7.0.crate https://crates.io/api/v1/crates/rustfft/6.0.1/download -> rustfft-6.0.1.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/safe_arch/0.6.0/download -> safe_arch-0.6.0.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/scoped-tls/1.0.0/download -> scoped-tls-1.0.0.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/semver/1.0.12/download -> semver-1.0.12.crate https://crates.io/api/v1/crates/serde/1.0.144/download -> serde-1.0.144.crate https://crates.io/api/v1/crates/serde-xml-rs/0.6.0/download -> serde-xml-rs-0.6.0.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.85/download -> serde_json-1.0.85.crate https://crates.io/api/v1/crates/sha2/0.10.5/download -> sha2-0.10.5.crate https://crates.io/api/v1/crates/shlex/1.1.0/download -> shlex-1.1.0.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/slice-deque/0.3.0/download -> slice-deque-0.3.0.crate https://crates.io/api/v1/crates/slotmap/1.0.6/download -> slotmap-1.0.6.crate https://crates.io/api/v1/crates/sluice/0.5.5/download -> sluice-0.5.5.crate https://crates.io/api/v1/crates/smallvec/1.9.0/download -> smallvec-1.9.0.crate https://crates.io/api/v1/crates/smithay-client-toolkit/0.15.4/download -> smithay-client-toolkit-0.15.4.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/spin/0.9.4/download -> spin-0.9.4.crate https://crates.io/api/v1/crates/spirv/0.2.0+1.5.4/download -> spirv-0.2.0+1.5.4.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/stdweb/0.1.3/download -> stdweb-0.1.3.crate https://crates.io/api/v1/crates/strength_reduce/0.2.3/download -> strength_reduce-0.2.3.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/symphonia/0.5.1/download -> symphonia-0.5.1.crate https://crates.io/api/v1/crates/symphonia-bundle-mp3/0.5.1/download -> symphonia-bundle-mp3-0.5.1.crate https://crates.io/api/v1/crates/symphonia-core/0.5.1/download -> symphonia-core-0.5.1.crate https://crates.io/api/v1/crates/symphonia-metadata/0.5.1/download -> symphonia-metadata-0.5.1.crate https://crates.io/api/v1/crates/syn/1.0.99/download -> syn-1.0.99.crate https://crates.io/api/v1/crates/synstructure/0.12.6/download -> synstructure-0.12.6.crate https://crates.io/api/v1/crates/system-deps/6.0.2/download -> system-deps-6.0.2.crate https://crates.io/api/v1/crates/tap/1.0.1/download -> tap-1.0.1.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/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/thiserror/1.0.34/download -> thiserror-1.0.34.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.34/download -> thiserror-impl-1.0.34.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.7.3/download -> tiff-0.7.3.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.8/download -> toml-0.5.8.crate https://crates.io/api/v1/crates/tracing/0.1.35/download -> tracing-0.1.35.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.22/download -> tracing-attributes-0.1.22.crate https://crates.io/api/v1/crates/tracing-core/0.1.28/download -> tracing-core-0.1.28.crate https://crates.io/api/v1/crates/tracing-futures/0.2.5/download -> tracing-futures-0.2.5.crate https://crates.io/api/v1/crates/transpose/0.2.1/download -> transpose-0.2.1.crate https://crates.io/api/v1/crates/typed-arena/2.0.1/download -> typed-arena-2.0.1.crate https://crates.io/api/v1/crates/typenum/1.15.0/download -> typenum-1.15.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.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-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.crate https://crates.io/api/v1/crates/url/2.3.1/download -> url-2.3.1.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/version-compare/0.1.0/download -> version-compare-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/vswhom/0.1.0/download -> vswhom-0.1.0.crate https://crates.io/api/v1/crates/vswhom-sys/0.1.1/download -> vswhom-sys-0.1.1.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.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.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-futures/0.4.32/download -> wasm-bindgen-futures-0.4.32.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/wayland-client/0.29.4/download -> wayland-client-0.29.4.crate https://crates.io/api/v1/crates/wayland-commons/0.29.4/download -> wayland-commons-0.29.4.crate https://crates.io/api/v1/crates/wayland-cursor/0.29.4/download -> wayland-cursor-0.29.4.crate https://crates.io/api/v1/crates/wayland-protocols/0.29.4/download -> wayland-protocols-0.29.4.crate https://crates.io/api/v1/crates/wayland-scanner/0.29.4/download -> wayland-scanner-0.29.4.crate https://crates.io/api/v1/crates/wayland-sys/0.29.4/download -> wayland-sys-0.29.4.crate https://crates.io/api/v1/crates/weak-table/0.3.2/download -> weak-table-0.3.2.crate https://crates.io/api/v1/crates/web-sys/0.3.58/download -> web-sys-0.3.58.crate https://crates.io/api/v1/crates/webbrowser/0.8.0/download -> webbrowser-0.8.0.crate https://crates.io/api/v1/crates/weezl/0.1.7/download -> weezl-0.1.7.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/wgpu/0.13.1/download -> wgpu-0.13.1.crate https://crates.io/api/v1/crates/wgpu-core/0.13.2/download -> wgpu-core-0.13.2.crate https://crates.io/api/v1/crates/wgpu-hal/0.13.2/download -> wgpu-hal-0.13.2.crate https://crates.io/api/v1/crates/wgpu-types/0.13.2/download -> wgpu-types-0.13.2.crate https://crates.io/api/v1/crates/wide/0.7.4/download -> wide-0.7.4.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.37.0/download -> windows-0.37.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_aarch64_msvc/0.37.0/download -> windows_aarch64_msvc-0.37.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.37.0/download -> windows_i686_gnu-0.37.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.37.0/download -> windows_i686_msvc-0.37.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.37.0/download -> windows_x86_64_gnu-0.37.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.37.0/download -> windows_x86_64_msvc-0.37.0.crate https://crates.io/api/v1/crates/winit/0.26.1/download -> winit-0.26.1.crate https://crates.io/api/v1/crates/winreg/0.10.1/download -> winreg-0.10.1.crate https://crates.io/api/v1/crates/wyz/0.2.0/download -> wyz-0.2.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/x11-dl/2.19.1/download -> x11-dl-2.19.1.crate https://crates.io/api/v1/crates/xcb/0.8.2/download -> xcb-0.8.2.crate https://crates.io/api/v1/crates/xcursor/0.3.4/download -> xcursor-0.3.4.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/yansi/0.5.1/download -> yansi-0.5.1.crate https://github.com/RustAudio/dasp/archive/f05a703d247bb504d7e812b51e95f3765d9c5e94.tar.gz -> dasp-f05a703d247bb504d7e812b51e95f3765d9c5e94.tar.gz https://github.com/ruffle-rs/gc-arena/archive/081b6883a522b38030b13744c80c84efbfcbae1f.tar.gz -> gc-arena-081b6883a522b38030b13744c80c84efbfcbae1f.tar.gz https://github.com/ruffle-rs/h263-rs/archive/023e14c73e565c4c778d41f66cfbac5ece6419b2.tar.gz -> h263-rs-023e14c73e565c4c778d41f66cfbac5ece6419b2.tar.gz https://github.com/ruffle-rs/nellymoser/archive/4a33521c29a918950df8ae9fe07e527ac65553f5.tar.gz -> nellymoser-4a33521c29a918950df8ae9fe07e527ac65553f5.tar.gz https://github.com/ruffle-rs/nihav-vp6/archive/9416fcc9fc8aab8f4681aa9093b42922214abbd3.tar.gz -> nihav-vp6-9416fcc9fc8aab8f4681aa9093b42922214abbd3.tar.gz https://github.com/ruffle-rs/quick-xml/archive/8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz -> quick-xml-8496365ec1412eb5ba5de350937b6bce352fa0ba.tar.gz https://github.com/ruffle-rs/rust-flash-lso/archive/19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz -> rust-flash-lso-19fecd07b9888c4bdaa66771c468095783b52bed.tar.gz
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=8636eac48219bdfdc599f9417be5a5b2
+_md5_=c9b1f841dbdc1273ba6e10ce26d53c72
diff --git a/metadata/md5-cache/app-eselect/Manifest.gz b/metadata/md5-cache/app-eselect/Manifest.gz
index 3af6c97ac94a..15e58a079f84 100644
Binary files a/metadata/md5-cache/app-eselect/Manifest.gz and b/metadata/md5-cache/app-eselect/Manifest.gz differ
diff --git a/metadata/md5-cache/app-eselect/eselect-rust-20210703 b/metadata/md5-cache/app-eselect/eselect-rust-20210703
index 58f498cf5e0b..a945c2c8c258 100644
--- a/metadata/md5-cache/app-eselect/eselect-rust-20210703
+++ b/metadata/md5-cache/app-eselect/eselect-rust-20210703
@@ -4,10 +4,10 @@ DESCRIPTION=Eselect module for management of multiple Rust versions
 EAPI=7
 HOMEPAGE=https://gitweb.gentoo.org/proj/eselect-rust.git
 INHERIT=autotools
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=amd64 arm arm64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=>=app-admin/eselect-1.2.3
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/eselect-rust.git/snapshot/eselect-rust-20210703.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=24acf3b3dcd0e911b0fb295deabe0f00
+_md5_=0aa3fb57a726a5b809798cb47946942c
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 69a5a020fb7b..9343a8b2eadf 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/aflplusplus-4.03c b/metadata/md5-cache/app-forensics/aflplusplus-4.03c
new file mode 100644
index 000000000000..5a50cb05e2d0
--- /dev/null
+++ b/metadata/md5-cache/app-forensics/aflplusplus-4.03c
@@ -0,0 +1,16 @@
+DEFINED_PHASES=compile install postinst setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=sys-devel/llvm-13:= || ( sys-devel/clang:13 sys-devel/clang:15 ) !app-forensics/afl test? ( dev-util/cmocka ) !!sys-devel/llvm:0
+DESCRIPTION=A fork of AFL, the popular compile-time instrumentation fuzzer
+EAPI=8
+HOMEPAGE=https://github.com/AFLplusplus/AFLplusplus
+INHERIT=toolchain-funcs llvm optfeature python-single-r1
+IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=sys-devel/llvm-13:= || ( sys-devel/clang:13 sys-devel/clang:15 ) !app-forensics/afl
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/4.03c.tar.gz -> aflplusplus-4.03c.tar.gz https://dev.gentoo.org/~sam/distfiles/app-forensics/aflplusplus/aflplusplus-4.03c-patches.tar.xz
+_eclasses_=llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=628adcc07844b477aefc2f0eb792e058
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 30fbfd550a1c..66de3772eef7 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/transifex-client-1.1.0 b/metadata/md5-cache/app-i18n/transifex-client-1.3.1
similarity index 52%
rename from metadata/md5-cache/app-i18n/transifex-client-1.1.0
rename to metadata/md5-cache/app-i18n/transifex-client-1.3.1
index 02c7fea0430a..8ec4f8977823 100644
--- a/metadata/md5-cache/app-i18n/transifex-client-1.1.0
+++ b/metadata/md5-cache/app-i18n/transifex-client-1.3.1
@@ -4,10 +4,10 @@ DESCRIPTION=The Transifex command-line client
 EAPI=8
 HOMEPAGE=https://github.com/transifex/cli
 INHERIT=go-module
-KEYWORDS=amd64 ~ppc64 x86
+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.1.0.tar.gz -> transifex-client-1.1.0.tar.gz https://gitlab.com/api/v4/projects/35204985/packages/generic/transifex-client/1.1.0/transifex-client-1.1-deps.tar.xz
+SRC_URI=https://github.com/transifex/cli/archive/refs/tags/v1.3.1.tar.gz -> transifex-client-1.3.1.tar.gz https://gitlab.com/api/v4/projects/35204985/packages/generic/transifex-client/1.3.1/transifex-client-1.3.1-deps.tar.bz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec
-_md5_=7c899b3077bd4ce0659621f5209e4dc0
+_md5_=8ff5a1c8c170282d399684f4765874bf
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 72842f6d273f..e5b846dab279 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/pax-utils-1.3.3 b/metadata/md5-cache/app-misc/pax-utils-1.3.3
deleted file mode 100644
index 5f64da741e70..000000000000
--- a/metadata/md5-cache/app-misc/pax-utils-1.3.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=caps? ( virtual/pkgconfig )
-DEFINED_PHASES=compile configure install setup test
-DEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) )
-DESCRIPTION=ELF utils that can check files for security relevant properties
-EAPI=7
-HOMEPAGE=https://wiki.gentoo.org/index.php?title=Project:Hardened/PaX_Utilities
-INHERIT=python-single-r1 toolchain-funcs
-IUSE=caps debug python seccomp python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=caps? ( >=sys-libs/libcap-2.24 ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/pyelftools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pyelftools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pyelftools[python_targets_python3_10(-)] ) )
-REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
-SLOT=0
-SRC_URI=mirror://gentoo/pax-utils-1.3.3.tar.xz https://dev.gentoo.org/~sam/distfiles/pax-utils-1.3.3.tar.xz https://dev.gentoo.org/~vapier/dist/pax-utils-1.3.3.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d26357f628a8dee5dfdd92913294dedc
diff --git a/metadata/md5-cache/app-misc/tmux-3.3a-r1 b/metadata/md5-cache/app-misc/tmux-3.3a-r1
new file mode 100644
index 000000000000..61064c916cb9
--- /dev/null
+++ b/metadata/md5-cache/app-misc/tmux-3.3a-r1
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig virtual/yacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=dev-libs/libevent:= sys-libs/ncurses:= systemd? ( sys-apps/systemd:= ) utempter? ( sys-libs/libutempter ) kernel_Darwin? ( dev-libs/libutf8proc:= )
+DESCRIPTION=Terminal multiplexer
+EAPI=8
+HOMEPAGE=https://tmux.github.io/
+INHERIT=autotools flag-o-matic
+IUSE=debug selinux systemd utempter vim-syntax
+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=ISC
+RDEPEND=dev-libs/libevent:= sys-libs/ncurses:= systemd? ( sys-apps/systemd:= ) utempter? ( sys-libs/libutempter ) kernel_Darwin? ( dev-libs/libutf8proc:= ) selinux? ( sec-policy/selinux-screen ) vim-syntax? ( app-vim/vim-tmux )
+SLOT=0
+SRC_URI=https://github.com/tmux/tmux/releases/download/3.3a/tmux-3.3a.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8ab14dd239cfaa915632fc469add1248
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 3f89b7acffdf..55909747fa14 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/gnumeric-1.12.53 b/metadata/md5-cache/app-office/gnumeric-1.12.53
new file mode 100644
index 000000000000..4d7131ef21e7
--- /dev/null
+++ b/metadata/md5-cache/app-office/gnumeric-1.12.53
@@ -0,0 +1,18 @@
+BDEPEND=app-text/docbook-xml-dtd:4.5 app-text/yelp-tools dev-util/gtk-doc-am >=dev-util/intltool-0.35.0 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 app-arch/xz-utils
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.51:0.10[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) libgda? ( gnome-extra/libgda:5[gtk] )
+DESCRIPTION=The GNOME Spreadsheet
+EAPI=8
+HOMEPAGE=http://www.gnumeric.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools gnome.org python-r1 xdg
+IUSE=+introspection libgda perl python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=app-arch/bzip2 sys-libs/zlib >=dev-libs/glib-2.40.0:2 >=gnome-extra/libgsf-1.14.33:= >=x11-libs/goffice-0.10.51:0.10[introspection?] >=dev-libs/libxml2-2.4.12:2 >=x11-libs/pango-1.24.0:= >=x11-libs/gtk+-3.8.7:3 x11-libs/cairo:=[svg] introspection? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-libs/gobject-introspection-1:= ) perl? ( dev-lang/perl:= ) libgda? ( gnome-extra/libgda:5[gtk] )
+REQUIRED_USE=introspection? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnumeric/1.12/gnumeric-1.12.53.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=1dcf56a351d5ed52aa1d4a9f79a1acaf
diff --git a/metadata/md5-cache/app-shells/Manifest.gz b/metadata/md5-cache/app-shells/Manifest.gz
index 793ac9c0b110..4c198416cf22 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.2_rc2 b/metadata/md5-cache/app-shells/bash-5.2_rc2
deleted file mode 100644
index 05f4d4708013..000000000000
--- a/metadata/md5-cache/app-shells/bash-5.2_rc2
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=pgo? ( dev-util/gperf ) 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 test unpack
-DEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl )
-DESCRIPTION=The standard GNU Bourne again shell
-EAPI=7
-HOMEPAGE=https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git
-INHERIT=flag-o-matic toolchain-funcs prefix verify-sig
-IUSE=afs bashlogger examples mem-scramble +net nls plugins pgo +readline verify-sig
-LICENSE=GPL-3+
-RDEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu/bash/bash-5.2-rc2.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.2-rc2.tar.gz verify-sig? ( mirror://gnu/bash/bash-5.2-rc2.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/bash-5.2-rc2.tar.gz.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=684170934a0831b0a4dbd462af6d5c4f
diff --git a/metadata/md5-cache/app-shells/bash-5.2_rc3 b/metadata/md5-cache/app-shells/bash-5.2_rc3
deleted file mode 100644
index 1b9e2a3e28c1..000000000000
--- a/metadata/md5-cache/app-shells/bash-5.2_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=pgo? ( dev-util/gperf ) 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 test unpack
-DEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl )
-DESCRIPTION=The standard GNU Bourne again shell
-EAPI=7
-HOMEPAGE=https://tiswww.case.edu/php/chet/bash/bashtop.html https://git.savannah.gnu.org/cgit/bash.git
-INHERIT=flag-o-matic toolchain-funcs prefix verify-sig
-IUSE=afs bashlogger examples mem-scramble +net nls plugins pgo +readline verify-sig
-LICENSE=GPL-3+
-RDEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl )
-SLOT=0
-SRC_URI=mirror://gnu/bash/bash-5.2-rc3.tar.gz ftp://ftp.cwru.edu/pub/bash/bash-5.2-rc3.tar.gz verify-sig? ( mirror://gnu/bash/bash-5.2-rc3.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/bash-5.2-rc3.tar.gz.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=684170934a0831b0a4dbd462af6d5c4f
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 9d96c3133745..1dbe7934e399 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/evince-43.0 b/metadata/md5-cache/app-text/evince-43.0
new file mode 100644
index 000000000000..7c15c692de22
--- /dev/null
+++ b/metadata/md5-cache/app-text/evince-43.0
@@ -0,0 +1,16 @@
+BDEPEND=gtk-doc? ( >=dev-util/gi-docgen-2021.1 app-text/docbook-xml-dtd:4.3 ) dev-libs/appstream-glib dev-util/gdbus-codegen dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.5.0:1= >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.40:2 >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-22.02.0[cairo] >=app-arch/libarchive-3.6.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 <gnome-base/nautilus-42.20 ) postscript? ( >=app-text/libspectre-0.2:= ) spell? ( >=app-text/gspell-1.6.0:= ) tiff? ( >=media-libs/tiff-4.0:0= ) xps? ( >=app-text/libgxps-0.2.1:= )
+DESCRIPTION=Simple document viewer for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Evince
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson systemd xdg
+IUSE=cups djvu dvi gstreamer gnome gnome-keyring gtk-doc +introspection nautilus postscript spell tiff xps
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2+ CC-BY-SA-3.0
+RDEPEND=dev-libs/atk >=dev-libs/glib-2.44.0:2 >=gui-libs/libhandy-1.5.0:1= >=dev-libs/libxml2-2.5:2 sys-libs/zlib:= >=x11-libs/gdk-pixbuf-2.40:2 >=x11-libs/gtk+-3.22.0:3[cups?,introspection?] gnome-base/gsettings-desktop-schemas >=x11-libs/cairo-1.10:= >=app-text/poppler-22.02.0[cairo] >=app-arch/libarchive-3.6.0 djvu? ( >=app-text/djvu-3.5.22:= ) dvi? ( >=app-text/libspectre-0.2:= dev-libs/kpathsea:= ) gstreamer? ( media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 media-libs/gst-plugins-good:1.0 ) gnome? ( gnome-base/gnome-desktop:3= ) gnome-keyring? ( >=app-crypt/libsecret-0.5 ) introspection? ( >=dev-libs/gobject-introspection-1:= ) nautilus? ( >=gnome-base/nautilus-3.28.0 <gnome-base/nautilus-42.20 ) postscript? ( >=app-text/libspectre-0.2:= ) spell? ( >=app-text/gspell-1.6.0:= ) tiff? ( >=media-libs/tiff-4.0:0= ) xps? ( >=app-text/libgxps-0.2.1:= ) gnome-base/gvfs gnome-base/librsvg || ( >=x11-themes/adwaita-icon-theme-2.17.1 >=x11-themes/hicolor-icon-theme-0.10 )
+SLOT=0/evd3.4-evv3.3
+SRC_URI=mirror://gnome/sources/evince/43/evince-43.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6a0e4f972266457daf66bec5519f2b3b
diff --git a/metadata/md5-cache/app-text/html401-19991224-r4 b/metadata/md5-cache/app-text/html401-19991224-r4
index bc585145e107..8ae5df17a6b6 100644
--- a/metadata/md5-cache/app-text/html401-19991224-r4
+++ b/metadata/md5-cache/app-text/html401-19991224-r4
@@ -9,4 +9,4 @@ RDEPEND=>=app-text/sgml-common-0.6.3-r7
 SLOT=0
 SRC_URI=https://www.w3.org/TR/1999/REC-html401-19991224/html40.tgz
 _eclasses_=sgml-catalog-r1	5d1d74baed1e6235b9a698917e954236
-_md5_=97447b5d1cb4e90e28bec3b64b66bc5b
+_md5_=9aa293994276484cc3670c6c9a238a6d
diff --git a/metadata/md5-cache/app-text/po4a-0.67 b/metadata/md5-cache/app-text/po4a-0.67
index dbd577461ce4..0c902ab531e6 100644
--- a/metadata/md5-cache/app-text/po4a-0.67
+++ b/metadata/md5-cache/app-text/po4a-0.67
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://po4a.org/
 INHERIT=perl-module plocale
 IUSE=test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=GPL-2+
 RDEPEND=app-text/opensp dev-libs/libxslt dev-perl/Locale-gettext dev-perl/Pod-Parser dev-perl/SGMLSpm dev-perl/Syntax-Keyword-Try dev-perl/TermReadKey dev-perl/Text-WrapI18N dev-perl/Unicode-LineBreak dev-perl/YAML-Tiny sys-devel/gettext dev-lang/perl:=
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/mquinson/po4a/releases/download/v0.67/po4a-0.67.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	plocale	7ce00136a77130df46fbbd5966f98a61	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=d393a4ad08cb421560986821ea1dcadb
+_md5_=1c29efca067ea94bdfe044605e39e55c
diff --git a/metadata/md5-cache/app-text/qpdf-11.1.0 b/metadata/md5-cache/app-text/qpdf-11.1.0-r1
similarity index 97%
rename from metadata/md5-cache/app-text/qpdf-11.1.0
rename to metadata/md5-cache/app-text/qpdf-11.1.0-r1
index 4994798f4281..16fa61abd0da 100644
--- a/metadata/md5-cache/app-text/qpdf-11.1.0
+++ b/metadata/md5-cache/app-text/qpdf-11.1.0-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://github.com/qpdf/qpdf/releases/download/v11.1.0/qpdf-11.1.0.tar.gz doc? ( https://github.com/qpdf/qpdf/releases/download/v11.1.0/qpdf-11.1.0-doc.zip )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4c34421ae09a16e1a45f0e833219ed47
+_md5_=6c657a41166f8e64809fc1dd7467ea7f
diff --git a/metadata/md5-cache/app-text/recode-3.7.11 b/metadata/md5-cache/app-text/recode-3.7.11
index b7b9dafc799e..594d62020b34 100644
--- a/metadata/md5-cache/app-text/recode-3.7.11
+++ b/metadata/md5-cache/app-text/recode-3.7.11
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/rrthomas/recode/releases/download/v3.7.11/recode-3.7.11.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0f9ec87a855c485dbc0f6f4d7d725e82
+_md5_=32248e26f446863b90759a1927408547
diff --git a/metadata/md5-cache/app-text/recode-3.7.12 b/metadata/md5-cache/app-text/recode-3.7.12
index 41c10e5726ab..450fb40f2df4 100644
--- a/metadata/md5-cache/app-text/recode-3.7.12
+++ b/metadata/md5-cache/app-text/recode-3.7.12
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/rrthomas/recode/releases/download/v3.7.12/recode-3.7.12.tar.gz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1baf04ad50e8482608bbf682ff4739d0
+_md5_=990185a50bdf5f24a48ee58bbb33cd74
diff --git a/metadata/md5-cache/app-text/recode-3.7.9 b/metadata/md5-cache/app-text/recode-3.7.9
index aecf239d7044..33de1a5f21b7 100644
--- a/metadata/md5-cache/app-text/recode-3.7.9
+++ b/metadata/md5-cache/app-text/recode-3.7.9
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=https://github.com/rrthomas/recode/releases/download/v3.7.9/recode-3.7.9.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=cc765b109f1d8925608fef75923e9b7e
+_md5_=2a0f0a6cac7924d559952ec6f7e5ce99
diff --git a/metadata/md5-cache/app-text/rnv-1.7.11-r1 b/metadata/md5-cache/app-text/rnv-1.7.11-r1
index f471fe5c80a2..a686441613a3 100644
--- a/metadata/md5-cache/app-text/rnv-1.7.11-r1
+++ b/metadata/md5-cache/app-text/rnv-1.7.11-r1
@@ -1,7 +1,7 @@
 DEFINED_PHASES=configure install prepare unpack
 DEPEND=dev-libs/expat dev-scheme/scm[libscm]
 DESCRIPTION=A lightweight Relax NG Compact Syntax validator
-EAPI=6
+EAPI=8
 HOMEPAGE=http://www.davidashen.net/rnv.html
 INHERIT=unpacker toolchain-funcs
 KEYWORDS=amd64 x86
@@ -10,4 +10,4 @@ RDEPEND=dev-libs/expat dev-scheme/scm[libscm]
 SLOT=0
 SRC_URI=mirror://sourceforge/rnv/rnv-1.7.11.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285
-_md5_=7300efb2c06eb0abeecce9f659cad466
+_md5_=43b9192f737b614c3bcfaad10bf36a5b
diff --git a/metadata/md5-cache/app-text/texlive-core-2021-r4 b/metadata/md5-cache/app-text/texlive-core-2021-r4
new file mode 100644
index 000000000000..35270c688a53
--- /dev/null
+++ b/metadata/md5-cache/app-text/texlive-core-2021-r4
@@ -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 >=sys-devel/libtool-2.4
+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	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	texlive-common	c918583cd52e23eacee8a4cb5a623ed0	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=340c320b7dcc6e28ab0fd8081d5277fb
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index dc7d3eb17a9c..0c676285520f 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/rapidyaml-0.4.1 b/metadata/md5-cache/dev-cpp/rapidyaml-0.4.1
index 6ceb55b4d5e2..297cc2769416 100644
--- a/metadata/md5-cache/dev-cpp/rapidyaml-0.4.1
+++ b/metadata/md5-cache/dev-cpp/rapidyaml-0.4.1
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4.1
 SRC_URI=https://github.com/biojppm/rapidyaml/releases/download/v0.4.1/rapidyaml-0.4.1-src.tgz test? ( https://github.com/biojppm/c4fs/archive/f78cbd86a77c976395c9834726a14a1bba059af0.tar.gz -> c4fs-f78cbd86a77c976395c9834726a14a1bba059af0.tar.gz https://github.com/biojppm/c4log/archive/e29915ceeaf9fffb18ba43fb9d6d446d20a1cb4d.tar.gz -> c4log-e29915ceeaf9fffb18ba43fb9d6d446d20a1cb4d.tar.gz https://github.com/yaml/yaml-test-suite/archive/6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz -> yaml-test-suite-6e6c296ae9c9d2d5c4134b4b64d01b29ac19ff6f.tar.gz )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c8a9ec6f47c64503a86df0b75887546c
+_md5_=cc0c07afd69b4e9c7b25ecac603290e9
diff --git a/metadata/md5-cache/dev-cpp/tbb-2021.6.0 b/metadata/md5-cache/dev-cpp/tbb-2021.6.0
new file mode 100644
index 000000000000..a66f7b7c282a
--- /dev/null
+++ b/metadata/md5-cache/dev-cpp/tbb-2021.6.0
@@ -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=!kernel_Darwin? ( sys-apps/hwloc:= )
+DESCRIPTION=High level abstract threading library
+EAPI=8
+HOMEPAGE=https://www.threadingbuildingblocks.org
+INHERIT=cmake-multilib flag-o-matic
+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 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=Apache-2.0
+RDEPEND=!kernel_Darwin? ( sys-apps/hwloc:= )
+RESTRICT=!test? ( test )
+SLOT=0/12.5-2.5-3.5
+SRC_URI=https://github.com/oneapi-src/oneTBB/archive/refs/tags/v2021.6.0.tar.gz -> tbb-2021.6.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=49da4157b8a58e286e439150d96d0f98
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 1820ab665f13..8061ee53af51 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/citus-10.0.6 b/metadata/md5-cache/dev-db/citus-10.0.6
deleted file mode 100644
index b3821f577a5b..000000000000
--- a/metadata/md5-cache/dev-db/citus-10.0.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) app-arch/lz4 app-arch/zstd
-DESCRIPTION=Open-source postgresql extension for clustering/multi-node setups
-EAPI=7
-HOMEPAGE=https://www.citusdata.com/
-INHERIT=postgres-multi
-IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11
-KEYWORDS=~amd64
-LICENSE=POSTGRESQL AGPL-3
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) app-arch/lz4 app-arch/zstd
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/citusdata/citus/archive/v10.0.6.tar.gz -> citus-10.0.6.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	postgres	8f9102af4a3f35d1c700d85892ffecbb	postgres-multi	67d8361b394ded18c2e915e9e493e5f7
-_md5_=3388d80b4d1019e9c0357f1fb12a76f7
diff --git a/metadata/md5-cache/dev-db/citus-10.1.3 b/metadata/md5-cache/dev-db/citus-10.1.3
deleted file mode 100644
index 8799c272d016..000000000000
--- a/metadata/md5-cache/dev-db/citus-10.1.3
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
-DESCRIPTION=Open-source postgresql extension for clustering/multi-node setups
-EAPI=7
-HOMEPAGE=https://www.citusdata.com/
-INHERIT=postgres-multi
-IUSE=postgres_targets_postgres13 postgres_targets_postgres12
-KEYWORDS=~amd64
-LICENSE=POSTGRESQL AGPL-3
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/citusdata/citus/archive/v10.1.3.tar.gz -> citus-10.1.3.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	postgres	8f9102af4a3f35d1c700d85892ffecbb	postgres-multi	67d8361b394ded18c2e915e9e493e5f7
-_md5_=c31462be49577232c82d4f0766921cbe
diff --git a/metadata/md5-cache/dev-db/citus-10.1.4 b/metadata/md5-cache/dev-db/citus-10.1.4
deleted file mode 100644
index 78ff16781ddd..000000000000
--- a/metadata/md5-cache/dev-db/citus-10.1.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
-DESCRIPTION=Open-source postgresql extension for clustering/multi-node setups
-EAPI=7
-HOMEPAGE=https://www.citusdata.com/
-INHERIT=postgres-multi
-IUSE=postgres_targets_postgres13 postgres_targets_postgres12
-KEYWORDS=~amd64
-LICENSE=POSTGRESQL AGPL-3
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/citusdata/citus/archive/v10.1.4.tar.gz -> citus-10.1.4.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	postgres	8f9102af4a3f35d1c700d85892ffecbb	postgres-multi	67d8361b394ded18c2e915e9e493e5f7
-_md5_=6b9492bce16dc042114ec4b5817ba881
diff --git a/metadata/md5-cache/dev-db/citus-10.2.4 b/metadata/md5-cache/dev-db/citus-10.2.4
deleted file mode 100644
index ec1a03ec7393..000000000000
--- a/metadata/md5-cache/dev-db/citus-10.2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
-DESCRIPTION=Open-source postgresql extension for clustering/multi-node setups
-EAPI=7
-HOMEPAGE=https://www.citusdata.com/
-INHERIT=postgres-multi
-IUSE=postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12
-KEYWORDS=~amd64
-LICENSE=POSTGRESQL AGPL-3
-RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/citusdata/citus/archive/v10.2.4.tar.gz -> citus-10.2.4.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	postgres	8f9102af4a3f35d1c700d85892ffecbb	postgres-multi	67d8361b394ded18c2e915e9e493e5f7
-_md5_=8d61ad0aa474eae5909a4aa31bca361a
diff --git a/metadata/md5-cache/dev-db/citus-10.2.5 b/metadata/md5-cache/dev-db/citus-10.2.5
deleted file mode 100644
index 33c9c94e6254..000000000000
--- a/metadata/md5-cache/dev-db/citus-10.2.5
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
-DESCRIPTION=Open-source postgresql extension for clustering/multi-node setups
-EAPI=7
-HOMEPAGE=https://www.citusdata.com/
-INHERIT=postgres-multi
-IUSE=postgres_targets_postgres14 postgres_targets_postgres13 postgres_targets_postgres12
-KEYWORDS=~amd64
-LICENSE=POSTGRESQL AGPL-3
-RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) app-arch/lz4 app-arch/zstd
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/citusdata/citus/archive/v10.2.5.tar.gz -> citus-10.2.5.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	postgres	8f9102af4a3f35d1c700d85892ffecbb	postgres-multi	67d8361b394ded18c2e915e9e493e5f7
-_md5_=8d61ad0aa474eae5909a4aa31bca361a
diff --git a/metadata/md5-cache/dev-db/citus-11.0.4 b/metadata/md5-cache/dev-db/citus-11.0.4
deleted file mode 100644
index 0a3aaba957ed..000000000000
--- a/metadata/md5-cache/dev-db/citus-11.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) app-arch/lz4 app-arch/zstd
-DESCRIPTION=Open-source postgresql extension for clustering/multi-node setups
-EAPI=7
-HOMEPAGE=https://www.citusdata.com/
-INHERIT=postgres-multi
-IUSE=postgres_targets_postgres14 postgres_targets_postgres13
-KEYWORDS=~amd64
-LICENSE=POSTGRESQL AGPL-3
-RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) app-arch/lz4 app-arch/zstd
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/citusdata/citus/archive/refs/tags/v11.0.4.tar.gz -> citus-11.0.4.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	postgres	8f9102af4a3f35d1c700d85892ffecbb	postgres-multi	67d8361b394ded18c2e915e9e493e5f7
-_md5_=af47c0e8da2befec3ea522340a216e10
diff --git a/metadata/md5-cache/dev-db/citus-11.0.2 b/metadata/md5-cache/dev-db/citus-11.1.1
similarity index 96%
rename from metadata/md5-cache/dev-db/citus-11.0.2
rename to metadata/md5-cache/dev-db/citus-11.1.1
index b04fdbb6e3b4..768bd0e79cc5 100644
--- a/metadata/md5-cache/dev-db/citus-11.0.2
+++ b/metadata/md5-cache/dev-db/citus-11.1.1
@@ -10,6 +10,6 @@ LICENSE=POSTGRESQL AGPL-3
 RDEPEND=postgres_targets_postgres14? ( dev-db/postgresql:14= ) postgres_targets_postgres13? ( dev-db/postgresql:13= ) app-arch/lz4 app-arch/zstd
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/citusdata/citus/archive/refs/tags/v11.0.2.tar.gz -> citus-11.0.2.tar.gz
+SRC_URI=https://github.com/citusdata/citus/archive/refs/tags/v11.1.1.tar.gz -> citus-11.1.1.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	postgres	8f9102af4a3f35d1c700d85892ffecbb	postgres-multi	67d8361b394ded18c2e915e9e493e5f7
 _md5_=af47c0e8da2befec3ea522340a216e10
diff --git a/metadata/md5-cache/dev-db/citus-9.5.10 b/metadata/md5-cache/dev-db/citus-9.5.10
deleted file mode 100644
index c2a9c4ad14e0..000000000000
--- a/metadata/md5-cache/dev-db/citus-9.5.10
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) app-arch/lz4 app-arch/zstd
-DESCRIPTION=Open-source postgresql extension for clustering/multi-node setups
-EAPI=7
-HOMEPAGE=https://www.citusdata.com/
-INHERIT=postgres-multi
-IUSE=postgres_targets_postgres13 postgres_targets_postgres12 postgres_targets_postgres11
-KEYWORDS=~amd64
-LICENSE=POSTGRESQL AGPL-3
-RDEPEND=postgres_targets_postgres13? ( dev-db/postgresql:13= ) postgres_targets_postgres12? ( dev-db/postgresql:12= ) postgres_targets_postgres11? ( dev-db/postgresql:11= ) app-arch/lz4 app-arch/zstd
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/citusdata/citus/archive/v9.5.10.tar.gz -> citus-9.5.10.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	postgres	8f9102af4a3f35d1c700d85892ffecbb	postgres-multi	67d8361b394ded18c2e915e9e493e5f7
-_md5_=3388d80b4d1019e9c0357f1fb12a76f7
diff --git a/metadata/md5-cache/dev-db/redis-7.0.5 b/metadata/md5-cache/dev-db/redis-7.0.5
new file mode 100644
index 000000000000..35b275d22897
--- /dev/null
+++ b/metadata/md5-cache/dev-db/redis-7.0.5
@@ -0,0 +1,17 @@
+BDEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) test? ( dev-lang/tcl:0= ssl? ( dev-tcltk/tls ) )
+DESCRIPTION=A persistent caching system, key-value, and data structures database
+EAPI=8
+HOMEPAGE=https://redis.io
+INHERIT=autotools edo flag-o-matic multiprocessing systemd tmpfiles toolchain-funcs
+IUSE=+jemalloc selinux ssl systemd tcmalloc test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=BSD
+RDEPEND=jemalloc? ( >=dev-libs/jemalloc-5.1:= ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd:= ) tcmalloc? ( dev-util/google-perftools ) acct-group/redis acct-user/redis selinux? ( sec-policy/selinux-redis ) virtual/tmpfiles
+REQUIRED_USE=?? ( jemalloc tcmalloc )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://download.redis.io/releases/redis-7.0.5.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=80280b371e9df6a595736c47f42f4153
diff --git a/metadata/md5-cache/dev-erlang/Manifest.gz b/metadata/md5-cache/dev-erlang/Manifest.gz
index 33d97c55f0f1..bf7d68ffefc7 100644
Binary files a/metadata/md5-cache/dev-erlang/Manifest.gz and b/metadata/md5-cache/dev-erlang/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-erlang/cache_tab-1.0.29 b/metadata/md5-cache/dev-erlang/cache_tab-1.0.29
deleted file mode 100644
index c364c4aa595b..000000000000
--- a/metadata/md5-cache/dev-erlang/cache_tab-1.0.29
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.23 dev-lang/erlang:=
-DESCRIPTION=In-memory cache Erlang and Elixir library
-EAPI=7
-HOMEPAGE=https://github.com/processone/cache_tab
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.23 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/cache_tab/archive/1.0.29.tar.gz -> cache_tab-1.0.29.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=77bb5697ad0ace1e01c3f255706e6021
diff --git a/metadata/md5-cache/dev-erlang/eimp-1.0.21 b/metadata/md5-cache/dev-erlang/eimp-1.0.21
deleted file mode 100644
index ac55d6d666f6..000000000000
--- a/metadata/md5-cache/dev-erlang/eimp-1.0.21
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.23 media-libs/gd[png,jpeg,webp] dev-lang/erlang:=
-DESCRIPTION=Erlang Image Manipulation Process
-EAPI=7
-HOMEPAGE=https://github.com/processone/eimp
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.23 media-libs/gd[png,jpeg,webp] dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/eimp/archive/1.0.21.tar.gz -> eimp-1.0.21.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=0ad9996a2dcce26a4895da6936a12e68
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.45 b/metadata/md5-cache/dev-erlang/esip-1.0.45
deleted file mode 100644
index 57513fd449ac..000000000000
--- a/metadata/md5-cache/dev-erlang/esip-1.0.45
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/fast_tls-1.1.13 >=dev-erlang/stun-1.0.47 >=dev-erlang/p1_utils-1.0.23 dev-lang/erlang:=
-DESCRIPTION=ProcessOne SIP server component
-EAPI=7
-HOMEPAGE=https://github.com/processone/esip
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/fast_tls-1.1.13 >=dev-erlang/stun-1.0.47 >=dev-erlang/p1_utils-1.0.23 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/esip/archive/1.0.45.tar.gz -> esip-1.0.45.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=50e7bbc6926484106d8a82e4a852cddb
diff --git a/metadata/md5-cache/dev-erlang/esip-1.0.47 b/metadata/md5-cache/dev-erlang/esip-1.0.47
index 34fb5c982e3a..f4c1967a8ba4 100644
--- a/metadata/md5-cache/dev-erlang/esip-1.0.47
+++ b/metadata/md5-cache/dev-erlang/esip-1.0.47
@@ -5,10 +5,10 @@ DESCRIPTION=ProcessOne SIP server component
 EAPI=7
 HOMEPAGE=https://github.com/processone/esip
 INHERIT=rebar
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
+KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
 LICENSE=Apache-2.0
 RDEPEND=>=dev-erlang/fast_tls-1.1.15 >=dev-erlang/stun-1.2.2 >=dev-erlang/p1_utils-1.0.25 dev-lang/erlang:=
 SLOT=0
 SRC_URI=https://github.com/processone/esip/archive/1.0.47.tar.gz -> esip-1.0.47.tar.gz
 _eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=6a5afa8ca3f13fc7d1845062325c7322
+_md5_=29ed0a797cf1f0db96ca5218d1f062c6
diff --git a/metadata/md5-cache/dev-erlang/ezlib-1.0.10 b/metadata/md5-cache/dev-erlang/ezlib-1.0.10
deleted file mode 100644
index 7461e4083493..000000000000
--- a/metadata/md5-cache/dev-erlang/ezlib-1.0.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1:= sys-libs/zlib dev-lang/erlang:=
-DESCRIPTION=Native zlib driver for Erlang and Elixir
-EAPI=7
-HOMEPAGE=https://github.com/processone/ezlib
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.1:= sys-libs/zlib dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/ezlib/archive/1.0.10.tar.gz -> ezlib-1.0.10.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=6ed8270601422cf08ac6e95a7b71d17b
diff --git a/metadata/md5-cache/dev-erlang/fast_tls-1.1.13 b/metadata/md5-cache/dev-erlang/fast_tls-1.1.13
deleted file mode 100644
index 0cbf81f0b30d..000000000000
--- a/metadata/md5-cache/dev-erlang/fast_tls-1.1.13
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/p1_utils-1.0.23 dev-libs/openssl:0= dev-lang/erlang:=
-DESCRIPTION=TLS/SSL native driver for Erlang and Elixir
-EAPI=7
-HOMEPAGE=https://github.com/processone/fast_tls
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/p1_utils-1.0.23 dev-libs/openssl:0= dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/fast_tls/archive/1.1.13.tar.gz -> fast_tls-1.1.13.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=18f991abd1153aa9316be5d1880df872
diff --git a/metadata/md5-cache/dev-erlang/jiffy-1.0.5 b/metadata/md5-cache/dev-erlang/jiffy-1.0.5
deleted file mode 100644
index f816279616b8..000000000000
--- a/metadata/md5-cache/dev-erlang/jiffy-1.0.5
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar:0 >=sys-apps/gawk-4.1
-DESCRIPTION=JSON NIFs for Erlang
-EAPI=6
-HOMEPAGE=https://github.com/davisp/jiffy
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc x86
-LICENSE=MIT BSD
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/davisp/jiffy/archive/1.0.5.tar.gz -> jiffy-1.0.5.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=2b72385debcad738b59a8b28bac47340
diff --git a/metadata/md5-cache/dev-erlang/jiffy-1.0.8 b/metadata/md5-cache/dev-erlang/jiffy-1.0.8
deleted file mode 100644
index 45e122f1593f..000000000000
--- a/metadata/md5-cache/dev-erlang/jiffy-1.0.8
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:= dev-util/rebar:0 >=sys-apps/gawk-4.1
-DESCRIPTION=JSON NIFs for Erlang
-EAPI=6
-HOMEPAGE=https://github.com/davisp/jiffy
-INHERIT=rebar
-KEYWORDS=~amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=MIT BSD
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/davisp/jiffy/archive/1.0.8.tar.gz -> jiffy-1.0.8.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=5893c31758c3397bb4ff8d1421ec8f6b
diff --git a/metadata/md5-cache/dev-erlang/mqtree-1.0.14 b/metadata/md5-cache/dev-erlang/mqtree-1.0.14
deleted file mode 100644
index ac2cd3f8f071..000000000000
--- a/metadata/md5-cache/dev-erlang/mqtree-1.0.14
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.5 >=dev-erlang/p1_utils-1.0.23 dev-lang/erlang:=
-DESCRIPTION=Index tree for MQTT topic filters
-EAPI=7
-HOMEPAGE=https://github.com/processone/mqtree
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.5 >=dev-erlang/p1_utils-1.0.23 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/mqtree/archive/1.0.14.tar.gz -> mqtree-1.0.14.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=69e1d78eedbec638414dcee694f7667d
diff --git a/metadata/md5-cache/dev-erlang/p1_acme-1.0.16 b/metadata/md5-cache/dev-erlang/p1_acme-1.0.16
deleted file mode 100644
index 30b5fe8daf90..000000000000
--- a/metadata/md5-cache/dev-erlang/p1_acme-1.0.16
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/jiffy-1.0.5 >=dev-erlang/yconf-1.0.12 >=dev-erlang/idna-6.0.0-r1 >=dev-erlang/jose-1.11.1 >=dev-erlang/base64url-1.0.1 dev-lang/erlang:=
-DESCRIPTION=ACME client library for Erlang
-EAPI=7
-HOMEPAGE=https://github.com/processone/p1_acme
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/jiffy-1.0.5 >=dev-erlang/yconf-1.0.12 >=dev-erlang/idna-6.0.0-r1 >=dev-erlang/jose-1.11.1 >=dev-erlang/base64url-1.0.1 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/p1_acme/archive/1.0.16.tar.gz -> p1_acme-1.0.16.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=f7ef94e7cfb2e4b7e8bb5c726ea55fab
diff --git a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.10 b/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.10
deleted file mode 100644
index 8be2ccb92880..000000000000
--- a/metadata/md5-cache/dev-erlang/p1_oauth2-0.6.10
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 test? ( >=dev-erlang/meck-0.8.7 >=dev-erlang/proper-1.3 ) dev-lang/erlang:=
-DESCRIPTION=Erlang OAuth 2.0 implementation
-EAPI=7
-HOMEPAGE=https://github.com/processone/p1_oauth2
-INHERIT=rebar
-IUSE=test
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=MIT
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/processone/p1_oauth2/archive/0.6.10.tar.gz -> p1_oauth2-0.6.10.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=aa5b4f02d788fb3bb37495bd2fa64f8e
diff --git a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.16 b/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.16
deleted file mode 100644
index 72f1a25ece2b..000000000000
--- a/metadata/md5-cache/dev-erlang/p1_pgsql-1.1.16
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
-DESCRIPTION=Pure Erlang PostgreSQL driver
-EAPI=7
-HOMEPAGE=https://github.com/processone/p1_pgsql
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=ErlPL-1.1
-RDEPEND=>=dev-lang/erlang-17.1 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/p1_pgsql/archive/1.1.16.tar.gz -> p1_pgsql-1.1.16.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=99ee4923634ae0e2817acf95a2b59394
diff --git a/metadata/md5-cache/dev-erlang/p1_utils-1.0.23 b/metadata/md5-cache/dev-erlang/p1_utils-1.0.23
deleted file mode 100644
index cfcf78f2fe9c..000000000000
--- a/metadata/md5-cache/dev-erlang/p1_utils-1.0.23
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1:= dev-lang/erlang:=
-DESCRIPTION=Erlang utility modules from ProcessOne
-EAPI=7
-HOMEPAGE=https://github.com/processone/p1_utils
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.1:= dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/p1_utils/archive/1.0.23.tar.gz -> p1_utils-1.0.23.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=b940b4e85e0f487fe03c682d0e2161e6
diff --git a/metadata/md5-cache/dev-erlang/pkix-1.0.8 b/metadata/md5-cache/dev-erlang/pkix-1.0.8
deleted file mode 100644
index e7200144dbde..000000000000
--- a/metadata/md5-cache/dev-erlang/pkix-1.0.8
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
-DEFINED_PHASES=compile install prepare test
-DEPEND=dev-lang/erlang:=
-DESCRIPTION=PKIX certificates management library for Erlang
-EAPI=7
-HOMEPAGE=https://github.com/processone/pkix
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/pkix/archive/1.0.8.tar.gz -> pkix-1.0.8.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=d06258bc4539c336f0b9155689df9234
diff --git a/metadata/md5-cache/dev-erlang/stringprep-1.0.27 b/metadata/md5-cache/dev-erlang/stringprep-1.0.27
deleted file mode 100644
index d945fcfb8273..000000000000
--- a/metadata/md5-cache/dev-erlang/stringprep-1.0.27
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.23 dev-lang/erlang:=
-DESCRIPTION=Fast Stringprep implementation for Erlang and Elixir
-EAPI=7
-HOMEPAGE=https://github.com/processone/stringprep
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0 tcltk
-RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/p1_utils-1.0.23 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/stringprep/archive/1.0.27.tar.gz -> stringprep-1.0.27.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=d2b615792b161baf5b27b564e15f146b
diff --git a/metadata/md5-cache/dev-erlang/xmpp-1.5.6 b/metadata/md5-cache/dev-erlang/xmpp-1.5.6
deleted file mode 100644
index 0feb769d1b49..000000000000
--- a/metadata/md5-cache/dev-erlang/xmpp-1.5.6
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-erlang/ezlib-1.0.10 >=dev-erlang/fast_tls-1.1.12 >=dev-erlang/fast_xml-1.1.48 >=dev-erlang/p1_utils-1.0.23 >=dev-erlang/stringprep-1.0.27 >=dev-erlang/idna-6.0.0-r1 dev-lang/erlang:=
-DESCRIPTION=XMPP parsing and serialization library on top of Fast XML
-EAPI=7
-HOMEPAGE=https://github.com/processone/xmpp
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-erlang/ezlib-1.0.10 >=dev-erlang/fast_tls-1.1.12 >=dev-erlang/fast_xml-1.1.48 >=dev-erlang/p1_utils-1.0.23 >=dev-erlang/stringprep-1.0.27 >=dev-erlang/idna-6.0.0-r1 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/xmpp/archive/1.5.6.tar.gz -> xmpp-1.5.6.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=09865dd7b230eab579745f29420b20a5
diff --git a/metadata/md5-cache/dev-erlang/yconf-1.0.12 b/metadata/md5-cache/dev-erlang/yconf-1.0.12
deleted file mode 100644
index 1e250ff32534..000000000000
--- a/metadata/md5-cache/dev-erlang/yconf-1.0.12
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/rebar:0 >=sys-apps/gawk-4.1
-DEFINED_PHASES=compile install prepare test
-DEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/fast_yaml-1.0.32 dev-lang/erlang:=
-DESCRIPTION=YAML configuration processor
-EAPI=7
-HOMEPAGE=https://github.com/processone/yconf
-INHERIT=rebar
-KEYWORDS=amd64 ~arm ~ia64 ~ppc ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=>=dev-lang/erlang-17.1 >=dev-erlang/fast_yaml-1.0.32 dev-lang/erlang:=
-SLOT=0
-SRC_URI=https://github.com/processone/yconf/archive/1.0.12.tar.gz -> yconf-1.0.12.tar.gz
-_eclasses_=rebar	c90ca870377295e338a9682a5b951ef6
-_md5_=03b4d705056e1bd465cdb0f3daebe052
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 5a2fce385bb5..cb813c5af8c8 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/irrlicht-mt-1.9.0.5 b/metadata/md5-cache/dev-games/irrlicht-mt-1.9.0.8
similarity index 70%
rename from metadata/md5-cache/dev-games/irrlicht-mt-1.9.0.5
rename to metadata/md5-cache/dev-games/irrlicht-mt-1.9.0.8
index b3da5a1a5190..6563148554cb 100644
--- a/metadata/md5-cache/dev-games/irrlicht-mt-1.9.0.5
+++ b/metadata/md5-cache/dev-games/irrlicht-mt-1.9.0.8
@@ -1,14 +1,14 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=~dev-games/irrlicht-mt-headers-1.9.0.5 media-libs/libpng:0= sys-libs/zlib media-libs/libjpeg-turbo virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm x11-base/xorg-proto
+DEPEND=~dev-games/irrlicht-mt-headers-1.9.0.8 media-libs/libpng:0= sys-libs/zlib media-libs/libjpeg-turbo virtual/opengl x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm x11-base/xorg-proto
 DESCRIPTION=Minetest's fork of dev-games/irrlicht
 EAPI=8
 HOMEPAGE=https://github.com/minetest/irrlicht
 INHERIT=cmake
 KEYWORDS=~amd64 ~riscv
 LICENSE=ZLIB
-RDEPEND=~dev-games/irrlicht-mt-headers-1.9.0.5 media-libs/libpng:0= sys-libs/zlib media-libs/libjpeg-turbo virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm
+RDEPEND=~dev-games/irrlicht-mt-headers-1.9.0.8 media-libs/libpng:0= sys-libs/zlib media-libs/libjpeg-turbo virtual/opengl x11-libs/libX11 x11-libs/libXi x11-libs/libXxf86vm
 SLOT=0
-SRC_URI=https://github.com/minetest/irrlicht/archive/refs/tags/1.9.0mt5.tar.gz -> irrlicht-mt-1.9.0.5.tar.gz
+SRC_URI=https://github.com/minetest/irrlicht/archive/refs/tags/1.9.0mt8.tar.gz -> irrlicht-mt-1.9.0.8.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=21a9cf84641d350c6b7bfbfd57f2d928
+_md5_=8ba3ec74c453c1ce95e5731489e92126
diff --git a/metadata/md5-cache/dev-games/irrlicht-mt-headers-1.9.0.5 b/metadata/md5-cache/dev-games/irrlicht-mt-headers-1.9.0.8
similarity index 88%
rename from metadata/md5-cache/dev-games/irrlicht-mt-headers-1.9.0.5
rename to metadata/md5-cache/dev-games/irrlicht-mt-headers-1.9.0.8
index 0295a5457cd6..9b82c168a6f3 100644
--- a/metadata/md5-cache/dev-games/irrlicht-mt-headers-1.9.0.5
+++ b/metadata/md5-cache/dev-games/irrlicht-mt-headers-1.9.0.8
@@ -6,5 +6,5 @@ KEYWORDS=~amd64 ~riscv
 LICENSE=ZLIB
 RDEPEND=!<dev-games/irrlicht-mt-1.9.0.4-r1
 SLOT=0
-SRC_URI=https://github.com/minetest/irrlicht/archive/refs/tags/1.9.0mt5.tar.gz -> irrlicht-mt-1.9.0.5.tar.gz
+SRC_URI=https://github.com/minetest/irrlicht/archive/refs/tags/1.9.0mt8.tar.gz -> irrlicht-mt-1.9.0.8.tar.gz
 _md5_=d87529af8687b392e376e114dfa65034
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index b84db2ead78f..d70cf82b3404 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/commons-digester-2.1-r2 b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
index 3342a873c703..5eb42b4edaa6 100644
--- a/metadata/md5-cache/dev-java/commons-digester-2.1-r2
+++ b/metadata/md5-cache/dev-java/commons-digester-2.1-r2
@@ -12,4 +12,4 @@ RESTRICT=!test? ( test )
 SLOT=2.1
 SRC_URI=mirror://apache/commons/digester/source/commons-digester-2.1-src.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=b7bb8f3b2a878f1cb6fe638237ebedbf
+_md5_=d9a856c9a26947e6aff0cc6a26b497a4
diff --git a/metadata/md5-cache/dev-java/xerces-2.12.2 b/metadata/md5-cache/dev-java/xerces-2.12.2
index ec1630af0519..1409728c560d 100644
--- a/metadata/md5-cache/dev-java/xerces-2.12.2
+++ b/metadata/md5-cache/dev-java/xerces-2.12.2
@@ -11,4 +11,4 @@ RDEPEND=dev-java/xml-commons-external:1.4 dev-java/xml-commons-resolver:0 >=virt
 SLOT=2
 SRC_URI=mirror://apache/xerces/j/source/Xerces-J-src.2.12.2.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=cb5ec7aa1a3c9ce7cbd1b7f7cf3f0037
+_md5_=7fa4e7df315d179713b3fd20c507a16c
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index d8953161cc8c..0c61002e7214 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/interprolog-2.1.2 b/metadata/md5-cache/dev-lang/interprolog-2.1.2
index 5181119ded7d..9e385dfe9be5 100644
--- a/metadata/md5-cache/dev-lang/interprolog-2.1.2
+++ b/metadata/md5-cache/dev-lang/interprolog-2.1.2
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/jdk-1.8:* dev-java/junit:0 >=dev-java/java-config-2.2.0-r3
 SLOT=0
 SRC_URI=http://www.declarativa.com/interprolog/interprolog212.zip
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a9569f73fbe910c8e341ff5af8dcfb0e
+_md5_=7038aa2b985832873c6d176feaeb1c52
diff --git a/metadata/md5-cache/dev-lang/rust-1.63.0-r1 b/metadata/md5-cache/dev-lang/rust-1.63.0-r1
index f5f651324c0c..30aeb9089691 100644
--- a/metadata/md5-cache/dev-lang/rust-1.63.0-r1
+++ b/metadata/md5-cache/dev-lang/rust-1.63.0-r1
@@ -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 rls rustfmt rust-src system-bootstrap system-llvm test wasm llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc64 ~riscv ~sparc ~x86
 LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
 RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:14[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:14[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:14[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:14[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:14[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:14[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:14[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:14[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:14[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:14[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:14[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:14[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:14[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:14[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:14[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:14[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:14[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-15:= wasm? ( sys-devel/lld ) 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 ) rls? ( rust-src ) test? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=stable/1.63
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.63.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.63.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.62.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.62.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.62.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.62.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.62.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.62.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.62.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.62.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.62.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.62.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.62.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.62.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.62.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.62.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.62.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.62.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.62.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=e73a8e95095a36ac112b4260b0385a44
+_md5_=35b8cc7cd349a1025d355eb6db1a77f6
diff --git a/metadata/md5-cache/dev-lang/rust-1.64.0 b/metadata/md5-cache/dev-lang/rust-1.64.0
new file mode 100644
index 000000000000..8a6d046bb212
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-1.64.0
@@ -0,0 +1,16 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-eselect/eselect-rust || ( >=sys-devel/gcc-4.7 >=sys-devel/clang-3.5 ) system-bootstrap? ( || ( =dev-lang/rust-1.63* =dev-lang/rust-bin-1.63* =dev-lang/rust-1.64* =dev-lang/rust-bin-1.64* ) ) !system-llvm? ( >=dev-util/cmake-3.13.4 dev-util/ninja ) test? ( sys-devel/gdb ) verify-sig? ( sec-keys/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:14[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:14[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:14[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:14[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:14[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:14[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:14[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:14[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:14[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:14[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:14[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:14[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:14[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:14[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:14[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:14[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:14[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-15:= wasm? ( sys-devel/lld ) llvm-libunwind? ( sys-libs/llvm-libunwind:= ) ) !system-llvm? ( !llvm-libunwind? ( elibc_musl? ( sys-libs/libunwind:= ) ) ) !!sys-devel/llvm:0
+DESCRIPTION=Systems programming language from Mozilla
+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 rls 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
+LICENSE=|| ( MIT Apache-2.0 ) BSD-1 BSD-2 BSD-4 UoI-NCSA
+RDEPEND=>=app-arch/xz-utils-5.2 net-misc/curl:=[http2,ssl] sys-libs/zlib:= dev-libs/openssl:0= system-llvm? ( || ( ( llvm_targets_AArch64? ( sys-devel/llvm:14[llvm_targets_AArch64(-)] ) llvm_targets_AMDGPU? ( sys-devel/llvm:14[llvm_targets_AMDGPU(-)] ) llvm_targets_ARM? ( sys-devel/llvm:14[llvm_targets_ARM(-)] ) llvm_targets_AVR? ( sys-devel/llvm:14[llvm_targets_AVR(-)] ) llvm_targets_BPF? ( sys-devel/llvm:14[llvm_targets_BPF(-)] ) llvm_targets_Hexagon? ( sys-devel/llvm:14[llvm_targets_Hexagon(-)] ) llvm_targets_Lanai? ( sys-devel/llvm:14[llvm_targets_Lanai(-)] ) llvm_targets_Mips? ( sys-devel/llvm:14[llvm_targets_Mips(-)] ) llvm_targets_MSP430? ( sys-devel/llvm:14[llvm_targets_MSP430(-)] ) llvm_targets_NVPTX? ( sys-devel/llvm:14[llvm_targets_NVPTX(-)] ) llvm_targets_PowerPC? ( sys-devel/llvm:14[llvm_targets_PowerPC(-)] ) llvm_targets_RISCV? ( sys-devel/llvm:14[llvm_targets_RISCV(-)] ) llvm_targets_Sparc? ( sys-devel/llvm:14[llvm_targets_Sparc(-)] ) llvm_targets_SystemZ? ( sys-devel/llvm:14[llvm_targets_SystemZ(-)] ) llvm_targets_WebAssembly? ( sys-devel/llvm:14[llvm_targets_WebAssembly(-)] ) llvm_targets_X86? ( sys-devel/llvm:14[llvm_targets_X86(-)] ) llvm_targets_XCore? ( sys-devel/llvm:14[llvm_targets_XCore(-)] ) ) ) <sys-devel/llvm-15:= wasm? ( sys-devel/lld ) 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 ) rls? ( rust-src ) test? ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore ) wasm? ( llvm_targets_WebAssembly ) x86? ( cpu_flags_x86_sse2 )
+RESTRICT=test
+SLOT=stable/1.64
+SRC_URI=https://static.rust-lang.org/dist/rustc-1.64.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.64.0-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.63.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.63.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.63.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.63.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.63.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.63.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.63.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.63.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.63.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.63.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.63.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.63.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.63.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.63.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.63.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=1fe226ae4fc71ee3aa5f25d2e5365875
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.63.0 b/metadata/md5-cache/dev-lang/rust-bin-1.63.0
index 39b448c71ff8..62046f180242 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.63.0
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.63.0
@@ -5,11 +5,11 @@ 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 rls rust-src rustfmt abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+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.63.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.63.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.63.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.63.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.63.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.63.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.63.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.63.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.63.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.63.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.63.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.63.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.63.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.63.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.63.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.63.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2022-08-11/rust-src-1.63.0.tar.xz ) sparc? ( https://dev.gentoo.org/~sam/distfiles/dev-lang/rust-bin/rust-1.63.0-sparc64-unknown-linux-gnu.tar.xz )
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=1bd8c27e2e438ab3d95dbf55a3c95a8b
+_md5_=36b523dd824f98ade0380e4f86158ce1
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.64.0 b/metadata/md5-cache/dev-lang/rust-bin-1.64.0
new file mode 100644
index 000000000000..7ee10f94f8c9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.64.0
@@ -0,0 +1,14 @@
+BDEPEND=prefix? ( dev-util/patchelf ) verify-sig? ( sec-keys/openpgp-keys-rust ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst postrm pretend test unpack
+DESCRIPTION=Systems programming language from Mozilla
+EAPI=8
+HOMEPAGE=https://www.rust-lang.org/
+INHERIT=multilib prefix rust-toolchain toolchain-funcs verify-sig multilib-minimal
+IUSE=clippy cpu_flags_x86_sse2 doc prefix rls 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
+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.64.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.64.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.64.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.64.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.64.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2022-09-22/rust-src-1.64.0.tar.xz )
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	9e3a9f96182f7084ca9c6e173d2f2f5c	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=738188dc90bd518a76ae85600a4d45c4
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-102.2.0 b/metadata/md5-cache/dev-lang/spidermonkey-102.3.0
similarity index 85%
rename from metadata/md5-cache/dev-lang/spidermonkey-102.2.0
rename to metadata/md5-cache/dev-lang/spidermonkey-102.3.0
index 6fe5ed086a88..ee28d3ad4cb5 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-102.2.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-102.3.0
@@ -11,6 +11,6 @@ LICENSE=MPL-2.0
 RDEPEND=>=dev-libs/icu-71.1:= dev-libs/nspr sys-libs/readline:0= sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=102
-SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.2.0esr/source/firefox-102.2.0esr.source.tar.xz -> firefox-102.2.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-01j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-01j.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/spidermonkey-102-patches-03j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-102-patches-03j.tar.xz
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/source/firefox-102.3.0esr.source.tar.xz -> firefox-102.3.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-02j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-02j.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/spidermonkey-102-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-102-patches-04j.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=51120513fd9e79cf2bbfdca37efa498d
+_md5_=310324a34f3eee51d90635022250fb70
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-78.15.0 b/metadata/md5-cache/dev-lang/spidermonkey-78.15.0
index 69630b8a1108..0a76cd613be4 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-78.15.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-78.15.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=78
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/78.15.0esr/source/firefox-78.15.0esr.source.tar.xz -> firefox-78.15.0esr.source.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-78esr-patches-19.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-78esr-patches-19.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/firefox-78esr-patches-19.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz https://dev.gentoo.org/~axs/mozilla/patchsets/spidermonkey-78-patches-04.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7960db75e608cfcc3e9f79c64baa194d
+_md5_=bc29f53fd47ed7be8f7160ce8b0e1f28
diff --git a/metadata/md5-cache/dev-lang/spidermonkey-91.13.0 b/metadata/md5-cache/dev-lang/spidermonkey-91.13.0
index 2f91dded3242..188aa4b045a1 100644
--- a/metadata/md5-cache/dev-lang/spidermonkey-91.13.0
+++ b/metadata/md5-cache/dev-lang/spidermonkey-91.13.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://spidermonkey.dev https://firefox-source-docs.mozilla.org/js/index.html
 INHERIT=autotools check-reqs flag-o-matic llvm multiprocessing prefix python-any-r1 toolchain-funcs
 IUSE=clang cpu_flags_arm_neon debug +jit lto test
-KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~mips ~ppc ppc64 ~riscv x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-libs/icu-69.1:= dev-libs/nspr sys-libs/readline:0= sys-libs/zlib
 RESTRICT=!test? ( test )
 SLOT=91
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/91.13.0esr/source/firefox-91.13.0esr.source.tar.xz -> firefox-91.13.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-91esr-patches-10j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/firefox-91esr-patches-10j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-91esr-patches-10j.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/spidermonkey-91-patches-04j.tar.xz https://dev.gentoo.org/~polynomial-c/mozilla/patchsets/spidermonkey-91-patches-04j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/spidermonkey-91-patches-04j.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1632b85f33d6a41905e5958f48e12fbd
+_md5_=01ba6b82f6c5d8269bc24ea1fafece33
diff --git a/metadata/md5-cache/dev-lang/typescript-4.5.4 b/metadata/md5-cache/dev-lang/typescript-4.5.4-r1
similarity index 70%
rename from metadata/md5-cache/dev-lang/typescript-4.5.4
rename to metadata/md5-cache/dev-lang/typescript-4.5.4-r1
index b55060abb470..2826a94ea2fa 100644
--- a/metadata/md5-cache/dev-lang/typescript-4.5.4
+++ b/metadata/md5-cache/dev-lang/typescript-4.5.4-r1
@@ -1,11 +1,11 @@
 BDEPEND=>=net-libs/nodejs-16[npm]
 DEFINED_PHASES=compile install
 DESCRIPTION=Superset of JavaScript with optional static typing, classes and interfaces
-EAPI=7
-HOMEPAGE=https://www.typescriptlang.org
+EAPI=8
+HOMEPAGE=https://www.typescriptlang.org/ https://github.com/microsoft/TypeScript/
 KEYWORDS=~amd64 ~arm64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=net-libs/nodejs
 SLOT=0
 SRC_URI=https://registry.npmjs.org/typescript/-/typescript-4.5.4.tgz
-_md5_=0837742d925772bc8f375291ed864bcc
+_md5_=da6b7c0cfedae1faabb6d04e9d9f40e5
diff --git a/metadata/md5-cache/dev-lang/typescript-4.8.3-r1 b/metadata/md5-cache/dev-lang/typescript-4.8.3-r1
new file mode 100644
index 000000000000..421dc7e5fc0d
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/typescript-4.8.3-r1
@@ -0,0 +1,11 @@
+BDEPEND=>=net-libs/nodejs-16[npm]
+DEFINED_PHASES=compile install
+DESCRIPTION=Superset of JavaScript with optional static typing, classes and interfaces
+EAPI=8
+HOMEPAGE=https://www.typescriptlang.org/ https://github.com/microsoft/TypeScript/
+KEYWORDS=~amd64 ~arm64 ~ppc64
+LICENSE=Apache-2.0
+RDEPEND=net-libs/nodejs
+SLOT=0
+SRC_URI=https://registry.npmjs.org/typescript/-/typescript-4.8.3.tgz
+_md5_=da6b7c0cfedae1faabb6d04e9d9f40e5
diff --git a/metadata/md5-cache/dev-lang/xsb-4.0.0 b/metadata/md5-cache/dev-lang/xsb-4.0.0
index 37f85df4a262..5a4bf64334ee 100644
--- a/metadata/md5-cache/dev-lang/xsb-4.0.0
+++ b/metadata/md5-cache/dev-lang/xsb-4.0.0
@@ -12,4 +12,4 @@ RDEPEND=curl? ( net-misc/curl ) iodbc? ( dev-db/libiodbc ) java? ( >=virtual/jdk
 SLOT=0
 SRC_URI=mirror://sourceforge/xsb/XSB-4-0-0.tar.gz https://dev.gentoo.org/~keri/distfiles/xsb/xsb-4.0.0-gentoo-patchset-3.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d6bcb668b3e2166657de4432cecdcef8
+_md5_=a40e8b6725c43a8b50a69eef5f9c22fe
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 4229be201fef..c7bad5c32834 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/expat-2.4.9 b/metadata/md5-cache/dev-libs/expat-2.4.9
index 6b5d8ea3bd58..2b365c34771d 100644
--- a/metadata/md5-cache/dev-libs/expat-2.4.9
+++ b/metadata/md5-cache/dev-libs/expat-2.4.9
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://libexpat.github.io/
 INHERIT=autotools multilib-minimal
 IUSE=examples static-libs unicode abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-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=MIT
 SLOT=0
 SRC_URI=https://github.com/libexpat/libexpat/releases/download/R_2_4_9/expat-2.4.9.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2b4d81f63ac0973abeeb429cb6d7ddea
+_md5_=ba29a04828a0a93c4ee403d4d54cb08c
diff --git a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2 b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
index 648a4b1a4609..29a4f74fb417 100644
--- a/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
+++ b/metadata/md5-cache/dev-libs/fcgi-2.4.1_pre0910052249-r2
@@ -10,4 +10,4 @@ LICENSE=FastCGI
 SLOT=0
 SRC_URI=http://www.fastcgi.com/dist/fcgi-2.4.1-SNAP-0910052249.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ac5bf4e646107922f5180b29e92f54c4
+_md5_=08daf09537322299963e70fa436371f2
diff --git a/metadata/md5-cache/dev-libs/glib-2.74.0 b/metadata/md5-cache/dev-libs/glib-2.74.0
index fe78b78fb0c3..6a89a7fc6cfd 100644
--- a/metadata/md5-cache/dev-libs/glib-2.74.0
+++ b/metadata/md5-cache/dev-libs/glib-2.74.0
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://gnome/sources/glib/2.74/glib-2.74.0.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5178b088e7ce0ea378b5289cf3669d94
+_md5_=482b923ef9ffed1f9376db2f2c3794a4
diff --git a/metadata/md5-cache/dev-libs/icu-72_rc b/metadata/md5-cache/dev-libs/icu-72_rc
new file mode 100644
index 000000000000..e068a993004a
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/icu-72_rc
@@ -0,0 +1,13 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) sys-devel/autoconf-archive virtual/pkgconfig doc? ( app-doc/doxygen[dot] ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare setup test
+DESCRIPTION=International Components for Unicode
+EAPI=8
+HOMEPAGE=https://icu.unicode.org/
+INHERIT=autotools flag-o-matic multilib-minimal python-any-r1 toolchain-funcs
+IUSE=debug doc examples 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=BSD
+RESTRICT=!test? ( test )
+SLOT=0/72_rc
+SRC_URI=https://github.com/unicode-org/icu/archive/refs/tags/release-72-rc.tar.gz -> icu-72_rc.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=abf543b5adf0a494ea46c2ddab28e1ce
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-72_rc b/metadata/md5-cache/dev-libs/icu-layoutex-72_rc
new file mode 100644
index 000000000000..0d1b78d76348
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/icu-layoutex-72_rc
@@ -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 >=sys-devel/libtool-2.4
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~dev-libs/icu-72_rc[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/icu-le-hb[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=External layout part of International Components for Unicode
+EAPI=8
+HOMEPAGE=https://icu.unicode.org/
+INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
+IUSE=debug 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=BSD
+RDEPEND=~dev-libs/icu-72_rc[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/icu-le-hb[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/72_rc
+SRC_URI=https://github.com/unicode-org/icu/archive/refs/tags/release-72-rc.tar.gz -> icu-72_rc.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ee5432ef2850da8c4a6c5ae0984a050c
diff --git a/metadata/md5-cache/dev-libs/inih-55 b/metadata/md5-cache/dev-libs/inih-55
deleted file mode 100644
index 75b404aedcb2..000000000000
--- a/metadata/md5-cache/dev-libs/inih-55
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install test
-DESCRIPTION=inih (INI not invented here) simple .INI file parser
-EAPI=7
-HOMEPAGE=https://github.com/benhoyt/inih
-INHERIT=meson-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=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=BSD
-SLOT=0
-SRC_URI=https://github.com/benhoyt/inih/archive/r55.tar.gz -> inih-55.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f21ca760ec2ccacc6e39c60729e9e3d6
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.6-r1 b/metadata/md5-cache/dev-libs/leatherman-1.12.6-r1
deleted file mode 100644
index 421bea4198f8..000000000000
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.6-r1
+++ /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 test
-DEPEND=dev-libs/boost:=[nls] net-misc/curl
-DESCRIPTION=A C++ toolkit
-EAPI=7
-HOMEPAGE=https://github.com/puppetlabs/leatherman
-INHERIT=cmake
-IUSE=debug static-libs test
-KEYWORDS=amd64 ~arm ~hppa ppc ppc64 sparc x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/boost:=[nls] net-misc/curl
-RESTRICT=test
-SLOT=0/1.12.6
-SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.6.tar.gz -> leatherman-1.12.6.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fc8ff176bc01afdb5d027887e507fd62
diff --git a/metadata/md5-cache/dev-libs/leatherman-1.12.6-r2 b/metadata/md5-cache/dev-libs/leatherman-1.12.6-r2
deleted file mode 100644
index 39db5398a4be..000000000000
--- a/metadata/md5-cache/dev-libs/leatherman-1.12.6-r2
+++ /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 test
-DEPEND=dev-libs/boost:=[nls] net-misc/curl
-DESCRIPTION=A C++ toolkit
-EAPI=7
-HOMEPAGE=https://github.com/puppetlabs/leatherman
-INHERIT=cmake
-IUSE=debug static-libs test
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=Apache-2.0
-RDEPEND=dev-libs/boost:=[nls] net-misc/curl
-RESTRICT=test
-SLOT=0/1.12.6
-SRC_URI=https://github.com/puppetlabs/leatherman/archive/1.12.6.tar.gz -> leatherman-1.12.6.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7f8dcb2fef96f28b42699a300f4e7410
diff --git a/metadata/md5-cache/dev-libs/libassuan-2.5.3 b/metadata/md5-cache/dev-libs/libassuan-2.5.3
deleted file mode 100644
index fb9bd5886328..000000000000
--- a/metadata/md5-cache/dev-libs/libassuan-2.5.3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libgpg-error-1.8
-DESCRIPTION=IPC library used by GnuPG and GPGME
-EAPI=7
-HOMEPAGE=https://www.gnupg.org/related_software/libassuan/index.en.html
-INHERIT=libtool
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3 LGPL-2.1
-RDEPEND=>=dev-libs/libgpg-error-1.8
-SLOT=0
-SRC_URI=mirror://gnupg/libassuan/libassuan-2.5.3.tar.bz2
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=88d78d93e76d3b26b17e2c57a9a3d7ed
diff --git a/metadata/md5-cache/dev-libs/libassuan-2.5.4 b/metadata/md5-cache/dev-libs/libassuan-2.5.4
deleted file mode 100644
index 688490ec7a04..000000000000
--- a/metadata/md5-cache/dev-libs/libassuan-2.5.4
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815
-DEFINED_PHASES=configure install prepare
-DEPEND=>=dev-libs/libgpg-error-1.17
-DESCRIPTION=IPC library used by GnuPG and GPGME
-EAPI=7
-HOMEPAGE=https://www.gnupg.org/related_software/libassuan/index.en.html
-INHERIT=libtool
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3 LGPL-2.1
-RDEPEND=>=dev-libs/libgpg-error-1.17
-SLOT=0
-SRC_URI=mirror://gnupg/libassuan/libassuan-2.5.4.tar.bz2
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=28d4e4053373eda18fa190fafdcb402c
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.42 b/metadata/md5-cache/dev-libs/libgpg-error-1.42
deleted file mode 100644
index ee47aa1d933f..000000000000
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.42
+++ /dev/null
@@ -1,15 +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 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)?] )
-DESCRIPTION=Contains error handling functions used by GnuPG software
-EAPI=7
-HOMEPAGE=https://www.gnupg.org/related_software/libgpg-error
-INHERIT=autotools multilib-minimal toolchain-funcs prefix
-IUSE=common-lisp 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 ~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 LGPL-2.1
-RDEPEND=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(-)?] )
-SLOT=0
-SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.42.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1a5ddba1d62b91bb75c1a933c2507e5c
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.44 b/metadata/md5-cache/dev-libs/libgpg-error-1.44
deleted file mode 100644
index 7c81fc50cefe..000000000000
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.44
+++ /dev/null
@@ -1,15 +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 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=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(-)?] )
-DESCRIPTION=Contains error handling functions used by GnuPG software
-EAPI=8
-HOMEPAGE=https://www.gnupg.org/related_software/libgpg-error
-INHERIT=autotools multilib-minimal toolchain-funcs prefix
-IUSE=common-lisp 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 ~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 LGPL-2.1
-RDEPEND=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(-)?] )
-SLOT=0
-SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.44.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=62a3ce110a5a26b23c2bbb30654fdf7a
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.18.0 b/metadata/md5-cache/dev-libs/libtasn1-4.18.0
deleted file mode 100644
index a81179aa1674..000000000000
--- a/metadata/md5-cache/dev-libs/libtasn1-4.18.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-apps/help2man virtual/yacc test? ( valgrind? ( dev-util/valgrind ) ) >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=ASN.1 library
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/libtasn1/
-INHERIT=multilib-minimal libtool
-IUSE=static-libs test valgrind 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
-LICENSE=GPL-3 LGPL-2.1
-RESTRICT=!test? ( test )
-SLOT=0/6
-SRC_URI=mirror://gnu/libtasn1/libtasn1-4.18.0.tar.gz
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=af76ea288b27510443f47d9127de3169
diff --git a/metadata/md5-cache/dev-libs/mathjax-2.7.7 b/metadata/md5-cache/dev-libs/mathjax-2.7.7
index f1beb0f6d49c..a690fdc48a7e 100644
--- a/metadata/md5-cache/dev-libs/mathjax-2.7.7
+++ b/metadata/md5-cache/dev-libs/mathjax-2.7.7
@@ -4,11 +4,11 @@ EAPI=7
 HOMEPAGE=https://www.mathjax.org/
 INHERIT=vcs-clean
 IUSE=doc examples
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=Apache-2.0
 RDEPEND=doc? ( app-doc/mathjax-docs:0 )
 RESTRICT=binchecks strip
 SLOT=0
 SRC_URI=https://github.com/mathjax/MathJax/archive/2.7.7.tar.gz -> mathjax-2.7.7.tar.gz
 _eclasses_=vcs-clean	d271b7bc7e6a009758d7d4ef749174e3
-_md5_=3ca58458e1805b2ab010a6d28ae719b9
+_md5_=b13eb29476381ef01ae7715bf8236a61
diff --git a/metadata/md5-cache/dev-libs/mpfr-4.1.0-r1 b/metadata/md5-cache/dev-libs/mpfr-4.1.0-r1
deleted file mode 100644
index e2a948c10736..000000000000
--- a/metadata/md5-cache/dev-libs/mpfr-4.1.0-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install test
-DEPEND=>=dev-libs/gmp-5.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(-)?,static-libs?]
-DESCRIPTION=Library for multiple-precision floating-point computations with exact rounding
-EAPI=7
-HOMEPAGE=https://www.mpfr.org/ https://gitlab.inria.fr/mpfr
-INHERIT=multilib-minimal
-IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=LGPL-2.1
-RDEPEND=>=dev-libs/gmp-5.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(-)?,static-libs?]
-SLOT=0/6
-SRC_URI=https://www.mpfr.org/mpfr-4.1.0/mpfr-4.1.0.tar.xz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5bee1472a2b24f34aaf9a77214055ed7
diff --git a/metadata/md5-cache/dev-libs/nettle-3.8 b/metadata/md5-cache/dev-libs/nettle-3.8
deleted file mode 100644
index 767a6cfc85c5..000000000000
--- a/metadata/md5-cache/dev-libs/nettle-3.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( sys-apps/texinfo ) verify-sig? ( sec-keys/openpgp-keys-nettle ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Low-level cryptographic library
-EAPI=7
-HOMEPAGE=http://www.lysator.liu.se/~nisse/nettle/
-INHERIT=multilib-build multilib-minimal toolchain-funcs verify-sig
-IUSE=+asm doc +gmp static-libs cpu_flags_arm_neon cpu_flags_arm_aes cpu_flags_arm_sha1 cpu_flags_arm_sha2 cpu_flags_ppc_altivec cpu_flags_x86_aes cpu_flags_x86_sha cpu_flags_x86_pclmul 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=|| ( LGPL-3 LGPL-2.1 )
-RDEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=cpu_flags_arm_aes? ( cpu_flags_arm_sha1 cpu_flags_arm_sha2 ) cpu_flags_arm_sha1? ( cpu_flags_arm_aes cpu_flags_arm_sha2 ) cpu_flags_arm_sha2? ( cpu_flags_arm_aes cpu_flags_arm_sha1 )
-SLOT=0/8-6
-SRC_URI=mirror://gnu/nettle/nettle-3.8.tar.gz verify-sig? ( mirror://gnu/nettle/nettle-3.8.tar.gz.sig )
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=2becbcc10276c2e3891cda2fae326c55
diff --git a/metadata/md5-cache/dev-libs/nss-3.79.1 b/metadata/md5-cache/dev-libs/nss-3.79.1
index 8861ee13ca5e..44e874508f81 100644
--- a/metadata/md5-cache/dev-libs/nss-3.79.1
+++ b/metadata/md5-cache/dev-libs/nss-3.79.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
 INHERIT=flag-o-matic multilib toolchain-funcs multilib-minimal
 IUSE=cacert test +utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx 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-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
 LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
 RDEPEND=>=dev-libs/nspr-4.34[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-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/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(-)?] virtual/pkgconfig
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_79_1_RTM/src/nss-3.79.1.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=429c0c01449069d7ac11b594a847f07d
+_md5_=d73865ad378b6685ba817440cbc77f1e
diff --git a/metadata/md5-cache/dev-libs/nsync-1.25.0 b/metadata/md5-cache/dev-libs/nsync-1.25.0
new file mode 100644
index 000000000000..54f418993e6c
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nsync-1.25.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=C library that exports various synchronization primitives, such as mutexes
+EAPI=8
+HOMEPAGE=https://github.com/google/nsync
+INHERIT=cmake
+IUSE=test
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/google/nsync/archive/1.25.0.tar.gz -> nsync-1.25.0.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=945425d563de2f8362a89c0b2a171480
diff --git a/metadata/md5-cache/dev-libs/rccl-5.1.3 b/metadata/md5-cache/dev-libs/rccl-5.1.3
new file mode 100644
index 000000000000..39a5bd187851
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/rccl-5.1.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/cmake-3.22 >=dev-util/rocm-cmake-5.0.2-r1 test? ( dev-cpp/gtest ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip dev-util/rocm-smi:0/5.1
+DESCRIPTION=ROCm Communication Collectives Library (RCCL)
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rccl
+INHERIT=cmake edo rocm
+IUSE=test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-util/hip dev-util/rocm-smi:0/5.1
+RESTRICT=!test? ( test )
+SLOT=0/5.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/rccl/archive/rocm-5.1.3.tar.gz -> rccl-5.1.3.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	rocm	b9cbeeea0f6a3a703665d80185feb812	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=57719c810219cffa912d3a3339326860
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-c-1.51.06-r3 b/metadata/md5-cache/dev-libs/xmlrpc-c-1.51.06-r3
new file mode 100644
index 000000000000..3f88d1f1c170
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/xmlrpc-c-1.51.06-r3
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( 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(-)?] ) libxml2? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=A lightweight RPC library based on XML and HTTP
+EAPI=7
+HOMEPAGE=http://xmlrpc-c.sourceforge.net/
+INHERIT=multilib-minimal toolchain-funcs
+IUSE=abyss +cgi +curl +cxx +libxml2 threads 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 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( 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(-)?] ) libxml2? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=test? ( abyss curl cxx )
+RESTRICT=!test? ( test )
+SLOT=0/4.51
+SRC_URI=mirror://sourceforge/xmlrpc-c/xmlrpc-c-1.51.06.tgz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0c4cee8afcb02603630535d0fc29beff
diff --git a/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05-r1 b/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05-r1
new file mode 100644
index 000000000000..a4b940a2c87f
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/xmlrpc-c-1.54.05-r1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( 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(-)?] ) libxml2? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=A lightweight RPC library based on XML and HTTP
+EAPI=7
+HOMEPAGE=http://xmlrpc-c.sourceforge.net/
+INHERIT=multilib-minimal toolchain-funcs
+IUSE=abyss +cgi +curl +cxx +libxml2 threads 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=BSD
+RDEPEND=sys-libs/ncurses:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/readline:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] curl? ( 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(-)?] ) libxml2? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+REQUIRED_USE=test? ( abyss curl cxx )
+RESTRICT=!test? ( test )
+SLOT=0/4.54
+SRC_URI=mirror://sourceforge/xmlrpc-c/xmlrpc-c-1.54.05.tgz
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=aa1394d581996be6d14728b5c2ce90e0
diff --git a/metadata/md5-cache/dev-ml/Manifest.gz b/metadata/md5-cache/dev-ml/Manifest.gz
index 1db338e3a036..77b635a85463 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/batteries-3.5.1 b/metadata/md5-cache/dev-ml/batteries-3.5.1
new file mode 100644
index 000000000000..a523a79da654
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/batteries-3.5.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-ml/ocamlbuild
+DEFINED_PHASES=compile install
+DEPEND=>=dev-ml/findlib-1.0.4-r1[ocamlopt?]
+DESCRIPTION=A community-maintained standard library extension
+EAPI=8
+HOMEPAGE=https://github.com/ocaml-batteries-team/batteries-included/
+INHERIT=findlib
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2.1-with-linking-exception
+RDEPEND=dev-ml/num:= dev-lang/ocaml:=[ocamlopt?]
+RESTRICT=test
+SLOT=0/3.5.1
+SRC_URI=https://github.com/ocaml-batteries-team/batteries-included/archive/v3.5.1.tar.gz -> batteries-3.5.1.tar.gz
+_eclasses_=findlib	d8fa93cf137156660d0b72144b1e31d9
+_md5_=5c687125da31117b2c4a81e7ae94271c
diff --git a/metadata/md5-cache/dev-ml/pprint-20220103 b/metadata/md5-cache/dev-ml/pprint-20220103
new file mode 100644
index 000000000000..1c4f27f4e7d3
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/pprint-20220103
@@ -0,0 +1,15 @@
+BDEPEND=dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=A pretty-printing combinator library and rendering engine
+EAPI=8
+HOMEPAGE=https://github.com/fpottier/pprint/
+INHERIT=dune
+IUSE=+ocamlopt
+KEYWORDS=~amd64 ~x86
+LICENSE=LGPL-2 LGPL-2-with-linking-exception
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+SLOT=0/20220103
+SRC_URI=https://github.com/fpottier/pprint/archive/20220103.tar.gz -> pprint-20220103.tar.gz
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=c6d63524ae24c23c0f6377b3bdee78b4
diff --git a/metadata/md5-cache/dev-ml/spawn-0.15.1 b/metadata/md5-cache/dev-ml/spawn-0.15.1
new file mode 100644
index 000000000000..07cf160e8456
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/spawn-0.15.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-ml/ppx_expect ) dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install test
+DEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=Spawning sub-processes
+EAPI=8
+HOMEPAGE=https://github.com/janestreet/spawn
+INHERIT=dune
+IUSE=+ocamlopt test
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/0.15
+SRC_URI=https://github.com/janestreet/spawn/archive/v0.15.1.tar.gz -> spawn-0.15.1.tar.gz
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=d1077f39afa8e3f1ee8628da5bc8b9b9
diff --git a/metadata/md5-cache/dev-ml/yojson-2.0.2 b/metadata/md5-cache/dev-ml/yojson-2.0.2
new file mode 100644
index 000000000000..cf12cbbc9322
--- /dev/null
+++ b/metadata/md5-cache/dev-ml/yojson-2.0.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-ml/cppo-1.6.1 test? ( dev-ml/alcotest ) dev-ml/dune dev-lang/ocaml
+DEFINED_PHASES=compile install prepare test
+DEPEND=>=dev-lang/ocaml-4.02.3:=[ocamlopt?] >=dev-ml/seq-0.2.2:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+DESCRIPTION=JSON parsing and pretty-printing library for OCaml
+EAPI=8
+HOMEPAGE=https://github.com/ocaml-community/yojson
+INHERIT=dune
+IUSE=examples +ocamlopt test
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-lang/ocaml-4.02.3:=[ocamlopt?] >=dev-ml/seq-0.2.2:=[ocamlopt?] >=dev-lang/ocaml-4:=[ocamlopt?] dev-ml/dune:=
+RESTRICT=!test? ( test )
+SLOT=0/2.0.2
+SRC_URI=https://github.com/ocaml-community/yojson/archive/2.0.2.tar.gz -> yojson-2.0.2.tar.gz
+_eclasses_=dune	c8f275f00adf2380fe0a57d8a249885c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=638295dae121698802b5428bb42ce2ee
diff --git a/metadata/md5-cache/dev-perl/ExtUtils-CChecker-0.110.0 b/metadata/md5-cache/dev-perl/ExtUtils-CChecker-0.110.0
index ba5a43203dfc..85083a5566cf 100644
--- a/metadata/md5-cache/dev-perl/ExtUtils-CChecker-0.110.0
+++ b/metadata/md5-cache/dev-perl/ExtUtils-CChecker-0.110.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/ExtUtils-CChecker
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=virtual/perl-ExtUtils-CBuilder dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/ExtUtils-CChecker-0.11.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=5add3b0581865f6cd8cf0e2d66691ed7
+_md5_=d038f54e894d975e2e1c749374daeb2b
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index e1262720abcd..9fd71a614b8b 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/Syntax-Keyword-Try-0.270.0 b/metadata/md5-cache/dev-perl/Syntax-Keyword-Try-0.270.0
index b3486b474f2d..1a4111cdc3b4 100644
--- a/metadata/md5-cache/dev-perl/Syntax-Keyword-Try-0.270.0
+++ b/metadata/md5-cache/dev-perl/Syntax-Keyword-Try-0.270.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Syntax-Keyword-Try
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=|| ( Artistic GPL-1+ )
 RDEPEND=dev-perl/XS-Parse-Keyword dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/P/PE/PEVANS/Syntax-Keyword-Try-0.27.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=3eb03729d1115b7662e9f2d0cb3731bf
+_md5_=6caff9d94dc29b4a609ff5b74d525279
diff --git a/metadata/md5-cache/dev-perl/XS-Parse-Keyword-0.250.0 b/metadata/md5-cache/dev-perl/XS-Parse-Keyword-0.250.0
index cb081cdba1d4..13cb751131c0 100644
--- a/metadata/md5-cache/dev-perl/XS-Parse-Keyword-0.250.0
+++ b/metadata/md5-cache/dev-perl/XS-Parse-Keyword-0.250.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/XS-Parse-Keyword
 INHERIT=perl-module
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~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 ~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/P/PE/PEVANS/XS-Parse-Keyword-0.25.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	4f80b00fab088c2f6d68edb55a6c4bf4	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=c175571b5b6de42eff5280f1d2fde644
+_md5_=de0f5f47121d7a933c36e38dabaacdda
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index a30090a81d5b..29c8475bde3a 100644
Binary files a/metadata/md5-cache/dev-php/Manifest.gz and b/metadata/md5-cache/dev-php/Manifest.gz differ
diff --git a/metadata/md5-cache/dev-php/mockery-0.9.0-r1 b/metadata/md5-cache/dev-php/mockery-0.9.0-r1
index b2dc42dd61af..607f55667c08 100644
--- a/metadata/md5-cache/dev-php/mockery-0.9.0-r1
+++ b/metadata/md5-cache/dev-php/mockery-0.9.0-r1
@@ -7,6 +7,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD
 RDEPEND=>=dev-php/pear-1.8.1
 SLOT=0
-SRC_URI=http:///get/Mockery-0.9.0.tgz
+SRC_URI=http://pear.survivethedeepend.com/get/Mockery-0.9.0.tgz
 _eclasses_=php-pear-r2	64a0c48972c51aa882f41e6b59374bcb
-_md5_=dc93f92f30c41c5e7c7d8e06406b7cd2
+_md5_=23f88c1cb8eab2d5ad5cc94e7bdfddb3
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 30895faf9a39..309df7b58064 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/MechanicalSoup-1.2.0 b/metadata/md5-cache/dev-python/MechanicalSoup-1.2.0
new file mode 100644
index 000000000000..aee09693a297
--- /dev/null
+++ b/metadata/md5-cache/dev-python/MechanicalSoup-1.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/requests-mock-1.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-httpbin[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/beautifulsoup4-4.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.22.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Python library for automating interaction with websites
+EAPI=8
+HOMEPAGE=https://github.com/MechanicalSoup/MechanicalSoup/ https://pypi.org/project/MechanicalSoup/
+INHERIT=distutils-r1
+IUSE=examples test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/beautifulsoup4-4.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/requests-2.22.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/M/MechanicalSoup/MechanicalSoup-1.2.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b1e3e70983819e06241fddcd1e88e5fc
diff --git a/metadata/md5-cache/dev-python/PyPDF2-2.10.9 b/metadata/md5-cache/dev-python/PyPDF2-2.10.9
new file mode 100644
index 000000000000..dc3cbda58e84
--- /dev/null
+++ b/metadata/md5-cache/dev-python/PyPDF2-2.10.9
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( python_targets_python3_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,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/PyPDF2/ https://github.com/py-pdf/PyPDF2/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 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_8? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 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/PyPDF2/archive/2.10.9.tar.gz -> PyPDF2-2.10.9.gh.tar.gz test? ( https://github.com/py-pdf/sample-files/archive/bedcbe077c4898e1b97c6c6f81d937f5048b4630.tar.gz -> PyPDF2-sample-files-bedcbe077c4898e1b97c6c6f81d937f5048b4630.gh.tar.gz )
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=0e2fba81614dd4a24df52327edb65665
diff --git a/metadata/md5-cache/dev-python/aiohttp-3.8.3 b/metadata/md5-cache/dev-python/aiohttp-3.8.3
new file mode 100644
index 000000000000..72536d67afb1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aiohttp-3.8.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/async_generator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] www-servers/gunicorn[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/re-assert[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !hppa? ( !ia64? ( dev-python/trustme[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) ) test? ( app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/async-timeout-4.0.0_alpha3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/charset_normalizer-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_11(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_11(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_11(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_11(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_10(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_10(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_10(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_10(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_9(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_9(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_9(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_9(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] >=dev-python/alabaster-0.6.2[python_targets_python3_8(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_8(-)] dev-python/sphinxcontrib-blockdiag[python_targets_python3_8(-)] dev-python/sphinxcontrib-newsfeed[python_targets_python3_8(-)] dev-python/sphinxcontrib-spelling[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-aiohttp-theme[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] >=dev-python/alabaster-0.6.2[python_targets_pypy3(-)] dev-python/sphinxcontrib-asyncio[python_targets_pypy3(-)] dev-python/sphinxcontrib-blockdiag[python_targets_pypy3(-)] dev-python/sphinxcontrib-newsfeed[python_targets_pypy3(-)] dev-python/sphinxcontrib-spelling[python_targets_pypy3(-)] dev-python/sphinx[python_targets_pypy3(-)] dev-python/sphinx-aiohttp-theme[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=HTTP client/server for asyncio
+EAPI=8
+HOMEPAGE=https://github.com/aio-libs/aiohttp/ https://pypi.org/project/aiohttp/
+INHERIT=distutils-r1 multiprocessing
+IUSE=test doc python_targets_pypy3 python_targets_python3_8 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=Apache-2.0
+RDEPEND=app-arch/brotli[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/aiosignal-1.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/async-timeout-4.0.0_alpha3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/attrs-17.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/charset_normalizer-2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/frozenlist-1.1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/multidict-4.5.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/yarl-1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/aiohttp/aiohttp-3.8.3.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=7a990e62f69270a550fac6fc8b0a1c73
diff --git a/metadata/md5-cache/dev-python/apsw-3.39.2.1-r1 b/metadata/md5-cache/dev-python/apsw-3.39.2.1-r1
index ad756242c420..6b5204e92af0 100644
--- a/metadata/md5-cache/dev-python/apsw-3.39.2.1-r1
+++ b/metadata/md5-cache/dev-python/apsw-3.39.2.1-r1
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 SLOT=0
 SRC_URI=https://github.com/rogerbinns/apsw/archive/3.39.2.1.tar.gz -> apsw-3.39.2.1.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=836fb39d7ae0fb9fce2d4bafa1c5e2ed
+_md5_=280b9f2b8e7ebe212fd77080752a0899
diff --git a/metadata/md5-cache/dev-python/argon2-cffi-21.3.0-r2 b/metadata/md5-cache/dev-python/argon2-cffi-21.3.0-r2
index 65d8e04b5325..8ca0304e026c 100644
--- a/metadata/md5-cache/dev-python/argon2-cffi-21.3.0-r2
+++ b/metadata/md5-cache/dev-python/argon2-cffi-21.3.0-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/hynek/argon2-cffi/ https://pypi.org/project/argon2-cffi/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/argon2-cffi-bindings-21.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/argon2-cffi/argon2-cffi-21.3.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b58a0e38ccd103ee36d79a3401d25495
+_md5_=e4143098186d9b160adee98449d77680
diff --git a/metadata/md5-cache/dev-python/argon2-cffi-bindings-21.2.0-r1 b/metadata/md5-cache/dev-python/argon2-cffi-bindings-21.2.0-r1
index 218fc53abe46..7d88eb2b5159 100644
--- a/metadata/md5-cache/dev-python/argon2-cffi-bindings-21.2.0-r1
+++ b/metadata/md5-cache/dev-python/argon2-cffi-bindings-21.2.0-r1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/hynek/argon2-cffi-bindings/ https://pypi.org/project/argon2-cffi-bindings/
 INHERIT=distutils-r1
 IUSE=cpu_flags_x86_sse2 test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=app-crypt/argon2:= >=dev-python/setuptools_scm-6.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/a/argon2-cffi-bindings/argon2-cffi-bindings-21.2.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3b8738064cb45fc2e54fb1fdd1dc8190
+_md5_=a82bf80a10aab2b6989337acbc1be5d9
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.51.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.51.0
new file mode 100644
index 000000000000..3556a89ff93f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.51.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/boto3-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.51.0.tar.gz -> aws-sam-translator-1.51.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=485f35ba7ed8681c67a26dfc45c1d571
diff --git a/metadata/md5-cache/dev-python/awxkit-21.6.0 b/metadata/md5-cache/dev-python/awxkit-21.6.0
new file mode 100644
index 000000000000..33084fa85151
--- /dev/null
+++ b/metadata/md5-cache/dev-python/awxkit-21.6.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Command line interface for Ansible AWX
+EAPI=8
+HOMEPAGE=https://github.com/ansible/awx/ https://pypi.org/project/awxkit/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/websocket-client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ansible/awx/archive/21.6.0.tar.gz -> awxkit-21.6.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=02e4ce7955f9a609875937ff6c351434
diff --git a/metadata/md5-cache/dev-python/backcall-0.2.0-r1 b/metadata/md5-cache/dev-python/backcall-0.2.0-r1
index b4159784b59f..19691deceded 100644
--- a/metadata/md5-cache/dev-python/backcall-0.2.0-r1
+++ b/metadata/md5-cache/dev-python/backcall-0.2.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/backcall/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/b/backcall/backcall-0.2.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=48f46db45a53b4f9cfad757767abe217
+_md5_=2e6559fd57a59809e152c404ec4fe952
diff --git a/metadata/md5-cache/dev-python/boto3-1.24.78 b/metadata/md5-cache/dev-python/boto3-1.24.78
new file mode 100644
index 000000000000..07ba13bd1c56
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.24.78
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.27.78[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 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.27.78[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.24.78.tar.gz -> boto3-1.24.78.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.27.78 b/metadata/md5-cache/dev-python/botocore-1.27.78
new file mode 100644
index 000000000000..719699568245
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.27.78
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,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_8 python_targets_python3_9 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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.27.78.tar.gz -> botocore-1.27.78.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=bb152b00283104522fdf392996d7badc
diff --git a/metadata/md5-cache/dev-python/canonicaljson-1.6.2 b/metadata/md5-cache/dev-python/canonicaljson-1.6.2
index 90946d5837a7..9045a96b9c05 100644
--- a/metadata/md5-cache/dev-python/canonicaljson-1.6.2
+++ b/metadata/md5-cache/dev-python/canonicaljson-1.6.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/matrix-org/python-canonicaljson/ https://pypi.org/project/canonicaljson/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-python/simplejson[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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/matrix-org/python-canonicaljson/archive/v1.6.2.tar.gz -> canonicaljson-1.6.2.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=12d52947b81cc3ec7f3e4a92b0be2bb7
+_md5_=519a4a1f954ff0e0acd4e4f5687e394b
diff --git a/metadata/md5-cache/dev-python/cfn-lint-0.65.1 b/metadata/md5-cache/dev-python/cfn-lint-0.65.1
new file mode 100644
index 000000000000..da2a7fd86fec
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cfn-lint-0.65.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/aws-sam-translator-1.51.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+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_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/aws-sam-translator-1.51.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonpatch[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jschema_to_python-1.2.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jsonschema-3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/junit-xml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >dev-python/pyyaml-5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.15.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sarif_om-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws-cloudformation/cfn-lint/archive/v0.65.1.tar.gz -> cfn-lint-0.65.1.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=3503a1ccca3aa433cf56231d3b55970f
diff --git a/metadata/md5-cache/dev-python/configupdater-3.1.1 b/metadata/md5-cache/dev-python/configupdater-3.1.1
index 6c428c039fc8..265fcaa024eb 100644
--- a/metadata/md5-cache/dev-python/configupdater-3.1.1
+++ b/metadata/md5-cache/dev-python/configupdater-3.1.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pyscaffold/configupdater/ https://pypi.org/project/ConfigUpdater/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT PSF-2 PYTHON
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/pyscaffold/configupdater/archive/v3.1.1.tar.gz -> configupdater-3.1.1.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0ac4a609f637ff333123e90f745da653
+_md5_=01d6ef5213fda1b8a73bdcddee33a59d
diff --git a/metadata/md5-cache/dev-python/dask-2022.9.1 b/metadata/md5-cache/dev-python/dask-2022.9.1
new file mode 100644
index 000000000000..d1d717638b30
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dask-2022.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numexpr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-rerunfailures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Task scheduling and blocked algorithms for parallel processing
+EAPI=8
+HOMEPAGE=https://www.dask.org/ https://github.com/dask/dask/ https://pypi.org/project/dask/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.15.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-0.25.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/packaging-20.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/partd-0.3.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dask/dask/archive/2022.9.1.tar.gz -> dask-2022.9.1.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a0b541c333193cb4c2e3eedae08472ce
diff --git a/metadata/md5-cache/dev-python/debugpy-1.6.3 b/metadata/md5-cache/dev-python/debugpy-1.6.3
index 62507e560aef..e230180fb91b 100644
--- a/metadata/md5-cache/dev-python/debugpy-1.6.3
+++ b/metadata/md5-cache/dev-python/debugpy-1.6.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/pydevd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/microsoft/debugpy/archive/v1.6.3.tar.gz -> debugpy-1.6.3.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=157aa819bdd03edeaf0d06e75205db10
+_md5_=3570cb905dda9884c2ffbacf5621bca9
diff --git a/metadata/md5-cache/dev-python/fastjsonschema-2.16.2 b/metadata/md5-cache/dev-python/fastjsonschema-2.16.2
index 5e97211d45a6..fd420bf44a99 100644
--- a/metadata/md5-cache/dev-python/fastjsonschema-2.16.2
+++ b/metadata/md5-cache/dev-python/fastjsonschema-2.16.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/horejsek/python-fastjsonschema/ https://pypi.org/project/fastjsonschema/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/horejsek/python-fastjsonschema/archive/v2.16.2.tar.gz -> python-fastjsonschema-2.16.2.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=eb8c8d9dcbaaaf3529caf1ab29fce104
+_md5_=26a8bec261a8e89082ef791f0ecbf277
diff --git a/metadata/md5-cache/dev-python/flask-compress-1.13 b/metadata/md5-cache/dev-python/flask-compress-1.13
new file mode 100644
index 000000000000..c123a441f51f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flask-compress-1.13
@@ -0,0 +1,16 @@
+BDEPEND=test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Compress responses in your Flask app with gzip
+EAPI=8
+HOMEPAGE=https://github.com/colour-science/flask-compress/ https://pypi.org/project/Flask-Compress/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/F/Flask-Compress/Flask-Compress-1.13.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=06046557119032390298e64ea0a08316
diff --git a/metadata/md5-cache/dev-python/fonttools-4.37.3 b/metadata/md5-cache/dev-python/fonttools-4.37.3
new file mode 100644
index 000000000000..06a687ed4f57
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fonttools-4.37.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( app-arch/brotli[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] app-arch/zopfli ) test? ( >=dev-python/fs-2.4.9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,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_python3_8 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_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[xml(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[xml(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[xml(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[xml(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 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.37.3.tar.gz -> fonttools-4.37.3.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=5184af7dda336c9995f9ae80f64a940b
diff --git a/metadata/md5-cache/dev-python/frozendict-2.3.4 b/metadata/md5-cache/dev-python/frozendict-2.3.4
index 9dfee2d1b6b5..3846b8af13e8 100644
--- a/metadata/md5-cache/dev-python/frozendict-2.3.4
+++ b/metadata/md5-cache/dev-python/frozendict-2.3.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Marco-Sulla/python-frozendict/ https://pypi.org/project/frozendict/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=MIT
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Marco-Sulla/python-frozendict/archive/v2.3.4.tar.gz -> frozendict-2.3.4.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2694cfa0c0fb016dad26dea7092d5c50
+_md5_=0c64fe8a24add9e23969ba888914f9d3
diff --git a/metadata/md5-cache/dev-python/google-api-python-client-2.62.0 b/metadata/md5-cache/dev-python/google-api-python-client-2.62.0
new file mode 100644
index 000000000000..016d8704283b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-api-python-client-2.62.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/oauth2client[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/uritemplate-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google API Client for Python
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-api-python-client/ https://pypi.org/project/google-api-python-client/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/httplib2-0.15[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/httplib2-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-api-core-2.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.35.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-httplib2-0.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/uritemplate-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/uritemplate-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/googleapis/google-api-python-client/archive/v2.62.0.tar.gz -> google-api-python-client-2.62.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=30baed68af227d8d50e2ff1fad823f5c
diff --git a/metadata/md5-cache/dev-python/google-auth-2.11.1 b/metadata/md5-cache/dev-python/google-auth-2.11.1
new file mode 100644
index 000000000000..65b55aa41b66
--- /dev/null
+++ b/metadata/md5-cache/dev-python/google-auth-2.11.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/freezegun[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyopenssl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-localserver[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyu2f[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/urllib3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( <dev-python/cachetools-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Google Authentication Library
+EAPI=8
+HOMEPAGE=https://github.com/googleapis/google-auth-library-python/ https://pypi.org/project/google-auth/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/cachetools-6.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyasn1-modules-0.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/rsa-3.1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !dev-python/namespace-google python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/g/google-auth/google-auth-2.11.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1872107c91c5a0201cf7ccbf7c7198a8
diff --git a/metadata/md5-cache/dev-python/hatch-fancy-pypi-readme-22.7.0 b/metadata/md5-cache/dev-python/hatch-fancy-pypi-readme-22.7.0
new file mode 100644
index 000000000000..37220ec31902
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hatch-fancy-pypi-readme-22.7.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/hatchling[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Fancy PyPI READMEs with Hatch
+EAPI=8
+HOMEPAGE=https://pypi.org/project/hatch-fancy-pypi-readme/ https://github.com/hynek/hatch-fancy-pypi-readme/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/hatchling[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/hynek/hatch-fancy-pypi-readme/archive/22.7.0.tar.gz -> hatch-fancy-pypi-readme-22.7.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8285f18599976b8fde854a325b4971bc
diff --git a/metadata/md5-cache/dev-python/html2text-2020.1.16-r2 b/metadata/md5-cache/dev-python/html2text-2020.1.16-r2
index ad7500bcdd9b..a88fd2c4d39f 100644
--- a/metadata/md5-cache/dev-python/html2text-2020.1.16-r2
+++ b/metadata/md5-cache/dev-python/html2text-2020.1.16-r2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/Alir3z4/html2text https://pypi.org/project/html2text/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~ppc ~sparc x86
+KEYWORDS=amd64 ~arm ~ppc ~ppc64 ~sparc x86
 LICENSE=GPL-3
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/h/html2text/html2text-2020.1.16.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9a3988b8d95beebcce52c8cfa8e2afc2
+_md5_=cb2d4c6f862ded866cbccb5da727d426
diff --git a/metadata/md5-cache/dev-python/humanize-4.4.0 b/metadata/md5-cache/dev-python/humanize-4.4.0
new file mode 100644
index 000000000000..804cc3a40961
--- /dev/null
+++ b/metadata/md5-cache/dev-python/humanize-4.4.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Common humanization utilities
+EAPI=8
+HOMEPAGE=https://github.com/python-humanize/humanize/ https://pypi.org/project/humanize/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/h/humanize/humanize-4.4.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=abcc828d46d66b09f1d027adde5bc1c9
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.54.6 b/metadata/md5-cache/dev-python/hypothesis-6.54.6
new file mode 100644
index 000000000000..ee87e4bd9dd3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.54.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite] ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 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=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.54.6.tar.gz -> hypothesis-6.54.6.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=5b09b9a0dd08f81535e7177132a73d3c
diff --git a/metadata/md5-cache/dev-python/ini2toml-0.11-r1 b/metadata/md5-cache/dev-python/ini2toml-0.11-r1
index 6eeba172f787..14ac621110b4 100644
--- a/metadata/md5-cache/dev-python/ini2toml-0.11-r1
+++ b/metadata/md5-cache/dev-python/ini2toml-0.11-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ini2toml/ https://github.com/abravalheri/ini2toml/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MPL-2.0
 RDEPEND=>=dev-python/packaging-20.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomli-w-0.4.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/abravalheri/ini2toml/archive/v0.11.tar.gz -> ini2toml-0.11.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b017a5947898dabe9eb24188fec5d61f
+_md5_=19020b0f9669628404449d6f77f62116
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.15.3 b/metadata/md5-cache/dev-python/ipykernel-6.15.3
new file mode 100644
index 000000000000..0f3ab46cd250
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ipykernel-6.15.3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipyparallel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hatchling-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=IPython Kernel for Jupyter
+EAPI=8
+HOMEPAGE=https://github.com/ipython/ipykernel
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/debugpy-1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jupyter_client-6.1.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nest_asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pyzmq-17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/traitlets-5.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=www-servers/tornado-6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/i/ipykernel/ipykernel-6.15.3.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b8dca97c37f5e4527036b5d4729db0fe
diff --git a/metadata/md5-cache/dev-python/jaraco-text-3.9.1 b/metadata/md5-cache/dev-python/jaraco-text-3.9.1
index ca2acd22ac51..e29f77bae35f 100644
--- a/metadata/md5-cache/dev-python/jaraco-text-3.9.1
+++ b/metadata/md5-cache/dev-python/jaraco-text-3.9.1
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/jaraco/jaraco.text/ https://pypi.org/project/jaraco.text/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 PDEPEND=dev-python/autocommand[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/inflect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 RDEPEND=>=dev-python/jaraco-context-4.1.1-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jaraco-functools-3.5.0-r1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/importlib_resources-5.4.0-r3[python_targets_python3_8(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/j/jaraco.text/jaraco.text-3.9.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=57345761c3ad0810663524bc6e2c7a9a
+_md5_=c61bf4e2bb0094c906806853c07815e3
diff --git a/metadata/md5-cache/dev-python/jq-1.3.0 b/metadata/md5-cache/dev-python/jq-1.3.0
new file mode 100644
index 000000000000..27913cac5eaf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jq-1.3.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python bindings for jq
+EAPI=8
+HOMEPAGE=https://github.com/mwilliamson/jq.py
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mwilliamson/jq.py/archive/1.3.0.tar.gz -> jq-1.3.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=38cb3077f42b6d2c414a25a4d658a1bc
diff --git a/metadata/md5-cache/dev-python/jsonschema-spec-0.1.2 b/metadata/md5-cache/dev-python/jsonschema-spec-0.1.2
new file mode 100644
index 000000000000..89544f7a2472
--- /dev/null
+++ b/metadata/md5-cache/dev-python/jsonschema-spec-0.1.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=JSONSchema Spec with object-oriented paths
+EAPI=8
+HOMEPAGE=https://pypi.org/project/jsonschema-spec/ https://github.com/p1c2u/jsonschema-spec/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pathable[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/p1c2u/jsonschema-spec/archive/0.1.2.tar.gz -> jsonschema-spec-0.1.2.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=9cb3654aaf9b117470e6240545e5f8e5
diff --git a/metadata/md5-cache/dev-python/keyring-23.9.3 b/metadata/md5-cache/dev-python/keyring-23.9.3
new file mode 100644
index 000000000000..c6ae261a1d4b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/keyring-23.9.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/secretstorage-3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jeepney-0.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Provides access to the system keyring service
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/keyring/ https://pypi.org/project/keyring/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=PSF-2
+RDEPEND=>=dev-python/secretstorage-3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jeepney-0.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jaraco/keyring/archive/v23.9.3.tar.gz -> keyring-23.9.3.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1b13c0fbed3f1122980c2d7a7a8ba640
diff --git a/metadata/md5-cache/dev-python/libvirt-python-7.10.0 b/metadata/md5-cache/dev-python/libvirt-python-7.10.0
deleted file mode 100644
index e50e44d9ac43..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-7.10.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) test? ( app-emulation/libvirt:0/7.10.0 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=libvirt Python bindings
-EAPI=7
-HOMEPAGE=https://www.libvirt.org
-INHERIT=distutils-r1 verify-sig
-IUSE=examples test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/7.10.0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://libvirt.org/sources/python/libvirt-python-7.10.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-7.10.0.tar.gz.asc )
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=d0db7dbb97c0247de4bbac48917d96b0
diff --git a/metadata/md5-cache/dev-python/libvirt-python-8.0.0 b/metadata/md5-cache/dev-python/libvirt-python-8.0.0
deleted file mode 100644
index 5751f4bdfc69..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-8.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) test? ( app-emulation/libvirt:0/8.0.0 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=libvirt Python bindings
-EAPI=7
-HOMEPAGE=https://www.libvirt.org
-INHERIT=distutils-r1 verify-sig
-IUSE=examples test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/8.0.0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://libvirt.org/sources/python/libvirt-python-8.0.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-8.0.0.tar.gz.asc )
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=237260b39b6fab75df1d55ac0c7748c1
diff --git a/metadata/md5-cache/dev-python/libvirt-python-8.1.0 b/metadata/md5-cache/dev-python/libvirt-python-8.1.0
deleted file mode 100644
index 03044b288e60..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-8.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) test? ( app-emulation/libvirt:0/8.1.0 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=libvirt Python bindings
-EAPI=7
-HOMEPAGE=https://www.libvirt.org
-INHERIT=distutils-r1 verify-sig
-IUSE=examples test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/8.1.0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://libvirt.org/sources/python/libvirt-python-8.1.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-8.1.0.tar.gz.asc )
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=9660d9d667467197b99ecf578c7943c1
diff --git a/metadata/md5-cache/dev-python/libvirt-python-8.3.0 b/metadata/md5-cache/dev-python/libvirt-python-8.3.0
deleted file mode 100644
index 5d88a72a9b78..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-8.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) test? ( app-emulation/libvirt:0/8.3.0 >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,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=libvirt Python bindings
-EAPI=7
-HOMEPAGE=https://www.libvirt.org
-INHERIT=distutils-r1 verify-sig
-IUSE=examples test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/8.3.0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://libvirt.org/sources/python/libvirt-python-8.3.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-8.3.0.tar.gz.asc )
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=86f07f8c5c51a56a475a116848682785
diff --git a/metadata/md5-cache/dev-python/libvirt-python-8.4.0 b/metadata/md5-cache/dev-python/libvirt-python-8.4.0
deleted file mode 100644
index 0794ed70fc6b..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-8.4.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) test? ( app-emulation/libvirt:0/8.4.0 >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,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=libvirt Python bindings
-EAPI=8
-HOMEPAGE=https://www.libvirt.org
-INHERIT=distutils-r1 verify-sig
-IUSE=examples test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/8.4.0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://libvirt.org/sources/python/libvirt-python-8.4.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-8.4.0.tar.gz.asc )
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=befca4618e634bfe065406cc5bd5af03
diff --git a/metadata/md5-cache/dev-python/libvirt-python-8.5.0 b/metadata/md5-cache/dev-python/libvirt-python-8.5.0
deleted file mode 100644
index 0f778753bc94..000000000000
--- a/metadata/md5-cache/dev-python/libvirt-python-8.5.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) verify-sig? ( sec-keys/openpgp-keys-libvirt ) test? ( app-emulation/libvirt:0/8.5.0 >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,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=libvirt Python bindings
-EAPI=8
-HOMEPAGE=https://www.libvirt.org
-INHERIT=distutils-r1 verify-sig
-IUSE=examples test test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=LGPL-2
-RDEPEND=app-emulation/libvirt:0/8.5.0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://libvirt.org/sources/python/libvirt-python-8.5.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-8.5.0.tar.gz.asc )
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=befca4618e634bfe065406cc5bd5af03
diff --git a/metadata/md5-cache/dev-python/mapbox_earcut-1.0.0 b/metadata/md5-cache/dev-python/mapbox_earcut-1.0.0
index 63432dd40701..db66ad18edf9 100644
--- a/metadata/md5-cache/dev-python/mapbox_earcut-1.0.0
+++ b/metadata/md5-cache/dev-python/mapbox_earcut-1.0.0
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python bindings to the mapbox earcut C++ library
 EAPI=8
 HOMEPAGE=https://github.com/skogler/mapbox_earcut_python
 INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/skogler/mapbox_earcut_python/archive/refs/tags/v1.0.0.tar.gz -> mapbox_earcut_python-1.0.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3a8f4a7800d863711c2c3fde25a1598a
+_md5_=2d22fe6bad36e6eb45490a45a5145d10
diff --git a/metadata/md5-cache/dev-python/marshmallow-3.18.0 b/metadata/md5-cache/dev-python/marshmallow-3.18.0
new file mode 100644
index 000000000000..8ff9428f18ad
--- /dev/null
+++ b/metadata/md5-cache/dev-python/marshmallow-3.18.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/simplejson[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-0.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library for converting to and from native Python datatypes
+EAPI=8
+HOMEPAGE=https://github.com/marshmallow-code/marshmallow/ https://pypi.org/project/marshmallow/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/packaging-0.17[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/marshmallow-code/marshmallow/archive/3.18.0.tar.gz -> marshmallow-3.18.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f1822b89533ff0671478f4d885c25bb3
diff --git a/metadata/md5-cache/dev-python/mkdocs-redirects-1.2.0 b/metadata/md5-cache/dev-python/mkdocs-redirects-1.2.0
new file mode 100644
index 000000000000..d060a5842919
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-redirects-1.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/mkdocs-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Plugin for Mkdocs page redirects
+EAPI=8
+HOMEPAGE=https://github.com/mkdocs/mkdocs-redirects https://pypi.org/project/mkdocs-redirects/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/mkdocs-1.0.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/mkdocs-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/twine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mkdocs/mkdocs-redirects/archive/refs/tags/v1.2.0.tar.gz -> mkdocs-redirects-1.2.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a6f2a3c5be30d66c43ce6141262df9e0
diff --git a/metadata/md5-cache/dev-python/mpmath-1.2.1 b/metadata/md5-cache/dev-python/mpmath-1.2.1
index a4366ed4bcf9..3df84e2688d8 100644
--- a/metadata/md5-cache/dev-python/mpmath-1.2.1
+++ b/metadata/md5-cache/dev-python/mpmath-1.2.1
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( gmp? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( gmp? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,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 library for arbitrary-precision floating-point arithmetic
 EAPI=7
 HOMEPAGE=https://mpmath.org/
 INHERIT=distutils-r1 virtualx
-IUSE=gmp matplotlib test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
+IUSE=gmp matplotlib test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
 KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=BSD
-RDEPEND=gmp? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=gmp? ( dev-python/gmpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) matplotlib? ( dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fredrik-johansson/mpmath/archive/1.2.1.tar.gz -> mpmath-1.2.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=2a051279613c2fb073db64ca9fe59105
+_md5_=24b81f7520199c99a55f436834d4be98
diff --git a/metadata/md5-cache/dev-python/netcdf4-python-1.5.8 b/metadata/md5-cache/dev-python/netcdf4-python-1.5.8
index 8ec6f8920c2c..38c8b7d3912a 100644
--- a/metadata/md5-cache/dev-python/netcdf4-python-1.5.8
+++ b/metadata/md5-cache/dev-python/netcdf4-python-1.5.8
@@ -1,17 +1,17 @@
-BDEPEND=test? ( sci-libs/hdf5 sci-libs/netcdf[hdf5,tools] dev-python/cftime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( sci-libs/hdf5 sci-libs/netcdf[hdf5,tools] dev-python/cftime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install postinst prepare test
 DEPEND=sci-libs/hdf5 sci-libs/netcdf:=[hdf5]
 DESCRIPTION=Python/numpy interface to the netCDF C library
 EAPI=8
 HOMEPAGE=https://unidata.github.io/netcdf4-python/
 INHERIT=distutils-r1 optfeature
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
-RDEPEND=sci-libs/hdf5 sci-libs/netcdf:=[hdf5] dev-python/cftime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=sci-libs/hdf5 sci-libs/netcdf:=[hdf5] dev-python/cftime[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/n/netCDF4/netCDF4-1.5.8.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a5f8b693d0338bc8c1628a6743ea9e52
+_md5_=d98a496ac02756b1ef3b97bf1c2528d5
diff --git a/metadata/md5-cache/dev-python/openapi-core-0.15.0 b/metadata/md5-cache/dev-python/openapi-core-0.15.0
new file mode 100644
index 000000000000..f0d115d45e69
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openapi-core-0.15.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/flask[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/responses[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/webob[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pathable-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Client-side and server-side support for the OpenAPI Specification v3
+EAPI=8
+HOMEPAGE=https://github.com/p1c2u/openapi-core/ https://pypi.org/project/openapi-core/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=>=dev-python/pathable-0.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/more-itertools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-spec-validator-0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/p1c2u/openapi-core/archive/0.15.0.tar.gz -> openapi-core-0.15.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a3c78ee949341908d84c10272163810d
diff --git a/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.4 b/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.4
new file mode 100644
index 000000000000..76bc3ab5d8f1
--- /dev/null
+++ b/metadata/md5-cache/dev-python/openapi-schema-validator-0.3.4
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=OpenAPI schema validation for Python
+EAPI=8
+HOMEPAGE=https://github.com/p1c2u/openapi-schema-validator/ https://pypi.org/project/openapi-schema-validator/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rfc3339-validator[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/strict-rfc3339[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/p1c2u/openapi-schema-validator/archive/0.3.4.tar.gz -> openapi-schema-validator-0.3.4.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=5dc1127d97e19ce765d04b004101beb5
diff --git a/metadata/md5-cache/dev-python/pandas-1.5.0 b/metadata/md5-cache/dev-python/pandas-1.5.0
new file mode 100644
index 000000000000..c321a7f5e63b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pandas-1.5.0
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-python/numpy-1.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2020.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/cython-0.29.32[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] doc? ( x11-base/xorg-server[xvfb] x11-apps/xhost app-text/pandoc dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/nbsphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpydoc-0.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/openpyxl-1.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytables-3.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/rpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sphinx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlrd[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip ) test? ( x11-base/xorg-server[xvfb] x11-apps/xhost >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel ) ) dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hypothesis-5.5.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pymysql[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-xdist-1.31[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psycopg:2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel )
+DESCRIPTION=Powerful data structures for data analysis and statistics
+EAPI=8
+HOMEPAGE=https://pandas.pydata.org/ https://github.com/pandas-dev/pandas/
+INHERIT=distutils-r1 multiprocessing optfeature virtualx
+IUSE=doc full-support minimal test X python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/numpy-1.21.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.8.1-r3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytz-2020.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !minimal? ( >=dev-python/bottleneck-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numexpr-2.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) full-support? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/blosc[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xlsxwriter[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytables-3.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xarray-0.12.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlrd-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/xlwt-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( dev-python/statsmodels[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) X? ( || ( dev-python/PyQt5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] x11-misc/xclip x11-misc/xsel ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pandas-dev/pandas/releases/download/v1.5.0/pandas-1.5.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=ed95d317474dcaba44d9013336537746
diff --git a/metadata/md5-cache/dev-python/pathlib2-2.3.7_p1 b/metadata/md5-cache/dev-python/pathlib2-2.3.7_p1
index 2fa11d38ad78..78f70eb95f2e 100644
--- a/metadata/md5-cache/dev-python/pathlib2-2.3.7_p1
+++ b/metadata/md5-cache/dev-python/pathlib2-2.3.7_p1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/pathlib2/ https://github.com/jazzband/pathlib2/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/jazzband/pathlib2/archive/2.3.7-post1.tar.gz -> pathlib2-2.3.7-post1.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6f74a61c0f9a3d88c5b9b4c721775218
+_md5_=238dcb98e78effbc8b470c5b435294fb
diff --git a/metadata/md5-cache/dev-python/pebble-5.0.0 b/metadata/md5-cache/dev-python/pebble-5.0.0
new file mode 100644
index 000000000000..0a92996b6abb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pebble-5.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Threading and multiprocessing eye-candy
+EAPI=8
+HOMEPAGE=https://pebble.readthedocs.io/ https://github.com/noxdafox/pebble/ https://pypi.org/project/Pebble/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=LGPL-3+
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/P/Pebble/Pebble-5.0.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1d0229bfdf3fff496a466670c5b3bbcc
diff --git a/metadata/md5-cache/dev-python/peewee-3.15.3 b/metadata/md5-cache/dev-python/peewee-3.15.3
new file mode 100644
index 000000000000..1a51da85e3c8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/peewee-3.15.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[sqlite] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 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.3.tar.gz -> peewee-3.15.3.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ffaaeb1ea4b5116377f6934325123948
diff --git a/metadata/md5-cache/dev-python/pickleshare-0.7.5 b/metadata/md5-cache/dev-python/pickleshare-0.7.5
index 346637422e48..245a5ea3bad0 100644
--- a/metadata/md5-cache/dev-python/pickleshare-0.7.5
+++ b/metadata/md5-cache/dev-python/pickleshare-0.7.5
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/pickleshare/pickleshare
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/path-py-6.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/pickleshare/pickleshare-0.7.5.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8b11fc9468fd84e4f22f7a95dfcf7561
+_md5_=981cc7c2b5a6a5e04e82694444d04233
diff --git a/metadata/md5-cache/dev-python/pikepdf-6.0.2 b/metadata/md5-cache/dev-python/pikepdf-6.0.2
new file mode 100644
index 000000000000..bc48e8121b7a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pikepdf-6.0.2
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools_scm-7.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools_scm_git_archive[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/attrs-20.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hypothesis-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-5.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?,jpeg,lcms,tiff] >=dev-python/psutil-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-timeout-1.4.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-xmp-toolkit-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=app-text/qpdf-11.0.0:0= dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=app-text/qpdf-11.0.0: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_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=app-text/qpdf-11.0.0:0= dev-python/deprecation[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pillow-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pybind11-2.9.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 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/v6.0.2.tar.gz -> pikepdf-6.0.2.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=3eaa5b7857a177b3f8c55cdd80de27b9
diff --git a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.31 b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.31
index 9e4278a6dd51..ebd7577b0b40 100644
--- a/metadata/md5-cache/dev-python/prompt_toolkit-3.0.31
+++ b/metadata/md5-cache/dev-python/prompt_toolkit-3.0.31
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/prompt-toolkit/ https://github.com/prompt-toolkit/python-prompt-toolkit
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=dev-python/wcwidth[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/prompt_toolkit/prompt_toolkit-3.0.31.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2dd21d20f178f37ab98889f176237ab1
+_md5_=cc128b787113465bea0068f7b635b4a9
diff --git a/metadata/md5-cache/dev-python/pycollada-0.7.2 b/metadata/md5-cache/dev-python/pycollada-0.7.2
index 14b02984e009..2e40ad99b851 100644
--- a/metadata/md5-cache/dev-python/pycollada-0.7.2
+++ b/metadata/md5-cache/dev-python/pycollada-0.7.2
@@ -1,16 +1,16 @@
-BDEPEND=doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ) ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ) ) test? ( dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library for reading and writing COLLADA documents
 EAPI=8
 HOMEPAGE=https://pycollada.readthedocs.io/
 INHERIT=distutils-r1
-IUSE=examples doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=examples doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=BSD
-RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/pycollada/pycollada/archive/v0.7.2.tar.gz -> pycollada-0.7.2.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=61840ed871fcf085b87df06b6268c410
+_md5_=87296ed1a664127de7ee0ea27cc99aa8
diff --git a/metadata/md5-cache/dev-python/pydevd-2.8.0-r1 b/metadata/md5-cache/dev-python/pydevd-2.8.0-r1
index 9a6e7db5573a..8033a1615660 100644
--- a/metadata/md5-cache/dev-python/pydevd-2.8.0-r1
+++ b/metadata/md5-cache/dev-python/pydevd-2.8.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/fabioz/PyDev.Debugger/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=EPL-1.0
 RDEPEND=!<dev-python/debugpy-1.4.2 sys-devel/gdb python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/fabioz/PyDev.Debugger/archive/pydev_debugger_2_8_0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=664595d6dbae1bb42ed2087db3a98818
+_md5_=74392a8c71a67656687fb515b130de02
diff --git a/metadata/md5-cache/dev-python/pyjwt-2.5.0 b/metadata/md5-cache/dev-python/pyjwt-2.5.0
new file mode 100644
index 000000000000..a187aba8f3af
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyjwt-2.5.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/cryptography-3.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( !dev-python/python-jwt >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=JSON Web Token implementation in Python
+EAPI=8
+HOMEPAGE=https://github.com/jpadilla/pyjwt/ https://pypi.org/project/PyJWT/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=!dev-python/python-jwt python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/P/PyJWT/PyJWT-2.5.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=4bfd72e8d4879cf5982821447ef02a95
diff --git a/metadata/md5-cache/dev-python/pymacaroons-0.13.0 b/metadata/md5-cache/dev-python/pymacaroons-0.13.0
index b3b9c9f8bb9d..ed644043930a 100644
--- a/metadata/md5-cache/dev-python/pymacaroons-0.13.0
+++ b/metadata/md5-cache/dev-python/pymacaroons-0.13.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ecordell/pymacaroons https://pypi.org/project/pymacaroons/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=MIT
 RDEPEND=dev-python/pynacl[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.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ecordell/pymacaroons/archive/v0.13.0.tar.gz -> pymacaroons-0.13.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=48bf693034c7d2b51d8fa5c30d6b6820
+_md5_=c224d4985d865b69775d982584383c94
diff --git a/metadata/md5-cache/dev-python/pyopencl-2022.2.3 b/metadata/md5-cache/dev-python/pyopencl-2022.2.3
new file mode 100644
index 000000000000..c72700f7c3d7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyopencl-2022.2.3
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pybind11-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-libs/pocl ) test? ( >=virtual/opencl-2 >=dev-python/mako-0.3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytools-2021.2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=virtual/opencl-2 opengl? ( media-libs/libglvnd )
+DESCRIPTION=Python wrapper for OpenCL
+EAPI=8
+HOMEPAGE=https://mathema.tician.de/software/pyopencl/ https://pypi.org/project/pyopencl/
+INHERIT=distutils-r1 multiprocessing
+IUSE=examples opengl test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~ppc64
+LICENSE=GPL-2
+RDEPEND=>=virtual/opencl-2 >=dev-python/mako-0.3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytools-2021.2.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2022.2.3.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ed7a97baeff288e42d420bc11ef0badf
diff --git a/metadata/md5-cache/dev-python/pyproject-fmt-0.3.5 b/metadata/md5-cache/dev-python/pyproject-fmt-0.3.5
index 65dcfe8a54dc..b8332d1b6ebb 100644
--- a/metadata/md5-cache/dev-python/pyproject-fmt-0.3.5
+++ b/metadata/md5-cache/dev-python/pyproject-fmt-0.3.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/tox-dev/pyproject-fmt/ https://pypi.org/project/pyproject-fmt/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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 ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tomlkit-0.11.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/tox-dev/pyproject-fmt/archive/0.3.5.tar.gz -> pyproject-fmt-0.3.5.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=82bc457714306e9fc8a6c8ccadaf4c6d
+_md5_=87237d98de7cdfedffa6f85a65240aec
diff --git a/metadata/md5-cache/dev-python/pytest-httpserver-1.0.6 b/metadata/md5-cache/dev-python/pytest-httpserver-1.0.6
new file mode 100644
index 000000000000..272b08c09186
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-httpserver-1.0.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=HTTP server for pytest to test HTTP clients
+EAPI=8
+HOMEPAGE=https://github.com/csernazs/pytest-httpserver/ https://pypi.org/project/pytest-httpserver/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/csernazs/pytest-httpserver/archive/1.0.6.tar.gz -> pytest-httpserver-1.0.6.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=ea09c85719702be992c7a0dd5fcec205
diff --git a/metadata/md5-cache/dev-python/python-email-validator-1.3.0 b/metadata/md5-cache/dev-python/python-email-validator-1.3.0
index 04e7f8ea03f8..463b416357b4 100644
--- a/metadata/md5-cache/dev-python/python-email-validator-1.3.0
+++ b/metadata/md5-cache/dev-python/python-email-validator-1.3.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/JoshData/python-email-validator/ https://pypi.org/project/email-validator/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_8 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 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=CC0-1.0
 RDEPEND=>=dev-python/idna-2.8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/dnspython-1.15.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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/JoshData/python-email-validator/archive/v1.3.0.tar.gz -> python-email-validator-1.3.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c769fcd5f99a24a0594f361fe5b7244d
+_md5_=e9419d4c24487c7c0659c73506544423
diff --git a/metadata/md5-cache/dev-python/python-ldap-3.4.3 b/metadata/md5-cache/dev-python/python-ldap-3.4.3
new file mode 100644
index 000000000000..29982037025a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/python-ldap-3.4.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( >=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-nds/openldap:=[sasl?,ssl?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p1:0 >=dev-python/sphinx-4.5.0-r1[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=net-nds/openldap:=[sasl?,ssl?] sasl? ( >=dev-libs/cyrus-sasl-2.1 )
+DESCRIPTION=Various LDAP-related Python modules
+EAPI=8
+HOMEPAGE=https://www.python-ldap.org/en/latest/ https://pypi.org/project/python-ldap/ https://github.com/python-ldap/python-ldap/
+INHERIT=distutils-r1
+IUSE=examples sasl ssl test doc python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x86-solaris
+LICENSE=MIT PSF-2
+RDEPEND=>=dev-python/pyasn1-0.3.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-modules-0.1.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-nds/openldap:=[sasl?,ssl?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/python-ldap/python-ldap/archive/python-ldap-3.4.3.tar.gz -> python-ldap-3.4.3.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=9e510bfdfa0e8d914ed1df41ffc56ef1
diff --git a/metadata/md5-cache/dev-python/pyupgrade-2.37.3 b/metadata/md5-cache/dev-python/pyupgrade-2.37.3
deleted file mode 100644
index c26c5042e676..000000000000
--- a/metadata/md5-cache/dev-python/pyupgrade-2.37.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/tokenize-rt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Tool + pre-commit hook to automatically upgrade syntax for newer Pythons
-EAPI=8
-HOMEPAGE=https://github.com/asottile/pyupgrade
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/tokenize-rt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/asottile/pyupgrade/archive/refs/tags/v2.37.3.tar.gz -> pyupgrade-2.37.3.gh.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=12844e66cdccf3b6f62b240c43f895f5
diff --git a/metadata/md5-cache/dev-python/pyzmq-24.0.1 b/metadata/md5-cache/dev-python/pyzmq-24.0.1
new file mode 100644
index 000000000000..e9eba6c71f36
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pyzmq-24.0.1
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_8? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pytest-rerunfailures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=www-servers/tornado-5.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=net-libs/zeromq-4.2.2-r2:=[drafts] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/numpydoc[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10[threads(+)] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/numpydoc[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[threads(+)] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/numpydoc[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[threads(+)] >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/numpydoc[python_targets_python3_8(-)] ) ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=net-libs/zeromq-4.2.2-r2:=[drafts]
+DESCRIPTION=Lightweight and super-fast messaging library built on top of the ZeroMQ library
+EAPI=8
+HOMEPAGE=https://zeromq.org/languages/python/ https://pypi.org/project/pyzmq/ https://github.com/zeromq/pyzmq/
+INHERIT=flag-o-matic distutils-r1 toolchain-funcs
+IUSE=+draft test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=LGPL-3
+RDEPEND=>=net-libs/zeromq-4.2.2-r2:=[drafts] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/zeromq/pyzmq/archive/v24.0.1.tar.gz -> pyzmq-24.0.1.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=041cae180a119def3a43af9170a9b49e
diff --git a/metadata/md5-cache/dev-python/qtsass-0.3.2 b/metadata/md5-cache/dev-python/qtsass-0.3.2
new file mode 100644
index 000000000000..c18529bbdb39
--- /dev/null
+++ b/metadata/md5-cache/dev-python/qtsass-0.3.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/flaky[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/libsass[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Compile SASS files to Qt stylesheets
+EAPI=8
+HOMEPAGE=https://github.com/spyder-ide/qtsass
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/libsass[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/spyder-ide/qtsass/archive/v0.3.2.tar.gz -> qtsass-0.3.2.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=82168799252f8b937f6dc96f17ecf45e
diff --git a/metadata/md5-cache/dev-python/rapidfuzz-2.10.0 b/metadata/md5-cache/dev-python/rapidfuzz-2.10.0
new file mode 100644
index 000000000000..7921bb5b3115
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rapidfuzz-2.10.0
@@ -0,0 +1,17 @@
+BDEPEND=dev-python/rapidfuzz_capi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/scikit-build-0.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/jarowinkler-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-cpp/taskflow-3.0.0 >=dev-cpp/jarowinkler-cpp-1.0.0 >=dev-cpp/rapidfuzz-cpp-1.0.1 dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Rapid fuzzy string matching in Python using various string metrics
+EAPI=8
+HOMEPAGE=https://github.com/maxbachmann/RapidFuzz/ https://pypi.org/project/rapidfuzz/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=<dev-python/jarowinkler-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/r/rapidfuzz/rapidfuzz-2.10.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d30aa54d2f6d106d2f0b20a04e03b8ee
diff --git a/metadata/md5-cache/dev-python/retworkx-0.11.0 b/metadata/md5-cache/dev-python/retworkx-0.11.0-r1
similarity index 73%
rename from metadata/md5-cache/dev-python/retworkx-0.11.0
rename to metadata/md5-cache/dev-python/retworkx-0.11.0-r1
index bc0ab35e59ad..9fcc0de53f22 100644
--- a/metadata/md5-cache/dev-python/retworkx-0.11.0
+++ b/metadata/md5-cache/dev-python/retworkx-0.11.0-r1
@@ -1,16 +1,16 @@
-BDEPEND=dev-python/setuptools-rust test? ( dev-python/fixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/testtools-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/networkx-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/stestr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/graphviz[gts] dev-python/graphviz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( >=dev-python/numpy-1.16.0 >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=virtual/rust-1.53 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=dev-python/setuptools-rust[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/fixtures[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/graphviz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/networkx-2.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stestr[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/testtools-2.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] media-gfx/graphviz[gts] ) test? ( >=dev-python/numpy-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=virtual/rust-1.53 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=A high performance Python graph library implemented in Rust
 EAPI=8
 HOMEPAGE=https://github.com/Qiskit/retworkx
 INHERIT=cargo distutils-r1
-IUSE=test debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=test debug python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions BSD BSD-2 MIT
-RDEPEND=>=dev-python/numpy-1.16.0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=>=dev-python/numpy-1.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Qiskit/retworkx/archive/refs/tags/0.11.0.tar.gz -> retworkx-0.11.0.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/autocfg/1.0.1/download -> autocfg-1.0.1.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/cfg-if/0.1.10/download -> cfg-if-0.1.10.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/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/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/fixedbitset/0.4.1/download -> fixedbitset-0.4.1.crate https://crates.io/api/v1/crates/getrandom/0.2.3/download -> getrandom-0.2.3.crate https://crates.io/api/v1/crates/hashbrown/0.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/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/indoc/0.3.6/download -> indoc-0.3.6.crate https://crates.io/api/v1/crates/indoc-impl/0.3.6/download -> indoc-impl-0.3.6.crate https://crates.io/api/v1/crates/instant/0.1.10/download -> instant-0.1.10.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.101/download -> libc-0.2.101.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/matrixmultiply/0.2.4/download -> matrixmultiply-0.2.4.crate https://crates.io/api/v1/crates/memoffset/0.6.4/download -> memoffset-0.6.4.crate https://crates.io/api/v1/crates/ndarray/0.13.1/download -> ndarray-0.13.1.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.0/download -> num-complex-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-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/numpy/0.15.1/download -> numpy-0.15.1.crate https://crates.io/api/v1/crates/once_cell/1.8.0/download -> once_cell-1.8.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/paste/0.1.18/download -> paste-0.1.18.crate https://crates.io/api/v1/crates/paste-impl/0.1.18/download -> paste-impl-0.1.18.crate https://crates.io/api/v1/crates/petgraph/0.6.0/download -> petgraph-0.6.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.10/download -> ppv-lite86-0.2.10.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/proc-macro2/1.0.29/download -> proc-macro2-1.0.29.crate https://crates.io/api/v1/crates/pyo3/0.15.1/download -> pyo3-0.15.1.crate https://crates.io/api/v1/crates/pyo3-build-config/0.15.1/download -> pyo3-build-config-0.15.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.15.1/download -> pyo3-macros-0.15.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.15.1/download -> pyo3-macros-backend-0.15.1.crate https://crates.io/api/v1/crates/quote/1.0.9/download -> quote-1.0.9.crate https://crates.io/api/v1/crates/rand/0.8.4/download -> rand-0.8.4.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/rand_hc/0.3.1/download -> rand_hc-0.3.1.crate https://crates.io/api/v1/crates/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.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/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/smallvec/1.6.1/download -> smallvec-1.6.1.crate https://crates.io/api/v1/crates/syn/1.0.76/download -> syn-1.0.76.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.7/download -> unindent-0.1.7.crate https://crates.io/api/v1/crates/version_check/0.9.3/download -> version_check-0.9.3.crate https://crates.io/api/v1/crates/wasi/0.10.2+wasi-snapshot-preview1/download -> wasi-0.10.2+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate
 _eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7dc92e0c0468300784a564122c919ec5
+_md5_=c05a516b652d969b3f49ed82c2953706
diff --git a/metadata/md5-cache/dev-python/setuptools-rust-1.5.2 b/metadata/md5-cache/dev-python/setuptools-rust-1.5.2
new file mode 100644
index 000000000000..cc15ccd67e89
--- /dev/null
+++ b/metadata/md5-cache/dev-python/setuptools-rust-1.5.2
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/cffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/lxml[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A plugin for setuptools to build Rust Python extensions
+EAPI=8
+HOMEPAGE=https://github.com/PyO3/setuptools-rust/ https://pypi.org/project/setuptools-rust/
+INHERIT=distutils-r1 cargo
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 debug
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=virtual/rust <dev-python/semantic_version-3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/semantic_version-2.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-3.7.4.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PyO3/setuptools-rust/archive/v1.5.2.tar.gz -> setuptools-rust-1.5.2.gh.tar.gz test? ( 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/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/convert_case/0.4.0/download -> convert_case-0.4.0.crate https://crates.io/api/v1/crates/cssparser/0.27.2/download -> cssparser-0.27.2.crate https://crates.io/api/v1/crates/cssparser-macros/0.6.0/download -> cssparser-macros-0.6.0.crate https://crates.io/api/v1/crates/derive_more/0.99.17/download -> derive_more-0.99.17.crate https://crates.io/api/v1/crates/dtoa/0.4.8/download -> dtoa-0.4.8.crate https://crates.io/api/v1/crates/dtoa-short/0.3.3/download -> dtoa-short-0.3.3.crate https://crates.io/api/v1/crates/futf/0.1.5/download -> futf-0.1.5.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.1.16/download -> getrandom-0.1.16.crate https://crates.io/api/v1/crates/html5ever/0.25.1/download -> html5ever-0.25.1.crate https://crates.io/api/v1/crates/indoc/1.0.4/download -> indoc-1.0.4.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/0.4.8/download -> itoa-0.4.8.crate https://crates.io/api/v1/crates/kuchiki/0.8.1/download -> kuchiki-0.8.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/libc/0.2.121/download -> libc-0.2.121.crate https://crates.io/api/v1/crates/lock_api/0.4.6/download -> lock_api-0.4.6.crate https://crates.io/api/v1/crates/log/0.4.14/download -> log-0.4.14.crate https://crates.io/api/v1/crates/mac/0.1.1/download -> mac-0.1.1.crate https://crates.io/api/v1/crates/markup5ever/0.10.1/download -> markup5ever-0.10.1.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.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/nodrop/0.1.14/download -> nodrop-0.1.14.crate https://crates.io/api/v1/crates/once_cell/1.10.0/download -> once_cell-1.10.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/phf/0.8.0/download -> phf-0.8.0.crate https://crates.io/api/v1/crates/phf_codegen/0.8.0/download -> phf_codegen-0.8.0.crate https://crates.io/api/v1/crates/phf_generator/0.8.0/download -> phf_generator-0.8.0.crate https://crates.io/api/v1/crates/phf_macros/0.8.0/download -> phf_macros-0.8.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/phf_shared/0.8.0/download -> phf_shared-0.8.0.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/precomputed-hash/0.1.1/download -> precomputed-hash-0.1.1.crate https://crates.io/api/v1/crates/proc-macro2/1.0.36/download -> proc-macro2-1.0.36.crate https://crates.io/api/v1/crates/proc-macro-hack/0.5.19/download -> proc-macro-hack-0.5.19.crate https://crates.io/api/v1/crates/pyo3/0.17.1/download -> pyo3-0.17.1.crate https://crates.io/api/v1/crates/pyo3-build-config/0.17.1/download -> pyo3-build-config-0.17.1.crate https://crates.io/api/v1/crates/pyo3-ffi/0.17.1/download -> pyo3-ffi-0.17.1.crate https://crates.io/api/v1/crates/pyo3-macros/0.17.1/download -> pyo3-macros-0.17.1.crate https://crates.io/api/v1/crates/pyo3-macros-backend/0.17.1/download -> pyo3-macros-backend-0.17.1.crate https://crates.io/api/v1/crates/quote/1.0.16/download -> quote-1.0.16.crate https://crates.io/api/v1/crates/rand/0.7.3/download -> rand-0.7.3.crate https://crates.io/api/v1/crates/rand_chacha/0.2.2/download -> rand_chacha-0.2.2.crate https://crates.io/api/v1/crates/rand_core/0.5.1/download -> rand_core-0.5.1.crate https://crates.io/api/v1/crates/rand_hc/0.2.0/download -> rand_hc-0.2.0.crate https://crates.io/api/v1/crates/rand_pcg/0.2.1/download -> rand_pcg-0.2.1.crate https://crates.io/api/v1/crates/redox_syscall/0.2.11/download -> redox_syscall-0.2.11.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/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/selectors/0.22.0/download -> selectors-0.22.0.crate https://crates.io/api/v1/crates/semver/1.0.6/download -> semver-1.0.6.crate https://crates.io/api/v1/crates/serde/1.0.136/download -> serde-1.0.136.crate https://crates.io/api/v1/crates/servo_arc/0.1.1/download -> servo_arc-0.1.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.8.0/download -> smallvec-1.8.0.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/string_cache/0.8.3/download -> string_cache-0.8.3.crate https://crates.io/api/v1/crates/string_cache_codegen/0.5.1/download -> string_cache_codegen-0.5.1.crate https://crates.io/api/v1/crates/syn/1.0.89/download -> syn-1.0.89.crate https://crates.io/api/v1/crates/target-lexicon/0.12.3/download -> target-lexicon-0.12.3.crate https://crates.io/api/v1/crates/tendril/0.4.3/download -> tendril-0.4.3.crate https://crates.io/api/v1/crates/thin-slice/0.1.1/download -> thin-slice-0.1.1.crate https://crates.io/api/v1/crates/unicode-xid/0.2.2/download -> unicode-xid-0.2.2.crate https://crates.io/api/v1/crates/unindent/0.1.8/download -> unindent-0.1.8.crate https://crates.io/api/v1/crates/utf-8/0.7.6/download -> utf-8-0.7.6.crate https://crates.io/api/v1/crates/wasi/0.9.0+wasi-snapshot-preview1/download -> wasi-0.9.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate )
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=94b8e36f2fac2b3ec97201106cdfe97c
diff --git a/metadata/md5-cache/dev-python/signedjson-1.1.4 b/metadata/md5-cache/dev-python/signedjson-1.1.4
index 278af3af1bac..db0a6106e91d 100644
--- a/metadata/md5-cache/dev-python/signedjson-1.1.4
+++ b/metadata/md5-cache/dev-python/signedjson-1.1.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/matrix-org/python-signedjson/ https://pypi.org/project/signedjson/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=dev-python/canonicaljson[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(-)?] dev-python/unpaddedbase64[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/importlib_metadata[python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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/matrix-org/python-signedjson/archive/v1.1.4.tar.gz -> signedjson-1.1.4.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c820fbff0093fab01a778d56c2f26f90
+_md5_=7059c2e14c5ce32c66b29be87af37b2c
diff --git a/metadata/md5-cache/dev-python/sphinx-pytest-0.0.5 b/metadata/md5-cache/dev-python/sphinx-pytest-0.0.5
new file mode 100644
index 000000000000..ac370c8c15e2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-pytest-0.0.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Helpful pytest fixtures for Sphinx extensions
+EAPI=8
+HOMEPAGE=https://github.com/chrisjsewell/sphinx-pytest/ https://pypi.org/project/sphinx_pytest/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/pytest[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/chrisjsewell/sphinx-pytest/archive/v0.0.5.tar.gz -> sphinx-pytest-0.0.5.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=7a95b85a57165b4174798ab57d83a685
diff --git a/metadata/md5-cache/dev-python/sympy-1.11 b/metadata/md5-cache/dev-python/sympy-1.11
deleted file mode 100644
index 4c05c7112f70..000000000000
--- a/metadata/md5-cache/dev-python/sympy-1.11
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mpmath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] aesara? ( dev-python/aesara[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) imaging? ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ipython? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) opengl? ( dev-python/pyopengl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) pyglet? ( dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) symengine? ( dev-python/symengine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) texmacs? ( app-office/texmacs ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Computer Algebra System in pure Python
-EAPI=8
-HOMEPAGE=https://www.sympy.org/
-INHERIT=distutils-r1 virtualx
-IUSE=aesara examples imaging ipython latex mathml opengl pdf png pyglet symengine test texmacs test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 test
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-python/mpmath[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pexpect[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] aesara? ( dev-python/aesara[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) imaging? ( dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ipython? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) latex? ( virtual/latex-base dev-texlive/texlive-fontsextra png? ( app-text/dvipng ) pdf? ( app-text/ghostscript-gpl ) ) mathml? ( dev-libs/libxml2:2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) opengl? ( dev-python/pyopengl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) pyglet? ( dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) symengine? ( dev-python/symengine[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) texmacs? ( app-office/texmacs ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sympy/sympy/archive/sympy-1.11.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=7b4b96b256672e83d01b7c13ea4c5e2e
diff --git a/metadata/md5-cache/dev-python/tenacity-8.1.0 b/metadata/md5-cache/dev-python/tenacity-8.1.0
new file mode 100644
index 000000000000..84a494cbf5b0
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tenacity-8.1.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( www-servers/tornado[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,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
+IUSE=test python_targets_python3_8 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_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tenacity/tenacity-8.1.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a37a8ec7bfd5bc56eb4c4e84cb3d2b44
diff --git a/metadata/md5-cache/dev-python/termcolor-2.0.1 b/metadata/md5-cache/dev-python/termcolor-2.0.1
new file mode 100644
index 000000000000..fb6f32aa27f4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/termcolor-2.0.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=ANSI Color formatting for output in terminal
+EAPI=8
+HOMEPAGE=https://github.com/termcolor/termcolor/ https://pypi.org/project/termcolor/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 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 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/termcolor/termcolor-2.0.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=64c75e26d2a2a240466b795931c18854
diff --git a/metadata/md5-cache/dev-python/traitlets-5.4.0 b/metadata/md5-cache/dev-python/traitlets-5.4.0
new file mode 100644
index 000000000000..3bd07b88cfdc
--- /dev/null
+++ b/metadata/md5-cache/dev-python/traitlets-5.4.0
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] dev-python/sphinx_rtd_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] dev-python/sphinx_rtd_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] dev-python/sphinx_rtd_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] dev-python/sphinx_rtd_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A configuration system for Python applications
+EAPI=8
+HOMEPAGE=https://github.com/ipython/traitlets/ https://pypi.org/project/traitlets/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/traitlets/traitlets-5.4.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=56f98bbe8015c0835706539cdbb6bf41
diff --git a/metadata/md5-cache/dev-python/treq-22.2.0-r1 b/metadata/md5-cache/dev-python/treq-22.2.0-r1
index a629a8b3383b..0494a19798c2 100644
--- a/metadata/md5-cache/dev-python/treq-22.2.0-r1
+++ b/metadata/md5-cache/dev-python/treq-22.2.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/twisted/treq/ https://pypi.org/project/treq/
 INHERIT=distutils-r1
 IUSE=doc test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv ~x86
 LICENSE=MIT
 RDEPEND=dev-python/attrs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/hyperlink-21.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/incremental[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/requests-2.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/twisted-18.7.0[ssl(-),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-18.7.0[crypt(-),python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/t/treq/treq-22.2.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3a00572423bde2af1e92fc764bbc3d9b
+_md5_=02fd563a6d27a9e8d6ede2b26938c938
diff --git a/metadata/md5-cache/dev-python/trimesh-3.15.1 b/metadata/md5-cache/dev-python/trimesh-3.15.1
new file mode 100644
index 000000000000..1f39f42fae0b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/trimesh-3.15.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python library for loading and using triangular meshes
+EAPI=8
+HOMEPAGE=https://trimsh.org/ https://github.com/mikedh/trimesh/ https://pypi.org/project/trimesh/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/colorlog[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/networkx[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycollada[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyglet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/shapely-1.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/svg-path[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/xxhash[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/rtree[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/mikedh/trimesh/archive/3.15.1.tar.gz -> trimesh-3.15.1.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=838f01dcebb4615d2db7ea9115b9431e
diff --git a/metadata/md5-cache/dev-python/unpaddedbase64-2.1.0 b/metadata/md5-cache/dev-python/unpaddedbase64-2.1.0
index 5bc23a0840ea..5af52185a4a7 100644
--- a/metadata/md5-cache/dev-python/unpaddedbase64-2.1.0
+++ b/metadata/md5-cache/dev-python/unpaddedbase64-2.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/matrix-org/python-unpaddedbase64/ https://pypi.org/project/unpaddedbase64/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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/matrix-org/python-unpaddedbase64/archive/v2.1.0.tar.gz -> unpaddedbase64-2.1.0.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2206ee91e9a0a452bcb737b332569578
+_md5_=7e4a07711af2ddb15e4f555243525f47
diff --git a/metadata/md5-cache/dev-python/untangle-1.2.1-r1 b/metadata/md5-cache/dev-python/untangle-1.2.1-r1
index 670379045318..384da86b2a09 100644
--- a/metadata/md5-cache/dev-python/untangle-1.2.1-r1
+++ b/metadata/md5-cache/dev-python/untangle-1.2.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/stchris/untangle/ https://pypi.org/project/untangle/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/defusedxml-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 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/stchris/untangle/archive/1.2.1.tar.gz -> untangle-1.2.1.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2b045b5d4e59087a452199edcf6507b7
+_md5_=f5edab6cc61520b064fa053d2cac00f8
diff --git a/metadata/md5-cache/dev-python/uvloop-0.17.0 b/metadata/md5-cache/dev-python/uvloop-0.17.0
new file mode 100644
index 000000000000..e0694bd6f4b6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/uvloop-0.17.0
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-python/cython-0.29.32[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/aiohttp[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyopenssl-22.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-libs/libuv-1.11.0:= >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-libs/libuv-1.11.0:=
+DESCRIPTION=Ultra-fast implementation of asyncio event loop on top of libuv
+EAPI=8
+HOMEPAGE=https://github.com/magicstack/uvloop/ https://pypi.org/project/uvloop/
+INHERIT=distutils-r1
+IUSE=examples test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 -riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=>=dev-libs/libuv-1.11.0:= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/u/uvloop/uvloop-0.17.0.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=b68daa555c12d6defceab70c47779815
diff --git a/metadata/md5-cache/dev-python/wcmatch-8.4.1 b/metadata/md5-cache/dev-python/wcmatch-8.4.1
new file mode 100644
index 000000000000..a050c7e4232c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wcmatch-8.4.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-vcs/git ) test? ( >=dev-python/bracex-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/mkdocs[python_targets_python3_11(-)] >=dev-python/mkdocs_pymdownx_material_extras-2.0[python_targets_python3_11(-)] dev-python/mkdocs-material[python_targets_python3_11(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/pyspelling[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/mkdocs[python_targets_python3_10(-)] >=dev-python/mkdocs_pymdownx_material_extras-2.0[python_targets_python3_10(-)] dev-python/mkdocs-material[python_targets_python3_10(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/pyspelling[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/mkdocs[python_targets_python3_9(-)] >=dev-python/mkdocs_pymdownx_material_extras-2.0[python_targets_python3_9(-)] dev-python/mkdocs-material[python_targets_python3_9(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/pyspelling[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/mkdocs[python_targets_python3_8(-)] >=dev-python/mkdocs_pymdownx_material_extras-2.0[python_targets_python3_8(-)] dev-python/mkdocs-material[python_targets_python3_8(-)] dev-python/mkdocs-git-revision-date-localized-plugin[python_targets_python3_8(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_8(-)] dev-python/pyspelling[python_targets_python3_8(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Wildcard/glob file name matcher
+EAPI=8
+HOMEPAGE=https://github.com/facelessuser/wcmatch/ https://pypi.org/project/wcmatch/
+INHERIT=distutils-r1 docs
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/bracex-2.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/facelessuser/wcmatch/archive/8.4.1.tar.gz -> wcmatch-8.4.1.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	docs	8ed2a8a28ff109e7a3582c9abb7fe327	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e77df5250c98b7c5499d1153ba6734b0
diff --git a/metadata/md5-cache/dev-python/xarray-2022.3.0 b/metadata/md5-cache/dev-python/xarray-2022.3.0
deleted file mode 100644
index 52954a24b00c..000000000000
--- a/metadata/md5-cache/dev-python/xarray-2022.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/bottleneck[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/hypothesis[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/matplotlib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/toolz[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !hppa? ( >=dev-python/scipy-1.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) test? ( >=dev-python/numpy-1.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=N-D labeled arrays and datasets in Python
-EAPI=8
-HOMEPAGE=https://xarray.pydata.org/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=Apache-2.0
-RDEPEND=>=dev-python/numpy-1.18[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/x/xarray/xarray-2022.3.0.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=de223a0a7b8d6560fc2dc9dcdbfbc7da
diff --git a/metadata/md5-cache/dev-python/xarray-2022.6.0 b/metadata/md5-cache/dev-python/xarray-2022.6.0
index e44669f50809..f7546442f800 100644
--- a/metadata/md5-cache/dev-python/xarray-2022.6.0
+++ b/metadata/md5-cache/dev-python/xarray-2022.6.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://xarray.pydata.org/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 arm arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=Apache-2.0
 RDEPEND=>=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pandas-1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/x/xarray/xarray-2022.6.0.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=56b1788c3db311b60781da56bdbdc837
+_md5_=2e4bcdb2afdb75f0dd79d715c6909ae9
diff --git a/metadata/md5-cache/dev-python/zope-hookable-5.2 b/metadata/md5-cache/dev-python/zope-hookable-5.2
new file mode 100644
index 000000000000..e50fffced2df
--- /dev/null
+++ b/metadata/md5-cache/dev-python/zope-hookable-5.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/zope-testing[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Efficient creation of 'hookable' objects
+EAPI=8
+HOMEPAGE=https://pypi.org/project/zope.hookable/ https://github.com/zopefoundation/zope.hookable/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=ZPL
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/z/zope.hookable/zope.hookable-5.2.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e5d143d634ced445d964c9d18dc585a2
diff --git a/metadata/md5-cache/dev-qt/Manifest.gz b/metadata/md5-cache/dev-qt/Manifest.gz
index ad26f262bde0..fdacc4969c93 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/qtlocation-5.15.5 b/metadata/md5-cache/dev-qt/qtlocation-5.15.5
index 2ddb1c4b56e6..dbcd680e63f3 100644
--- a/metadata/md5-cache/dev-qt/qtlocation-5.15.5
+++ b/metadata/md5-cache/dev-qt/qtlocation-5.15.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtlocation https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=debug test
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=dev-libs/icu:= =dev-qt/qtcore-5.15.5* =dev-qt/qtdeclarative-5.15.5* =dev-qt/qtgui-5.15.5* =dev-qt/qtnetwork-5.15.5* =dev-qt/qtpositioning-5.15.5*[qml] =dev-qt/qtsql-5.15.5* sys-libs/zlib
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtlocation-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtlocation-5.15.5-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=8bc775c129ddb1a6d947433d0591876e
+_md5_=8c1e5a8e707f84476e0aca851b32283f
diff --git a/metadata/md5-cache/dev-qt/qtspeech-5.15.5 b/metadata/md5-cache/dev-qt/qtspeech-5.15.5
index 4e95c5431f74..ddfc7c0b9dc4 100644
--- a/metadata/md5-cache/dev-qt/qtspeech-5.15.5
+++ b/metadata/md5-cache/dev-qt/qtspeech-5.15.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtspeech https://community.kde.org/Qt5PatchCollection
 INHERIT=qt5-build
 IUSE=alsa flite debug test
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
 LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
 RDEPEND=>=app-accessibility/speech-dispatcher-0.8.7 =dev-qt/qtcore-5.15.5* flite? ( >=app-accessibility/flite-2[alsa?] =dev-qt/qtmultimedia-5.15.5*[alsa?] alsa? ( media-libs/alsa-lib ) )
 RESTRICT=test
 SLOT=5/5.15
 SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.5/submodules/qtspeech-everywhere-opensource-src-5.15.5.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtspeech-5.15.5-gentoo-kde-1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	f2dfafcf0c2b89d7f474fae87a25d2dc	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=fface3820df5be546fa22158e013273a
+_md5_=afac39d188e6b0fcdb0cbd7dbde3a839
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index e17dabd9c1fd..4c194ad822dd 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/Tensile-5.0.2-r2 b/metadata/md5-cache/dev-util/Tensile-5.0.2-r2
index 82d4df0acd88..641de3370e2c 100644
--- a/metadata/md5-cache/dev-util/Tensile-5.0.2-r2
+++ b/metadata/md5-cache/dev-util/Tensile-5.0.2-r2
@@ -1,17 +1,17 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/rocm-smi-4.3.0 dev-util/hip:=
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/rocm-smi-4.3.0 dev-util/hip:=
 DESCRIPTION=Stretching GPU performance for GEMMs and tensor contractions
 EAPI=8
 HOMEPAGE=https://github.com/ROCmSoftwarePlatform/Tensile
 INHERIT=distutils-r1 prefix
-IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 KEYWORDS=~amd64
 LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/rocm-smi-4.3.0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/rocm-smi-4.3.0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0/5.0
 SRC_URI=https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.0.2.tar.gz -> rocm-Tensile-5.0.2.tar.gz https://github.com/littlewu2508/littlewu2508.github.io/raw/main/gentoo-distfiles/Tensile-5.0.2-PR1419.patch.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d172ae0b2d8d93bf41e1e9e3a3a2e964
+_md5_=e11a8c9bf9038e7b6545122df5fca29e
diff --git a/metadata/md5-cache/dev-util/Tensile-5.1.3 b/metadata/md5-cache/dev-util/Tensile-5.1.3
new file mode 100644
index 000000000000..4e3fc4898950
--- /dev/null
+++ b/metadata/md5-cache/dev-util/Tensile-5.1.3
@@ -0,0 +1,17 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/rocm-smi-4.3.0 >=sys-devel/clang-14.0.6-r1:14= dev-util/hip !!sys-devel/llvm:0
+DESCRIPTION=Stretching GPU performance for GEMMs and tensor contractions
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/Tensile
+INHERIT=distutils-r1 llvm prefix
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/msgpack[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-util/rocm-smi-4.3.0 >=sys-devel/clang-14.0.6-r1:14= python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
+SLOT=0/5.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/Tensile/archive/rocm-5.1.3.tar.gz -> rocm-Tensile-5.1.3.tar.gz https://github.com/littlewu2508/littlewu2508.github.io/raw/main/gentoo-distfiles/Tensile-5.0.2-PR1419.patch.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1f78404e31dae61d2fe19459e593bdc2
diff --git a/metadata/md5-cache/dev-util/android-studio-2020.3.1.24 b/metadata/md5-cache/dev-util/android-studio-2020.3.1.24
deleted file mode 100644
index 8610e7b05ba7..000000000000
--- a/metadata/md5-cache/dev-util/android-studio-2020.3.1.24
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install
-DESCRIPTION=Android development environment based on IntelliJ IDEA
-EAPI=7
-HOMEPAGE=http://developer.android.com/sdk/installing/studio.html
-INHERIT=desktop eutils
-IUSE=selinux
-KEYWORDS=~amd64 ~x86
-LICENSE=Apache-2.0
-RDEPEND=selinux? ( sec-policy/selinux-android ) >=app-arch/bzip2-1.0.6-r4 >=dev-libs/expat-2.1.0-r3 >=dev-libs/libffi-3.0.13-r1 >=media-libs/fontconfig-2.10.92 >=media-libs/freetype-2.5.5 >=media-libs/libpng-1.2.51 >=media-libs/mesa-10.2.8[X(+)] || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) sys-libs/ncurses-compat:5[tinfo] >=sys-libs/zlib-1.2.8-r1 >=x11-libs/libX11-1.6.2 >=x11-libs/libXau-1.0.7-r1 >=x11-libs/libXdamage-1.1.4-r1 >=x11-libs/libXdmcp-1.1.1-r1 >=x11-libs/libXext-1.3.2 >=x11-libs/libXfixes-5.0.1 >=x11-libs/libXrender-0.9.8 >=x11-libs/libXxf86vm-1.1.3 >=x11-libs/libdrm-2.4.46 >=x11-libs/libxcb-1.9.1 >=x11-libs/libxshmfence-1.1 virtual/libcrypt:= !!<dev-util/android-studio-2020.3.1.24
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2020.3.1.24/android-studio-2020.3.1.24-linux.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b9cec241d270ac38d5f2c21528795073
diff --git a/metadata/md5-cache/dev-util/android-studio-2021.3.1.16 b/metadata/md5-cache/dev-util/android-studio-2021.3.1.16
new file mode 100644
index 000000000000..9ae3cff27482
--- /dev/null
+++ b/metadata/md5-cache/dev-util/android-studio-2021.3.1.16
@@ -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-r3 >=dev-libs/expat-2.4.8 >=dev-libs/libffi-3.4.2-r2 >=media-libs/fontconfig-2.14.0-r1 >=media-libs/freetype-2.12.1-r1 >=media-libs/libpng-1.6.37-r2 >=media-libs/mesa-22.1.3[X(+)] || ( gnome-extra/zenity kde-apps/kdialog x11-apps/xmessage x11-libs/libnotify ) sys-libs/ncurses-compat:5[tinfo] >=sys-libs/zlib-1.2.12-r3 >=x11-libs/libX11-1.8.1 >=x11-libs/libXau-1.0.9-r1 >=x11-libs/libXdamage-1.1.5 >=x11-libs/libXdmcp-1.1.3-r1 >=x11-libs/libXext-1.3.4 >=x11-libs/libXfixes-6.0.0 >=x11-libs/libXrender-0.9.10-r2 >=x11-libs/libXxf86vm-1.1.4-r2 >=x11-libs/libdrm-2.4.112 >=x11-libs/libxcb-1.15-r1 >=x11-libs/libxshmfence-1.3-r2 virtual/libcrypt:=
+RESTRICT=bindist mirror strip
+SLOT=0
+SRC_URI=https://redirector.gvt1.com/edgedl/android/studio/ide-zips/2021.3.1.16/android-studio-2021.3.1.16-linux.tar.gz
+_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=1426545b29e8202573c613a46918d797
diff --git a/metadata/md5-cache/dev-util/bazel-5.0.0 b/metadata/md5-cache/dev-util/bazel-5.0.0
index 64375b8a6814..e747a4e5826a 100644
--- a/metadata/md5-cache/dev-util/bazel-5.0.0
+++ b/metadata/md5-cache/dev-util/bazel-5.0.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://bazel.build/
 INHERIT=bash-completion-r1 bazel java-pkg-2 multiprocessing
 IUSE=examples tools
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3
 RESTRICT=strip test
 SLOT=0
 SRC_URI=https://github.com/bazelbuild/bazel/releases/download/5.0.0/bazel-5.0.0-dist.zip
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	bazel	bba8ebd5d6542318a68bb236cf9ba0a9	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=eef296857d16dc0c1c4e4e578956a376
+_md5_=dc35c63d44ce488133fed43664393657
diff --git a/metadata/md5-cache/dev-util/bazel-5.1.1 b/metadata/md5-cache/dev-util/bazel-5.1.1
new file mode 100644
index 000000000000..a503eb5c9781
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bazel-5.1.1
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=virtual/jdk:11 app-arch/unzip app-arch/zip >=dev-java/java-config-2.2.0-r3
+DESCRIPTION=Fast and correct automated build system
+EAPI=8
+HOMEPAGE=https://bazel.build/
+INHERIT=bash-completion-r1 bazel java-pkg-2 multiprocessing
+IUSE=examples tools
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/bazelbuild/bazel/releases/download/5.1.1/bazel-5.1.1-dist.zip
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	bazel	bba8ebd5d6542318a68bb236cf9ba0a9	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=eef296857d16dc0c1c4e4e578956a376
diff --git a/metadata/md5-cache/dev-util/bpftrace-0.16.0 b/metadata/md5-cache/dev-util/bpftrace-0.16.0
new file mode 100644
index 000000000000..c2d5b521bd77
--- /dev/null
+++ b/metadata/md5-cache/dev-util/bpftrace-0.16.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-apps/sed app-arch/xz-utils sys-devel/flex sys-devel/bison virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-libs/cereal:= test? ( dev-cpp/gtest ) !!sys-devel/llvm:0
+DESCRIPTION=High-level tracing language for eBPF
+EAPI=8
+HOMEPAGE=https://github.com/iovisor/bpftrace
+INHERIT=llvm linux-info cmake
+IUSE=fuzzing test
+KEYWORDS=~amd64 ~arm64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/libbpf-1.0:= >=dev-util/bcc-0.25.0:= dev-util/systemtap <sys-devel/clang-17:= <sys-devel/llvm-17:=[llvm_targets_BPF(+)] sys-libs/binutils-libs:= virtual/libelf:=
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/iovisor/bpftrace/archive/v0.16.0.tar.gz -> bpftrace-0.16.0.gh.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6d03924a3b59462a3e2b747490d1ceb1
diff --git a/metadata/md5-cache/dev-util/buildbot-3.6.1 b/metadata/md5-cache/dev-util/buildbot-3.6.1
new file mode 100644
index 000000000000..3399c31197c8
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-3.6.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,ssl(-)] >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/treq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pypugjs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/boto3-1.12.48[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-pkg-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/buildbot-worker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/pkgconfig python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile config configure install postinst prepare test
+DESCRIPTION=BuildBot build automation system
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot/
+INHERIT=readme.gentoo-r1 systemd distutils-r1
+IUSE=crypt docker examples irc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=acct-user/buildbot >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,ssl(-)] >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot/buildbot-3.6.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e01637306f6fc8ba9963f20e97817c3c
diff --git a/metadata/md5-cache/dev-util/buildbot-9999 b/metadata/md5-cache/dev-util/buildbot-9999
index ffce4ad4a91a..69abc9f970a6 100644
--- a/metadata/md5-cache/dev-util/buildbot-9999
+++ b/metadata/md5-cache/dev-util/buildbot-9999
@@ -1,4 +1,4 @@
-BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,ssl(-)] >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/treq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pypugjs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/boto3-1.12.48[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/buildbot-pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/buildbot-worker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/buildbot-www[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+BDEPEND=test? ( acct-user/buildbot >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/buildbot-worker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,ssl(-)] >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/treq[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pypugjs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/boto3-1.12.48[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/moto[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/mock-2.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lz4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/ldap3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/buildbot-pkg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/buildbot-worker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/buildbot-www[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DEFINED_PHASES=compile config configure install postinst prepare test unpack
 DESCRIPTION=BuildBot build automation system
 EAPI=8
@@ -7,9 +7,9 @@ INHERIT=readme.gentoo-r1 git-r3 systemd distutils-r1
 IUSE=crypt docker examples irc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=acct-user/buildbot >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-worker-9999[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,ssl(-)] >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
+RDEPEND=acct-user/buildbot >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/zope-interface-4.1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/sqlalchemy-1.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] <dev-python/sqlalchemy-1.5.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/alembic-1.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/python-dateutil-1.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/txaio-2.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyjwt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/buildbot-worker[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] crypt? ( >=dev-python/pyopenssl-16.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/service_identity[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] || ( >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,ssl(-)] >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,crypt(-)] ) dev-python/idna[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) irc? ( dev-python/txrequests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) docker? ( >=dev-python/docker-py-2.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=078f48fa0692a2612c41c36134d1549a
+_md5_=4722fc4b4f550373d245bd9f1a2dad61
diff --git a/metadata/md5-cache/dev-util/buildbot-badges-3.6.1 b/metadata/md5-cache/dev-util/buildbot-badges-3.6.1
new file mode 100644
index 000000000000..5ec3847e02f6
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-badges-3.6.1
@@ -0,0 +1,15 @@
+BDEPEND=~dev-util/buildbot-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-pkg-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cairocffi[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] media-gfx/cairosvg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/jinja-2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/klein[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Buildbot badges plugin produces an image in SVG or PNG format...
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-badges/buildbot-badges-3.6.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=04e332ae70e40c1ba0123817ff29cd4d
diff --git a/metadata/md5-cache/dev-util/buildbot-console-view-3.6.1 b/metadata/md5-cache/dev-util/buildbot-console-view-3.6.1
new file mode 100644
index 000000000000..2722c0fe3afd
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-console-view-3.6.1
@@ -0,0 +1,15 @@
+BDEPEND=~dev-util/buildbot-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Buildbot console-view plugin
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-console-view/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-console-view/buildbot-console-view-3.6.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8b9a30371e09859f3b37d76fa366f5e3
diff --git a/metadata/md5-cache/dev-util/buildbot-grid-view-3.6.1 b/metadata/md5-cache/dev-util/buildbot-grid-view-3.6.1
new file mode 100644
index 000000000000..69fb6650ad54
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-grid-view-3.6.1
@@ -0,0 +1,15 @@
+BDEPEND=~dev-util/buildbot-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=BuildBot grid view web interface
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-grid-view/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-grid-view/buildbot-grid-view-3.6.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=5c28b7c52510d477250776aafc5cfcd2
diff --git a/metadata/md5-cache/dev-util/buildbot-pkg-3.6.1 b/metadata/md5-cache/dev-util/buildbot-pkg-3.6.1
new file mode 100644
index 000000000000..0dd3e517b7c2
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-pkg-3.6.1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=BuildBot common www build tools for packaging releases
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-pkg/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-pkg/buildbot-pkg-3.6.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a3c86a1fc5e0ba9145a58e7f68cc00ec
diff --git a/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.6.1 b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.6.1
new file mode 100644
index 000000000000..249988ce4a72
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-waterfall-view-3.6.1
@@ -0,0 +1,15 @@
+BDEPEND=~dev-util/buildbot-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Buildbot waterfall-view plugin
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-waterfall-view/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-waterfall-view/buildbot-waterfall-view-3.6.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=e41f885ae665ad0cff045523e0a56bdd
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-3.6.1 b/metadata/md5-cache/dev-util/buildbot-worker-3.6.1
new file mode 100644
index 000000000000..2271f18e76f7
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-worker-3.6.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/psutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) virtual/pkgconfig python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile config configure install postinst prepare test
+DESCRIPTION=BuildBot Worker (slave) Daemon
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-worker/
+INHERIT=readme.gentoo-r1 systemd distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=acct-user/buildbot >=dev-python/autobahn-0.16.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/msgpack-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/twisted-18.7.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/future[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] !<dev-util/buildbot-1.0.0 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-worker/buildbot-worker-3.6.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=06d23505248813fc2fff1239a9b16e36
diff --git a/metadata/md5-cache/dev-util/buildbot-worker-9999 b/metadata/md5-cache/dev-util/buildbot-worker-9999
index a907ebd97b30..f3e2dce09561 100644
--- a/metadata/md5-cache/dev-util/buildbot-worker-9999
+++ b/metadata/md5-cache/dev-util/buildbot-worker-9999
@@ -12,4 +12,4 @@ REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4418ddb627c184f77f5e5aad59a75c44
+_md5_=008e695e4add19198dfa344bef2f20ec
diff --git a/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.6.1 b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.6.1
new file mode 100644
index 000000000000..a1ae2202de16
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-wsgi-dashboards-3.6.1
@@ -0,0 +1,15 @@
+BDEPEND=~dev-util/buildbot-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ~dev-util/buildbot-www-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Buildbot plugin to integrate flask or bottle dashboards to buildbot UI
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-wsgi-dashboards/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-wsgi-dashboards/buildbot-wsgi-dashboards-3.6.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=d1e58328cf11c13100718fae5fea1c51
diff --git a/metadata/md5-cache/dev-util/buildbot-www-3.6.1 b/metadata/md5-cache/dev-util/buildbot-www-3.6.1
new file mode 100644
index 000000000000..8fa6c39aae3f
--- /dev/null
+++ b/metadata/md5-cache/dev-util/buildbot-www-3.6.1
@@ -0,0 +1,15 @@
+BDEPEND=~dev-util/buildbot-pkg-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=BuildBot base web interface, use with buildbot-{console-view,waterfall-view}...
+EAPI=8
+HOMEPAGE=https://buildbot.net/ https://github.com/buildbot/buildbot https://pypi.org/project/buildbot-www/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~arm64 ~riscv ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=~dev-util/buildbot-pkg-3.6.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=mirror://pypi/b/buildbot-www/buildbot-www-3.6.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=a4884cd5285be0a7462ec5c06c684892
diff --git a/metadata/md5-cache/dev-util/ccache-4.6-r1 b/metadata/md5-cache/dev-util/ccache-4.6-r1
deleted file mode 100644
index a3e0196b3613..000000000000
--- a/metadata/md5-cache/dev-util/ccache-4.6-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( dev-ruby/asciidoctor ) verify-sig? ( sec-keys/openpgp-keys-joelrosdahl ) >=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 prerm test unpack
-DEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) test? ( dev-libs/elfutils )
-DESCRIPTION=Fast compiler cache
-EAPI=8
-HOMEPAGE=https://ccache.dev/
-IDEPEND=dev-util/shadowman
-INHERIT=cmake toolchain-funcs flag-o-matic verify-sig
-IUSE=doc redis +static-c++ test verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) dev-util/shadowman sys-apps/gentoo-functions
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ccache/ccache/releases/download/v4.6/ccache-4.6.tar.xz verify-sig? ( https://github.com/ccache/ccache/releases/download/v4.6/ccache-4.6.tar.xz.asc )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5f5894fe83073ca8ccc1623bc36fa1ea
diff --git a/metadata/md5-cache/dev-util/ccache-4.6.1 b/metadata/md5-cache/dev-util/ccache-4.6.1
deleted file mode 100644
index 609c9aae58fa..000000000000
--- a/metadata/md5-cache/dev-util/ccache-4.6.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( dev-ruby/asciidoctor ) verify-sig? ( sec-keys/openpgp-keys-joelrosdahl ) >=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 prerm test unpack
-DEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) test? ( dev-libs/elfutils )
-DESCRIPTION=Fast compiler cache
-EAPI=8
-HOMEPAGE=https://ccache.dev/
-IDEPEND=dev-util/shadowman
-INHERIT=cmake toolchain-funcs flag-o-matic verify-sig
-IUSE=doc redis +static-c++ test verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) dev-util/shadowman sys-apps/gentoo-functions
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ccache/ccache/releases/download/v4.6.1/ccache-4.6.1.tar.xz verify-sig? ( https://github.com/ccache/ccache/releases/download/v4.6.1/ccache-4.6.1.tar.xz.asc )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4f0382efdb7b4e28cb3e1f6d3366acc2
diff --git a/metadata/md5-cache/dev-util/ccache-4.6.2 b/metadata/md5-cache/dev-util/ccache-4.6.2
deleted file mode 100644
index 01d8cea75857..000000000000
--- a/metadata/md5-cache/dev-util/ccache-4.6.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( dev-ruby/asciidoctor ) verify-sig? ( sec-keys/openpgp-keys-joelrosdahl ) >=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 prerm test unpack
-DEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) test? ( dev-libs/elfutils )
-DESCRIPTION=Fast compiler cache
-EAPI=8
-HOMEPAGE=https://ccache.dev/
-IDEPEND=dev-util/shadowman
-INHERIT=cmake toolchain-funcs flag-o-matic verify-sig
-IUSE=doc redis +static-c++ test verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-3 LGPL-3
-RDEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) dev-util/shadowman sys-apps/gentoo-functions
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/ccache/ccache/releases/download/v4.6.2/ccache-4.6.2.tar.xz verify-sig? ( https://github.com/ccache/ccache/releases/download/v4.6.2/ccache-4.6.2.tar.xz.asc )
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=167a55abd31f0ca6c7ebbd67ca9bac00
diff --git a/metadata/md5-cache/dev-util/cmake-3.24.1 b/metadata/md5-cache/dev-util/cmake-3.24.1
deleted file mode 100644
index 9ddf0ae854a8..000000000000
--- a/metadata/md5-cache/dev-util/cmake-3.24.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-bradking ) doc? ( dev-python/requests dev-python/sphinx ) test? ( app-arch/libarchive[zstd] ) sys-devel/make test? ( x11-base/xorg-server[xvfb] x11-apps/xhost ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst postrm prepare test unpack
-DEPEND=>=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 )
-DESCRIPTION=Cross platform Make
-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
-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.24/cmake-3.24.1.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.24.1-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.24.1/cmake-3.24.1-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.24.1/cmake-3.24.1-SHA-256.txt.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	44afbf15c35884f7c840470f1cf05d0d	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=3cbefc3486064e5b6b988ebd99be4fac
diff --git a/metadata/md5-cache/dev-util/ctags-20190331-r1 b/metadata/md5-cache/dev-util/ctags-20190331-r1
deleted file mode 100644
index aafd317f4eb6..000000000000
--- a/metadata/md5-cache/dev-util/ctags-20190331-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install postinst postrm prepare
-DEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) dev-python/docutils virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
-EAPI=6
-HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
-INHERIT=autotools
-IUSE=json xml yaml
-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
-LICENSE=GPL-2+
-RDEPEND=json? ( dev-libs/jansson:= ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml ) app-eselect/eselect-ctags
-SLOT=0
-SRC_URI=https://github.com/universal-ctags/ctags/archive/95975bd157cc1326120977ce530f0477bcbf43b1.tar.gz -> ctags-20190331.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	epatch	447396341f5f896d722e435a06f87a4f	eqawarn	c9847c43b3253a276ae2eabddedab3d7	estack	055c42df72f76a4f45ec92b35e83cd56	eutils	8f942ebdcf04334697649d4a0bf65a32	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	ltprune	97143780d341cc8d8f1d4c6187a36d29	multilib	5ca4e49abed8e3a2f7b56920eadee157	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	vcs-clean	d271b7bc7e6a009758d7d4ef749174e3	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8497bd5b01f5686975ddebe3286f4f45
diff --git a/metadata/md5-cache/dev-util/ctags-20220828.0 b/metadata/md5-cache/dev-util/ctags-20220828.0-r1
similarity index 85%
rename from metadata/md5-cache/dev-util/ctags-20220828.0
rename to metadata/md5-cache/dev-util/ctags-20220828.0-r1
index ff9142c17ed0..28f5346b3d34 100644
--- a/metadata/md5-cache/dev-util/ctags-20220828.0
+++ b/metadata/md5-cache/dev-util/ctags-20220828.0-r1
@@ -1,17 +1,17 @@
 BDEPEND=dev-python/docutils virtual/pkgconfig test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install postinst postrm prepare setup
-DEPEND=json? ( dev-libs/jansson:= ) pcre? ( dev-libs/libpcre2 ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
+DEPEND=json? ( dev-libs/jansson:= ) pcre? ( dev-libs/libpcre2 ) seccomp? ( sys-libs/libseccomp ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
 DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
 EAPI=8
 HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
 IDEPEND=app-eselect/eselect-ctags
 INHERIT=autotools python-any-r1
-IUSE=json pcre test xml yaml
+IUSE=json pcre seccomp test xml yaml
 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=json? ( dev-libs/jansson:= ) pcre? ( dev-libs/libpcre2 ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
+RDEPEND=json? ( dev-libs/jansson:= ) pcre? ( dev-libs/libpcre2 ) seccomp? ( sys-libs/libseccomp ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/universal-ctags/ctags/archive/refs/tags/p5.9.20220828.0.tar.gz -> ctags-20220828.0.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8130d73179b1bf502bcc637b6ce29cb7
+_md5_=dab060d50e435c9ceef44ac4d830e429
diff --git a/metadata/md5-cache/dev-util/ctags-99999999 b/metadata/md5-cache/dev-util/ctags-99999999
index 2ce7874aa999..8ff787baa4c6 100644
--- a/metadata/md5-cache/dev-util/ctags-99999999
+++ b/metadata/md5-cache/dev-util/ctags-99999999
@@ -1,16 +1,16 @@
 BDEPEND=dev-python/docutils virtual/pkgconfig test? ( || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=configure install postinst postrm prepare setup unpack
-DEPEND=json? ( dev-libs/jansson:= ) pcre? ( dev-libs/libpcre2 ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
+DEPEND=json? ( dev-libs/jansson:= ) pcre? ( dev-libs/libpcre2 ) seccomp? ( sys-libs/libseccomp ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
 DESCRIPTION=Exuberant Ctags creates tags files for code browsing in editors
 EAPI=8
 HOMEPAGE=https://ctags.io/ https://github.com/universal-ctags/ctags
 IDEPEND=app-eselect/eselect-ctags
 INHERIT=autotools python-any-r1 git-r3
-IUSE=json pcre test xml yaml
+IUSE=json pcre seccomp test xml yaml
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=json? ( dev-libs/jansson:= ) pcre? ( dev-libs/libpcre2 ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
+RDEPEND=json? ( dev-libs/jansson:= ) pcre? ( dev-libs/libpcre2 ) seccomp? ( sys-libs/libseccomp ) xml? ( dev-libs/libxml2:2 ) yaml? ( dev-libs/libyaml )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8130d73179b1bf502bcc637b6ce29cb7
+_md5_=dab060d50e435c9ceef44ac4d830e429
diff --git a/metadata/md5-cache/dev-util/difftastic-0.36.1 b/metadata/md5-cache/dev-util/difftastic-0.36.1
new file mode 100644
index 000000000000..f97413d2f4ba
--- /dev/null
+++ b/metadata/md5-cache/dev-util/difftastic-0.36.1
@@ -0,0 +1,13 @@
+BDEPEND=>=virtual/rust-1.53
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=A structural diff that understands syntax.
+EAPI=8
+HOMEPAGE=https://github.com/wilfred/difftastic
+INHERIT=cargo
+IUSE=debug
+KEYWORDS=~amd64
+LICENSE=Apache-2.0 Apache-2.0-with-LLVM-exceptions MIT MPL-2.0 Unlicense ZLIB
+SLOT=0
+SRC_URI=https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/ansi_term/0.12.1/download -> ansi_term-0.12.1.crate https://crates.io/api/v1/crates/archery/0.4.0/download -> archery-0.4.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/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/bumpalo/3.9.1/download -> bumpalo-3.9.1.crate https://crates.io/api/v1/crates/bytecount/0.6.2/download -> bytecount-0.6.2.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.18/download -> clap-3.1.18.crate https://crates.io/api/v1/crates/clap_lex/0.2.0/download -> clap_lex-0.2.0.crate https://crates.io/api/v1/crates/const_format/0.2.23/download -> const_format-0.2.23.crate https://crates.io/api/v1/crates/const_format_proc_macros/0.2.22/download -> const_format_proc_macros-0.2.22.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/ctor/0.1.22/download -> ctor-0.1.22.crate https://crates.io/api/v1/crates/diff/0.1.12/download -> diff-0.1.12.crate https://crates.io/api/v1/crates/either/1.6.1/download -> either-1.6.1.crate https://crates.io/api/v1/crates/env_logger/0.7.1/download -> env_logger-0.7.1.crate https://crates.io/api/v1/crates/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/fixedbitset/0.4.1/download -> fixedbitset-0.4.1.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/hashbrown/0.11.2/download -> hashbrown-0.11.2.crate https://crates.io/api/v1/crates/hermit-abi/0.1.19/download -> hermit-abi-0.1.19.crate https://crates.io/api/v1/crates/humantime/1.3.0/download -> humantime-1.3.0.crate https://crates.io/api/v1/crates/indexmap/1.7.0/download -> indexmap-1.7.0.crate https://crates.io/api/v1/crates/io-lifetimes/0.7.3/download -> io-lifetimes-0.7.3.crate https://crates.io/api/v1/crates/itertools/0.10.3/download -> itertools-0.10.3.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/libmimalloc-sys/0.1.24/download -> libmimalloc-sys-0.1.24.crate https://crates.io/api/v1/crates/linux-raw-sys/0.0.46/download -> linux-raw-sys-0.0.46.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/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/mimalloc/0.1.28/download -> mimalloc-0.1.28.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/nom/7.1.1/download -> nom-7.1.1.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/once_cell/1.12.0/download -> once_cell-1.12.0.crate https://crates.io/api/v1/crates/os_str_bytes/6.0.1/download -> os_str_bytes-6.0.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/owo-colors/3.4.0/download -> owo-colors-3.4.0.crate https://crates.io/api/v1/crates/petgraph/0.6.1/download -> petgraph-0.6.1.crate https://crates.io/api/v1/crates/pretty_assertions/1.2.1/download -> pretty_assertions-1.2.1.crate https://crates.io/api/v1/crates/pretty_env_logger/0.4.0/download -> pretty_env_logger-0.4.0.crate https://crates.io/api/v1/crates/proc-macro2/1.0.39/download -> proc-macro2-1.0.39.crate https://crates.io/api/v1/crates/quick-error/1.2.3/download -> quick-error-1.2.3.crate https://crates.io/api/v1/crates/quote/1.0.18/download -> quote-1.0.18.crate https://crates.io/api/v1/crates/radix-heap/0.4.2/download -> radix-heap-0.4.2.crate https://crates.io/api/v1/crates/rayon/1.5.3/download -> rayon-1.5.3.crate https://crates.io/api/v1/crates/rayon-core/1.9.3/download -> rayon-core-1.9.3.crate https://crates.io/api/v1/crates/regex/1.5.6/download -> regex-1.5.6.crate https://crates.io/api/v1/crates/regex-syntax/0.6.26/download -> regex-syntax-0.6.26.crate https://crates.io/api/v1/crates/rpds/0.10.0/download -> rpds-0.10.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.35.9/download -> rustix-0.35.9.crate https://crates.io/api/v1/crates/same-file/1.0.6/download -> same-file-1.0.6.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.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.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/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/terminal_size/0.1.17/download -> terminal_size-0.1.17.crate https://crates.io/api/v1/crates/terminal_size/0.2.1/download -> terminal_size-0.2.1.crate https://crates.io/api/v1/crates/textwrap/0.15.0/download -> textwrap-0.15.0.crate https://crates.io/api/v1/crates/tree-sitter/0.20.6/download -> tree-sitter-0.20.6.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/typed-arena/2.0.1/download -> typed-arena-2.0.1.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-width/0.1.9/download -> unicode-width-0.1.9.crate https://crates.io/api/v1/crates/unicode-xid/0.2.3/download -> unicode-xid-0.2.3.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/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_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/wu-diff/0.1.2/download -> wu-diff-0.1.2.crate https://github.com/Wilfred/difftastic/archive/refs/tags/0.36.1.tar.gz -> difftastic-0.36.1.gh.tar.gz
+_eclasses_=cargo	52a92ed3815080c5f2caac1905687b1c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=fe3c3f1137cfb39b40a89da1c7253ffb
diff --git a/metadata/md5-cache/dev-util/idea-community-2022.2.1.222.3739.54 b/metadata/md5-cache/dev-util/idea-community-2022.2.1.222.3739.54
deleted file mode 100644
index 19b084c203d7..000000000000
--- a/metadata/md5-cache/dev-util/idea-community-2022.2.1.222.3739.54
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=dev-util/patchelf
-DEFINED_PHASES=install prepare unpack
-DEPEND=|| ( >=dev-java/openjdk-11.0.13_p8:11 >=dev-java/openjdk-bin-11.0.13_p8-r1:11 )
-DESCRIPTION=A complete toolset for web, mobile and enterprise development
-EAPI=7
-HOMEPAGE=https://www.jetbrains.com/idea
-INHERIT=desktop wrapper
-KEYWORDS=~amd64 ~arm64
-LICENSE=Apache-2.0 BSD BSD-2 CC0-1.0 CC-BY-2.5 CDDL-1.1 codehaus-classworlds CPL-1.0 EPL-1.0 EPL-2.0 GPL-2 GPL-2-with-classpath-exception ISC JDOM LGPL-2.1 LGPL-2.1+ LGPL-3-with-linking-exception MIT MPL-1.0 MPL-1.1 OFL ZLIB
-RDEPEND=|| ( >=dev-java/openjdk-11.0.13_p8:11 >=dev-java/openjdk-bin-11.0.13_p8-r1:11 ) sys-libs/glibc media-libs/harfbuzz dev-java/jansi-native dev-libs/libdbusmenu
-RESTRICT=splitdebug
-SLOT=0
-SRC_URI=https://download.jetbrains.com/idea/ideaIC-2022.2.1-no-jbr.tar.gz?_ga=2.151348410.2082789468.1660859635-1531039212.1660859635 -> ideaIC-2.1.222.3739.54.tar.gz amd64? ( https://cache-redirector.jetbrains.com/intellij-jbr/jbrsdk-11_0_13-linux-x64-b1751.21.tar.gz -> jbr-11_0_13-linux-x64-b1751.21.tar.gz )
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fdddb7990da6fb6a050dd58e4c6e6922
diff --git a/metadata/md5-cache/dev-util/pkgdev-0.2.1-r1 b/metadata/md5-cache/dev-util/pkgdev-0.2.1-r1
deleted file mode 100644
index 419b1ff361d8..000000000000
--- a/metadata/md5-cache/dev-util/pkgdev-0.2.1-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest ) doc? ( || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Collection of tools for Gentoo development
-EAPI=8
-HOMEPAGE=https://github.com/pkgcore/pkgdev
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 arm arm64 hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-macos
-LICENSE=BSD MIT
-RDEPEND=>=dev-python/snakeoil-0.9.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-util/pkgcheck-0.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-vcs/git python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pkgdev/pkgdev-0.2.1.tar.gz
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3a289e9123da017aef5fe4bf0e6b6653
diff --git a/metadata/md5-cache/dev-util/seer-1.9-r2 b/metadata/md5-cache/dev-util/seer-1.9-r2
deleted file mode 100644
index 5829842c6cee..000000000000
--- a/metadata/md5-cache/dev-util/seer-1.9-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5
-DESCRIPTION=A GUI frontend to gdb
-EAPI=8
-HOMEPAGE=https://github.com/epasveer/seer
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake desktop xdg
-KEYWORDS=~amd64
-LICENSE=GPL-3
-RDEPEND=dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sys-devel/gdb
-SLOT=0
-SRC_URI=https://github.com/epasveer/seer/archive/refs/tags/v1.9.tar.gz -> seer-1.9.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=725545c51f93786b8089f4f9172b30e2
diff --git a/metadata/md5-cache/dev-util/strace-5.18 b/metadata/md5-cache/dev-util/strace-5.18
deleted file mode 100644
index 35d2840af9e7..000000000000
--- a/metadata/md5-cache/dev-util/strace-5.18
+++ /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 >=sys-devel/libtool-2.4
-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 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/v5.18/strace-5.18.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=75dd4869b235655ec74dde3a12026dd7
diff --git a/metadata/md5-cache/dev-util/uglifyjs-3.16.3 b/metadata/md5-cache/dev-util/uglifyjs-3.17.1
similarity index 90%
rename from metadata/md5-cache/dev-util/uglifyjs-3.16.3
rename to metadata/md5-cache/dev-util/uglifyjs-3.17.1
index 0dbc7cffb416..298aaff4dc04 100644
--- a/metadata/md5-cache/dev-util/uglifyjs-3.16.3
+++ b/metadata/md5-cache/dev-util/uglifyjs-3.17.1
@@ -7,5 +7,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=BSD-2
 RDEPEND=net-libs/nodejs
 SLOT=0
-SRC_URI=https://github.com/mishoo/UglifyJS/archive/refs/tags/v3.16.3.tar.gz -> uglifyjs-3.16.3.tar.gz
+SRC_URI=https://github.com/mishoo/UglifyJS/archive/refs/tags/v3.17.1.tar.gz -> uglifyjs-3.17.1.tar.gz
 _md5_=44bd2da544eaceb8bdf1c4717e18bda2
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 8ed912c9647a..666f6453fdff 100644
Binary files a/metadata/md5-cache/games-action/Manifest.gz and b/metadata/md5-cache/games-action/Manifest.gz differ
diff --git a/metadata/md5-cache/games-action/beathazardultra-20130308-r2 b/metadata/md5-cache/games-action/beathazardultra-20130308-r2
index f10a18548ce6..e440cfec85e8 100644
--- a/metadata/md5-cache/games-action/beathazardultra-20130308-r2
+++ b/metadata/md5-cache/games-action/beathazardultra-20130308-r2
@@ -12,4 +12,4 @@ RESTRICT=bindist fetch splitdebug
 SLOT=0
 SRC_URI=beathazard-installer_03-08-13
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=763ac459c796ed2ce9946bc8a7a75f0a
+_md5_=c65d080bca10fc1739aeae0a6a6d4130
diff --git a/metadata/md5-cache/games-action/minetest-5.6.1 b/metadata/md5-cache/games-action/minetest-5.6.1
new file mode 100644
index 000000000000..e9efbc251ca0
--- /dev/null
+++ b/metadata/md5-cache/games-action/minetest-5.6.1
@@ -0,0 +1,18 @@
+BDEPEND=doc? ( app-doc/doxygen media-gfx/graphviz ) nls? ( sys-devel/gettext ) >=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
+DEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) app-arch/zstd dev-db/sqlite:3 dev-libs/gmp:0= dev-libs/jsoncpp:= sys-libs/zlib client? ( >=dev-games/irrlicht-mt-1.9.0.8 media-libs/freetype:2 media-libs/libpng:0= media-libs/libjpeg-turbo virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libvorbis media-libs/openal ) ) curl? ( net-misc/curl ) leveldb? ( dev-libs/leveldb:= ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) prometheus? ( dev-cpp/prometheus-cpp ) redis? ( dev-libs/hiredis:= ) server? ( acct-group/minetest acct-user/minetest >=dev-games/irrlicht-mt-headers-1.9.0.8 ) spatial? ( sci-libs/libspatialindex:= )
+DESCRIPTION=A free open-source voxel game engine with easy modding and game creation
+EAPI=8
+HOMEPAGE=https://www.minetest.net
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake flag-o-matic lua-single systemd xdg
+IUSE=+client +curl doc leveldb ncurses nls postgres prometheus redis +server +sound spatial test lua_single_target_luajit lua_single_target_lua5-1
+KEYWORDS=~amd64 ~riscv
+LICENSE=LGPL-2.1+ CC-BY-SA-3.0 OFL-1.1 Apache-2.0
+RDEPEND=lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-1? ( dev-lang/lua:5.1[deprecated] ) app-arch/zstd dev-db/sqlite:3 dev-libs/gmp:0= dev-libs/jsoncpp:= sys-libs/zlib client? ( >=dev-games/irrlicht-mt-1.9.0.8 media-libs/freetype:2 media-libs/libpng:0= media-libs/libjpeg-turbo virtual/opengl x11-libs/libX11 x11-libs/libXxf86vm sound? ( media-libs/libvorbis media-libs/openal ) ) curl? ( net-misc/curl ) leveldb? ( dev-libs/leveldb:= ) ncurses? ( sys-libs/ncurses:0= ) nls? ( virtual/libintl ) postgres? ( >=dev-db/postgresql-9.5:= ) prometheus? ( dev-cpp/prometheus-cpp ) redis? ( dev-libs/hiredis:= ) server? ( acct-group/minetest acct-user/minetest >=dev-games/irrlicht-mt-headers-1.9.0.8 ) spatial? ( sci-libs/libspatialindex:= )
+REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 ) || ( client server )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/minetest/minetest/archive/5.6.1.tar.gz -> minetest-5.6.1.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=6304eeb146950af8ea86411935c9ba71
diff --git a/metadata/md5-cache/games-action/polymc-1.4.1-r2 b/metadata/md5-cache/games-action/polymc-1.4.1-r2
deleted file mode 100644
index 81920ebba66b..000000000000
--- a/metadata/md5-cache/games-action/polymc-1.4.1-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-text/scdoc kde-frameworks/extra-cmake-modules:5 >=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-qt/qtconcurrent-5.12.0:5 >=dev-qt/qtcore-5.12.0:5 >=dev-qt/qtgui-5.12.0:5 >=dev-qt/qtnetwork-5.12.0:5 >=dev-qt/qttest-5.12.0:5 >=dev-qt/qtwidgets-5.12.0:5 >=dev-qt/qtxml-5.12.0:5 >=dev-libs/quazip-1.3:=[qt5(+)] sys-libs/zlib media-libs/libglvnd >=virtual/jdk-1.8.0:* >=dev-java/java-config-2.2.0-r3
-DESCRIPTION=A custom, open source Minecraft launcher
-EAPI=8
-HOMEPAGE=https://polymc.org/ https://github.com/PolyMC/PolyMC
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=cmake java-pkg-2 optfeature xdg
-IUSE=debug lto test
-KEYWORDS=~amd64
-LICENSE=Apache-2.0 Boost-1.0 BSD BSD-2 GPL-2+ GPL-3 LGPL-3 OFL-1.1 MIT
-RDEPEND=>=dev-qt/qtconcurrent-5.12.0:5 >=dev-qt/qtcore-5.12.0:5 >=dev-qt/qtgui-5.12.0:5 >=dev-qt/qtnetwork-5.12.0:5 >=dev-qt/qttest-5.12.0:5 >=dev-qt/qtwidgets-5.12.0:5 >=dev-qt/qtxml-5.12.0:5 >=dev-libs/quazip-1.3:=[qt5(+)] sys-libs/zlib >=virtual/jre-1.8.0:* virtual/opengl >=dev-java/java-config-2.2.0-r3
-REQUIRED_USE=lto? ( !debug )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/PolyMC/PolyMC/releases/download/1.4.1/PolyMC-1.4.1.tar.gz -> polymc-1.4.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=abf664035bd73cb5e45d922d1e8de8fa
diff --git a/metadata/md5-cache/games-action/polymc-1.4.2-r1 b/metadata/md5-cache/games-action/polymc-1.4.2-r2
similarity index 90%
rename from metadata/md5-cache/games-action/polymc-1.4.2-r1
rename to metadata/md5-cache/games-action/polymc-1.4.2-r2
index d0281d762f61..05db9f4ff92a 100644
--- a/metadata/md5-cache/games-action/polymc-1.4.2-r1
+++ b/metadata/md5-cache/games-action/polymc-1.4.2-r2
@@ -9,10 +9,10 @@ INHERIT=cmake java-pkg-2 optfeature xdg
 IUSE=debug lto test
 KEYWORDS=~amd64
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+ MIT
-RDEPEND=>=dev-qt/qtconcurrent-5.12.0:5 >=dev-qt/qtcore-5.12.0:5 >=dev-qt/qtgui-5.12.0:5 >=dev-qt/qtnetwork-5.12.0:5 >=dev-qt/qttest-5.12.0:5 >=dev-qt/qtwidgets-5.12.0:5 >=dev-qt/qtxml-5.12.0:5 >=dev-libs/quazip-1.3:=[qt5(+)] sys-libs/zlib >=virtual/jre-1.8.0:* virtual/opengl >=dev-java/java-config-2.2.0-r3
+RDEPEND=>=dev-qt/qtconcurrent-5.12.0:5 >=dev-qt/qtcore-5.12.0:5 >=dev-qt/qtgui-5.12.0:5 >=dev-qt/qtnetwork-5.12.0:5 >=dev-qt/qttest-5.12.0:5 >=dev-qt/qtwidgets-5.12.0:5 >=dev-qt/qtxml-5.12.0:5 >=dev-libs/quazip-1.3:=[qt5(+)] sys-libs/zlib >=dev-qt/qtsvg-5.12.0:5 >=virtual/jre-1.8.0:* virtual/opengl >=dev-java/java-config-2.2.0-r3
 REQUIRED_USE=lto? ( !debug )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/PolyMC/PolyMC/releases/download/1.4.2/PolyMC-1.4.2.tar.gz -> polymc-1.4.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=58a0cb3d5948bda0d1491ccd606415b2
+_md5_=36e60b825d8b68e11d83cf90abc72928
diff --git a/metadata/md5-cache/games-action/polymc-9999 b/metadata/md5-cache/games-action/polymc-9999
index 66e971442494..ea76e5c153f7 100644
--- a/metadata/md5-cache/games-action/polymc-9999
+++ b/metadata/md5-cache/games-action/polymc-9999
@@ -1,17 +1,17 @@
 BDEPEND=app-text/scdoc kde-frameworks/extra-cmake-modules:5 >=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 postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-qt/qtconcurrent-5.12.0:5 >=dev-qt/qtcore-5.12.0:5 >=dev-qt/qtgui-5.12.0:5 >=dev-qt/qtnetwork-5.12.0:5 >=dev-qt/qttest-5.12.0:5 >=dev-qt/qtwidgets-5.12.0:5 >=dev-qt/qtxml-5.12.0:5 >=dev-libs/quazip-1.3:=[qt5(+)] sys-libs/zlib media-libs/libglvnd >=virtual/jdk-1.8.0:* >=dev-java/java-config-2.2.0-r3
+DEPEND=!qt6? ( >=dev-qt/qtconcurrent-5.12.0:5 >=dev-qt/qtcore-5.12.0:5 >=dev-qt/qtgui-5.12.0:5 >=dev-qt/qtnetwork-5.12.0:5 >=dev-qt/qttest-5.12.0:5 >=dev-qt/qtwidgets-5.12.0:5 >=dev-qt/qtxml-5.12.0:5 ) qt6? ( >=dev-qt/qtbase-6.0.0:6[concurrent,gui,network,widgets,xml(+)] >=dev-qt/qt5compat-6.0.0:6 ) !qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] ) qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] ) sys-libs/zlib media-libs/libglvnd >=virtual/jdk-1.8.0:* >=dev-java/java-config-2.2.0-r3
 DESCRIPTION=A custom, open source Minecraft launcher
 EAPI=8
 HOMEPAGE=https://polymc.org/ https://github.com/PolyMC/PolyMC
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=cmake java-pkg-2 optfeature xdg git-r3
-IUSE=debug lto test
+IUSE=debug lto qt6 test
 LICENSE=Apache-2.0 BSD BSD-2 GPL-2+ GPL-3 ISC LGPL-2.1+ LGPL-3+ MIT
 PROPERTIES=live
-RDEPEND=>=dev-qt/qtconcurrent-5.12.0:5 >=dev-qt/qtcore-5.12.0:5 >=dev-qt/qtgui-5.12.0:5 >=dev-qt/qtnetwork-5.12.0:5 >=dev-qt/qttest-5.12.0:5 >=dev-qt/qtwidgets-5.12.0:5 >=dev-qt/qtxml-5.12.0:5 >=dev-libs/quazip-1.3:=[qt5(+)] sys-libs/zlib >=virtual/jre-1.8.0:* virtual/opengl >=dev-java/java-config-2.2.0-r3
+RDEPEND=!qt6? ( >=dev-qt/qtconcurrent-5.12.0:5 >=dev-qt/qtcore-5.12.0:5 >=dev-qt/qtgui-5.12.0:5 >=dev-qt/qtnetwork-5.12.0:5 >=dev-qt/qttest-5.12.0:5 >=dev-qt/qtwidgets-5.12.0:5 >=dev-qt/qtxml-5.12.0:5 ) qt6? ( >=dev-qt/qtbase-6.0.0:6[concurrent,gui,network,widgets,xml(+)] >=dev-qt/qt5compat-6.0.0:6 ) !qt6? ( >=dev-libs/quazip-1.3:=[qt5(+)] ) qt6? ( >=dev-libs/quazip-1.3:=[qt6(-)] ) sys-libs/zlib !qt6? ( >=dev-qt/qtsvg-5.12.0:5 ) qt6? ( >=dev-qt/qtsvg-6.0.0:6 ) >=virtual/jre-1.8.0:* virtual/opengl >=dev-java/java-config-2.2.0-r3
 REQUIRED_USE=lto? ( !debug )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=58a0cb3d5948bda0d1491ccd606415b2
+_md5_=a8c3f70cbf19dcecbbf6274c9d9f4929
diff --git a/metadata/md5-cache/games-arcade/Manifest.gz b/metadata/md5-cache/games-arcade/Manifest.gz
index fa504a124c6d..76a5b784b969 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/holotz-castle-1.3.14-r1 b/metadata/md5-cache/games-arcade/holotz-castle-1.3.14-r1
index 11cfdf384755..08b9c19b79ea 100644
--- a/metadata/md5-cache/games-arcade/holotz-castle-1.3.14-r1
+++ b/metadata/md5-cache/games-arcade/holotz-castle-1.3.14-r1
@@ -10,4 +10,4 @@ RDEPEND=virtual/opengl virtual/glu media-libs/sdl-mixer media-libs/libsdl[joysti
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~chewi/distfiles/holotz-castle-1.3.14-src.tar.gz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5a3c2086f5a19494ff4bfdb96b932a02
+_md5_=de491dd7fd3d56c71e496a4a59dd24f6
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index 97a71f296801..cacc099676d8 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/pcsx2-1.7.3329 b/metadata/md5-cache/games-emulation/pcsx2-1.7.3329
new file mode 100644
index 000000000000..2c230d8cb91a
--- /dev/null
+++ b/metadata/md5-cache/games-emulation/pcsx2-1.7.3329
@@ -0,0 +1,18 @@
+BDEPEND=dev-lang/perl qt6? ( dev-qt/qttools[linguist] ) !qt6? ( sys-devel/gettext ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libzip:=[zstd] media-libs/cubeb media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:= media-libs/libsamplerate >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 net-misc/curl ) !qt6? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/wxGTK:3.0-gtk3[X] pulseaudio? ( media-libs/libpulse ) ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland ) x11-base/xorg-proto test? ( dev-cpp/gtest )
+DESCRIPTION=PlayStation 2 emulator
+EAPI=8
+HOMEPAGE=https://pcsx2.net/
+IDEPEND=filecaps? ( sys-libs/libcap )
+INHERIT=cmake fcaps flag-o-matic wxwidgets
+IUSE=cpu_flags_x86_sse4_1 pulseaudio qt6 test vulkan wayland +filecaps
+KEYWORDS=-* ~amd64
+LICENSE=GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 GPL-2+ LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
+RDEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libzip:=[zstd] media-libs/cubeb media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:= media-libs/libsamplerate >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 net-misc/curl ) !qt6? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/wxGTK:3.0-gtk3[X] pulseaudio? ( media-libs/libpulse ) ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland )
+REQUIRED_USE=cpu_flags_x86_sse4_1
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/PCSX2/pcsx2/archive/refs/tags/v1.7.3329.tar.gz -> pcsx2-1.7.3329.tar.gz vulkan? ( https://github.com/KhronosGroup/glslang/archive/c9706bdda0ac22b9856f1aa8261e5b9e15cd20c5.tar.gz -> pcsx2-glslang-c9706bdda0.tar.gz https://github.com/KhronosGroup/Vulkan-Headers/archive/9f4c61a31435a7a90a314fc68aeb386c92a09c0f.tar.gz -> pcsx2-vulkan-headers-9f4c61a314.tar.gz )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5625559ba32eafb887f2106bbd5a263e
diff --git a/metadata/md5-cache/games-emulation/pcsx2-9999 b/metadata/md5-cache/games-emulation/pcsx2-9999
index 551668579197..e11f0616eeaf 100644
--- a/metadata/md5-cache/games-emulation/pcsx2-9999
+++ b/metadata/md5-cache/games-emulation/pcsx2-9999
@@ -1,15 +1,17 @@
-BDEPEND=test? ( dev-cpp/gtest ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 filecaps? ( sys-libs/libcap ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=dev-lang/perl qt6? ( dev-qt/qttools[linguist] ) !qt6? ( sys-devel/gettext ) >=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 postinst prepare test unpack
-DEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/glib:2 dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libxml2:2 dev-libs/libzip:=[zstd] media-libs/alsa-lib media-libs/cubeb media-libs/freetype media-libs/libglvnd media-libs/libpng:= media-libs/libsamplerate media-libs/libsdl2[haptic,joystick,sound] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib virtual/libudev:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/wxGTK:3.0-gtk3[X] pulseaudio? ( media-sound/pulseaudio ) x11-base/xorg-proto
-DESCRIPTION=A PlayStation 2 emulator
-EAPI=7
+DEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libzip:=[zstd] media-libs/cubeb media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:= media-libs/libsamplerate >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 net-misc/curl ) !qt6? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/wxGTK:3.0-gtk3[X] pulseaudio? ( media-libs/libpulse ) ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland ) x11-base/xorg-proto test? ( dev-cpp/gtest )
+DESCRIPTION=PlayStation 2 emulator
+EAPI=8
 HOMEPAGE=https://pcsx2.net/
-INHERIT=cmake fcaps git-r3 toolchain-funcs wxwidgets
-IUSE=pulseaudio test +filecaps
-LICENSE=GPL-3 Apache-2.0 OFL-1.1
+IDEPEND=filecaps? ( sys-libs/libcap )
+INHERIT=cmake fcaps flag-o-matic wxwidgets git-r3
+IUSE=cpu_flags_x86_sse4_1 pulseaudio qt6 test vulkan wayland +filecaps
+LICENSE=GPL-3+ Apache-2.0 BSD BSD-2 BSD-4 Boost-1.0 GPL-2+ LGPL-2.1+ LGPL-3+ MIT OFL-1.1 ZLIB public-domain
 PROPERTIES=live
-RDEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/glib:2 dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libxml2:2 dev-libs/libzip:=[zstd] media-libs/alsa-lib media-libs/cubeb media-libs/freetype media-libs/libglvnd media-libs/libpng:= media-libs/libsamplerate media-libs/libsdl2[haptic,joystick,sound] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib virtual/libudev:= x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libICE x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/wxGTK:3.0-gtk3[X] pulseaudio? ( media-sound/pulseaudio ) filecaps? ( sys-libs/libcap )
+RDEPEND=app-arch/xz-utils app-arch/zstd:= dev-cpp/rapidyaml:= dev-libs/libaio dev-libs/libchdr >=dev-libs/libfmt-7.1.3:= dev-libs/libzip:=[zstd] media-libs/cubeb media-libs/harfbuzz media-libs/libglvnd media-libs/libpng:= media-libs/libsamplerate >=media-libs/libsdl2-2.0.22[haptic,joystick] media-libs/libsoundtouch:= net-libs/libpcap sys-libs/zlib:= virtual/libudev:= x11-libs/libX11 x11-libs/libXrandr qt6? ( dev-qt/qtbase:6[gui,network,widgets] dev-qt/qtsvg:6 net-misc/curl ) !qt6? ( dev-libs/glib:2 x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[wayland?] x11-libs/wxGTK:3.0-gtk3[X] pulseaudio? ( media-libs/libpulse ) ) vulkan? ( media-libs/vulkan-loader ) wayland? ( dev-libs/wayland )
+REQUIRED_USE=cpu_flags_x86_sse4_1
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=32f92750dbfdf226513a2ef9055ee34e
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	wxwidgets	c09e9b94378cadaf6ef86ec1534c0fd6	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=5625559ba32eafb887f2106bbd5a263e
diff --git a/metadata/md5-cache/games-engines/Manifest.gz b/metadata/md5-cache/games-engines/Manifest.gz
index bb2f8c322a3c..cd8aeaccf705 100644
Binary files a/metadata/md5-cache/games-engines/Manifest.gz and b/metadata/md5-cache/games-engines/Manifest.gz differ
diff --git a/metadata/md5-cache/games-engines/xzip-1.8.2-r3 b/metadata/md5-cache/games-engines/xzip-1.8.2-r3
index 9652e5717bac..c136b9c2396c 100644
--- a/metadata/md5-cache/games-engines/xzip-1.8.2-r3
+++ b/metadata/md5-cache/games-engines/xzip-1.8.2-r3
@@ -11,4 +11,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://www.eblong.com/zarf/ftp/xzip182.tar.Z
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c6a2e4f01a6e31cce380b521215c7f07
+_md5_=6f0011b3f866f60011537bb168acb241
diff --git a/metadata/md5-cache/games-fps/Manifest.gz b/metadata/md5-cache/games-fps/Manifest.gz
index 7e7cf18439c3..a5d53e1ebc82 100644
Binary files a/metadata/md5-cache/games-fps/Manifest.gz and b/metadata/md5-cache/games-fps/Manifest.gz differ
diff --git a/metadata/md5-cache/games-fps/quake1-rally-1.2-r1 b/metadata/md5-cache/games-fps/quake1-rally-1.2-r1
index ccc52422d578..9d67405c40a3 100644
--- a/metadata/md5-cache/games-fps/quake1-rally-1.2-r1
+++ b/metadata/md5-cache/games-fps/quake1-rally-1.2-r1
@@ -10,4 +10,4 @@ RESTRICT=mirror bindist
 SLOT=0
 SRC_URI=http://ehall.freeshell.org/quake/qr12.zip http://ehall.freeshell.org/quake/qrlo1.zip
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773
-_md5_=5a5967924111e333094f153c0c26a78c
+_md5_=3a39a4a235be3121c29758350a9353d3
diff --git a/metadata/md5-cache/games-misc/Manifest.gz b/metadata/md5-cache/games-misc/Manifest.gz
index 1be545f30b62..3aa73a452831 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/bsd-games-2.17_p28-r2 b/metadata/md5-cache/games-misc/bsd-games-2.17_p28-r2
index 9975c20960a0..d3e5980b76b3 100644
--- a/metadata/md5-cache/games-misc/bsd-games-2.17_p28-r2
+++ b/metadata/md5-cache/games-misc/bsd-games-2.17_p28-r2
@@ -11,4 +11,4 @@ RDEPEND=sys-apps/miscfiles sys-libs/ncurses:0= !app-misc/banner !games-misc/wtf
 SLOT=0
 SRC_URI=http://deb.debian.org/debian/pool/main/b/bsdgames/bsdgames_2.17.orig.tar.gz mirror://debian/pool/main/b/bsdgames/bsdgames_2.17-28.debian.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5d5c00cb1b7d32f45559bef0d08ca781
+_md5_=bd5b44af6e3ce4389f20daa05465e7aa
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 7bef2aefbda0..c198fc240db4 100644
Binary files a/metadata/md5-cache/games-puzzle/Manifest.gz and b/metadata/md5-cache/games-puzzle/Manifest.gz differ
diff --git a/metadata/md5-cache/games-puzzle/tanglet-1.6.1.1 b/metadata/md5-cache/games-puzzle/tanglet-1.6.1.1
index 37267ad28028..e13531e79506 100644
--- a/metadata/md5-cache/games-puzzle/tanglet-1.6.1.1
+++ b/metadata/md5-cache/games-puzzle/tanglet-1.6.1.1
@@ -11,4 +11,4 @@ RDEPEND=dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 sys-libs/zlib
 SLOT=0
 SRC_URI=https://gottcode.org/tanglet/tanglet-1.6.1.1-src.tar.bz2
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=78d97d25ffec28507642cf41cae8567e
+_md5_=33e86fad20dda9515f18d83c80b3b717
diff --git a/metadata/md5-cache/games-puzzle/xlogical-1.0.8 b/metadata/md5-cache/games-puzzle/xlogical-1.0.8
index 057e9703128e..0df80cd1394a 100644
--- a/metadata/md5-cache/games-puzzle/xlogical-1.0.8
+++ b/metadata/md5-cache/games-puzzle/xlogical-1.0.8
@@ -5,10 +5,10 @@ DESCRIPTION=Puzzle game based on the Logical! game released on the Commodore Ami
 EAPI=8
 HOMEPAGE=https://changeling.ixionstudios.com/xlogical/
 INHERIT=autotools desktop
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=GPL-2+
 RDEPEND=acct-group/gamestat media-libs/libsdl[sound,video] media-libs/sdl-image[jpeg] media-libs/sdl-mixer[mod]
 SLOT=0
 SRC_URI=https://changeling.ixionstudios.com/xlogical/downloads/xlogical-1.0-8.tar.bz2 https://dev.gentoo.org/~ionen/distfiles/xlogical.png
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	22952d8f27cac191d75529d4c38e6bfa	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d563f853311c7b9f6ed1a5579a256b1d
+_md5_=339dcf5c728f59798c0ee46f00619f4b
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index 7af4f7191821..bebc6aa42ca5 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/mtavc-0.5-r2 b/metadata/md5-cache/games-server/mtavc-0.5-r2
index ae8edef731a0..2d0d5c948614 100644
--- a/metadata/md5-cache/games-server/mtavc-0.5-r2
+++ b/metadata/md5-cache/games-server/mtavc-0.5-r2
@@ -8,4 +8,4 @@ RDEPEND=sys-libs/libstdc++-v3:5
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=http://files.gonnaplay.com/201/MTAServer0_5-linux.tar.gz
-_md5_=fd1f6ce1bdc7f623a9f906cc7177aa62
+_md5_=19c24d29c8d673d4e5206c2ede84030b
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index 1a3498ad9af3..5812b20be9f8 100644
Binary files a/metadata/md5-cache/games-util/Manifest.gz and b/metadata/md5-cache/games-util/Manifest.gz differ
diff --git a/metadata/md5-cache/games-util/libstrangle-0.1.1_p20220222-r1 b/metadata/md5-cache/games-util/libstrangle-0.1.1_p20220222-r1
index 496eb355e570..b9d20e8db7cd 100644
--- a/metadata/md5-cache/games-util/libstrangle-0.1.1_p20220222-r1
+++ b/metadata/md5-cache/games-util/libstrangle-0.1.1_p20220222-r1
@@ -1,14 +1,14 @@
-DEFINED_PHASES=compile configure install postinst prepare test
+DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-util/vulkan-headers media-libs/libglvnd x11-base/xorg-proto x11-libs/libX11
 DESCRIPTION=Frame rate limiter for OpenGL/Vulkan
 EAPI=8
 HOMEPAGE=https://gitlab.com/torkel104/libstrangle/
-INHERIT=multilib multilib-minimal toolchain-funcs
-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
+INHERIT=multilib-minimal toolchain-funcs
+IUSE=+abi_x86_32 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-3+
 RDEPEND=sys-apps/grep[pcre] elibc_glibc? ( || ( >=sys-libs/glibc-2.36-r3[hash-sysv-compat] <sys-libs/glibc-2.36 ) )
 SLOT=0
 SRC_URI=https://gitlab.com/torkel104/libstrangle/-/archive/0273e318e3b0cc759155db8729ad74266b74cb9b/libstrangle-0.1.1_p20220222.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=acf3c0eac9cda23407d8b8b87b717711
+_md5_=161b68d810726a933df6826e4a3efdc9
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 06552e682d04..b1a35248d9d9 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/nemo-fileroller-5.2.0 b/metadata/md5-cache/gnome-extra/nemo-fileroller-5.2.0
index 5a683dfe05b3..f0aed831a0bf 100644
--- a/metadata/md5-cache/gnome-extra/nemo-fileroller-5.2.0
+++ b/metadata/md5-cache/gnome-extra/nemo-fileroller-5.2.0
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/glib-2.14.0 >=gnome-extra/nemo-2.0.0 app-arch/file-roller
 SLOT=0
 SRC_URI=https://github.com/linuxmint/nemo-extensions/archive/5.2.0.tar.gz -> nemo-extensions-5.2.0.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=41cd082386ce38257986cf81563bde8b
+_md5_=00973348ea538bb10ba0f0a8efd71db4
diff --git a/metadata/md5-cache/gnome-extra/yelp-42.2 b/metadata/md5-cache/gnome-extra/yelp-42.2
new file mode 100644
index 000000000000..c189264b7629
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/yelp-42.2
@@ -0,0 +1,15 @@
+BDEPEND=dev-libs/appstream-glib >=dev-util/gtk-doc-am-1.13 dev-util/glib-utils dev-util/itstool >=sys-devel/gettext-0.19.8 virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.67.4:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-41.0 >=net-libs/webkit-gtk-2.19.2:4 >=x11-libs/gtk+-3.13.3:3 >=gui-libs/libhandy-1.5.0:1 x11-themes/adwaita-icon-theme
+DESCRIPTION=Help browser for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Yelp
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=GPL-2+
+RDEPEND=app-arch/bzip2:= >=app-arch/xz-utils-4.9:= dev-db/sqlite:3= >=dev-libs/glib-2.67.4:2 >=dev-libs/libxml2-2.6.5:2 >=dev-libs/libxslt-1.1.4 >=gnome-extra/yelp-xsl-41.0 >=net-libs/webkit-gtk-2.19.2:4 >=x11-libs/gtk+-3.13.3:3 >=gui-libs/libhandy-1.5.0:1 x11-themes/adwaita-icon-theme
+SLOT=0
+SRC_URI=mirror://gnome/sources/yelp/42/yelp-42.2.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=0352f99e01c2d37174ece687eb886ab4
diff --git a/metadata/md5-cache/gnome-extra/yelp-xsl-42.1 b/metadata/md5-cache/gnome-extra/yelp-xsl-42.1
new file mode 100644
index 000000000000..964519b83c4f
--- /dev/null
+++ b/metadata/md5-cache/gnome-extra/yelp-xsl-42.1
@@ -0,0 +1,15 @@
+BDEPEND=>=dev-util/itstool-1.2.0 >=sys-devel/gettext-0.19.8 virtual/awk virtual/pkgconfig >=app-portage/elt-patches-20170815 app-arch/xz-utils
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare
+DEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
+DESCRIPTION=XSL stylesheets for yelp
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/yelp-xsl
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome2
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ LGPL-2.1+ MIT FDL-1.1+
+RDEPEND=>=dev-libs/libxml2-2.6.12:= >=dev-libs/libxslt-1.1.8:=
+SLOT=0
+SRC_URI=mirror://gnome/sources/yelp-xsl/42/yelp-xsl-42.1.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2	4f729d9211b2e3c00a285d6301a557e1	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=eb09c42a8468ae33b8c133c6cbe3183d
diff --git a/metadata/md5-cache/gui-wm/Manifest.gz b/metadata/md5-cache/gui-wm/Manifest.gz
index 6f86f3a9e83a..14d2d0c433d4 100644
Binary files a/metadata/md5-cache/gui-wm/Manifest.gz and b/metadata/md5-cache/gui-wm/Manifest.gz differ
diff --git a/metadata/md5-cache/gui-wm/gamescope-3.11.43 b/metadata/md5-cache/gui-wm/gamescope-3.11.43
deleted file mode 100644
index b639a0094468..000000000000
--- a/metadata/md5-cache/gui-wm/gamescope-3.11.43
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-util/glslang 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 postinst prepare test
-DEPEND==dev-libs/libliftoff-0.3* dev-libs/wayland >=dev-libs/wayland-protocols-1.17 =gui-libs/wlroots-0.15*[X] media-libs/libsdl2[video] media-libs/vulkan-loader sys-libs/libcap x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= ) dev-libs/stb dev-util/vulkan-headers
-DESCRIPTION=Efficient micro-compositor for running games
-EAPI=8
-HOMEPAGE=https://github.com/Plagman/gamescope
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=fcaps meson
-IUSE=pipewire +filecaps
-KEYWORDS=~amd64
-LICENSE=BSD-2
-RDEPEND==dev-libs/libliftoff-0.3* dev-libs/wayland >=dev-libs/wayland-protocols-1.17 =gui-libs/wlroots-0.15*[X] media-libs/libsdl2[video] media-libs/vulkan-loader sys-libs/libcap x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= )
-SLOT=0
-SRC_URI=https://github.com/Plagman/gamescope/archive/refs/tags/3.11.43.tar.gz -> gamescope-3.11.43.tar.gz
-_eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c286de624f1d91c0a73509bdf96af4cd
diff --git a/metadata/md5-cache/gui-wm/gamescope-3.11.45.2 b/metadata/md5-cache/gui-wm/gamescope-3.11.45.2
new file mode 100644
index 000000000000..9d5c84e5872b
--- /dev/null
+++ b/metadata/md5-cache/gui-wm/gamescope-3.11.45.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/glslang 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 postinst prepare test
+DEPEND==dev-libs/libliftoff-0.3* >=dev-libs/wayland-1.21 >=dev-libs/wayland-protocols-1.17 =gui-libs/wlroots-0.15*[X] media-libs/libsdl2[video] media-libs/vulkan-loader sys-libs/libcap >=x11-libs/libdrm-2.4.109 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= ) dev-libs/stb dev-util/vulkan-headers
+DESCRIPTION=Efficient micro-compositor for running games
+EAPI=8
+HOMEPAGE=https://github.com/Plagman/gamescope
+IDEPEND=filecaps? ( sys-libs/libcap )
+INHERIT=fcaps meson
+IUSE=pipewire +filecaps
+KEYWORDS=~amd64
+LICENSE=BSD-2
+RDEPEND==dev-libs/libliftoff-0.3* >=dev-libs/wayland-1.21 >=dev-libs/wayland-protocols-1.17 =gui-libs/wlroots-0.15*[X] media-libs/libsdl2[video] media-libs/vulkan-loader sys-libs/libcap >=x11-libs/libdrm-2.4.109 x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libXrender x11-libs/libXres x11-libs/libXtst x11-libs/libXxf86vm pipewire? ( >=media-video/pipewire-0.3:= )
+SLOT=0
+SRC_URI=https://github.com/Plagman/gamescope/archive/refs/tags/3.11.45-2.tar.gz -> gamescope-3.11.45.2.tar.gz
+_eclasses_=fcaps	babe6282ea5c195981bd302af1adaf3a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=08d559e9817f1f915e4cdc6f2ce733f2
diff --git a/metadata/md5-cache/mail-mta/Manifest.gz b/metadata/md5-cache/mail-mta/Manifest.gz
index f7695308520a..6269fa82b3d9 100644
Binary files a/metadata/md5-cache/mail-mta/Manifest.gz and b/metadata/md5-cache/mail-mta/Manifest.gz differ
diff --git a/metadata/md5-cache/mail-mta/protonmail-bridge-2.2.2 b/metadata/md5-cache/mail-mta/proton-mail-bridge-2.3.0
similarity index 80%
rename from metadata/md5-cache/mail-mta/protonmail-bridge-2.2.2
rename to metadata/md5-cache/mail-mta/proton-mail-bridge-2.3.0
index 4b818ece541c..3aa76e9c0897 100644
--- a/metadata/md5-cache/mail-mta/protonmail-bridge-2.2.2
+++ b/metadata/md5-cache/mail-mta/proton-mail-bridge-2.3.0
@@ -12,6 +12,6 @@ PROPERTIES=test_network
 RDEPEND=app-crypt/libsecret
 RESTRICT=test strip
 SLOT=0
-SRC_URI=https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v2.2.2.tar.gz -> protonmail-bridge-2.2.2.tar.gz https://dev.gentoo.org/~marecki/dists/mail-mta/protonmail-bridge/protonmail-bridge-2.2.2-deps.tar.xz
+SRC_URI=https://github.com/ProtonMail/proton-bridge/archive/refs/tags/v2.3.0.tar.gz -> proton-mail-bridge-2.3.0.tar.gz https://dev.gentoo.org/~marecki/dists/mail-mta/proton-mail-bridge/proton-mail-bridge-2.3.0-deps.tar.xz
 _eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=2d808b394b98dcf04ff0a59308bca1dc
+_md5_=42a322da07d9a2db8c0829471733c6f0
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index 76e7da8b0b9d..59248c22173d 100644
Binary files a/metadata/md5-cache/media-gfx/Manifest.gz and b/metadata/md5-cache/media-gfx/Manifest.gz differ
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.38 b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.38
deleted file mode 100644
index 7fa80fd258ea..000000000000
--- a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.38
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-bobfriesenhahn ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=dev-libs/libltdl bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) heif? ( media-libs/libheif:= ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( virtual/jpeg ) 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 ) 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/libXext ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Collection of tools and libraries for many image formats
-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 threads tiff truetype webp wmf X zlib verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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? ( virtual/jpeg ) 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 ) 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/libXext ) zlib? ( sys-libs/zlib )
-SLOT=0/1.3
-SRC_URI=mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.38.tar.xz verify-sig? ( mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.38.tar.xz.sig )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=1122ae5cd3cc194dbe4ce571a46917d5
diff --git a/metadata/md5-cache/media-gfx/sxiv-26 b/metadata/md5-cache/media-gfx/sxiv-26
index 83e17929be49..2b80fd870ece 100644
--- a/metadata/md5-cache/media-gfx/sxiv-26
+++ b/metadata/md5-cache/media-gfx/sxiv-26
@@ -6,9 +6,9 @@ HOMEPAGE=https://github.com/muennich/sxiv/
 INHERIT=desktop xdg-utils savedconfig toolchain-funcs
 IUSE=exif gif +jpeg +png webp savedconfig
 KEYWORDS=amd64 arm64 ppc64 ~riscv x86
-LICENSE=GPL-2
+LICENSE=GPL-2+ public-domain
 RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?,jpeg?,png?,webp?] x11-libs/libX11 x11-libs/libXft
 SLOT=0
 SRC_URI=https://github.com/muennich/sxiv/archive/v26.tar.gz -> sxiv-26.tar.gz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	multilib	5ca4e49abed8e3a2f7b56920eadee157	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=cdf6bc6f593e90f8ec46b6b45262cef8
+_md5_=d3dcc6fd8e19b79ff832e6230c5be09e
diff --git a/metadata/md5-cache/media-gfx/sxiv-9999 b/metadata/md5-cache/media-gfx/sxiv-9999
index 6b61fbe65820..325b0706fdcd 100644
--- a/metadata/md5-cache/media-gfx/sxiv-9999
+++ b/metadata/md5-cache/media-gfx/sxiv-9999
@@ -6,9 +6,9 @@ EAPI=7
 HOMEPAGE=https://github.com/muennich/sxiv/
 INHERIT=desktop xdg-utils savedconfig toolchain-funcs git-r3
 IUSE=exif gif +jpeg +png webp savedconfig
-LICENSE=GPL-2
+LICENSE=GPL-2+ public-domain
 PROPERTIES=live
 RDEPEND=exif? ( media-libs/libexif ) gif? ( media-libs/giflib:0= ) media-libs/imlib2[X,gif?,jpeg?,png?,webp?] x11-libs/libX11 x11-libs/libXft
 SLOT=0
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multilib	5ca4e49abed8e3a2f7b56920eadee157	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c40816a169c777c0cf47328c349c6e27
+_md5_=fce12c50ca4a37fefca30121194d9f21
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 46c6ed7ceeb6..1e385b887bc6 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/libcdaudio-0.99.12-r4 b/metadata/md5-cache/media-libs/libcdaudio-0.99.12-r4
new file mode 100644
index 000000000000..f28d67a968c4
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libcdaudio-0.99.12-r4
@@ -0,0 +1,9 @@
+DEFINED_PHASES=configure install
+DESCRIPTION=Library of cd audio related routines
+EAPI=7
+HOMEPAGE=http://libcdaudio.sourceforge.net/
+KEYWORDS=~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=mirror://sourceforge/libcdaudio/libcdaudio-0.99.12.tar.gz
+_md5_=075cfa51dcf14931c880f0e1a6fc5566
diff --git a/metadata/md5-cache/media-libs/mesa-22.1.7 b/metadata/md5-cache/media-libs/mesa-22.1.7
index 921a9329f776..949bade443cc 100644
--- a/metadata/md5-cache/media-libs/mesa-22.1.7
+++ b/metadata/md5-cache/media-libs/mesa-22.1.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 INHERIT=llvm meson-multilib python-any-r1 linux-info
 IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +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
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
 RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.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(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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.18.0:=[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/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.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/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/libXxf86vm-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(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:14[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:13[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-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:14[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:13[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-15:=[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=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://archive.mesa3d.org/mesa-22.1.7.tar.xz
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8325aaf8447af95188265e160c7c658e
+_md5_=08777dc2a7f14687fa13358a56dd10ef
diff --git a/metadata/md5-cache/media-libs/mesa-22.1.3 b/metadata/md5-cache/media-libs/mesa-22.2.0
similarity index 78%
rename from metadata/md5-cache/media-libs/mesa-22.1.3
rename to metadata/md5-cache/media-libs/mesa-22.2.0
index 4511d5659f4f..8d0732c93a8a 100644
--- a/metadata/md5-cache/media-libs/mesa-22.1.3
+++ b/metadata/md5-cache/media-libs/mesa-22.2.0
@@ -1,17 +1,17 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( 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 pretend setup test
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.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(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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.18.0:=[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/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.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/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/libXxf86vm-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(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:14[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:13[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:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:14[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:13[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:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+DEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.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(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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.18.0:=[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/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.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/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/libXxf86vm-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(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:15[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(-)] sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:15[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(-)] sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:15[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(-)] sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:15[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:14[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:13[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-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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:15[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(-)] sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:15[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(-)] sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:15[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(-)] sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:15[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:14[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:13[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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) video_cards_d3d12? ( dev-util/directx-headers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=8
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
 INHERIT=llvm meson-multilib python-any-r1 linux-info
-IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +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
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
+IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +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
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~sparc-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.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(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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.18.0:=[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/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.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/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/libXxf86vm-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(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] sys-devel/clang:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/clang-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:14[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:13[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:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/clang-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] sys-devel/llvm:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,llvm_targets_AMDGPU(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:14[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:13[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:12[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) <sys-devel/llvm-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.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(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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.18.0:=[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/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.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/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/libXxf86vm-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(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:15[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(-)] sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:15[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(-)] sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:15[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(-)] sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:15[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:14[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:13[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-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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:15[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(-)] sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:15[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(-)] sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:15[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(-)] sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:15[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:14[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:13[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:=[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=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
 RESTRICT=!test? ( test )
 SLOT=0
-SRC_URI=https://archive.mesa3d.org/mesa-22.1.3.tar.xz
+SRC_URI=https://archive.mesa3d.org/mesa-22.2.0.tar.xz
 _eclasses_=linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e7355e4797d4b515b30754bcfb43f167
+_md5_=b07851b19207b580e444feff01bcc9b1
diff --git a/metadata/md5-cache/media-libs/mesa-9999 b/metadata/md5-cache/media-libs/mesa-9999
index c688f1a6dbef..aae41ff3b667 100644
--- a/metadata/md5-cache/media-libs/mesa-9999
+++ b/metadata/md5-cache/media-libs/mesa-9999
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) opencl? ( >=sys-devel/gcc-4.6 ) sys-devel/bison sys-devel/flex virtual/pkgconfig || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/mako-0.8.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/mako-0.8.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/mako-0.8.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/mako-0.8.0[python_targets_python3_8(-)] ) ) wayland? ( dev-util/wayland-scanner ) >=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 pretend setup test unpack
-DEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.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(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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.18.0:=[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/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.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/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/libXxf86vm-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(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:14[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:13[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-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:14[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:13[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-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) video_cards_d3d12? ( dev-util/directx-headers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
+DEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.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(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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.18.0:=[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/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.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/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/libXxf86vm-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(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:15[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(-)] sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:15[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(-)] sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:15[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(-)] sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:15[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:14[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:13[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-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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:15[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(-)] sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:15[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(-)] sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:15[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(-)] sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:15[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:14[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:13[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:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) ) video_cards_d3d12? ( dev-util/directx-headers[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) valgrind? ( dev-util/valgrind ) wayland? ( >=dev-libs/wayland-protocols-1.24 ) X? ( x11-libs/libXrandr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-base/xorg-proto ) !!sys-devel/llvm:0
 DESCRIPTION=OpenGL-like graphic library for Linux
 EAPI=8
 HOMEPAGE=https://www.mesa3d.org/ https://mesa.freedesktop.org/
@@ -8,9 +8,9 @@ INHERIT=llvm meson-multilib python-any-r1 linux-info git-r3
 IUSE=video_cards_r300 video_cards_r600 video_cards_radeon video_cards_radeonsi video_cards_d3d12 video_cards_freedreno video_cards_intel video_cards_lima video_cards_nouveau video_cards_panfrost video_cards_v3d video_cards_vc4 video_cards_virgl video_cards_vivante video_cards_vmware cpu_flags_x86_sse2 d3d9 debug gles1 +gles2 +llvm lm-sensors opencl osmesa +proprietary-codecs selinux test unwind vaapi valgrind vdpau vulkan vulkan-overlay wayland +X xa xvmc zink +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
 LICENSE=MIT
 PROPERTIES=live
-RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.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(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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.18.0:=[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/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.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/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/libXxf86vm-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(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:14[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:13[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-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-15:=[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(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:14[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:13[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-15:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) ) ) )
+RDEPEND=>=dev-libs/expat-2.1.0-r3:=[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/libglvnd-1.3.2[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(-)?] >=sys-libs/zlib-1.2.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(-)?] unwind? ( sys-libs/libunwind[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm? ( video_cards_radeonsi? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_r600? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) video_cards_radeon? ( virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) lm-sensors? ( sys-apps/lm-sensors:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) opencl? ( >=virtual/opencl-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(-)?] dev-libs/libclc virtual/libelf:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) vaapi? ( >=x11-libs/libva-1.7.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(-)?] ) vdpau? ( >=x11-libs/libvdpau-1.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(-)?] ) xvmc? ( >=x11-libs/libXvMC-1.0.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(-)?] ) selinux? ( sys-libs/libselinux[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.18.0:=[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/libdrm-2.4.110[video_cards_freedreno?,video_cards_intel?,video_cards_nouveau?,video_cards_vc4?,video_cards_vivante?,video_cards_vmware?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] vulkan-overlay? ( dev-util/glslang:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) X? ( >=x11-libs/libX11-1.6.2:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libxshmfence-1.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/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/libXxf86vm-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(-)?] >=x11-libs/libxcb-1.13:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] x11-libs/libXfixes:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zink? ( media-libs/vulkan-loader:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) 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(-)?] ) video_cards_r300? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_r600? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeon? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_radeon] ) video_cards_radeonsi? ( >=x11-libs/libdrm-2.4.110[video_cards_amdgpu] ) llvm? ( opencl? ( video_cards_r600? ( || ( sys-devel/clang:15[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(-)] sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/clang:15[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(-)] sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/clang:15[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(-)] sys-devel/clang:14[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(-)] sys-devel/clang:13[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(-)] ) <sys-devel/clang-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/clang:15[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:14[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:13[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-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(-)?] ) ) ) ) !opencl? ( video_cards_r600? ( || ( sys-devel/llvm:15[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(-)] sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-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(-)?,llvm_targets_AMDGPU(-)] ) !video_cards_r600? ( video_cards_radeonsi? ( || ( sys-devel/llvm:15[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(-)] sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-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(-)?,llvm_targets_AMDGPU(-)] ) ) !video_cards_r600? ( !video_cards_radeonsi? ( video_cards_radeon? ( || ( sys-devel/llvm:15[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(-)] sys-devel/llvm:14[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(-)] sys-devel/llvm:13[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(-)] ) <sys-devel/llvm-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(-)?,llvm_targets_AMDGPU(-)] ) ) ) !video_cards_r600? ( !video_cards_radeon? ( !video_cards_radeonsi? ( || ( sys-devel/llvm:15[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:14[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:13[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:=[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=d3d9? ( || ( video_cards_intel video_cards_r300 video_cards_r600 video_cards_radeonsi video_cards_nouveau video_cards_vmware ) ) vulkan? ( video_cards_radeonsi? ( llvm ) ) vulkan-overlay? ( vulkan ) video_cards_radeon? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_r300? ( x86? ( llvm ) amd64? ( llvm ) ) video_cards_radeonsi? ( llvm ) xa? ( X ) xvmc? ( X ) zink? ( vulkan )
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7c515752f39f2556e54b8d6449531de8
+_md5_=b07851b19207b580e444feff01bcc9b1
diff --git a/metadata/md5-cache/media-libs/openal-1.22.2 b/metadata/md5-cache/media-libs/openal-1.22.2
deleted file mode 100644
index 82135e657870..000000000000
--- a/metadata/md5-cache/media-libs/openal-1.22.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) oss? ( virtual/os-headers )
-DESCRIPTION=A software implementation of the OpenAL 3D audio API
-EAPI=8
-HOMEPAGE=https://www.openal-soft.org/
-INHERIT=cmake-multilib
-IUSE=alsa coreaudio debug jack oss portaudio pulseaudio sdl sndio qt5 cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux
-LICENSE=LGPL-2+ BSD
-RDEPEND=alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jack? ( virtual/jack[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) portaudio? ( media-libs/portaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pulseaudio? ( media-sound/pulseaudio[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) sdl? ( media-libs/libsdl2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sndio? ( media-sound/sndio:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://www.openal-soft.org/openal-releases/openal-soft-1.22.2.tar.bz2
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=790200b86007d0b6c705380e84f5d840
diff --git a/metadata/md5-cache/media-libs/suil-0.10.12 b/metadata/md5-cache/media-libs/suil-0.10.12
deleted file mode 100644
index a6204c2f1d29..000000000000
--- a/metadata/md5-cache/media-libs/suil-0.10.12
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx dev-python/sphinx_lv2_theme )
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=media-libs/lv2 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) || ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] >=dev-lang/python-3.10.4:3.10[threads(+)] >=dev-lang/python-3.9.12:3.9[threads(+)] >=dev-lang/python-3.8.13:3.8[threads(+)] )
-DESCRIPTION=Lightweight C library for loading and wrapping LV2 plugin UIs
-EAPI=7
-HOMEPAGE=http://drobilla.net/software/suil/
-INHERIT=python-any-r1 waf-utils
-IUSE=doc gtk qt5
-KEYWORDS=amd64 ~arm64 ppc ppc64 ~riscv x86
-LICENSE=ISC
-RDEPEND=media-libs/lv2 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 )
-SLOT=0
-SRC_URI=http://download.drobilla.net/suil-0.10.12.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	waf-utils	e8ae5118de0d41a51336b4317cdcd2d5
-_md5_=c5bd6f53cb6392abef7f7133cc22ffa8
diff --git a/metadata/md5-cache/media-libs/suil-0.10.14 b/metadata/md5-cache/media-libs/suil-0.10.14
deleted file mode 100644
index 8f29bba530fe..000000000000
--- a/metadata/md5-cache/media-libs/suil-0.10.14
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen dev-python/sphinx dev-python/sphinx_lv2_theme ) >=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=media-libs/lv2 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 ) || ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] >=dev-lang/python-3.10.4:3.10[threads(+)] >=dev-lang/python-3.9.12:3.9[threads(+)] >=dev-lang/python-3.8.13:3.8[threads(+)] )
-DESCRIPTION=Lightweight C library for loading and wrapping LV2 plugin UIs
-EAPI=8
-HOMEPAGE=http://drobilla.net/software/suil/
-INHERIT=meson python-any-r1
-IUSE=doc gtk qt5
-KEYWORDS=~amd64 ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=ISC
-RDEPEND=media-libs/lv2 gtk? ( x11-libs/gtk+:2 ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 )
-SLOT=0
-SRC_URI=http://download.drobilla.net/suil-0.10.14.tar.xz
-_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2f07dd609107e0821be5efe3baaf7f2b
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index b2027dc302b6..80cae7e9b2b5 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/darkice-1.4 b/metadata/md5-cache/media-sound/darkice-1.4
index 7beb19d60651..ddfa65ccce32 100644
--- a/metadata/md5-cache/media-sound/darkice-1.4
+++ b/metadata/md5-cache/media-sound/darkice-1.4
@@ -1,15 +1,15 @@
 DEFINED_PHASES=configure install
-DEPEND=aac? ( media-libs/faac ) aacplus? ( media-libs/libaacplus ) alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mp3? ( media-sound/lame ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis )
+DEPEND=aac? ( media-libs/faac ) alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mp3? ( media-sound/lame ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis )
 DESCRIPTION=A live audio streamer
 EAPI=7
 HOMEPAGE=http://www.darkice.org/
 INHERIT=flag-o-matic
-IUSE=aac aacplus alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis
+IUSE=aac alsa debug jack libsamplerate mp3 opus pulseaudio twolame vorbis
 KEYWORDS=amd64 ~hppa ppc sparc x86
 LICENSE=GPL-3
-RDEPEND=aac? ( media-libs/faac ) aacplus? ( media-libs/libaacplus ) alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mp3? ( media-sound/lame ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis )
-REQUIRED_USE=|| ( aac aacplus mp3 opus twolame vorbis ) || ( alsa jack pulseaudio )
+RDEPEND=aac? ( media-libs/faac ) alsa? ( media-libs/alsa-lib ) jack? ( virtual/jack ) libsamplerate? ( media-libs/libsamplerate ) mp3? ( media-sound/lame ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) twolame? ( media-sound/twolame ) vorbis? ( media-libs/libvorbis )
+REQUIRED_USE=|| ( aac mp3 opus twolame vorbis ) || ( alsa jack pulseaudio )
 SLOT=0
 SRC_URI=https://github.com/rafael2k/darkice/releases/download/v1.4/darkice-1.4.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=4413780dd25fe3b6480566324f59e19d
+_md5_=03abdbfeccfaa7a964c73f4de8c26228
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.9.1-r2 b/metadata/md5-cache/media-sound/deadbeef-1.9.1-r2
index ca95df1d30f5..e87da8ac349b 100644
--- a/metadata/md5-cache/media-sound/deadbeef-1.9.1-r2
+++ b/metadata/md5-cache/media-sound/deadbeef-1.9.1-r2
@@ -13,4 +13,4 @@ REQUIRED_USE=|| ( alsa oss pulseaudio nullout )
 SLOT=0
 SRC_URI=mirror://sourceforge/deadbeef/deadbeef-1.9.1.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	7ce00136a77130df46fbbd5966f98a61	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a384314d0a0959f282c3bfc6bbd783ef
+_md5_=a1d4fa3a7c3b498627bf1a267cce360a
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.9.1-r3 b/metadata/md5-cache/media-sound/deadbeef-1.9.1-r3
new file mode 100644
index 000000000000..3885bd52a649
--- /dev/null
+++ b/metadata/md5-cache/media-sound/deadbeef-1.9.1-r3
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/intltool sys-devel/gettext sys-devel/clang sys-devel/llvm virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install postinst postrm preinst prepare
+DEPEND=x11-libs/gtk+:3 net-misc/curl:= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:= media-libs/libcddb dev-libs/libcdio-paranoia:= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:= media-libs/libogg ) libsamplerate? ( media-libs/libsamplerate ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-libs/libdispatch
+DESCRIPTION=DeaDBeeF is a modular audio player similar to foobar2000
+EAPI=8
+HOMEPAGE=https://deadbeef.sourceforge.io/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools xdg flag-o-matic toolchain-funcs plocale
+IUSE=aac alsa cdda converter cover dts ffmpeg flac +hotkeys lastfm libsamplerate mp3 musepack nls notify +nullout opus oss pulseaudio sc68 shellexec +supereq threads vorbis wavpack
+KEYWORDS=~amd64 ~riscv ~x86
+LICENSE=GPL-2 LGPL-2.1 wavpack? ( BSD )
+RDEPEND=x11-libs/gtk+:3 net-misc/curl:= dev-libs/jansson:= aac? ( media-libs/faad2 ) alsa? ( media-libs/alsa-lib ) cdda? ( dev-libs/libcdio:= media-libs/libcddb dev-libs/libcdio-paranoia:= ) cover? ( media-libs/imlib2[jpeg,png] ) dts? ( media-libs/libdca ) ffmpeg? ( media-video/ffmpeg ) flac? ( media-libs/flac:= media-libs/libogg ) libsamplerate? ( media-libs/libsamplerate ) mp3? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) nls? ( virtual/libintl ) notify? ( sys-apps/dbus ) opus? ( media-libs/opusfile ) pulseaudio? ( media-sound/pulseaudio ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) dev-libs/libdispatch
+REQUIRED_USE=|| ( alsa oss pulseaudio nullout )
+SLOT=0
+SRC_URI=mirror://sourceforge/deadbeef/deadbeef-1.9.1.tar.bz2
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	7ce00136a77130df46fbbd5966f98a61	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d054ec8f2e7d62eca2074edc4f761eb3
diff --git a/metadata/md5-cache/media-sound/picard-2.8.3 b/metadata/md5-cache/media-sound/picard-2.8.3
index f9893393df4c..4f54bf6f1fe5 100644
--- a/metadata/md5-cache/media-sound/picard-2.8.3
+++ b/metadata/md5-cache/media-sound/picard-2.8.3
@@ -6,7 +6,7 @@ HOMEPAGE=https://picard.musicbrainz.org
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=distutils-r1 xdg
 IUSE=discid fingerprints nls test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=GPL-2+
 RDEPEND=python_single_target_python3_8? ( dev-python/fasteners[python_targets_python3_8(-)] dev-python/pyjwt[python_targets_python3_8(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_8(-)] dev-python/python-dateutil[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] media-libs/mutagen[python_targets_python3_8(-)] discid? ( dev-python/python-discid[python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( dev-python/fasteners[python_targets_python3_9(-)] dev-python/pyjwt[python_targets_python3_9(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_9(-)] dev-python/python-dateutil[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] media-libs/mutagen[python_targets_python3_9(-)] discid? ( dev-python/python-discid[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/fasteners[python_targets_python3_10(-)] dev-python/pyjwt[python_targets_python3_10(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_10(-)] dev-python/python-dateutil[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] media-libs/mutagen[python_targets_python3_10(-)] discid? ( dev-python/python-discid[python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( dev-python/fasteners[python_targets_python3_11(-)] dev-python/pyjwt[python_targets_python3_11(-)] dev-python/PyQt5[declarative,gui,network,widgets,python_targets_python3_11(-)] dev-python/python-dateutil[python_targets_python3_11(-)] dev-python/pyyaml[python_targets_python3_11(-)] media-libs/mutagen[python_targets_python3_11(-)] discid? ( dev-python/python-discid[python_targets_python3_11(-)] ) ) fingerprints? ( media-libs/chromaprint[tools] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://musicbrainz.osuosl.org/pub/musicbrainz/picard/picard-2.8.3.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=b797b95e1db812044312590362655326
+_md5_=ecb1c928511693d2110359d374a76de0
diff --git a/metadata/md5-cache/media-sound/rawrec-0.9.991 b/metadata/md5-cache/media-sound/rawrec-0.9.991
index b037ab0127d3..91f3ce39984f 100644
--- a/metadata/md5-cache/media-sound/rawrec-0.9.991
+++ b/metadata/md5-cache/media-sound/rawrec-0.9.991
@@ -2,10 +2,10 @@ DEFINED_PHASES=configure install
 DESCRIPTION=CLI program to play and record audiofiles
 EAPI=7
 HOMEPAGE=http://rawrec.sourceforge.net
-INHERIT=flag-o-matic toolchain-funcs
+INHERIT=toolchain-funcs
 KEYWORDS=~alpha amd64 ppc ppc64 sparc x86
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://sourceforge/rawrec/rawrec-0.9.991.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=784188e9ed9b40108944595c460c8beb
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f4893c6981d629bc2eb172d07149c461
diff --git a/metadata/md5-cache/media-sound/sndio-1.8.0-r1 b/metadata/md5-cache/media-sound/sndio-1.8.0-r1
index bbbb134bca87..77f637d7fb88 100644
--- a/metadata/md5-cache/media-sound/sndio-1.8.0-r1
+++ b/metadata/md5-cache/media-sound/sndio-1.8.0-r1
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=http://www.sndio.org/
 INHERIT=multilib-minimal toolchain-funcs
 IUSE=alsa 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 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ppc ppc64 ~riscv ~sparc x86
 LICENSE=ISC
 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(-)?] alsa? ( media-libs/alsa-lib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) acct-user/sndiod
 SLOT=0/7.1
 SRC_URI=http://www.sndio.org/sndio-1.8.0.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=48a0a5563829b63cb052c48e1954ed76
+_md5_=945481d9534c104fdf5f7b338bd19ed7
diff --git a/metadata/md5-cache/media-sound/zynaddsubfx-3.0.5 b/metadata/md5-cache/media-sound/zynaddsubfx-3.0.5
deleted file mode 100644
index a1eabbcbbf88..000000000000
--- a/metadata/md5-cache/media-sound/zynaddsubfx-3.0.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig doc? ( app-doc/doxygen ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/mxml-2.2.1 media-libs/liblo sci-libs/fftw:3.0 sys-libs/zlib alsa? ( media-libs/alsa-lib ) dssi? ( media-libs/dssi ) fltk? ( >=x11-libs/fltk-1.3:1 x11-libs/libX11 x11-libs/libXpm ) jack? ( virtual/jack ) lash? ( media-sound/lash ) portaudio? ( media-libs/portaudio )
-DESCRIPTION=Software synthesizer capable of making a countless number of instruments
-EAPI=7
-HOMEPAGE=http://zynaddsubfx.sourceforge.net/
-INHERIT=cmake flag-o-matic
-IUSE=alsa doc dssi +fltk jack lash portaudio
-KEYWORDS=amd64 ~ppc x86
-LICENSE=GPL-2
-RDEPEND=>=dev-libs/mxml-2.2.1 media-libs/liblo sci-libs/fftw:3.0 sys-libs/zlib alsa? ( media-libs/alsa-lib ) dssi? ( media-libs/dssi ) fltk? ( >=x11-libs/fltk-1.3:1 x11-libs/libX11 x11-libs/libXpm ) jack? ( virtual/jack ) lash? ( media-sound/lash ) portaudio? ( media-libs/portaudio )
-REQUIRED_USE=|| ( alsa jack portaudio )
-SLOT=0
-SRC_URI=mirror://sourceforge/zynaddsubfx/zynaddsubfx-3.0.5.tar.bz2
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=4b3d11045c4964be3ccf916b488104e1
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index cc4a0891a1fb..956cbde9ee18 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/wireshark-3.6.2 b/metadata/md5-cache/net-analyzer/wireshark-3.6.2
deleted file mode 100644
index f6129f2a9c2b..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-3.6.2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( dev-python/pytest dev-python/pytest-xdist ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=8
-HOMEPAGE=https://www.wireshark.org/
-IDEPEND=filecaps? ( sys-libs/libcap )
-INHERIT=fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
-IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86
-LICENSE=GPL-2
-RDEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins )
-RESTRICT=!test? ( test )
-SLOT=0/3.6.2
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.6.2.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=27709fb516afcc709d5b9e87ebac4498
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.6.5 b/metadata/md5-cache/net-analyzer/wireshark-3.6.5
deleted file mode 100644
index f3f6a33360ce..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-3.6.5
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pytest[python_targets_python3_8(-)] dev-python/pytest-xdist[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=8
-HOMEPAGE=https://www.wireshark.org/
-IDEPEND=filecaps? ( sys-libs/libcap ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins )
-RESTRICT=!test? ( test )
-SLOT=0/3.6.5
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.6.5.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0d5af4071eec1154cdf912162b0358a9
diff --git a/metadata/md5-cache/net-analyzer/wireshark-3.6.7 b/metadata/md5-cache/net-analyzer/wireshark-3.6.7
deleted file mode 100644
index 0a880010b7d9..000000000000
--- a/metadata/md5-cache/net-analyzer/wireshark-3.6.7
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) dev-lang/perl sys-devel/flex sys-devel/gettext virtual/pkgconfig doc? ( app-doc/doxygen dev-ruby/asciidoctor ) qt5? ( dev-qt/linguist-tools:5 ) test? ( || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/pytest[python_targets_python3_10(-)] dev-python/pytest-xdist[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pytest[python_targets_python3_9(-)] dev-python/pytest-xdist[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pytest[python_targets_python3_8(-)] dev-python/pytest-xdist[python_targets_python3_8(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
-DESCRIPTION=A network protocol analyzer formerly known as ethereal
-EAPI=8
-HOMEPAGE=https://www.wireshark.org/
-IDEPEND=filecaps? ( sys-libs/libcap ) dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-IUSE=androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd +filecaps +lua_single_target_lua5-1
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/pcap >=dev-libs/glib-2.38:2 >=net-dns/c-ares-1.5:= dev-libs/libgcrypt:= media-libs/speexdsp bcg729? ( media-libs/bcg729 ) brotli? ( app-arch/brotli:= ) ciscodump? ( >=net-libs/libssh-0.6 ) filecaps? ( sys-libs/libcap ) http2? ( net-libs/nghttp2:= ) ilbc? ( media-libs/libilbc ) kerberos? ( virtual/krb5 ) libxml2? ( dev-libs/libxml2 ) lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) lz4? ( app-arch/lz4:= ) maxminddb? ( dev-libs/libmaxminddb:= ) minizip? ( sys-libs/zlib[minizip] ) netlink? ( dev-libs/libnl:3 ) opus? ( media-libs/opus ) pcap? ( net-libs/libpcap ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 x11-misc/xdg-utils ) sbc? ( media-libs/sbc ) sdjournal? ( sys-apps/systemd ) smi? ( net-libs/libsmi ) snappy? ( app-arch/snappy ) spandsp? ( media-libs/spandsp ) sshdump? ( >=net-libs/libssh-0.6 ) ssl? ( net-libs/gnutls:= ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= ) qt5? ( virtual/freedesktop-icon-theme ) selinux? ( sec-policy/selinux-wireshark )
-REQUIRED_USE=lua? ( ^^ ( lua_single_target_lua5-1 ) ) plugin-ifdemo? ( plugins )
-RESTRICT=!test? ( test )
-SLOT=0/3.6.7
-SRC_URI=https://www.wireshark.org/download/src/all-versions/wireshark-3.6.7.tar.xz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	fcaps	babe6282ea5c195981bd302af1adaf3a	flag-o-matic	29a755b1291d64133634d80b0328f153	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0d5af4071eec1154cdf912162b0358a9
diff --git a/metadata/md5-cache/net-analyzer/zabbix-4.0.44 b/metadata/md5-cache/net-analyzer/zabbix-4.0.44
new file mode 100644
index 000000000000..4a511845e3b6
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-4.0.44
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig 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 ) mbedtls? ( net-libs/mbedtls:0= ) 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 ) xmpp? ( dev-libs/iksemel ) 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 toolchain-funcs tmpfiles user-info
+IUSE=+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static xmpp 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 ) mbedtls? ( net-libs/mbedtls:0= ) 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 ) xmpp? ( dev-libs/iksemel ) 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 frontend proxy server ) ?? ( gnutls mbedtls openssl ) proxy? ( ^^ ( mysql oracle postgres sqlite ) ) server? ( ^^ ( mysql oracle postgres ) !sqlite ) static? ( !oracle !snmp )
+SLOT=0/4.0
+SRC_URI=https://cdn.zabbix.com/zabbix/sources/stable/4.0/zabbix-4.0.44.tar.gz
+_eclasses_=java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	user-info	69a1ed744ec33cf2c910ff2bd6084d11	webapp	67df5bab481d0b9428f9ab7b3de690e4
+_md5_=e5a47bf7096a357ec6d711f6cdb1e2d9
diff --git a/metadata/md5-cache/net-analyzer/zabbix-5.0.28 b/metadata/md5-cache/net-analyzer/zabbix-5.0.28
new file mode 100644
index 000000000000..fa09af1ed4bb
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-5.0.28
@@ -0,0 +1,17 @@
+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.28.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-5.0.28-go-deps.tar.xz )
+_eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	user-info	69a1ed744ec33cf2c910ff2bd6084d11	webapp	67df5bab481d0b9428f9ab7b3de690e4
+_md5_=94de55f9e697c405a82ad7d8e34e782e
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.0.9 b/metadata/md5-cache/net-analyzer/zabbix-6.0.9
new file mode 100644
index 000000000000..43275199afd6
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.0.9
@@ -0,0 +1,17 @@
+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.9.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.0.9-go-deps.tar.xz )
+_eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	user-info	69a1ed744ec33cf2c910ff2bd6084d11	webapp	67df5bab481d0b9428f9ab7b3de690e4
+_md5_=e9793a98c4fe53cc5c4105f0e4cf0481
diff --git a/metadata/md5-cache/net-analyzer/zabbix-6.2.3 b/metadata/md5-cache/net-analyzer/zabbix-6.2.3
new file mode 100644
index 000000000000..7d307e621af8
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/zabbix-6.2.3
@@ -0,0 +1,17 @@
+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.3.tar.gz agent2? ( https://dev.gentoo.org/~fordfrog/distfiles/zabbix-6.2.3-go-deps.tar.xz )
+_eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	user-info	69a1ed744ec33cf2c910ff2bd6084d11	webapp	67df5bab481d0b9428f9ab7b3de690e4
+_md5_=e9793a98c4fe53cc5c4105f0e4cf0481
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index c4693da4cd46..362be20838d7 100644
Binary files a/metadata/md5-cache/net-firewall/Manifest.gz and b/metadata/md5-cache/net-firewall/Manifest.gz differ
diff --git a/metadata/md5-cache/net-firewall/iptables-1.8.7-r2 b/metadata/md5-cache/net-firewall/iptables-1.8.7-r2
deleted file mode 100644
index 1f9a265a0653..000000000000
--- a/metadata/md5-cache/net-firewall/iptables-1.8.7-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=app-eselect/eselect-iptables-20220320 virtual/pkgconfig nftables? ( sys-devel/flex virtual/yacc ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst prepare prerm
-DEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:0= >=net-libs/libnftnl-1.1.6:0= ) pcap? ( net-libs/libpcap ) virtual/os-headers >=sys-kernel/linux-headers-4.4:0
-DESCRIPTION=Linux kernel (2.4+) firewall, NAT and packet mangling tools
-EAPI=7
-HOMEPAGE=https://www.netfilter.org/projects/iptables/
-INHERIT=systemd toolchain-funcs autotools flag-o-matic usr-ldscript
-IUSE=conntrack netlink nftables pcap static-libs split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 ) netlink? ( net-libs/libnfnetlink ) nftables? ( >=net-libs/libmnl-1.0:0= >=net-libs/libnftnl-1.1.6:0= ) pcap? ( net-libs/libpcap ) >=app-eselect/eselect-iptables-20220320 nftables? ( net-misc/ethertypes ) !<net-firewall/ebtables-2.0.11-r1 !<net-firewall/arptables-0.0.5-r1
-SLOT=0/1.8.3
-SRC_URI=https://www.netfilter.org/projects/iptables/files/iptables-1.8.7.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=7ebf0ec47d8793b2949d1cf04c10acca
diff --git a/metadata/md5-cache/net-fs/Manifest.gz b/metadata/md5-cache/net-fs/Manifest.gz
index a9d5a9217c4e..02344a105b58 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/nfs-utils-2.6.2 b/metadata/md5-cache/net-fs/nfs-utils-2.6.2
deleted file mode 100644
index 45a245dfc017..000000000000
--- a/metadata/md5-cache/net-fs/nfs-utils-2.6.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=net-libs/rpcsvc-proto virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap:= sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-db/sqlite:3 dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) elibc_musl? ( sys-libs/queue-standalone )
-DESCRIPTION=NFS client and server daemons
-EAPI=8
-HOMEPAGE=http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git
-INHERIT=autotools linux-info systemd
-IUSE=caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/libxml2 net-libs/libtirpc:= >=net-nds/rpcbind-0.2.4 sys-fs/e2fsprogs caps? ( sys-libs/libcap ) ldap? ( net-nds/openldap:= sasl? ( app-crypt/mit-krb5 dev-libs/cyrus-sasl:2 ) ) libmount? ( sys-apps/util-linux ) nfsv4? ( dev-db/sqlite:3 dev-libs/libevent:= >=sys-apps/keyutils-1.5.9:= kerberos? ( >=net-libs/libtirpc-0.2.4-r1[kerberos] app-crypt/mit-krb5 ) ) nfsv41? ( sys-fs/lvm2 ) tcpd? ( sys-apps/tcp-wrappers ) uuid? ( sys-apps/util-linux ) !net-libs/libnfsidmap selinux? ( sec-policy/selinux-rpc sec-policy/selinux-rpcbind )
-REQUIRED_USE=kerberos? ( nfsv4 )
-RESTRICT=test
-SLOT=0
-SRC_URI=mirror://sourceforge/nfs/nfs-utils-2.6.2.tar.bz2
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=82d9a0744704bb494225bf3ba3863303
diff --git a/metadata/md5-cache/net-fs/nfs4-acl-tools-0.3.7 b/metadata/md5-cache/net-fs/nfs4-acl-tools-0.3.7
deleted file mode 100644
index fad33100ed53..000000000000
--- a/metadata/md5-cache/net-fs/nfs4-acl-tools-0.3.7
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=prepare
-DEPEND=sys-apps/attr
-DESCRIPTION=Commandline and GUI tools that deal directly with NFSv4 ACLs
-EAPI=7
-HOMEPAGE=https://git.linux-nfs.org/?p=bfields/nfs4-acl-tools.git;a=summary
-INHERIT=autotools
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-2
-RDEPEND=sys-apps/attr
-SLOT=0
-SRC_URI=https://linux-nfs.org/~bfields/nfs4-acl-tools/nfs4-acl-tools-0.3.7.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bd40dcbad026002188b31053a8a31cc2
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 11a2e5346485..1596b75a45b8 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/choqok-1.7.0-r1 b/metadata/md5-cache/net-im/choqok-1.7.0-r1
index 72757e0d156c..e4d849377a03 100644
--- a/metadata/md5-cache/net-im/choqok-1.7.0-r1
+++ b/metadata/md5-cache/net-im/choqok-1.7.0-r1
@@ -13,4 +13,4 @@ RDEPEND=>=app-crypt/qca-2.3.0:2 >=dev-qt/qtdbus-5.15.2:5 >=dev-qt/qtgui-5.15.2:5
 SLOT=5
 SRC_URI=mirror://kde/stable/choqok/1.7/src/choqok-1.7.0.tar.xz https://dev.gentoo.org/~asturm/distfiles/choqok-1.7.0-patchset-1.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	ecm	6f19455c3ec51029d40be1fdc6cdb8e0	flag-o-matic	29a755b1291d64133634d80b0328f153	kde.org	087d21100477ce987a8de6c1d613a176	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=335e0166d842228454589262f5735f30
+_md5_=069f579a63b14cc719f5185903d25b02
diff --git a/metadata/md5-cache/net-im/ejabberd-21.12-r2 b/metadata/md5-cache/net-im/ejabberd-21.12-r2
deleted file mode 100644
index a900a9540b89..000000000000
--- a/metadata/md5-cache/net-im/ejabberd-21.12-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-processone ) dev-util/rebar:0 >=sys-apps/gawk-4.1 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=dev-lang/erlang-19.3[odbc?,ssl] >=dev-erlang/cache_tab-1.0.29 >=dev-erlang/eimp-1.0.21 >=dev-erlang/fast_tls-1.1.13 >=dev-erlang/fast_xml-1.1.48 >=dev-erlang/fast_yaml-1.0.32 >=dev-erlang/yconf-1.0.12 >=dev-erlang/jiffy-1.0.5 >=dev-erlang/jose-1.11.2 >=dev-erlang/lager-3.9.1 >=dev-erlang/p1_oauth2-0.6.10 >=dev-erlang/p1_utils-1.0.23 >=dev-erlang/stringprep-1.0.27 >=dev-erlang/xmpp-1.5.6 >=dev-erlang/pkix-1.0.8 >=dev-erlang/mqtree-1.0.14 >=dev-erlang/idna-6.0.0-r1 >=dev-erlang/p1_acme-1.0.16 >=dev-erlang/base64url-1.0.1 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.19 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/epam-1.0.12 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.16 ) redis? ( >=dev-erlang/eredis-1.2.0 ) sip? ( >=dev-erlang/esip-1.0.45 ) sqlite? ( >=dev-erlang/sqlite3-1.1.13 ) stun? ( >=dev-erlang/stun-1.0.47 ) zlib? ( >=dev-erlang/ezlib-1.0.10 ) dev-lang/erlang:=
-DESCRIPTION=Robust, scalable and extensible XMPP server
-EAPI=7
-HOMEPAGE=https://www.ejabberd.im/ https://github.com/processone/ejabberd/
-INHERIT=pam rebar systemd verify-sig
-IUSE=captcha debug full-xml ldap mssql mysql odbc pam postgres redis roster-gw selinux sip sqlite +stun zlib verify-sig
-KEYWORDS=amd64 ~arm ~ia64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=dev-lang/erlang-19.3[odbc?,ssl] >=dev-erlang/cache_tab-1.0.29 >=dev-erlang/eimp-1.0.21 >=dev-erlang/fast_tls-1.1.13 >=dev-erlang/fast_xml-1.1.48 >=dev-erlang/fast_yaml-1.0.32 >=dev-erlang/yconf-1.0.12 >=dev-erlang/jiffy-1.0.5 >=dev-erlang/jose-1.11.2 >=dev-erlang/lager-3.9.1 >=dev-erlang/p1_oauth2-0.6.10 >=dev-erlang/p1_utils-1.0.23 >=dev-erlang/stringprep-1.0.27 >=dev-erlang/xmpp-1.5.6 >=dev-erlang/pkix-1.0.8 >=dev-erlang/mqtree-1.0.14 >=dev-erlang/idna-6.0.0-r1 >=dev-erlang/p1_acme-1.0.16 >=dev-erlang/base64url-1.0.1 ldap? ( =net-nds/openldap-2* ) mysql? ( >=dev-erlang/p1_mysql-1.0.19 ) odbc? ( dev-db/unixODBC ) pam? ( >=dev-erlang/epam-1.0.12 ) postgres? ( >=dev-erlang/p1_pgsql-1.1.16 ) redis? ( >=dev-erlang/eredis-1.2.0 ) sip? ( >=dev-erlang/esip-1.0.45 ) sqlite? ( >=dev-erlang/sqlite3-1.1.13 ) stun? ( >=dev-erlang/stun-1.0.47 ) zlib? ( >=dev-erlang/ezlib-1.0.10 ) >=acct-user/ejabberd-2[pam?] captcha? ( media-gfx/imagemagick[truetype,png] ) selinux? ( sec-policy/selinux-jabber ) dev-lang/erlang:=
-REQUIRED_USE=mssql? ( odbc )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://static.process-one.net/ejabberd/downloads/21.12/ejabberd-21.12.tgz -> ejabberd-21.12.tar.gz verify-sig? ( https://static.process-one.net/ejabberd/downloads/21.12/ejabberd-21.12.tgz.asc -> ejabberd-21.12.tar.gz.asc )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	rebar	c90ca870377295e338a9682a5b951ef6	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=68f8957e7532ea6cad664ebf8310bc55
diff --git a/metadata/md5-cache/net-im/signal-desktop-bin-5.59.0 b/metadata/md5-cache/net-im/signal-desktop-bin-5.60.0
similarity index 97%
rename from metadata/md5-cache/net-im/signal-desktop-bin-5.59.0
rename to metadata/md5-cache/net-im/signal-desktop-bin-5.60.0
index 8138d0361b74..b4de692129ad 100644
--- a/metadata/md5-cache/net-im/signal-desktop-bin-5.59.0
+++ b/metadata/md5-cache/net-im/signal-desktop-bin-5.60.0
@@ -10,6 +10,6 @@ LICENSE=GPL-3 MIT MIT-with-advertising BSD-1 BSD-2 BSD Apache-2.0 ISC openssl ZL
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/wayland media-libs/alsa-lib media-libs/mesa[X(+)] net-print/cups sys-apps/dbus[X] x11-libs/cairo x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/pango sound? ( || ( media-sound/pulseaudio media-sound/apulse ) )
 RESTRICT=splitdebug
 SLOT=0
-SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.59.0_amd64.deb
+SRC_URI=https://updates.signal.org/desktop/apt/pool/main/s/signal-desktop/signal-desktop_5.60.0_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=b23d1a2ff25c054d469a9abe79059bd5
diff --git a/metadata/md5-cache/net-im/synapse-1.63.1 b/metadata/md5-cache/net-im/synapse-1.63.1
index b467dd709cb6..7c06ab3c74b8 100644
--- a/metadata/md5-cache/net-im/synapse-1.63.1
+++ b/metadata/md5-cache/net-im/synapse-1.63.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://matrix.org/ https://github.com/matrix-org/synapse/
 INHERIT=distutils-r1 optfeature systemd
 IUSE=postgres systemd test python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=Apache-2.0
 RDEPEND=acct-user/synapse acct-group/synapse python_single_target_python3_9? ( dev-python/attrs[python_targets_python3_9(-)] dev-python/bcrypt[python_targets_python3_9(-)] dev-python/bleach[python_targets_python3_9(-)] dev-python/canonicaljson[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] dev-python/frozendict[python_targets_python3_9(-)] dev-python/ijson[python_targets_python3_9(-)] >=dev-python/jinja-3.0[python_targets_python3_9(-)] dev-python/jsonschema[python_targets_python3_9(-)] >=dev-python/matrix-common-1.2.1[python_targets_python3_9(-)] dev-python/msgpack[python_targets_python3_9(-)] dev-python/netaddr[python_targets_python3_9(-)] dev-python/packaging[python_targets_python3_9(-)] dev-python/phonenumbers[python_targets_python3_9(-)] dev-python/pillow[python_targets_python3_9(-),webp] dev-python/prometheus_client[python_targets_python3_9(-)] dev-python/pyasn1-modules[python_targets_python3_9(-)] dev-python/pyasn1[python_targets_python3_9(-)] dev-python/pymacaroons[python_targets_python3_9(-)] dev-python/pyopenssl[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] dev-python/service_identity[python_targets_python3_9(-)] dev-python/signedjson[python_targets_python3_9(-)] dev-python/sortedcontainers[python_targets_python3_9(-)] dev-python/treq[python_targets_python3_9(-)] dev-python/twisted[python_targets_python3_9(-)] dev-python/typing-extensions[python_targets_python3_9(-)] dev-python/unpaddedbase64[python_targets_python3_9(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_9(-)] ) systemd? ( dev-python/python-systemd[python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( dev-python/attrs[python_targets_python3_10(-)] dev-python/bcrypt[python_targets_python3_10(-)] dev-python/bleach[python_targets_python3_10(-)] dev-python/canonicaljson[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] dev-python/frozendict[python_targets_python3_10(-)] dev-python/ijson[python_targets_python3_10(-)] >=dev-python/jinja-3.0[python_targets_python3_10(-)] dev-python/jsonschema[python_targets_python3_10(-)] >=dev-python/matrix-common-1.2.1[python_targets_python3_10(-)] dev-python/msgpack[python_targets_python3_10(-)] dev-python/netaddr[python_targets_python3_10(-)] dev-python/packaging[python_targets_python3_10(-)] dev-python/phonenumbers[python_targets_python3_10(-)] dev-python/pillow[python_targets_python3_10(-),webp] dev-python/prometheus_client[python_targets_python3_10(-)] dev-python/pyasn1-modules[python_targets_python3_10(-)] dev-python/pyasn1[python_targets_python3_10(-)] dev-python/pymacaroons[python_targets_python3_10(-)] dev-python/pyopenssl[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] dev-python/service_identity[python_targets_python3_10(-)] dev-python/signedjson[python_targets_python3_10(-)] dev-python/sortedcontainers[python_targets_python3_10(-)] dev-python/treq[python_targets_python3_10(-)] dev-python/twisted[python_targets_python3_10(-)] dev-python/typing-extensions[python_targets_python3_10(-)] dev-python/unpaddedbase64[python_targets_python3_10(-)] postgres? ( dev-python/psycopg:2[python_targets_python3_10(-)] ) systemd? ( dev-python/python-systemd[python_targets_python3_10(-)] ) ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/matrix-org/synapse/archive/v1.63.1.tar.gz -> synapse-1.63.1.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=beaa208307e126db40ca653e03c03e8b
+_md5_=f84985a13cb0e3b967dce4f58f055433
diff --git a/metadata/md5-cache/net-irc/Manifest.gz b/metadata/md5-cache/net-irc/Manifest.gz
index 4f286e7fbb9c..fa7bfdd72b8d 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/anope-2.0.10-r1 b/metadata/md5-cache/net-irc/anope-2.0.10-r1
deleted file mode 100644
index 5464dafed49e..000000000000
--- a/metadata/md5-cache/net-irc/anope-2.0.10-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gettext >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=acct-group/anope acct-user/anope mysql? ( dev-db/mysql-connector-c:0= ) ssl? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) ldap? ( net-nds/openldap:= ) pcre? ( dev-libs/libpcre ) sqlite? ( dev-db/sqlite:3 ) tre? ( dev-libs/tre ) virtual/libintl
-DESCRIPTION=Anope IRC Services
-EAPI=7
-HOMEPAGE=https://anope.org/ https://github.com/anope/anope/
-INHERIT=cmake
-IUSE=gnutls ldap mysql pcre sql sqlite ssl tre
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=GPL-2
-RDEPEND=acct-group/anope acct-user/anope mysql? ( dev-db/mysql-connector-c:0= ) ssl? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:0= dev-libs/libgcrypt:0= ) ldap? ( net-nds/openldap:= ) pcre? ( dev-libs/libpcre ) sqlite? ( dev-db/sqlite:3 ) tre? ( dev-libs/tre ) virtual/libintl
-REQUIRED_USE=sql? ( || ( mysql sqlite ) )
-SLOT=0
-SRC_URI=https://github.com/anope/anope/archive/2.0.10.tar.gz -> anope-2.0.10.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9865ab28095070b50598fe6e9b626b55
diff --git a/metadata/md5-cache/net-irc/ergo-2.9.1-r1 b/metadata/md5-cache/net-irc/ergo-2.9.1-r1
deleted file mode 100644
index fd839e360294..000000000000
--- a/metadata/md5-cache/net-irc/ergo-2.9.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install postinst prepare unpack
-DESCRIPTION=A modern IRC server written in Go
-EAPI=8
-HOMEPAGE=https://ergo.chat/ https://github.com/ergochat/ergo
-INHERIT=go-module systemd
-KEYWORDS=amd64 ~arm ~arm64
-LICENSE=Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0
-RDEPEND=acct-user/oragono acct-group/oragono
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/ergochat/ergo/archive/v2.9.1.tar.gz -> ergo-2.9.1.tar.gz
-_eclasses_=go-module	05668e36c51c78c9681fdf4aefa0abec	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e776d71a3b1248a219286951282afbda
diff --git a/metadata/md5-cache/net-irc/unrealircd-6.0.4 b/metadata/md5-cache/net-irc/unrealircd-6.0.4
deleted file mode 100644
index 738513e82893..000000000000
--- a/metadata/md5-cache/net-irc/unrealircd-6.0.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-unrealircd ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 dev-libs/openssl:0 virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst prepare unpack
-DEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:= dev-libs/jansson:= >=net-dns/c-ares-1.7:= virtual/libcrypt:= curl? ( net-misc/curl[adns] ) geoip? ( dev-libs/libmaxminddb )
-DESCRIPTION=An advanced Internet Relay Chat daemon
-EAPI=8
-HOMEPAGE=https://www.unrealircd.org/
-INHERIT=autotools ssl-cert systemd tmpfiles verify-sig
-IUSE=class-nofakelag curl geoip +operoverride operoverride-verify verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux
-LICENSE=GPL-2+
-RDEPEND=acct-group/unrealircd acct-user/unrealircd >=app-crypt/argon2-20171227-r1:= dev-libs/libpcre2 dev-libs/libsodium:= dev-libs/openssl:= dev-libs/jansson:= >=net-dns/c-ares-1.7:= virtual/libcrypt:= curl? ( net-misc/curl[adns] ) geoip? ( dev-libs/libmaxminddb ) virtual/tmpfiles
-SLOT=0
-SRC_URI=https://www.unrealircd.org/downloads/unrealircd-6.0.4.tar.gz verify-sig? ( https://www.unrealircd.org/downloads/unrealircd-6.0.4.tar.gz.asc )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	6dbe6a8a3dccb3d2f28f8404cd02c7d7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=cbe5651cac4617b0a91592e85acd96fe
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 63760227a24a..9c707169a5d9 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/accounts-qml-0.7-r1 b/metadata/md5-cache/net-libs/accounts-qml-0.7-r1
deleted file mode 100644
index de1d90999f26..000000000000
--- a/metadata/md5-cache/net-libs/accounts-qml-0.7-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=doc? ( app-doc/doxygen )
-DEFINED_PHASES=configure install prepare
-DEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 net-libs/accounts-qt net-libs/signond test? ( dev-qt/qtgui:5 dev-qt/qttest:5 )
-DESCRIPTION=QML bindings for accounts-qt and signond
-EAPI=7
-HOMEPAGE=https://accounts-sso.gitlab.io/
-INHERIT=qmake-utils
-IUSE=doc test
-KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
-LICENSE=LGPL-2.1
-RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 net-libs/accounts-qt net-libs/signond
-RESTRICT=test
-SLOT=0
-SRC_URI=https://gitlab.com/accounts-sso/accounts-qml-module/-/archive/VERSION_0.7/accounts-qml-module-VERSION_0.7.tar.gz https://dev.gentoo.org/~asturm/distfiles/accounts-qml-0.7-patches-1.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=639e5b789a886e26b7c3c3f0d81338f7
diff --git a/metadata/md5-cache/net-libs/accounts-qml-0.7-r2 b/metadata/md5-cache/net-libs/accounts-qml-0.7-r2
index 639b1c2f5df4..a335735c6b8c 100644
--- a/metadata/md5-cache/net-libs/accounts-qml-0.7-r2
+++ b/metadata/md5-cache/net-libs/accounts-qml-0.7-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://accounts-sso.gitlab.io/
 INHERIT=qmake-utils
 IUSE=doc test
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86
 LICENSE=LGPL-2.1
 RDEPEND=dev-qt/qtcore:5 dev-qt/qtdeclarative:5 net-libs/accounts-qt net-libs/signond
 RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/accounts-qml-module/-/archive/VERSION_0.7/accounts-qml-module-VERSION_0.7.tar.gz https://dev.gentoo.org/~asturm/distfiles/accounts-qml-0.7-patches-1.tar.xz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6bdfd47c4a2c9acc021bbe3976f220ee
+_md5_=7f318e24466d59755f929355d7777ea7
diff --git a/metadata/md5-cache/net-libs/accounts-qt-1.16 b/metadata/md5-cache/net-libs/accounts-qt-1.16
index 707363865bc8..a5a20c2aa166 100644
--- a/metadata/md5-cache/net-libs/accounts-qt-1.16
+++ b/metadata/md5-cache/net-libs/accounts-qt-1.16
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-doc/doxygen )
+BDEPEND=doc? ( app-doc/doxygen[dot] dev-qt/qdoc:5 )
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-libs/glib:2 dev-qt/qtcore:5 dev-qt/qtxml:5 >=net-libs/libaccounts-glib-1.23:= test? ( dev-qt/qttest:5 )
 DESCRIPTION=Qt5 bindings for libaccounts-glib
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/libaccounts-qt/-/archive/VERSION_1.16/libaccounts-qt-VERSION_1.16.tar.gz -> accounts-qt-1.16a.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=4a59830bc569e1bcc67c0b9f6982bab7
+_md5_=c13a30591bb6a23610429f46429e618f
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.2.1 b/metadata/md5-cache/net-libs/libnftnl-1.2.1
deleted file mode 100644
index bccf864e5436..000000000000
--- a/metadata/md5-cache/net-libs/libnftnl-1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-netfilter ) virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install prepare setup unpack
-DEPEND=>=net-libs/libmnl-1.0.4:=
-DESCRIPTION=Netlink API to the in-kernel nf_tables subsystem
-EAPI=7
-HOMEPAGE=https://netfilter.org/projects/nftables/
-INHERIT=autotools linux-info usr-ldscript verify-sig
-IUSE=examples static-libs test split-usr verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=net-libs/libmnl-1.0.4:=
-RESTRICT=!test? ( test )
-SLOT=0/11
-SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.2.1.tar.bz2 verify-sig? ( https://netfilter.org/projects/libnftnl/files/libnftnl-1.2.1.tar.bz2.sig )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=b1508a0f65002410fdf182960baf0d85
diff --git a/metadata/md5-cache/net-libs/libpcap-1.10.1-r1 b/metadata/md5-cache/net-libs/libpcap-1.10.1-r1
deleted file mode 100644
index 95db07caafbb..000000000000
--- a/metadata/md5-cache/net-libs/libpcap-1.10.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/flex virtual/yacc dbus? ( virtual/pkgconfig ) verify-sig? ( sec-keys/openpgp-keys-tcpdump ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl: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(-)?] ) remote? ( 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(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=A system-independent library for user-level network packet capture
-EAPI=7
-HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap
-INHERIT=autotools multilib-minimal verify-sig
-IUSE=bluetooth dbus netlink rdma remote static-libs usb yydebug 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 ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris
-LICENSE=BSD
-RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) netlink? ( dev-libs/libnl: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(-)?] ) remote? ( 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(-)?] ) rdma? ( sys-cluster/rdma-core ) usb? ( virtual/libusb:1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz -> libpcap-1.10.1-upstream.tar.gz verify-sig? ( https://www.tcpdump.org/release/libpcap-1.10.1.tar.gz.sig -> libpcap-1.10.1-upstream.tar.gz.sig )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=438444c652ddc01c5342347dce855cff
diff --git a/metadata/md5-cache/net-libs/signond-8.61 b/metadata/md5-cache/net-libs/signond-8.61
index d98edc638d25..30c5da5ff7ad 100644
--- a/metadata/md5-cache/net-libs/signond-8.61
+++ b/metadata/md5-cache/net-libs/signond-8.61
@@ -1,4 +1,4 @@
-BDEPEND=doc? ( app-doc/doxygen[dot] )
+BDEPEND=doc? ( app-doc/doxygen[dot] dev-qt/qdoc:5 )
 DEFINED_PHASES=configure install prepare
 DEPEND=dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtsql:5 net-libs/libproxy test? ( dev-qt/qttest:5 )
 DESCRIPTION=Signon daemon for libaccounts-glib
@@ -13,4 +13,4 @@ RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.com/accounts-sso/signond/-/archive/VERSION_8.61/signond-VERSION_8.61.tar.gz -> signond-8.61.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=38a814f894b930e9e82a547940f9a694
+_md5_=62c6d3ffa0bbdfb3d7227a99dc6280ff
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 27e88be78c56..ba41c4e9d0fe 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/rss2email-3.13.1 b/metadata/md5-cache/net-mail/rss2email-3.13.1
index 8e09c16d76b1..120622f49010 100644
--- a/metadata/md5-cache/net-mail/rss2email-3.13.1
+++ b/metadata/md5-cache/net-mail/rss2email-3.13.1
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/rss2email/rss2email
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
+KEYWORDS=amd64 ~ppc64 x86
 LICENSE=|| ( GPL-2 GPL-3 )
 RDEPEND=>=dev-python/feedparser-6.0.5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/html2text-2020.1.16[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/rss2email/rss2email/archive/v3.13.1.tar.gz -> rss2email-3.13.1.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=384246c5bb3fffb36eae947097908d40
+_md5_=c86214893dfeeeed56c13597fbac9f52
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index e30ae15759d2..dbb20d4a3d67 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/aria2-1.36.0 b/metadata/md5-cache/net-misc/aria2-1.36.0-r1
similarity index 98%
rename from metadata/md5-cache/net-misc/aria2-1.36.0
rename to metadata/md5-cache/net-misc/aria2-1.36.0-r1
index ee4a7c311341..5c5b06b8910c 100644
--- a/metadata/md5-cache/net-misc/aria2-1.36.0
+++ b/metadata/md5-cache/net-misc/aria2-1.36.0-r1
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/aria2/aria2/releases/download/release-1.36.0/aria2-1.36.0.tar.xz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8f076ff0b6f9ba031ac3782ceb556dbe
+_md5_=27cd795e5cd9a61ef4bf72d60e77e08b
diff --git a/metadata/md5-cache/net-misc/electrum-4.2.2 b/metadata/md5-cache/net-misc/electrum-4.2.2
deleted file mode 100644
index 762b7a45730d..000000000000
--- a/metadata/md5-cache/net-misc/electrum-4.2.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pyaes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=User friendly Bitcoin client
-EAPI=8
-HOMEPAGE=https://electrum.org/
-INHERIT=desktop distutils-r1 xdg-utils
-IUSE=cli ncurses qrcode +qt5 test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] )
-REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spesmilo/electrum/archive/4.2.2.tar.gz -> electrum-4.2.2.gh.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ba5051748db730da2ac82cc869a8d454
diff --git a/metadata/md5-cache/net-misc/electrum-4.3.0 b/metadata/md5-cache/net-misc/electrum-4.3.0
deleted file mode 100644
index b0cd2a323b67..000000000000
--- a/metadata/md5-cache/net-misc/electrum-4.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pyaes[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pycryptodome[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) ) >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DESCRIPTION=User friendly Bitcoin client
-EAPI=8
-HOMEPAGE=https://electrum.org/ https://github.com/spesmilo/electrum/
-INHERIT=desktop distutils-r1 xdg-utils
-IUSE=cli ncurses qrcode +qt5 test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] )
-REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/spesmilo/electrum/archive/4.3.0.tar.gz -> electrum-4.3.0.gh.tar.gz
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=177d41b378935f10d76a611fcca162aa
diff --git a/metadata/md5-cache/net-misc/electrum-4.3.1 b/metadata/md5-cache/net-misc/electrum-4.3.1
index 064eb2145f2a..0aa216871c2f 100644
--- a/metadata/md5-cache/net-misc/electrum-4.3.1
+++ b/metadata/md5-cache/net-misc/electrum-4.3.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://electrum.org/ https://github.com/spesmilo/electrum/
 INHERIT=distutils-r1 xdg-utils
 IUSE=cli ncurses qrcode +qt5 test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] ) dev-libs/libsecp256k1 >=dev-python/aiohttp-socks-0.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] =dev-python/aiorpcX-0.22*[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/attrs-19.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/bitstring[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/dnspython-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pbkdf2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/PySocks[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/qrcode[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] qrcode? ( media-gfx/zbar[v4l] ) qt5? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ncurses? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses] ) ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses?] )
 REQUIRED_USE=|| ( cli ncurses qt5 ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/spesmilo/electrum/archive/4.3.1.tar.gz -> electrum-4.3.1.gh.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dbac4f9c2c0a3e0e15fc8bb578bd5e2a
+_md5_=39a3fb4352637b237e31f61b2659ab40
diff --git a/metadata/md5-cache/net-misc/iputils-99999999 b/metadata/md5-cache/net-misc/iputils-99999999
index 6a45d09308f6..d06738f735ee 100644
--- a/metadata/md5-cache/net-misc/iputils-99999999
+++ b/metadata/md5-cache/net-misc/iputils-99999999
@@ -12,4 +12,4 @@ RDEPEND=caps? ( sys-libs/libcap ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libi
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fcaps	babe6282ea5c195981bd302af1adaf3a	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	plocale	7ce00136a77130df46fbbd5966f98a61	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=451527bde5da08712ae53201636b58cc
+_md5_=717ff942750d9a907037d0248ad80bb0
diff --git a/metadata/md5-cache/net-misc/mosh-1.3.2-r2 b/metadata/md5-cache/net-misc/mosh-1.3.2-r3
similarity index 69%
rename from metadata/md5-cache/net-misc/mosh-1.3.2-r2
rename to metadata/md5-cache/net-misc/mosh-1.3.2-r3
index 8fa0446e407b..6be1a5c7fda0 100644
--- a/metadata/md5-cache/net-misc/mosh-1.3.2-r2
+++ b/metadata/md5-cache/net-misc/mosh-1.3.2-r3
@@ -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 >=sys-devel/libtool-2.4
 DEFINED_PHASES=configure install prepare
-DEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) dev-libs/openssl:0= utempter? ( sys-libs/libutempter ) virtual/pkgconfig
+DEPEND=dev-libs/protobuf:= sys-libs/ncurses:= sys-libs/zlib virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) dev-libs/openssl:= utempter? ( sys-libs/libutempter ) virtual/pkgconfig
 DESCRIPTION=Mobile shell that supports roaming and intelligent local echo
 EAPI=8
 HOMEPAGE=https://mosh.org
@@ -8,9 +8,9 @@ INHERIT=autotools bash-completion-r1
 IUSE=+client examples +mosh-hardening +server ufw +utempter
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=GPL-3
-RDEPEND=dev-libs/protobuf:0= sys-libs/ncurses:0= virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) dev-libs/openssl:0= utempter? ( sys-libs/libutempter )
+RDEPEND=dev-libs/protobuf:= sys-libs/ncurses:= sys-libs/zlib virtual/ssh client? ( dev-lang/perl dev-perl/IO-Tty ) dev-libs/openssl:= utempter? ( sys-libs/libutempter )
 REQUIRED_USE=|| ( client server ) examples? ( client )
 SLOT=0
 SRC_URI=https://mosh.org/mosh-1.3.2.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=cf603728b52236e0799d34e21bf891c0
+_md5_=0abcf67b5d60e1ed70bfc4eccbf82d30
diff --git a/metadata/md5-cache/net-misc/rwbs-0.27-r2 b/metadata/md5-cache/net-misc/rwbs-0.27-r2
index cd6a7778963d..2798062bb07b 100644
--- a/metadata/md5-cache/net-misc/rwbs-0.27-r2
+++ b/metadata/md5-cache/net-misc/rwbs-0.27-r2
@@ -1,9 +1,9 @@
 DEFINED_PHASES=install
 DESCRIPTION=Roger Wilco base station
-EAPI=6
+EAPI=8
 HOMEPAGE=http://rogerwilco.gamespy.com/
 KEYWORDS=~amd64 x86
 LICENSE=Resounding GPL-2
 SLOT=0
 SRC_URI=http://games.gci.net/pub/VoiceOverIP/RogerWilco/rwbs_Linux_0_27.tar.gz
-_md5_=01e78a36d1a07996825c586daf611348
+_md5_=923087a1682a5a28999e849235e11091
diff --git a/metadata/md5-cache/net-misc/telnet-bsd-1.2-r4 b/metadata/md5-cache/net-misc/telnet-bsd-1.2-r4
index 8026598b193c..ae19963896c9 100644
--- a/metadata/md5-cache/net-misc/telnet-bsd-1.2-r4
+++ b/metadata/md5-cache/net-misc/telnet-bsd-1.2-r4
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=ftp://ftp.suse.com/pub/people/kukuk/ipv6/
 INHERIT=autotools toolchain-funcs
 IUSE=nls xinetd
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=sys-libs/ncurses:= !net-misc/netkit-telnetd xinetd? ( sys-apps/xinetd ) !net-misc/netkit-telnetd
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~mschiff/distfiles/telnet-bsd-1.2.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=296b6d19beca38c87c88a17cbf4a75bd
+_md5_=eceeb03b21e355c3839156162dad30ae
diff --git a/metadata/md5-cache/net-misc/wget-1.21.2 b/metadata/md5-cache/net-misc/wget-1.21.2
deleted file mode 100644
index 984be87ea610..000000000000
--- a/metadata/md5-cache/net-misc/wget-1.21.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-arch/xz-utils dev-lang/perl sys-apps/texinfo virtual/pkgconfig nls? ( sys-devel/gettext ) test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-perl/HTTP-Daemon-6.60.0 dev-perl/HTTP-Message dev-perl/IO-Socket-SSL )
-DEFINED_PHASES=configure prepare setup
-DEPEND=!static? ( cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:= ) metalink? ( media-libs/libmetalink ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) ) static? ( cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] ) metalink? ( media-libs/libmetalink ) pcre? ( dev-libs/libpcre2[static-libs(+)] ) ssl? ( gnutls? ( net-libs/gnutls:0=[static-libs(+)] ) !gnutls? ( dev-libs/openssl:0=[static-libs(+)] ) ) uuid? ( sys-apps/util-linux[static-libs(+)] ) zlib? ( sys-libs/zlib[static-libs(+)] ) )
-DESCRIPTION=Network utility to retrieve files from the WWW
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/wget/
-INHERIT=flag-o-matic python-any-r1 toolchain-funcs
-IUSE=cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+
-RDEPEND=!static? ( cookie-check? ( net-libs/libpsl ) idn? ( >=net-dns/libidn2-0.14:= ) metalink? ( media-libs/libmetalink ) pcre? ( dev-libs/libpcre2 ) ssl? ( gnutls? ( net-libs/gnutls:0= ) !gnutls? ( dev-libs/openssl:0= ) ) uuid? ( sys-apps/util-linux ) zlib? ( sys-libs/zlib ) )
-REQUIRED_USE=ntlm? ( !gnutls ssl ) gnutls? ( ssl )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://gnu/wget/wget-1.21.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=2d4fdf5781c0d43c35db9444a5dab4b0
diff --git a/metadata/md5-cache/net-nds/Manifest.gz b/metadata/md5-cache/net-nds/Manifest.gz
index d47ed92abb64..03521cec4a6e 100644
Binary files a/metadata/md5-cache/net-nds/Manifest.gz and b/metadata/md5-cache/net-nds/Manifest.gz differ
diff --git a/metadata/md5-cache/net-nds/gssproxy-0.8.4-r2 b/metadata/md5-cache/net-nds/gssproxy-0.8.4-r2
deleted file mode 100644
index fe954cdbd36a..000000000000
--- a/metadata/md5-cache/net-nds/gssproxy-0.8.4-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd:4.4 dev-libs/libxslt virtual/pkgconfig
-DEFINED_PHASES=configure install
-DESCRIPTION=daemon to proxy GSSAPI context establishment and channel handling
-EAPI=7
-HOMEPAGE=https://github.com/gssapi/gssproxy
-IUSE=debug selinux systemd hardened
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86
-LICENSE=BSD-1
-RDEPEND=>=dev-libs/libverto-0.2.2 >=dev-libs/ding-libs-0.6.1 virtual/krb5 selinux? ( sys-libs/libselinux ) selinux? ( sec-policy/selinux-gssproxy )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/gssapi/gssproxy/releases/download/v0.8.4/gssproxy-0.8.4.tar.gz
-_md5_=d632d1cb447e60343fbbfa07dc62a223
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 16589d0b029e..ee196929da0a 100644
Binary files a/metadata/md5-cache/net-proxy/Manifest.gz and b/metadata/md5-cache/net-proxy/Manifest.gz differ
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.2.9999 b/metadata/md5-cache/net-proxy/haproxy-2.2.9999
index 95b9579b077b..a7b0c4c4f8c1 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.2.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.2.9999
@@ -12,4 +12,4 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( de
 REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( slz zlib )
 SLOT=0/2.2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=99523f7c54ce6c4e2af7a97e16bbcb1b
+_md5_=bd3a5f914f0dca7024016a50f9fa2a49
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.4.9999 b/metadata/md5-cache/net-proxy/haproxy-2.4.9999
index 1586baf118cb..f1a01fc83358 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.4.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.4.9999
@@ -12,4 +12,4 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( de
 REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
 SLOT=0/2.4
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b5fac1e3b8899ffdd099c71f54ced74e
+_md5_=2de37a88d8909c1394ccd8095c00aa92
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.5.9999 b/metadata/md5-cache/net-proxy/haproxy-2.5.9999
index 3730fb732447..2e9f63c9da00 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.5.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.5.9999
@@ -12,4 +12,4 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( de
 REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 ) ) ?? ( slz zlib )
 SLOT=0/2.5
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a0719f26912cc5a2c9404120dc487332
+_md5_=5525d08a600770e849385a53d72bcd67
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.6.2-r1 b/metadata/md5-cache/net-proxy/haproxy-2.6.2-r1
deleted file mode 100644
index 0a5d8112acc5..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.6.2-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-INHERIT=toolchain-funcs flag-o-matic lua-single systemd linux-info
-IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) acct-group/haproxy acct-user/haproxy
-REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
-SLOT=0/2.6
-SRC_URI=http://haproxy.1wt.eu/download/2.6/src/haproxy-2.6.2.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ef297cc02450bfddde7629c9c11db474
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.6.4 b/metadata/md5-cache/net-proxy/haproxy-2.6.4
deleted file mode 100644
index 93d87a716bbb..000000000000
--- a/metadata/md5-cache/net-proxy/haproxy-2.6.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile install postinst setup
-DEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) )
-DESCRIPTION=A TCP/HTTP reverse proxy for high availability environments
-EAPI=7
-HOMEPAGE=http://www.haproxy.org
-INHERIT=toolchain-funcs flag-o-matic lua-single systemd linux-info
-IUSE=+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~x86
-LICENSE=GPL-2 LGPL-2.1
-RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) acct-group/haproxy acct-user/haproxy
-REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
-SLOT=0/2.6
-SRC_URI=http://haproxy.1wt.eu/download/2.6/src/haproxy-2.6.4.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ef297cc02450bfddde7629c9c11db474
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.6.5 b/metadata/md5-cache/net-proxy/haproxy-2.6.6
similarity index 94%
rename from metadata/md5-cache/net-proxy/haproxy-2.6.5
rename to metadata/md5-cache/net-proxy/haproxy-2.6.6
index 5cb823a03dfc..e3dd6f4f48f2 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.6.5
+++ b/metadata/md5-cache/net-proxy/haproxy-2.6.6
@@ -11,6 +11,6 @@ LICENSE=GPL-2 LGPL-2.1
 RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( dev-libs/libpcre2:=[jit] ) ) ssl? ( dev-libs/openssl:0= ) systemd? ( sys-apps/systemd ) zlib? ( sys-libs/zlib ) lua? ( lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) acct-group/haproxy acct-user/haproxy
 REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
 SLOT=0/2.6
-SRC_URI=http://haproxy.1wt.eu/download/2.6/src/haproxy-2.6.5.tar.gz
+SRC_URI=http://haproxy.1wt.eu/download/2.6/src/haproxy-2.6.6.tar.gz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ef297cc02450bfddde7629c9c11db474
+_md5_=b52c7b0045ebe901b2eb5103919c6ef9
diff --git a/metadata/md5-cache/net-proxy/haproxy-2.6.9999 b/metadata/md5-cache/net-proxy/haproxy-2.6.9999
index 41459cc26efd..2b06a6664e5a 100644
--- a/metadata/md5-cache/net-proxy/haproxy-2.6.9999
+++ b/metadata/md5-cache/net-proxy/haproxy-2.6.9999
@@ -12,4 +12,4 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( de
 REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
 SLOT=0/2.6
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ef297cc02450bfddde7629c9c11db474
+_md5_=b52c7b0045ebe901b2eb5103919c6ef9
diff --git a/metadata/md5-cache/net-proxy/haproxy-9999 b/metadata/md5-cache/net-proxy/haproxy-9999
index 14e0644c67d0..2a77f9db09a8 100644
--- a/metadata/md5-cache/net-proxy/haproxy-9999
+++ b/metadata/md5-cache/net-proxy/haproxy-9999
@@ -12,4 +12,4 @@ RDEPEND=crypt? ( virtual/libcrypt:= ) pcre? ( dev-libs/libpcre2:= pcre-jit? ( de
 REQUIRED_USE=pcre-jit? ( pcre ) lua? ( ^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) ?? ( slz zlib )
 SLOT=0/9999
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	linux-info	bbfa385d6907d7948d49a5e107bd654d	lua-single	f2c2fb82c912dd65d53bdae3613a331f	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ef297cc02450bfddde7629c9c11db474
+_md5_=b52c7b0045ebe901b2eb5103919c6ef9
diff --git a/metadata/md5-cache/sci-biology/Manifest.gz b/metadata/md5-cache/sci-biology/Manifest.gz
index 99c4a40c29d8..7d31cc21d3d2 100644
Binary files a/metadata/md5-cache/sci-biology/Manifest.gz and b/metadata/md5-cache/sci-biology/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-biology/phred-071220-r2 b/metadata/md5-cache/sci-biology/phred-071220-r2
index f0372478081c..9f637409f8e3 100644
--- a/metadata/md5-cache/sci-biology/phred-071220-r2
+++ b/metadata/md5-cache/sci-biology/phred-071220-r2
@@ -9,4 +9,4 @@ RESTRICT=fetch
 SLOT=0
 SRC_URI=phred-dist-071220.b-acd.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b4f0ecabb29f6151604a63619790300c
+_md5_=0b391faf1bbb559536c0722250656707
diff --git a/metadata/md5-cache/sci-electronics/Manifest.gz b/metadata/md5-cache/sci-electronics/Manifest.gz
index c2cb93ba32a1..bdcbb9f52718 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/petrify-4.2-r1 b/metadata/md5-cache/sci-electronics/petrify-4.2-r1
index 08f444a57ed3..dca20f77b2e7 100644
--- a/metadata/md5-cache/sci-electronics/petrify-4.2-r1
+++ b/metadata/md5-cache/sci-electronics/petrify-4.2-r1
@@ -8,4 +8,4 @@ RDEPEND=media-gfx/graphviz
 RESTRICT=strip
 SLOT=0
 SRC_URI=http://www.lsi.upc.edu/~jordicf/petrify/distrib/petrify-4.2-linux.tgz
-_md5_=89f5e2b404701ced0649acfc5d43672f
+_md5_=6aec892abe1e3f7e7896490eadf0b90d
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index 54151984a79b..efb00f7438f3 100644
Binary files a/metadata/md5-cache/sci-geosciences/Manifest.gz and b/metadata/md5-cache/sci-geosciences/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-geosciences/gshhs-1.13-r1 b/metadata/md5-cache/sci-geosciences/gshhs-1.13-r1
index cd09c637c687..008c2e4f69d9 100644
--- a/metadata/md5-cache/sci-geosciences/gshhs-1.13-r1
+++ b/metadata/md5-cache/sci-geosciences/gshhs-1.13-r1
@@ -12,4 +12,4 @@ RDEPEND=sci-libs/netcdf:= sci-libs/gdal:= data? ( sci-geosciences/gshhs-data )
 SLOT=0
 SRC_URI=ftp://ftp.soest.hawaii.edu/pwessel/gshhs/gshhs_1.13_src.zip
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=cbc7c9a7f021569728e305f281f76cc3
+_md5_=13cc781650faabd8456715294dd44a27
diff --git a/metadata/md5-cache/sci-geosciences/xtide-2.15.1-r2 b/metadata/md5-cache/sci-geosciences/xtide-2.15.1-r2
deleted file mode 100644
index afc48e6110c4..000000000000
--- a/metadata/md5-cache/sci-geosciences/xtide-2.15.1-r2
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=media-libs/libpng:0= sci-geosciences/gpsd >=sci-geosciences/libtcd-2.2.5_p2 x11-libs/libX11 x11-libs/libXaw3d[unicode(+)] x11-libs/libXaw3dXft x11-libs/libXft x11-libs/libXpm x11-libs/libXt
-DESCRIPTION=XTide provides tide and current predictions in a wide variety of formats
-EAPI=6
-HOMEPAGE=https://flaterco.com/xtide/
-INHERIT=desktop gnome2-utils
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=media-libs/libpng:0= sci-geosciences/gpsd >=sci-geosciences/libtcd-2.2.5_p2 x11-libs/libX11 x11-libs/libXaw3d[unicode(+)] x11-libs/libXaw3dXft x11-libs/libXft x11-libs/libXpm x11-libs/libXt media-fonts/font-schumacher-misc
-SLOT=0
-SRC_URI=ftp://ftp.flaterco.com/xtide/xtide-2.15.1.tar.bz2
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=7062532dd9e55a3304565637860f6b65
diff --git a/metadata/md5-cache/sci-geosciences/xtide-2.15.1-r3 b/metadata/md5-cache/sci-geosciences/xtide-2.15.1-r3
deleted file mode 100644
index 303b0b2c5f46..000000000000
--- a/metadata/md5-cache/sci-geosciences/xtide-2.15.1-r3
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DEPEND=media-libs/libpng:= sci-geosciences/gpsd >=sci-geosciences/libtcd-2.2.5_p2 x11-libs/libX11 x11-libs/libXaw3d[unicode(+)] x11-libs/libXaw3dXft x11-libs/libXft x11-libs/libXpm x11-libs/libXt
-DESCRIPTION=XTide provides tide and current predictions in a wide variety of formats
-EAPI=8
-HOMEPAGE=https://flaterco.com/xtide/
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop xdg
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=media-libs/libpng:= sci-geosciences/gpsd >=sci-geosciences/libtcd-2.2.5_p2 x11-libs/libX11 x11-libs/libXaw3d[unicode(+)] x11-libs/libXaw3dXft x11-libs/libXft x11-libs/libXpm x11-libs/libXt media-fonts/font-schumacher-misc
-SLOT=0
-SRC_URI=ftp://ftp.flaterco.com/xtide/xtide-2.15.1.tar.bz2
-_eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=204b96d15926600c3cba04ed4d7b143e
diff --git a/metadata/md5-cache/sci-geosciences/xtide-2.15.5 b/metadata/md5-cache/sci-geosciences/xtide-2.15.5
index e2770d04e8c8..b90909ea2d70 100644
--- a/metadata/md5-cache/sci-geosciences/xtide-2.15.5
+++ b/metadata/md5-cache/sci-geosciences/xtide-2.15.5
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://flaterco.com/xtide/
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=desktop xdg
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=media-libs/libpng:= sci-geosciences/gpsd:= >=sci-geosciences/libtcd-2.2.5_p2:= x11-libs/libX11 x11-libs/libXaw3dXft x11-libs/libXft x11-libs/libXpm x11-libs/libXt sys-libs/zlib media-fonts/font-schumacher-misc
 SLOT=0
 SRC_URI=https://flaterco.com/files/xtide/xtide-2.15.5.tar.xz
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=a92b03d0925f8ab1ab188886d671dc4d
+_md5_=6a7052c402a24319ae79df0d53deebfa
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index 3be402e0effd..a57cd35bdfda 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/hipBLAS-5.1.3 b/metadata/md5-cache/sci-libs/hipBLAS-5.1.3
new file mode 100644
index 000000000000..8805b034cce1
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/hipBLAS-5.1.3
@@ -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-util/hip sci-libs/rocBLAS:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?] sci-libs/rocSOLVER:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?]
+DESCRIPTION=ROCm BLAS marshalling library
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/hipBLAS
+INHERIT=cmake rocm
+IUSE=+amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip sci-libs/rocBLAS:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?] sci-libs/rocSOLVER:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?]
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 )
+SLOT=0/5.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-5.1.3.tar.gz -> hipBLAS-5.1.3.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	rocm	b9cbeeea0f6a3a703665d80185feb812	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=57df0baf730b4ce18aeb3acb5502c8f1
diff --git a/metadata/md5-cache/sci-libs/hipCUB-5.1.3 b/metadata/md5-cache/sci-libs/hipCUB-5.1.3
new file mode 100644
index 000000000000..6856e8902be7
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/hipCUB-5.1.3
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip sci-libs/rocPRIM:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?] benchmark? ( dev-cpp/benchmark ) test? ( dev-cpp/gtest )
+DESCRIPTION=Wrapper of rocPRIM or CUB for GPU parallel primitives
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/hipCUB
+INHERIT=cmake rocm
+IUSE=benchmark test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-util/hip sci-libs/rocPRIM:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?] benchmark? ( dev-cpp/benchmark ) test? ( dev-cpp/gtest )
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 )
+RESTRICT=!test? ( test )
+SLOT=0/5.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/hipCUB/archive/rocm-5.1.3.tar.gz -> hipCUB-5.1.3.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	rocm	b9cbeeea0f6a3a703665d80185feb812	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=7de6e962b2597459ebed4b5e7b5abb10
diff --git a/metadata/md5-cache/sci-libs/hipFFT-5.1.3 b/metadata/md5-cache/sci-libs/hipFFT-5.1.3
new file mode 100644
index 000000000000..0d33e64865de
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/hipFFT-5.1.3
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip:0/5.1 sci-libs/rocFFT:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?]
+DESCRIPTION=CU / ROCM agnostic hip FFT implementation
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/hipFFT
+INHERIT=cmake rocm
+IUSE=+amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip:0/5.1 sci-libs/rocFFT:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?]
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 )
+RESTRICT=test
+SLOT=0/5.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/hipFFT/archive/refs/tags/rocm-5.1.3.tar.gz -> hipFFT-rocm-5.1.3.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	rocm	b9cbeeea0f6a3a703665d80185feb812	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=a82f3733f851d2413b5363534b761b20
diff --git a/metadata/md5-cache/sci-libs/hipSPARSE-5.1.3 b/metadata/md5-cache/sci-libs/hipSPARSE-5.1.3
new file mode 100644
index 000000000000..ac9c09885239
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/hipSPARSE-5.1.3
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/rocm-cmake >=dev-util/cmake-3.22 test? ( dev-cpp/gtest ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/rocminfo dev-util/hip sci-libs/rocSPARSE:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?]
+DESCRIPTION=ROCm SPARSE marshalling library
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/hipSPARSE
+INHERIT=cmake edo rocm toolchain-funcs
+IUSE=test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/rocminfo dev-util/hip sci-libs/rocSPARSE:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?]
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 )
+RESTRICT=!test? ( test )
+SLOT=0/5.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-5.1.3.tar.gz -> hipSPARSE-5.1.tar.gz test? ( https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	rocm	b9cbeeea0f6a3a703665d80185feb812	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2b9e5ad7cb87739e136b9938e7ef4075
diff --git a/metadata/md5-cache/sci-libs/keras-2.10.0 b/metadata/md5-cache/sci-libs/keras-2.10.0
new file mode 100644
index 000000000000..1a005c4f5616
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/keras-2.10.0
@@ -0,0 +1,17 @@
+BDEPEND=app-arch/unzip >=dev-libs/protobuf-3.13.0 dev-java/java-config >=dev-util/bazel-4.2.2 >=dev-util/bazel-0.20 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=>=dev-libs/protobuf-3.13.0:= dev-python/absl-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/keras-applications-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/keras-preprocessing-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/tensorflow-2.10[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=Deep Learning for humans
+EAPI=8
+HOMEPAGE=https://keras.io/
+INHERIT=bazel distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=dev-libs/protobuf-3.13.0:= dev-python/absl-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/keras-applications-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/keras-preprocessing-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/tensorflow-2.10[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/keras-team/keras/archive/v2.10.0.tar.gz -> keras-2.10.0.tar.gz https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip -> bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
+_eclasses_=bazel	bba8ebd5d6542318a68bb236cf9ba0a9	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=03ff8f91a3ee0d73d14df7ceef0ad60b
diff --git a/metadata/md5-cache/sci-libs/miopen-4.3.0 b/metadata/md5-cache/sci-libs/miopen-4.3.0
deleted file mode 100644
index d168ac37401f..000000000000
--- a/metadata/md5-cache/sci-libs/miopen-4.3.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-libs/half:0/1 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-util/hip:0/4.3 >=dev-db/sqlite-3.17 dev-libs/ocl-icd dev-util/rocm-clang-ocl:0/4.3 sci-libs/rocBLAS:0/4.3 dev-libs/boost
-DESCRIPTION=AMD's Machine Intelligence Library
-EAPI=7
-HOMEPAGE=https://github.com/ROCmSoftwarePlatform/MIOpen
-INHERIT=cmake
-IUSE=debug test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-util/hip:0/4.3 >=dev-db/sqlite-3.17 dev-libs/ocl-icd dev-util/rocm-clang-ocl:0/4.3 sci-libs/rocBLAS:0/4.3 dev-libs/boost
-RESTRICT=!test? ( test )
-SLOT=0/4.3
-SRC_URI=https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-4.3.0.tar.gz -> MIOpen-4.3.0.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=ae667c9c454e8d6347c65244b29b894a
diff --git a/metadata/md5-cache/sci-libs/miopen-5.1.3 b/metadata/md5-cache/sci-libs/miopen-5.1.3
new file mode 100644
index 000000000000..ebf17af91915
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/miopen-5.1.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-libs/half:0/1 dev-util/rocm-cmake >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=>=dev-util/hip-5.1.3 >=dev-db/sqlite-3.17 sci-libs/rocBLAS:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?] >=dev-libs/boost-1.72 !!sys-devel/llvm:0
+DESCRIPTION=AMD's Machine Intelligence Library
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/MIOpen
+INHERIT=cmake flag-o-matic llvm rocm
+IUSE=debug test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-util/hip-5.1.3 >=dev-db/sqlite-3.17 sci-libs/rocBLAS:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?] >=dev-libs/boost-1.72
+RESTRICT=!test? ( test )
+SLOT=0/5.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/MIOpen/archive/rocm-5.1.3.tar.gz -> MIOpen-5.1.3.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	rocm	b9cbeeea0f6a3a703665d80185feb812	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=aebd3732b6f3bbdf75a1762399738638
diff --git a/metadata/md5-cache/sci-libs/rocBLAS-5.1.3 b/metadata/md5-cache/sci-libs/rocBLAS-5.1.3
new file mode 100644
index 000000000000..b7adeb2325bc
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocBLAS-5.1.3
@@ -0,0 +1,16 @@
+BDEPEND=dev-util/rocm-cmake:0/5.1 dev-util/Tensile:0/5.1 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( app-doc/doxygen media-gfx/graphviz )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip dev-libs/msgpack test? ( virtual/blas dev-cpp/gtest sys-libs/libomp ) benchmark? ( virtual/blas sys-libs/libomp )
+DESCRIPTION=AMD's library for BLAS on ROCm
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocBLAS
+INHERIT=cmake docs edo multiprocessing prefix rocm
+IUSE=benchmark test doc +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
+KEYWORDS=~amd64
+LICENSE=BSD
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 )
+RESTRICT=!test? ( test )
+SLOT=0/5.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-5.1.3.tar.gz -> rocm-rocBLAS-5.1.3.tar.gz https://media.githubusercontent.com/media/littlewu2508/littlewu2508.github.io/main/gentoo-distfiles/rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	docs	8ed2a8a28ff109e7a3582c9abb7fe327	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	rocm	b9cbeeea0f6a3a703665d80185feb812	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=cc101fa41f5b96a7c7457cdc02cdc4f8
diff --git a/metadata/md5-cache/sci-libs/rocFFT-5.1.3 b/metadata/md5-cache/sci-libs/rocFFT-5.1.3
new file mode 100644
index 000000000000..59407dcbc3bb
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocFFT-5.1.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-cpp/gtest dev-libs/boost >=sci-libs/fftw-3 sys-libs/libomp ) >=dev-util/cmake-3.22 dev-util/rocm-cmake:0/5.1 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DEPEND=dev-util/hip python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+DESCRIPTION=Next generation FFT implementation for ROCm
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocFFT
+INHERIT=cmake check-reqs edo multiprocessing python-r1 rocm
+IUSE=benchmark perfscripts test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=perfscripts? ( >=media-gfx/asymptote-2.61 dev-texlive/texlive-latex dev-tex/latexmk sys-apps/texinfo dev-python/sympy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/scipy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=perfscripts? ( benchmark ) || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) || ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 )
+RESTRICT=!test? ( test )
+SLOT=0/5.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-5.1.3.tar.gz -> rocFFT-5.1.3.tar.gz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	rocm	b9cbeeea0f6a3a703665d80185feb812	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=07c1d38db3e250b8ed8f162196fe538a
diff --git a/metadata/md5-cache/sci-libs/rocPRIM-5.1.3 b/metadata/md5-cache/sci-libs/rocPRIM-5.1.3
new file mode 100644
index 000000000000..a01b0949831c
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocPRIM-5.1.3
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/rocm-cmake >=dev-util/cmake-3.22 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip benchmark? ( dev-cpp/benchmark ) test? ( dev-cpp/gtest )
+DESCRIPTION=HIP parallel primitives for developing performant GPU-accelerated code on ROCm
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocPRIM
+INHERIT=cmake rocm
+IUSE=benchmark test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip benchmark? ( dev-cpp/benchmark ) test? ( dev-cpp/gtest )
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 )
+RESTRICT=!test? ( test )
+SLOT=0/5.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/rocPRIM/archive/rocm-5.1.3.tar.gz -> rocPRIM-5.1.3.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	rocm	b9cbeeea0f6a3a703665d80185feb812	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=356c750a03c041ca5fbcb8bc86653b5f
diff --git a/metadata/md5-cache/sci-libs/rocRAND-5.1.3 b/metadata/md5-cache/sci-libs/rocRAND-5.1.3
new file mode 100644
index 000000000000..a7c2a7363119
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocRAND-5.1.3
@@ -0,0 +1,17 @@
+BDEPEND=dev-util/rocm-cmake >=dev-util/cmake-3.22 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip dev-util/rocm-cmake test? ( dev-cpp/gtest )
+DESCRIPTION=Generate pseudo-random and quasi-random numbers
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocRAND
+INHERIT=cmake rocm
+IUSE=benchmark test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 )
+RESTRICT=!test? ( test )
+SLOT=0/5.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/rocRAND/archive/rocm-5.1.3.tar.gz -> rocRAND-5.1.3.tar.gz https://github.com/ROCmSoftwarePlatform/hipRAND/archive/de941a7eb9ede2a862d719cd3ca23234a3692d07.tar.gz -> hipRAND-de941a7eb9ede2a862d719cd3ca23234a3692d07.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	rocm	b9cbeeea0f6a3a703665d80185feb812	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=2aa37a2c03bcb4fc678adce2eed2be42
diff --git a/metadata/md5-cache/sci-libs/rocSOLVER-5.1.3 b/metadata/md5-cache/sci-libs/rocSOLVER-5.1.3
new file mode 100644
index 000000000000..468a9d8a7784
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocSOLVER-5.1.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-cpp/gtest >=dev-util/cmake-3.22 virtual/blas ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip sci-libs/rocBLAS:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?] =dev-libs/libfmt-8* benchmark? ( virtual/blas )
+DESCRIPTION=Implementation of a subset of LAPACK functionality on the ROCm platform
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocSOLVER
+INHERIT=cmake edo rocm
+IUSE=test benchmark +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
+KEYWORDS=~amd64
+LICENSE=BSD
+RDEPEND=dev-util/hip sci-libs/rocBLAS:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?] =dev-libs/libfmt-8* benchmark? ( virtual/blas )
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 )
+RESTRICT=!test? ( test )
+SLOT=0/5.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-5.1.3.tar.gz -> rocSOLVER-5.1.3.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	rocm	b9cbeeea0f6a3a703665d80185feb812	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=4aa107d6ef560393d5f58d034bf5aa0f
diff --git a/metadata/md5-cache/sci-libs/rocSPARSE-5.1.3 b/metadata/md5-cache/sci-libs/rocSPARSE-5.1.3
new file mode 100644
index 000000000000..ea554e14b472
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocSPARSE-5.1.3
@@ -0,0 +1,17 @@
+BDEPEND=test? ( dev-cpp/gtest >=dev-util/cmake-3.22 || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-python/pyyaml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-python/pyyaml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/pyyaml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/pyyaml[python_targets_python3_8(-)] ) ) ) benchmark? ( app-admin/chrpath ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-util/hip sci-libs/rocPRIM:0/5.1
+DESCRIPTION=Basic Linear Algebra Subroutines for sparse computation
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocSPARSE
+INHERIT=cmake edo python-any-r1 toolchain-funcs rocm
+IUSE=benchmark test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=dev-util/hip sci-libs/rocPRIM:0/5.1
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 )
+RESTRICT=!test? ( test )
+SLOT=0/5.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-5.1.3.tar.gz -> rocSPARSE-5.1.3.tar.gz test? ( https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz https://sparse.tamu.edu/MM/Cote/mplate.tar.gz -> rocSPARSE_mplate.tar.gz https://sparse.tamu.edu/MM/Bai/qc2534.tar.gz -> rocSPARSE_qc2534.tar.gz https://sparse.tamu.edu/MM/Chevron/Chevron2.tar.gz -> rocSPARSE_Chevron2.tar.gz https://sparse.tamu.edu/MM/Chevron/Chevron3.tar.gz -> rocSPARSE_Chevron3.tar.gz https://sparse.tamu.edu/MM/Chevron/Chevron4.tar.gz -> rocSPARSE_Chevron4.tar.gz )
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	rocm	b9cbeeea0f6a3a703665d80185feb812	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=aee2db77cfe1aca1241c6cdb4bdfc2fa
diff --git a/metadata/md5-cache/sci-libs/rocThrust-5.1.3 b/metadata/md5-cache/sci-libs/rocThrust-5.1.3
new file mode 100644
index 000000000000..5637348c4f11
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/rocThrust-5.1.3
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-util/cmake-3.22 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dev-util/hip sci-libs/rocPRIM:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?] test? ( dev-cpp/gtest )
+DESCRIPTION=HIP back-end for the parallel algorithm library Thrust
+EAPI=8
+HOMEPAGE=https://github.com/ROCmSoftwarePlatform/rocThrust
+INHERIT=cmake rocm
+IUSE=benchmark test +amdgpu_targets_gfx906 +amdgpu_targets_gfx908 +amdgpu_targets_gfx90a +amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=dev-util/hip sci-libs/rocPRIM:0/5.1[amdgpu_targets_gfx906(-)?,amdgpu_targets_gfx908(-)?,amdgpu_targets_gfx90a(-)?,amdgpu_targets_gfx1030(-)?,amdgpu_targets_gfx803(-)?,amdgpu_targets_gfx900(-)?,amdgpu_targets_gfx1010(-)?,amdgpu_targets_gfx1011(-)?,amdgpu_targets_gfx1012(-)?,amdgpu_targets_gfx1031(-)?] test? ( dev-cpp/gtest )
+REQUIRED_USE=|| ( amdgpu_targets_gfx906 amdgpu_targets_gfx908 amdgpu_targets_gfx90a amdgpu_targets_gfx1030 amdgpu_targets_gfx803 amdgpu_targets_gfx900 amdgpu_targets_gfx1010 amdgpu_targets_gfx1011 amdgpu_targets_gfx1012 amdgpu_targets_gfx1031 )
+RESTRICT=!test? ( test )
+SLOT=0/5.1
+SRC_URI=https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-5.1.3.tar.gz -> rocThrust-5.1.3.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	rocm	b9cbeeea0f6a3a703665d80185feb812	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=46cd1fdaba0f822cb706340904aa8722
diff --git a/metadata/md5-cache/sci-libs/tensorflow-2.10.0 b/metadata/md5-cache/sci-libs/tensorflow-2.10.0
new file mode 100644
index 000000000000..6f75d2a80a3e
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/tensorflow-2.10.0
@@ -0,0 +1,18 @@
+BDEPEND=app-arch/unzip >=dev-libs/protobuf-3.8.0 dev-java/java-config >=dev-util/bazel-5.1.1 cuda? ( >=dev-util/nvidia-cuda-toolkit-9.1[profiler] ) !python? ( dev-lang/python ) python? ( dev-python/cython dev-python/mock >=dev-python/grpcio-tools-1.28 ) >=dev-util/bazel-0.20
+DEFINED_PHASES=compile configure install prepare pretend setup unpack
+DEPEND=app-arch/snappy >=dev-cpp/abseil-cpp-20211102-r2:= dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev-libs/icu:= >=dev-libs/jsoncpp-1.9.2:= >=dev-libs/nsync-1.25.0 dev-libs/openssl:0= >=dev-libs/protobuf-3.13.0:= >=dev-libs/re2-0.2019.06.01:= media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.28:= net-misc/curl sys-libs/zlib >=sys-apps/hwloc-2:= cuda? ( <dev-util/nvidia-cuda-toolkit-11.8_pre:=[profiler] =dev-libs/cudnn-8* ) mpi? ( virtual/mpi ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-libs/flatbuffers-2.0.6:= dev-python/absl-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/astor-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/astunparse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/clang-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dill[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flatbuffers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/gast-0.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-pasta-0.1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/opt-einsum-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/grpcio-1.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=net-libs/google-cloud-cpp-0.10.0 >=sci-visualization/tensorboard-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python? ( dev-python/mock dev-python/setuptools )
+DESCRIPTION=Computation framework using data flow graphs for scalable machine learning
+EAPI=8
+HOMEPAGE=https://www.tensorflow.org/
+INHERIT=bazel check-reqs cuda distutils-r1 flag-o-matic prefix toolchain-funcs
+IUSE=cuda mpi +python xla cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_x86_fma3 cpu_flags_x86_fma4 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+PDEPEND=python? ( >=sci-libs/keras-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sci-libs/tensorflow-estimator-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+RDEPEND=app-arch/snappy >=dev-cpp/abseil-cpp-20211102-r2:= dev-db/lmdb dev-db/sqlite dev-libs/double-conversion dev-libs/icu:= >=dev-libs/jsoncpp-1.9.2:= >=dev-libs/nsync-1.25.0 dev-libs/openssl:0= >=dev-libs/protobuf-3.13.0:= >=dev-libs/re2-0.2019.06.01:= media-libs/giflib media-libs/libjpeg-turbo media-libs/libpng:0 >=net-libs/grpc-1.28:= net-misc/curl sys-libs/zlib >=sys-apps/hwloc-2:= cuda? ( <dev-util/nvidia-cuda-toolkit-11.8_pre:=[profiler] =dev-libs/cudnn-8* ) mpi? ( virtual/mpi ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-libs/flatbuffers-2.0.6:= dev-python/absl-py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/astor-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/astunparse[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/clang-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/dill[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/flatbuffers[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/gast-0.3.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/h5py[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/numpy-1.19[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-pasta-0.1.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/opt-einsum-3.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/protobuf-python-3.13.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/termcolor[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/typing-extensions[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/grpcio-1.28[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wrapt-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=net-libs/google-cloud-cpp-0.10.0 >=sci-visualization/tensorboard-2.10[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
+REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/tensorflow/tensorflow/archive/v2.10.0.tar.gz -> tensorflow-2.10.0.tar.gz https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-2.10.0.tar.bz2 https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz -> bazelbuild-platforms-0.0.5.tar.gz https://github.com/bazelbuild/apple_support/releases/download/0.12.1/apple_support.0.12.1.tar.gz https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz https://github.com/bazelbuild/bazel-toolchains/archive/ea243d43269df23de03a797cff2347e1fc3d02bb.tar.gz -> bazel-toolchains-ea243d43269df23de03a797cff2347e1fc3d02bb.tar.gz https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip https://github.com/bazelbuild/rules_apple/releases/download/0.33.0/rules_apple.0.33.0.tar.gz https://github.com/bazelbuild/rules_cc/archive/081771d4a0e9d7d3aa0eed2ef389fa4700dfb23e.tar.gz -> bazelbuild-rules_cc-081771d4a0e9d7d3aa0eed2ef389fa4700dfb23e.tar.gz https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz -> bazelbuild-rules_pkg-0.7.0.tar.gz https://github.com/bazelbuild/rules_proto/archive/11bf7c25e666dd7ddacbcd4d4c4a9de7a25175f8.tar.gz -> bazelbuild-rules_proto-11bf7c25e666dd7ddacbcd4d4c4a9de7a25175f8.tar.gz https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz https://github.com/bazelbuild/rules_swift/releases/download/0.25.0/rules_swift.0.25.0.tar.gz -> bazelbuild-rules_swift.0.25.0.tar.gz https://github.com/dmlc/dlpack/archive/9351cf542ab478499294864ff3acfdab5c8c5f3d.tar.gz -> dlpack-9351cf542ab478499294864ff3acfdab5c8c5f3d.tar.gz https://github.com/google/farmhash/archive/0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz -> farmhash-0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz https://github.com/google/gemmlowp/archive/e844ffd17118c1e17d94e1ba4354c075a4577b88.zip -> gemmlowp-e844ffd17118c1e17d94e1ba4354c075a4577b88.zip https://github.com/google/highwayhash/archive/c13d28517a4db259d738ea4886b1f00352a3cc33.tar.gz -> highwayhash-c13d28517a4db259d738ea4886b1f00352a3cc33.tar.gz https://github.com/google/re2/archive/a276a8c738735a0fe45a6ee590fe2df69bcf4502.tar.gz -> re2-a276a8c738735a0fe45a6ee590fe2df69bcf4502.tar.gz https://github.com/google/ruy/archive/841ea4172ba904fe3536789497f9565f2ef64129.zip -> ruy-841ea4172ba904fe3536789497f9565f2ef64129.zip https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz https://github.com/llvm/llvm-project/archive/0538e5431afdb1fa05bdcedf70ee502ccfcd112a.tar.gz -> llvm-project-0538e5431afdb1fa05bdcedf70ee502ccfcd112a.tar.gz https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz https://github.com/mborgerding/kissfft/archive/131.1.0.tar.gz -> kissfft-131.1.0.tar.gz https://github.com/oneapi-src/oneDNN/archive/refs/tags/v2.6.1.tar.gz -> oneDNN-v2.6.1.tar.gz https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.zip -> pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip https://github.com/pytorch/cpuinfo/archive/5e63739504f0f8e18e941bd63b2d6d42536c7d90.tar.gz -> pytorch-cpuinfo-5e63739504f0f8e18e941bd63b2d6d42536c7d90.tar.gz https://github.com/tensorflow/runtime/archive/6ca793b5d862ef6c50f242d77a811f06cce9b60a.tar.gz -> tensorflow-runtime-6ca793b5d862ef6c50f242d77a811f06cce9b60a.tar.gz https://gitlab.com/libeigen/eigen/-/archive/0e187141679fdb91da33249d18cb79a011c0e2ea/eigen-0e187141679fdb91da33249d18cb79a011c0e2ea.tar.gz https://github.com/google/XNNPACK/archive/6b409ac0a3090ebe74d0cdfb494c4cd91485ad39.zip -> XNNPACK-6b409ac0a3090ebe74d0cdfb494c4cd91485ad39.zip https://github.com/Maratyszcza/pthreadpool/archive/b8374f80e42010941bda6c85b0e3f1a1bd77a1e0.zip -> pthreadpool-b8374f80e42010941bda6c85b0e3f1a1bd77a1e0.zip https://github.com/Maratyszcza/FP16/archive/4dfe081cf6bcd15db339cf2680b9281b8451eeb3.zip -> FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3.zip https://github.com/Maratyszcza/FXdiv/archive/63058eff77e11aa15bf531df5dd34395ec3017c8.zip -> FXdiv-63058eff77e11aa15bf531df5dd34395ec3017c8.zip cuda? ( https://github.com/NVIDIA/cudnn-frontend/archive/v0.6.2.zip -> cudnn-frontend-v0.6.2.zip https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip https://github.com/nvidia/nccl/archive/v2.12.12-1.tar.gz -> nvidia-nccl-v2.12.12-1.tar.gz ) python? ( https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt )
+_eclasses_=bazel	bba8ebd5d6542318a68bb236cf9ba0a9	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cuda	15edbf8fd9df209322f42c06ecf59a96	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=83972023347fa55647991a27340771d1
diff --git a/metadata/md5-cache/sci-libs/tensorflow-estimator-2.10 b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.10
new file mode 100644
index 000000000000..d523da78ec0e
--- /dev/null
+++ b/metadata/md5-cache/sci-libs/tensorflow-estimator-2.10
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip dev-java/java-config >=dev-util/bazel-4.2.2 >=dev-util/bazel-0.20 python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=sci-libs/tensorflow[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/keras[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DESCRIPTION=A high-level TensorFlow API that greatly simplifies machine learning programming
+EAPI=8
+HOMEPAGE=https://www.tensorflow.org/
+INHERIT=bazel distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=sci-libs/tensorflow[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] sci-libs/keras[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://github.com/tensorflow/estimator/archive/v2.10.tar.gz -> tensorflow-estimator-2.10.tar.gz https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip -> bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
+_eclasses_=bazel	bba8ebd5d6542318a68bb236cf9ba0a9	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=54f5b037ef85be553cac64fb74335176
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index e9888767c30a..d962731d993f 100644
Binary files a/metadata/md5-cache/sci-mathematics/Manifest.gz and b/metadata/md5-cache/sci-mathematics/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.11.2 b/metadata/md5-cache/sci-mathematics/z3-4.11.2
index 02675e54289e..70d4d063c912 100644
--- a/metadata/md5-cache/sci-mathematics/z3-4.11.2
+++ b/metadata/md5-cache/sci-mathematics/z3-4.11.2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://github.com/Z3Prover/z3/
 INHERIT=cmake-multilib java-pkg-opt-2 python-single-r1
 IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 java python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=MIT
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 SLOT=0/4.11
 SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.11.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5a5629cb4238258fe6311f27108e2723
+_md5_=1f28a6e6b2939b364900c7d99d41acc9
diff --git a/metadata/md5-cache/sci-misc/Manifest.gz b/metadata/md5-cache/sci-misc/Manifest.gz
index 16223e54aa7a..73337eec4176 100644
Binary files a/metadata/md5-cache/sci-misc/Manifest.gz and b/metadata/md5-cache/sci-misc/Manifest.gz differ
diff --git a/metadata/md5-cache/sci-misc/cdfplayer-12.2.0 b/metadata/md5-cache/sci-misc/cdfplayer-12.2.0
index 90f18881027a..edc620e85125 100644
--- a/metadata/md5-cache/sci-misc/cdfplayer-12.2.0
+++ b/metadata/md5-cache/sci-misc/cdfplayer-12.2.0
@@ -10,4 +10,4 @@ RESTRICT=strip mirror bindist fetch
 SLOT=0
 SRC_URI=WolframPlayer_12.2.0_LINUX.sh
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	versionator	d3fb3ba33acc3bbbdc4d7970227c100d
-_md5_=5f269bddd19058f11eb5ea8447485de9
+_md5_=e301ae90b2aef31c484fb70b6b139032
diff --git a/metadata/md5-cache/sci-visualization/Manifest.gz b/metadata/md5-cache/sci-visualization/Manifest.gz
index bb68fbaa43bf..215a05df3083 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/tensorboard-2.10.0 b/metadata/md5-cache/sci-visualization/tensorboard-2.10.0
new file mode 100644
index 000000000000..fe70952b20c8
--- /dev/null
+++ b/metadata/md5-cache/sci-visualization/tensorboard-2.10.0
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+DEFINED_PHASES=install prepare
+DESCRIPTION=TensorFlow's Visualization Toolkit
+EAPI=8
+HOMEPAGE=https://www.tensorflow.org/
+INHERIT=python-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+PDEPEND=sci-libs/tensorflow[python,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-python/bleach[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-1.6.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/google-auth-oauthlib-0.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/grpcio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/html5lib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/markdown[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/protobuf-python[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-41[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/werkzeug[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/scipy-1.4.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/py3/t/tensorboard/tensorboard-2.10.0-py3-none-any.whl -> tensorboard-2.10.0.zip
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=29a7aa722f42af00e610759ad98cff53
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index 6ed6b0588cf0..26c552baaaaa 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/baobab-43.0 b/metadata/md5-cache/sys-apps/baobab-43.0
new file mode 100644
index 000000000000..a14aa942bc34
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/baobab-43.0
@@ -0,0 +1,15 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) || ( dev-lang/vala:0.56 ) >=gui-libs/libadwaita-1.2:1=[vala] dev-util/itstool >=sys-devel/gettext-0.21 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.44:2 >=gui-libs/gtk-4.4.0:4 >=gui-libs/libadwaita-1.2:1=
+DESCRIPTION=Disk usage browser for GNOME
+EAPI=8
+HOMEPAGE=https://wiki.gnome.org/Apps/Baobab
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=gnome.org gnome2-utils meson python-any-r1 vala xdg
+KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2+ FDL-1.1+
+RDEPEND=>=dev-libs/glib-2.44:2 >=gui-libs/gtk-4.4.0:4 >=gui-libs/libadwaita-1.2:1=
+SLOT=0
+SRC_URI=mirror://gnome/sources/baobab/43/baobab-43.0.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	vala	160a8a30a6cb9aa601e5441c643a7c61	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=25f73d17b33d5a2820dec3c8b2155369
diff --git a/metadata/md5-cache/sys-apps/dbus-1.14.0-r5 b/metadata/md5-cache/sys-apps/dbus-1.14.0-r6
similarity index 82%
rename from metadata/md5-cache/sys-apps/dbus-1.14.0-r5
rename to metadata/md5-cache/sys-apps/dbus-1.14.0-r6
index cfc8c4a82466..c2bc3a8db8c5 100644
--- a/metadata/md5-cache/sys-apps/dbus-1.14.0-r5
+++ b/metadata/md5-cache/sys-apps/dbus-1.14.0-r6
@@ -1,6 +1,6 @@
 BDEPEND=acct-user/messagebus app-text/xmlto app-text/docbook-xml-dtd:4.4 sys-devel/autoconf-archive virtual/pkgconfig 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 >=sys-devel/libtool-2.4 virtual/pkgconfig test? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
 DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) dev-libs/expat test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-libs/glib-2.40:2 )
+DEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-process/audit sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) dev-libs/expat test? ( || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-libs/glib-2.40:2 )
 DESCRIPTION=A message bus system, a simple way for applications to talk to each other
 EAPI=7
 HOMEPAGE=https://www.freedesktop.org/wiki/Software/dbus/
@@ -8,10 +8,10 @@ INHERIT=autotools flag-o-matic linux-info python-any-r1 readme.gentoo-r1 systemd
 IUSE=debug doc elogind selinux static-libs systemd test X 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=|| ( AFL-2.1 GPL-2 )
-RDEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) acct-user/messagebus selinux? ( sec-policy/selinux-dbus ) systemd? ( virtual/tmpfiles )
+RDEPEND=>=dev-libs/expat-2.1.0 elogind? ( sys-auth/elogind ) selinux? ( sys-process/audit sys-libs/libselinux ) systemd? ( sys-apps/systemd:0= ) X? ( x11-libs/libX11 x11-libs/libXt ) acct-user/messagebus selinux? ( sec-policy/selinux-dbus ) systemd? ( virtual/tmpfiles )
 REQUIRED_USE=?? ( elogind systemd )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dbus.freedesktop.org/releases/dbus/dbus-1.14.0.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8d3a3c6a6b877bf483446a0ed7706c99
+_md5_=d03f138b7d7a0fa1dccfbb7fa182d80a
diff --git a/metadata/md5-cache/sys-apps/dmidecode-3.3 b/metadata/md5-cache/sys-apps/dmidecode-3.3
deleted file mode 100644
index 5ff8f0e3e5c4..000000000000
--- a/metadata/md5-cache/sys-apps/dmidecode-3.3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile postinst prepare
-DESCRIPTION=DMI (Desktop Management Interface) table related utilities
-EAPI=7
-HOMEPAGE=https://www.nongnu.org/dmidecode/
-INHERIT=toolchain-funcs
-IUSE=selinux
-KEYWORDS=-* ~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv x86 ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=selinux? ( sec-policy/selinux-dmidecode )
-SLOT=0
-SRC_URI=https://savannah.nongnu.org/download/dmidecode/dmidecode-3.3.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=55bac27aa6bcd2c0d37d9822b1326f40
diff --git a/metadata/md5-cache/sys-apps/file-5.42 b/metadata/md5-cache/sys-apps/file-5.42
deleted file mode 100644
index b56b2d68988a..000000000000
--- a/metadata/md5-cache/sys-apps/file-5.42
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-file ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=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(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-DESCRIPTION=Identify a file's format by scanning binary data for patterns
-EAPI=7
-HOMEPAGE=https://www.darwinsys.com/file/
-INHERIT=distutils-r1 libtool toolchain-funcs multilib-minimal verify-sig
-IUSE=bzip2 lzma python seccomp static-libs zlib python_targets_python3_8 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 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD-2
-RDEPEND=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(-)?] ) lzma? ( app-arch/xz-utils[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) python? ( !dev-python/python-magic ) seccomp? ( sys-libs/libseccomp[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
-SLOT=0
-SRC_URI=ftp://ftp.astron.com/pub/file/file-5.42.tar.gz verify-sig? ( ftp://ftp.astron.com/pub/file/file-5.42.tar.gz.asc )
-_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=78820a2336b8dd160f339321cfc2bac6
diff --git a/metadata/md5-cache/sys-apps/gentoo-functions-0.14 b/metadata/md5-cache/sys-apps/gentoo-functions-0.14
deleted file mode 100644
index 181be50361a4..000000000000
--- a/metadata/md5-cache/sys-apps/gentoo-functions-0.14
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Base functions required by all Gentoo systems
-EAPI=7
-HOMEPAGE=https://gitweb.gentoo.org/proj/gentoo-functions.git
-INHERIT=toolchain-funcs flag-o-matic
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/gentoo-functions-0.14.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e0372e98c158c730f41b2484e3895829
diff --git a/metadata/md5-cache/sys-apps/gentoo-functions-0.15 b/metadata/md5-cache/sys-apps/gentoo-functions-0.15
deleted file mode 100644
index 0bcf761704f5..000000000000
--- a/metadata/md5-cache/sys-apps/gentoo-functions-0.15
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Base functions required by all Gentoo systems
-EAPI=7
-HOMEPAGE=https://gitweb.gentoo.org/proj/gentoo-functions.git
-INHERIT=toolchain-funcs flag-o-matic
-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=GPL-2
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/gentoo-functions-0.15.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3830153840c42d50787fa6fb1872cdd7
diff --git a/metadata/md5-cache/sys-apps/gentoo-functions-0.16 b/metadata/md5-cache/sys-apps/gentoo-functions-0.16
deleted file mode 100644
index 82a79b6461b9..000000000000
--- a/metadata/md5-cache/sys-apps/gentoo-functions-0.16
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=configure
-DESCRIPTION=Base functions required by all Gentoo systems
-EAPI=8
-HOMEPAGE=https://gitweb.gentoo.org/proj/gentoo-functions.git
-INHERIT=toolchain-funcs flag-o-matic
-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=GPL-2
-SLOT=0
-SRC_URI=https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/gentoo-functions-0.16.tar.bz2
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=dbc7b0988e8df080d372e952650c2309
diff --git a/metadata/md5-cache/sys-apps/gptfdisk-1.0.9-r2 b/metadata/md5-cache/sys-apps/gptfdisk-1.0.9-r2
new file mode 100644
index 000000000000..e81a3da49004
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/gptfdisk-1.0.9-r2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=install prepare
+DEPEND=!static? ( dev-libs/popt ncurses? ( sys-libs/ncurses:=[unicode(+)] ) kernel_linux? ( sys-apps/util-linux ) ) static? ( dev-libs/popt[static-libs(+)] ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] ) kernel_linux? ( sys-apps/util-linux[static-libs(+)] ) ) virtual/pkgconfig
+DESCRIPTION=GPT partition table manipulator for Linux
+EAPI=8
+HOMEPAGE=https://www.rodsbooks.com/gdisk/
+INHERIT=flag-o-matic toolchain-funcs
+IUSE=ncurses static
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=!static? ( dev-libs/popt ncurses? ( sys-libs/ncurses:=[unicode(+)] ) kernel_linux? ( sys-apps/util-linux ) )
+SLOT=0
+SRC_URI=mirror://sourceforge/gptfdisk/gptfdisk/1.0.9/gptfdisk-1.0.9.tar.gz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1c9ee0db877abc44da9d079e8abd0e29
diff --git a/metadata/md5-cache/sys-apps/hdparm-9.63 b/metadata/md5-cache/sys-apps/hdparm-9.63
deleted file mode 100644
index 48bc9696c62c..000000000000
--- a/metadata/md5-cache/sys-apps/hdparm-9.63
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Utility to change hard drive performance parameters
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/hdparm/
-INHERIT=toolchain-funcs flag-o-matic
-IUSE=static
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD GPL-2
-SLOT=0
-SRC_URI=mirror://sourceforge/hdparm/hdparm-9.63.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c9b794864bf37e9eeba2538e22353ccb
diff --git a/metadata/md5-cache/sys-apps/irqbalance-1.8.0-r1 b/metadata/md5-cache/sys-apps/irqbalance-1.8.0-r1
deleted file mode 100644
index db222b633f0b..000000000000
--- a/metadata/md5-cache/sys-apps/irqbalance-1.8.0-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 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install prepare setup
-DEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) tui? ( sys-libs/ncurses:=[unicode(+)] )
-DESCRIPTION=Distribute hardware interrupts across processors on a multiprocessor system
-EAPI=7
-HOMEPAGE=https://github.com/Irqbalance/irqbalance
-INHERIT=autotools systemd linux-info
-IUSE=caps +numa selinux tui
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 x86
-LICENSE=GPL-2
-RDEPEND=dev-libs/glib:2 caps? ( sys-libs/libcap-ng ) numa? ( sys-process/numactl ) tui? ( sys-libs/ncurses:=[unicode(+)] ) selinux? ( sec-policy/selinux-irqbalance )
-SLOT=0
-SRC_URI=https://github.com/Irqbalance/irqbalance/archive/v1.8.0.tar.gz -> irqbalance-1.8.0.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1d0fa60878f4901f9f5a647f7fe5e100
diff --git a/metadata/md5-cache/sys-apps/kbd-2.4.0 b/metadata/md5-cache/sys-apps/kbd-2.4.0
deleted file mode 100644
index 4809558e63f3..000000000000
--- a/metadata/md5-cache/sys-apps/kbd-2.4.0
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig test? ( dev-libs/check )
-DEFINED_PHASES=configure install prepare unpack
-DEPEND=app-arch/gzip pam? ( !app-misc/vlock sys-libs/pam )
-DESCRIPTION=Keyboard and console utilities
-EAPI=7
-HOMEPAGE=http://kbd-project.org/
-IUSE=nls pam test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=app-arch/gzip pam? ( !app-misc/vlock sys-libs/pam )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/kbd/kbd-2.4.0.tar.xz
-_md5_=d9cda450b1541a7e187c31ca49e8fea3
diff --git a/metadata/md5-cache/sys-apps/kexec-tools-2.0.23 b/metadata/md5-cache/sys-apps/kexec-tools-2.0.23
deleted file mode 100644
index 7ad7f31bdce2..000000000000
--- a/metadata/md5-cache/sys-apps/kexec-tools-2.0.23
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=app-portage/elt-patches-20170815 virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
-DESCRIPTION=Load another kernel from the currently executing Linux kernel
-EAPI=7
-HOMEPAGE=https://kernel.org/pub/linux/utils/kernel/kexec/
-INHERIT=libtool linux-info systemd
-IUSE=booke lzma xen zlib
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-RDEPEND=lzma? ( app-arch/xz-utils ) zlib? ( sys-libs/zlib )
-REQUIRED_USE=lzma? ( zlib )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/kernel/kexec/kexec-tools-2.0.23.tar.xz
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=97db8abc14bdfbb9aebdbb9a1f310d12
diff --git a/metadata/md5-cache/sys-apps/kmod-29 b/metadata/md5-cache/sys-apps/kmod-29
deleted file mode 100644
index 9961b15de806..000000000000
--- a/metadata/md5-cache/sys-apps/kmod-29
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( dev-util/gtk-doc dev-util/gtk-doc-am ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.4.4 )
-DESCRIPTION=library and tools for managing linux kernel modules
-EAPI=7
-HOMEPAGE=https://git.kernel.org/?p=utils/kernel/kmod/kmod.git
-INHERIT=autotools bash-completion-r1 multilib python-r1
-IUSE=debug doc +lzma pkcs7 python static-libs +tools +zlib zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=LGPL-2
-RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:0= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.4.4 )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6cdba75f89363ca03e7f30e93298376d
diff --git a/metadata/md5-cache/sys-apps/kmod-29-r2 b/metadata/md5-cache/sys-apps/kmod-29-r2
deleted file mode 100644
index 60a66be74fed..000000000000
--- a/metadata/md5-cache/sys-apps/kmod-29-r2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=doc? ( dev-util/gtk-doc dev-util/gtk-doc-am ) lzma? ( virtual/pkgconfig ) python? ( dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] virtual/pkgconfig ) zlib? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst prepare
-DEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.5.2-r1:= )
-DESCRIPTION=library and tools for managing linux kernel modules
-EAPI=8
-HOMEPAGE=https://git.kernel.org/?p=utils/kernel/kmod/kmod.git
-INHERIT=autotools libtool bash-completion-r1 python-r1
-IUSE=debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=LGPL-2
-RDEPEND=!sys-apps/module-init-tools !sys-apps/modutils !<sys-apps/openrc-0.13.8 !<sys-apps/systemd-216-r3 lzma? ( >=app-arch/xz-utils-5.0.4-r1 ) python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) pkcs7? ( >=dev-libs/openssl-1.1.0:= ) zlib? ( >=sys-libs/zlib-1.2.6 ) zstd? ( >=app-arch/zstd-1.5.2-r1:= )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/utils/kernel/kmod/kmod-29.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=801f2fba09f497ca75b936e1807d9703
diff --git a/metadata/md5-cache/sys-apps/pciutils-3.8.0 b/metadata/md5-cache/sys-apps/pciutils-3.8.0
deleted file mode 100644
index 06ec5a0c1025..000000000000
--- a/metadata/md5-cache/sys-apps/pciutils-3.8.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-apps/which || ( >=sys-devel/binutils-2.37:* sys-devel/lld sys-devel/native-cctools ) kmod? ( virtual/pkgconfig )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=kmod? ( sys-apps/kmod ) udev? ( >=virtual/libudev-208[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? ( zlib? ( >=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(-)?] ) ) !static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) )
-DESCRIPTION=Various utilities dealing with the PCI bus
-EAPI=7
-HOMEPAGE=https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git
-INHERIT=toolchain-funcs multilib-minimal flag-o-matic
-IUSE=dns +kmod static-libs +udev zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=kmod? ( sys-apps/kmod ) udev? ( >=virtual/libudev-208[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? ( zlib? ( >=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(-)?] ) ) !static-libs? ( zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) sys-apps/hwdata
-REQUIRED_USE=static-libs? ( !udev )
-SLOT=0
-SRC_URI=https://mj.ucw.cz/download/linux/pci/pciutils-3.8.0.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=6f1db975b4bad4e557de8b4937ab17f8
diff --git a/metadata/md5-cache/sys-apps/pcsc-lite-1.9.8-r2 b/metadata/md5-cache/sys-apps/pcsc-lite-1.9.8-r2
deleted file mode 100644
index a10fee54e919..000000000000
--- a/metadata/md5-cache/sys-apps/pcsc-lite-1.9.8-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/flex virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm setup test
-DEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/libudev:= ) policykit? ( >=sys-auth/polkit-0.111 ) acct-group/openct acct-group/pcscd acct-user/pcscd python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-DESCRIPTION=PC/SC Architecture smartcard middleware library
-EAPI=8
-HOMEPAGE=https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC
-INHERIT=python-single-r1 systemd tmpfiles udev multilib-minimal
-IUSE=doc embedded libusb policykit selinux systemd +udev python_single_target_python3_8 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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD ISC MIT GPL-3+ GPL-2
-RDEPEND=libusb? ( virtual/libusb:1 ) udev? ( virtual/libudev:= ) policykit? ( >=sys-auth/polkit-0.111 ) acct-group/openct acct-group/pcscd acct-user/pcscd python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) selinux? ( sec-policy/selinux-pcscd ) virtual/tmpfiles
-REQUIRED_USE=^^ ( udev libusb ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://pcsclite.apdu.fr/files/pcsc-lite-1.9.8.tar.bz2
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=334ceb122b247940710cb8819c3aca33
diff --git a/metadata/md5-cache/sys-apps/plocate-1.1.15 b/metadata/md5-cache/sys-apps/plocate-1.1.15
deleted file mode 100644
index 3541f03588b1..000000000000
--- a/metadata/md5-cache/sys-apps/plocate-1.1.15
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=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 prepare setup test
-DEPEND=acct-group/locate app-arch/zstd:= io-uring? ( sys-libs/liburing:= ) !sys-apps/mlocate
-DESCRIPTION=Posting locate is a much faster locate
-EAPI=7
-HOMEPAGE=https://plocate.sesse.net/
-INHERIT=linux-info meson systemd
-IUSE=+io-uring
-KEYWORDS=amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2 GPL-2+
-RDEPEND=acct-group/locate app-arch/zstd:= io-uring? ( sys-libs/liburing:= ) !sys-apps/mlocate
-SLOT=0
-SRC_URI=https://plocate.sesse.net/download/plocate-1.1.15.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a9d866ade22fb9cce692ca427ac3066c
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.37 b/metadata/md5-cache/sys-apps/portage-3.0.37
new file mode 100644
index 000000000000..c7b9c7da73c9
--- /dev/null
+++ b/metadata/md5-cache/sys-apps/portage-3.0.37
@@ -0,0 +1,18 @@
+BDEPEND=app-arch/xz-utils test? ( dev-vcs/git ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[bzip2(+),threads(+)] ) >=dev-python/setuptools-42.0.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install preinst prepare pretend setup test
+DEPEND=!build? ( python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[ssl(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4: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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx-epytext[python_targets_pypy3(-)?,python_targets_python3_8(-)?,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_8 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/file-5.41 >=sys-apps/coreutils-6.4 )
+RDEPEND=acct-user/portage app-arch/zstd >=app-arch/tar-1.27 dev-lang/python-exec:2 >=sys-apps/findutils-4.4 !build? ( >=sys-apps/sed-4.0.5 >=app-shells/bash-5.0:0[readline] >=app-admin/eselect-1.2 rsync-verify? ( >=app-portage/gemato-14.5[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=sec-keys/openpgp-keys-gentoo-release-20180706 >=app-crypt/gnupg-2.2.4-r2[ssl(-)] ) ) elibc_glibc? ( >=sys-apps/sandbox-2.2 ) elibc_musl? ( >=sys-apps/sandbox-2.2 ) kernel_linux? ( sys-apps/util-linux ) >=app-misc/pax-utils-0.1.17 selinux? ( >=sys-libs/libselinux-2.0.94[python,python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_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.9_p1:0=[bzip2(+),threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[bzip2(+),threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[bzip2(+),threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[bzip2(+),threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[bzip2(+),threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 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.37.tar.bz2
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=6c07f27909150a45e897f0a73f535fd7
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 5800fb01d2f1..5dd93b01068d 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/fprintd-1.94.1 b/metadata/md5-cache/sys-auth/fprintd-1.94.1
index 65d5aa2ce6fb..1d8ca39eeb8d 100644
--- a/metadata/md5-cache/sys-auth/fprintd-1.94.1
+++ b/metadata/md5-cache/sys-auth/fprintd-1.94.1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://gitlab.freedesktop.org/libfprint/fprintd
 INHERIT=meson pam python-any-r1 systemd
 IUSE=doc pam systemd test
-KEYWORDS=amd64 arm ~arm64 ~ia64 ppc ~riscv sparc x86
+KEYWORDS=~alpha amd64 arm ~arm64 ~ia64 ppc ~riscv sparc x86
 LICENSE=GPL-2+
 RDEPEND=dev-libs/dbus-glib dev-libs/glib:2 >=sys-auth/libfprint-1.94.0:2 sys-auth/polkit pam? ( sys-libs/pam systemd? ( sys-apps/systemd ) !systemd? ( sys-auth/elogind ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitlab.freedesktop.org/libfprint/fprintd/-/archive/v1.94.1/fprintd-v1.94.1.tar.bz2
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=06d294bb9847da3b506f61776198568f
+_md5_=6153232edc33991b94de2fcaaa718b10
diff --git a/metadata/md5-cache/sys-boot/Manifest.gz b/metadata/md5-cache/sys-boot/Manifest.gz
index 7b70b3ddcd57..13b44c25e924 100644
Binary files a/metadata/md5-cache/sys-boot/Manifest.gz and b/metadata/md5-cache/sys-boot/Manifest.gz differ
diff --git a/metadata/md5-cache/sys-boot/dvhtool-1.0.1-r2 b/metadata/md5-cache/sys-boot/dvhtool-1.0.1-r2
index 22836dd4ec80..25cd5229db65 100644
--- a/metadata/md5-cache/sys-boot/dvhtool-1.0.1-r2
+++ b/metadata/md5-cache/sys-boot/dvhtool-1.0.1-r2
@@ -9,4 +9,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://debian/pool/main/d/dvhtool/dvhtool_1.0.1.orig.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=45668e169534dd0b42154ccf5e196463
+_md5_=508f6d6419baf024d6f0f6bf987fe8d3
diff --git a/metadata/md5-cache/sys-boot/efibootmgr-17 b/metadata/md5-cache/sys-boot/efibootmgr-17-r1
similarity index 74%
rename from metadata/md5-cache/sys-boot/efibootmgr-17
rename to metadata/md5-cache/sys-boot/efibootmgr-17-r1
index a917acc8789d..da3a0f734173 100644
--- a/metadata/md5-cache/sys-boot/efibootmgr-17
+++ b/metadata/md5-cache/sys-boot/efibootmgr-17-r1
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure prepare
-DEPEND=sys-apps/pciutils >=sys-libs/efivar-37:=
+DEPEND=dev-libs/popt sys-apps/pciutils >=sys-libs/efivar-37:=
 DESCRIPTION=User-space application to modify the EFI boot manager
 EAPI=7
 HOMEPAGE=https://github.com/rhinstaller/efibootmgr
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong ~riscv x86
 LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils >=sys-libs/efivar-37:=
+RDEPEND=dev-libs/popt sys-apps/pciutils >=sys-libs/efivar-37:=
 SLOT=0
 SRC_URI=https://github.com/rhboot/efibootmgr/archive/17.tar.gz -> efibootmgr-17.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9e62a223bd73488e3574374ff8cb0fa2
+_md5_=45ebc3a389ca985b92a438f0a7ba4342
diff --git a/metadata/md5-cache/sys-boot/efibootmgr-18 b/metadata/md5-cache/sys-boot/efibootmgr-18-r1
similarity index 74%
rename from metadata/md5-cache/sys-boot/efibootmgr-18
rename to metadata/md5-cache/sys-boot/efibootmgr-18-r1
index 7da392d68d30..0e01f354ace2 100644
--- a/metadata/md5-cache/sys-boot/efibootmgr-18
+++ b/metadata/md5-cache/sys-boot/efibootmgr-18-r1
@@ -1,14 +1,14 @@
 BDEPEND=virtual/pkgconfig
 DEFINED_PHASES=compile configure prepare
-DEPEND=sys-apps/pciutils >=sys-libs/efivar-37:=
+DEPEND=dev-libs/popt sys-apps/pciutils >=sys-libs/efivar-37:=
 DESCRIPTION=User-space application to modify the EFI boot manager
 EAPI=8
 HOMEPAGE=https://github.com/rhinstaller/efibootmgr
 INHERIT=toolchain-funcs
 KEYWORDS=amd64 arm arm64 ~ia64 ~loong ~riscv x86
 LICENSE=GPL-2
-RDEPEND=sys-apps/pciutils >=sys-libs/efivar-37:=
+RDEPEND=dev-libs/popt sys-apps/pciutils >=sys-libs/efivar-37:=
 SLOT=0
 SRC_URI=https://github.com/rhboot/efibootmgr/archive/18.tar.gz -> efibootmgr-18.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=b2573372b1060414b6a66c38cd4621a7
+_md5_=b6a2ebe5e68023ae15abed0d6a3874b0
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index ee03100822df..413085fb5fe2 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/autoconf-2.69-r6 b/metadata/md5-cache/sys-devel/autoconf-2.69-r6
deleted file mode 100644
index 5f527909dba2..000000000000
--- a/metadata/md5-cache/sys-devel/autoconf-2.69-r6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6
-DEFINED_PHASES=configure install prepare
-DESCRIPTION=Used to create autoconfiguration files
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
-INHERIT=toolchain-autoconf
-IUSE=emacs
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3+
-PDEPEND=emacs? ( app-emacs/autoconf-mode )
-RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6 >=sys-devel/autoconf-wrapper-13 !~sys-devel/autoconf-2.69:2.5
-SLOT=2.69
-SRC_URI=mirror://gnu/autoconf/autoconf-2.69.tar.xz ftp://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.69.tar.xz https://dev.gentoo.org/~polynomial-c/dist/autoconf-2.69-runstatedir_patches.tar.xz
-_eclasses_=toolchain-autoconf	c85a87c2280cd1204e1433d3e1123e41
-_md5_=1f87045571e872cd3ed74abae765a9af
diff --git a/metadata/md5-cache/sys-devel/autoconf-2.71-r2 b/metadata/md5-cache/sys-devel/autoconf-2.71-r2
deleted file mode 100644
index ca53c629a46e..000000000000
--- a/metadata/md5-cache/sys-devel/autoconf-2.71-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.8
-DEFINED_PHASES=configure install prepare test
-DESCRIPTION=Used to create autoconfiguration files
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/autoconf/autoconf.html
-INHERIT=toolchain-autoconf
-IUSE=emacs
-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-3
-PDEPEND=emacs? ( app-emacs/autoconf-mode )
-RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.8 >=sys-devel/autoconf-wrapper-15 sys-devel/gnuconfig !~sys-devel/autoconf-2.71:2.5
-SLOT=2.71
-SRC_URI=mirror://gnu/autoconf/autoconf-2.71.tar.xz https://alpha.gnu.org/pub/gnu/autoconf/autoconf-2.71.tar.xz
-_eclasses_=toolchain-autoconf	c85a87c2280cd1204e1433d3e1123e41
-_md5_=e89edc629db7c722f784722841aee6b1
diff --git a/metadata/md5-cache/sys-devel/crossdev-20211121 b/metadata/md5-cache/sys-devel/crossdev-20211121
deleted file mode 100644
index acb1c5560ccb..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20211121
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=install
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
-SLOT=0
-SRC_URI=mirror://gentoo/crossdev-20211121.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/crossdev/crossdev-20211121.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20211121.tar.xz
-_md5_=64f960beec273fccad933ad7c3639fdd
diff --git a/metadata/md5-cache/sys-devel/crossdev-20220205 b/metadata/md5-cache/sys-devel/crossdev-20220205
deleted file mode 100644
index c6fda60b8c7c..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20220205
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=install
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
-SLOT=0
-SRC_URI=mirror://gentoo/crossdev-20220205.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/crossdev/crossdev-20220205.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20220205.tar.xz
-_md5_=64f960beec273fccad933ad7c3639fdd
diff --git a/metadata/md5-cache/sys-devel/crossdev-20220424 b/metadata/md5-cache/sys-devel/crossdev-20220424
deleted file mode 100644
index 9c082dfbf69f..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20220424
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=install
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/crossdev/crossdev-20220424.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20220424.tar.xz
-_md5_=6ccc417f7f6014c5a5b93618d09afd5a
diff --git a/metadata/md5-cache/sys-devel/crossdev-20220617 b/metadata/md5-cache/sys-devel/crossdev-20220617
deleted file mode 100644
index c80acce7f2ff..000000000000
--- a/metadata/md5-cache/sys-devel/crossdev-20220617
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=install
-DESCRIPTION=Gentoo Cross-toolchain generator
-EAPI=8
-HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Crossdev
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=>=sys-apps/portage-2.1 >=app-portage/portage-utils-0.55 app-shells/bash sys-apps/gentoo-functions
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/crossdev/crossdev-20220617.tar.xz https://dev.gentoo.org/~vapier/dist/crossdev-20220617.tar.xz
-_md5_=ad3af1e70cb72b1b49e66da4c58cd91f
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220901 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220901
deleted file mode 100644
index c54eb8dc67d3..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220901
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils 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
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=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
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib 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=10
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20220901/gcc-10-20220901.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	e9e4306cc7a54f473c4742c779e359c4	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0a8ea3893328fee07ec65057a33ed32f
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220908 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220908
deleted file mode 100644
index 4886e3d35697..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20220908
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/binutils 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
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
-DEPEND=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
-LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
-PDEPEND=>=sys-devel/gcc-config-2.3
-RDEPEND=sys-libs/zlib 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=10
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20220908/gcc-10-20220908.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-0.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	e9e4306cc7a54f473c4742c779e359c4	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0a8ea3893328fee07ec65057a33ed32f
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220902 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220902
deleted file mode 100644
index 04bba75acb5c..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20220902
+++ /dev/null
@@ -1,16 +0,0 @@
-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 )
-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
-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=11
-SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20220902/gcc-11-20220902.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-2.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	e9e4306cc7a54f473c4742c779e359c4	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=64cbe678a83e79b419ae9e2de4e53fed
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220827 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220827
deleted file mode 100644
index a8b765a88a6b..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220827
+++ /dev/null
@@ -1,16 +0,0 @@
-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 )
-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
-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-20220827/gcc-12-20220827.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	e9e4306cc7a54f473c4742c779e359c4	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9624ff2f545339d3ee11225f931bda32
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220903 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220903
deleted file mode 100644
index 46c7fa750008..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220903
+++ /dev/null
@@ -1,16 +0,0 @@
-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 )
-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
-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-20220903/gcc-12-20220903.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	e9e4306cc7a54f473c4742c779e359c4	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9624ff2f545339d3ee11225f931bda32
diff --git a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220910 b/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220910
deleted file mode 100644
index 6d52563d6d82..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-12.2.1_p20220910
+++ /dev/null
@@ -1,16 +0,0 @@
-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 )
-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
-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-20220910/gcc-12-20220910.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-12.2.0-musl-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	e9e4306cc7a54f473c4742c779e359c4	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9624ff2f545339d3ee11225f931bda32
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220828 b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220828
deleted file mode 100644
index cc2ee886c3e8..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220828
+++ /dev/null
@@ -1,17 +0,0 @@
-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 )
-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
-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-20220828/gcc-13-20220828.tar.xz https://dev.gentoo.org/~xen0n/distfiles/sys-devel/gcc/gcc-13.0.0-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	e9e4306cc7a54f473c4742c779e359c4	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d4804665563c18b688f5fc23a110c531
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220904 b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220904
deleted file mode 100644
index dc32c4303c2e..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220904
+++ /dev/null
@@ -1,17 +0,0 @@
-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 )
-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
-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-20220904/gcc-13-20220904.tar.xz https://dev.gentoo.org/~xen0n/distfiles/sys-devel/gcc/gcc-13.0.0-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	e9e4306cc7a54f473c4742c779e359c4	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d4804665563c18b688f5fc23a110c531
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220911 b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220911
deleted file mode 100644
index cf689eb555d4..000000000000
--- a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20220911
+++ /dev/null
@@ -1,17 +0,0 @@
-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 )
-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
-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-20220911/gcc-13-20220911.tar.xz https://dev.gentoo.org/~xen0n/distfiles/sys-devel/gcc/gcc-13.0.0-patches-1.tar.xz
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	e9e4306cc7a54f473c4742c779e359c4	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d4804665563c18b688f5fc23a110c531
diff --git a/metadata/md5-cache/sys-devel/gcc-config-2.6 b/metadata/md5-cache/sys-devel/gcc-config-2.6
new file mode 100644
index 000000000000..24289c6741b4
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-config-2.6
@@ -0,0 +1,11 @@
+DEFINED_PHASES=compile install postinst
+DESCRIPTION=Utility to manage compilers
+EAPI=8
+HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
+IUSE=+cc-wrappers +native-symlinks
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=>=sys-apps/gentoo-functions-0.10
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc-config/gcc-config-2.6.tar.xz
+_md5_=39451caeec5fbe4eb55be3ea11cf6b4d
diff --git a/metadata/md5-cache/sys-devel/gcc-config-9999 b/metadata/md5-cache/sys-devel/gcc-config-9999
index f7098ea93be3..507b1b35175e 100644
--- a/metadata/md5-cache/sys-devel/gcc-config-9999
+++ b/metadata/md5-cache/sys-devel/gcc-config-9999
@@ -1,7 +1,7 @@
 BDEPEND=>=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst unpack
 DESCRIPTION=Utility to manage compilers
-EAPI=7
+EAPI=8
 HOMEPAGE=https://gitweb.gentoo.org/proj/gcc-config.git/
 INHERIT=git-r3
 IUSE=+cc-wrappers +native-symlinks
@@ -10,4 +10,4 @@ PROPERTIES=live
 RDEPEND=>=sys-apps/gentoo-functions-0.10
 SLOT=0
 _eclasses_=git-r3	b9ac6f96d2a88edb5b351df634dc5e53
-_md5_=4502d81f78e4656ee95aface9ee9cf57
+_md5_=39451caeec5fbe4eb55be3ea11cf6b4d
diff --git a/metadata/md5-cache/sys-devel/gnuconfig-20210107 b/metadata/md5-cache/sys-devel/gnuconfig-20210107
deleted file mode 100644
index e2dd19a5b435..000000000000
--- a/metadata/md5-cache/sys-devel/gnuconfig-20210107
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=compile install prepare test unpack
-DESCRIPTION=Updated config.sub and config.guess file from GNU
-EAPI=7
-HOMEPAGE=https://savannah.gnu.org/projects/config
-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=GPL-3+-with-autoconf-exception
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~polynomial-c/dist/gnuconfig/gnuconfig-20210107.tar.xz
-_md5_=2d25021da34a85e077c3e58009d5f244
diff --git a/metadata/md5-cache/sys-devel/mold-1.4.1 b/metadata/md5-cache/sys-devel/mold-1.4.1
deleted file mode 100644
index a44642790041..000000000000
--- a/metadata/md5-cache/sys-devel/mold-1.4.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend test
-DEPEND=sys-libs/zlib system-tbb? ( >=dev-cpp/tbb-2021.4.0:= ) !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
-DESCRIPTION=A Modern Linker
-EAPI=8
-HOMEPAGE=https://github.com/rui314/mold
-INHERIT=cmake toolchain-funcs
-IUSE=system-tbb
-KEYWORDS=~amd64 ~riscv
-LICENSE=AGPL-3 Apache-2.0 BSD-2
-RDEPEND=sys-libs/zlib system-tbb? ( >=dev-cpp/tbb-2021.4.0:= ) !kernel_Darwin? ( >=dev-libs/mimalloc-2:= dev-libs/openssl:= )
-SLOT=0
-SRC_URI=https://github.com/rui314/mold/archive/refs/tags/v1.4.1.tar.gz -> mold-1.4.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=39ca04f0c7a25c693d694eecbd9dc18f
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 56f2c1cdc0b6..8819daf6dd93 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/btrfs-progs-5.19.1 b/metadata/md5-cache/sys-fs/btrfs-progs-5.19.1
new file mode 100644
index 000000000000..ba5a271cb001
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-5.19.1
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig man? ( dev-python/sphinx ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare setup
+DEPEND=dev-libs/lzo:2= sys-apps/util-linux:=[static-libs(+)?] sys-libs/zlib:= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd[static-libs(+)] ) )
+DESCRIPTION=Btrfs filesystem utilities
+EAPI=8
+HOMEPAGE=https://btrfs.wiki.kernel.org
+INHERIT=bash-completion-r1 python-single-r1 udev
+IUSE=+convert python +man reiserfs static static-libs udev +zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:=[static-libs(+)?] sys-libs/zlib:= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= )
+REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
+RESTRICT=test
+SLOT=0/0
+SRC_URI=https://www.kernel.org/pub/linux/kernel/people/kdave/btrfs-progs/btrfs-progs-v5.19.1.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=a5123b478545c164a156ce29ea80880f
diff --git a/metadata/md5-cache/sys-fs/btrfs-progs-9999 b/metadata/md5-cache/sys-fs/btrfs-progs-9999
index 3483b269589f..912197639caf 100644
--- a/metadata/md5-cache/sys-fs/btrfs-progs-9999
+++ b/metadata/md5-cache/sys-fs/btrfs-progs-9999
@@ -2,7 +2,7 @@ BDEPEND=virtual/pkgconfig man? ( dev-python/sphinx ) sys-devel/gnuconfig virtual
 DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
 DEPEND=dev-libs/lzo:2= sys-apps/util-linux:=[static-libs(+)?] sys-libs/zlib:= convert? ( sys-fs/e2fsprogs:= reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27 ) ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) ) udev? ( virtual/libudev:= ) zstd? ( app-arch/zstd:= ) >=sys-kernel/linux-headers-5.10 convert? ( sys-apps/acl ) python? ( python_single_target_python3_8? ( dev-python/setuptools[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/setuptools[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/setuptools[python_targets_python3_10(-)] ) ) static? ( dev-libs/lzo:2[static-libs(+)] sys-apps/util-linux:0[static-libs(+)] sys-libs/zlib:0[static-libs(+)] convert? ( sys-fs/e2fsprogs[static-libs(+)] reiserfs? ( >=sys-fs/reiserfsprogs-3.6.27[static-libs(+)] ) ) zstd? ( app-arch/zstd[static-libs(+)] ) )
 DESCRIPTION=Btrfs filesystem utilities
-EAPI=7
+EAPI=8
 HOMEPAGE=https://btrfs.wiki.kernel.org
 INHERIT=bash-completion-r1 python-single-r1 udev autotools git-r3
 IUSE=+convert python +man reiserfs static static-libs udev +zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/lzo:2= sys-apps/util-linux:=[static-libs(+)?] sys-libs/zlib:= c
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=test
 SLOT=0/0
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=d13f908e9c6c62f8fa257b886e9840f6
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=a5123b478545c164a156ce29ea80880f
diff --git a/metadata/md5-cache/sys-fs/mp3fs-1.1.1-r3 b/metadata/md5-cache/sys-fs/mp3fs-1.1.1-r4
similarity index 70%
rename from metadata/md5-cache/sys-fs/mp3fs-1.1.1-r3
rename to metadata/md5-cache/sys-fs/mp3fs-1.1.1-r4
index 7a4f8113a7b1..6f7e571ddde7 100644
--- a/metadata/md5-cache/sys-fs/mp3fs-1.1.1-r3
+++ b/metadata/md5-cache/sys-fs/mp3fs-1.1.1-r4
@@ -1,14 +1,14 @@
 DEFINED_PHASES=configure
-DEPEND=media-libs/libid3tag:= media-sound/lame sys-fs/fuse:0= flac? ( >=media-libs/flac-1.1.4:= ) vorbis? ( >=media-libs/libvorbis-1.3.0 )
+DEPEND=media-libs/libid3tag:= media-sound/lame sys-fs/fuse:0= flac? ( >=media-libs/flac-1.1.4:=[cxx] ) vorbis? ( >=media-libs/libvorbis-1.3.0 )
 DESCRIPTION=Read-only FUSE filesystem which transcodes FLAC audio files to MP3 when read
 EAPI=8
 HOMEPAGE=https://khenriks.github.com/mp3fs/
 IUSE=+flac vorbis
 KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=media-libs/libid3tag:= media-sound/lame sys-fs/fuse:0= flac? ( >=media-libs/flac-1.1.4:= ) vorbis? ( >=media-libs/libvorbis-1.3.0 )
+RDEPEND=media-libs/libid3tag:= media-sound/lame sys-fs/fuse:0= flac? ( >=media-libs/flac-1.1.4:=[cxx] ) vorbis? ( >=media-libs/libvorbis-1.3.0 )
 REQUIRED_USE=|| ( flac vorbis )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/khenriks/mp3fs/releases/download/v1.1.1/mp3fs-1.1.1.tar.gz
-_md5_=c2e231889c9ad153d896d5ea5c70507b
+_md5_=63480130f1ef1e34a35a8b95420a847b
diff --git a/metadata/md5-cache/sys-fs/mtools-4.0.40 b/metadata/md5-cache/sys-fs/mtools-4.0.40
deleted file mode 100644
index 3863fb418403..000000000000
--- a/metadata/md5-cache/sys-fs/mtools-4.0.40
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-DESCRIPTION=Utilities to access MS-DOS disks from Unix without mounting them
-EAPI=7
-HOMEPAGE=https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools
-INHERIT=flag-o-matic
-IUSE=X
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris
-LICENSE=GPL-3
-RDEPEND=!elibc_glibc? ( virtual/libiconv ) X? ( x11-libs/libICE x11-libs/libXau x11-libs/libSM x11-libs/libX11 x11-libs/libXt )
-SLOT=0
-SRC_URI=mirror://gnu/mtools/mtools-4.0.40.tar.bz2
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a9226edfb310e27f14c630506a90dd4c
diff --git a/metadata/md5-cache/sys-fs/ntfs3g-2022.5.17-r1 b/metadata/md5-cache/sys-fs/ntfs3g-2022.5.17-r1
new file mode 100644
index 000000000000..6dc0b2d04f7f
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/ntfs3g-2022.5.17-r1
@@ -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 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-apps/util-linux:0= ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 ) sys-apps/attr
+DESCRIPTION=Open source read-write NTFS driver that runs under FUSE
+EAPI=8
+HOMEPAGE=https://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html
+INHERIT=autotools toolchain-funcs
+IUSE=acl debug +fuse +mount-ntfs ntfsdecrypt +ntfsprogs static-libs suid xattr
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=GPL-2
+RDEPEND=sys-apps/util-linux:0= ntfsdecrypt? ( >=dev-libs/libgcrypt-1.2.2:0 >=net-libs/gnutls-1.4.4 )
+SLOT=0/89
+SRC_URI=http://tuxera.com/opensource/ntfs-3g_ntfsprogs-2022.5.17.tgz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=98f6408d39b31c5c58d4eacfdfbe1cd1
diff --git a/metadata/md5-cache/sys-fs/quota-4.09 b/metadata/md5-cache/sys-fs/quota-4.09
new file mode 100644
index 000000000000..555883fd9a32
--- /dev/null
+++ b/metadata/md5-cache/sys-fs/quota-4.09
@@ -0,0 +1,16 @@
+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 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-fs/e2fsprogs ldap? ( >=net-nds/openldap-2.3.35:= ) netlink? ( sys-apps/dbus dev-libs/libnl:3 ) rpc? ( elibc_glibc? ( sys-libs/glibc[-rpc(-)] ) net-libs/libtirpc:= net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers )
+DESCRIPTION=Linux quota tools
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/linuxquota/
+INHERIT=autotools
+IUSE=ldap netlink nls rpc tcpd
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+PDEPEND=rpc? ( net-nds/rpcbind )
+RDEPEND=sys-fs/e2fsprogs ldap? ( >=net-nds/openldap-2.3.35:= ) netlink? ( sys-apps/dbus dev-libs/libnl:3 ) rpc? ( elibc_glibc? ( sys-libs/glibc[-rpc(-)] ) net-libs/libtirpc:= net-libs/rpcsvc-proto ) tcpd? ( sys-apps/tcp-wrappers )
+SLOT=0
+SRC_URI=mirror://sourceforge/linuxquota/quota-4.09.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8e43c866277782b2e88b3b4fdcd4ca63
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 609ef54a5a78..4e4992ea7ea4 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.286 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.286
index 44d459cf6fbb..fc4fa8e4a0da 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.286
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.286
@@ -5,11 +5,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
 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.286
 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-297.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-297.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-297.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-297.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-297.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-297.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-297.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-297.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-297.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f94c154644a1ce9ab60f39c56e9fe44b
+_md5_=f381178380eb619c1bf83bddbf0e624a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.289 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.289
deleted file mode 100644
index 3c3794021275..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.289
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.289
-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-300.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-300.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-300.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-300.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-300.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-300.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-300.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-300.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-300.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=66b9de69fe5cb24741987f1edb83e54c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.290 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.290
deleted file mode 100644
index e909505d837a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.290
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.290
-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-301.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-301.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-301.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-301.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-301.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-301.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-301.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-301.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-301.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=96c410ab7f343c5256b120b85e37f5fa
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.291 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.291
deleted file mode 100644
index 6f5c22ad55a5..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.291
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.291
-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-302.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-302.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-302.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-302.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-302.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-302.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-302.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-302.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-302.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c2c5a19dbbb3a423e217f6695512ffad
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.292 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.292
deleted file mode 100644
index 9805303ab860..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.292
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.292
-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-303.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-303.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-303.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-303.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-303.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-303.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-303.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-303.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-303.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fa5a680ddee008719bf87407f577a107
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.294 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.294
index f38ae53c79ca..5c6011ab252f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.294
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.14.294
@@ -5,11 +5,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=~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.294
 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-305.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-305.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-305.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-305.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-305.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-305.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.14-305.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.14-305.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.14-305.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e1b42ddbea4dc33971fd3e0c4699933b
+_md5_=80b46820a5d1e5d2e097af3b4c35b1b0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.250 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.250
index 8b0f478e6aed..295bde9a09ce 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.250
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.250
@@ -5,11 +5,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
 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.250
 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-249.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-249.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-249.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-249.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-249.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-249.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-249.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-249.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-249.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9f47123376884daa9a751b03b90aa547
+_md5_=d057421ef31a47750413f73ff3e57031
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.255 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.255
deleted file mode 100644
index cdc234b3abfd..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.255
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.255
-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-254.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-254.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-254.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-254.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-254.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-254.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-254.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-254.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-254.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=dbd022cefcdedac175d15bb9be87e01d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.256 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.256
deleted file mode 100644
index e5440c541b30..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.256
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.256
-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-255.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-255.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-255.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-255.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-255.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-255.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-255.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-255.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-255.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6916eee3d26b3b9ad04c30553fba96ed
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.257 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.257
deleted file mode 100644
index f811622f49fd..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.257
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.257
-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-256.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-256.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-256.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-256.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-256.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-256.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-256.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-256.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-256.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=25f5f82b29fe5649040b0e85a6ed257e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.259 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.259
index a23b9241bf19..9cdf654c1d44 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.259
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.19.259
@@ -5,11 +5,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=~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.259
 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-258.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-258.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-258.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-258.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-258.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-258.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.19-258.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.19-258.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.19-258.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0edc0e1e4d22aa795078a8cb444b18f3
+_md5_=f25221f855519014d82019dbdb9342be
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.321 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.321
index a6d4fed9c412..e3f2cbcdd75c 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.321
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.321
@@ -5,11 +5,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
 LICENSE=GPL-2 linux-firmware
 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.9.321
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-324.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-324.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-324.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-324.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-324.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-324.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-324.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-324.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-324.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=27c38a304ff737cfb06efee55c422a4a
+_md5_=be2a761dca946f04761b7de1a0374011
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.324 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.324
deleted file mode 100644
index 0cc9f5d134de..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.324
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 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 linux-firmware
-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.9.324
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-327.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-327.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-327.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-327.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-327.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-327.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-327.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-327.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-327.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=2567a443ac5171a140e46ed43e357427
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.325 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.325
deleted file mode 100644
index dea642cdda37..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.325
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 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 linux-firmware
-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.9.325
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-328.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-328.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-328.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-328.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-328.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-328.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-328.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-328.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-328.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=67cbee9e78c175ad94fcf9a154fab4ec
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.326 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.326
deleted file mode 100644
index 0a07fef9e16d..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.326
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 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 linux-firmware
-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.9.326
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-329.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-329.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-329.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-329.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-329.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-329.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-329.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-329.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-329.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3e1ce8cf4dd1b18edcb0f50535b58195
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.327 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.327
deleted file mode 100644
index c526051e69da..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.327
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 4.9 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 linux-firmware
-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.9.327
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-330.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-330.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-330.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-330.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-330.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-330.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-330.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-330.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-330.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8f955f6d7370570189dff8614507fb83
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.329 b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.329
index 6688146ab586..ac37ab29c5b4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.329
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-4.9.329
@@ -5,11 +5,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=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2 linux-firmware
 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.9.329
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v4.x/linux-4.9.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-332.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-332.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-332.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-332.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-332.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-332.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-4.9-332.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-4.9-332.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-4.9-332.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=51151393177b2efadd437b87cc7da891
+_md5_=ac6d0f57e1b25264a336a0ff84181c29
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.135 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.135
index 2d0343f2dedd..7d7cb5756e7b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.135
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.135
@@ -5,11 +5,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
 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.135
 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-144.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-144.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-144.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-144.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-144.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-144.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-144.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-144.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-144.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=0f1d0a3c6b4869ba1171007140c6ef0a
+_md5_=95821d60d29b1ba7a1b27f7bf5f4a17e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.138 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.138
deleted file mode 100644
index 356ca7dab196..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.138
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.138
-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-147.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-147.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-147.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-147.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-147.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-147.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-147.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-147.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-147.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=8c5b16ab1143a433ea418e8f1394cbd6
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.139 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.139
deleted file mode 100644
index 4d9b6f68c6e1..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.139
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.139
-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-148.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-148.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-148.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-148.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-148.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-148.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-148.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-148.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-148.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c262c5da68c01d2f5c566e9f6ede180b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.140 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.140
deleted file mode 100644
index c983396dd4b0..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.140
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.140
-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-149.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-149.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-149.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-149.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-149.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-149.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-149.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-149.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-149.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=800f48ac4d9e8db32dea75f52ddad0ff
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.141 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.141
deleted file mode 100644
index 687310e61683..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.141
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.141
-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-150.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-150.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-150.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-150.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-150.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-150.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-150.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-150.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-150.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=6f951af1826dd05b4dd2af297a38efb0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.142 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.142
deleted file mode 100644
index 25c88fca3c9b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.142
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.142
-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-151.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-151.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-151.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-151.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-151.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-151.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-151.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-151.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-151.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=35fee3935f359f5956e5a2608595ea33
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.144 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.144
index 6998517c03f5..94086911809f 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.144
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.144
@@ -5,11 +5,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 ~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.144
 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-153.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-153.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-153.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-153.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-153.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-153.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-153.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-153.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-153.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1354dbf710fc023853ddf40d09670db3
+_md5_=3bda5fb976fa13198b25f87c6291014d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.59 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.59
index fa0619a8e9c6..369f9d64f76d 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.59
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.59
@@ -5,11 +5,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
 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.59
 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-63.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-63.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-63.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-63.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-63.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-63.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-63.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-63.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-63.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1ab933156f66bf1f7003333232ca537d
+_md5_=940232a000f42e3c2531c9118fdcb6f3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.62 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.62
deleted file mode 100644
index 46ab723fbf89..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.62
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.62
-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-66.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-66.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-66.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-66.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-66.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-66.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-66.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-66.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-66.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=c0caa7eb679820262816b0fea0c6ca33
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.63 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.63
deleted file mode 100644
index 558e2eb35846..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.63
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.63
-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-67.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-67.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-67.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-67.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-67.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-67.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-67.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-67.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-67.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=7b65d8462adeb96fdeb2bfb4228e02bf
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.64 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.64
deleted file mode 100644
index 0cd9189c1481..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.64
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.64
-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-68.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-68.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-68.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-68.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-68.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-68.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-68.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-68.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-68.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=e3a4bdcf85209598bba5af0b910f47c7
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.65 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.65
deleted file mode 100644
index 4ddd1b7f351e..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.65
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.65
-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-69.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-69.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-69.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-69.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-69.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-69.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-69.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-69.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-69.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f7d43ff99b7128e08f574e9c557ae2d2
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.67 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.67
deleted file mode 100644
index 1ad46930f0f0..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.67
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.67
-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-71.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-71.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-71.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-71.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-71.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-71.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-71.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-71.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-71.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bfff8c0d90616931fb2b477699d8029b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.69 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.69
index ddeb5125da83..1fd3bd0ae059 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.69
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.69
@@ -5,11 +5,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 ~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.69
 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-73.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-73.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-73.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-73.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-73.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-73.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-73.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-73.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-73.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=19697195a692cf157ad8761bd4f25670
+_md5_=1a94412f6b1c8ad61e9060e1e1ab19df
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.19.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.19.4
deleted file mode 100644
index 40a76c84fcd6..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.19.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.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 ~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.19.4
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-6.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-6.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-6.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-6.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-6.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-6.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-6.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-6.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-6.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=53314dfaf1307b7b34f3a9ae986b066d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.19.5 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.19.5
deleted file mode 100644
index 9deae01c2d42..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.19.5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.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 ~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.19.5
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-7.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-7.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-7.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-7.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-7.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-7.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-7.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-7.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=3a8fe1766bbb24293b1e9ecab2420f46
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.19.6 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.19.6
deleted file mode 100644
index 8eee9aad73e7..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.19.6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
-DESCRIPTION=Full sources including the Gentoo patchset for the 5.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 ~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.19.6
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-8.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-8.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-8.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-8.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-8.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-8.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.19-8.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-8.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.19-8.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=692b163cc4666e01d5dada183788a409
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.203 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.203
index 06203a39b90c..8fca92f2eb41 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.203
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.203
@@ -5,11 +5,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
 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.203
 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-208.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-208.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-208.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-208.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-208.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-208.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-208.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-208.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-208.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5424098fecd845ccb5ea485d00b9b631
+_md5_=9a9f08c51907b29d9d77241fc1f04f56
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.210 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.210
deleted file mode 100644
index 2e41118b705b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.210
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.210
-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-215.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-215.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-215.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-215.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-215.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-215.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-215.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-215.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-215.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=128fdfff4d6e14c8a97d87c9106174ce
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.211 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.211
deleted file mode 100644
index 0d190801bbac..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.211
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.211
-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-216.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-216.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-216.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-216.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-216.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-216.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-216.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-216.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-216.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bcad1f919f62e1aa37be9cd3ba45999e
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.212 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.212
deleted file mode 100644
index e79e3f15ed23..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.212
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=!build? ( sys-apps/sed )
-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.212
-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-217.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-217.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-217.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-217.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-217.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-217.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-217.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-217.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-217.experimental.tar.xz )
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=d0442a396ee12ba20cb9d3d3cad8fc02
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.214 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.214
index 2fb8de21e04e..4efb7d02d6fd 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.214
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.214
@@ -5,11 +5,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=~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.214
 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-219.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-219.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-219.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-219.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-219.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-219.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-219.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-219.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-219.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	aa8997cf13a12b867c4c8c57383b8582	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fa81b32a31e43a5dc7da609abf1d6702
+_md5_=fc751447becc7bf0d335750c3aaf0829
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 0de647ccbe2e..59e00c719fba 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/glibc-2.36-r3 b/metadata/md5-cache/sys-libs/glibc-2.36-r3
index 966c67a1318f..acfbb001e244 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.36-r3
+++ b/metadata/md5-cache/sys-libs/glibc-2.36-r3
@@ -6,6 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
 INHERIT=python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
@@ -13,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-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	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fdedec7a447f3232ac43228529e55069
+_md5_=4a771f6e908f4de995d150484ffb6770
diff --git a/metadata/md5-cache/sys-libs/libcap-2.64 b/metadata/md5-cache/sys-libs/libcap-2.64
deleted file mode 100644
index d1ee2802ad45..000000000000
--- a/metadata/md5-cache/sys-libs/libcap-2.64
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/diffutils tools? ( dev-lang/go )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=pam? ( sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sys-kernel/linux-headers
-DESCRIPTION=POSIX 1003.1e capabilities
-EAPI=7
-HOMEPAGE=https://sites.google.com/site/fullycapable/
-INHERIT=multilib-minimal toolchain-funcs pam usr-ldscript
-IUSE=pam static-libs 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 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=|| ( GPL-2 BSD )
-PDEPEND=pam? ( sys-libs/pam[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-SLOT=0
-SRC_URI=https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/libcap-2.64.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f0513c271cea38810997b0d94c0af2e2
diff --git a/metadata/md5-cache/sys-libs/libsemanage-3.4 b/metadata/md5-cache/sys-libs/libsemanage-3.4
deleted file mode 100644
index 69a1608e9f43..000000000000
--- a/metadata/md5-cache/sys-libs/libsemanage-3.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-lang/swig-2.0.4-r1 sys-devel/bison sys-devel/flex virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare test
-DEPEND=>=sys-libs/libsepol-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(-)?] >=sys-libs/libselinux-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(-)?] >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-DESCRIPTION=SELinux kernel and policy management library
-EAPI=7
-HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
-INHERIT=python-r1 toolchain-funcs multilib-minimal
-IUSE=python_targets_python3_8 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 arm arm64 ~mips ~riscv x86
-LICENSE=GPL-2
-RDEPEND=>=sys-libs/libsepol-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(-)?] >=sys-libs/libselinux-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(-)?] >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test
-SLOT=0/2
-SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.4/libsemanage-3.4.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=78d36cdbeca812112c76bb0b14816409
diff --git a/metadata/md5-cache/sys-libs/libsemanage-3.4-r1 b/metadata/md5-cache/sys-libs/libsemanage-3.4-r1
new file mode 100644
index 000000000000..eff5b722b30d
--- /dev/null
+++ b/metadata/md5-cache/sys-libs/libsemanage-3.4-r1
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-lang/swig-2.0.4-r1 sys-devel/bison sys-devel/flex virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=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(-)?] >=sys-libs/libsepol-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(-)?] >=sys-libs/libselinux-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(-)?] >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+DESCRIPTION=SELinux kernel and policy management library
+EAPI=7
+HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
+INHERIT=python-r1 toolchain-funcs multilib-minimal
+IUSE=python_targets_python3_8 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 arm arm64 ~mips ~riscv x86
+LICENSE=GPL-2
+RDEPEND=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(-)?] >=sys-libs/libsepol-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(-)?] >=sys-libs/libselinux-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(-)?] >=sys-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=test
+SLOT=0/2
+SRC_URI=https://github.com/SELinuxProject/selinux/releases/download/3.4/libsemanage-3.4.tar.gz
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=bf8e519544f7b2061cc4ac0490bc9e22
diff --git a/metadata/md5-cache/sys-libs/libsemanage-9999 b/metadata/md5-cache/sys-libs/libsemanage-9999
index 79e94821a295..136bf5442a04 100644
--- a/metadata/md5-cache/sys-libs/libsemanage-9999
+++ b/metadata/md5-cache/sys-libs/libsemanage-9999
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-lang/swig-2.0.4-r1 sys-devel/bison sys-devel/flex virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst prepare test unpack
-DEPEND=>=sys-libs/libsepol-9999:=[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/libselinux-9999:=[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-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+DEPEND=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(-)?] >=sys-libs/libsepol-9999:=[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/libselinux-9999:=[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-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 DESCRIPTION=SELinux kernel and policy management library
 EAPI=7
 HOMEPAGE=https://github.com/SELinuxProject/selinux/wiki
@@ -8,9 +8,9 @@ INHERIT=python-r1 toolchain-funcs multilib-minimal git-r3
 IUSE=python_targets_python3_8 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
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=>=sys-libs/libsepol-9999:=[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/libselinux-9999:=[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-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+RDEPEND=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(-)?] >=sys-libs/libsepol-9999:=[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/libselinux-9999:=[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-process/audit-2.2.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test
 SLOT=0/2
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=67fa62126db0001344b1773d04c8cfa5
+_md5_=0618be2026791f23ecebaf4eb39df53e
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.27 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.27
deleted file mode 100644
index da92c859e4dc..000000000000
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.27
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl test? ( || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/passlib[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/passlib[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/passlib[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] !sys-libs/glibc[crypt(+)] ) !sys-libs/musl )
-DESCRIPTION=Extended crypt library for descrypt, md5crypt, bcrypt, and others
-EAPI=7
-HOMEPAGE=https://github.com/besser82/libxcrypt
-INHERIT=multibuild multilib python-any-r1 toolchain-funcs multilib-minimal
-IUSE=+compat split-usr static-libs system test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=LGPL-2.1+ public-domain BSD BSD-2
-RDEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] !sys-libs/glibc[crypt(+)] ) !sys-libs/musl )
-REQUIRED_USE=split-usr? ( system )
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.27-autotools.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f2b5cec3b827a795e3d19dce2d326d68
diff --git a/metadata/md5-cache/sys-libs/libxcrypt-4.4.28 b/metadata/md5-cache/sys-libs/libxcrypt-4.4.28
deleted file mode 100644
index 9f2ee2709017..000000000000
--- a/metadata/md5-cache/sys-libs/libxcrypt-4.4.28
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-lang/perl test? ( || ( ( >=dev-lang/python-3.10.4:3.10 dev-python/passlib[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-python/passlib[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-python/passlib[python_targets_python3_8(-)] ) ) )
-DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] !sys-libs/glibc[crypt(+)] ) !sys-libs/musl )
-DESCRIPTION=Extended crypt library for descrypt, md5crypt, bcrypt, and others
-EAPI=7
-HOMEPAGE=https://github.com/besser82/libxcrypt
-INHERIT=multibuild multilib python-any-r1 toolchain-funcs multilib-minimal
-IUSE=+compat split-usr static-libs system 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
-LICENSE=LGPL-2.1+ public-domain BSD BSD-2
-RDEPEND=system? ( elibc_glibc? ( sys-libs/glibc[-crypt(+)] !sys-libs/glibc[crypt(+)] ) !sys-libs/musl )
-REQUIRED_USE=split-usr? ( system )
-RESTRICT=!test? ( test )
-SLOT=0/1
-SRC_URI=https://dev.gentoo.org/~sam/distfiles/sys-libs/libxcrypt/libxcrypt-4.4.28-autotools.tar.xz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f41485f21100473f77d878755a7162d3
diff --git a/metadata/md5-cache/sys-libs/musl-1.2.3 b/metadata/md5-cache/sys-libs/musl-1.2.3
index 1c066e255cb4..a3bd9b9eb7ba 100644
--- a/metadata/md5-cache/sys-libs/musl-1.2.3
+++ b/metadata/md5-cache/sys-libs/musl-1.2.3
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://musl.libc.org
 INHERIT=eapi8-dosym flag-o-matic toolchain-funcs prefix verify-sig
 IUSE=headers-only verify-sig
-KEYWORDS=-* amd64 arm arm64 ~mips ~ppc ~ppc64 ~riscv x86
+KEYWORDS=-* amd64 arm arm64 ~mips ppc ppc64 ~riscv x86
 LICENSE=MIT LGPL-2 GPL-2
 SLOT=0
 SRC_URI=https://musl.libc.org/releases/musl-1.2.3.tar.gz verify-sig? ( https://musl.libc.org/releases/musl-1.2.3.tar.gz.asc ) https://dev.gentoo.org/~blueness/musl-misc/getconf.c https://gitlab.alpinelinux.org/alpine/aports/-/raw/93a08815f8598db442d8b766b463d0150ed8e2ab/main/musl/getent.c -> musl-getent-93a08815f8598db442d8b766b463d0150ed8e2ab.c https://dev.gentoo.org/~blueness/musl-misc/iconv.c
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=8d80bba2da7e95bd53f1c9358e335df1
+_md5_=bc9a191cd4f3b86422b53af4c413d97e
diff --git a/metadata/md5-cache/sys-libs/readline-8.1_p1-r1 b/metadata/md5-cache/sys-libs/readline-8.1_p1-r1
deleted file mode 100644
index 40014d665fa7..000000000000
--- a/metadata/md5-cache/sys-libs/readline-8.1_p1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Another cute console display library
-EAPI=7
-HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html
-INHERIT=flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
-IUSE=static-libs +unicode utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/8
-SRC_URI=mirror://gnu/readline/readline-8.1.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-001 mirror://gnu/readline/readline-8.1-patches/readline81-001
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b557a16b66d604296490d57a50dfc5f2
diff --git a/metadata/md5-cache/sys-libs/readline-8.2_rc3 b/metadata/md5-cache/sys-libs/readline-8.2_rc3
deleted file mode 100644
index 2a5ac0090baf..000000000000
--- a/metadata/md5-cache/sys-libs/readline-8.2_rc3
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-chetramey ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
-DEFINED_PHASES=compile configure install postinst preinst prepare test unpack
-DEPEND=>=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-DESCRIPTION=Another cute console display library
-EAPI=7
-HOMEPAGE=https://tiswww.case.edu/php/chet/readline/rltop.html https://git.savannah.gnu.org/cgit/readline.git
-INHERIT=flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript verify-sig autotools
-IUSE=static-libs +unicode utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr verify-sig
-LICENSE=GPL-3
-RDEPEND=>=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
-SLOT=0/8
-SRC_URI=mirror://gnu/readline/readline-8.2-rc3.tar.gz ftp://ftp.cwru.edu/pub/bash/readline-8.2-rc3.tar.gz verify-sig? ( mirror://gnu/readline/readline-8.2-rc3.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/readline-8.2-rc3.tar.gz.sig )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c1abb1c1764f9ac2a6ba4b59511ce527
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2021e b/metadata/md5-cache/sys-libs/timezone-data-2021e
deleted file mode 100644
index 87b99afcadaa..000000000000
--- a/metadata/md5-cache/sys-libs/timezone-data-2021e
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare test unpack
-DEPEND=nls? ( virtual/libintl )
-DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
-EAPI=7
-HOMEPAGE=https://www.iana.org/time-zones
-INHERIT=toolchain-funcs flag-o-matic
-IUSE=nls leaps-timezone zic-slim
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=BSD public-domain
-RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
-SLOT=0
-SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2021e.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2021e.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=333b12470e4dbe45f021dc3007663151
diff --git a/metadata/md5-cache/sys-libs/timezone-data-2022a b/metadata/md5-cache/sys-libs/timezone-data-2022a
deleted file mode 100644
index 290a26708122..000000000000
--- a/metadata/md5-cache/sys-libs/timezone-data-2022a
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile config configure install postinst preinst prepare test unpack
-DEPEND=nls? ( virtual/libintl )
-DESCRIPTION=Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)
-EAPI=7
-HOMEPAGE=https://www.iana.org/time-zones
-INHERIT=toolchain-funcs flag-o-matic
-IUSE=nls leaps-timezone zic-slim
-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 public-domain
-RDEPEND=nls? ( virtual/libintl ) !sys-libs/glibc[vanilla(+)]
-SLOT=0
-SRC_URI=https://www.iana.org/time-zones/repository/releases/tzdata2022a.tar.gz https://www.iana.org/time-zones/repository/releases/tzcode2022a.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=dfe06eb704139ea76b5966313a30b1c6
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.11-r4 b/metadata/md5-cache/sys-libs/zlib-1.2.11-r4
deleted file mode 100644
index b9375d36031e..000000000000
--- a/metadata/md5-cache/sys-libs/zlib-1.2.11-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=minizip? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<dev-libs/libxml2-2.7.7 !sys-libs/zlib-ng[compat]
-DESCRIPTION=Standard (de)compression library
-EAPI=7
-HOMEPAGE=https://zlib.net/
-INHERIT=autotools multilib-minimal usr-ldscript
-IUSE=minizip static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=ZLIB
-RDEPEND=!<dev-libs/libxml2-2.7.7 !sys-libs/zlib-ng[compat]
-SLOT=0/1
-SRC_URI=https://zlib.net/zlib-1.2.11.tar.gz https://zlib.net/fossils/zlib-1.2.11.tar.gz http://www.gzip.org/zlib/zlib-1.2.11.tar.gz http://www.zlib.net/current/beta/zlib-1.2.11.tar.gz elibc_Cygwin? ( https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> zlib-1.2.11-cygwin-gzopen_w.patch https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> zlib-1.2.7-cygwin-minizip.patch )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=6b69ddd7c3372810789a7f0956a37a37
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.11-r5 b/metadata/md5-cache/sys-libs/zlib-1.2.11-r5
deleted file mode 100644
index 0188d960dc94..000000000000
--- a/metadata/md5-cache/sys-libs/zlib-1.2.11-r5
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=minizip? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=!<dev-libs/libxml2-2.7.7 !sys-libs/zlib-ng[compat]
-DESCRIPTION=Standard (de)compression library
-EAPI=7
-HOMEPAGE=https://zlib.net/
-INHERIT=autotools multilib-minimal usr-ldscript
-IUSE=minizip static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=ZLIB
-RDEPEND=!<dev-libs/libxml2-2.7.7 !sys-libs/zlib-ng[compat]
-SLOT=0/1
-SRC_URI=https://zlib.net/zlib-1.2.11.tar.gz https://zlib.net/fossils/zlib-1.2.11.tar.gz http://www.gzip.org/zlib/zlib-1.2.11.tar.gz http://www.zlib.net/current/beta/zlib-1.2.11.tar.gz elibc_Cygwin? ( https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> zlib-1.2.11-cygwin-gzopen_w.patch https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> zlib-1.2.7-cygwin-minizip.patch )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c
-_md5_=b6b9830140e1e4dba3ac6a862c2419c2
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.12-r2 b/metadata/md5-cache/sys-libs/zlib-1.2.12-r2
deleted file mode 100644
index 3e57ae04d630..000000000000
--- a/metadata/md5-cache/sys-libs/zlib-1.2.12-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=minizip? ( || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 ) verify-sig? ( sec-keys/openpgp-keys-madler ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=!sys-libs/zlib-ng[compat]
-DESCRIPTION=Standard (de)compression library
-EAPI=7
-HOMEPAGE=https://zlib.net/
-INHERIT=autotools multilib-minimal usr-ldscript verify-sig
-IUSE=minizip static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr 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
-LICENSE=ZLIB
-RDEPEND=!sys-libs/zlib-ng[compat]
-SLOT=0/1
-SRC_URI=https://zlib.net/zlib-1.2.12.tar.gz https://zlib.net/fossils/zlib-1.2.12.tar.gz https://www.gzip.org/zlib/zlib-1.2.12.tar.gz https://www.zlib.net/current/beta/zlib-1.2.12.tar.gz verify-sig? ( https://zlib.net/zlib-1.2.12.tar.gz.asc ) elibc_Cygwin? ( https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> zlib-1.2.11-cygwin-gzopen_w.patch https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> zlib-1.2.7-cygwin-minizip.patch )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961	usr-ldscript	5c738dce357b54d5a90e30094d2f983c	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=27d37b2fdecb30386cb00ab65b95a381
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 55d451e00136..65fb346240e9 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/at-3.2.2-r4 b/metadata/md5-cache/sys-process/at-3.2.2-r4
deleted file mode 100644
index 605a7861f053..000000000000
--- a/metadata/md5-cache/sys-process/at-3.2.2-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=sys-devel/autoconf-2.64 sys-devel/bison >=sys-devel/flex-2.5.4a sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/at acct-user/at virtual/mta pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux )
-DESCRIPTION=Queues jobs for later execution
-EAPI=7
-HOMEPAGE=http://blog.calhariz.com/index.php/tag/at https://packages.qa.debian.org/a/at.html
-INHERIT=autotools pam systemd
-IUSE=pam selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/at acct-user/at virtual/mta pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) virtual/mta virtual/logger selinux? ( sec-policy/selinux-at )
-SLOT=0
-SRC_URI=http://software.calhariz.com/at/at_3.2.2.orig.tar.gz mirror://debian/pool/main/a/at/at_3.2.2.orig.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c5a1af052c9f00ec6c8536751508635c
diff --git a/metadata/md5-cache/sys-process/at-3.2.4 b/metadata/md5-cache/sys-process/at-3.2.4
deleted file mode 100644
index 35e029fd9fae..000000000000
--- a/metadata/md5-cache/sys-process/at-3.2.4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=sys-devel/autoconf-2.64 sys-devel/bison >=sys-devel/flex-2.5.4a sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/at acct-user/at virtual/mta pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux )
-DESCRIPTION=Queues jobs for later execution
-EAPI=8
-HOMEPAGE=http://blog.calhariz.com/index.php/tag/at https://packages.qa.debian.org/a/at.html
-INHERIT=autotools pam systemd
-IUSE=pam selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=acct-group/at acct-user/at virtual/mta pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) virtual/mta virtual/logger selinux? ( sec-policy/selinux-at )
-SLOT=0
-SRC_URI=http://software.calhariz.com/at/at_3.2.4.orig.tar.gz mirror://debian/pool/main/a/at/at_3.2.4.orig.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=cc6ed07daf05afd9fefa6990092ee7ee
diff --git a/metadata/md5-cache/sys-process/at-3.2.5 b/metadata/md5-cache/sys-process/at-3.2.5
index ac6c00e29061..d4e4da18d42b 100644
--- a/metadata/md5-cache/sys-process/at-3.2.5
+++ b/metadata/md5-cache/sys-process/at-3.2.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://blog.calhariz.com/index.php/tag/at https://packages.qa.debian.org/a/at.html
 INHERIT=autotools pam systemd
 IUSE=pam selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=acct-group/at acct-user/at virtual/mta pam? ( sys-libs/pam ) selinux? ( sys-libs/libselinux ) virtual/mta virtual/logger selinux? ( sec-policy/selinux-at )
 SLOT=0
 SRC_URI=http://software.calhariz.com/at/at_3.2.5.orig.tar.gz mirror://debian/pool/main/a/at/at_3.2.5.orig.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=9e6a826b7e7145ab67aed1729d9ed051
+_md5_=220a75177b034b620f24e409e4041cd1
diff --git a/metadata/md5-cache/sys-process/cronie-1.5.7 b/metadata/md5-cache/sys-process/cronie-1.5.7
deleted file mode 100644
index 21fb3fa1a37b..000000000000
--- a/metadata/md5-cache/sys-process/cronie-1.5.7
+++ /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 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) )
-DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cron
-EAPI=7
-HOMEPAGE=https://github.com/cronie-crond/cronie
-INHERIT=autotools cron flag-o-matic pam systemd
-IUSE=+anacron +inotify pam selinux
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=ISC BSD BSD-2 GPL-2
-RDEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) sys-apps/debianutils >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
-SLOT=0
-SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.5.7.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	cron	b3117529d23cf99d6166b59608ed94e4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=904f52111321d8e35f1067821dadf2e6
diff --git a/metadata/md5-cache/sys-process/cronie-1.6.0-r2 b/metadata/md5-cache/sys-process/cronie-1.6.0-r2
deleted file mode 100644
index 2c1864480ec9..000000000000
--- a/metadata/md5-cache/sys-process/cronie-1.6.0-r2
+++ /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 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) )
-DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cron
-EAPI=7
-HOMEPAGE=https://github.com/cronie-crond/cronie
-INHERIT=autotools cron flag-o-matic pam systemd
-IUSE=+anacron +inotify pam selinux
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=ISC BSD BSD-2 GPL-2
-RDEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) sys-apps/debianutils >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
-SLOT=0
-SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.6.0.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	cron	b3117529d23cf99d6166b59608ed94e4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d2ac141bf149ec00c8a772f671b0e466
diff --git a/metadata/md5-cache/sys-process/cronie-1.6.1 b/metadata/md5-cache/sys-process/cronie-1.6.1-r1
similarity index 83%
rename from metadata/md5-cache/sys-process/cronie-1.6.1
rename to metadata/md5-cache/sys-process/cronie-1.6.1-r1
index ec120388f189..a2b6d3609e18 100644
--- a/metadata/md5-cache/sys-process/cronie-1.6.1
+++ b/metadata/md5-cache/sys-process/cronie-1.6.1-r1
@@ -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 >=sys-devel/libtool-2.4 virtual/pkgconfig
 DEFINED_PHASES=configure install postinst prepare
-DEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) )
+DEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) selinux? ( sys-libs/libselinux )
 DESCRIPTION=Cronie is a standard UNIX daemon cron based on the original vixie-cron
 EAPI=7
 HOMEPAGE=https://github.com/cronie-crond/cronie
@@ -8,8 +8,8 @@ INHERIT=autotools cron flag-o-matic pam systemd
 IUSE=+anacron +inotify pam selinux
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=ISC BSD BSD-2 GPL-2
-RDEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) sys-apps/debianutils >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
+RDEPEND=acct-group/crontab pam? ( sys-libs/pam ) anacron? ( !sys-process/anacron !sys-process/systemd-cron elibc_musl? ( sys-libs/obstack-standalone ) ) selinux? ( sys-libs/libselinux ) sys-apps/debianutils >=sys-process/cronbase-0.3.2 !sys-process/vixie-cron !sys-process/bcron !sys-process/dcron !sys-process/fcron
 SLOT=0
 SRC_URI=https://github.com/cronie-crond/cronie/archive/cronie-1.6.1.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	cron	b3117529d23cf99d6166b59608ed94e4	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=37d7ad8b13adcd21327236374d3516f9
+_md5_=97cc70ca36463b11cfb15e538aa87f78
diff --git a/metadata/md5-cache/sys-process/htop-3.1.2-r1 b/metadata/md5-cache/sys-process/htop-3.1.2-r1
deleted file mode 100644
index a1b2681d12ff..000000000000
--- a/metadata/md5-cache/sys-process/htop-3.1.2-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 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure postinst postrm prepare setup
-DEPEND=sys-libs/ncurses:=[unicode(+)?] hwloc? ( sys-apps/hwloc:= ) unwind? ( !llvm-libunwind? ( sys-libs/libunwind:= ) llvm-libunwind? ( sys-libs/llvm-libunwind:= ) ) kernel_linux? ( caps? ( sys-libs/libcap ) delayacct? ( dev-libs/libnl:3 ) lm-sensors? ( sys-apps/lm-sensors ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
-DESCRIPTION=interactive process viewer
-EAPI=8
-HOMEPAGE=https://htop.dev/ https://github.com/htop-dev/htop
-INHERIT=autotools linux-info python-any-r1 xdg-utils
-IUSE=caps debug delayacct hwloc lm-sensors llvm-libunwind openvz unicode unwind vserver
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD GPL-2+
-RDEPEND=sys-libs/ncurses:=[unicode(+)?] hwloc? ( sys-apps/hwloc:= ) unwind? ( !llvm-libunwind? ( sys-libs/libunwind:= ) llvm-libunwind? ( sys-libs/llvm-libunwind:= ) ) kernel_linux? ( caps? ( sys-libs/libcap ) delayacct? ( dev-libs/libnl:3 ) lm-sensors? ( sys-apps/lm-sensors ) )
-SLOT=0
-SRC_URI=https://github.com/htop-dev/htop/archive/3.1.2.tar.gz -> htop-3.1.2.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=9d744e718388ea4ca9046d173a12c09b
diff --git a/metadata/md5-cache/sys-process/htop-3.2.0 b/metadata/md5-cache/sys-process/htop-3.2.0
deleted file mode 100644
index b3611b7ac423..000000000000
--- a/metadata/md5-cache/sys-process/htop-3.2.0
+++ /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 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure postinst postrm prepare setup
-DEPEND=sys-libs/ncurses:=[unicode(+)?] hwloc? ( sys-apps/hwloc:= ) unwind? ( !llvm-libunwind? ( sys-libs/libunwind:= ) llvm-libunwind? ( sys-libs/llvm-libunwind:= ) ) kernel_linux? ( caps? ( sys-libs/libcap ) delayacct? ( dev-libs/libnl:3 ) lm-sensors? ( sys-apps/lm-sensors ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
-DESCRIPTION=interactive process viewer
-EAPI=8
-HOMEPAGE=https://htop.dev/ https://github.com/htop-dev/htop
-INHERIT=autotools linux-info python-any-r1 xdg-utils
-IUSE=caps debug delayacct hwloc lm-sensors llvm-libunwind openvz unicode unwind vserver
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD GPL-2+
-RDEPEND=sys-libs/ncurses:=[unicode(+)?] hwloc? ( sys-apps/hwloc:= ) unwind? ( !llvm-libunwind? ( sys-libs/libunwind:= ) llvm-libunwind? ( sys-libs/llvm-libunwind:= ) ) kernel_linux? ( caps? ( sys-libs/libcap ) delayacct? ( dev-libs/libnl:3 ) lm-sensors? ( sys-apps/lm-sensors ) )
-SLOT=0
-SRC_URI=https://github.com/htop-dev/htop/archive/3.2.0.tar.gz -> htop-3.2.0.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6aef42ec6c00e0a68b73b6fbe574df91
diff --git a/metadata/md5-cache/sys-process/htop-3.2.1 b/metadata/md5-cache/sys-process/htop-3.2.1
deleted file mode 100644
index e90f481d51fd..000000000000
--- a/metadata/md5-cache/sys-process/htop-3.2.1
+++ /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 >=sys-devel/libtool-2.4
-DEFINED_PHASES=configure postinst postrm prepare setup
-DEPEND=sys-libs/ncurses:=[unicode(+)?] hwloc? ( sys-apps/hwloc:= ) unwind? ( !llvm-libunwind? ( sys-libs/libunwind:= ) llvm-libunwind? ( sys-libs/llvm-libunwind:= ) ) kernel_linux? ( caps? ( sys-libs/libcap ) delayacct? ( dev-libs/libnl:3 ) lm-sensors? ( sys-apps/lm-sensors ) ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 )
-DESCRIPTION=interactive process viewer
-EAPI=8
-HOMEPAGE=https://htop.dev/ https://github.com/htop-dev/htop
-INHERIT=autotools linux-info python-any-r1 xdg-utils
-IUSE=caps debug delayacct hwloc lm-sensors llvm-libunwind openvz unicode unwind vserver
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD GPL-2+
-RDEPEND=sys-libs/ncurses:=[unicode(+)?] hwloc? ( sys-apps/hwloc:= ) unwind? ( !llvm-libunwind? ( sys-libs/libunwind:= ) llvm-libunwind? ( sys-libs/llvm-libunwind:= ) ) kernel_linux? ( caps? ( sys-libs/libcap ) delayacct? ( dev-libs/libnl:3 ) lm-sensors? ( sys-apps/lm-sensors ) )
-SLOT=0
-SRC_URI=https://github.com/htop-dev/htop/archive/3.2.1.tar.gz -> htop-3.2.1.tar.gz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6aef42ec6c00e0a68b73b6fbe574df91
diff --git a/metadata/md5-cache/sys-process/numactl-2.0.14-r1 b/metadata/md5-cache/sys-process/numactl-2.0.14-r1
index 2589ebc811ce..76afb8f4b3f5 100644
--- a/metadata/md5-cache/sys-process/numactl-2.0.14-r1
+++ b/metadata/md5-cache/sys-process/numactl-2.0.14-r1
@@ -10,4 +10,4 @@ LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://github.com/numactl/numactl/releases/download/v2.0.14/numactl-2.0.14.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=bfd42d649a05a70e29aa7c0a2bb765bf
+_md5_=c2772e93288a8a513ef70c2ad4878db0
diff --git a/metadata/md5-cache/sys-process/parallel-20220522 b/metadata/md5-cache/sys-process/parallel-20220522
deleted file mode 100644
index 5acbdecc3007..000000000000
--- a/metadata/md5-cache/sys-process/parallel-20220522
+++ /dev/null
@@ -1,15 +0,0 @@
-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 ~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-20220522.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20220522.tar.bz2.sig )
-_eclasses_=verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=b076a6c826961a3850cd6ccaa3b5a946
diff --git a/metadata/md5-cache/sys-process/parallel-20220622-r1 b/metadata/md5-cache/sys-process/parallel-20220622-r1
deleted file mode 100644
index 83a9889eae42..000000000000
--- a/metadata/md5-cache/sys-process/parallel-20220622-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-oletange-20210423 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure prepare 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=autotools verify-sig
-IUSE=verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~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-20220622.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20220622.tar.bz2.sig )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=6d88718a9e7cd7555b4b466131c6e24d
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 9a4209f8159c..f18d7afb6f5d 100644
Binary files a/metadata/md5-cache/virtual/Manifest.gz and b/metadata/md5-cache/virtual/Manifest.gz differ
diff --git a/metadata/md5-cache/virtual/rust-1.63.0 b/metadata/md5-cache/virtual/rust-1.63.0
index 79f7fd2a9182..d61a76782bfa 100644
--- a/metadata/md5-cache/virtual/rust-1.63.0
+++ b/metadata/md5-cache/virtual/rust-1.63.0
@@ -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 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 RDEPEND=|| ( ~dev-lang/rust-1.63.0[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-lang/rust-bin-1.63.0[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=fb68fad3d1521c2ec4e2facfb0af9ebc
+_md5_=e0f17d5db291f0c2db6ad74d12610469
diff --git a/metadata/md5-cache/virtual/rust-1.64.0 b/metadata/md5-cache/virtual/rust-1.64.0
new file mode 100644
index 000000000000..0136539a5423
--- /dev/null
+++ b/metadata/md5-cache/virtual/rust-1.64.0
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+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
+RDEPEND=|| ( ~dev-lang/rust-1.64.0[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~dev-lang/rust-bin-1.64.0[rustfmt?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=612e380535ac9b123c75afed94a2da5e
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index cda3127852a1..d893109ecbcd 100644
Binary files a/metadata/md5-cache/www-client/Manifest.gz and b/metadata/md5-cache/www-client/Manifest.gz differ
diff --git a/metadata/md5-cache/www-client/chromium-104.0.5112.101 b/metadata/md5-cache/www-client/chromium-105.0.5195.125
similarity index 96%
rename from metadata/md5-cache/www-client/chromium-104.0.5112.101
rename to metadata/md5-cache/www-client/chromium-105.0.5195.125
index fe2a7be6f22b..8e637e2b79f2 100644
--- a/metadata/md5-cache/www-client/chromium-104.0.5112.101
+++ b/metadata/md5-cache/www-client/chromium-105.0.5195.125
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://chromium.org/
 INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
 IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
-KEYWORDS=amd64 arm64
+KEYWORDS=~amd64 arm64
 LICENSE=BSD
 RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
 REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
 SLOT=0/stable
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-104.0.5112.101.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-104-patchset-2/chromium-104-patchset-2.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
+SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-105.0.5195.125.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-105-patchset-1/chromium-105-patchset-1.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=0a4a7497e08e13e3ebd2523fbb183abd
+_md5_=a3c0296b2d2948a58527fd3277384fcb
diff --git a/metadata/md5-cache/www-client/chromium-105.0.5195.52 b/metadata/md5-cache/www-client/chromium-105.0.5195.52
deleted file mode 100644
index 0a55ec367bdc..000000000000
--- a/metadata/md5-cache/www-client/chromium-105.0.5195.52
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) || ( >=dev-lang/python-3.10.4:3.10[xml(+)] >=dev-lang/python-3.9.12:3.9[xml(+)] >=dev-lang/python-3.8.13:3.8[xml(+)] ) || ( ( >=dev-lang/python-3.10.4:3.10[xml(+)] dev-python/setuptools[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9[xml(+)] dev-python/setuptools[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8[xml(+)] dev-python/setuptools[python_targets_python3_8(-)] ) ) >=app-arch/gzip-1.7 libcxx? ( >=sys-devel/clang-12 ) lto? ( || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) pgo? ( >=dev-python/selenium-3.141.0 >=dev-util/web_page_replay_go-20220314 || ( ( sys-devel/clang:13 sys-devel/llvm:13 =sys-devel/lld-13* ) ( sys-devel/clang:14 sys-devel/llvm:14 =sys-devel/lld-14* ) ( sys-devel/clang:15 sys-devel/llvm:15 =sys-devel/lld-15* ) ) ) dev-lang/perl >=dev-util/gn-0.1807 >=dev-util/gperf-3.0.3 >=dev-util/ninja-1.7.2 dev-vcs/git >=net-libs/nodejs-7.6.0[inspector] >=sys-devel/bison-2.4.3 sys-devel/flex virtual/pkgconfig js-type-check? ( virtual/jre ) pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup
-DEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( gtk4? ( gui-libs/gtk:4[X?,wayland?] ) !gtk4? ( x11-libs/gtk+:3[X?,wayland?] ) ) !!sys-devel/llvm:0
-DESCRIPTION=Open-source version of Google Chrome web browser
-EAPI=8
-HOMEPAGE=https://chromium.org/
-INHERIT=check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-IUSE=+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine custom-cflags +l10n_af +l10n_am +l10n_ar +l10n_bg +l10n_bn +l10n_ca +l10n_cs +l10n_da +l10n_de +l10n_el +l10n_en-GB +l10n_es +l10n_es-419 +l10n_et +l10n_fa +l10n_fi +l10n_fil +l10n_fr +l10n_gu +l10n_he +l10n_hi +l10n_hr +l10n_hu +l10n_id +l10n_it +l10n_ja +l10n_kn +l10n_ko +l10n_lt +l10n_lv +l10n_ml +l10n_mr +l10n_ms +l10n_nb +l10n_nl +l10n_pl +l10n_pt-BR +l10n_pt-PT +l10n_ro +l10n_ru +l10n_sk +l10n_sl +l10n_sr +l10n_sv +l10n_sw +l10n_ta +l10n_te +l10n_th +l10n_tr +l10n_uk +l10n_ur +l10n_vi +l10n_zh-CN +l10n_zh-TW pgo
-KEYWORDS=~amd64 ~arm64
-LICENSE=BSD
-RDEPEND=system-icu? ( >=dev-libs/icu-71.1:= ) >=dev-libs/libxml2-2.9.4-r3:=[icu] dev-libs/nspr:= >=dev-libs/nss-3.26:= !libcxx? ( >=dev-libs/re2-0.2019.08.01:= ) dev-libs/libxslt:= media-libs/fontconfig:= >=media-libs/freetype-2.11.0-r1:= system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] ) media-libs/libjpeg-turbo:= system-png? ( media-libs/libpng:=[-apng] ) >=media-libs/libwebp-0.4.0:= media-libs/mesa:=[gbm(+)] >=media-libs/openh264-1.6.0:= sys-libs/zlib:= x11-libs/libdrm:= !headless? ( dev-libs/glib:2 >=media-libs/alsa-lib-1.0.19:= pulseaudio? ( media-sound/pulseaudio:= ) sys-apps/pciutils:= kerberos? ( virtual/krb5 ) vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] ) X? ( x11-libs/libX11:= x11-libs/libXext:= x11-libs/libxcb:= ) x11-libs/libxkbcommon:= wayland? ( dev-libs/wayland:= screencast? ( media-video/pipewire:= ) ) ) app-arch/bzip2:= dev-libs/expat:= system-ffmpeg? ( >=media-video/ffmpeg-4.3:= || ( media-video/ffmpeg[-samba] >=net-fs/samba-4.5.10-r1[-debug(-)] ) >=media-libs/opus-1.3.1:= ) net-misc/curl[ssl] sys-apps/dbus:= media-libs/flac:= sys-libs/zlib:=[minizip] !headless? ( X? ( x11-libs/libXcomposite:= x11-libs/libXcursor:= x11-libs/libXdamage:= x11-libs/libXfixes:= >=x11-libs/libXi-1.6.0:= x11-libs/libXrandr:= x11-libs/libXrender:= x11-libs/libXtst:= x11-libs/libxshmfence:= ) >=app-accessibility/at-spi2-atk-2.26:2 >=app-accessibility/at-spi2-core-2.26:2 >=dev-libs/atk-2.26 media-libs/mesa:=[X?,wayland?] cups? ( >=net-print/cups-1.3.11:= ) virtual/udev x11-libs/cairo:= x11-libs/gdk-pixbuf:2 x11-libs/pango:= ) !headless? ( || ( x11-libs/gtk+:3[X?,wayland?] gui-libs/gtk:4[X?,wayland?] ) x11-misc/xdg-utils ) virtual/ttf-fonts selinux? ( sec-policy/selinux-chromium )
-REQUIRED_USE=component-build? ( !suid !libcxx ) screencast? ( wayland ) !headless? ( || ( X wayland ) ) pgo? ( X !wayland )
-SLOT=0/stable
-SRC_URI=https://commondatastorage.googleapis.com/chromium-browser-official/chromium-105.0.5195.52.tar.xz https://github.com/stha09/chromium-patches/releases/download/chromium-105-patchset-1/chromium-105-patchset-1.tar.xz pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=86829c101bcd1946ba234da6d61c5d28
diff --git a/metadata/md5-cache/www-client/chromium-bin-104.0.5112.101-r1 b/metadata/md5-cache/www-client/chromium-bin-105.0.5195.125
similarity index 64%
rename from metadata/md5-cache/www-client/chromium-bin-104.0.5112.101-r1
rename to metadata/md5-cache/www-client/chromium-bin-105.0.5195.125
index 16e06475f618..deca208030da 100644
--- a/metadata/md5-cache/www-client/chromium-bin-104.0.5112.101-r1
+++ b/metadata/md5-cache/www-client/chromium-bin-105.0.5195.125
@@ -8,6 +8,6 @@ KEYWORDS=-* ~amd64 ~arm64 ~x86
 LICENSE=BSD
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libxml2[icu] dev-libs/libxslt dev-libs/nspr >=dev-libs/nss-3.26 media-libs/alsa-lib || ( media-libs/flac:0/0 media-libs/flac-compat:8.3.0 ) media-libs/fontconfig >=media-libs/freetype-2.11.0-r1 media-libs/libjpeg-turbo media-libs/libwebp media-libs/mesa[gbm(+)] media-libs/openh264:0/6.1 net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/pciutils >=sys-devel/gcc-9.3.0 >=sys-libs/glibc-2.32 sys-libs/zlib[minizip] virtual/ttf-fonts virtual/udev x11-libs/cairo x11-libs/libdrm x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X,wayland?] gui-libs/gtk:4[X,wayland?] ) x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils amd64? ( widevine? ( www-plugins/chrome-binary-plugins ) ) wayland? ( dev-libs/wayland )
 SLOT=0
-SRC_URI=https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-104.0.5112.101-1-common.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-104.0.5112.101-1-l10n.tar.xz amd64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-104.0.5112.101-1-common-x86_64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-104.0.5112.101-1-wayland-x86_64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-104.0.5112.101-1-x11-x86_64.tar.xz ) ) arm64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-104.0.5112.101-1-common-aarch64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-104.0.5112.101-1-wayland-aarch64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-104.0.5112.101-1-x11-aarch64.tar.xz ) ) x86? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-104.0.5112.101-1-common-i686.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-104.0.5112.101-1-wayland-i686.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-104.0.5112.101-1-x11-i686.tar.xz ) )
+SRC_URI=https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-105.0.5195.125-1-common.tar.xz https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-105.0.5195.125-1-l10n.tar.xz amd64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-105.0.5195.125-1-common-x86_64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-105.0.5195.125-1-wayland-x86_64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-105.0.5195.125-1-x11-x86_64.tar.xz ) ) arm64? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-105.0.5195.125-1-common-aarch64.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-105.0.5195.125-1-wayland-aarch64.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-105.0.5195.125-1-x11-aarch64.tar.xz ) ) x86? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-105.0.5195.125-1-common-i686.tar.xz wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-105.0.5195.125-1-wayland-i686.tar.xz ) !wayland? ( https://dev.gentoo.org/~sultan/distfiles/www-client/chromium-bin/chromium-bin-105.0.5195.125-1-x11-i686.tar.xz ) )
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=59947b8ebae13e44f06b9b717696f68e
+_md5_=d001a1df94304082cb6dc5325ad57003
diff --git a/metadata/md5-cache/www-client/firefox-102.3.0 b/metadata/md5-cache/www-client/firefox-102.3.0
index a702bc8736ea..0b091d142d00 100644
--- a/metadata/md5-cache/www-client/firefox-102.3.0
+++ b/metadata/md5-cache/www-client/firefox-102.3.0
@@ -7,11 +7,11 @@ 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 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
+KEYWORDS=amd64 arm64 ~ppc64 x86
 LICENSE=MPL-2.0 GPL-2 LGPL-2.1
 RDEPEND=!www-client/firefox:0 !www-client/firefox:rapid screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79.1 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) 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-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.0:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( 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 ) ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) )
 REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wifi? ( dbus ) screencast? ( wayland )
 SLOT=esr
 SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/source/firefox-102.3.0esr.source.tar.xz -> firefox-102.3.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-02j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-02j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-02j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/af.xpi -> firefox-102.3.0esr-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ar.xpi -> firefox-102.3.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ast.xpi -> firefox-102.3.0esr-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/be.xpi -> firefox-102.3.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/bg.xpi -> firefox-102.3.0esr-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/br.xpi -> firefox-102.3.0esr-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ca.xpi -> firefox-102.3.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/cak.xpi -> firefox-102.3.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/cs.xpi -> firefox-102.3.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/cy.xpi -> firefox-102.3.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/da.xpi -> firefox-102.3.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/de.xpi -> firefox-102.3.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-102.3.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/el.xpi -> firefox-102.3.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-102.3.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-102.3.0esr-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-102.3.0esr-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-102.3.0esr-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/et.xpi -> firefox-102.3.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/eu.xpi -> firefox-102.3.0esr-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/fi.xpi -> firefox-102.3.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/fr.xpi -> firefox-102.3.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-102.3.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-102.3.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/gd.xpi -> firefox-102.3.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/gl.xpi -> firefox-102.3.0esr-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/he.xpi -> firefox-102.3.0esr-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/hr.xpi -> firefox-102.3.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-102.3.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/hu.xpi -> firefox-102.3.0esr-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/id.xpi -> firefox-102.3.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/is.xpi -> firefox-102.3.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/it.xpi -> firefox-102.3.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ja.xpi -> firefox-102.3.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ka.xpi -> firefox-102.3.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/kab.xpi -> firefox-102.3.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/kk.xpi -> firefox-102.3.0esr-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ko.xpi -> firefox-102.3.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/lt.xpi -> firefox-102.3.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/lv.xpi -> firefox-102.3.0esr-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ms.xpi -> firefox-102.3.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-102.3.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/nl.xpi -> firefox-102.3.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-102.3.0esr-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-102.3.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/pl.xpi -> firefox-102.3.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-102.3.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-102.3.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/rm.xpi -> firefox-102.3.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ro.xpi -> firefox-102.3.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ru.xpi -> firefox-102.3.0esr-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/sk.xpi -> firefox-102.3.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/sl.xpi -> firefox-102.3.0esr-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/sq.xpi -> firefox-102.3.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/sr.xpi -> firefox-102.3.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-102.3.0esr-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/th.xpi -> firefox-102.3.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/tr.xpi -> firefox-102.3.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/uk.xpi -> firefox-102.3.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/uz.xpi -> firefox-102.3.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/vi.xpi -> firefox-102.3.0esr-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-102.3.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-102.3.0esr-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ach.xpi -> firefox-102.3.0esr-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/an.xpi -> firefox-102.3.0esr-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/az.xpi -> firefox-102.3.0esr-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/bn.xpi -> firefox-102.3.0esr-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/bs.xpi -> firefox-102.3.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-102.3.0esr-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/eo.xpi -> firefox-102.3.0esr-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-102.3.0esr-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-102.3.0esr-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/fa.xpi -> firefox-102.3.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ff.xpi -> firefox-102.3.0esr-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/gn.xpi -> firefox-102.3.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-102.3.0esr-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-102.3.0esr-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-102.3.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ia.xpi -> firefox-102.3.0esr-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/km.xpi -> firefox-102.3.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/kn.xpi -> firefox-102.3.0esr-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/lij.xpi -> firefox-102.3.0esr-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/mk.xpi -> firefox-102.3.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/mr.xpi -> firefox-102.3.0esr-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/my.xpi -> firefox-102.3.0esr-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-102.3.0esr-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/oc.xpi -> firefox-102.3.0esr-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/sco.xpi -> firefox-102.3.0esr-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/si.xpi -> firefox-102.3.0esr-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/son.xpi -> firefox-102.3.0esr-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/szl.xpi -> firefox-102.3.0esr-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ta.xpi -> firefox-102.3.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/te.xpi -> firefox-102.3.0esr-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/tl.xpi -> firefox-102.3.0esr-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/trs.xpi -> firefox-102.3.0esr-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/ur.xpi -> firefox-102.3.0esr-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/102.3.0esr/linux-x86_64/xpi/xh.xpi -> firefox-102.3.0esr-xh.xpi )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	1c0b36f6ee2ff37bb9ab25cf23563030	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=f3f31bf7691d88cacbf38dc9782f4a75
+_md5_=116c2bfa2c6bec5a1f9ee3b872aeee76
diff --git a/metadata/md5-cache/www-client/google-chrome-beta-106.0.5249.40 b/metadata/md5-cache/www-client/google-chrome-beta-106.0.5249.51
similarity index 97%
rename from metadata/md5-cache/www-client/google-chrome-beta-106.0.5249.40
rename to metadata/md5-cache/www-client/google-chrome-beta-106.0.5249.51
index a3965762abcb..f83fbc65b9c6 100644
--- a/metadata/md5-cache/www-client/google-chrome-beta-106.0.5249.40
+++ b/metadata/md5-cache/www-client/google-chrome-beta-106.0.5249.51
@@ -10,6 +10,6 @@ LICENSE=google-chrome
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr >=dev-libs/nss-3.26 dev-libs/wayland media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl net-print/cups sys-apps/dbus sys-libs/glibc sys-libs/libcap x11-libs/cairo x11-libs/gdk-pixbuf:2 || ( x11-libs/gtk+:3[X] gui-libs/gtk:4[X] ) x11-libs/libdrm >=x11-libs/libX11-1.5.0 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils selinux? ( sec-policy/selinux-chromium )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_106.0.5249.40-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_106.0.5249.51-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7bb93e46b5176068deb7b8a0c24a0e9e
diff --git a/metadata/md5-cache/www-client/microsoft-edge-dev-106.0.1363.0 b/metadata/md5-cache/www-client/microsoft-edge-dev-107.0.1387.2
similarity index 96%
rename from metadata/md5-cache/www-client/microsoft-edge-dev-106.0.1363.0
rename to metadata/md5-cache/www-client/microsoft-edge-dev-107.0.1387.2
index d858646cb732..646c9f6a5621 100644
--- a/metadata/md5-cache/www-client/microsoft-edge-dev-106.0.1363.0
+++ b/metadata/md5-cache/www-client/microsoft-edge-dev-107.0.1387.2
@@ -10,6 +10,6 @@ LICENSE=microsoft-edge
 RDEPEND=app-accessibility/at-spi2-atk:2 app-accessibility/at-spi2-core:2 app-misc/ca-certificates dev-libs/atk dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-fonts/liberation-fonts media-libs/alsa-lib media-libs/mesa[gbm(+)] net-misc/curl[ssl] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3[X] x11-libs/libdrm x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango x11-misc/xdg-utils mip? ( app-crypt/libsecret )
 RESTRICT=bindist mirror strip
 SLOT=0
-SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_106.0.1363.0-1_amd64.deb
+SRC_URI=https://packages.microsoft.com/repos/edge/pool/main/m/microsoft-edge-dev/microsoft-edge-dev_107.0.1387.2-1_amd64.deb
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	22952d8f27cac191d75529d4c38e6bfa	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
 _md5_=7b79a8f51cfe4d4f62e90c71634a4fd3
diff --git a/metadata/md5-cache/www-client/pybugz-0.13-r1 b/metadata/md5-cache/www-client/pybugz-0.13-r1
deleted file mode 100644
index bc26543e780c..000000000000
--- a/metadata/md5-cache/www-client/pybugz-0.13-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[readline(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[readline(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?]
-DESCRIPTION=Command line interface to (Gentoo) Bugzilla
-EAPI=7
-HOMEPAGE=https://github.com/williamh/pybugz
-INHERIT=bash-completion-r1 distutils-r1
-IUSE=python_targets_python3_8 python_targets_python3_9
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
-LICENSE=GPL-2
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[readline(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[readline(+)] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 )
-SLOT=0
-SRC_URI=https://github.com/williamh/pybugz/archive/0.13.tar.gz -> pybugz-0.13.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ca5640be10f93b397f2b17f182d9880b
diff --git a/metadata/md5-cache/www-client/pybugz-0.13-r2 b/metadata/md5-cache/www-client/pybugz-0.13-r2
index c1cecd34fe03..171c288798c8 100644
--- a/metadata/md5-cache/www-client/pybugz-0.13-r2
+++ b/metadata/md5-cache/www-client/pybugz-0.13-r2
@@ -1,4 +1,4 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[readline(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[readline(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[readline(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[readline(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[readline(+),ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[readline(+),ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[readline(+),ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[readline(+),ssl(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test
 DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DESCRIPTION=Command line interface to (Gentoo) Bugzilla
@@ -8,9 +8,9 @@ INHERIT=bash-completion-r1 distutils-r1
 IUSE=python_targets_python3_8 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 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris
 LICENSE=GPL-2
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[readline(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[readline(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[readline(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[readline(+)] )
+RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[readline(+),ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[readline(+),ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[readline(+),ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[readline(+),ssl(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/williamh/pybugz/archive/0.13.tar.gz -> pybugz-0.13.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f8d9827e56eae5ed05565b9b0b844782
+_md5_=c1594dca3437e77d8c5ab141869b2da6
diff --git a/metadata/md5-cache/www-client/pybugz-9999 b/metadata/md5-cache/www-client/pybugz-9999
index 37dd57f9b1c9..91b7ea2ae001 100644
--- a/metadata/md5-cache/www-client/pybugz-9999
+++ b/metadata/md5-cache/www-client/pybugz-9999
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-vcs/git-1.8.2.1[curl] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[readline(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[readline(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[readline(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[readline(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=>=dev-vcs/git-1.8.2.1[curl] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[readline(+),ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[readline(+),ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[readline(+),ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[readline(+),ssl(+)] ) >=dev-python/setuptools-42.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DESCRIPTION=Command line interface to (Gentoo) Bugzilla
@@ -8,8 +8,8 @@ INHERIT=git-r3 bash-completion-r1 distutils-r1
 IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[readline(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[readline(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[readline(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[readline(+)] )
+RDEPEND=dev-python/setuptools[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[readline(+),ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[readline(+),ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[readline(+),ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[readline(+),ssl(+)] )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5086c3182b6079970319c190e405b0c4
+_md5_=4d61ac8c4c2f82c6d74e88c58f9981a9
diff --git a/metadata/md5-cache/www-plugins/Manifest.gz b/metadata/md5-cache/www-plugins/Manifest.gz
index 3d67f3615b43..fc71a60df6cb 100644
Binary files a/metadata/md5-cache/www-plugins/Manifest.gz and b/metadata/md5-cache/www-plugins/Manifest.gz differ
diff --git a/metadata/md5-cache/www-plugins/chrome-binary-plugins-106.0.5249.40_beta b/metadata/md5-cache/www-plugins/chrome-binary-plugins-106.0.5249.51_beta
similarity index 92%
rename from metadata/md5-cache/www-plugins/chrome-binary-plugins-106.0.5249.40_beta
rename to metadata/md5-cache/www-plugins/chrome-binary-plugins-106.0.5249.51_beta
index 99304a814225..9f77c55aea35 100644
--- a/metadata/md5-cache/www-plugins/chrome-binary-plugins-106.0.5249.40_beta
+++ b/metadata/md5-cache/www-plugins/chrome-binary-plugins-106.0.5249.51_beta
@@ -8,6 +8,6 @@ LICENSE=google-chrome
 RDEPEND=dev-libs/glib:2 dev-libs/nspr dev-libs/nss sys-libs/glibc !www-plugins/chrome-binary-plugins:0 !www-plugins/chrome-binary-plugins:stable !www-plugins/chrome-binary-plugins:unstable
 RESTRICT=bindist mirror strip
 SLOT=beta
-SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_106.0.5249.40-1_amd64.deb
+SRC_URI=https://dl.google.com/linux/chrome/deb/pool/main/g/google-chrome-beta/google-chrome-beta_106.0.5249.51-1_amd64.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285
 _md5_=280d4365f7d545b5db4b59005ac2ef69
diff --git a/metadata/md5-cache/x11-drivers/Manifest.gz b/metadata/md5-cache/x11-drivers/Manifest.gz
index e671743aff5f..fc307ac0acd4 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-390.154 b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154
index 5fa02b8570b5..47521bf51a02 100644
--- a/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154
+++ b/metadata/md5-cache/x11-drivers/nvidia-drivers-390.154
@@ -12,4 +12,4 @@ RDEPEND=acct-group/video sys-libs/glibc persistenced? ( acct-user/nvpd net-libs/
 SLOT=0/390
 SRC_URI=amd64? ( https://download.nvidia.com/XFree86/Linux-x86_64/390.154/NVIDIA-Linux-x86_64-390.154.run ) x86? ( https://download.nvidia.com/XFree86/Linux-x86/390.154/NVIDIA-Linux-x86-390.154.run ) https://download.nvidia.com/XFree86/nvidia-installer/nvidia-installer-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-modprobe/nvidia-modprobe-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-persistenced/nvidia-persistenced-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-settings/nvidia-settings-390.154.tar.bz2 https://download.nvidia.com/XFree86/nvidia-xconfig/nvidia-xconfig-390.154.tar.bz2
 _eclasses_=desktop	22952d8f27cac191d75529d4c38e6bfa	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	linux-mod	6ff232574f0bcad33767903505553e8d	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	unpacker	697382d119fd3d195f110b7979184285	user-info	69a1ed744ec33cf2c910ff2bd6084d11
-_md5_=23f7239be596fe1fb6b3445a2a5da0a4
+_md5_=b9d36c8aea9fb47eb367ae49b9ec4522
diff --git a/metadata/md5-cache/x11-libs/Manifest.gz b/metadata/md5-cache/x11-libs/Manifest.gz
index 1aee537c0094..51a7016ffdfb 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/goffice-0.10.53 b/metadata/md5-cache/x11-libs/goffice-0.10.53
new file mode 100644
index 000000000000..ce7e3d87ad31
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/goffice-0.10.53
@@ -0,0 +1,15 @@
+BDEPEND=dev-lang/perl dev-util/glib-utils >=dev-util/gtk-doc-am-1.12 >=dev-util/intltool-0.35 virtual/perl-Compress-Raw-Zlib virtual/perl-Getopt-Long virtual/perl-IO-Compress virtual/pkgconfig app-arch/xz-utils >=app-portage/elt-patches-20170815
+DEFINED_PHASES=configure install prepare
+DEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.4.12:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=x11-libs/cairo-1.10:=[svg] >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.24:= x11-libs/libXext:= x11-libs/libXrender:= introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
+DESCRIPTION=A library of document-centric objects and utilities
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/goffice/
+INHERIT=gnome.org libtool
+IUSE=+introspection
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris
+LICENSE=GPL-2
+RDEPEND=>=app-text/libspectre-0.2.6:= >=dev-libs/glib-2.40.0:2 >=dev-libs/libxml2-2.4.12:2 dev-libs/libxslt >=gnome-base/librsvg-2.22:2 >=gnome-extra/libgsf-1.14.24:=[introspection?] >=x11-libs/cairo-1.10:=[svg] >=x11-libs/gdk-pixbuf-2.22:2 >=x11-libs/gtk+-3.20:3 >=x11-libs/pango-1.24:= x11-libs/libXext:= x11-libs/libXrender:= introspection? ( >=dev-libs/gobject-introspection-1:= >=gnome-extra/libgsf-1.14.23:= )
+SLOT=0.10
+SRC_URI=mirror://gnome/sources/goffice/0.10/goffice-0.10.53.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=436900c1a3ba74fa81ff663df38bbdcc
diff --git a/metadata/md5-cache/x11-misc/Manifest.gz b/metadata/md5-cache/x11-misc/Manifest.gz
index a1a988097e97..485f8de65e2b 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/bbcd-0.3.1-r5 b/metadata/md5-cache/x11-misc/bbcd-0.3.1-r5
new file mode 100644
index 000000000000..5e34cd30367e
--- /dev/null
+++ b/metadata/md5-cache/x11-misc/bbcd-0.3.1-r5
@@ -0,0 +1,14 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=configure install prepare
+DEPEND=>=media-libs/libcdaudio-0.99.12-r4 x11-libs/libX11 x11-libs/libXt
+DESCRIPTION=Basic CD Player for blackbox wm
+EAPI=8
+HOMEPAGE=http://tranber1.free.fr/bbcd.html
+INHERIT=autotools flag-o-matic
+KEYWORDS=~amd64 ~ppc ~x86
+LICENSE=GPL-2
+RDEPEND=>=media-libs/libcdaudio-0.99.12-r4 x11-libs/libX11
+SLOT=0
+SRC_URI=http://tranber1.free.fr/bbcd-0.3.1.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=734fb4bd2180658c3cf3f8873d68d24f
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 9dc6f748e780..62280503904f 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.26.3 b/metadata/md5-cache/x11-terms/kitty-0.26.3
new file mode 100644
index 000000000000..5de3db4b0876
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-0.26.3
@@ -0,0 +1,18 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sys-libs/ncurses virtual/pkgconfig test? ( python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] ) ) wayland? ( dev-util/wayland-scanner ) verify-sig? ( sec-keys/openpgp-keys-kovidgoyal ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/openssl:= media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-0.26.3 ~x11-terms/kitty-terminfo-0.26.3 X? ( x11-libs/libX11 ) transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland ) X? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr ) wayland? ( dev-libs/wayland-protocols )
+DESCRIPTION=Fast, feature-rich, GPU-based terminal
+EAPI=8
+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 transfer wayland python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 verify-sig
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/openssl:= media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-0.26.3 ~x11-terms/kitty-terminfo-0.26.3 X? ( x11-libs/libX11 ) transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland )
+REQUIRED_USE=|| ( X wayland ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.3/kitty-0.26.3.tar.xz verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v0.26.3/kitty-0.26.3.tar.xz.sig )
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d2ead6637d7c3c790abbb35c49d3b77c
diff --git a/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.3 b/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.3
new file mode 100644
index 000000000000..6398fd844ab9
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.3
@@ -0,0 +1,10 @@
+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 ~x86
+LICENSE=GPL-3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.3/kitty-0.26.3.tar.xz
+_md5_=469ce3d113ca8a046e780aa7f7d5ba3d
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.3 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.3
new file mode 100644
index 000000000000..0202aa528826
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.3
@@ -0,0 +1,11 @@
+BDEPEND=sys-libs/ncurses
+DEFINED_PHASES=compile install
+DESCRIPTION=Terminfo for kitty, a GPU-based terminal emulator
+EAPI=8
+HOMEPAGE=https://sw.kovidgoyal.net/kitty/
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.3/kitty-0.26.3.tar.xz
+_md5_=96d958882b65a1b8fae9dfaa54af8e62
diff --git a/metadata/md5-cache/x11-themes/Manifest.gz b/metadata/md5-cache/x11-themes/Manifest.gz
index 0a9342152969..a5417a07ff5b 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/gnome-backgrounds-43 b/metadata/md5-cache/x11-themes/gnome-backgrounds-43
new file mode 100644
index 000000000000..db26287d11f8
--- /dev/null
+++ b/metadata/md5-cache/x11-themes/gnome-backgrounds-43
@@ -0,0 +1,12 @@
+BDEPEND=>=sys-devel/gettext-0.19.8 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 test
+DESCRIPTION=A set of backgrounds packaged with the GNOME desktop
+EAPI=8
+HOMEPAGE=https://gitlab.gnome.org/GNOME/gnome-backgrounds
+INHERIT=gnome.org meson
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0 CC-BY-4.0
+SLOT=0
+SRC_URI=mirror://gnome/sources/gnome-backgrounds/43/gnome-backgrounds-43.tar.xz
+_eclasses_=gnome.org	429073e99d7067d3462e875bf5c6e14a	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=27da5766aa99fa2634ce3527c55b8dbf
diff --git a/metadata/md5-cache/x11-wm/Manifest.gz b/metadata/md5-cache/x11-wm/Manifest.gz
index e26f3ea3d5dc..d6177cd73b79 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/dwm-6.3 b/metadata/md5-cache/x11-wm/dwm-6.3
index 08e6ae90c6ab..d0b7653a499d 100644
--- a/metadata/md5-cache/x11-wm/dwm-6.3
+++ b/metadata/md5-cache/x11-wm/dwm-6.3
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://dwm.suckless.org/
 INHERIT=savedconfig toolchain-funcs
 IUSE=xinerama savedconfig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ppc ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=media-libs/fontconfig x11-libs/libX11 x11-libs/libXft xinerama? ( x11-libs/libXinerama )
 SLOT=0
 SRC_URI=https://dl.suckless.org/dwm/dwm-6.3.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=f74b36098c5074cab9b3c35b7900e231
+_md5_=78bd3c2ad0ad43d51470e2b43b2b3dcd
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 082679ccc953..06b8e245b859 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Sep 2022 16:39:50 +0000
+Fri, 23 Sep 2022 04:39:52 +0000
diff --git a/metadata/projects.xml b/metadata/projects.xml
index e99f4c8346ef..c1fd1efeedd0 100644
--- a/metadata/projects.xml
+++ b/metadata/projects.xml
@@ -447,6 +447,10 @@
       <email>floppym@gentoo.org</email>
       <name>Mike Gilbert</name>
     </member>
+    <member>
+      <email>sultan@gentoo.org</email>
+      <name>Stephan Hartmann</name>
+    </member>
   </project>
   <project>
     <email>cjk@gentoo.org</email>
diff --git a/metadata/timestamp b/metadata/timestamp
index 183ecd99c613..060bdd580f2a 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Sep 21 04:39:49 PM UTC 2022
+Fri Sep 23 04:39:52 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index b8f94ffddd90..bbfe942c2fff 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Sep 2022 17:00:01 +0000
+Fri, 23 Sep 2022 05:00:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index e6b0ebe2cf9a..117880be5faf 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-81f20ebb0c4714af59f9dcc1a4b2c36926e43d60 1663776589 2022-09-21T16:09:49+00:00
+66724d2efd8d82e091396f48e49f65b6af467e95 1663905815 2022-09-23T04:03:35+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 3f85318ae027..ea155fa90a70 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1663778401 Wed 21 Sep 2022 04:40:01 PM UTC
+1663908001 Fri 23 Sep 2022 04:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index 7e8bc7ab76e6..06b8e245b859 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 21 Sep 2022 16:39:49 +0000
+Fri, 23 Sep 2022 04:39:52 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 377002e0a13c..06c4cfc65be1 100644
Binary files a/net-analyzer/Manifest.gz and b/net-analyzer/Manifest.gz differ
diff --git a/net-analyzer/wireshark/Manifest b/net-analyzer/wireshark/Manifest
index ac6e9b0afbc2..4bdd30fffb51 100644
--- a/net-analyzer/wireshark/Manifest
+++ b/net-analyzer/wireshark/Manifest
@@ -1,8 +1,5 @@
 DIST wireshark-3.4.11.tar.xz 32354216 BLAKE2B 3e08d01f2d89f5ddd74c4e2215e6852f30c7419234a45b52a25aa9119995ec2c2882cc3993dce7941e6e73230eb4d295bf0785dda5fe8c3df99f9efdb1e42bfd SHA512 cfef2c3e56279baadb7f41a1f46fde9214a467972f69914c14a8153ea2f2adcb55832413bcaf7a3f8d98b4b62d0574f12144de6c06ff382b4fa8b071903993dc
-DIST wireshark-3.6.2.tar.xz 39654296 BLAKE2B 585cf925892ec9d5b6413ccc53c49035eba8a7cd9206f1354f0a808daec9b0f20fc72b3427a2b592f196dd6b2ab67fd35e73d152a20c16fb0f0153c6a03d3156 SHA512 cd4a8077629632e9a924600f9af2ffd01917726fd64504d6f3b4a2a1cb5340c9c0bac23e4abab63743952a0a78efd2e09bb125b127d24e85eca6fa41928fd070
 DIST wireshark-3.6.3.tar.xz 39935892 BLAKE2B 3b636867d946f0cf748eb719874e815c919ee9cedd21a7e9034d54b4cb87ae4a09ec02a199e1ec8051e421fe2929983d659f340ccfd12ab35e1ecd52000964fd SHA512 4415216f791caee23757f3c754dd88ce8fd8eb8d2d64c1bd011b40c7451a1ef56cf41bcf1cdcf41221f196bf17be550f9271f05b82a017a02cac5c241785b7e6
-DIST wireshark-3.6.5.tar.xz 39939340 BLAKE2B 4df1abce2563f20e91fac169ef1ab65851a5f63423aceba487db8cd4b954c4a2ba5673e032878b33a43992cb2ee4628899eee8b0065220cd0c79a8c98a589ef0 SHA512 9aa60721401fbd1f3c6b912312792433c9f8a09583cf684a4f1a24c839f4786a54a0abbfd88c04ba222e5a7af09f7bc67c292a0f944c9b717a71509655fe2fe5
 DIST wireshark-3.6.6.tar.xz 39950276 BLAKE2B cb74c4ed307b83ba509fa3b56356a33df11d9d1effb29054f73f248ca1c7107806676539d0802cc71e07687831a838145194104183afa4ae1825eb1fb85062b1 SHA512 c32d5aafb3091dc1475896a3c4cfcb5a47af002e53f011a65697271c611e690743153841f5db1021a6cbea6d427dc661dce7b85208832251200258fb46aad84b
-DIST wireshark-3.6.7.tar.xz 39967312 BLAKE2B 0539130aec2c7d8fdfec536114144a0b761addb8006d146a5e08d0a58e95d5d6b0db67ef32ceae4143de9836f25a3497802706f0a0eb633f29e1f24a47819e4b SHA512 caf087ee467bf934f28d096869ea3d9d7c5a3c83e51c4df447700096943a92abf5cf29f4956b9a549e0708bcb3515b55c4660a7ced2cb9dbc582b87550026fac
 DIST wireshark-3.6.8.tar.xz 39942580 BLAKE2B 8b51ae1b3bf56fe1ccec70e94d9edb891e7b486a87b8f43984ea6d3150fe8f6c04beef9f12ebd9b830138aec6a993bcf88d50cfc4695b1f9ade6933092bed8db SHA512 c286e84e113f06b13b931da89b6d21b18e342660682579f88e77697f3e9c335ba75cdc190b41651da4d5729529a20740ef1a41e9f9523d9f6cc768147363053a
 DIST wireshark-4.0.0rc2.tar.xz 41318448 BLAKE2B e4f3a9aca102a2f9fa519e429ad262f24df6a67fbd6debf9a9320ae0eb1e8753f65783ca19b5e4b224cf7af368af2a2cedc8065c7cc97216b4ced224fa9ffcaf SHA512 524722f7093af3d9cbb1e355fdeafb653917eabfb1d8d7d7c480a35853b0a777c8f5043d367955d01b7ca16b3f90569dcbafc1025bbeeb57a29ff486066840b8
diff --git a/net-analyzer/wireshark/wireshark-3.6.2.ebuild b/net-analyzer/wireshark/wireshark-3.6.2.ebuild
deleted file mode 100644
index 760d4c694ac1..000000000000
--- a/net-analyzer/wireshark/wireshark-3.6.2.ebuild
+++ /dev/null
@@ -1,273 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg-utils cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
-	inherit git-r3
-else
-	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-	S="${WORKDIR}/${P/_/}"
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ppc64 ~riscv x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	plugin-ifdemo? ( plugins )"
-
-RESTRICT="!test? ( test )"
-
-# bug #753062 for speexdsp
-RDEPEND="acct-group/pcap
-	>=dev-libs/glib-2.38:2
-	>=net-dns/c-ares-1.5:=
-	dev-libs/libgcrypt:=
-	media-libs/speexdsp
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli:= )
-	ciscodump? ( >=net-libs/libssh-0.6 )
-	filecaps? ( sys-libs/libcap )
-	http2? ( net-libs/nghttp2:= )
-	ilbc? ( media-libs/libilbc )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( ${LUA_DEPS} )
-	lz4? ( app-arch/lz4:= )
-	maxminddb? ( dev-libs/libmaxminddb:= )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	opus? ( media-libs/opus )
-	pcap? ( net-libs/libpcap )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	sshdump? ( >=net-libs/libssh-0.6 )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	test? (
-		dev-python/pytest
-		dev-python/pytest-xdist
-	)"
-RDEPEND="${RDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-)
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos ; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5 ; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	python_setup
-
-	mycmakeargs+=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DDISABLE_WERROR=yes
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_ILBC=$(usex ilbc)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LTO=$(usex lto)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_OPUS=$(usex opus)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	myctestargs=(
-		--disable-capture
-		--skip-missing-programs=all
-		--verbose
-
-		# Skip known failing tests
-		# extcaps needs a bunch of external programs
-		-E "(suite_extcaps)"
-		#-E "(suite_decryption|suite_extcaps|suite_nameres)"
-	)
-
-	cmake_src_test
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h
-
-	# If trying to remove this, try build e.g. libvirt first!
-	# At last check, Fedora is still doing this too.
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		wiretap
-		wsutil
-		wsutil/wmem
-	)
-
-	for dir in "${dirs[@]}" ; do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	if use qt5 ; then
-		local s
-
-		for s in 16 32 48 64 128 256 512 1024 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${ED}"/usr/share/appdata ]] ; then
-		rm -r "${ED}"/usr/share/appdata || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-
-	# Add group for users allowed to sniff.
-	chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap ; then
-		fcaps -o 0 -g pcap -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the pcap group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-	xdg_mimeinfo_database_update
-}
diff --git a/net-analyzer/wireshark/wireshark-3.6.5.ebuild b/net-analyzer/wireshark/wireshark-3.6.5.ebuild
deleted file mode 100644
index fffca9343012..000000000000
--- a/net-analyzer/wireshark/wireshark-3.6.5.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
-	inherit git-r3
-else
-	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-	S="${WORKDIR}/${P/_/}"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	plugin-ifdemo? ( plugins )"
-
-RESTRICT="!test? ( test )"
-
-# bug #753062 for speexdsp
-RDEPEND="acct-group/pcap
-	>=dev-libs/glib-2.38:2
-	>=net-dns/c-ares-1.5:=
-	dev-libs/libgcrypt:=
-	media-libs/speexdsp
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli:= )
-	ciscodump? ( >=net-libs/libssh-0.6 )
-	filecaps? ( sys-libs/libcap )
-	http2? ( net-libs/nghttp2:= )
-	ilbc? ( media-libs/libilbc )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( ${LUA_DEPS} )
-	lz4? ( app-arch/lz4:= )
-	maxminddb? ( dev-libs/libmaxminddb:= )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	opus? ( media-libs/opus )
-	pcap? ( net-libs/libpcap )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	sshdump? ( >=net-libs/libssh-0.6 )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		')
-	)"
-RDEPEND="${RDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-)
-
-python_check_deps() {
-	use test || return 0
-
-	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
-		 python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos ; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5 ; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	python_setup
-
-	mycmakeargs+=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DDISABLE_WERROR=ON
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_ILBC=$(usex ilbc)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LTO=$(usex lto)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_OPUS=$(usex opus)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
-	epytest \
-		--disable-capture \
-		--skip-missing-programs=all \
-		--program-path "${BUILD_DIR}"/run
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h
-
-	# If trying to remove this, try build e.g. libvirt first!
-	# At last check, Fedora is still doing this too.
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		wiretap
-		wsutil
-		wsutil/wmem
-	)
-
-	for dir in "${dirs[@]}" ; do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	if use qt5 ; then
-		local s
-
-		for s in 16 32 48 64 128 256 512 1024 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${ED}"/usr/share/appdata ]] ; then
-		rm -r "${ED}"/usr/share/appdata || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# Add group for users allowed to sniff.
-	chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap ; then
-		fcaps -o 0 -g pcap -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the pcap group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
diff --git a/net-analyzer/wireshark/wireshark-3.6.7.ebuild b/net-analyzer/wireshark/wireshark-3.6.7.ebuild
deleted file mode 100644
index fffca9343012..000000000000
--- a/net-analyzer/wireshark/wireshark-3.6.7.ebuild
+++ /dev/null
@@ -1,269 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-LUA_COMPAT=( lua5-{1..2} )
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit fcaps flag-o-matic lua-single python-any-r1 qmake-utils xdg cmake
-
-DESCRIPTION="A network protocol analyzer formerly known as ethereal"
-HOMEPAGE="https://www.wireshark.org/"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://gitlab.com/wireshark/wireshark"
-	inherit git-r3
-else
-	SRC_URI="https://www.wireshark.org/download/src/all-versions/${P/_/}.tar.xz"
-	S="${WORKDIR}/${P/_/}"
-
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc64 ~riscv ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/${PV}"
-IUSE="androiddump bcg729 brotli +capinfos +captype ciscodump +dftest doc dpauxmon"
-IUSE+=" +dumpcap +editcap http2 ilbc kerberos libxml2 lto lua lz4 maxminddb"
-IUSE+=" +mergecap +minizip +netlink opus +plugins plugin-ifdemo +pcap +qt5 +randpkt"
-IUSE+=" +randpktdump +reordercap sbc selinux +sharkd smi snappy spandsp sshdump ssl"
-IUSE+=" sdjournal test +text2pcap tfshark +tshark +udpdump zlib +zstd"
-
-REQUIRED_USE="lua? ( ${LUA_REQUIRED_USE} )
-	plugin-ifdemo? ( plugins )"
-
-RESTRICT="!test? ( test )"
-
-# bug #753062 for speexdsp
-RDEPEND="acct-group/pcap
-	>=dev-libs/glib-2.38:2
-	>=net-dns/c-ares-1.5:=
-	dev-libs/libgcrypt:=
-	media-libs/speexdsp
-	bcg729? ( media-libs/bcg729 )
-	brotli? ( app-arch/brotli:= )
-	ciscodump? ( >=net-libs/libssh-0.6 )
-	filecaps? ( sys-libs/libcap )
-	http2? ( net-libs/nghttp2:= )
-	ilbc? ( media-libs/libilbc )
-	kerberos? ( virtual/krb5 )
-	libxml2? ( dev-libs/libxml2 )
-	lua? ( ${LUA_DEPS} )
-	lz4? ( app-arch/lz4:= )
-	maxminddb? ( dev-libs/libmaxminddb:= )
-	minizip? ( sys-libs/zlib[minizip] )
-	netlink? ( dev-libs/libnl:3 )
-	opus? ( media-libs/opus )
-	pcap? ( net-libs/libpcap )
-	qt5? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtmultimedia:5
-		dev-qt/qtprintsupport:5
-		dev-qt/qtwidgets:5
-		x11-misc/xdg-utils
-	)
-	sbc? ( media-libs/sbc )
-	sdjournal? ( sys-apps/systemd )
-	smi? ( net-libs/libsmi )
-	snappy? ( app-arch/snappy )
-	spandsp? ( media-libs/spandsp )
-	sshdump? ( >=net-libs/libssh-0.6 )
-	ssl? ( net-libs/gnutls:= )
-	zlib? ( sys-libs/zlib )
-	zstd? ( app-arch/zstd:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="${PYTHON_DEPS}
-	dev-lang/perl
-	sys-devel/flex
-	sys-devel/gettext
-	virtual/pkgconfig
-	doc? (
-		app-doc/doxygen
-		dev-ruby/asciidoctor
-	)
-	qt5? (
-		dev-qt/linguist-tools:5
-	)
-	test? (
-		$(python_gen_any_dep '
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		')
-	)"
-RDEPEND="${RDEPEND}
-	qt5? ( virtual/freedesktop-icon-theme )
-	selinux? ( sec-policy/selinux-wireshark )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.6.0-redhat.patch
-	"${FILESDIR}"/${PN}-3.4.2-cmake-lua-version.patch
-)
-
-python_check_deps() {
-	use test || return 0
-
-	python_has_version -b "dev-python/pytest[${PYTHON_USEDEP}]" &&
-		 python_has_version -b "dev-python/pytest-xdist[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local mycmakeargs
-
-	# Workaround bug #213705. If krb5-config --libs has -lcrypto then pass
-	# --with-ssl to ./configure. (Mimics code from acinclude.m4).
-	if use kerberos ; then
-		case $(krb5-config --libs) in
-			*-lcrypto*)
-				ewarn "Kerberos was built with ssl support: linkage with openssl is enabled."
-				ewarn "Note there are annoying license incompatibilities between the OpenSSL"
-				ewarn "license and the GPL, so do your check before distributing such package."
-				mycmakeargs+=( -DENABLE_GNUTLS=$(usex ssl) )
-				;;
-		esac
-	fi
-
-	if use qt5 ; then
-		export QT_MIN_VERSION=5.3.0
-		append-cxxflags -fPIC -DPIC
-	fi
-
-	python_setup
-
-	mycmakeargs+=(
-		-DCMAKE_DISABLE_FIND_PACKAGE_{Asciidoctor,DOXYGEN}=$(usex !doc)
-		$(use androiddump && use pcap && echo -DEXTCAP_ANDROIDDUMP_LIBPCAP=yes)
-		$(usex qt5 LRELEASE=$(qt5_get_bindir)/lrelease '')
-		$(usex qt5 MOC=$(qt5_get_bindir)/moc '')
-		$(usex qt5 RCC=$(qt5_get_bindir)/rcc '')
-		$(usex qt5 UIC=$(qt5_get_bindir)/uic '')
-		-DBUILD_androiddump=$(usex androiddump)
-		-DBUILD_capinfos=$(usex capinfos)
-		-DBUILD_captype=$(usex captype)
-		-DBUILD_ciscodump=$(usex ciscodump)
-		-DBUILD_dftest=$(usex dftest)
-		-DBUILD_dpauxmon=$(usex dpauxmon)
-		-DBUILD_dumpcap=$(usex dumpcap)
-		-DBUILD_editcap=$(usex editcap)
-		-DBUILD_mergecap=$(usex mergecap)
-		-DBUILD_mmdbresolve=$(usex maxminddb)
-		-DBUILD_randpkt=$(usex randpkt)
-		-DBUILD_randpktdump=$(usex randpktdump)
-		-DBUILD_reordercap=$(usex reordercap)
-		-DBUILD_sdjournal=$(usex sdjournal)
-		-DBUILD_sharkd=$(usex sharkd)
-		-DBUILD_sshdump=$(usex sshdump)
-		-DBUILD_text2pcap=$(usex text2pcap)
-		-DBUILD_tfshark=$(usex tfshark)
-		-DBUILD_tshark=$(usex tshark)
-		-DBUILD_udpdump=$(usex udpdump)
-		-DBUILD_wireshark=$(usex qt5)
-		-DDISABLE_WERROR=ON
-		-DENABLE_BCG729=$(usex bcg729)
-		-DENABLE_BROTLI=$(usex brotli)
-		-DENABLE_CAP=$(usex filecaps caps)
-		-DENABLE_GNUTLS=$(usex ssl)
-		-DENABLE_ILBC=$(usex ilbc)
-		-DENABLE_KERBEROS=$(usex kerberos)
-		-DENABLE_LIBXML2=$(usex libxml2)
-		-DENABLE_LTO=$(usex lto)
-		-DENABLE_LUA=$(usex lua)
-		-DENABLE_LZ4=$(usex lz4)
-		-DENABLE_MINIZIP=$(usex minizip)
-		-DENABLE_NETLINK=$(usex netlink)
-		-DENABLE_NGHTTP2=$(usex http2)
-		-DENABLE_OPUS=$(usex opus)
-		-DENABLE_PCAP=$(usex pcap)
-		-DENABLE_PLUGINS=$(usex plugins)
-		-DENABLE_PLUGIN_IFDEMO=$(usex plugin-ifdemo)
-		-DENABLE_SBC=$(usex sbc)
-		-DENABLE_SMI=$(usex smi)
-		-DENABLE_SNAPPY=$(usex snappy)
-		-DENABLE_SPANDSP=$(usex spandsp)
-		-DENABLE_ZLIB=$(usex zlib)
-		-DENABLE_ZSTD=$(usex zstd)
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build test-programs
-
-	# https://www.wireshark.org/docs/wsdg_html_chunked/ChTestsRunPytest.html
-	epytest \
-		--disable-capture \
-		--skip-missing-programs=all \
-		--program-path "${BUILD_DIR}"/run
-}
-
-src_install() {
-	cmake_src_install
-
-	# FAQ is not required as is installed from help/faq.txt
-	dodoc AUTHORS ChangeLog NEWS README* doc/randpkt.txt doc/README*
-
-	# install headers
-	insinto /usr/include/wireshark
-	doins ws_diag_control.h ws_symbol_export.h \
-		"${BUILD_DIR}"/config.h
-
-	# If trying to remove this, try build e.g. libvirt first!
-	# At last check, Fedora is still doing this too.
-	local dir dirs=(
-		epan
-		epan/crypt
-		epan/dfilter
-		epan/dissectors
-		epan/ftypes
-		wiretap
-		wsutil
-		wsutil/wmem
-	)
-
-	for dir in "${dirs[@]}" ; do
-		insinto /usr/include/wireshark/${dir}
-		doins ${dir}/*.h
-	done
-
-	if use qt5 ; then
-		local s
-
-		for s in 16 32 48 64 128 256 512 1024 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/apps
-			newins image/wsicon${s}.png wireshark.png
-		done
-
-		for s in 16 24 32 48 64 128 256 ; do
-			insinto /usr/share/icons/hicolor/${s}x${s}/mimetypes
-			newins image/WiresharkDoc-${s}.png application-vnd.tcpdump.pcap.png
-		done
-	fi
-
-	if [[ -d "${ED}"/usr/share/appdata ]] ; then
-		rm -r "${ED}"/usr/share/appdata || die
-	fi
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-
-	# Add group for users allowed to sniff.
-	chgrp pcap "${EROOT}"/usr/bin/dumpcap
-
-	if use dumpcap && use pcap ; then
-		fcaps -o 0 -g pcap -m 4710 -M 0710 \
-			cap_dac_read_search,cap_net_raw,cap_net_admin \
-			"${EROOT}"/usr/bin/dumpcap
-	fi
-
-	ewarn "NOTE: To capture traffic with wireshark as normal user you have to"
-	ewarn "add yourself to the pcap group. This security measure ensures"
-	ewarn "that only trusted users are allowed to sniff your traffic."
-}
diff --git a/net-analyzer/zabbix/Manifest b/net-analyzer/zabbix/Manifest
index 9859510d522b..b5749c267db3 100644
--- a/net-analyzer/zabbix/Manifest
+++ b/net-analyzer/zabbix/Manifest
@@ -1,13 +1,20 @@
 DIST zabbix-4.0.43.tar.gz 17648025 BLAKE2B 1dbe0c8691d990278bcc540dcd57d7640a3d832021a9ec416dd67857a3e6e0724659ca13c6c59482e45e772cdb3c22f66810d0111e59d0371ed37f3d8b61275b SHA512 5d7f81a2e7dd8d060ab46c37622b4b73702d208e065bd99022f6c7e9598f2230b89347e73864238861eed7747d5439221ed1e4cc7ac99bf1e990d9550612dd7f
+DIST zabbix-4.0.44.tar.gz 17713321 BLAKE2B 1f75f99430846cfc029d5e541ede7ef8c019a42af0ab6d70be3170052b723877ca54f6554cd9a29f7f436fb6e9d5ffd02913a1b12ad45a2a8ed00432738e5660 SHA512 223d6fdd352e5731487797d839c1741209eae79af78a058d3ba29e5a9eaab5cbf91072ad827bdd676696d3ea518c638d7fd515bff2a257aef3a7ad38f41b3cb6
 DIST zabbix-5.0.26-go-deps.tar.xz 34385532 BLAKE2B a52924f8bee464deb6f6812242c0d7d987e7b46d097f0a118e2cb429d6d3d26f8e116d66e594a26e22bc5bf81997d21fb66ef97151538a814f63fe2c55a7f729 SHA512 49727ccd5e26d28e577fe9ee1d7eaa2de3d5054e831ea82e5dc9d8177c63063cf957b575072c5dc68b294763d519fff9041700e2dc267394e6ec143d272b1dd7
 DIST zabbix-5.0.26.tar.gz 21248951 BLAKE2B 9119e66acc71f5ed8baf07b6bc90a69152188e1e74058146a9c7eef7d36fc9f0363a5635518bdb696b76fb93c9777878b8d4411853c641dec809e86cba4cfa74 SHA512 b10b3eb849ea3646aeaf3d2a1dbf639e6effbd21a23c06e4f2686a177d2ae186537607ed0a76c3f520cb84f3bba3079f5d9f7e840077cf5e1a3eac4b46f0558b
 DIST zabbix-5.0.27-go-deps.tar.xz 34405712 BLAKE2B a24aa4bfde3726e04a6eb2664e4e9ab510ebaee55bd35ee61fe296cd961482d587305f461ca76a483d5441c3a2a8554dbb510bb00aabf3d60a0cc7342f48f61b SHA512 6f871b203247633253339db21015ad8610d905d9c7801ca34291af373fdc1a57b676b575da02b21968ab624fd3e87084cd4c4d234f43520d55a4a448c27d09e6
 DIST zabbix-5.0.27.tar.gz 21319138 BLAKE2B bd6d8986c3c1fbfb702fcda97ce1567701c4354cfed624978a3820b79643295e38c08370e43a2d2ae8b78f68118e4b443488903227197d3afd5fc298b806549e SHA512 e6c3f63e0f3999d723c6e46611cbdb33eea2c81cf33821bf6204ea1e3c31a8745a65641da037886798f918e8f775d97c326dd180dc4b26d66cc0af822e8697ad
+DIST zabbix-5.0.28-go-deps.tar.xz 34382032 BLAKE2B 09d5ba3e81bef941b09907d3bad752935a8106d9e0ea083d13b8946c68dab995180f3b8cc18ef0506f987a12672c3899392e54a5072be03cf4ffa19fbe11ee3d SHA512 e22df02943569b4ef5dfbe043b137941194e0e44d059424d3ff59b34dfab1322dbbaf29586257f561328beec7f85f060c69866ed2723fe75f4bb45a21d2fbde1
+DIST zabbix-5.0.28.tar.gz 21453968 BLAKE2B aa4c94ee43d986897694a9a27cfd2a5cb2aa23678e8eeb1df9b7c7198d480a2543203dda6a81b316ed3a5c80d87ea51c8160f268525e3b7e96d2087f332c4f7e SHA512 9f47205997bf2e7326dc7a7e04d352174dbc1c69fb1b34fdcbc10325ec0a3b70bf5c27373e6276e657f9a88a6d62f413e64612decf93eb53870471e53f2b6925
 DIST zabbix-6.0.7-go-deps.tar.xz 35327308 BLAKE2B eb95964650a58bd300218888e9207f3feb25e9e0c87ed459446d6494bc2388d21d501e73ea8e0a99e4feabbd6d6c12d18c11b096cc6dc1fb534acbe8b3b353ac SHA512 eff9ec6c170279aa228b05a83c5f1bb8d793216189575180d05255faf6a6062c2ab6366ff4aa4e2cd092636a984e6658be47c404628d24dbee209111d28a516e
 DIST zabbix-6.0.7.tar.gz 34190093 BLAKE2B 781edbeaf5452f8e54b6fe91b77ad9dfc8ffcf4716e97f39f5ff8160f084d551cdee9bc34d67141ebcfc5eb0cb074a03c55e0dce36d06c6d589ee021c1c6dba6 SHA512 36e8e26edd104cfdd2510dd201b8020a41d7af3006ad04d6659083ebcc14574b3360c01f70c86a1e008f719c1078512c891ac525ffe7480816973b515f0dcc8f
 DIST zabbix-6.0.8-go-deps.tar.xz 35354840 BLAKE2B bae764f1c66accc77171099c47432c8024c1e591286ac88cab7e25acb7c5f168ac69c5824d3e1e7281bfd2e26a1c80f5c77201368290424cc54fbb7134a76307 SHA512 f15d64e76c3ff037aa040fadd79805834b41c7494309c0d24f95c7d20c6c67c3d374f9079e2cc31a9af20a775d1691ef9cc57075cb895ee4e96f8b00cc41e2e6
 DIST zabbix-6.0.8.tar.gz 34291972 BLAKE2B 9c3fc052c8da9e4d54462ed84ea5a7dc784b2b2256e8ca56083f2419319d6f79b4ff25a11b853214d0bd2a9f0f4b96d09bdbe1c5b311767d045e94070d80fedb SHA512 76e3ec798b4cb4474ef6c0f936aea04cc9e15ce3aefb146e1de09b08c64559bdaa1caaa011fdfa94c23765417d8c3be3da9aa22dfb2cb403e588befa25fcc668
+DIST zabbix-6.0.9-go-deps.tar.xz 35300488 BLAKE2B 7a516774f812e41a8640a68de11fb2f9e8e4d1da90d3c7a76807b25025ab32400e3c9efff7818ed90868da2d753c61e0f03126df0f7661cd440b1b59dc216217 SHA512 0f2c1e79b4b894384c9c09056242ccec732ffe49e80a6167748da4671e6f869486c1be70a83f09beaef356cfde4ec1b1a34ce2c5b122a0f19f351a82614d1389
+DIST zabbix-6.0.9.tar.gz 34515806 BLAKE2B c9b5a432ede5fc5307c30ee1c1f986cb1cb8f0351a46f9f0ee9add2c5d86a9b96ed933d2c6801022451cc8b52babc54deba8ba2478d90136a12798728f83366f SHA512 20211e2eab47d03a5de221f3a466aaff24c01b868208d4cbd7a10a16a10cd20172f009842c631169962c06e13ca8b0c6f0b6bd3cfd060b68b59f95a136a2e207
 DIST zabbix-6.2.1-go-deps.tar.xz 35335980 BLAKE2B 07af6563a9349aa70bf5c258c949ebea520e191088e41e546e0f0cf139fd8f3d47d1d64c6135ed36851269fd0e5cd7b7e52d0d25ccd6fd1ed0108f60daf7cde0 SHA512 146a3a4dc2d49b4d1f48f2f3e38f1d123860d4854c5b4a696c07649141cf6de4b076751cb99582688518b060100a0b740357921177b5340ea4b9426480051360
 DIST zabbix-6.2.1.tar.gz 34776549 BLAKE2B 4952f81936e999c03b8aa71cc370ddc7fcea7f3951bc403501c3617748ecd81a10c5bfe9f80ff55a2521e6b874c50463aa61151ea30ddd6a7b46b20b5e24b645 SHA512 cfdca2a34fecd31ff6f58257abc695e9aba3eaeefebd66f8653b5999e3b650e5ba94d036fc5b9d8e03a1cf532d5f76b1d36a3a9759831707d88ebbe37dc20fc5
 DIST zabbix-6.2.2-go-deps.tar.xz 35354668 BLAKE2B 2fba7e9ee2c04f74d0fe041489136ac30e27ef5869799e0eef720baf0c1f3e4426fc43a8abbb5295b5dec7a5a3ddaf2399096858e47d2d594a23b726599994aa SHA512 92d88ad0d398238cafc29a7d76b4105b8af690694a121aeb9068c5939231933ef9fb319287def02d6248dded6e6e4a6b77152be0bc3925327a4baa8974b1e76c
 DIST zabbix-6.2.2.tar.gz 34995538 BLAKE2B 749e43f23e06f9ad84bea2bae82fc1b8a499df3b873d26fd4fbfefd28288a3f17c1f05207d143516787cb1417107dd8594c704ea79b1a3d745affc787e723ff9 SHA512 b9ea0fb8fbfba6ecba54ad3abb68b10a005098cbbdf7130c6f9321cabcfe60a3b3094214a84e1c9d18fc4a0c959cf238eea43b400af027b9f200fb99c088658a
+DIST zabbix-6.2.3-go-deps.tar.xz 35349056 BLAKE2B 1548167558be12e7519e59e011eb6e761a0a5e1625fb460bbf3106ca5a895277789ce4b2f649884ebb0f236997771378ea47919f3e6fb6a4f4908a29ef34385e SHA512 a8934a5bb2367395c1ba6bf7ccd830c951fb585e7dc054d29f2667bfc45d18eed13889f4c31f8f417aba1920df06512e927c77975f70ab419e7525768caece7f
+DIST zabbix-6.2.3.tar.gz 35252249 BLAKE2B fdc9bd32c1aa632b266d26d88cdc08ac40d2663823730298ae2a136730ad4646a38921b0425ac87ef2c4dad7c62f5d41c2955cdf6b275204e26306b115ae3568 SHA512 9a8d3021f0e2929897c2f6d3e05721a9dd55ec5778c39edf7af9fb99590f8eece6bba40cb085426373837409d690646254fd2a3f0b151224532226dc46df14f4
diff --git a/net-analyzer/zabbix/zabbix-4.0.44.ebuild b/net-analyzer/zabbix/zabbix-4.0.44.ebuild
new file mode 100644
index 000000000000..1e0af68937f8
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-4.0.44.ebuild
@@ -0,0 +1,367 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# needed to make webapp-config dep optional
+WEBAPP_OPTIONAL="yes"
+inherit webapp java-pkg-opt-2 systemd toolchain-funcs tmpfiles 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/4.0/${P}.tar.gz"
+LICENSE="GPL-2"
+SLOT="0/$(ver_cut 1-2)"
+WEBAPP_MANUAL_SLOT="yes"
+KEYWORDS="~amd64 ~x86"
+IUSE="+agent curl frontend gnutls ipv6 java ldap libxml2 mbedtls mysql odbc openipmi +openssl oracle +postgres proxy server snmp sqlite ssh static xmpp"
+REQUIRED_USE="|| ( agent frontend proxy server )
+	?? ( gnutls mbedtls 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 )
+	mbedtls? ( net-libs/mbedtls:0= )
+	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 )
+	xmpp? ( dev-libs/iksemel )
+"
+
+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
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.0.18-modulepathfix.patch"
+	"${FILESDIR}/${PN}-3.0.30-security-disable-PidFile.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 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 mbedtls) \
+		$(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) \
+		$(use_with xmpp jabber)
+}
+
+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
+
+	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 frontends/php/* "${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 (e.g. ~/.sendxmpprc when"
+			ewarn "using sendxmpp for Jabber alerts)."
+			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
+
+	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.28.ebuild b/net-analyzer/zabbix/zabbix-5.0.28.ebuild
new file mode 100644
index 000000000000..d3c97bb80618
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-5.0.28.ebuild
@@ -0,0 +1,398 @@
+# 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-6.0.9.ebuild b/net-analyzer/zabbix/zabbix-6.0.9.ebuild
new file mode 100644
index 000000000000..4b12b01e37ea
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.0.9.ebuild
@@ -0,0 +1,411 @@
+# 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.3.ebuild b/net-analyzer/zabbix/zabbix-6.2.3.ebuild
new file mode 100644
index 000000000000..4b12b01e37ea
--- /dev/null
+++ b/net-analyzer/zabbix/zabbix-6.2.3.ebuild
@@ -0,0 +1,411 @@
+# 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-firewall/Manifest.gz b/net-firewall/Manifest.gz
index 5e61d70815d3..53faffcb1c64 100644
Binary files a/net-firewall/Manifest.gz and b/net-firewall/Manifest.gz differ
diff --git a/net-firewall/iptables/Manifest b/net-firewall/iptables/Manifest
index 76320a6fa208..44c1d5abb450 100644
--- a/net-firewall/iptables/Manifest
+++ b/net-firewall/iptables/Manifest
@@ -1,2 +1 @@
-DIST iptables-1.8.7.tar.bz2 717862 BLAKE2B fd4dcff142eaadde2a14ce3eb5e45d41c326752553b52900c77fd2e2a20c0685d0a04b95755995e914df47658834d52216d6465c2ae9cd6abc6eb122b95cc976 SHA512 c0a33fafbf1139157a9f52860938ebedc282a1394a68dcbd58981159379eb525919f999b25925f2cb4d6b18089bd99a94b00b3e73cff5cb0a0e47bdff174ed75
 DIST iptables-1.8.8.tar.bz2 746985 BLAKE2B 0da021cc7313b86af331768904956dab3eee3de245a7b03965129f3d7f13097fc03fbb1390167dcd971eff216eabad9e59b261a9c0f54bfc48a77453aa40d164 SHA512 f21df23279a77531a23f3fcb1b8f0f8ec0c726bda236dd0e33af74b06753baff6ce3f26fb9fcceb6fada560656ba901e68fc6452eb840ac1b206bc4654950f59
diff --git a/net-firewall/iptables/files/iptables-1.8.7-cache-double-free.patch b/net-firewall/iptables/files/iptables-1.8.7-cache-double-free.patch
deleted file mode 100644
index fc88636d2944..000000000000
--- a/net-firewall/iptables/files/iptables-1.8.7-cache-double-free.patch
+++ /dev/null
@@ -1,61 +0,0 @@
-commit 4318961230bce82958df82b57f1796143bf2f421
-Author: Phil Sutter <phil@nwl.cc>
-Date:   Tue Sep 21 11:39:45 2021 +0200
-
-    nft: cache: Avoid double free of unrecognized base-chains
-    
-    On error, nft_cache_add_chain() frees the allocated nft_chain object
-    along with the nftnl_chain it points at. Fix nftnl_chain_list_cb() to
-    not free the nftnl_chain again in that case.
-    
-    Fixes: 176c92c26bfc9 ("nft: Introduce a dedicated base chain array")
-    Signed-off-by: Phil Sutter <phil@nwl.cc>
-
-diff --git a/iptables/nft-cache.c b/iptables/nft-cache.c
-index 2c88301c..9a03bbfb 100644
---- a/iptables/nft-cache.c
-+++ b/iptables/nft-cache.c
-@@ -314,9 +314,7 @@ static int nftnl_chain_list_cb(const struct nlmsghdr *nlh, void *data)
- 		goto out;
- 	}
- 
--	if (nft_cache_add_chain(h, t, c))
--		goto out;
--
-+	nft_cache_add_chain(h, t, c);
- 	return MNL_CB_OK;
- out:
- 	nftnl_chain_free(c);
-diff --git a/iptables/tests/shell/testcases/chain/0004extra-base_0 b/iptables/tests/shell/testcases/chain/0004extra-base_0
-new file mode 100755
-index 00000000..1b85b060
---- /dev/null
-+++ b/iptables/tests/shell/testcases/chain/0004extra-base_0
-@@ -0,0 +1,27 @@
-+#!/bin/bash
-+
-+case $XT_MULTI in
-+*xtables-nft-multi)
-+	;;
-+*)
-+	echo skip $XT_MULTI
-+	exit 0
-+	;;
-+esac
-+
-+set -e
-+
-+nft -f - <<EOF
-+table ip filter {
-+        chain INPUT {
-+                type filter hook input priority filter
-+                counter packets 218 bytes 91375 accept
-+        }
-+
-+        chain x {
-+                type filter hook input priority filter
-+        }
-+}
-+EOF
-+
-+$XT_MULTI iptables -L
diff --git a/net-firewall/iptables/iptables-1.8.7-r2.ebuild b/net-firewall/iptables/iptables-1.8.7-r2.ebuild
deleted file mode 100644
index 42fd108f2606..000000000000
--- a/net-firewall/iptables/iptables-1.8.7-r2.ebuild
+++ /dev/null
@@ -1,176 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit systemd toolchain-funcs autotools flag-o-matic usr-ldscript
-
-DESCRIPTION="Linux kernel (2.4+) firewall, NAT and packet mangling tools"
-HOMEPAGE="https://www.netfilter.org/projects/iptables/"
-SRC_URI="https://www.netfilter.org/projects/iptables/files/${P}.tar.bz2"
-
-LICENSE="GPL-2"
-# Subslot reflects PV when libxtables and/or libip*tc was changed
-# the last time.
-SLOT="0/1.8.3"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="conntrack netlink nftables pcap static-libs"
-
-BUILD_DEPEND="
-	>=app-eselect/eselect-iptables-20220320
-"
-COMMON_DEPEND="
-	conntrack? ( >=net-libs/libnetfilter_conntrack-1.0.6 )
-	netlink? ( net-libs/libnfnetlink )
-	nftables? (
-		>=net-libs/libmnl-1.0:0=
-		>=net-libs/libnftnl-1.1.6:0=
-	)
-	pcap? ( net-libs/libpcap )
-"
-DEPEND="${COMMON_DEPEND}
-	virtual/os-headers
-	>=sys-kernel/linux-headers-4.4:0
-"
-BDEPEND="${BUILD_DEPEND}
-	virtual/pkgconfig
-	nftables? (
-		sys-devel/flex
-		virtual/yacc
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	${BUILD_DEPEND}
-	nftables? ( net-misc/ethertypes )
-	!<net-firewall/ebtables-2.0.11-r1
-	!<net-firewall/arptables-0.0.5-r1
-"
-
-PATCHES=(
-	"${FILESDIR}/iptables-1.8.4-no-symlinks.patch"
-	"${FILESDIR}/iptables-1.8.2-link.patch"
-	# https://bugs.gentoo.org/831626
-	"${FILESDIR}/iptables-1.8.7-cache-double-free.patch"
-)
-
-src_prepare() {
-	# use the saner headers from the kernel
-	rm include/linux/{kernel,types}.h || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Some libs use $(AR) rather than libtool to build #444282
-	tc-export AR
-
-	# Hack around struct mismatches between userland & kernel for some ABIs. #472388
-	use amd64 && [[ ${ABI} == "x32" ]] && append-flags -fpack-struct
-
-	sed -i \
-		-e "/nfnetlink=[01]/s:=[01]:=$(usex netlink 1 0):" \
-		-e "/nfconntrack=[01]/s:=[01]:=$(usex conntrack 1 0):" \
-		configure || die
-
-	local myeconfargs=(
-		--sbindir="${EPREFIX}/sbin"
-		--libexecdir="${EPREFIX}/$(get_libdir)"
-		--enable-devel
-		--enable-ipv6
-		--enable-shared
-		$(use_enable nftables)
-		$(use_enable pcap bpf-compiler)
-		$(use_enable pcap nfsynproxy)
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	default
-	dodoc INCOMPATIBILITIES iptables/iptables.xslt
-
-	# all the iptables binaries are in /sbin, so might as well
-	# put these small files in with them
-	into /
-	dosbin iptables/iptables-apply
-	dosym iptables-apply /sbin/ip6tables-apply
-	doman iptables/iptables-apply.8
-
-	insinto /usr/include
-	doins include/ip{,6}tables.h
-	insinto /usr/include/iptables
-	doins include/iptables/internal.h
-
-	keepdir /var/lib/ip{,6}tables
-	newinitd "${FILESDIR}"/${PN}-r2.init iptables
-	newconfd "${FILESDIR}"/${PN}-r1.confd iptables
-	dosym iptables /etc/init.d/ip6tables
-	newconfd "${FILESDIR}"/ip6tables-r1.confd ip6tables
-
-	if use nftables; then
-		# Bug 647458
-		rm "${ED}"/etc/ethertypes || die
-
-		# Bugs 660886 and 669894
-		rm "${ED}"/sbin/{arptables,ebtables}{,-{save,restore}} || die
-	fi
-
-	systemd_dounit "${FILESDIR}"/systemd/ip{,6}tables-{re,}store.service
-
-	# Move important libs to /lib #332175
-	gen_usr_ldscript -a ip{4,6}tc xtables
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
-
-pkg_postinst() {
-	local default_iptables="xtables-legacy-multi"
-	if ! eselect iptables show &>/dev/null; then
-		elog "Current iptables implementation is unset, setting to ${default_iptables}"
-		eselect iptables set "${default_iptables}"
-	fi
-
-	if use nftables; then
-		local tables
-		for tables in {arp,eb}tables; do
-			if ! eselect ${tables} show &>/dev/null; then
-				elog "Current ${tables} implementation is unset, setting to ${default_iptables}"
-				eselect ${tables} set xtables-nft-multi
-			fi
-		done
-	fi
-
-	eselect iptables show
-}
-
-pkg_prerm() {
-	if [[ -z ${REPLACED_BY_VERSION} ]]; then
-		elog "Unsetting iptables symlinks before removal"
-		eselect iptables unset
-	fi
-
-	if ! has_version 'net-firewall/ebtables'; then
-		elog "Unsetting ebtables symlinks before removal"
-		eselect ebtables unset
-	elif [[ -z ${REPLACED_BY_VERSION} ]]; then
-		elog "Resetting ebtables symlinks to ebtables-legacy"
-		eselect ebtables set ebtables-legacy
-	fi
-
-	if ! has_version 'net-firewall/arptables'; then
-		elog "Unsetting arptables symlinks before removal"
-		eselect arptables unset
-	elif [[ -z ${REPLACED_BY_VERSION} ]]; then
-		elog "Resetting arptables symlinks to arptables-legacy"
-		eselect arptables set arptables-legacy
-	fi
-
-	# the eselect module failing should not be fatal
-	return 0
-}
diff --git a/net-fs/Manifest.gz b/net-fs/Manifest.gz
index 83bdf300b837..407e6d91dcec 100644
Binary files a/net-fs/Manifest.gz and b/net-fs/Manifest.gz differ
diff --git a/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild b/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild
deleted file mode 100644
index 9f9ef08b453e..000000000000
--- a/net-fs/nfs-utils/nfs-utils-2.6.2.ebuild
+++ /dev/null
@@ -1,228 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools linux-info systemd
-
-DESCRIPTION="NFS client and server daemons"
-HOMEPAGE="http://linux-nfs.org/ https://git.linux-nfs.org/?p=steved/nfs-utils.git"
-
-if [[ ${PV} == *_rc* ]] ; then
-	MY_PV="$(ver_rs 1- -)"
-	SRC_URI="http://git.linux-nfs.org/?p=steved/nfs-utils.git;a=snapshot;h=refs/tags/${PN}-${MY_PV};sf=tgz -> ${P}.tar.gz"
-	S="${WORKDIR}/${PN}-${PN}-${MY_PV}"
-else
-	SRC_URI="mirror://sourceforge/nfs/${P}.tar.bz2"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="caps junction kerberos ldap +libmount nfsdcld +nfsidmap +nfsv4 nfsv41 sasl selinux tcpd +uuid"
-REQUIRED_USE="kerberos? ( nfsv4 )"
-# bug #315573
-RESTRICT="test"
-
-# kth-krb doesn't provide the right include
-# files, and nfs-utils doesn't build against heimdal either,
-# so don't depend on virtual/krb.
-# (04 Feb 2005 agriffis)
-COMMON_DEPEND="
-	dev-libs/libxml2
-	net-libs/libtirpc:=
-	>=net-nds/rpcbind-0.2.4
-	sys-fs/e2fsprogs
-	caps? ( sys-libs/libcap )
-	ldap? (
-		net-nds/openldap:=
-		sasl? (
-			app-crypt/mit-krb5
-			dev-libs/cyrus-sasl:2
-		)
-	)
-	libmount? ( sys-apps/util-linux )
-	nfsv4? (
-		dev-db/sqlite:3
-		dev-libs/libevent:=
-		>=sys-apps/keyutils-1.5.9:=
-		kerberos? (
-			>=net-libs/libtirpc-0.2.4-r1[kerberos]
-			app-crypt/mit-krb5
-		)
-	)
-	nfsv41? (
-		sys-fs/lvm2
-	)
-	tcpd? ( sys-apps/tcp-wrappers )
-	uuid? ( sys-apps/util-linux )"
-DEPEND="${COMMON_DEPEND}
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-RDEPEND="${COMMON_DEPEND}
-	!net-libs/libnfsidmap
-	selinux? (
-		sec-policy/selinux-rpc
-		sec-policy/selinux-rpcbind
-	)
-"
-BDEPEND="
-	net-libs/rpcsvc-proto
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.2-no-werror.patch
-)
-
-pkg_setup() {
-	linux-info_pkg_setup
-
-	if use nfsv4 && ! use nfsdcld && linux_config_exists && ! linux_chkconfig_present CRYPTO_MD5 ; then
-		ewarn "Your NFS server will be unable to track clients across server restarts!"
-		ewarn "Please enable the \"${HILITE}nfsdcld${NORMAL}\" USE flag to install the nfsdcltrack usermode"
-		ewarn "helper upcall program, or enable ${HILITE}CONFIG_CRYPTO_MD5${NORMAL} in your kernel to"
-		ewarn "support the legacy, in-kernel client tracker."
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed \
-		-e "/^sbindir/s:= := \"${EPREFIX}\":g" \
-		-i utils/*/Makefile.am || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# Our DEPEND forces this.
-	export libsqlite3_cv_is_recent=yes
-	export ac_cv_header_keyutils_h=$(usex nfsidmap)
-
-	# SASL is consumed in a purely automagic way
-	export ac_cv_header_sasl_h=no
-	export ac_cv_header_sasl_sasl_h=$(usex sasl)
-
-	local myeconfargs=(
-		--disable-static
-		--with-statedir="${EPREFIX}"/var/lib/nfs
-		--enable-tirpc
-		--with-tirpcinclude="${ESYSROOT}"/usr/include/tirpc/
-		--with-pluginpath="${EPREFIX}"/usr/$(get_libdir)/libnfsidmap
-		--with-rpcgen
-		--with-systemd="$(systemd_get_systemunitdir)"
-		--without-gssglue
-		$(use_enable caps)
-		--enable-ipv6
-		$(use_enable junction)
-		$(use_enable kerberos gss)
-		$(use_enable kerberos svcgss)
-		$(use_enable ldap)
-		$(use_enable libmount libmount-mount)
-		$(use_enable nfsdcld nfsdcltrack)
-		$(use_enable nfsv4)
-		$(use_enable nfsv41)
-		$(use_enable uuid)
-		$(use_with tcpd tcp-wrappers)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Remove compiled files bundled in the tarball
-	emake clean
-
-	default
-}
-
-src_install() {
-	default
-	rm linux-nfs/Makefile* || die
-	dodoc -r linux-nfs README
-
-	# Don't overwrite existing xtab/etab, install the original
-	# versions somewhere safe...  more info in pkg_postinst
-	keepdir /var/lib/nfs/{,sm,sm.bak}
-	mv "${ED}"/var/lib/nfs "${ED}"/usr/$(get_libdir)/ || die
-
-	# Install some client-side binaries in /sbin
-	dodir /sbin
-	mv "${ED}"/usr/sbin/rpc.statd "${ED}"/sbin/ || die
-
-	if use nfsv4 && use nfsidmap ; then
-		insinto /etc
-		doins support/nfsidmap/idmapd.conf
-
-		# Install a config file for idmappers in newer kernels. bug #415625
-		insinto /etc/request-key.d
-		echo 'create id_resolver * * /usr/sbin/nfsidmap -t 600 %k %d' > id_resolver.conf
-		doins id_resolver.conf
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/exports
-	keepdir /etc/exports.d
-
-	local f list=() opt_need=""
-	if use nfsv4 ; then
-		opt_need="rpc.idmapd"
-		list+=( rpc.idmapd rpc.pipefs )
-		use kerberos && list+=( rpc.gssd rpc.svcgssd )
-	fi
-	for f in nfs nfsclient rpc.statd "${list[@]}" ; do
-		newinitd "${FILESDIR}"/${f}.initd ${f}
-	done
-
-	# Nuke after 2015/08/01
-	newinitd "${FILESDIR}"/nfsmount.initd-1.3.1 nfsmount
-	for f in nfs nfsclient ; do
-		newconfd "${FILESDIR}"/${f}.confd ${f}
-	done
-
-	# bug #234132
-	sed -i \
-		-e "/^NFS_NEEDED_SERVICES=/s:=.*:=\"${opt_need}\":" \
-		"${ED}"/etc/conf.d/nfs || die
-
-	local systemd_systemunitdir="$(systemd_get_systemunitdir)"
-	sed -i \
-		-e 's:/usr/sbin/rpc.statd:/sbin/rpc.statd:' \
-		"${ED}${systemd_systemunitdir}"/* || die
-
-	# bug #368505
-	keepdir /var/lib/nfs
-	# bug #603628
-	keepdir /var/lib/nfs/v4recovery
-
-	# No static archives
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	# Install default xtab and friends if there's none existing.  In
-	# src_install we put them in /usr/lib/nfs for safe-keeping, but
-	# the daemons actually use the files in /var/lib/nfs.  #30486
-	local f
-	for f in "${EROOT}"/usr/$(get_libdir)/nfs/*; do
-		[[ -e ${EROOT}/var/lib/nfs/${f##*/} ]] && continue
-		einfo "Copying default ${f##*/} from ${EPREFIX}/usr/$(get_libdir)/nfs to ${EPREFIX}/var/lib/nfs"
-		cp -pPR "${f}" "${EROOT}"/var/lib/nfs/
-	done
-
-	if systemd_is_booted; then
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 1.3.0; then
-				ewarn "We have switched to upstream systemd unit files. Since"
-				ewarn "they got renamed, you should probably enable the new ones."
-				ewarn "You can run 'equery files nfs-utils | grep systemd'"
-				ewarn "to know what services you need to enable now."
-			fi
-		done
-	else
-		ewarn "If you use OpenRC, the nfsmount service has been replaced with nfsclient."
-		ewarn "If you were using nfsmount, please add nfsclient and netmount to the"
-		ewarn "same runlevel as nfsmount."
-	fi
-}
diff --git a/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.7.ebuild b/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.7.ebuild
deleted file mode 100644
index a8d5fbe0b115..000000000000
--- a/net-fs/nfs4-acl-tools/nfs4-acl-tools-0.3.7.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="Commandline and GUI tools that deal directly with NFSv4 ACLs"
-HOMEPAGE="https://git.linux-nfs.org/?p=bfields/nfs4-acl-tools.git;a=summary"
-SRC_URI="https://linux-nfs.org/~bfields/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE=""
-
-DEPEND="sys-apps/attr"
-RDEPEND="${DEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-0.3.5-jobserver-unavailable.patch )
-
-src_prepare() {
-	default
-	eautoreconf
-}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 6e80eec113f5..fba869b939cf 100644
Binary files a/net-im/Manifest.gz and b/net-im/Manifest.gz differ
diff --git a/net-im/choqok/choqok-1.7.0-r1.ebuild b/net-im/choqok/choqok-1.7.0-r1.ebuild
index 347ae3c26c3d..665a4a472330 100644
--- a/net-im/choqok/choqok-1.7.0-r1.ebuild
+++ b/net-im/choqok/choqok-1.7.0-r1.ebuild
@@ -60,6 +60,7 @@ PATCHES=(
 	"${WORKDIR}/${P}-choqokplugin.patch"
 	"${WORKDIR}/${P}-fix-layout-of-tweets.patch" # KDE-bug 424938
 	"${WORKDIR}/${P}-fix-partially-static-signatures.patch" # KDE-bug 417297
+	"${FILESDIR}/${P}-fix-KCModule-warning.patch" # bug 871546, git master
 )
 
 src_configure() {
diff --git a/net-im/choqok/files/choqok-1.7.0-fix-KCModule-warning.patch b/net-im/choqok/files/choqok-1.7.0-fix-KCModule-warning.patch
new file mode 100644
index 000000000000..26721514ca04
--- /dev/null
+++ b/net-im/choqok/files/choqok-1.7.0-fix-KCModule-warning.patch
@@ -0,0 +1,43 @@
+From 9c488d8f776b5e7462e8e57dc2b15db5fe28815a Mon Sep 17 00:00:00 2001
+From: Andrea Scarpino <scarpino@kde.org>
+Date: Sat, 8 Feb 2020 16:06:18 +0100
+Subject: [PATCH] Fix warning about KCModule::changed
+
+---
+ choqok/config/behavior/behaviorconfig.cpp    | 4 ++--
+ choqok/config/plugins/choqokpluginconfig.cpp | 3 +--
+ 2 files changed, 3 insertions(+), 4 deletions(-)
+
+diff --git a/choqok/config/behavior/behaviorconfig.cpp b/choqok/config/behavior/behaviorconfig.cpp
+index a25b0196..fb1d16b3 100644
+--- a/choqok/config/behavior/behaviorconfig.cpp
++++ b/choqok/config/behavior/behaviorconfig.cpp
+@@ -95,9 +95,9 @@ BehaviorConfig::BehaviorConfig(QWidget *parent, const QVariantList &args)
+     d->mBehaviorTabCtl->addTab(d->proxyModule, proxyInfo.moduleName());
+ 
+     connect(d->mPrfsShorten, (void (BehaviorConfig_Shorten::*)(bool))&BehaviorConfig_Shorten::changed,
+-            this, (void (KCModule::*)())&KCModule::changed);
++            this, &BehaviorConfig::markAsChanged);
+     connect(d->proxyModule, (void (KCModuleProxy::*)(KCModuleProxy*))&KCModuleProxy::changed,
+-            this, (void (KCModule::*)())&KCModule::changed);
++            this, &BehaviorConfig::markAsChanged);
+ 
+     load();
+ 
+diff --git a/choqok/config/plugins/choqokpluginconfig.cpp b/choqok/config/plugins/choqokpluginconfig.cpp
+index 1a5f4fc2..4f36d608 100644
+--- a/choqok/config/plugins/choqokpluginconfig.cpp
++++ b/choqok/config/plugins/choqokpluginconfig.cpp
+@@ -46,8 +46,7 @@ ChoqokPluginConfig::ChoqokPluginConfig(QWidget *parent, const QVariantList &args
+     mainLayout->setMargin(0);
+     mainLayout->addWidget(m_pluginSelector);
+ 
+-    connect(m_pluginSelector, &KPluginSelector::changed, this,
+-            (void (KCModule::*)())&KCModule::changed);
++    connect(m_pluginSelector, &KPluginSelector::changed, this, &ChoqokPluginConfig::markAsChanged);
+     connect(m_pluginSelector, &KPluginSelector::configCommitted,
+             this, &ChoqokPluginConfig::reparseConfiguration);
+ 
+-- 
+GitLab
+
diff --git a/net-im/ejabberd/Manifest b/net-im/ejabberd/Manifest
index e8815deaf151..df8cc1d38ab8 100644
--- a/net-im/ejabberd/Manifest
+++ b/net-im/ejabberd/Manifest
@@ -1,4 +1,2 @@
-DIST ejabberd-21.12.tar.gz 2532288 BLAKE2B 847fa90ce0140c384add489a97d566e3edf9927f71c4abf4f51869f2e0ba4a5183002cb5e4f7a9d7f4ad5ed5902a47b2dd336ab1ef854673a3a2f337326a3fc2 SHA512 4f1e56becb9970355b98c0ad177ee162130346e53aa92c274e502fe300d6f4dc7fda8fcca845821087da78379a19a2962b50794b71d139c91764539fcfeec73c
-DIST ejabberd-21.12.tar.gz.asc 195 BLAKE2B 6e2b409dd6e5eb24890b0ecaa58019cb1cfcfef78eddedb5fe4436ba72f15c1525ba6f254d24b6a11b84c2360d67d93036f47007cf6af9c3475fefbd10f48093 SHA512 81d838b35d1ea54205187d4c74fb2232b18466e562bce01ed6287aa17b80c5b287041d456a7fda9de4791eb635c102c25b19a9b26d794723cd9d36c740513bc1
 DIST ejabberd-22.05.tar.gz 2527957 BLAKE2B d7fc614b8fe88bc8997d78821334a5e26a4201a5d199e6a04fe668e192ed0c7a37b68aff2fd9c6740844634c005b492b1dd76de4b9ed841863d0285f6097edd9 SHA512 33f98a9c45ff8257d240e7b90181e399ecab84e361f5619dc8d57252642e81d4958467cfa89b90681f3cf0d1d56a3079eb98d4e80cc6af5ca11938bb2a69f865
 DIST ejabberd-22.05.tar.gz.asc 195 BLAKE2B 634cb0a338c68d8ee1d3b2e3e267a758deff3a925c93273c5aaa209d12a5bb40565831869cc7e81fa66de8648211eb60f9644ac7d4d0ec557e9332a8cdd9dfce SHA512 42ffc224915f3f0ac4df42cfe0c35e65861be38856e398ac6172cdcbf5de543ae808a4b201a1c1d64d10234d02d754d1376ff21ee9d679095497479c717c17da
diff --git a/net-im/ejabberd/ejabberd-21.12-r2.ebuild b/net-im/ejabberd/ejabberd-21.12-r2.ebuild
deleted file mode 100644
index 51848cda5a6c..000000000000
--- a/net-im/ejabberd/ejabberd-21.12-r2.ebuild
+++ /dev/null
@@ -1,222 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit pam rebar systemd verify-sig
-
-DESCRIPTION="Robust, scalable and extensible XMPP server"
-HOMEPAGE="https://www.ejabberd.im/ https://github.com/processone/ejabberd/"
-SRC_URI="https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz
-	-> ${P}.tar.gz
-	verify-sig? ( https://static.process-one.net/${PN}/downloads/${PV}/${P}.tgz.asc -> ${P}.tar.gz.asc )"
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/process-one.net.asc
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~ia64 ~sparc ~x86"
-REQUIRED_USE="mssql? ( odbc )"
-# TODO: Add 'tools' flag.
-IUSE="captcha debug full-xml ldap mssql mysql odbc pam postgres redis
-	roster-gw selinux sip sqlite +stun zlib"
-
-RESTRICT="test"
-
-# TODO: Add dependencies for 'tools' flag enabled.
-# TODO: tools? (
-# TODO:		>=dev-erlang/luerl-0.3
-# TODO: )
-DEPEND=">=dev-lang/erlang-19.3[odbc?,ssl]
-	>=dev-erlang/cache_tab-1.0.29
-	>=dev-erlang/eimp-1.0.21
-	>=dev-erlang/fast_tls-1.1.13
-	>=dev-erlang/fast_xml-1.1.48
-	>=dev-erlang/fast_yaml-1.0.32
-	>=dev-erlang/yconf-1.0.12
-	>=dev-erlang/jiffy-1.0.5
-	>=dev-erlang/jose-1.11.2
-	>=dev-erlang/lager-3.9.1
-	>=dev-erlang/p1_oauth2-0.6.10
-	>=dev-erlang/p1_utils-1.0.23
-	>=dev-erlang/stringprep-1.0.27
-	>=dev-erlang/xmpp-1.5.6
-	>=dev-erlang/pkix-1.0.8
-	>=dev-erlang/mqtree-1.0.14
-	>=dev-erlang/idna-6.0.0-r1
-	>=dev-erlang/p1_acme-1.0.16
-	>=dev-erlang/base64url-1.0.1
-	ldap? ( =net-nds/openldap-2* )
-	mysql? ( >=dev-erlang/p1_mysql-1.0.19 )
-	odbc? ( dev-db/unixODBC )
-	pam? ( >=dev-erlang/epam-1.0.12 )
-	postgres? ( >=dev-erlang/p1_pgsql-1.1.16 )
-	redis? ( >=dev-erlang/eredis-1.2.0 )
-	sip? ( >=dev-erlang/esip-1.0.45 )
-	sqlite? ( >=dev-erlang/sqlite3-1.1.13 )
-	stun? ( >=dev-erlang/stun-1.0.47 )
-	zlib? ( >=dev-erlang/ezlib-1.0.10 )"
-RDEPEND="${DEPEND}
-	>=acct-user/ejabberd-2[pam?]
-	captcha? ( media-gfx/imagemagick[truetype,png] )
-	selinux? ( sec-policy/selinux-jabber )
-"
-BDEPEND="verify-sig? ( sec-keys/openpgp-keys-processone )"
-
-DOCS=( CHANGELOG.md README.md )
-PATCHES=(
-	"${FILESDIR}/${PN}-19.08-ejabberdctl.patch"
-	"${FILESDIR}/adjust-ejabberd.service.template-to-Gentoo.patch"
-)
-
-# Set paths to ejabberd lib directory consistently to point always to directory
-# suffixed with version.
-correct_ejabberd_paths() {
-	sed -e "/^EJABBERDDIR[[:space:]]*=/{s:ejabberd:${P}:}" \
-		-i "${S}/Makefile.in" \
-		|| die 'failed to set ejabberd path in Makefile.in'
-	sed -e "/EJABBERD_BIN_PATH=/{s:ejabberd:${P}:}" \
-		-i "${S}/ejabberdctl.template" \
-		|| die 'failed to set ejabberd path in ejabberdctl.template'
-}
-
-# Get epam-wrapper from 'files' directory and correct path to lib directory in
-# it. epam-wrapper is placed into work directory. It is assumed no epam-wrapper
-# file exists there already.
-customize_epam_wrapper() {
-	local epam_wrapper_src="${1}"
-	local epam_wrapper_dst="${S}/epam-wrapper"
-
-	[[ -e ${epam_wrapper_dst} ]] && die 'epam-wrapper already exists'
-	sed -r -e "s@^(ERL_LIBS=).*\$@\1${EPREFIX}$(get_erl_libs)@" \
-		"${epam_wrapper_src}" >"${epam_wrapper_dst}" \
-		|| die 'failed to install epam-wrapper'
-}
-
-# Get path to ejabberd lib directory.
-#
-# This is the path ./configure script Base for this path is path set in
-# ./configure script which is /usr/lib by default. If libdir is explicitely set
-# to something else than this should be adjusted here as well.
-get_ejabberd_path() {
-	echo "/usr/$(get_libdir)/${P}"
-}
-
-src_prepare() {
-	default
-
-	rebar_remove_deps
-	correct_ejabberd_paths
-	customize_epam_wrapper "${FILESDIR}/epam-wrapper"
-
-	rebar_fix_include_path fast_xml
-	rebar_fix_include_path p1_utils
-	rebar_fix_include_path xmpp
-
-	# Fix bug #591862. ERL_LIBS should point directly to ejabberd directory
-	# rather than its parent which is default. That way ejabberd directory
-	# takes precedence is module lookup.
-	local ejabberd_erl_libs="$(get_ejabberd_path):$(get_erl_libs)"
-	sed -e "s|\(ERL_LIBS=\){{libdir}}.*|\1${ejabberd_erl_libs}|" \
-		-i "${S}/ejabberdctl.template" \
-		|| die 'failed to set ERL_LIBS in ejabberdctl.template'
-}
-
-src_configure() {
-	econf \
-		--docdir="${EPREFIX}/usr/share/doc/${PF}/html" \
-		--localstatedir="${EPREFIX}/var" \
-		--enable-user=${PN} \
-		$(use_enable debug) \
-		$(use_enable full-xml) \
-		$(use_enable mssql) \
-		$(use_enable mysql) \
-		$(use_enable odbc) \
-		$(use_enable pam) \
-		$(use_enable postgres pgsql) \
-		$(use_enable redis) \
-		$(use_enable roster-gw roster-gateway-workaround) \
-		$(use_enable sqlite) \
-		$(use_enable sip) \
-		$(use_enable stun) \
-		$(use_enable zlib)
-
-	# more options to support
-	# --enable-elixir requires https://github.com/elixir-lang/elixir
-}
-
-src_compile() {
-	emake REBAR='rebar -v' src
-}
-
-src_install() {
-	default
-
-	if use pam; then
-		local epam_path="$(get_ejabberd_path)/priv/bin/epam"
-
-		pamd_mimic_system xmpp auth account
-		into "$(get_ejabberd_path)/priv"
-		newbin epam-wrapper epam
-	fi
-
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
-	systemd_dounit "${PN}.service"
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}/${PN}.logrotate" "${PN}"
-
-	keepdir /var/{lib,log}/ejabberd
-}
-
-pkg_postinst() {
-	local migrate_to_ejabberd_user=false
-
-	if [[ ! ${REPLACING_VERSIONS} ]]; then
-		echo
-		elog "For configuration instructions, please see"
-		elog "  https://docs.ejabberd.im/"
-		echo
-	else
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 21.04-r1; then
-				migrate_to_ejabberd_user=true
-				break
-			fi
-		done
-	fi
-
-	# Sarting with >=21.04-r1, the ejabberd configuration is now in
-	# /etc/ejabberd and no longer in /etc/jabber. See if we need to
-	# migrate the configuration. Furthermore, ejabberd no longer runs
-	# under the, shared via net-im/jabber-base, 'jabber' use, but under
-	# its own user. This increase isolation and hence robustness and
-	# security.
-	if $migrate_to_ejabberd_user; then
-		ewarn "Newer versions of the ejabberd Gentoo package use /etc/ejabberd"
-		ewarn "(just as upstream) and *not* /etc/jabber."
-		ewarn "The files from /etc/jabber will now be copied to /etc/ejabberd."
-		ewarn "Also ejabberd's spool directory became /var/lib/ejabberd (was /var/spool/jabber)."
-		ewarn "Please check your configuration, and finish the migration by stopping ejabberd"
-		ewarn "followed by rsync'ing /var/spool/jabber to /var/lib/ejabberd."
-
-		local -A dirs_to_migrate=(
-			[/etc/jabber]=/etc/ejabberd
-			[/var/spool/jabber]=/var/lib/ejabberd
-		)
-
-		for src_dir in "${!dirs_to_migrate[@]}"; do
-			local eroot_src_dir="${EROOT}${src_dir}"
-			local eroot_dst_dir="${EROOT}${dirs_to_migrate[${src_dir}]}"
-
-			cp -r "${eroot_src_dir}"/. "${eroot_dst_dir}" || die "Could not copy ${eroot_src_dir} to ${eroot_dst_dir}"
-
-			if [[ -f "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 ]]; then
-				rm "${eroot_dst_dir}"/.keep_net-im_jabber-base-0 || die
-			fi
-			if ! use prefix; then
-				chown --recursive ejabberd:ejabberd "${eroot_dst_dir}" || die
-			fi
-		done
-	fi
-}
diff --git a/net-im/signal-desktop-bin/Manifest b/net-im/signal-desktop-bin/Manifest
index 9b89a76be914..ffdef0d8be5e 100644
--- a/net-im/signal-desktop-bin/Manifest
+++ b/net-im/signal-desktop-bin/Manifest
@@ -1 +1 @@
-DIST signal-desktop_5.59.0_amd64.deb 124652828 BLAKE2B b3cb42a81bde6adf58864d8157ce0c2dc961dd0173b311ea5e5b465bc2e0a2cff8fd914b722f18d54cc9eac923506bff05badc7e9fd6f6489e07a7c83855f501 SHA512 eefbd423499e807bbcbca928770ba3461b6436d3e5e6379b4a5824c84c143a7659dbd6d0b5e5506247fd7fea7e61ac4c66af546090cbbf6cc354f11f2d243094
+DIST signal-desktop_5.60.0_amd64.deb 124644854 BLAKE2B 3264d9cb3164beeff78e7203200274eae75c5876488ce622868b9ab513bf3f5a64381e8d58d91a43730db2ad06763c7c726c3248062895e673dda3f8e1685cf4 SHA512 f096981313ad5e7ce58b98650c831e683eb3aa3a58b07fbdfc06efa10d3596bc196d1e82d9742149facde3ccf4fecf9eea3973b71e83ca8589e4bc3f6017597f
diff --git a/net-im/signal-desktop-bin/signal-desktop-bin-5.59.0.ebuild b/net-im/signal-desktop-bin/signal-desktop-bin-5.60.0.ebuild
similarity index 100%
rename from net-im/signal-desktop-bin/signal-desktop-bin-5.59.0.ebuild
rename to net-im/signal-desktop-bin/signal-desktop-bin-5.60.0.ebuild
diff --git a/net-im/synapse/synapse-1.63.1.ebuild b/net-im/synapse/synapse-1.63.1.ebuild
index 72a914a9792e..9ed4c0a7bbe7 100644
--- a/net-im/synapse/synapse-1.63.1.ebuild
+++ b/net-im/synapse/synapse-1.63.1.ebuild
@@ -22,7 +22,7 @@ else
 	MY_PV="${PV/_rc/rc}"
 	SRC_URI="https://github.com/matrix-org/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.gh.tar.gz"
 	S="${WORKDIR}/${PN}-${MY_PV}"
-	KEYWORDS="~amd64 ~ppc64"
+	KEYWORDS="amd64 ~ppc64"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/net-irc/Manifest.gz b/net-irc/Manifest.gz
index b442f6618c48..e46ae0394068 100644
Binary files a/net-irc/Manifest.gz and b/net-irc/Manifest.gz differ
diff --git a/net-irc/anope/Manifest b/net-irc/anope/Manifest
index 5e83254d4c54..db5af0191baa 100644
--- a/net-irc/anope/Manifest
+++ b/net-irc/anope/Manifest
@@ -1,2 +1 @@
-DIST anope-2.0.10.tar.gz 1809378 BLAKE2B d10323ace767aff19194f7cff353aecbced6122ef72d379d050c8dab3c7013adf6b3e649ffd95edc03bc8ca4873f60ad84991ef0f5c9c454b27ec0eda29edc6d SHA512 2a0e4f14a275a6b986fd224449dddd66584de92509770311262076bd659ba0bbd6e2726fc7a22a6edef57ade5268756ac0c56e6f220fb953ed83e72017d1c67b
 DIST anope-2.0.11.tar.gz 1812305 BLAKE2B cb1579f5483df1207482458d63d5293375310f8a54ed528b749f8355f122a1a71a0c17b9ef82477bd429f0c672746f5d5c28d51e12d8695c8c1c8368fd651307 SHA512 120588a815600abb93b77d3e9cb18527a61e955e9dbc947e4e62c97bac871325863f519d20535882f3eff136743454c08af62fd3cd4825e5a956fd1a4ac4d728
diff --git a/net-irc/anope/anope-2.0.10-r1.ebuild b/net-irc/anope/anope-2.0.10-r1.ebuild
deleted file mode 100644
index f85dd8410448..000000000000
--- a/net-irc/anope/anope-2.0.10-r1.ebuild
+++ /dev/null
@@ -1,150 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake
-
-DESCRIPTION="Anope IRC Services"
-HOMEPAGE="https://anope.org/ https://github.com/anope/anope/"
-SRC_URI="https://github.com/anope/anope/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="gnutls ldap mysql pcre sql sqlite ssl tre"
-REQUIRED_USE="sql? ( || ( mysql sqlite ) )"
-
-DEPEND="
-	acct-group/anope
-	acct-user/anope
-	mysql? ( dev-db/mysql-connector-c:0= )
-	ssl? ( dev-libs/openssl:0= )
-	gnutls? (
-		net-libs/gnutls:0=
-		dev-libs/libgcrypt:0=
-	)
-	ldap? ( net-nds/openldap:= )
-	pcre? ( dev-libs/libpcre )
-	sqlite? ( dev-db/sqlite:3 )
-	tre? ( dev-libs/tre )
-	virtual/libintl
-"
-RDEPEND="${DEPEND}"
-BDEPEND="sys-devel/gettext"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-2.0.6-example.conf-pid-path.patch"
-	"${FILESDIR}/${PN}-2.0.7-example.conf-user.patch"
-)
-
-src_prepare() {
-	anope_enable_mod() {
-		local modulefile=${1}
-		ln -s "extra/${modulefile}" "modules/" || \
-			die "Failed to use ${modulefile}"
-	}
-
-	# These all require MySQL specifically
-	if use mysql ; then
-		anope_enable_mod "m_mysql.cpp"
-		anope_enable_mod "stats/irc2sql/irc2sql.cpp"
-		anope_enable_mod "stats/irc2sql/irc2sql.h"
-		anope_enable_mod "stats/irc2sql/tables.cpp"
-		anope_enable_mod "stats/irc2sql/utils.cpp"
-		anope_enable_mod "stats/m_chanstats.cpp"
-		anope_enable_mod "stats/cs_fantasy_top.cpp"
-		anope_enable_mod "stats/cs_fantasy_stats.cpp"
-		anope_enable_mod "m_sql_log.cpp"
-		anope_enable_mod "m_sql_oper.cpp"
-	fi
-
-	use sqlite && anope_enable_mod "m_sqlite.cpp"
-
-	# Any SQL implementation
-	if use sql ; then
-		anope_enable_mod "m_sql_authentication.cpp"
-	fi
-
-	if use ldap ; then
-		anope_enable_mod "m_ldap.cpp"
-		anope_enable_mod "m_ldap_authentication.cpp"
-		anope_enable_mod "m_ldap_oper.cpp"
-	fi
-
-	use gnutls && anope_enable_mod "m_ssl_gnutls.cpp"
-	use pcre && anope_enable_mod "m_regex_pcre.cpp"
-	use ssl && anope_enable_mod "m_ssl_openssl.cpp"
-	use tre && anope_enable_mod "m_regex_tre.cpp"
-
-	# Unconditional modules
-	anope_enable_mod "m_regex_posix.cpp"
-
-	# Avoid a silly sandbox error - tries to delete /usr/lib/modules
-	sed -i '/install.*REMOVE_RECURSE.*/d' CMakeLists.txt || die
-
-	# Copy anope.conf for fixup to comply w/ prefix
-	cp "${FILESDIR}"/anope-conf.d-v2 "${T}" || die
-
-	# Look in the right place for modules
-	sed -i "s~%LIBDIR%~${EPREFIX}/usr/$(get_libdir)/anope/~" \
-		"${T}"/anope-conf.d-v2 || die
-
-	cmake_src_prepare
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DBIN_DIR="libexec/anope"
-		-DDB_DIR="../var/lib/anope"
-		-DDOC_DIR="share/doc/${PF}"
-		-DLIB_DIR="$(get_libdir)/anope"
-		-DLOCALE_DIR="share/locale"
-		-DCONF_DIR="/etc/anope"
-		-DLOGS_DIR="../var/log/anope/"
-	)
-
-	cmake_src_configure
-}
-
-src_install() {
-	cmake_src_install
-
-	newinitd "${FILESDIR}"/anope-init.d ${PN}
-	newconfd "${T}"/anope-conf.d-v2 ${PN}
-
-	dosym ../libexec/anope/services /usr/bin/services
-	dosym ../libexec/anope/anopesmtp /usr/bin/anopesmtp
-
-	keepdir /var/log/anope /var/lib/anope/backups
-	fowners anope:anope /var/{lib,log}/anope /var/lib/anope/backups
-
-	dodoc -r docs/* data/example.conf
-
-	insinto /etc/anope
-	newins data/example.conf services.conf
-
-	fowners anope:anope /var/log/anope
-	fowners anope:anope /var/lib/anope/backups/
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		# Only tell them about this on a fresh install.
-		ewarn "Anope won't run out of the box, you still have to configure it to match your IRCd's configuration."
-		ewarn "Edit /etc/anope/services.conf to configure Anope."
-	else
-		# We're replacing some versions. Find out which.
-		local ver
-		for ver in "${REPLACING_VERSIONS}" ; do
-			if ver_test ${ver} -lt 2.0.7 ; then
-				# In this version, we introduced correct FHS structure
-				# We need the users to make some changes to their services.conf
-				ewarn "Please modify your services.conf to include the following directive:"
-				ewarn "in options{}, please include user=\"anope\" and group=\"anope\""
-				ewarn "This is needed because Anope now starts as root and drops down."
-				ewarn "Reference: https://wiki.anope.org/index.php/2.0/Configuration#Services_Process_Options"
-			fi
-		done
-	fi
-}
diff --git a/net-irc/ergo/Manifest b/net-irc/ergo/Manifest
index 584717998122..6a7eff9494a6 100644
--- a/net-irc/ergo/Manifest
+++ b/net-irc/ergo/Manifest
@@ -1,2 +1 @@
 DIST ergo-2.10.0.tar.gz 3256716 BLAKE2B 72f1d6464ee434508b9944a9923435cda01e97c8b542c7c77c74562309a6b9ed727b5ae7c444f6e95517482fd87f34623d477e14c1dfbe323a7d81ace5c3e111 SHA512 952ef22b28d8de0814f04ece55b8ff88f405f184d8ecfce45c4af63e8c53153786d0b685f9bfff7cdb53ad369914f07069436f43b5ab65816bb7410b02f34bf8
-DIST ergo-2.9.1.tar.gz 3249107 BLAKE2B 6d8f98ab868ef10323a40583e2ddb2e1854b967265f789ec176caae40675ef5a9a6a9e54c1b60d8e3f281dcb5ad18e964624ccf673e146ee7044f3454a3e2349 SHA512 5aa8f1afc55c432acf6763aa95cffdb3447b7d53a759d04c303675852b240b0fe26030a94ea12954a453d4f8e4f7db7ffbca8faeb6a1b20b17a44ac27b80d66a
diff --git a/net-irc/ergo/ergo-2.9.1-r1.ebuild b/net-irc/ergo/ergo-2.9.1-r1.ebuild
deleted file mode 100644
index 1b189203c307..000000000000
--- a/net-irc/ergo/ergo-2.9.1-r1.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
-
-inherit go-module systemd
-
-DESCRIPTION="A modern IRC server written in Go"
-HOMEPAGE="https://ergo.chat/ https://github.com/ergochat/ergo"
-SRC_URI="https://github.com/ergochat/ergo/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="Apache-2.0 BSD-2 BSD ISC MIT MPL-2.0"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64"
-
-# We may even want to package irctest in future?
-
-RDEPEND="acct-user/oragono
-	acct-group/oragono"
-
-DOCS=( README.md docs/MANUAL.md docs/USERGUIDE.md )
-
-src_prepare() {
-	default
-
-	# Minor fiddling with paths
-	sed -i \
-		-e 's:/home/ergo/ergo:/usr/bin/ergo:' \
-		-e 's:/home/ergo:/var/lib/ergo:' \
-		-e 's:/var/lib/ergo/ircd.yaml:/etc/ergo/ircd.yaml:' \
-		-e 's:User=ergo:User=oragono:' \
-		distrib/systemd/ergo.service || die
-}
-
-src_compile() {
-	go build . || die
-}
-
-src_install() {
-	einstalldocs
-
-	dobin ergo
-
-	insinto /etc/ergo
-	doins default.yaml
-
-	# Swap back in next release?
-	# Forked locally for https://github.com/ergochat/ergo/issues/1914 changes
-	#newinitd distrib/openrc/ergo.initd ergo
-	#newconfd distrib/openrc/ergo.confd ergo
-
-	newinitd "${FILESDIR}"/ergo.initd-r1 ergo
-	newconfd "${FILESDIR}"/ergo.confd-r1 ergo
-
-	keepdir /var/lib/ergo
-	fowners oragono:oragono /var/lib/ergo
-
-	insinto /var/lib/ergo
-	doins -r languages/
-
-	systemd_dounit distrib/systemd/ergo.service
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog "Please copy the example config in ${EROOT}/etc/ergo:"
-		elog "e.g. cp ${EROOT}/etc/ergo/default.yaml ${EROOT}/etc/ergo/ircd.yaml"
-	fi
-}
diff --git a/net-irc/unrealircd/Manifest b/net-irc/unrealircd/Manifest
index 38ce5e6c6857..3c494d94f4b9 100644
--- a/net-irc/unrealircd/Manifest
+++ b/net-irc/unrealircd/Manifest
@@ -2,5 +2,3 @@ DIST unrealircd-5.2.4.tar.gz 7201203 BLAKE2B 06afc8b5e28bbd56971b2ce21da3e000e39
 DIST unrealircd-5.2.4.tar.gz.asc 866 BLAKE2B 9fc520e93f80a548650b016690036c4e9957e81095f75c34489eb0b83d28548a891196469199cf354207c44b22aaeecfc696995842e9b278ab10fdf5bdb8d7f6 SHA512 0d85a668e2cc3f3d736f3a321e282ecb1fd94d5f605e0e40e8c84a17a6486f8e0d299ec673fe7688fca3ead847f432144ff077547cc90321534406fbe084804b
 DIST unrealircd-6.0.4.1.tar.gz 8696975 BLAKE2B 2ca38b2eed09747f419cb9c7e338e10687541c981cce6425e266a1e0597c3a3eb36882a0d1da43a9b829aa855289887d28206b7e7298cf310e84703b1d4e7d5c SHA512 c2da78e785ddd7dd1567dd4cbc6bf44d8013c84334ee2ed836bb2b265bb79cf2db620570e3e626d77389ea820365dec3cd84d27f219df0a38d6d0e364e99a3cc
 DIST unrealircd-6.0.4.1.tar.gz.asc 866 BLAKE2B 018dd63bd02261fb390e98ebafaf9d712d30984a2034f8e4ee3c4125cf67b0dba4113f84f62e2b4ef3a42e10123f61e985ed5da42a234fe5fef30184af48520b SHA512 50d98bcff738307f866ff838944bf574613fb99fa8f3a7cd34272245924f70c0c56eea6376c704c56c920f6411870f259f89155b811d6bab2d34f770fcb6e0f8
-DIST unrealircd-6.0.4.tar.gz 8696690 BLAKE2B 25960ce78d56f7e5c2ad62751f3359ffc8df1885351f5a8bc36461f2a0a45aed1e99adb207e56988f9bf637d51f8cc17ca3d82f232f09e659a26c0afc3655a93 SHA512 fddce374dc7480e0f02d91965926028993e965450cfe871985ffbfadf38c86198d55be024eddc3dac65e44ff859a6e5e7e8176110d87042b489ce4b14deeeca2
-DIST unrealircd-6.0.4.tar.gz.asc 866 BLAKE2B 79bc065c7b24398bee53660c9dc4a7cfca857c7368b3667d2fdd30c87a160126dff0b255b3a20cc436026b923eb6dd744ca21a010f3a0b5df13af185bec211db SHA512 467b3cc1d291da76fea6b4e8fbeb02ffd24a3bd94b6eddf1e94ceabe9fc97e573fd6a3860b49370088a9c60ba0e0485af0f9f5a48e854e1b30f4d45be873ac20
diff --git a/net-irc/unrealircd/unrealircd-6.0.4.ebuild b/net-irc/unrealircd/unrealircd-6.0.4.ebuild
deleted file mode 100644
index 4811353f1fb1..000000000000
--- a/net-irc/unrealircd/unrealircd-6.0.4.ebuild
+++ /dev/null
@@ -1,187 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-SSL_CERT_MANDATORY=1
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/unrealircd.asc
-inherit autotools ssl-cert systemd tmpfiles verify-sig
-
-DESCRIPTION="An advanced Internet Relay Chat daemon"
-HOMEPAGE="https://www.unrealircd.org/"
-SRC_URI="https://www.unrealircd.org/downloads/${P}.tar.gz"
-SRC_URI+=" verify-sig? ( https://www.unrealircd.org/downloads/${P}.tar.gz.asc )"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux"
-IUSE="class-nofakelag curl geoip +operoverride operoverride-verify"
-
-RDEPEND="acct-group/unrealircd
-	acct-user/unrealircd
-	>=app-crypt/argon2-20171227-r1:=
-	dev-libs/libpcre2
-	dev-libs/libsodium:=
-	dev-libs/openssl:=
-	dev-libs/jansson:=
-	>=net-dns/c-ares-1.7:=
-	virtual/libcrypt:=
-	curl? ( net-misc/curl[adns] )
-	geoip? ( dev-libs/libmaxminddb )"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-unrealircd )"
-
-DOCS=( doc/{Authors,Donation,RELEASE-NOTES.md,tao.of.irc,technical/,translations.txt} )
-
-src_prepare() {
-	# QA check against bundled pkgs
-	rm -r extras || die
-
-	# building third-party modules (which we don't do) cause a sandbox violation
-	# bug 704444
-	echo "" > src/buildmod || die
-
-	sed -e 's/$(MODULEFLAGS)/$(LDFLAGS) &/' -i src/modules/{,*/}Makefile.in || die
-
-	if use class-nofakelag; then
-		sed -i -e 's:^//#undef\( FAKELAG_CONFIGURABLE\):#define\1:' include/config.h || die
-	fi
-
-	# File is missing from the 5.0.9.1 tarball
-	sed -i -e '/unrealircd-upgrade-script/d' configure.ac || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	# Default value for privatelibdir adds a build path to -Wl,-rpath.
-	econf \
-		--with-bindir="${EPREFIX}"/usr/bin \
-		--with-cachedir="${EPREFIX}"/var/lib/${PN} \
-		--with-confdir="${EPREFIX}"/etc/${PN} \
-		--with-datadir="${EPREFIX}"/var/lib/${PN} \
-		--with-docdir="${EPREFIX}"/usr/share/doc/${PF} \
-		--with-logdir="${EPREFIX}"/var/log/${PN} \
-		--with-modulesdir="${EPREFIX}/usr/$(get_libdir)"/${PN}/modules \
-		--without-privatelibdir \
-		--with-pidfile="${EPREFIX}"/run/${PN}/ircd.pid \
-		--with-tmpdir="${EPREFIX}"/var/lib/${PN}/tmp \
-		--with-maxconnections=1024 \
-		--with-nick-history=2000 \
-		--with-permissions=0640 \
-		--with-system-argon2 \
-		--with-system-cares \
-		--with-system-pcre2 \
-		--with-system-sodium \
-		--with-system-jansson \
-		--enable-dynamic-linking \
-		--with-controlfile="${EPREFIX}"/run/${PN}/unrealircd.ctl \
-		--enable-ssl="${EPREFIX}"/usr \
-		$(use_enable curl libcurl "${EPREFIX}"/usr) \
-		$(use_with !operoverride no-operoverride) \
-		$(use_with operoverride-verify) \
-		$(use_enable geoip libmaxminddb)
-}
-
-src_install() {
-	keepdir /var/log/${PN}
-	keepdir /var/lib/${PN}/tmp
-
-	newbin src/ircd ${PN}
-	dobin src/unrealircdctl
-
-	newtmpfiles "${FILESDIR}"/unrealircd.tmpfiles unrealircd.conf
-
-	(
-		cd src/modules || die
-		for subdir in $(find . -type d -print); do
-			if [[ -n $(shopt -s nullglob; echo ${subdir}/*.so) ]]; then
-				exeinto /usr/$(get_libdir)/${PN}/modules/"${subdir}"
-				doexe "${subdir}"/*.so
-			fi
-		done
-	)
-
-	insinto /etc/${PN}
-	# Purposefully omitting the examples/ and ssl/ subdirectories. ssl
-	# is redundant with app-misc/ca-certificates and examples will all
-	# be in docs anyway.
-	doins -r doc/conf/{aliases,help}
-	doins doc/conf/*.conf
-	newins doc/conf/examples/example.conf ${PN}.conf
-	keepdir /etc/${PN}/tls
-
-	einstalldocs
-
-	newinitd "${FILESDIR}"/${PN}.initd-r3 ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd-r4 ${PN}
-
-	# config should be read-only
-	fperms -R 0640 /etc/${PN}
-	fperms 0750 /etc/${PN}{,/aliases,/help}
-	fperms 0750 /etc/${PN}/tls
-	# state is editable but not owned by unrealircd directly
-	fperms 0770 /var/log/${PN}
-	fperms 0770 /var/lib/${PN}{,/tmp}
-	fowners -R root:unrealircd /{etc,var/{lib,log}}/${PN}
-
-	# By default looks in /etc/unrealircd/ssl/curl-ca-bundle.crt. Fix
-	# that to look for ca-certificates-provided file instead. %s is
-	# CONFDIR. #618066
-	dosym ../../ssl/certs/ca-certificates.crt /etc/${PN}/tls/curl-ca-bundle.crt
-
-	systemd_dounit "${FILESDIR}"/${PN}.service
-}
-
-pkg_postinst() {
-	tmpfiles_process unrealircd.conf
-
-	# Move docert call from src_install() to install_cert in pkg_postinst for
-	# bug #201682
-	if [[ ! -f "${EROOT}"/etc/${PN}/tls/server.cert.key ]]; then
-		if [[ -f "${EROOT}"/etc/${PN}/ssl/server.cert.key ]]; then
-			ewarn "The location ${PN} looks for SSL certificates has changed"
-			ewarn "from ${EROOT}/etc/${PN}/ssl to ${EROOT}/etc/${PN}/tls."
-			ewarn "Please move your existing certificates."
-		else
-			(
-				umask 0037
-				install_cert /etc/${PN}/tls/server.cert
-				chown unrealircd "${EROOT}"/etc/${PN}/tls/server.cert.*
-				ln -snf server.cert.key "${EROOT}"/etc/${PN}/tls/server.key.pem
-			)
-		fi
-	fi
-
-	local unrealircd_conf="${EROOT}"/etc/${PN}/${PN}.conf
-	# Fix up the default cloak keys.
-	if grep -qe '"and another one";$' "${unrealircd_conf}" && grep -qe '"Oozahho1raezoh0iMee4ohvegaifahv5xaepeitaich9tahdiquaid0geecipahdauVaij3zieph4ahi";$' "${unrealircd_conf}"; then
-		ebegin "Generating cloak-keys"
-		local keys=(
-			$(su ${PN} -s /bin/sh -c "${PN} -k 2>&1 | tail -n 6 | head -n 3")
-		)
-		[[ -n ${keys[0]} || -n ${keys[1]} || -n ${keys[2]} ]]
-		eend $?
-
-		ebegin "Substituting cloak-keys into ${unrealircd_conf}"
-		sed -i \
-			-e '/cloak-keys/ {
-n
-s/"Oozahho1raezoh0iMee4ohvegaifahv5xaepeitaich9tahdiquaid0geecipahdauVaij3zieph4ahi";/'${keys[0]}'/
-n
-s/"and another one";/'${keys[1]}'/
-n
-s/"and another one";/'${keys[2]}'/
-}' \
-			"${unrealircd_conf}"
-		eend $?
-	fi
-
-	elog "UnrealIRCd will not run until you've set up ${EROOT}/etc/unrealircd/unrealircd.conf"
-	elog
-	elog "You can also configure ${PN} start at boot with rc-update(1)."
-	elog "It is recommended to run unrealircd as an unprivileged user."
-	elog "The provided init.d script does this for you."
-}
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 96220106a635..ef69fac0d631 100644
Binary files a/net-libs/Manifest.gz and b/net-libs/Manifest.gz differ
diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
deleted file mode 100644
index 69d8dd7a258a..000000000000
--- a/net-libs/accounts-qml/accounts-qml-0.7-r1.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit qmake-utils
-
-DESCRIPTION="QML bindings for accounts-qt and signond"
-HOMEPAGE="https://accounts-sso.gitlab.io/"
-SRC_URI="https://gitlab.com/accounts-sso/${PN}-module/-/archive/VERSION_${PV}/${PN}-module-VERSION_${PV}.tar.gz
-	https://dev.gentoo.org/~asturm/distfiles/${P}-patches-1.tar.xz"
-
-LICENSE="LGPL-2.1"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
-IUSE="doc test"
-
-BDEPEND="
-	doc? ( app-doc/doxygen )
-"
-RDEPEND="
-	dev-qt/qtcore:5
-	dev-qt/qtdeclarative:5
-	net-libs/accounts-qt
-	net-libs/signond
-"
-DEPEND="${RDEPEND}
-	test? (
-		dev-qt/qtgui:5
-		dev-qt/qttest:5
-	)
-"
-
-# dbus problems
-RESTRICT="test"
-
-PATCHES=( "${WORKDIR}/${P}-patches-1/${P}-no-tests.patch" )
-
-S="${WORKDIR}/${PN}-module-VERSION_${PV}"
-
-src_prepare() {
-	default
-	sed -e 's/-Werror//' -i common-project-config.pri || die
-}
-
-src_configure() {
-	eqmake5 PREFIX="${EPREFIX}"/usr
-}
-
-src_install() {
-	emake INSTALL_ROOT="${D}" install_subtargets
-}
diff --git a/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild b/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild
index 2555f92d251b..b1785dc0718b 100644
--- a/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild
+++ b/net-libs/accounts-qml/accounts-qml-0.7-r2.ebuild
@@ -13,7 +13,7 @@ S="${WORKDIR}/${PN}-module-VERSION_${PV}"
 
 LICENSE="LGPL-2.1"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~loong ~ppc64 ~riscv x86"
 IUSE="doc test"
 
 # dbus problems
diff --git a/net-libs/accounts-qt/accounts-qt-1.16.ebuild b/net-libs/accounts-qt/accounts-qt-1.16.ebuild
index 8f7734ee51e9..8bec7d6b3146 100644
--- a/net-libs/accounts-qt/accounts-qt-1.16.ebuild
+++ b/net-libs/accounts-qt/accounts-qt-1.16.ebuild
@@ -27,7 +27,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
-BDEPEND="doc? ( app-doc/doxygen )"
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		dev-qt/qdoc:5
+	)
+"
 
 src_prepare() {
 	default
diff --git a/net-libs/libnftnl/Manifest b/net-libs/libnftnl/Manifest
index 2ed5281d9977..bcb01613be38 100644
--- a/net-libs/libnftnl/Manifest
+++ b/net-libs/libnftnl/Manifest
@@ -1,5 +1,3 @@
-DIST libnftnl-1.2.1.tar.bz2 395299 BLAKE2B 9f525eb540ed959075199aab4b4217bdcf0f67d6744e58d7eab9f7a50aca2d22c6d65419b15c98d24772ef020c3ed2662eba7a0812a5919a840cee5aa589b056 SHA512 cabe6896210c451d7917d1abde5e73a65594d53f011486f75dd7be5b4804c49d10f0e508675e091e1faf0363b82670b3f3a167a85db91d52742dc69445888b6a
-DIST libnftnl-1.2.1.tar.bz2.sig 566 BLAKE2B dd37a52dc185ef2e8af8f0fe32037a03bf8f50101d566be1d40217ea092ec1a9af08281b22193bb274a1ad462c081980ccc8da35c76d910cf0d613ecb0235449 SHA512 dc589d7fcd7d4b0e5e7d50b02967f265ef11b2de69018c8eb264251eb5fab4b4fabb147b8b934f29cdbf66e7bee3f030ef9f02b5872bd76c4cf3523f7e38b94b
 DIST libnftnl-1.2.2-clang-fortify-source.patch.xz 2704 BLAKE2B 107c90a2875e7477a5e8b7af8ff4c2139d2117e41a4ca9a7656b5f15c430668572c18a43e9b14a5af36c60818289e00bc082cad5d601b4c489335ca7161e5871 SHA512 c024607cb138748adcd28a511b858bbf51f2f09e13afa48d3090ba5ecd7bff1c1e87fcf38330eb24ae52c79d1a8bfce91f75be5dc81cfec6f0bc5334dd2f7456
 DIST libnftnl-1.2.2.tar.bz2 394955 BLAKE2B 69c3338e295dd158faad812ec05db8b8ab12c5626d0f33db14ee830a14d73dc5c3cd764a563cbb4fdeaa2657c99487a99fb0cc4f324a2832d5de21d922acd451 SHA512 657d48aa263043b80daa39eb8e2647c84c03b3e3a4a30b85bec1d8e4a0976075a71ad233bb384f4460d5f6662f285c12947feb8c1a6c9a534a2c9cf7ba04eee3
 DIST libnftnl-1.2.2.tar.bz2.sig 566 BLAKE2B ffdb35811e57f55ba30dfdd3e6656166b5f515348f99ee11c771b7460fd1b26b1e598146afdf76f4765e865ae76472d7071eabb30604cf78964e2fcbd6a39508 SHA512 dc4263e744a79f2b7e4ea619e740d66d6013e62aab655f040150552a6f069794ac59b8cc87a9f630dd42f087ef60523ecf08dc89cd1194637d988f85f67aaf43
diff --git a/net-libs/libnftnl/libnftnl-1.2.1.ebuild b/net-libs/libnftnl/libnftnl-1.2.1.ebuild
deleted file mode 100644
index 27da09b2ed02..000000000000
--- a/net-libs/libnftnl/libnftnl-1.2.1.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools linux-info usr-ldscript verify-sig
-
-DESCRIPTION="Netlink API to the in-kernel nf_tables subsystem"
-HOMEPAGE="https://netfilter.org/projects/nftables/"
-
-if [[ ${PV} =~ ^[9]{4,}$ ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.netfilter.org/${PN}"
-else
-	SRC_URI="https://netfilter.org/projects/${PN}/files/${P}.tar.bz2
-		verify-sig? ( https://netfilter.org/projects/${PN}/files/${P}.tar.bz2.sig )"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/netfilter.org.asc
-	BDEPEND+="verify-sig? ( sec-keys/openpgp-keys-netfilter )"
-fi
-
-LICENSE="GPL-2"
-SLOT="0/11" # libnftnl.so version
-IUSE="examples static-libs test"
-
-RESTRICT="!test? ( test )"
-
-RDEPEND=">=net-libs/libmnl-1.0.4:="
-BDEPEND+="
-	virtual/pkgconfig"
-DEPEND="${RDEPEND}"
-
-pkg_setup() {
-	if kernel_is ge 3 13; then
-		CONFIG_CHECK="~NF_TABLES"
-		linux-info_pkg_setup
-	else
-		eerror "This package requires kernel version 3.13 or newer to work properly."
-	fi
-}
-
-src_prepare() {
-	default
-	[[ ${PV} =~ ^[9]{4,}$ ]] && eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_enable static-libs static)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	gen_usr_ldscript -a nftnl
-	find "${ED}" -type f -name '*.la' -delete || die
-
-	if use examples; then
-		find examples/ -name 'Makefile*' -delete || die "Could not rm examples"
-		dodoc -r examples
-		docompress -x /usr/share/doc/${PF}/examples
-	fi
-}
diff --git a/net-libs/libpcap/libpcap-1.10.1-r1.ebuild b/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
deleted file mode 100644
index bf74c32ad09b..000000000000
--- a/net-libs/libpcap/libpcap-1.10.1-r1.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools multilib-minimal
-
-DESCRIPTION="A system-independent library for user-level network packet capture"
-HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/libpcap"
-
-if [[ ${PV} == *9999* ]] ; then
-	EGIT_REPO_URI="https://github.com/the-tcpdump-group/libpcap"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
-	inherit verify-sig
-
-	# Note: drop -upstream on bump, this is just because we switched to the official
-	# distfiles for verify-sig
-	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
-	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
-
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x86-solaris"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="bluetooth dbus netlink rdma remote static-libs usb yydebug"
-
-RDEPEND="
-	bluetooth? ( net-wireless/bluez:=[${MULTILIB_USEDEP}] )
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	netlink? ( dev-libs/libnl:3[${MULTILIB_USEDEP}] )
-	remote? ( virtual/libcrypt:=[${MULTILIB_USEDEP}] )
-	rdma? ( sys-cluster/rdma-core )
-	usb? ( virtual/libusb:1[${MULTILIB_USEDEP}] )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/flex
-	virtual/yacc
-	dbus? ( virtual/pkgconfig )
-"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.9.1-pcap-config.patch
-	"${FILESDIR}"/${PN}-1.10.0-usbmon.patch
-)
-
-src_prepare() {
-	default
-
-	if ! [[ -f VERSION ]]; then
-		echo ${PV} > VERSION || die
-	fi
-
-	eautoreconf
-}
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" \
-	econf \
-		$(use_enable bluetooth) \
-		$(use_enable dbus) \
-		$(use_enable rdma) \
-		$(use_enable remote) \
-		$(use_enable usb) \
-		$(use_enable yydebug) \
-		$(use_with netlink libnl) \
-		--enable-ipv6
-}
-
-multilib_src_compile() {
-	emake all shared
-}
-
-multilib_src_install_all() {
-	dodoc CREDITS CHANGES VERSION TODO README.* doc/README.*
-
-	# remove static libraries (--disable-static does not work)
-	if ! use static-libs; then
-		find "${ED}" -name '*.a' -exec rm {} + || die
-	fi
-
-	find "${ED}" -name '*.la' -delete || die
-
-	# We need this to build pppd on G/FBSD systems
-	if [[ "${USERLAND}" == "BSD" ]]; then
-		insinto /usr/include
-		doins pcap-int.h portability.h
-	fi
-}
diff --git a/net-libs/signond/signond-8.61.ebuild b/net-libs/signond/signond-8.61.ebuild
index 6aa2f1b9ab30..7fd33f469139 100644
--- a/net-libs/signond/signond-8.61.ebuild
+++ b/net-libs/signond/signond-8.61.ebuild
@@ -29,7 +29,12 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( dev-qt/qttest:5 )
 "
-BDEPEND="doc? ( app-doc/doxygen[dot] )"
+BDEPEND="
+	doc? (
+		app-doc/doxygen[dot]
+		dev-qt/qdoc:5
+	)
+"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-8.60-buildsystem.patch"
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index 2af9712fc5f5..2ccf878aac53 100644
Binary files a/net-mail/Manifest.gz and b/net-mail/Manifest.gz differ
diff --git a/net-mail/rss2email/rss2email-3.13.1.ebuild b/net-mail/rss2email/rss2email-3.13.1.ebuild
index 6df1cca3885f..b81e9e736714 100644
--- a/net-mail/rss2email/rss2email-3.13.1.ebuild
+++ b/net-mail/rss2email/rss2email-3.13.1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/rss2email/rss2email/archive/v${PV}.tar.gz -> ${P}.ta
 
 LICENSE="|| ( GPL-2 GPL-3 )"
 SLOT="0"
-KEYWORDS="amd64 x86"
+KEYWORDS="amd64 ~ppc64 x86"
 
 RDEPEND=">=dev-python/feedparser-6.0.5[${PYTHON_USEDEP}]
 	>=dev-python/html2text-2020.1.16[${PYTHON_USEDEP}]
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index b9f8b2bedef1..6ba9a72edac7 100644
Binary files a/net-misc/Manifest.gz and b/net-misc/Manifest.gz differ
diff --git a/net-misc/aria2/aria2-1.36.0.ebuild b/net-misc/aria2/aria2-1.36.0-r1.ebuild
similarity index 90%
rename from net-misc/aria2/aria2-1.36.0.ebuild
rename to net-misc/aria2/aria2-1.36.0-r1.ebuild
index 88356647df78..c5eb810cec54 100644
--- a/net-misc/aria2/aria2-1.36.0.ebuild
+++ b/net-misc/aria2/aria2-1.36.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -12,11 +12,16 @@ SRC_URI="https://github.com/aria2/${PN}/releases/download/release-${PV}/${P}.tar
 LICENSE="GPL-2+-with-openssl-exception"
 KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 SLOT="0"
-IUSE="adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle nls sqlite scripts ssh ssl tcmalloc test xmlrpc"
+IUSE="
+	adns bittorrent +gnutls jemalloc libuv +libxml2 metalink +nettle
+	nls sqlite scripts ssh ssl tcmalloc test xmlrpc
+"
 # xmlrpc has no explicit switch, it's turned out by any XML library
 # so metalink implicitly forces it on
-REQUIRED_USE="?? ( jemalloc tcmalloc )
-	metalink? ( xmlrpc )"
+REQUIRED_USE="
+	?? ( jemalloc tcmalloc )
+	metalink? ( xmlrpc )
+"
 RESTRICT="!test? ( test )"
 
 # Crazy GnuTLS/OpenSSL/etc. logic below:
@@ -34,13 +39,15 @@ RESTRICT="!test? ( test )"
 # We map this into:
 # ssl? -> openssl || (gnutls + (nettle || libgcrypt ))
 # !ssl? -> nettle || libgcrypt
-RDEPEND="sys-libs/zlib:0=
+RDEPEND="
+	sys-libs/zlib:0=
 	adns? ( >=net-dns/c-ares-1.5.0:0= )
 	jemalloc? ( dev-libs/jemalloc )
 	libuv? ( >=dev-libs/libuv-1.13:0= )
 	metalink? (
 		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )
+		!libxml2? ( dev-libs/expat:0= )
+	)
 	sqlite? ( dev-db/sqlite:3= )
 	ssh? ( net-libs/libssh2:= )
 	ssl? (
@@ -73,16 +80,22 @@ RDEPEND="sys-libs/zlib:0=
 	tcmalloc? ( dev-util/google-perftools )
 	xmlrpc? (
 		libxml2? ( >=dev-libs/libxml2-2.6.26:2= )
-		!libxml2? ( dev-libs/expat:0= ) )"
+		!libxml2? ( dev-libs/expat:0= )
+	)
+"
 
-DEPEND="${RDEPEND}
-	test? ( >=dev-util/cppunit-1.12.0:0 )"
+DEPEND="
+	${RDEPEND}
+	test? ( >=dev-util/cppunit-1.12.0:0 )
+"
 RDEPEND+="
 	nls? ( virtual/libiconv virtual/libintl )
-	scripts? ( dev-lang/ruby )"
+	scripts? ( dev-lang/ruby )
+"
 BDEPEND="app-arch/xz-utils
 	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
+	nls? ( sys-devel/gettext )
+"
 
 pkg_setup() {
 	if use scripts && ! use xmlrpc; then
@@ -123,6 +136,9 @@ src_configure() {
 		$(use_with sqlite sqlite3)
 		$(use_with ssh libssh2)
 		$(use_with tcmalloc)
+
+		# forces bundled wslay
+		--disable-websocket
 	)
 
 	# See TLS/MD logic described above deps.
diff --git a/net-misc/electrum/Manifest b/net-misc/electrum/Manifest
index b6a7d360af49..56775674b3f3 100644
--- a/net-misc/electrum/Manifest
+++ b/net-misc/electrum/Manifest
@@ -1,3 +1 @@
-DIST electrum-4.2.2.gh.tar.gz 5071636 BLAKE2B a13ae03e513736e5f24ded46a9b6ce13312a7d9243082f1d5b1948e7519f40f1fab238ec73550f72607ff2463a54a31f47c6ab8e511efddfcec362d5e427c6c1 SHA512 ae39ca0b548f3e4c7454096a7a05f9400a738e3b1c217ae9d41bf6156f7d642d3f1911f97829bfadbf6fdb6873538f38525363d256b363dac41d378c6b41002d
-DIST electrum-4.3.0.gh.tar.gz 5436120 BLAKE2B 180fcbd7749888707e9e57a9117b1df98f248584d68a9edcea996a73a0fdbc78f0955f778af50afae1a7a02b0d12b4aefe58b8a63f59a2b220ecddb20126966f SHA512 305ff483de498c93b118422fdff0f67ba9522275d45a5f8b14040697647b58b8113e312fd6b14bf15d3cbba3907d978657dd99d8c02e199d8c936afa2b9a6407
 DIST electrum-4.3.1.gh.tar.gz 5444509 BLAKE2B 68d63b730396c229bcb09262740a7d3ef322fce7fd16265d352e3eb2039e123d043307036d906b1688cc43d33620cf1b8f7aaa03ac9f5d68e5f9a2b84e6d44a7 SHA512 038b7c643ed11fe14e368be91bc09e5f043d4ae86cdf0ad0d80861ffa47aececcc4b0bec5a8596a8d78590b859bf302ed99d2d57bab1a2a053677fc7fa190e06
diff --git a/net-misc/electrum/electrum-4.2.2.ebuild b/net-misc/electrum/electrum-4.2.2.ebuild
deleted file mode 100644
index 3741fcfc777b..000000000000
--- a/net-misc/electrum/electrum-4.2.2.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
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="https://electrum.org/"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	eapply "${FILESDIR}/3.1.2-no-user-root.patch"
-
-	# Prevent data files from being installed in the wrong location
-	sed -i -e '/icons_dirname/d' -e '/applications/d' setup.py || die
-
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	# make qdarkstyle dep optional
-	sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	doicon -s 128 electrum/gui/icons/${PN}.png
-	domenu electrum.desktop
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.3.0.ebuild b/net-misc/electrum/electrum-4.3.0.ebuild
deleted file mode 100644
index 125465b08385..000000000000
--- a/net-misc/electrum/electrum-4.3.0.ebuild
+++ /dev/null
@@ -1,95 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses?"
-
-inherit desktop distutils-r1 xdg-utils
-
-DESCRIPTION="User friendly Bitcoin client"
-HOMEPAGE="
-	https://electrum.org/
-	https://github.com/spesmilo/electrum/
-"
-SRC_URI="
-	https://github.com/spesmilo/electrum/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="cli ncurses qrcode +qt5"
-REQUIRED_USE="|| ( cli ncurses qt5 )"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	dev-libs/libsecp256k1
-	>=dev-python/aiohttp-socks-0.3[${PYTHON_USEDEP}]
-	=dev-python/aiorpcX-0.22*[${PYTHON_USEDEP}]
-	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
-	dev-python/bitstring[${PYTHON_USEDEP}]
-	dev-python/cryptography[${PYTHON_USEDEP}]
-	>=dev-python/dnspython-2[${PYTHON_USEDEP}]
-	dev-python/pbkdf2[${PYTHON_USEDEP}]
-	dev-python/PySocks[${PYTHON_USEDEP}]
-	dev-python/qrcode[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/setuptools[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-	>=dev-python/protobuf-python-3.12[${PYTHON_USEDEP}]
-	qrcode? ( media-gfx/zbar[v4l] )
-	qt5? (
-		dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-	)
-	ncurses? ( $(python_gen_impl_dep 'ncurses') )
-"
-BDEPEND="
-	test? (
-		dev-python/pyaes[${PYTHON_USEDEP}]
-		dev-python/pycryptodome[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# use backwards-compatible cryptodome API
-	sed -i -e 's:Cryptodome:Crypto:' electrum/crypto.py || die
-
-	# make qdarkstyle dep optional
-	sed -i -e '/qdarkstyle/d' contrib/requirements/requirements.txt || die
-
-	local bestgui
-	if use qt5; then
-		bestgui=qt
-	elif use ncurses; then
-		bestgui=text
-	else
-		bestgui=stdio
-	fi
-	sed -i 's/^\([[:space:]]*\)\(config_options\['\''cwd'\''\] = .*\)$/\1\2\n\1config_options.setdefault("gui", "'"${bestgui}"'")\n/' ${PN}/${PN} || die
-
-	eapply_user
-
-	xdg_environment_reset
-	distutils-r1_src_prepare
-}
-
-src_install() {
-	dodoc RELEASE-NOTES
-	distutils-r1_src_install
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/net-misc/electrum/electrum-4.3.1.ebuild b/net-misc/electrum/electrum-4.3.1.ebuild
index 52e7834f1a47..719d71694cf4 100644
--- a/net-misc/electrum/electrum-4.3.1.ebuild
+++ b/net-misc/electrum/electrum-4.3.1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="cli ncurses qrcode +qt5"
 REQUIRED_USE="|| ( cli ncurses qt5 )"
 
diff --git a/net-misc/electrum/files/3.1.2-no-user-root.patch b/net-misc/electrum/files/3.1.2-no-user-root.patch
deleted file mode 100644
index 0d4781717714..000000000000
--- a/net-misc/electrum/files/3.1.2-no-user-root.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-diff -Naur Electrum-3.1.2.orig/setup.py Electrum-3.1.2/setup.py
---- Electrum-3.1.2.orig/setup.py	2018-03-28 04:51:11.000000000 -0400
-+++ Electrum-3.1.2/setup.py	2018-03-31 15:05:45.540757981 -0400
-@@ -28,13 +28,6 @@
-     opts, _ = parser.parse_known_args(sys.argv[1:])
-     usr_share = os.path.join(sys.prefix, "share")
-     icons_dirname = 'pixmaps'
--    if not os.access(opts.root_path + usr_share, os.W_OK) and \
--       not os.access(opts.root_path, os.W_OK):
--        icons_dirname = 'icons'
--        if 'XDG_DATA_HOME' in os.environ.keys():
--            usr_share = os.environ['XDG_DATA_HOME']
--        else:
--            usr_share = os.path.expanduser('~/.local/share')
-     data_files += [
-         (os.path.join(usr_share, 'applications/'), ['electrum.desktop']),
-         (os.path.join(usr_share, icons_dirname), ['icons/electrum.png'])
diff --git a/net-misc/iputils/iputils-99999999.ebuild b/net-misc/iputils/iputils-99999999.ebuild
index 6e435f7605da..7f3760b7d4f5 100644
--- a/net-misc/iputils/iputils-99999999.ebuild
+++ b/net-misc/iputils/iputils-99999999.ebuild
@@ -110,6 +110,10 @@ src_test() {
 src_install() {
 	meson_src_install
 
+	FILECAPS=( cap_net_raw usr/bin/ping )
+	use arping && FILECAPS+=( usr/bin/arping )
+	use clockdiff && FILECAPS+=( usr/bin/clockdiff )
+
 	dosym ping /usr/bin/ping4
 	dosym ping /usr/bin/ping6
 
@@ -159,15 +163,12 @@ pkg_preinst() {
 }
 
 pkg_postinst() {
+	fcaps_pkg_postinst
+
 	if [[ ${HAD_TFTPD_VERSION} -eq 1 ]] ; then
 		ewarn "This upstream version (>= 20211215) drops two tools:"
 		ewarn "1. tftpd (alternatives: net-ftp/tftp-hpa, net-dns/dnsmasq)"
 		ewarn "2. traceroute6 (alternatives: net-analyzer/mtr, net-analyzer/traceroute)"
 		ewarn "Please install one of the listed alternatives if needed!"
 	fi
-
-	fcaps cap_net_raw \
-		bin/ping \
-		$(usex arping 'bin/arping' '') \
-		$(usex clockdiff 'usr/bin/clockdiff' '')
 }
diff --git a/net-misc/mosh/mosh-1.3.2-r2.ebuild b/net-misc/mosh/mosh-1.3.2-r3.ebuild
similarity index 94%
rename from net-misc/mosh/mosh-1.3.2-r2.ebuild
rename to net-misc/mosh/mosh-1.3.2-r3.ebuild
index 4f8c1ca09ae2..bb82ed9190a5 100644
--- a/net-misc/mosh/mosh-1.3.2-r2.ebuild
+++ b/net-misc/mosh/mosh-1.3.2-r3.ebuild
@@ -19,14 +19,15 @@ REQUIRED_USE="
 	examples? ( client )"
 
 RDEPEND="
-	dev-libs/protobuf:0=
-	sys-libs/ncurses:0=
+	dev-libs/protobuf:=
+	sys-libs/ncurses:=
+	sys-libs/zlib
 	virtual/ssh
 	client? (
 		dev-lang/perl
 		dev-perl/IO-Tty
 	)
-	dev-libs/openssl:0=
+	dev-libs/openssl:=
 	utempter? (
 		sys-libs/libutempter
 	)"
diff --git a/net-misc/rwbs/rwbs-0.27-r2.ebuild b/net-misc/rwbs/rwbs-0.27-r2.ebuild
index d89840ef568c..f5316f9d5c4c 100644
--- a/net-misc/rwbs/rwbs-0.27-r2.ebuild
+++ b/net-misc/rwbs/rwbs-0.27-r2.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=6
+EAPI=8
 
 DESCRIPTION="Roger Wilco base station"
 HOMEPAGE="http://rogerwilco.gamespy.com/"
-SRC_URI="http://games.gci.net/pub/VoiceOverIP/RogerWilco/rwbs_Linux_0_27.tar.gz"
+SRC_URI="http://games.gci.net/pub/VoiceOverIP/RogerWilco/rwbs_Linux_$(ver_rs 1-2 '_').tar.gz"
 
 SLOT="0"
 LICENSE="Resounding GPL-2"
diff --git a/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild b/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild
index 890dc085eabe..fb17df0fd58b 100644
--- a/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild
+++ b/net-misc/telnet-bsd/telnet-bsd-1.2-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~mschiff/distfiles/${P}.tar.bz2"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 IUSE="nls xinetd"
 
 DEPEND="
diff --git a/net-misc/wget/Manifest b/net-misc/wget/Manifest
index 0f4b65782569..7053a352228b 100644
--- a/net-misc/wget/Manifest
+++ b/net-misc/wget/Manifest
@@ -1,3 +1,2 @@
-DIST wget-1.21.2.tar.gz 5004576 BLAKE2B e11c3a2b89ab26834dc4cbb445bcc6122d3a6b2a5b9c6de1ce9e8f062281f9e5aa1f80ca37a44791ba5aaf6a447015a26afef2199cdb75f1931d5e1ffb1f406b SHA512 3e35f92604486ca459f26df97d392579f1d83a9254519e8ce249b410bacf70dddf716d6caa3b29fd4865163f60410b2b8ad1ca1f7bb3dbb2456386b7647b988d
 DIST wget-1.21.3.tar.gz 5079864 BLAKE2B 4ff40a30cb3be82ea492d0eae324a9d43de30a0169d3b219ce25f3d667915f90c7eb1559760d1605340f112e96e028613265e0be73aaba7935c69cc06a4ae4f6 SHA512 29889ecbf590dff0f39183d9e0621741d731a554d990e5c995a4644725dca62e8e19601d40db0ef7d62ebf54e5457c7409965e4832b6e60e4ccbc9c8caa30718
 DIST wget-1.21.3.tar.gz.sig 854 BLAKE2B 71f69492397ae9e36284be9acdd1c94da34a7397c14a6de1a867c0d1e807bf961f8a2e098ab5629425691ce595227fb08f046416245fda2a6025929079f2d7c2 SHA512 b9f41496e0083545bc703c97b0758500f337527647cdc422152d7855d05351e3a62685269238c78300eafdbfaed8afecaeb988901a3d8a6b002e9fb3d70efe4f
diff --git a/net-misc/wget/wget-1.21.2.ebuild b/net-misc/wget/wget-1.21.2.ebuild
deleted file mode 100644
index 31b255f0d501..000000000000
--- a/net-misc/wget/wget-1.21.2.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic python-any-r1 toolchain-funcs
-
-DESCRIPTION="Network utility to retrieve files from the WWW"
-HOMEPAGE="https://www.gnu.org/software/wget/"
-SRC_URI="mirror://gnu/wget/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="cookie-check debug gnutls idn ipv6 metalink nls ntlm pcre +ssl static test uuid zlib"
-REQUIRED_USE=" ntlm? ( !gnutls ssl ) gnutls? ( ssl )"
-RESTRICT="!test? ( test )"
-
-# Force a newer libidn2 to avoid libunistring deps. #612498
-LIB_DEPEND="
-	cookie-check? ( net-libs/libpsl )
-	idn? ( >=net-dns/libidn2-0.14:=[static-libs(+)] )
-	metalink? ( media-libs/libmetalink )
-	pcre? ( dev-libs/libpcre2[static-libs(+)] )
-	ssl? (
-		gnutls? ( net-libs/gnutls:0=[static-libs(+)] )
-		!gnutls? ( dev-libs/openssl:0=[static-libs(+)] )
-	)
-	uuid? ( sys-apps/util-linux[static-libs(+)] )
-	zlib? ( sys-libs/zlib[static-libs(+)] )
-"
-RDEPEND="!static? ( ${LIB_DEPEND//\[static-libs(+)]} )"
-DEPEND="
-	${RDEPEND}
-	static? ( ${LIB_DEPEND} )
-"
-BDEPEND="
-	app-arch/xz-utils
-	dev-lang/perl
-	sys-apps/texinfo
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-	test? (
-		${PYTHON_DEPS}
-		>=dev-perl/HTTP-Daemon-6.60.0
-		dev-perl/HTTP-Message
-		dev-perl/IO-Socket-SSL
-	)
-"
-
-DOCS=( AUTHORS MAILING-LIST NEWS README )
-
-pkg_setup() {
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	sed -i -e "s:/usr/local/etc:${EPREFIX}/etc:g" doc/{sample.wgetrc,wget.texi} || die
-}
-
-src_configure() {
-	# fix compilation on Solaris, we need filio.h for FIONBIO as used in
-	# the included gnutls -- force ioctl.h to include this header
-	[[ ${CHOST} == *-solaris* ]] && append-cppflags -DBSD_COMP=1
-
-	if use static ; then
-		append-ldflags -static
-		tc-export PKG_CONFIG
-		PKG_CONFIG+=" --static"
-	fi
-
-	# There is no flag that controls this.  libunistring-prefix only
-	# controls the search path (which is why we turn it off below).
-	# Further, libunistring is only needed w/older libidn2 installs,
-	# and since we force the latest, we can force off libunistring. #612498
-	local myeconfargs=(
-		ac_cv_libunistring=no
-		--disable-assert
-		--disable-pcre
-		--disable-rpath
-		--without-included-libunistring
-		--without-libunistring-prefix
-		$(use_enable debug)
-		$(use_enable idn iri)
-		$(use_enable ipv6)
-		$(use_enable nls)
-		$(use_enable ntlm)
-		$(use_enable pcre pcre2)
-		$(use_enable ssl digest)
-		$(use_enable ssl opie)
-		$(use_with cookie-check libpsl)
-		$(use_with idn libidn)
-		$(use_with metalink)
-		$(use_with ssl ssl $(usex gnutls gnutls openssl))
-		$(use_with uuid libuuid)
-		$(use_with zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
diff --git a/net-nds/Manifest.gz b/net-nds/Manifest.gz
index 2d3a75535c56..025c4e7ffecf 100644
Binary files a/net-nds/Manifest.gz and b/net-nds/Manifest.gz differ
diff --git a/net-nds/gssproxy/Manifest b/net-nds/gssproxy/Manifest
index 124be759a0d3..6fc2a26a1c4b 100644
--- a/net-nds/gssproxy/Manifest
+++ b/net-nds/gssproxy/Manifest
@@ -1,2 +1 @@
-DIST gssproxy-0.8.4.tar.gz 567579 BLAKE2B 55519d2d439e168df0346cfa2655e01bc90191e17ea7d8c72c5f29c22ed6adca39e5adb4fd900f6dc756147b2fbee23212bfc097c38ab927e6c9679b0186fa2c SHA512 ab81c40d6c7b1908751feb107d8da66603b7681fb67aa7a1f30194a81d542ca89e6c2f34425e9356b9c55eb3691bfa240ba41441c01498af45e862a133cd088a
 DIST gssproxy-0.9.1.tar.gz 579038 BLAKE2B a17e673876b4acf480b23a8086720f507cd3a85c2f328469b726ab1653a94cd9a3eb9dd9369dee30b57457b6e8125b67a86fc4186c387e58d2d96b1da7c55089 SHA512 767c4e73d5240a43a0586e836e7dc199b8baf0adbc5a1a2cbb6ffc6f0a7ca574a4fc541ca474ef696d78956724eb24c465760f680e7170f8d77d056513b6226b
diff --git a/net-nds/gssproxy/files/gssproxy-0.8.4-include.patch b/net-nds/gssproxy/files/gssproxy-0.8.4-include.patch
deleted file mode 100644
index 1f85329c237e..000000000000
--- a/net-nds/gssproxy/files/gssproxy-0.8.4-include.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-From 57f951d1e32739ddfd0d924df81da010e47d35b9 Mon Sep 17 00:00:00 2001
-From: David Seifert <soap@gentoo.org>
-Date: Sun, 23 Jan 2022 19:09:25 +0100
-Subject: [PATCH] Add missing #include for musl
-
-Bug: https://bugs.gentoo.org/719920
-
-Signed-off-by: David Seifert <soap@gentoo.org>
----
- src/gp_socket.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/gp_socket.c b/src/gp_socket.c
-index 9070928..493399a 100644
---- a/src/gp_socket.c
-+++ b/src/gp_socket.c
-@@ -10,6 +10,7 @@
- #include <fcntl.h>
- #include <netinet/in.h>
- #include <stdlib.h>
-+#include <string.h>
- #include <sys/socket.h>
- #include <sys/stat.h>
- #include <sys/types.h>
diff --git a/net-nds/gssproxy/gssproxy-0.8.4-r2.ebuild b/net-nds/gssproxy/gssproxy-0.8.4-r2.ebuild
deleted file mode 100644
index 3e5dc8ca5043..000000000000
--- a/net-nds/gssproxy/gssproxy-0.8.4-r2.ebuild
+++ /dev/null
@@ -1,94 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="daemon to proxy GSSAPI context establishment and channel handling"
-HOMEPAGE="https://github.com/gssapi/gssproxy"
-SRC_URI="https://github.com/gssapi/${PN}/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ppc64 ~s390 ~sparc x86"
-IUSE="debug selinux systemd hardened"
-
-COMMON_DEPEND=">=dev-libs/libverto-0.2.2
-	>=dev-libs/ding-libs-0.6.1
-	virtual/krb5
-	selinux? ( sys-libs/libselinux )"
-RDEPEND="${COMMON_DEPEND}
-	selinux? ( sec-policy/selinux-gssproxy )"
-# We need xml stuff to build the man pages, and people really want/need
-# the man pages for this package :). #585200
-BDEPEND="
-	app-text/docbook-xml-dtd:4.4
-	dev-libs/libxslt
-	virtual/pkgconfig
-"
-
-# Many requirements to run tests, including running slapd as root, hence
-# unfeasible.
-RESTRICT="test"
-
-# pkg_setup() {
-# 	# Here instead of flag-logic in DEPEND, since virtual/krb5 does not
-# 	# allow to specify the openldap use flag, which heimdal doesn't
-# 	# support.
-# 	# Using mit-krb5 explicitly because heimdal doesn't install kerberos
-# 	# schemata required for the tests of gss-proxy.
-# 	if use test && ! has_version "app-crypt/mit-krb5[openldap]"; then
-# 		eerror "Tests of this package require the kerberos schemata installed from app-crypt/mit-krb5[openldap]."
-# 		die "Tests enabled but no app-crypt/mit-krb5[openldap] being installed."
-# 	fi
-# }
-
-# Was required in 0.7.0 to fix the schema- and slapd-path. Reason for
-# comment: see RESTRICT comment
-# src_prepare() {
-# 	default
-# 	# The tests look for kerberos schemata in the documentation
-# 	# directory of krb5, however these are installed in /etc/openldap
-# 	# and only if the openldap useflag is supplied
-# 	sed -i \
-# 		-e 's#/usr/share/doc/krb5-server-ldap*#/etc/openldap/schema#' \
-# 		-e "s#\(subprocess.Popen..\"\)slapd#\1/usr/$(get_libdir)/openldap/slapd#" \
-# 		"${S}/tests/testlib.py" || die
-# }
-
-PATCHES=( "${FILESDIR}"/${P}-include.patch )
-
-src_configure() {
-	local myeconfargs=(
-		# The build assumes localstatedir is /var and takes care of
-		# using all the right subdirs itself.
-		"--localstatedir=${EPREFIX}/var"
-		"--with-os=gentoo"
-		"--with-initscript=$(usex systemd systemd none)"
-		"$(use_with selinux)"
-		"$(use_with debug gssidebug)"
-		"$(use_with hardened hardening)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	# This is a plugin module, so no need for la file.
-	find "${ED}"/usr -name proxymech.la -delete || die
-
-	doinitd "${FILESDIR}"/gssproxy
-	insinto /etc/gssproxy
-	doins examples/*.conf
-	insinto /etc/gss/mech.d
-	newins examples/mech gssproxy.conf
-
-	keepdir /var/lib/gssproxy
-	keepdir /var/lib/gssproxy/clients
-	keepdir /var/lib/gssproxy/rcache
-	fperms 0700 /var/lib/gssproxy/clients
-	fperms 0700 /var/lib/gssproxy/rcache
-
-	# The build installs a bunch of empty dirs, so prune them.
-	find "${ED}" -depth -type d -empty -delete || die
-}
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index 4d98494f2b89..34f3b2b6e82b 100644
Binary files a/net-proxy/Manifest.gz and b/net-proxy/Manifest.gz differ
diff --git a/net-proxy/haproxy/Manifest b/net-proxy/haproxy/Manifest
index 63c9c0e16f95..2c8928b326b1 100644
--- a/net-proxy/haproxy/Manifest
+++ b/net-proxy/haproxy/Manifest
@@ -8,6 +8,4 @@ DIST haproxy-2.4.18.tar.gz 3626923 BLAKE2B 1ec312a5607634f7906cfcf5d4e22d829bdca
 DIST haproxy-2.5.4.tar.gz 3819082 BLAKE2B fabc62ebaa968a11a49a6dd131198af31a49adbe73bcae82124ca752c2c90c1d77346621c9d804a10bca8ff254580aa7fbaca774f9df1a6a99ec112375d84a50 SHA512 95eb1ad9121a93cc77f0dd14e0080e18935cd45dc7dc511ab6dd0ecbdbb967bbde5eaa83f70157086796603560b979689f7d50b0cfba93d0245544c3a8c28a87
 DIST haproxy-2.5.7.tar.gz 3832801 BLAKE2B 6d54135b56f84129dea497ddc935fecf593abccfb21fc647c7d166f9c1aa4abc670c66bf13e0923e353627d83d47345f632ae8212672c3b3da7a757fd5d24d7c SHA512 cf6994508d559401a84e1304c2b6829952a9b3a14365d03436da42ec7e4553c201ffde9e524044dfa48813e8e614d24095a87b0fae7d9145ce5e66b953666ee9
 DIST haproxy-2.5.8.tar.gz 3838130 BLAKE2B fd02c285682815fd1837190b80184e110bb6a37b99dfa30e6cece628e62af6a5a145d97f5849e64364a286593d0ea206506c0b474485b22018a816b899744710 SHA512 99a49556864b178c024e73e5bd45051a7a6e512bbb52906ba6f3888e22a83e2b91198ed1c6a3bcbbc44c474a9ba6a6373fae4216fac8ecdb5d724f281b00fd68
-DIST haproxy-2.6.2.tar.gz 3978933 BLAKE2B 8d080b175f574718fac6c58b9681a50d40d8ea4a562a05466668ee9ebe95c065aaa3eab33115c69cca356207f91927c2b949c0ec7d354fdad413ae91a41e60cd SHA512 8eef882145ce8da409d2fbd6fa5b7d383b9d52f8147ef697d61c512c07a8aa8029ae742b5682af5fe736c34398a5265ce9dc189e938f47395cf9e775471b5f55
-DIST haproxy-2.6.4.tar.gz 3986583 BLAKE2B e4eb9c576aa1405bd07359488d4defaa765d7e802a62278f784de8fbf4fbca67da6cd4690917534c7a7e1e9979c727cbfc021f1a5676dec3f47b8f295d61a5d3 SHA512 f6e20e164ef3d6e81a85c272806ddae94c1d1cbd800dfeeaee3818ed7987ee6e59797c235c53efc51905da707d238026fbcb0a44f0de29e76f4eac7beeb8d035
-DIST haproxy-2.6.5.tar.gz 4010014 BLAKE2B 310556ace0fc54537e7cd91f7055c46f172355ca6eb9bde92f2fac6bf3d0c6ee60036e5744f67421b6d910f5719d4b6ae91e0737d95312d2dfef1760f2c354dd SHA512 b285345be866b25a645b8d417cac0f9b2c9ed473cd327a621f549e77cbf0600a94e39868bb83d24a5c2ac49fe94990e37030bf3ad6f5874fb6b150f16a701731
+DIST haproxy-2.6.6.tar.gz 4015438 BLAKE2B 36e676e011e290cc16ed4d116426639e9c11dcc6383fbcc82da8c9df87f19dde55a420167d926a510f6ca06cedec5588abb1ee1dd78881e3ecafbe428ea247c7 SHA512 0b416d200e9b406a96896d3570483d24e94fdfa3f781bee663476e218a57851aefdf8768f00c8a2e9df1bb028f6398690f07da452f59656327967685787ee5c2
diff --git a/net-proxy/haproxy/haproxy-2.2.9999.ebuild b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
index 954368323612..c3fd5e9e2c2b 100644
--- a/net-proxy/haproxy/haproxy-2.2.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.2.9999.ebuild
@@ -122,7 +122,6 @@ src_compile() {
 
 src_install() {
 	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
diff --git a/net-proxy/haproxy/haproxy-2.4.9999.ebuild b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
index 56ad7268073b..1ff5a7b10e0b 100644
--- a/net-proxy/haproxy/haproxy-2.4.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.4.9999.ebuild
@@ -117,7 +117,6 @@ src_compile() {
 
 src_install() {
 	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
diff --git a/net-proxy/haproxy/haproxy-2.5.9999.ebuild b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
index 853340e4fcb2..ba2ff38efb00 100644
--- a/net-proxy/haproxy/haproxy-2.5.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.5.9999.ebuild
@@ -117,7 +117,6 @@ src_compile() {
 
 src_install() {
 	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
diff --git a/net-proxy/haproxy/haproxy-2.6.4.ebuild b/net-proxy/haproxy/haproxy-2.6.4.ebuild
deleted file mode 100644
index 6e17e38ddf96..000000000000
--- a/net-proxy/haproxy/haproxy-2.6.4.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	crypt? ( virtual/libcrypt:= )
-	pcre? (
-		dev-libs/libpcre2:=
-		pcre-jit? ( dev-libs/libpcre2:=[jit] )
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	lua? ( ${LUA_DEPS} )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		TARGET=linux-glibc
-		# Switching to PCRE2 by default, bug 838013
-		PCRE=
-		PCRE_JIT=
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE2) )
-	args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-	args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for extra in ${EXTRAS[@]} ; do
-			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
-			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
-			else
-				# Those two includes are a workaround for hpack Makefile missing those
-				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit admin/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
-		has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
-		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
-		has dev/hpack "${EXTRAS[@]}" && {
-			newbin dev/hpack/gen-rht haproxy_gen-rht
-			newbin dev/hpack/gen-enc haproxy_gen-enc
-			newbin dev/hpack/decode haproxy_decode
-		}
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.6.5.ebuild b/net-proxy/haproxy/haproxy-2.6.5.ebuild
deleted file mode 100644
index 6e17e38ddf96..000000000000
--- a/net-proxy/haproxy/haproxy-2.6.5.ebuild
+++ /dev/null
@@ -1,177 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-LUA_COMPAT=( lua5-4 lua5-3 )
-
-[[ ${PV} == *9999 ]] && SCM="git-r3"
-inherit toolchain-funcs flag-o-matic lua-single systemd linux-info ${SCM}
-
-MY_P="${PN}-${PV/_beta/-dev}"
-
-DESCRIPTION="A TCP/HTTP reverse proxy for high availability environments"
-HOMEPAGE="http://www.haproxy.org"
-if [[ ${PV} != *9999 ]]; then
-	SRC_URI="http://haproxy.1wt.eu/download/$(ver_cut 1-2)/src/${MY_P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
-elif [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy.git/"
-	EGIT_BRANCH=master
-else
-	EGIT_REPO_URI="https://git.haproxy.org/git/haproxy-$(ver_cut 1-2).git/"
-	EGIT_BRANCH=master
-fi
-
-LICENSE="GPL-2 LGPL-2.1"
-SLOT="0/$(ver_cut 1-2)"
-IUSE="+crypt doc examples +slz +net_ns +pcre pcre-jit prometheus-exporter
-ssl systemd +threads tools vim-syntax zlib lua 51degrees wurfl"
-REQUIRED_USE="pcre-jit? ( pcre )
-	lua? ( ${LUA_REQUIRED_USE} )
-	?? ( slz zlib )"
-
-BDEPEND="virtual/pkgconfig"
-DEPEND="
-	crypt? ( virtual/libcrypt:= )
-	pcre? (
-		dev-libs/libpcre2:=
-		pcre-jit? ( dev-libs/libpcre2:=[jit] )
-	)
-	ssl? (
-		dev-libs/openssl:0=
-	)
-	systemd? ( sys-apps/systemd )
-	zlib? ( sys-libs/zlib )
-	lua? ( ${LUA_DEPS} )"
-RDEPEND="${DEPEND}
-	acct-group/haproxy
-	acct-user/haproxy"
-
-S="${WORKDIR}/${MY_P}"
-
-DOCS=( CHANGELOG CONTRIBUTING MAINTAINERS README )
-EXTRAS=( admin/halog admin/iprange dev/tcploop dev/hpack )
-
-haproxy_use() {
-	(( $# != 2 )) && die "${FUNCNAME} <USE flag> <make option>"
-
-	usex "${1}" "USE_${2}=1" "USE_${2}="
-}
-
-pkg_setup() {
-	use lua && lua-single_pkg_setup
-	if use net_ns; then
-		CONFIG_CHECK="~NET_NS"
-		linux-info_pkg_setup
-	fi
-}
-
-src_compile() {
-	local -a args=(
-		V=1
-		TARGET=linux-glibc
-		# Switching to PCRE2 by default, bug 838013
-		PCRE=
-		PCRE_JIT=
-	)
-
-	# TODO: PCRE2_WIDTH?
-	args+=( $(haproxy_use threads THREAD) )
-	args+=( $(haproxy_use crypt LIBCRYPT) )
-	args+=( $(haproxy_use net_ns NS) )
-	args+=( $(haproxy_use pcre PCRE2) )
-	args+=( $(haproxy_use pcre-jit PCRE2_JIT) )
-	args+=( $(haproxy_use ssl OPENSSL) )
-	args+=( $(haproxy_use slz SLZ) )
-	args+=( $(haproxy_use zlib ZLIB) )
-	args+=( $(haproxy_use lua LUA) )
-	args+=( $(haproxy_use 51degrees 51DEGREES) )
-	args+=( $(haproxy_use wurfl WURFL) )
-	args+=( $(haproxy_use systemd SYSTEMD) )
-	args+=( $(haproxy_use prometheus-exporter PROMEX) )
-
-	# Bug #668002
-	if use ppc || use arm || use hppa; then
-		TARGET_LDFLAGS=-latomic
-	fi
-
-	# HAProxy really needs some of those "SPEC_CFLAGS", like -fno-strict-aliasing
-	emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]}
-	emake -C admin/systemd CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) SBINDIR=/usr/sbin
-
-	if use tools ; then
-		for extra in ${EXTRAS[@]} ; do
-			if [ "${extra}" = "admin/halog" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} admin/halog/halog
-			elif [ "${extra}" = "dev/hpack" ]; then
-				emake CFLAGS="${CFLAGS} \$(SPEC_CFLAGS)" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" EXTRA_OBJS="${EXTRA_OBJS}" TARGET_LDFLAGS="${TARGET_LDFLAGS}" PCRE_LIB="${ESYSROOT}"/usr/$(get_libdir) ${args[@]} dev/hpack/{decode,gen-enc,gen-rht}
-			else
-				# Those two includes are a workaround for hpack Makefile missing those
-				emake -C ${extra} \
-					CFLAGS="${CFLAGS} -I../../include/ -I../../ebtree/" OPTIMIZE="${CFLAGS}" LDFLAGS="${LDFLAGS}" CC="$(tc-getCC)" ${args[@]}
-			fi
-		done
-	fi
-}
-
-src_install() {
-	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
-
-	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
-	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
-
-	doman doc/haproxy.1
-
-	systemd_dounit admin/systemd/haproxy.service
-
-	einstalldocs
-
-	# The errorfiles are used by upstream defaults.
-	insinto /etc/haproxy/errors/
-	doins examples/errorfiles/*
-
-	if use doc; then
-		dodoc doc/*.txt
-		#if use lua; then
-		# TODO: doc/lua-api/
-		#fi
-	fi
-
-	if use tools ; then
-		has admin/halog "${EXTRAS[@]}" && dobin admin/halog/halog
-		has admin/iprange "${EXTRAS[@]}" && { newbin admin/iprange/iprange haproxy_iprange; newbin admin/iprange/ip6range haproxy_ip6range; }
-		has dev/tcploop "${EXTRAS[@]}" && newbin dev/tcploop/tcploop haproxy_tcploop
-		has dev/hpack "${EXTRAS[@]}" && {
-			newbin dev/hpack/gen-rht haproxy_gen-rht
-			newbin dev/hpack/gen-enc haproxy_gen-enc
-			newbin dev/hpack/decode haproxy_decode
-		}
-	fi
-
-	if use examples ; then
-		docinto examples
-		dodoc examples/*.cfg
-		dodoc doc/seamless_reload.txt
-	fi
-
-	if use vim-syntax ; then
-		insinto /usr/share/vim/vimfiles/syntax
-		doins admin/syntax-highlight/haproxy.vim
-	fi
-}
-
-pkg_postinst() {
-	if [[ ! -f "${EROOT}/etc/haproxy/haproxy.cfg" ]] ; then
-		ewarn "You need to create /etc/haproxy/haproxy.cfg before you start the haproxy service."
-		ewarn "It's best practice to not run haproxy as root, user and group haproxy was therefore created."
-		ewarn "Make use of them with the \"user\" and \"group\" directives."
-
-		if [[ -d "${EROOT}/usr/share/doc/${PF}" ]]; then
-			einfo "Please consult the installed documentation for learning the configuration file's syntax."
-			einfo "The documentation and sample configuration files are installed here:"
-			einfo "   ${EROOT}/usr/share/doc/${PF}"
-		fi
-	fi
-}
diff --git a/net-proxy/haproxy/haproxy-2.6.2-r1.ebuild b/net-proxy/haproxy/haproxy-2.6.6.ebuild
similarity index 99%
rename from net-proxy/haproxy/haproxy-2.6.2-r1.ebuild
rename to net-proxy/haproxy/haproxy-2.6.6.ebuild
index 6e17e38ddf96..5d7459642b66 100644
--- a/net-proxy/haproxy/haproxy-2.6.2-r1.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.6.ebuild
@@ -117,7 +117,6 @@ src_compile() {
 
 src_install() {
 	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
diff --git a/net-proxy/haproxy/haproxy-2.6.9999.ebuild b/net-proxy/haproxy/haproxy-2.6.9999.ebuild
index 6e17e38ddf96..5d7459642b66 100644
--- a/net-proxy/haproxy/haproxy-2.6.9999.ebuild
+++ b/net-proxy/haproxy/haproxy-2.6.9999.ebuild
@@ -117,7 +117,6 @@ src_compile() {
 
 src_install() {
 	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
diff --git a/net-proxy/haproxy/haproxy-9999.ebuild b/net-proxy/haproxy/haproxy-9999.ebuild
index 6e17e38ddf96..5d7459642b66 100644
--- a/net-proxy/haproxy/haproxy-9999.ebuild
+++ b/net-proxy/haproxy/haproxy-9999.ebuild
@@ -117,7 +117,6 @@ src_compile() {
 
 src_install() {
 	dosbin haproxy
-	dosym ../sbin/haproxy /usr/bin/haproxy
 
 	newconfd "${FILESDIR}/${PN}.confd-r1" ${PN}
 	newinitd "${FILESDIR}/${PN}.initd-r8" ${PN}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index c800368f12d2..ecdde4f7d3cd 100644
Binary files a/profiles/Manifest.gz and b/profiles/Manifest.gz differ
diff --git a/profiles/arch/amd64/no-multilib/package.mask b/profiles/arch/amd64/no-multilib/package.mask
index 06c7c71acb18..943950147149 100644
--- a/profiles/arch/amd64/no-multilib/package.mask
+++ b/profiles/arch/amd64/no-multilib/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # James Le Cuirot <chewi@gentoo.org> (2021-09-04)
@@ -62,7 +62,7 @@ games-arcade/gish-demo
 games-arcade/jardinains
 games-arcade/thinktanks-demo
 games-emulation/gens
-<games-emulation/pcsx2-9999
+<games-emulation/pcsx2-1.7
 games-emulation/vgba
 games-emulation/zinc
 games-emulation/zsnes
diff --git a/profiles/arch/mips/package.use.force b/profiles/arch/mips/package.use.force
index 89f4520ca4eb..bc882ff72538 100644
--- a/profiles/arch/mips/package.use.force
+++ b/profiles/arch/mips/package.use.force
@@ -1,6 +1,10 @@
-# Copyright 1999-2019 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# matoro <matoro_gentoo@matoro.tk> (2022-09-14)
+# Same as below for rust.
+dev-lang/rust llvm_targets_Mips
+
 # Michał Górny <mgorny@gentoo.org> (2016-09-24)
 # Force the host target to avoid dependency hell
 dev-ml/llvm-ocaml llvm_targets_Mips
diff --git a/profiles/arch/mips/package.use.mask b/profiles/arch/mips/package.use.mask
index d761e4e458d6..2c2619a4a296 100644
--- a/profiles/arch/mips/package.use.mask
+++ b/profiles/arch/mips/package.use.mask
@@ -1,6 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# matoro <matoro_gentoo@matoro.tk> (2022-09-14)
+# Not broken, but better wait on profiles: bug #515694
+dev-lang/rust system-llvm
+
 # Matt Turner <mattst88@gentoo.org> (2022-04-18)
 # app-text/nuspell is not keyworded
 app-text/enchant nuspell
diff --git a/profiles/base/package.use.mask b/profiles/base/package.use.mask
index ab2d36ce0217..bb76e3ff09a1 100644
--- a/profiles/base/package.use.mask
+++ b/profiles/base/package.use.mask
@@ -6,6 +6,18 @@
 # This file is only for generic masks. For arch-specific masks (i.e.
 # mask everywhere, unmask on arch/*) use arch/base.
 
+# Pascal Jaeger <pascal.jaeger@leimstift.de> (2022-09-21)
+# Versions >=43.0 of evince only work with <gnome-base/nautilus-42.2.
+# Allowing that use flag for >=43.0 would stop users from updating nautilus
+>=app-text/evince-43.0 nautilus
+
+# Yiyang Wu <xgreenlandforwyy@gmail.com> (2022-09-21)
+# Intolerable mathematical errors found on AMD Radeon VII GPU during src_test,
+# may lead to incorrect results in computation.
+# https://github.com/ROCmSoftwarePlatform/rocFFT/issues/369
+=sci-libs/rocFFT-5.1.3 amdgpu_targets_gfx906
+=sci-libs/hipFFT-5.1.3 amdgpu_targets_gfx906
+
 # Georgy Yakovlev <gyakovlev@gentoo.org> (2022-09-17)
 # po4a crashes while translating
 # mask for now
@@ -19,7 +31,7 @@
 # bug #870211.
 dev-lang/rust llvm-libunwind
 
-# Matt Jolly <Matt.Jolly@footclan.ninja (2022-09-09)
+# Matt Jolly <Matt.Jolly@footclan.ninja> (2022-09-09)
 # app-antivirus/clamav JIT support requires LLVM <=13
 # ebuild support is there but currently failing to link
 app-antivirus/clamav jit
diff --git a/profiles/default/linux/musl/eapi b/profiles/default/linux/mips/17.0/musl/eapi
similarity index 100%
rename from profiles/default/linux/musl/eapi
rename to profiles/default/linux/mips/17.0/musl/eapi
diff --git a/profiles/default/linux/musl/mips/eapi b/profiles/default/linux/mips/17.0/musl/mipsel/eapi
similarity index 100%
rename from profiles/default/linux/musl/mips/eapi
rename to profiles/default/linux/mips/17.0/musl/mipsel/eapi
diff --git a/profiles/default/linux/musl/mips/mipsel/make.defaults b/profiles/default/linux/mips/17.0/musl/mipsel/make.defaults
similarity index 60%
rename from profiles/default/linux/musl/mips/mipsel/make.defaults
rename to profiles/default/linux/mips/17.0/musl/mipsel/make.defaults
index dce419912712..53daa27ad9fb 100644
--- a/profiles/default/linux/musl/mips/mipsel/make.defaults
+++ b/profiles/default/linux/mips/17.0/musl/mipsel/make.defaults
@@ -1,9 +1,5 @@
-# Copyright 1999-2014 Gentoo Foundation.
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-CHOST="mipsel-gentoo-linux-musl"
-CHOST_o32="${CHOST}"
-
 # Disable sandbox because its currently broken on mipsel-musl
 FEATURES="-sandbox"
-
diff --git a/profiles/default/linux/musl/mips/mipsel/eapi b/profiles/default/linux/mips/17.0/musl/mipsel/n64/eapi
similarity index 100%
rename from profiles/default/linux/musl/mips/mipsel/eapi
rename to profiles/default/linux/mips/17.0/musl/mipsel/n64/eapi
diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/n64/make.defaults b/profiles/default/linux/mips/17.0/musl/mipsel/n64/make.defaults
new file mode 100644
index 000000000000..26dbb0e4c1dc
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/mipsel/n64/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mips64el-gentoo-linux-musl"
+CHOST_n64="${CHOST}"
+LIBDIR_n64="lib"
diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent b/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent
new file mode 100644
index 000000000000..e92fcf7cbf75
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/mipsel/n64/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/mips/mipsel/mips64el/n64
diff --git a/profiles/hardened/eapi b/profiles/default/linux/mips/17.0/musl/mipsel/o32/eapi
similarity index 100%
rename from profiles/hardened/eapi
rename to profiles/default/linux/mips/17.0/musl/mipsel/o32/eapi
diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults b/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults
new file mode 100644
index 000000000000..d0dec15ac7be
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/mipsel/o32/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mipsel-gentoo-linux-musl"
+CHOST_o32="${CHOST}"
+LIBDIR_o32="lib"
diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent b/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent
new file mode 100644
index 000000000000..85db6caf16e5
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/mipsel/o32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../arch/mips/mipsel/o32
diff --git a/profiles/default/linux/mips/17.0/musl/mipsel/parent b/profiles/default/linux/mips/17.0/musl/mipsel/parent
new file mode 100644
index 000000000000..f2bcf2737c18
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/mipsel/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/mipsel
diff --git a/profiles/hardened/linux/musl/eapi b/profiles/default/linux/mips/17.0/musl/n64/eapi
similarity index 100%
rename from profiles/hardened/linux/musl/eapi
rename to profiles/default/linux/mips/17.0/musl/n64/eapi
diff --git a/profiles/default/linux/mips/17.0/musl/n64/make.defaults b/profiles/default/linux/mips/17.0/musl/n64/make.defaults
new file mode 100644
index 000000000000..90dd88675350
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/n64/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mips64-gentoo-linux-musl"
+CHOST_n64="${CHOST}"
+LIBDIR_n64="lib"
diff --git a/profiles/default/linux/mips/17.0/musl/n64/parent b/profiles/default/linux/mips/17.0/musl/n64/parent
new file mode 100644
index 000000000000..0a2e2f270682
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/n64/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/mips64/n64
diff --git a/profiles/hardened/linux/musl/mips/eapi b/profiles/default/linux/mips/17.0/musl/o32/eapi
similarity index 100%
rename from profiles/hardened/linux/musl/mips/eapi
rename to profiles/default/linux/mips/17.0/musl/o32/eapi
diff --git a/profiles/default/linux/mips/17.0/musl/o32/make.defaults b/profiles/default/linux/mips/17.0/musl/o32/make.defaults
new file mode 100644
index 000000000000..4027a830450d
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/o32/make.defaults
@@ -0,0 +1,6 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+CHOST="mips-gentoo-linux-musl"
+CHOST_o32="${CHOST}"
+LIBDIR_o32="lib"
diff --git a/profiles/default/linux/mips/17.0/musl/o32/parent b/profiles/default/linux/mips/17.0/musl/o32/parent
new file mode 100644
index 000000000000..6d4edaa24a38
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/o32/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../arch/mips/o32
diff --git a/profiles/default/linux/musl/mips/package.mask b/profiles/default/linux/mips/17.0/musl/package.mask
similarity index 71%
rename from profiles/default/linux/musl/mips/package.mask
rename to profiles/default/linux/mips/17.0/musl/package.mask
index b102791cad4a..ee0e90a0fba8 100644
--- a/profiles/default/linux/musl/mips/package.mask
+++ b/profiles/default/linux/mips/17.0/musl/package.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 >sys-apps/kbd-1.15.5-r99
diff --git a/profiles/default/linux/mips/17.0/musl/parent b/profiles/default/linux/mips/17.0/musl/parent
new file mode 100644
index 000000000000..9ef7663a23b6
--- /dev/null
+++ b/profiles/default/linux/mips/17.0/musl/parent
@@ -0,0 +1,3 @@
+..
+../../../../../features/musl
+../../../../../features/wd40
diff --git a/profiles/default/linux/musl/make.defaults b/profiles/default/linux/musl/make.defaults
deleted file mode 100644
index f0116539f6b1..000000000000
--- a/profiles/default/linux/musl/make.defaults
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-PORTAGE_LIBC="musl"
-ELIBC="musl"
-
-FEATURES="sandbox sfperms strict"
-
-USE="nptl unicode -berkdb"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} nptl -berkdb"
-
-SYMLINK_LIB="no"
-
-# TODO: fix so musl doesn't generate this for all packages
-# that use a charset, it causes package collisons.
-INSTALL_MASK="charset.alias"
diff --git a/profiles/default/linux/musl/mips/make.defaults b/profiles/default/linux/musl/mips/make.defaults
deleted file mode 100644
index f1406ac0ecda..000000000000
--- a/profiles/default/linux/musl/mips/make.defaults
+++ /dev/null
@@ -1,20 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-ARCH="mips"
-ACCEPT_KEYWORDS="${ARCH} ~${ARCH}"
-
-CHOST="mips-gentoo-linux-musl"
-CFLAGS="-O2 -pipe"
-CXXFLAGS="${CFLAGS}"
-FFLAGS="${CFLAGS}"
-FCFLAGS="${CFLAGS}"
-
-# Anthony G. Basile <blueness@gentoo.org> (2014-07-01)
-# Multilib-related setup, bug #515130
-ABI="o32"
-DEFAULT_ABI="o32"
-MULTILIB_ABIS="o32"
-CHOST_o32="${CHOST}"
-LIBDIR_o32="lib"
-IUSE_IMPLICIT="abi_mips_o32"
diff --git a/profiles/default/linux/musl/mips/mipsel/parent b/profiles/default/linux/musl/mips/mipsel/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/musl/mips/mipsel/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/musl/mips/package.use.force b/profiles/default/linux/musl/mips/package.use.force
deleted file mode 100644
index 9fc197b1445f..000000000000
--- a/profiles/default/linux/musl/mips/package.use.force
+++ /dev/null
@@ -1,5 +0,0 @@
-# Michał Górny <mgorny@gentoo.org> (2016-09-24)
-# Force the host target to avoid dependency hell
-dev-ml/llvm-ocaml llvm_targets_Mips
-sys-devel/clang llvm_targets_Mips
-sys-devel/llvm llvm_targets_Mips
diff --git a/profiles/default/linux/musl/mips/parent b/profiles/default/linux/musl/mips/parent
deleted file mode 100644
index f3229c5b9876..000000000000
--- a/profiles/default/linux/musl/mips/parent
+++ /dev/null
@@ -1 +0,0 @@
-..
diff --git a/profiles/default/linux/musl/mips/use.force b/profiles/default/linux/musl/mips/use.force
deleted file mode 100644
index e94d30137368..000000000000
--- a/profiles/default/linux/musl/mips/use.force
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-# Force the flag which corresponds to arch/abi, bug #515130
-mips
-abi_mips_o32
diff --git a/profiles/default/linux/musl/mips/use.mask b/profiles/default/linux/musl/mips/use.mask
deleted file mode 100644
index b285b3b4746e..000000000000
--- a/profiles/default/linux/musl/mips/use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Unmask the flag which corresponds to arch/abi, bug #515130
--mips
--abi_mips_o32
diff --git a/profiles/default/linux/musl/package.mask b/profiles/default/linux/musl/package.mask
deleted file mode 100644
index 369b436b9733..000000000000
--- a/profiles/default/linux/musl/package.mask
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-sys-libs/glibc
-
-# We use eudev which is tested on musl
-sys-apps/systemd
-sys-fs/udev
-
-# dev-libs/elfutils needs a port to musl, bug #602126
-dev-libs/elfutils
->virtual/libelf-2
-
-# packages that need masked packages or multilib
-dev-games/ps2-packer
-games-action/beathazardultra
-games-action/brutal-legend-gog
-games-action/brutal-legend-hb
-games-action/crimsonland
-games-action/descent3
-games-action/descent3-demo
-games-action/guacamelee
-games-action/heretic2-demo
-games-action/hotline-miami
-games-action/intrusion2
-games-action/shadowgrounds-bin
-games-action/shadowgrounds-survivor-bin
-games-action/solar2
-games-action/swordandsworcery
-games-action/trine
-games-action/trine-enchanted-edition
-games-action/trine2
-games-arcade/aquaria
-games-arcade/barbarian-bin
-games-arcade/dynamitejack
-games-arcade/jardinains
-games-arcade/thinktanks-demo
-games-emulation/zinc
-games-emulation/zsnes
-games-fps/etqw-demo
-games-fps/glxquake-bin
-games-fps/legends
-games-fps/soldieroffortune
-games-fps/transfusion-bin
-games-fps/tribes2
-games-fps/ut2003
-games-fps/ut2003-bonuspack-cm
-games-fps/ut2003-bonuspack-de
-games-fps/ut2003-bonuspack-epic
-games-fps/ut2003-demo
-games-fps/ut2004
-games-fps/ut2004-bonuspack-cbp1
-games-fps/ut2004-bonuspack-cbp2
-games-fps/ut2004-bonuspack-ece
-games-fps/ut2004-bonuspack-mega
-games-fps/ut2004-data
-games-fps/ut2004-demo
-games-misc/little-inferno
-games-misc/papers-please
-games-puzzle/world-of-goo-demo
-games-puzzle/world-of-goo-hb
-games-roguelike/adom
-games-roguelike/neon-chrome
-games-rpg/costume-quest
-games-rpg/crosscode
-games-rpg/dear-esther
-games-rpg/dungeon-defenders
-games-rpg/eschalon-book-1-demo
-games-rpg/wasteland2
-games-server/etqw-ded
-games-server/ut2004-ded
-games-simulation/bcs-demo
-games-strategy/darwinia
-games-strategy/darwinia-demo
-games-strategy/defcon-demo
-games-strategy/dominions2
-games-strategy/knights-demo
-games-strategy/majesty-demo
-media-video/binkplayer
-
-# James Le Cuirot <chewi@gentoo.org> (2022-08-11)
-# Binary package for glibc. Could be built from source but would take ages and
-# isn't worth the maintenance cost.
-dev-libs/nwjs
diff --git a/profiles/default/linux/musl/package.use b/profiles/default/linux/musl/package.use
deleted file mode 100644
index 2220022c5f79..000000000000
--- a/profiles/default/linux/musl/package.use
+++ /dev/null
@@ -1,7 +0,0 @@
-# Copyright 1999-2016 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Anthony G. Basile <blueness@gentoo.org> (2016-07-14)
-# We need this to break a circular dependency with
-# 'sys-libs/libcap pam' in stage3 catalyst builds
-sys-libs/pam -filecaps
diff --git a/profiles/default/linux/musl/package.use.force b/profiles/default/linux/musl/package.use.force
deleted file mode 100644
index 8122d90a6c88..000000000000
--- a/profiles/default/linux/musl/package.use.force
+++ /dev/null
@@ -1,9 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Force system-libevent use flag on mozilla packages, since the building of
-# bundled libevent cannot accomodate a system without sysctl.h
-# See bug 574830 for more info.
->=www-client/firefox-45.0 system-libevent
->=www-client/seamonkey-2.40 system-libevent
->=mail-client/thunderbird-45.0 system-libevent
diff --git a/profiles/default/linux/musl/package.use.mask b/profiles/default/linux/musl/package.use.mask
deleted file mode 100644
index f06ca2ec25ae..000000000000
--- a/profiles/default/linux/musl/package.use.mask
+++ /dev/null
@@ -1,18 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# See bug #604542
-net-misc/iputils idn
-
-# See bug #504200
-sys-devel/gcc sanitize
-
-# These cause collisions with <libintl.h>
-# even with --without-included-gettext
-sys-devel/gettext nls
-sys-fs/e2fsprogs nls
-
-# bash-malloc relies on sbrk which is implemented
-# as a fail-only stub in musl. breaks horribly if enabled.
-# bash: xmalloc: locale.c:81: cannot allocate 18 bytes (0 bytes allocated)
-app-shells/bash mem-scramble
diff --git a/profiles/default/linux/musl/packages b/profiles/default/linux/musl/packages
deleted file mode 100644
index 8e9700f13e8f..000000000000
--- a/profiles/default/linux/musl/packages
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-*app-misc/pax-utils
-*sys-apps/sandbox
--*sys-apps/man-pages
diff --git a/profiles/default/linux/musl/packages.build b/profiles/default/linux/musl/packages.build
deleted file mode 100644
index c07961aa76f7..000000000000
--- a/profiles/default/linux/musl/packages.build
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2014 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# This file lists extra packages needed to build for
-# a stage 1 based on this profile.
-
-dev-util/pkgconf
-sys-apps/attr
-sys-apps/sandbox
-dev-python/pyxattr
diff --git a/profiles/default/linux/musl/parent b/profiles/default/linux/musl/parent
deleted file mode 100644
index 2348d8d17b95..000000000000
--- a/profiles/default/linux/musl/parent
+++ /dev/null
@@ -1,3 +0,0 @@
-../../../arch/base
-../../../base
-..
diff --git a/profiles/default/linux/musl/use.force b/profiles/default/linux/musl/use.force
deleted file mode 100644
index cf1d9c0d3ca4..000000000000
--- a/profiles/default/linux/musl/use.force
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-elibc_musl
-
diff --git a/profiles/default/linux/musl/use.mask b/profiles/default/linux/musl/use.mask
deleted file mode 100644
index ce9f2fcf95c8..000000000000
--- a/profiles/default/linux/musl/use.mask
+++ /dev/null
@@ -1,10 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
--elibc_musl
-elibc_glibc
-
-# video cards that work on musl
--video_cards_i915
--video_cards_intel
--video_cards_virtualbox
diff --git a/profiles/hardened/linux/musl/mips/mipsel/eapi b/profiles/default/linux/ppc64le/17.0/desktop/systemd/eapi
similarity index 100%
rename from profiles/hardened/linux/musl/mips/mipsel/eapi
rename to profiles/default/linux/ppc64le/17.0/desktop/systemd/eapi
diff --git a/profiles/default/linux/ppc64le/17.0/desktop/systemd/merged-usr/eapi b/profiles/default/linux/ppc64le/17.0/desktop/systemd/merged-usr/eapi
new file mode 100644
index 000000000000..7ed6ff82de6b
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/desktop/systemd/merged-usr/eapi
@@ -0,0 +1 @@
+5
diff --git a/profiles/default/linux/ppc64le/17.0/desktop/systemd/merged-usr/parent b/profiles/default/linux/ppc64le/17.0/desktop/systemd/merged-usr/parent
new file mode 100644
index 000000000000..c8b1675247c9
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/desktop/systemd/merged-usr/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../../features/merged-usr
diff --git a/profiles/default/linux/ppc64le/17.0/desktop/systemd/parent b/profiles/default/linux/ppc64le/17.0/desktop/systemd/parent
new file mode 100644
index 000000000000..7e061533c151
--- /dev/null
+++ b/profiles/default/linux/ppc64le/17.0/desktop/systemd/parent
@@ -0,0 +1,2 @@
+..
+../../../../../../targets/systemd
diff --git a/profiles/desc/l10n.desc b/profiles/desc/l10n.desc
index e50db4be3262..8507b4ecd5b2 100644
--- a/profiles/desc/l10n.desc
+++ b/profiles/desc/l10n.desc
@@ -56,7 +56,9 @@ cy - Welsh
 da - Danish
 de - German
 de-1901 - German (traditional orthography)
+de-AT - German (Austria)
 de-CH - German (Switzerland)
+de-DE - German (Germany)
 dgo - Dogri (individual language)
 doi - Dogri (macrolanguage)
 dsb - Lower Sorbian
diff --git a/profiles/hardened/deprecated b/profiles/hardened/deprecated
deleted file mode 100644
index 4c4fb270ad52..000000000000
--- a/profiles/hardened/deprecated
+++ /dev/null
@@ -1,5 +0,0 @@
-
-Note that the hardened/arches profiles have been deprecated in
-favor of the hardened/linux/arches profiles.  Please use a supported
-profile which you can list using "eselect profile list" and select
-with "eselect profile set #".
diff --git a/profiles/hardened/linux/musl/make.defaults b/profiles/hardened/linux/musl/make.defaults
deleted file mode 100644
index 1212f635f54f..000000000000
--- a/profiles/hardened/linux/musl/make.defaults
+++ /dev/null
@@ -1,5 +0,0 @@
-# Copyright 1999-2017 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-USE="${USE} hardened pic -jit -orc"
-BOOTSTRAP_USE="${BOOTSTRAP_USE} hardened pic -jit -orc"
diff --git a/profiles/hardened/linux/musl/mips/mipsel/parent b/profiles/hardened/linux/musl/mips/mipsel/parent
deleted file mode 100644
index c3e31b297154..000000000000
--- a/profiles/hardened/linux/musl/mips/mipsel/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../../default/linux/musl/mips/mipsel
-..
diff --git a/profiles/hardened/linux/musl/mips/parent b/profiles/hardened/linux/musl/mips/parent
deleted file mode 100644
index 506bb45139d0..000000000000
--- a/profiles/hardened/linux/musl/mips/parent
+++ /dev/null
@@ -1,2 +0,0 @@
-../../../../default/linux/musl/mips
-..
diff --git a/profiles/hardened/linux/musl/package.use.mask b/profiles/hardened/linux/musl/package.use.mask
deleted file mode 100644
index ce38400b406e..000000000000
--- a/profiles/hardened/linux/musl/package.use.mask
+++ /dev/null
@@ -1,6 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-# Matthias Maier <tamiko@genoto.org> (2017-05-11)
-# masked in base, unmask for hardened/musl/
-sys-devel/gcc -pie
diff --git a/profiles/hardened/linux/musl/use.force b/profiles/hardened/linux/musl/use.force
deleted file mode 100644
index e2d7cf05ec5c..000000000000
--- a/profiles/hardened/linux/musl/use.force
+++ /dev/null
@@ -1,8 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation.
-# Distributed under the terms of the GNU General Public License v2
-
-elibc_musl
-
-# Make sure people don't accidentally turn of ssp/pie in important packages.
-pie
-ssp
diff --git a/profiles/hardened/linux/musl/use.mask b/profiles/hardened/linux/musl/use.mask
deleted file mode 100644
index a98fea1d4e7b..000000000000
--- a/profiles/hardened/linux/musl/use.mask
+++ /dev/null
@@ -1,13 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
--elibc_musl
-elibc_glibc
-
--hardened
-
-# precompiled headers are not compat with ASLR.
-pch
-
-# profile are incompatible when linking with pie
-profile
diff --git a/profiles/package.mask b/profiles/package.mask
index 4f72cd8393b6..9dff783deec5 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -69,10 +69,6 @@ x11-themes/e-flat-theme
 # version is broken. Removal in 30 days. #865103
 media-fonts/source-pro
 
-# Stephan Hartmannr <sultan@gentoo.org> (2022-09-12)
-# Unpatched security vulerabilities, bug #868156, bug #868354.
-www-client/chromium-bin
-
 # Mike Gilbert <floppym@gentoo.org> (2022-09-12)
 # repoman is no longer maintained and has been removed from the portage
 # git repository. Please use dev-util/pkgcheck and dev-util/pkgdev instead.
diff --git a/profiles/profiles.desc b/profiles/profiles.desc
index 88e3e5cf2a5c..d5338d2db472 100644
--- a/profiles/profiles.desc
+++ b/profiles/profiles.desc
@@ -246,6 +246,8 @@ ppc64		default/linux/ppc64le/17.0/desktop/gnome/systemd/merged-usr	dev
 ppc64		default/linux/ppc64le/17.0/desktop/plasma			stable
 ppc64		default/linux/ppc64le/17.0/desktop/plasma/systemd		stable
 ppc64		default/linux/ppc64le/17.0/desktop/plasma/systemd/merged-usr	dev
+ppc64		default/linux/ppc64le/17.0/desktop/systemd			stable
+ppc64		default/linux/ppc64le/17.0/desktop/systemd/merged-usr		dev
 ppc64		default/linux/ppc64le/17.0/systemd				stable
 ppc64		default/linux/ppc64le/17.0/systemd/merged-usr			dev
 ppc64		default/linux/ppc64le/17.0/developer				exp
@@ -336,10 +338,10 @@ arm		default/linux/arm/17.0/musl/armv7a/hardened/selinux	exp
 arm64		default/linux/arm64/17.0/musl				exp
 arm64		default/linux/arm64/17.0/musl/hardened			exp
 arm64		default/linux/arm64/17.0/musl/hardened/selinux		exp
-mips		default/linux/musl/mips					exp
-mips		hardened/linux/musl/mips				exp
-mips		default/linux/musl/mips/mipsel				exp
-mips		hardened/linux/musl/mips/mipsel				exp
+mips		default/linux/mips/17.0/musl/o32			exp
+mips		default/linux/mips/17.0/musl/n64			exp
+mips		default/linux/mips/17.0/musl/mipsel/o32			exp
+mips		default/linux/mips/17.0/musl/mipsel/n64			exp
 riscv		default/linux/riscv/20.0/rv64gc/lp64d/musl		exp
 riscv		default/linux/riscv/20.0/rv64gc/lp64/musl		exp
 x86		default/linux/x86/17.0/musl				exp
diff --git a/profiles/updates/3Q-2022 b/profiles/updates/3Q-2022
index 5b6de63728a9..1cc2a9bd58d9 100644
--- a/profiles/updates/3Q-2022
+++ b/profiles/updates/3Q-2022
@@ -16,3 +16,4 @@ move app-admin/ansible-base app-admin/ansible-core
 slotmove =dev-ruby/rack-test-2.0.2 1.0 2
 move app-office/gnome-todo app-office/endeavour
 move dev-python/python-levenshtein dev-python/Levenshtein
+move mail-mta/protonmail-bridge mail-mta/proton-mail-bridge
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index f0ec8c1152b6..317ec4260acb 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -1764,6 +1764,7 @@ dev-lang/rust:nightly - Enable nightly (UNSTABLE) features (NOTE: it does not in
 dev-lang/rust:parallel-compiler - Build a multi-threaded rustc (experimental, not tested by upstream)
 dev-lang/rust:profiler - Build the profiler runtime and rust-demangler tool (needed for '-C profile-generate' or '-C instrument-coverage' codegen opts)
 dev-lang/rust:rls - Install rls, Rust Language Server (used with IDEs supporting RLS protocol)
+dev-lang/rust:rust-analyzer - Install rust-analyzer, A Rust compiler front-end for IDEs (like rls)
 dev-lang/rust:rust-src - Install rust-src, needed by developer tools and for build-std (cross)
 dev-lang/rust:rustfmt - Install rustfmt, Rust code formatter
 dev-lang/rust:system-bootstrap - Bootstrap using installed rust compiler
@@ -1771,6 +1772,7 @@ dev-lang/rust:system-llvm - Use the system LLVM installation
 dev-lang/rust:wasm - Build support for the wasm32-unknown-unknown target
 dev-lang/rust-bin:clippy - Install clippy, Rust code linter
 dev-lang/rust-bin:rls - Install rls, Rust Language Server (used with IDEs supporting RLS protocol)
+dev-lang/rust-bin:rust-analyzer - Install rust-analyzer, A Rust compiler front-end for IDEs (like rls)
 dev-lang/rust-bin:rust-src - Install rust-src, needed by developer tools and for build-std (cross)
 dev-lang/rust-bin:rustfmt - Install rustfmt, Rust code formatter
 dev-lang/scala:binary - Install from (Gentoo-compiled) binary instead of building from sources. Set this when you run out of memory during build.
@@ -2987,6 +2989,7 @@ games-action/minetest:redis - Enable redis backend via dev-libs/hiredis
 games-action/minetest:server - Build Minetest server
 games-action/minetest:spatial - Enable SpatialIndex AreaStore backend
 games-action/polymc:lto - Enable link-time optimization
+games-action/polymc:qt6 - Build with Qt6 support instead of the default Qt5
 games-action/supermariowar:server - Compile and install Super Mario War server files
 games-action/supertuxkart:nettle - Use dev-libs/nettle crypto backend
 games-action/supertuxkart:recorder - Enable recording with media-libs/libopenglrecorder
@@ -3073,6 +3076,8 @@ games-emulation/mupen64plus-core:new-dynarec - Enable new experimental dynamic r
 games-emulation/mupen64plus-core:opencv - Support video capture via media-libs/opencv
 games-emulation/mupen64plus-core:osd - Overlay emulator messages using on-screen-display
 games-emulation/mupen64plus-video-glide64mk2:hires - Support hi-resolution textures (requires dev-libs/boost)
+games-emulation/pcsx2:qt6 - Add support for the Qt 6 application and UI framework
+games-emulation/pcsx2:vulkan - Enable support for Vulkan
 games-emulation/pcsxr:archive - Support compressed files (via libarchive)
 games-emulation/pcsxr:ccdda - Support compressed CDDA (requires ffmpeg)
 games-emulation/pcsxr:cdio - Use libcdio for CD support
@@ -4580,12 +4585,12 @@ media-sound/csound:dssi - Build the DSSI opcodes
 media-sound/csound:portmidi - Build the PortMIDI I/O module
 media-sound/csound:samples - Install the HRTF datafiles for use with hrtfmove, hrtfmove2, hrtfstat, hrtfearly, and hrtfreverb
 media-sound/csound:utils - Build stand-alone executables for utilities that can also be used via `csound -U`
-media-sound/darkice:aacplus - AAC+ encoding via media-libs/libaacplus
 media-sound/darkice:twolame - Build with twolame support
 media-sound/deadbeef:converter - File format converter
 media-sound/deadbeef:cover - Support for cover art
 media-sound/deadbeef:hotkeys - Keyboard shortcuts support
 media-sound/deadbeef:lastfm - last.fm/AudioScrobbler protocol support
+media-sound/deadbeef:libsamplerate - Support the Secret Rabbit Code resampler
 media-sound/deadbeef:notify - Desktop notifications support
 media-sound/deadbeef:nullout - Dummy output driver
 media-sound/deadbeef:sc68 - Atari ST and Amiga music player
diff --git a/sci-biology/Manifest.gz b/sci-biology/Manifest.gz
index 797517008228..ab140cdda8b7 100644
Binary files a/sci-biology/Manifest.gz and b/sci-biology/Manifest.gz differ
diff --git a/sci-biology/phred/phred-071220-r2.ebuild b/sci-biology/phred/phred-071220-r2.ebuild
index 9d7ff9a1f6c8..2d33df654a1b 100644
--- a/sci-biology/phred/phred-071220-r2.ebuild
+++ b/sci-biology/phred/phred-071220-r2.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="A base caller for Sanger DNA sequencing"
 HOMEPAGE="http://phrap.org/phredphrapconsed.html"
-SRC_URI="phred-dist-071220.b-acd.tar.gz"
+SRC_URI="${PN}-dist-${PV}.b-acd.tar.gz"
 S="${WORKDIR}"
 
 LICENSE="phrap"
diff --git a/sci-electronics/Manifest.gz b/sci-electronics/Manifest.gz
index 8660bbf61dc4..51b8b468baf3 100644
Binary files a/sci-electronics/Manifest.gz and b/sci-electronics/Manifest.gz differ
diff --git a/sci-electronics/petrify/petrify-4.2-r1.ebuild b/sci-electronics/petrify/petrify-4.2-r1.ebuild
index 4620813921eb..ee66b2212e7f 100644
--- a/sci-electronics/petrify/petrify-4.2-r1.ebuild
+++ b/sci-electronics/petrify/petrify-4.2-r1.ebuild
@@ -1,11 +1,11 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
 DESCRIPTION="Synthesize Petri nets into asynchronous circuits"
 HOMEPAGE="http://www.lsi.upc.edu/~jordicf/petrify/"
-SRC_URI="http://www.lsi.upc.edu/~jordicf/petrify/distrib/petrify-4.2-linux.tgz"
+SRC_URI="http://www.lsi.upc.edu/~jordicf/petrify/distrib/${P}-linux.tgz"
 S="${WORKDIR}"/${PN}
 
 LICENSE="Old-MIT"
diff --git a/sci-geosciences/Manifest.gz b/sci-geosciences/Manifest.gz
index f75ec0054e67..63793886755c 100644
Binary files a/sci-geosciences/Manifest.gz and b/sci-geosciences/Manifest.gz differ
diff --git a/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild b/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild
index 14c8c92d67cb..dd460de1633c 100644
--- a/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild
+++ b/sci-geosciences/gshhs/gshhs-1.13-r1.ebuild
@@ -7,7 +7,7 @@ inherit toolchain-funcs
 
 DESCRIPTION="Global Self-consistent, Hierarchical, High-resolution Shoreline programs"
 HOMEPAGE="https://www.ngdc.noaa.gov/mgg/shorelines/gshhs.html"
-SRC_URI="ftp://ftp.soest.hawaii.edu/pwessel/gshhs/gshhs_1.13_src.zip"
+SRC_URI="ftp://ftp.soest.hawaii.edu/pwessel/gshhs/gshhs_${PV}_src.zip"
 S="${WORKDIR}/${PN}"
 
 LICENSE="GPL-2"
diff --git a/sci-geosciences/xtide/Manifest b/sci-geosciences/xtide/Manifest
index f3d722d6a226..13d163d93a6e 100644
--- a/sci-geosciences/xtide/Manifest
+++ b/sci-geosciences/xtide/Manifest
@@ -1,2 +1 @@
-DIST xtide-2.15.1.tar.bz2 710182 BLAKE2B 31c336c16d855615bb3b33571f71cf47ff4ae524c1ca987e4b29a1c0a88844d9de7fa9f0340a07360c6e0299826e47d0c448dec074a3755a929300cc72cb6462 SHA512 3951d5c797981fd4a0396d21830241a700d0f6c7a21694addf7df14f4b3864fbeecb6d352f075a7ccd1c15f8c6b7ddee6ddd501a2699165a9432e8e8dcc0a448
 DIST xtide-2.15.5.tar.xz 574972 BLAKE2B b03a2d0b4c2616b0a81fc745a7781dba74e0d7977c84790ab5fc3aebaf3a04ae51fa9bd5b79166195e0b6cbe736efa3e31b5203a25bb6f60df385c0f357294f9 SHA512 314c3d256a873ae5862e83050937c72983e5ac0bc9dc2c1a9264d0285f73f681eae1451706c5c6c2829d980423044e83adff3fcf8975b33eb03eed8cb72f1f43
diff --git a/sci-geosciences/xtide/xtide-2.15.1-r2.ebuild b/sci-geosciences/xtide/xtide-2.15.1-r2.ebuild
deleted file mode 100644
index 5cd9b00baedf..000000000000
--- a/sci-geosciences/xtide/xtide-2.15.1-r2.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-inherit desktop gnome2-utils
-
-DESCRIPTION="XTide provides tide and current predictions in a wide variety of formats"
-HOMEPAGE="https://flaterco.com/xtide/"
-SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-DEPEND="
-	media-libs/libpng:0=
-	sci-geosciences/gpsd
-	>=sci-geosciences/libtcd-2.2.5_p2
-	x11-libs/libX11
-	x11-libs/libXaw3d[unicode(+)]
-	x11-libs/libXaw3dXft
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXt
-"
-RDEPEND="${DEPEND}
-	media-fonts/font-schumacher-misc
-"
-
-src_install() {
-	default
-
-	echo 'HFILE_PATH=/usr/share/harmonics' > 50xtide_harm
-	doenvd 50xtide_harm
-
-	newicon -s 48 iconsrc/icon_48x48_orig.png ${PN}.png
-	make_desktop_entry ${PN} 'Tide prediction' ${PN} 'Science'
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-pkg_postinst() {
-	gnome2_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_icon_cache_update
-}
diff --git a/sci-geosciences/xtide/xtide-2.15.1-r3.ebuild b/sci-geosciences/xtide/xtide-2.15.1-r3.ebuild
deleted file mode 100644
index 60d326916506..000000000000
--- a/sci-geosciences/xtide/xtide-2.15.1-r3.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop xdg
-
-DESCRIPTION="XTide provides tide and current predictions in a wide variety of formats"
-HOMEPAGE="https://flaterco.com/xtide/"
-SRC_URI="ftp://ftp.flaterco.com/xtide/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-DEPEND="media-libs/libpng:=
-	sci-geosciences/gpsd
-	>=sci-geosciences/libtcd-2.2.5_p2
-	x11-libs/libX11
-	x11-libs/libXaw3d[unicode(+)]
-	x11-libs/libXaw3dXft
-	x11-libs/libXft
-	x11-libs/libXpm
-	x11-libs/libXt"
-RDEPEND="${DEPEND}
-	media-fonts/font-schumacher-misc"
-
-src_install() {
-	default
-
-	echo 'HFILE_PATH=/usr/share/harmonics' > 50xtide_harm || die
-	doenvd 50xtide_harm
-
-	newicon -s 48 iconsrc/icon_48x48_orig.png ${PN}.png
-	make_desktop_entry ${PN} 'Tide prediction' ${PN} 'Science'
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/sci-geosciences/xtide/xtide-2.15.5.ebuild b/sci-geosciences/xtide/xtide-2.15.5.ebuild
index 28ed3a79b08c..bda5dbc7ee96 100644
--- a/sci-geosciences/xtide/xtide-2.15.5.ebuild
+++ b/sci-geosciences/xtide/xtide-2.15.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://flaterco.com/files/xtide/${P}.tar.xz"
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 DEPEND="media-libs/libpng:=
 	sci-geosciences/gpsd:=
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index a0944319eba6..ff949a765922 100644
Binary files a/sci-libs/Manifest.gz and b/sci-libs/Manifest.gz differ
diff --git a/sci-libs/hipBLAS/Manifest b/sci-libs/hipBLAS/Manifest
index 55444b3ae0e5..61d6dfad8aa5 100644
--- a/sci-libs/hipBLAS/Manifest
+++ b/sci-libs/hipBLAS/Manifest
@@ -1,2 +1,3 @@
 DIST hipBLAS-4.3.0.tar.gz 428016 BLAKE2B 5a86f7a59aaed9cd6219779546135080f4c583a010f47b902f25545046c50451cd48e570b58c9c3721d735f3ab54295d5eddc61fecc01236e960e37fc87761c8 SHA512 128ee56d6db3d19c83b20fbc315eae8de6ee52aae6c2c5727351bab76c14d9131318cd49a6bcc724f5ec73485783058618bca4dddf96b05cd2f3a772c04f469f
 DIST hipBLAS-5.0.2.tar.gz 475009 BLAKE2B e7cb123c4ce08a8423f48816fe9248d580df59d089379c3c71eba8725470482cde591254cb2c4af7def390c702fdf6e6ddbe4fda70a6bc4579809c3e00e7d088 SHA512 40bccf8845467d14d614d2eba5482668167fa0488f118e30bbf4cf5fad3aea5e591f89ae2ae63bcb898cff624812d2f94572c18b8ed3d55d4bb254a440790c21
+DIST hipBLAS-5.1.3.tar.gz 526704 BLAKE2B d32d7029ea910c341e00dccab1ee9ab984518368cf38524f2264bb808cc1242b3d57db283937650f54460cb01174ec90f02c4bd66866cba4be5d0a1855814f0e SHA512 41dbc86b7ea53e7c0f1d629130f90b719f864ceddae972f1c68911e97b6233286f0c22c0fcfce049ae7db73a1ed41bdaf730040c72f1790fca367362c14ac707
diff --git a/sci-libs/hipBLAS/hipBLAS-5.1.3.ebuild b/sci-libs/hipBLAS/hipBLAS-5.1.3.ebuild
new file mode 100644
index 000000000000..3ac3a0ae1200
--- /dev/null
+++ b/sci-libs/hipBLAS/hipBLAS-5.1.3.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+DESCRIPTION="ROCm BLAS marshalling library"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipBLAS"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipBLAS/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	sci-libs/rocSOLVER:${SLOT}[${ROCM_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/hipBLAS-rocm-${PV}"
+
+src_prepare() {
+	sed -e "s:<INSTALL_INTERFACE\:include:<INSTALL_INTERFACE\:include/hipblas/:" -i library/src/CMakeLists.txt || die
+	sed -e "/PREFIX hipblas/d" -i library/src/CMakeLists.txt || die
+	sed -e "/rocm_install_symlink_subdir( hipblas )/d" -i library/src/CMakeLists.txt || die
+	sed -e "s:hipblas/include:include/hipblas:" -i library/src/CMakeLists.txt || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DBUILD_CLIENTS_TESTS=OFF  # currently hipBLAS is a wrapper of rocBLAS which has tests, so no need to perform test here
+		-DBUILD_CLIENTS_BENCHMARKS=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/hipCUB/Manifest b/sci-libs/hipCUB/Manifest
index 4038ecb82108..72e40f7df9d6 100644
--- a/sci-libs/hipCUB/Manifest
+++ b/sci-libs/hipCUB/Manifest
@@ -1,3 +1,4 @@
 DIST hipCUB-4.0.0.tar.gz 137513 BLAKE2B b7ef4d53037fba04771162ae8993def648f5e1401654286ffc6987bbb4b25baa1b1b14bc37035e1afe46eeffe3e564f244e339cdfd0e5a242574d248bf4683db SHA512 e778b94c86e09bf3b0bc043fb15ed8725387b875e8631a7e8599aee8da2d8085190effc9681d742fc0d286cc0c20762341f1f24699c8a52e9734611c716530d5
 DIST hipCUB-4.3.0.tar.gz 154097 BLAKE2B 68a46f1416c969e4bf8e245c2aa8aee626f1e8089182ffb8f5090d540efe98606a616499d52b14da3733b3a6f4da690ea1718ea58fb6166351f4b4807f1b8228 SHA512 7c0abcf034d885615a9a4f05e6ca906e99b0ffbe36ae3d4b9d9d79b01d21077dc86be659548b45dad8498b84bec24dc0a5be78040c1ab21ca458d22fa7fae43d
 DIST hipCUB-5.0.2.tar.gz 243032 BLAKE2B 68256c0868bd23dbd78075ab286fc0738dc90f330a7e99186803e7920b3366f5608986dd9e3f4c5a045f9ec3f2461a66ab5b708d5d1d3fc748d042dd929a7993 SHA512 ae4d55fcf513eb5dd1316e335a0de30f6098eba70e877b41905bc59f3fb500ad9a46a28de77b74b914a15ffc38ad5c5f4dbdf36139505c26b94c43ffa5c90e01
+DIST hipCUB-5.1.3.tar.gz 278021 BLAKE2B f30e567370fea80ef63a455c2c27b3f4ff241e7e405688fa4dc33d1e0ce3dffb016a1a1523b20613a7963bff061758eac0c0d110243a9a6cedbc100bb087d7d4 SHA512 dd3ca341b78cf6985ba723feeeb560c0503ab283b63067e9a5e68d12ad42f752a7f56fd60f0f0c26c2853538853e09a102cfc6006c18c31c3162fa7b536ffb9f
diff --git a/sci-libs/hipCUB/hipCUB-5.1.3.ebuild b/sci-libs/hipCUB/hipCUB-5.1.3.ebuild
new file mode 100644
index 000000000000..4588711d36b2
--- /dev/null
+++ b/sci-libs/hipCUB/hipCUB-5.1.3.ebuild
@@ -0,0 +1,71 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="Wrapper of rocPRIM or CUB for GPU parallel primitives"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipCUB"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipCUB/archive/rocm-${PV}.tar.gz -> hipCUB-${PV}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}]
+	benchmark? ( dev-cpp/benchmark )
+	test? ( dev-cpp/gtest )
+"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/hipCUB-rocm-${PV}"
+
+PATCHES="${FILESDIR}/${PN}-4.3.0-add-memory-header.patch"
+
+src_prepare() {
+	sed -e "/PREFIX hipcub/d" \
+		-e "/DESTINATION/s:hipcub/include/:include/:" \
+		-e "/rocm_install_symlink_subdir(hipcub)/d" \
+		-e "/<INSTALL_INTERFACE/s:hipcub/include/:include/hipcub/:" -i hipcub/CMakeLists.txt || die
+
+	sed	-e "s:\${ROCM_INSTALL_LIBDIR}:\${CMAKE_INSTALL_LIBDIR}:" -i cmake/ROCMExportTargetsHeaderOnly.cmake || die
+
+	# disable downloading googletest and googlebenchmark
+	sed  -r -e '/Downloading/{:a;N;/\n *\)$/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	# remove GIT dependency
+	sed  -r -e '/find_package\(Git/{:a;N;/\nendif/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	if use benchmark; then
+		sed -e "/get_filename_component/s,\${BENCHMARK_SOURCE},${PN}_\${BENCHMARK_SOURCE}," \
+			-e "/add_executable/a\  install(TARGETS \${BENCHMARK_TARGET})" -i benchmark/CMakeLists.txt || die
+	fi
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	MAKEOPTS="-j1" cmake_src_test
+}
diff --git a/sci-libs/hipFFT/Manifest b/sci-libs/hipFFT/Manifest
index ea28dc7b9ab8..12b43d91d6cd 100644
--- a/sci-libs/hipFFT/Manifest
+++ b/sci-libs/hipFFT/Manifest
@@ -1,4 +1,5 @@
 DIST hipFFT-rocm-4.3.0.tar.gz 83355 BLAKE2B ee99b4cb685cbb846084d8a7c77982d75cf0d1597f9270260284bb26ae00702a31dd4d5ad9ae1885ab631c390f65c0f584f302be189701ba4f0dd9061b1bba5a SHA512 0d3100b054ff485eae06b13b8c568626b8e3a3286f36012c5a5f9bb4918e03c30c687a2714049bd797f6c3973f1730ad0936f02ad044cde1663c9c5750bbcf40
 DIST hipFFT-rocm-5.0.2.tar.gz 88405 BLAKE2B c3a2e5e029d7d91c7cdc1c4e2ddec71c17df0cf2d863c81ef263eea3734488fcc31795ea681b27dffd04c0833c99df252256c3ffacfbf29305fa1ba5b8bd4efa SHA512 4fdc080479f1094e9ce92acc0eceb630a6a6ce711ffdc5ffef58d61baf23e8ea9ec45a922d798fb17a7724425d5785451f5f114bc7db40ebbfb50359b56456a6
+DIST hipFFT-rocm-5.1.3.tar.gz 89397 BLAKE2B 3c29d5d660e9f3db8afd8c9e524296c29f50faf06a5d6a58ec628b5cc5ddb47ac2b99f137c7bc5090a311189b44014ea2f6f1f7547d22506f5ba18f837fbeb68 SHA512 8d7a90630cd8bfeade9cb026e45b6b6c1ab9c96dba424559a7ced8c881cd45c1cb06d3f7e82c8e6558e4ccb8bb41b6278842057a0cf0957b0644b1139f2c9706
 DIST rocFFT-4.3.0.tar.gz 840748 BLAKE2B 236a5faa930751d35e501a9a32ecc8b4075448ef21a0ffb0bb7ec04f4ed1cb67b908aa153b5b424e0823d3e306cf375d7c01a77d687220ed79de6d374037e003 SHA512 765d41e4018a04a53e847c03de80eec830d3e8766187fb8cb493624afa2673175347c16e6eeeebd4ad7d88bb866e58f7e572708f22238723c710b98565a0cd3d
 DIST rocFFT-5.0.2.tar.gz 837508 BLAKE2B b74d0c6edd7b232f775bffefbca829d88d9d7cd9108c27a0698f45d7fe2760d40463bcda8c710e923874b3bbfb1e83e0fe8622db4dfa28afb29392b3e135e9a5 SHA512 d6810a92a10a27dbcac8a04e8fcd56c7fa198f208da626d8938d5ff28b6ab8b89a058c7a56b5666464165e8f6bd7c4c031a94315625a3613eb02a9b8eccd9eb9
diff --git a/sci-libs/hipFFT/files/hipFFT-5.1.3-gentoo-install-locations.patch b/sci-libs/hipFFT/files/hipFFT-5.1.3-gentoo-install-locations.patch
new file mode 100644
index 000000000000..fe395de42f86
--- /dev/null
+++ b/sci-libs/hipFFT/files/hipFFT-5.1.3-gentoo-install-locations.patch
@@ -0,0 +1,29 @@
+Fix install location to meet FHS, and remove useless symlink
+===================================================================
+--- hipFFT-rocm-5.1.3.orig/library/CMakeLists.txt
++++ hipFFT-rocm-5.1.3/library/CMakeLists.txt
+@@ -81,7 +81,7 @@ target_include_directories( hipfft
+   PUBLIC  $<BUILD_INTERFACE:${CMAKE_SOURCE_DIR}/library/include>
+   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+   $<BUILD_INTERFACE:${HIP_INCLUDE_DIRS}>
+-  $<INSTALL_INTERFACE:include>
++  $<INSTALL_INTERFACE:include/hipfft>
+   ${HIP_INCLUDE_DIRS}
+   )
+
+@@ -142,13 +142,11 @@ if( ROCM_FOUND )
+   rocm_install_targets( TARGETS hipfft
+     INCLUDE
+     ${CMAKE_SOURCE_DIR}/library/include
+-    ${CMAKE_BINARY_DIR}/include
+-    PREFIX hipfft )
++    ${CMAKE_BINARY_DIR}/include )
+   rocm_export_targets( TARGETS hip::hipfft
+-    PREFIX hipfft
++    PREFIX .
+     DEPENDS PACKAGE hip
+     NAMESPACE hip:: )
+-  rocm_install_symlink_subdir( hipfft )
+
+   # Package specific CPACK vars
+   if( NOT BUILD_WITH_LIB STREQUAL "CUDA" )
diff --git a/sci-libs/hipFFT/hipFFT-5.1.3.ebuild b/sci-libs/hipFFT/hipFFT-5.1.3.ebuild
new file mode 100644
index 000000000000..216d15841546
--- /dev/null
+++ b/sci-libs/hipFFT/hipFFT-5.1.3.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="CU / ROCM agnostic hip FFT implementation"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipFFT"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipFFT/archive/refs/tags/rocm-${PV}.tar.gz -> hipFFT-rocm-${PV}.tar.gz"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+RESTRICT="test"
+
+RDEPEND="dev-util/hip:${SLOT}
+	sci-libs/rocFFT:${SLOT}[${ROCM_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND=""
+
+S="${WORKDIR}/hipFFT-rocm-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-5.1.3-gentoo-install-locations.patch"
+	"${FILESDIR}/${PN}-5.0.2-remove-git-dependency.patch"
+	"${FILESDIR}/${PN}-4.3.0-add-complex-header.patch"
+)
+
+src_prepare() {
+	sed -e "/CMAKE_INSTALL_LIBDIR/d" -i CMakeLists.txt || die
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
+		-DCMAKE_INSTALL_INCLUDEDIR="include/hipfft"
+		-DCMAKE_MODULE_PATH="${EPREFIX}/usr/$(get_libdir)/cmake"
+		-DHIP_ROOT_DIR="${EPREFIX}/usr"
+		-DBUILD_CLIENTS_TESTS=OFF
+		-DBUILD_CLIENTS_RIDER=OFF
+	)
+
+	cmake_src_configure
+}
diff --git a/sci-libs/hipSPARSE/Manifest b/sci-libs/hipSPARSE/Manifest
index be5066e946d0..8c0208fe0bf2 100644
--- a/sci-libs/hipSPARSE/Manifest
+++ b/sci-libs/hipSPARSE/Manifest
@@ -1,6 +1,7 @@
 DIST hipSPARSE-4.0.tar.gz 271756 BLAKE2B d774632c145a842c5dd97df6e0c1c3b3fc6986a5d3e000564b3b9b4f8a9c72bc01b360baf93a82f8a70a85b8ee1833f4e767a48021d3869391000551ed00e614 SHA512 78c9501e6f9f8b0727d2f2207814048f8c784b2b06797559d6f639244cb1439e9218a46c582a6b337b15791519f0bcb9e0f42c17bff00c096c797c96cc7660ae
 DIST hipSPARSE-4.3.tar.gz 349357 BLAKE2B e0da23ba8f39af276842eb9bc45232a0dbe7f40197215397bf2d6ae454061626aedb698701703a03a60487dff2b427d54fa3e0fd36db69fcccf9868d0e5a5097 SHA512 b7302ae4205d5c0e8fd8017e345f7677e55a6ea82741a85f77b2af3f669d63013e12435201f9e0ca4b31d3c4af2cb1630775bf101a69338be2df621d68504d60
 DIST hipSPARSE-5.0.tar.gz 440916 BLAKE2B 4011dda3d22b373848735bab0570421fed786bd4d9cff992d3eaaf70b84c00334cec6a8fe3bdd2b9cd5241d837522b778b3462064426195db68930af89c21984 SHA512 567c6b05844143834efbb6f5b7a97ec93f349b97ec6bea55e780cb2480cf80aafbbf15b06f83af3d73ff8ab44c51cbe26ada27b4b398b67dc428c1959c3e7222
+DIST hipSPARSE-5.1.tar.gz 449838 BLAKE2B 7727ecb9fa397e2730cfda4c9367188c37ad201d501b50129994869c6ef15b51cdf2d1f481f19f2f37cf0530f1ec3689c40a9651924f70fabe945d80732df64a SHA512 8b01c01a10b8419d14a532ebccfa5b5b5b5c3f6a6e73f3f0ecee58c7e240d2754485a9da020fe4693df3ef9fc08e5bb09b05396472ccbeebf89bc2635d94eb64
 DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03
 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0
 DIST rocSPARSE_amazon0312.tar.gz 11303646 BLAKE2B 388947a29380253bb5eecb22d3a3b6f3378711044b3fe98d6d2517cd27330f11b3d12fdb96320a2889e139224f1a6a5ad1c455ff8e91a262aa2aadbe16301330 SHA512 aed2d62581763742d9c7faf3dcaf1eaa983caa1e2e7ad4abebe97c5e7c2aec9942e0e32291092b348b60052c92b130e721ec19ed59bda22e1b233ef72ac7d2ff
diff --git a/sci-libs/hipSPARSE/hipSPARSE-5.1.3.ebuild b/sci-libs/hipSPARSE/hipSPARSE-5.1.3.ebuild
new file mode 100644
index 000000000000..5962bd36caa1
--- /dev/null
+++ b/sci-libs/hipSPARSE/hipSPARSE-5.1.3.ebuild
@@ -0,0 +1,96 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake edo rocm toolchain-funcs
+
+DESCRIPTION="ROCm SPARSE marshalling library"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/hipSPARSE"
+# share some test datasets with rocSPARSE
+SRC_URI="https://github.com/ROCmSoftwarePlatform/hipSPARSE/archive/rocm-${PV}.tar.gz -> hipSPARSE-$(ver_cut 1-2).tar.gz
+test? (
+https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> rocSPARSE_amazon0312.tar.gz
+https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> rocSPARSE_Chebyshev4.tar.gz
+https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> rocSPARSE_sme3Dc.tar.gz
+https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> rocSPARSE_webbase-1M.tar.gz
+https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> rocSPARSE_rma10.tar.gz
+https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> rocSPARSE_bibd_22_8.tar.gz
+https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> rocSPARSE_mac_econ_fwd500.tar.gz
+https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> rocSPARSE_mc2depi.tar.gz
+https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> rocSPARSE_scircuit.tar.gz
+https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> rocSPARSE_ASIC_320k.tar.gz
+https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> rocSPARSE_bmwcra_1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> rocSPARSE_nos1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> rocSPARSE_nos2.tar.gz
+https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> rocSPARSE_nos3.tar.gz
+https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> rocSPARSE_nos4.tar.gz
+https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> rocSPARSE_nos5.tar.gz
+https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> rocSPARSE_nos6.tar.gz
+https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> rocSPARSE_nos7.tar.gz
+https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> rocSPARSE_shipsec1.tar.gz
+)"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0"/$(ver_cut 1-2)
+IUSE="test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/rocminfo
+		dev-util/hip
+		sci-libs/rocSPARSE:${SLOT}[${ROCM_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-util/rocm-cmake
+	>=dev-util/cmake-3.22
+	test? ( dev-cpp/gtest )"
+
+S="${WORKDIR}/hipSPARSE-rocm-${PV}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.0.2-remove-matrices-unpacking.patch" )
+
+src_prepare() {
+	sed -e "s/PREFIX hipsparse//" \
+		-e "/<INSTALL_INTERFACE/s,include,include/hipsparse," \
+		-e "s:rocm_install_symlink_subdir(hipsparse):#rocm_install_symlink_subdir(hipsparse):" \
+		-i library/CMakeLists.txt || die
+
+	cmake_src_prepare
+
+	# remove GIT dependency
+	sed -e "/find_package(Git/d" -i cmake/Dependencies.cmake || die
+
+	if use test; then
+		mkdir -p "${BUILD_DIR}"/clients/matrices
+		# compile and use the mtx2bin converter. Do not use any optimization flags!
+		edo $(tc-getCXX) deps/convert.cpp -o deps/convert
+		find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 |
+			while IFS= read -r -d '' mtxfile; do
+				destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).bin
+				ebegin "Converting ${mtxfile} to ${destination}"
+				deps/convert ${mtxfile} ${destination}
+				eend $?
+			done
+	fi
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DHIP_RUNTIME="ROCclr"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DCMAKE_INSTALL_INCLUDEDIR=include/hipsparse
+	)
+
+	cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}"/clients/staging || die
+	edob ./${PN,,}-test
+}
diff --git a/sci-libs/keras/Manifest b/sci-libs/keras/Manifest
index 6bd8df8bd0df..c8a8659e2e4b 100644
--- a/sci-libs/keras/Manifest
+++ b/sci-libs/keras/Manifest
@@ -1,4 +1,5 @@
 DIST bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip 201360 BLAKE2B 0173a8edb17f344b18e42026e2f8a62a1909d4694ab0be83562b6437a3f1ef38889f069269ddd2308b41062e5f375f791be0d2631a8e52ede668203779813b56 SHA512 2ba1dc316d88947c1d17ec67154c052700e3571b8d03370a9f204cf9fe94a1bd58f93a2c4a3c0b02233ee3250053a4c30a4133b5b38745858c1d04be8c9d973f
 DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c
+DIST keras-2.10.0.tar.gz 2250425 BLAKE2B eb05537739cdc81e279b5c400e2e2b77d46f4085e8530fef565bde12414ddccedb44c0b13265106a3353e67c367106e1d341412dc25b32e2221f144a31d76079 SHA512 8682110495a045c2ebc61f31a98d646b88fd9608d5169be78701cf528457ff0d2e39669d885854c14c1e6bebb380b14968957f2a8a34a8a023f8860efc7aeecd
 DIST keras-2.8.0.tar.gz 2001168 BLAKE2B 64e756da102369bd41b176245f7f8184b2376b6fb714485627e30107af552035931c9fcff18d82def5f4e1b83f2eae2fa3d0c18b030986f8d3a53dffbdbb2963 SHA512 a70ae1409761211f3b59d358df4d5abf6bb76b915f5dde90ada5a867aef2831581836d38876bd2e962f3c345f59373bf76a7c21247cef8aeaec45ba1301f787b
 DIST keras-2.9.0.tar.gz 2142884 BLAKE2B 9d90ad998ef7215f9a3ab0f0ac9d035f81023f7049e5c73823a0aa8561ead2f697ff762c225f668f3d9fe376d69a2bfbdf8b137128c915a711cee53d809093d6 SHA512 779828aff9aa31970e7f68b32423e47b81f47d2284d9e9734428c3bc3789e6b0e9ef151315e1cae666b14b1cdc387828ddaf520811250f9ad4fa73cf5c98781d
diff --git a/sci-libs/keras/files/keras-2.10.0-0001-bazel-Use-system-protobuf.patch b/sci-libs/keras/files/keras-2.10.0-0001-bazel-Use-system-protobuf.patch
new file mode 100644
index 000000000000..d7cb39f70e8c
--- /dev/null
+++ b/sci-libs/keras/files/keras-2.10.0-0001-bazel-Use-system-protobuf.patch
@@ -0,0 +1,327 @@
+From bbb2bd19534d6d5aef466dc8707f7c8ad3bab9d8 Mon Sep 17 00:00:00 2001
+From: Jason Zaman <jason@perfinion.com>
+Date: Sun, 14 Nov 2021 17:59:39 -0800
+Subject: [PATCH] bazel: Use system protobuf
+
+---
+ WORKSPACE                |  49 ---------
+ keras/protobuf/BUILD     |   2 +-
+ third_party/BUILD        |   8 +-
+ third_party/protobuf.bzl | 216 +++++++++++++++++++++++++++++++++++++++
+ 4 files changed, 224 insertions(+), 51 deletions(-)
+ create mode 100644 third_party/protobuf.bzl
+
+diff --git a/WORKSPACE b/WORKSPACE
+index 898b5b6d..61282aea 100644
+--- a/WORKSPACE
++++ b/WORKSPACE
+@@ -1,50 +1 @@
+ workspace(name = "org_keras")
+-
+-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+-
+-# Needed by protobuf
+-load("@bazel_tools//tools/build_defs/repo:http.bzl", "http_archive")
+-http_archive(
+-    name = "bazel_skylib",
+-    url = "https://github.com/bazelbuild/bazel-skylib/releases/download/1.0.1/bazel-skylib-1.0.1.tar.gz",
+-    sha256 = "f1c8360c01fcf276778d3519394805dc2a71a64274a3a0908bc9edff7b5aebc8",
+-)
+-load("@bazel_skylib//:workspace.bzl", "bazel_skylib_workspace")
+-bazel_skylib_workspace()
+-
+-# Needed by protobuf
+-http_archive(
+-    name = "six_archive",
+-    build_file = "//third_party:six.BUILD",
+-    sha256 = "d16a0141ec1a18405cd4ce8b4613101da75da0e9a7aec5bdd4fa804d0e0eba73",
+-    strip_prefix = "six-1.12.0",
+-    urls = [
+-        "http://mirror.bazel.build/pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz",
+-        "https://pypi.python.org/packages/source/s/six/six-1.12.0.tar.gz",  # 2018-12-10
+-    ],
+-)
+-
+-bind(
+-    name = "six",
+-    actual = "@six_archive//:six",
+-)
+-
+-http_archive(
+-    name = "com_google_protobuf",
+-    sha256 = "1fbf1c2962af287607232b2eddeaec9b4f4a7a6f5934e1a9276e9af76952f7e0",
+-    strip_prefix = "protobuf-3.9.2",
+-    urls = ["https://github.com/protocolbuffers/protobuf/archive/v3.9.2.tar.gz"],
+-)
+-
+-# ZLIB. Need by com_google_protobuf.
+-http_archive(
+-    name = "zlib",
+-    build_file = "@com_google_protobuf//:third_party/zlib.BUILD",
+-    sha256 = "91844808532e5ce316b3c010929493c0244f3d37593afd6de04f71821d5136d9",
+-    strip_prefix = "zlib-1.2.12",
+-    urls = ["https://zlib.net/zlib-1.2.12.tar.gz"],
+-)
+-
+-
+-load("@com_google_protobuf//:protobuf_deps.bzl", "protobuf_deps")
+-protobuf_deps()
+diff --git a/keras/protobuf/BUILD b/keras/protobuf/BUILD
+index 413dcb74..80133c06 100644
+--- a/keras/protobuf/BUILD
++++ b/keras/protobuf/BUILD
+@@ -1,7 +1,7 @@
+ # Description:
+ #   Contains Keras protobufs
+ 
+-load("@com_google_protobuf//:protobuf.bzl", "py_proto_library")
++load("//third_party:protobuf.bzl", "py_proto_library")
+ 
+ package(
+     default_visibility = [
+diff --git a/third_party/BUILD b/third_party/BUILD
+index 9be54076..9399232f 100644
+--- a/third_party/BUILD
++++ b/third_party/BUILD
+@@ -1,4 +1,5 @@
+ package(
++    default_visibility = ["//visibility:public"],
+     licenses = ["notice"],  # Apache 2.0
+ )
+ 
+@@ -7,4 +8,9 @@ exports_files([
+     "six.BUILD",
+ ])
+ 
+-package(default_visibility = ["//visibility:public"])
++genrule(
++    name = "protoc",
++    outs = ["protoc.bin"],
++    cmd = "ln -s $$(which protoc) $@",
++    executable = 1,
++)
+diff --git a/third_party/protobuf.bzl b/third_party/protobuf.bzl
+new file mode 100644
+index 00000000..3a7ef0a2
+--- /dev/null
++++ b/third_party/protobuf.bzl
+@@ -0,0 +1,216 @@
++def _GetPath(ctx, path):
++    if ctx.label.workspace_root:
++        return ctx.label.workspace_root + "/" + path
++    else:
++        return path
++
++def _IsNewExternal(ctx):
++    # Bazel 0.4.4 and older have genfiles paths that look like:
++    #   bazel-out/local-fastbuild/genfiles/external/repo/foo
++    # After the exec root rearrangement, they look like:
++    #   ../repo/bazel-out/local-fastbuild/genfiles/foo
++    return ctx.label.workspace_root.startswith("../")
++
++def _GenDir(ctx):
++    if _IsNewExternal(ctx):
++        # We are using the fact that Bazel 0.4.4+ provides repository-relative paths
++        # for ctx.genfiles_dir.
++        return ctx.genfiles_dir.path + (
++            "/" + ctx.attr.includes[0] if ctx.attr.includes and ctx.attr.includes[0] else ""
++        )
++
++    # This means that we're either in the old version OR the new version in the local repo.
++    # Either way, appending the source path to the genfiles dir works.
++    return ctx.var["GENDIR"] + "/" + _SourceDir(ctx)
++
++def _SourceDir(ctx):
++    if not ctx.attr.includes:
++        return ctx.label.workspace_root
++    if not ctx.attr.includes[0]:
++        return _GetPath(ctx, ctx.label.package)
++    if not ctx.label.package:
++        return _GetPath(ctx, ctx.attr.includes[0])
++    return _GetPath(ctx, ctx.label.package + "/" + ctx.attr.includes[0])
++
++def _PyOuts(srcs, use_grpc_plugin = False):
++    ret = [s[:-len(".proto")] + "_pb2.py" for s in srcs]
++    if use_grpc_plugin:
++        ret += [s[:-len(".proto")] + "_pb2_grpc.py" for s in srcs]
++    return ret
++
++def _proto_gen_impl(ctx):
++    """General implementation for generating protos"""
++    srcs = ctx.files.srcs
++    deps = []
++    deps += ctx.files.srcs
++    source_dir = _SourceDir(ctx)
++    gen_dir = _GenDir(ctx)
++    if source_dir:
++        import_flags = ["-I" + source_dir, "-I" + gen_dir]
++    else:
++        import_flags = ["-I."]
++
++    for dep in ctx.attr.deps:
++        import_flags += dep.proto.import_flags
++        deps += dep.proto.deps
++    import_flags = depset(import_flags).to_list()
++    deps = depset(deps).to_list()
++
++    args = []
++    if ctx.attr.gen_cc:
++        args += ["--cpp_out=" + gen_dir]
++    if ctx.attr.gen_py:
++        args += ["--python_out=" + gen_dir]
++
++    inputs = srcs + deps
++    tools = [ctx.executable.protoc]
++    if ctx.executable.plugin:
++        plugin = ctx.executable.plugin
++        lang = ctx.attr.plugin_language
++        if not lang and plugin.basename.startswith("protoc-gen-"):
++            lang = plugin.basename[len("protoc-gen-"):]
++        if not lang:
++            fail("cannot infer the target language of plugin", "plugin_language")
++
++        outdir = gen_dir
++        if ctx.attr.plugin_options:
++            outdir = ",".join(ctx.attr.plugin_options) + ":" + outdir
++        args += ["--plugin=protoc-gen-%s=%s" % (lang, plugin.path)]
++        args += ["--%s_out=%s" % (lang, outdir)]
++        tools.append(plugin)
++
++    if args:
++        ctx.actions.run(
++            inputs = inputs,
++            outputs = ctx.outputs.outs,
++            arguments = args + import_flags + [s.path for s in srcs],
++            executable = ctx.executable.protoc,
++            mnemonic = "ProtoCompile",
++            tools = tools,
++            use_default_shell_env = True,
++        )
++
++    return struct(
++        proto = struct(
++            srcs = srcs,
++            import_flags = import_flags,
++            deps = deps,
++        ),
++    )
++
++proto_gen = rule(
++    attrs = {
++        "srcs": attr.label_list(allow_files = True),
++        "deps": attr.label_list(providers = ["proto"]),
++        "includes": attr.string_list(),
++        "protoc": attr.label(
++            cfg = "host",
++            executable = True,
++            allow_single_file = True,
++            mandatory = True,
++        ),
++        "plugin": attr.label(
++            cfg = "host",
++            allow_files = True,
++            executable = True,
++        ),
++        "plugin_language": attr.string(),
++        "plugin_options": attr.string_list(),
++        "gen_cc": attr.bool(),
++        "gen_py": attr.bool(),
++        "outs": attr.output_list(),
++    },
++    output_to_genfiles = True,
++    implementation = _proto_gen_impl,
++)
++"""Generates codes from Protocol Buffers definitions.
++
++This rule helps you to implement Skylark macros specific to the target
++language. You should prefer more specific `cc_proto_library `,
++`py_proto_library` and others unless you are adding such wrapper macros.
++
++Args:
++  srcs: Protocol Buffers definition files (.proto) to run the protocol compiler
++    against.
++  deps: a list of dependency labels; must be other proto libraries.
++  includes: a list of include paths to .proto files.
++  protoc: the label of the protocol compiler to generate the sources.
++  plugin: the label of the protocol compiler plugin to be passed to the protocol
++    compiler.
++  plugin_language: the language of the generated sources
++  plugin_options: a list of options to be passed to the plugin
++  gen_cc: generates C++ sources in addition to the ones from the plugin.
++  gen_py: generates Python sources in addition to the ones from the plugin.
++  outs: a list of labels of the expected outputs from the protocol compiler.
++"""
++
++def py_proto_library(
++        name,
++        srcs = [],
++        deps = [],
++        py_libs = [],
++        py_extra_srcs = [],
++        include = None,
++        default_runtime = None,
++        protoc = "//third_party:protoc",
++        use_grpc_plugin = False,
++        **kwargs):
++    """Bazel rule to create a Python protobuf library from proto source files
++
++    NOTE: the rule is only an internal workaround to generate protos. The
++    interface may change and the rule may be removed when bazel has introduced
++    the native rule.
++
++    Args:
++      name: the name of the py_proto_library.
++      srcs: the .proto files of the py_proto_library.
++      deps: a list of dependency labels; must be py_proto_library.
++      py_libs: a list of other py_library targets depended by the generated
++          py_library.
++      py_extra_srcs: extra source files that will be added to the output
++          py_library. This attribute is used for internal bootstrapping.
++      include: a string indicating the include path of the .proto files.
++      default_runtime: the implicitly default runtime which will be depended on by
++          the generated py_library target.
++      protoc: the label of the protocol compiler to generate the sources.
++      use_grpc_plugin: a flag to indicate whether to call the Python C++ plugin
++          when processing the proto files.
++      **kwargs: other keyword arguments that are passed to py_library.
++
++    """
++    outs = _PyOuts(srcs, use_grpc_plugin)
++
++    includes = []
++    if include != None:
++        includes = [include]
++
++    grpc_python_plugin = None
++    if use_grpc_plugin:
++        grpc_python_plugin = "//external:grpc_python_plugin"
++        # Note: Generated grpc code depends on Python grpc module. This dependency
++        # is not explicitly listed in py_libs. Instead, host system is assumed to
++        # have grpc installed.
++
++    proto_gen(
++        name = name + "_genproto",
++        srcs = srcs,
++        deps = [s + "_genproto" for s in deps],
++        includes = includes,
++        protoc = protoc,
++        gen_py = 1,
++        outs = outs,
++        visibility = ["//visibility:public"],
++        plugin = grpc_python_plugin,
++        plugin_language = "grpc",
++    )
++
++    if default_runtime and not default_runtime in py_libs + deps:
++        py_libs = py_libs + [default_runtime]
++
++    native.py_library(
++        name = name,
++        srcs = outs + py_extra_srcs,
++        deps = py_libs + deps,
++        imports = includes,
++        **kwargs
++    )
+-- 
+2.35.1
+
diff --git a/sci-libs/keras/keras-2.10.0.ebuild b/sci-libs/keras/keras-2.10.0.ebuild
new file mode 100644
index 000000000000..8ee2fa5059b1
--- /dev/null
+++ b/sci-libs/keras/keras-2.10.0.ebuild
@@ -0,0 +1,85 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit bazel distutils-r1
+
+DESCRIPTION="Deep Learning for humans"
+HOMEPAGE="https://keras.io/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+bazel_external_uris="
+	https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip -> bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip
+	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
+
+SRC_URI="https://github.com/keras-team/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
+	${bazel_external_uris}"
+
+RDEPEND="
+	>=dev-libs/protobuf-3.13.0:=
+	dev-python/absl-py[${PYTHON_USEDEP}]
+	dev-python/h5py[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	>=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=sci-libs/keras-applications-1.0.8[${PYTHON_USEDEP}]
+	>=sci-libs/keras-preprocessing-1.1.2[${PYTHON_USEDEP}]
+	>=sci-libs/tensorflow-2.10[python,${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}
+	dev-python/setuptools[${PYTHON_USEDEP}]"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.13.0
+	dev-java/java-config
+	>=dev-util/bazel-4.2.2"
+
+# Bazel tests not pytest, also want GPU access
+RESTRICT="test"
+DOCS=( CONTRIBUTING.md README.md )
+PATCHES=(
+	"${FILESDIR}/keras-2.10.0-0001-bazel-Use-system-protobuf.patch"
+)
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	bazel_setup_bazelrc
+	default
+	python_copy_sources
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	ebazel build //keras/tools/pip_package:build_pip_package
+	ebazel shutdown
+
+	local srcdir="${T}/src-${EPYTHON/./_}"
+	mkdir -p "${srcdir}" || die
+	bazel-bin/keras/tools/pip_package/build_pip_package --src "${srcdir}" || die
+
+	popd || die
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home)
+	distutils-r1_src_compile
+}
+
+python_install() {
+	pushd "${T}/src-${EPYTHON/./_}" >/dev/null || die
+	esetup.py install
+	python_optimize
+	popd || die
+}
diff --git a/sci-libs/miopen/Manifest b/sci-libs/miopen/Manifest
index 2a8dbb55fead..39e5f94389f6 100644
--- a/sci-libs/miopen/Manifest
+++ b/sci-libs/miopen/Manifest
@@ -1,2 +1,2 @@
-DIST MIOpen-4.3.0.tar.gz 59405686 BLAKE2B fe91bd91a74023866883d6d0a2a8071a8fe40c4cff2fb4ef58fc6e343a05ac2a731f73e657f4d183ade4e5b7c1fbbe41f3f032918f6e50cb713073aee8d97dc5 SHA512 a8615b7738acfbc7f68d9417b0746c62630d2b48fb8485fafba4db65a4b277a8230f601d249d7e54f89ba25c14176429ca76ad8365a437b09d836b031b0c4fbb
 DIST MIOpen-5.0.2.tar.gz 76294827 BLAKE2B 7b2a1f0e675793aee4a0fa2a270caac8332cda36c8f04cee483cc2882ed987b6e676e9c24a1acf4976a16a10f922b1a6263470b419aa88a29cfcb6d6d4b4cc29 SHA512 a581b45220797904db3e4dd3840f2ef96085f00baf8187c5ab574325a66da4f599dee6496457bb1cc32825b57a13fb0ef35a2ef1bd2a5f449c7e7b9fa64b27d1
+DIST MIOpen-5.1.3.tar.gz 88118329 BLAKE2B d24722ffc5f5dab6d6a1de2ce34193ad2f25c9a2562e38c52e010a29870f01d9ea1c56970ba0601a088c8286e97958ee95d0da27fc8082126dd2ebe5ccb36b70 SHA512 a14e28cfcb12e5061e0e7b999ef3e67fa0a0e897e31bc50e7288b8a23eb1791312e33d3b697021c2b654ccc065ae1b046c1cfd77ba8e04b0f3e87e9cc0626dcd
diff --git a/sci-libs/miopen/files/miopen-4.3.0-no-strip.patch b/sci-libs/miopen/files/miopen-4.3.0-no-strip.patch
deleted file mode 100644
index 2d0565821063..000000000000
--- a/sci-libs/miopen/files/miopen-4.3.0-no-strip.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-Don't strip for release. Let portage handle stripping.
---- orig/CMakeLists.txt
-+++ MIOpen-rocm-4.3.0/CMakeLists.txt
-@@ -69,12 +69,6 @@ set(MIOPEN_ENABLE_SQLITE_BACKOFF On CACH
- option( BUILD_DEV "Build for development only" OFF)
- 
- 
--# Strip symbols for release
--if(NOT WIN32 AND NOT APPLE)
--    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
--    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
--endif()
--
- rocm_setup_version(VERSION 2.12.0)
- 
- list( APPEND CMAKE_MODULE_PATH ${PROJECT_SOURCE_DIR}/cmake )
diff --git a/sci-libs/miopen/files/miopen-4.3.0-strip-xnack-in-flags.patch b/sci-libs/miopen/files/miopen-4.3.0-strip-xnack-in-flags.patch
deleted file mode 100644
index dc6db68c2afc..000000000000
--- a/sci-libs/miopen/files/miopen-4.3.0-strip-xnack-in-flags.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-if options like :xnack- exists in ${AMDGPU_TARGETS}, CMakeLists cannot handle HIP_COMPILER_FLAGS well
-
-the original regex replace should include :+- so xnack- is stripped as well. Otherwise clang complation at MIOpen runtime will fail.
-
-Signed-off-by: Yiyang Wu <xgreenlandforwyy@gmail.com>
---- orig/CMakeLists.txt
-+++ MIOpen-rocm-4.3.0/CMakeLists.txt
-@@ -191,8 +191,8 @@ find_package(hip REQUIRED PATHS /opt/roc
- message(STATUS "Build with HIP ${hip_VERSION}")
- target_flags(HIP_COMPILER_FLAGS hip::device)
- # Remove cuda arch flags
--string(REGEX REPLACE --cuda-gpu-arch=[a-z0-9]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
--string(REGEX REPLACE --offload-arch=[a-z0-9]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
-+string(REGEX REPLACE --cuda-gpu-arch=[a-z0-9:+-]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
-+string(REGEX REPLACE --offload-arch=[a-z0-9:+-]+ "" HIP_COMPILER_FLAGS "${HIP_COMPILER_FLAGS}")
- 
- # Override HIP version in config.h, if necessary.
- # The variables set by find_package() can't be overwritten,
diff --git a/sci-libs/miopen/files/miopen-5.1.3-avoid-metadata-error-for-vanilla-clang.patch b/sci-libs/miopen/files/miopen-5.1.3-avoid-metadata-error-for-vanilla-clang.patch
new file mode 100644
index 000000000000..3dca20f1fb12
--- /dev/null
+++ b/sci-libs/miopen/files/miopen-5.1.3-avoid-metadata-error-for-vanilla-clang.patch
@@ -0,0 +1,183 @@
+Together with find-sed command in 5.1.3 ebuild, this fixes
+https://github.com/ROCmSoftwarePlatform/MIOpen/issues/1731
+index 71b2cabf1..60e7fab6e 100644
+--- a/src/kernels/Conv_Winograd_v13_3_12_epilogue.inc
++++ b/src/kernels/Conv_Winograd_v13_3_12_epilogue.inc
+@@ -76,7 +76,7 @@ amdhsa.kernels:
+     .max_flat_workgroup_size: \wg_x
+     .wavefront_size: 64
+     .args:
+-    - { .size: 4, .offset: 0,   .value_kind: by_value,      .value_type: i32, .name: N }
++    - { .size: 4, .offset: 0,   .value_kind: by_value,      .value_type: i32, .name: X }
+     - { .size: 4, .offset: 4,   .value_kind: by_value,      .value_type: i32, .name: C }
+     - { .size: 4, .offset: 8,   .value_kind: by_value,      .value_type: i32, .name: H }
+     - { .size: 4, .offset: 12,  .value_kind: by_value,      .value_type: i32, .name: W }
+diff --git a/src/kernels/Conv_Winograd_v16_5_0_epilogue.inc b/src/kernels/Conv_Winograd_v16_5_0_epilogue.inc
+index 36d47c862..f8f677ec6 100644
+--- a/src/kernels/Conv_Winograd_v16_5_0_epilogue.inc
++++ b/src/kernels/Conv_Winograd_v16_5_0_epilogue.inc
+@@ -76,7 +76,7 @@ amdhsa.kernels:
+     .max_flat_workgroup_size: \wg_x
+     .wavefront_size: 64
+     .args:
+-    - { .size: 4, .offset: 0,   .value_kind: by_value,      .value_type: i32, .name: N }
++    - { .size: 4, .offset: 0,   .value_kind: by_value,      .value_type: i32, .name: X }
+     - { .size: 4, .offset: 4,   .value_kind: by_value,      .value_type: i32, .name: C }
+     - { .size: 4, .offset: 8,   .value_kind: by_value,      .value_type: i32, .name: H }
+     - { .size: 4, .offset: 12,  .value_kind: by_value,      .value_type: i32, .name: W }
+diff --git a/src/kernels/Conv_Winograd_v21_1_3_metadata.inc b/src/kernels/Conv_Winograd_v21_1_3_metadata.inc
+index deff81e84..ed47abea7 100644
+--- a/src/kernels/Conv_Winograd_v21_1_3_metadata.inc
++++ b/src/kernels/Conv_Winograd_v21_1_3_metadata.inc
+@@ -51,7 +51,7 @@ amdhsa.kernels:
+     .max_flat_workgroup_size: \wg_x
+     .wavefront_size: 64
+     .args:
+-    - { .size: 4, .offset:   0, .value_kind: by_value, .value_type: i32, .name: N }
++    - { .size: 4, .offset:   0, .value_kind: by_value, .value_type: i32, .name: X }
+     - { .size: 4, .offset:   4, .value_kind: by_value, .value_type: i32, .name: C }
+     - { .size: 4, .offset:   8, .value_kind: by_value, .value_type: i32, .name: H }
+     - { .size: 4, .offset:  12, .value_kind: by_value, .value_type: i32, .name: W }
+diff --git a/src/kernels/conv1x1u.s b/src/kernels/conv1x1u.s
+index 5dc213546..c890d45a4 100644
+--- a/src/kernels/conv1x1u.s
++++ b/src/kernels/conv1x1u.s
+@@ -1076,7 +1076,7 @@ amdhsa.kernels:
+     .max_flat_workgroup_size: \wg_x
+     .wavefront_size: 64
+     .args:
+-    - { .size: 4, .offset:  0, .value_kind: by_value, .value_type: i32, .name: N }
++    - { .size: 4, .offset:  0, .value_kind: by_value, .value_type: i32, .name: X }
+     - { .size: 4, .offset:  4, .value_kind: by_value, .value_type: i32, .name: C }
+     - { .size: 4, .offset:  8, .value_kind: by_value, .value_type: i32, .name: H }
+     - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
+diff --git a/src/kernels/conv1x1u_bias_activ.s b/src/kernels/conv1x1u_bias_activ.s
+index 1675e819a..6bbdd9936 100644
+--- a/src/kernels/conv1x1u_bias_activ.s
++++ b/src/kernels/conv1x1u_bias_activ.s
+@@ -1230,7 +1230,7 @@ amdhsa.kernels:
+     .max_flat_workgroup_size: \wg_x
+     .wavefront_size: 64
+     .args:
+-    - { .size: 4, .offset:  0, .value_kind: by_value, .value_type: i32, .name: N }
++    - { .size: 4, .offset:  0, .value_kind: by_value, .value_type: i32, .name: X }
+     - { .size: 4, .offset:  4, .value_kind: by_value, .value_type: i32, .name: C }
+     - { .size: 4, .offset:  8, .value_kind: by_value, .value_type: i32, .name: H }
+     - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
+diff --git a/src/kernels/conv1x1u_stride2.s b/src/kernels/conv1x1u_stride2.s
+index c5ea1e90c..6241edcf7 100644
+--- a/src/kernels/conv1x1u_stride2.s
++++ b/src/kernels/conv1x1u_stride2.s
+@@ -1162,7 +1162,7 @@ amdhsa.kernels:
+     .max_flat_workgroup_size: \wg_x
+     .wavefront_size: 64
+     .args:
+-    - { .size: 4, .offset:  0, .value_kind: by_value, .value_type: i32, .name: N }
++    - { .size: 4, .offset:  0, .value_kind: by_value, .value_type: i32, .name: X }
+     - { .size: 4, .offset:  4, .value_kind: by_value, .value_type: i32, .name: C }
+     - { .size: 4, .offset:  8, .value_kind: by_value, .value_type: i32, .name: H }
+     - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
+diff --git a/src/kernels/conv1x1wrw.s b/src/kernels/conv1x1wrw.s
+index b13b6ffa4..eb63f17c6 100644
+--- a/src/kernels/conv1x1wrw.s
++++ b/src/kernels/conv1x1wrw.s
+@@ -1243,7 +1243,7 @@ amdhsa.kernels:
+     .max_flat_workgroup_size: \wg_x
+     .wavefront_size: 64
+     .args:
+-    - { .size: 4, .offset:  0, .value_kind: by_value, .value_type: i32, .name: N }
++    - { .size: 4, .offset:  0, .value_kind: by_value, .value_type: i32, .name: X }
+     - { .size: 4, .offset:  4, .value_kind: by_value, .value_type: i32, .name: C }
+     - { .size: 4, .offset:  8, .value_kind: by_value, .value_type: i32, .name: H }
+     - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
+diff --git a/src/kernels/conv3x3wrw.s b/src/kernels/conv3x3wrw.s
+index a3f73aeae..b6fb1632c 100755
+--- a/src/kernels/conv3x3wrw.s
++++ b/src/kernels/conv3x3wrw.s
+@@ -1033,7 +1033,7 @@ amdhsa.kernels:
+     .max_flat_workgroup_size: \wg_x
+     .wavefront_size: 64
+     .args:
+-    - { .size: 4, .offset:  0, .value_kind: by_value, .value_type: i32, .name: N }
++    - { .size: 4, .offset:  0, .value_kind: by_value, .value_type: i32, .name: X }
+     - { .size: 4, .offset:  4, .value_kind: by_value, .value_type: i32, .name: C }
+     - { .size: 4, .offset:  8, .value_kind: by_value, .value_type: i32, .name: H }
+     - { .size: 4, .offset: 12, .value_kind: by_value, .value_type: i32, .name: W }
+diff --git a/src/kernels/conv_3x3_wheel_alpha_v3_0b_epilogue.inc b/src/kernels/conv_3x3_wheel_alpha_v3_0b_epilogue.inc
+index 358772e63..b27ad5284 100644
+--- a/src/kernels/conv_3x3_wheel_alpha_v3_0b_epilogue.inc
++++ b/src/kernels/conv_3x3_wheel_alpha_v3_0b_epilogue.inc
+@@ -76,7 +76,7 @@ amdhsa.kernels:
+     .max_flat_workgroup_size: \wg_x
+     .wavefront_size: 64
+     .args:
+-    - { .size: 4, .offset: 0,   .value_kind: by_value,      .value_type: i32, .name: N }
++    - { .size: 4, .offset: 0,   .value_kind: by_value,      .value_type: i32, .name: X }
+     - { .size: 4, .offset: 4,   .value_kind: by_value,      .value_type: i32, .name: C }
+     - { .size: 4, .offset: 8,   .value_kind: by_value,      .value_type: i32, .name: H }
+     - { .size: 4, .offset: 12,  .value_kind: by_value,      .value_type: i32, .name: W }
+diff --git a/src/kernels/conv_3x3_wheel_alpha_v7_0_3b_epilogue.inc b/src/kernels/conv_3x3_wheel_alpha_v7_0_3b_epilogue.inc
+index d3296969a..f873ce153 100644
+--- a/src/kernels/conv_3x3_wheel_alpha_v7_0_3b_epilogue.inc
++++ b/src/kernels/conv_3x3_wheel_alpha_v7_0_3b_epilogue.inc
+@@ -76,7 +76,7 @@ amdhsa.kernels:
+     .max_flat_workgroup_size: \wg_x
+     .wavefront_size: 64
+     .args:
+-    - { .size: 4, .offset: 0,   .value_kind: by_value,      .value_type: i32, .name: N }
++    - { .size: 4, .offset: 0,   .value_kind: by_value,      .value_type: i32, .name: X }
+     - { .size: 4, .offset: 4,   .value_kind: by_value,      .value_type: i32, .name: C }
+     - { .size: 4, .offset: 8,   .value_kind: by_value,      .value_type: i32, .name: H }
+     - { .size: 4, .offset: 12,  .value_kind: by_value,      .value_type: i32, .name: W }
+diff --git a/src/kernels/conv_3x3_wheel_alpha_v9_0_15_epilogue.inc b/src/kernels/conv_3x3_wheel_alpha_v9_0_15_epilogue.inc
+index a253cc0f9..1582d002c 100644
+--- a/src/kernels/conv_3x3_wheel_alpha_v9_0_15_epilogue.inc
++++ b/src/kernels/conv_3x3_wheel_alpha_v9_0_15_epilogue.inc
+@@ -76,7 +76,7 @@ amdhsa.kernels:
+     .max_flat_workgroup_size: \wg_x
+     .wavefront_size: 64
+     .args:
+-    - { .size: 4, .offset: 0,   .value_kind: by_value,      .value_type: i32, .name: N }
++    - { .size: 4, .offset: 0,   .value_kind: by_value,      .value_type: i32, .name: X }
+     - { .size: 4, .offset: 4,   .value_kind: by_value,      .value_type: i32, .name: C }
+     - { .size: 4, .offset: 8,   .value_kind: by_value,      .value_type: i32, .name: H }
+     - { .size: 4, .offset: 12,  .value_kind: by_value,      .value_type: i32, .name: W }
+diff --git a/src/kernels/conv_3x3_wheel_alpha_v9_2_7_epilogue.inc b/src/kernels/conv_3x3_wheel_alpha_v9_2_7_epilogue.inc
+index e40ac1f60..78495e024 100644
+--- a/src/kernels/conv_3x3_wheel_alpha_v9_2_7_epilogue.inc
++++ b/src/kernels/conv_3x3_wheel_alpha_v9_2_7_epilogue.inc
+@@ -76,7 +76,7 @@ amdhsa.kernels:
+     .max_flat_workgroup_size: \wg_x
+     .wavefront_size: 64
+     .args:
+-    - { .size: 4, .offset: 0,   .value_kind: by_value,      .value_type: i32, .name: N }
++    - { .size: 4, .offset: 0,   .value_kind: by_value,      .value_type: i32, .name: X }
+     - { .size: 4, .offset: 4,   .value_kind: by_value,      .value_type: i32, .name: C }
+     - { .size: 4, .offset: 8,   .value_kind: by_value,      .value_type: i32, .name: H }
+     - { .size: 4, .offset: 12,  .value_kind: by_value,      .value_type: i32, .name: W }
+diff --git a/src/kernels/xform_bidirect_winograd_code.inc b/src/kernels/xform_bidirect_winograd_code.inc
+index 724845f49..d03314ef5 100644
+--- a/src/kernels/xform_bidirect_winograd_code.inc
++++ b/src/kernels/xform_bidirect_winograd_code.inc
+@@ -1566,7 +1566,7 @@ amdhsa.kernels:
+     .max_flat_workgroup_size: \wg_x
+     .wavefront_size: 64
+     .args:
+-    - { .size: 4, .offset:   0, .value_kind: by_value, .value_type: i32, .name: N }
++    - { .size: 4, .offset:   0, .value_kind: by_value, .value_type: i32, .name: X }
+     - { .size: 4, .offset:   4, .value_kind: by_value, .value_type: i32, .name: C }
+     - { .size: 4, .offset:   8, .value_kind: by_value, .value_type: i32, .name: H }
+     - { .size: 4, .offset:  12, .value_kind: by_value, .value_type: i32, .name: W }
+diff --git a/src/kernels/xform_metadata.inc b/src/kernels/xform_metadata.inc
+index 960a9a2d8..83b736bee 100644
+--- a/src/kernels/xform_metadata.inc
++++ b/src/kernels/xform_metadata.inc
+@@ -74,7 +74,7 @@ amdhsa.kernels:
+     .max_flat_workgroup_size: \wg_x
+     .wavefront_size: 64
+     .args:
+-    - { .size: 4, .offset:   0, .value_kind: by_value, .value_type: i32, .name: N }
++    - { .size: 4, .offset:   0, .value_kind: by_value, .value_type: i32, .name: X }
+     - { .size: 4, .offset:   4, .value_kind: by_value, .value_type: i32, .name: C }
+     - { .size: 4, .offset:   8, .value_kind: by_value, .value_type: i32, .name: H }
+     - { .size: 4, .offset:  12, .value_kind: by_value, .value_type: i32, .name: W }
diff --git a/sci-libs/miopen/files/miopen-5.1.3-deprecate-clang-ocl.patch b/sci-libs/miopen/files/miopen-5.1.3-deprecate-clang-ocl.patch
new file mode 100644
index 000000000000..93c66fd3ef05
--- /dev/null
+++ b/sci-libs/miopen/files/miopen-5.1.3-deprecate-clang-ocl.patch
@@ -0,0 +1,55 @@
+This is a cherry picked PR on 5.1.3, which replace clang-ocl with clang
+From 98f001dfe61208af04ecf7690023efd772ee7d43 Mon Sep 17 00:00:00 2001
+From: Jehandad Khan <jahandad@gmail.com>
+Date: Tue, 19 Jul 2022 17:24:05 -0500
+Subject: [PATCH] Remove clang-ocl  and replace with clang
+
+---
+ CMakeLists.txt              | 7 +------
+ README.md                   | 1 -
+ src/hipoc/hipoc_program.cpp | 7 ++++++-
+ 3 files changed, 7 insertions(+), 8 deletions(-)
+
+Index: MIOpen-rocm-5.1.3/CMakeLists.txt
+===================================================================
+--- MIOpen-rocm-5.1.3.orig/CMakeLists.txt
++++ MIOpen-rocm-5.1.3/CMakeLists.txt
+@@ -241,7 +241,7 @@ if( MIOPEN_BACKEND STREQUAL "HIP" OR MIO
+     # miopentensile default off
+     set(MIOPEN_USE_MIOPENTENSILE OFF CACHE BOOL "")
+ 
+-    find_program(HIP_OC_COMPILER clang-ocl
++    find_program(HIP_OC_COMPILER clang
+         PATH_SUFFIXES bin
+         PATHS
+             /opt/rocm
+Index: MIOpen-rocm-5.1.3/README.md
+===================================================================
+--- MIOpen-rocm-5.1.3.orig/README.md
++++ MIOpen-rocm-5.1.3/README.md
+@@ -14,7 +14,6 @@ MIOpen supports two programming models -
+   * OpenCL - OpenCL libraries and header files
+   * HIP - 
+     * HIP and HCC libraries and header files
+-    * [clang-ocl](https://github.com/RadeonOpenCompute/clang-ocl) -- **required**
+ * [MIOpenGEMM](https://github.com/ROCmSoftwarePlatform/MIOpenGEMM) to enable various functionalities including transposed and dilated convolutions. This is optional on the HIP backend. Users can enable this library using the cmake configuration flag `-DMIOPEN_USE_MIOPENGEMM=On`.
+ * ROCm cmake modules can be installed from [here](https://github.com/RadeonOpenCompute/rocm-cmake)
+ * [Half](http://half.sourceforge.net/) - IEEE 754-based half-precision floating point library
+Index: MIOpen-rocm-5.1.3/src/hipoc/hipoc_program.cpp
+===================================================================
+--- MIOpen-rocm-5.1.3.orig/src/hipoc/hipoc_program.cpp
++++ MIOpen-rocm-5.1.3/src/hipoc/hipoc_program.cpp
+@@ -255,7 +255,12 @@ void HIPOCProgramImpl::BuildCodeObjectIn
+         if(miopen::IsEnabled(MIOPEN_DEBUG_OPENCL_WAVE64_NOWGP{}))
+             params += " -mwavefrontsize64 -mcumode";
+         WriteFile(src, dir->path / filename);
+-        dir->Execute(HIP_OC_COMPILER, params + " " + filename + " -o " + hsaco_file.string());
++        params += " -target amdgcn-amd-amdhsa -x cl -D__AMD__=1  -O3";
++        params += " -cl-kernel-arg-info -cl-denorms-are-zero";
++        params += " -cl-std=CL1.2 -mllvm -amdgpu-early-inline-all";
++        params += " -mllvm -amdgpu-internalize-symbols ";
++        params += " " + filename + " -o " + hsaco_file.string();
++        dir->Execute(HIP_OC_COMPILER, params);
+     }
+     if(!boost::filesystem::exists(hsaco_file))
+         MIOPEN_THROW("Cant find file: " + hsaco_file.string());
diff --git a/sci-libs/miopen/files/miopen-5.1.3-gfx1031.patch b/sci-libs/miopen/files/miopen-5.1.3-gfx1031.patch
new file mode 100644
index 000000000000..de22d66d887a
--- /dev/null
+++ b/sci-libs/miopen/files/miopen-5.1.3-gfx1031.patch
@@ -0,0 +1,375 @@
+Enable gfx1031 support
+======================
+--- MIOpen-rocm-5.1.3/fin/src/include/conv_fin.hpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/fin/src/include/conv_fin.hpp	2022-09-01 18:36:18.630980283 +0800
+@@ -111,6 +111,10 @@ class ConvFin : public Fin
+         {
+             assert(num_cu == 72 || num_cu == 36);
+         }
++        else if(arch == "gfx1031")
++        {
++            assert(num_cu == 40 || num_cu == 20);
++        }
+         else if(arch == "gfx90a")
+         {
+             assert(num_cu == 110);
+Only in MIOpen-rocm-5.1.3: patches
+--- MIOpen-rocm-5.1.3/src/composable_kernel/composable_kernel/include/utility/config.hpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/composable_kernel/composable_kernel/include/utility/config.hpp	2022-09-01 18:36:18.634980274 +0800
+@@ -13,7 +13,7 @@
+ // GPU target
+ // should enable one and only one GPU target
+ #if !(defined(CK_AMD_GPU_GFX803) || defined(CK_AMD_GPU_GFX900) || defined(CK_AMD_GPU_GFX906) || \
+-      defined(CK_AMD_GPU_GFX908) || defined(CK_AMD_GPU_GFX90A) || defined(CK_AMD_GPU_GFX1030))
++      defined(CK_AMD_GPU_GFX908) || defined(CK_AMD_GPU_GFX90A) || defined(CK_AMD_GPU_GFX1030) || defined(CK_AMD_GPU_GFX1031))
+ #error Need to define (only) one GPU target
+ #endif
+ 
+@@ -29,7 +29,7 @@
+ #if defined(CK_AMD_GPU_GFX803) || defined(CK_AMD_GPU_GFX900) || defined(CK_AMD_GPU_GFX906) || \
+     defined(CK_AMD_GPU_GFX908) || defined(CK_AMD_GPU_GFX90A)
+ #define CK_BUFFER_RESOURCE_3RD_DWORD 0x00020000
+-#elif defined(CK_AMD_GPU_GFX1030)
++#elif (defined(CK_AMD_GPU_GFX1030) || defined(CK_AMD_GPU_GFX1031))
+ #define CK_BUFFER_RESOURCE_3RD_DWORD 0x31014000
+ #endif
+ 
+@@ -37,7 +37,7 @@
+ #if defined(CK_AMD_GPU_GFX803) || defined(CK_AMD_GPU_GFX900)
+ #define CK_USE_AMD_V_MAC_F32
+ #elif defined(CK_AMD_GPU_GFX906) || defined(CK_AMD_GPU_GFX908) || defined(CK_AMD_GPU_GFX90a) || \
+-    defined(CK_AMD_GPU_GFX1030)
++    (defined(CK_AMD_GPU_GFX1030) || defined(CK_AMD_GPU_GFX1031))
+ #define CK_USE_AMD_V_FMAC_F32
+ #define CK_USE_AMD_V_DOT2_F32_F16
+ #define CK_USE_AMD_V_DOT4_I32_I8
+--- MIOpen-rocm-5.1.3/src/include/miopen/solver/ck_utility_common.hpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/include/miopen/solver/ck_utility_common.hpp	2022-09-01 18:36:18.638980266 +0800
+@@ -54,6 +54,7 @@ static inline bool is_ck_supported_hardw
+            StartsWith(handle.GetDeviceName(), "gfx908") ||
+            StartsWith(handle.GetDeviceName(), "gfx90a") ||
+            StartsWith(handle.GetDeviceName(), "gfx1030");
++           StartsWith(handle.GetDeviceName(), "gfx1031");
+ }
+ 
+ static inline bool is_support_amd_buffer_atomic_fadd(const std::string& device_name)
+@@ -83,6 +84,8 @@ static inline auto get_ck_common_compile
+         compiler_flag << " -DCK_AMD_GPU_GFX90A";
+     else if(StartsWith(device_name, "gfx1030"))
+         compiler_flag << " -DCK_AMD_GPU_GFX1030";
++    else if(StartsWith(device_name, "gfx1031"))
++        compiler_flag << " -DCK_AMD_GPU_GFX1031";
+ 
+     // buffer atomic-fadd
+     compiler_flag << " -DCK_USE_AMD_BUFFER_ATOMIC_FADD="
+--- MIOpen-rocm-5.1.3/src/include/miopen/solver/implicitgemm_util.hpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/include/miopen/solver/implicitgemm_util.hpp	2022-09-01 18:36:18.638980266 +0800
+@@ -469,7 +469,7 @@ static inline bool is_use_amd_buffer_loa
+ {
+ #if WORKAROUND_MIOPEN_ISSUE_557
+     const auto device_name = ctx.GetStream().GetDeviceName();
+-    return !StartsWith(device_name, "gfx1030");
++    return !StartsWith(device_name, "gfx1030") && !StartsWith(device_name, "gfx1031");
+ #else
+     return true;
+ #endif
+@@ -478,7 +478,7 @@ static inline bool is_use_amd_buffer_loa
+ static inline bool is_use_v_fmac_f32(const ConvolutionContext& ctx)
+ {
+     const auto device_name = ctx.GetStream().GetDeviceName();
+-    return StartsWith(device_name, "gfx1030");
++    return StartsWith(device_name, "gfx1030") || StartsWith(device_name, "gfx1031");
+ }
+ 
+ static inline bool support_amd_buffer_atomic_fadd(const std::string& device_name)
+@@ -599,7 +599,8 @@ static inline bool IsComposableKernelSup
+            StartsWith(c.GetStream().GetDeviceName(), "gfx906") ||
+            StartsWith(c.GetStream().GetDeviceName(), "gfx908") ||
+            StartsWith(c.GetStream().GetDeviceName(), "gfx90a") ||
+-           StartsWith(c.GetStream().GetDeviceName(), "gfx1030");
++           StartsWith(c.GetStream().GetDeviceName(), "gfx1030")||
++           StartsWith(c.GetStream().GetDeviceName(), "gfx1031");
+ }
+ 
+ // greatest common divisor, aka highest common factor
+--- MIOpen-rocm-5.1.3/src/kernels/batchnorm_functions.h	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/kernels/batchnorm_functions.h	2022-09-01 18:36:18.858979772 +0800
+@@ -159,6 +159,10 @@
+ #define MIO_BN_GFX1030 0
+ #endif
+ 
++#ifndef MIO_BN_GFX1031
++#define MIO_BN_GFX1031 0
++#endif
++
+ #define UNUSED __attribute__((__unused__))
+ 
+ #if(MIO_BN_VARIANT != 4)
+--- MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormActivBwdPerAct.cl	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/kernels/MIOpenBatchNormActivBwdPerAct.cl	2022-09-01 18:36:18.858979772 +0800
+@@ -34,7 +34,7 @@
+ #endif
+ 
+ #define MIOPEN_USE_AMDGCN 0
+-#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
++#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
+ #undef MIOPEN_USE_AMDGCN
+ #define MIOPEN_USE_AMDGCN 1
+ #endif
+--- MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormActivBwdSpatial.cl	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/kernels/MIOpenBatchNormActivBwdSpatial.cl	2022-09-01 18:36:18.858979772 +0800
+@@ -32,7 +32,7 @@
+ #endif
+ 
+ #define MIOPEN_USE_AMDGCN 0
+-#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
++#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
+ #undef MIOPEN_USE_AMDGCN
+ #define MIOPEN_USE_AMDGCN 1
+ #endif
+--- MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/kernels/MIOpenBatchNormActivFwdTrainSpatial.cl	2022-09-01 18:36:18.858979772 +0800
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ #define MIOPEN_USE_AMDGCN 0
+-#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
++#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
+ #undef MIOPEN_USE_AMDGCN
+ #define MIOPEN_USE_AMDGCN 1
+ #endif
+--- MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormBwdSpatial.cl	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/kernels/MIOpenBatchNormBwdSpatial.cl	2022-09-01 18:36:18.858979772 +0800
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ #define MIOPEN_USE_AMDGCN 0
+-#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
++#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
+ #undef MIOPEN_USE_AMDGCN
+ #define MIOPEN_USE_AMDGCN 1
+ #endif
+--- MIOpen-rocm-5.1.3/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/kernels/MIOpenBatchNormFwdTrainSpatial.cl	2022-09-01 18:36:18.858979772 +0800
+@@ -33,7 +33,7 @@
+ #endif
+ 
+ #define MIOPEN_USE_AMDGCN 0
+-#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1
++#if defined(__AMDGCN__) && MIO_BN_GFX1030 != 1 && MIO_BN_GFX1031 != 1
+ #undef MIOPEN_USE_AMDGCN
+ #define MIOPEN_USE_AMDGCN 1
+ #endif
+--- MIOpen-rocm-5.1.3/src/md_graph.cpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/md_graph.cpp	2022-09-01 18:36:18.630980283 +0800
+@@ -738,8 +738,8 @@ void FusionMDGraph::InitConv(FusionMDGra
+ 
+             add_v21_wino("gfx9", {"gfx900", "gfx906", "gfx908", "gfx90a"}, 1);
+             add_v21_wino("gfx9", {"gfx900", "gfx906", "gfx908", "gfx90a"}, 2);
+-            add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030"}, 1);
+-            add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030"}, 2);
++            add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030", "gfx1031"}, 1);
++            add_v21_wino("gfx10", {"gfx1011", "gfx1012", "gfx1030", "gfx1031"}, 2);
+         }
+     }
+ 
+--- MIOpen-rocm-5.1.3/src/ocl/fusionopbiasbnactivocl.cpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/ocl/fusionopbiasbnactivocl.cpp	2022-09-01 18:36:18.634980274 +0800
+@@ -392,7 +392,8 @@ miopenStatus_t BatchNormBwdTrainFusionOp
+            " -DMIO_BN_USESAVED=" + std::to_string(static_cast<int>(true)) +
+            " -DMIO_BN_VARIANT=" + std::to_string(variant) +
+            " -DMIO_BN_CBA_WRITE_INTERMEDIATE=" + std::to_string(0) +
+-           " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0");
++           " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0") +
++           " -DMIO_BN_GFX1031=" + ((handle.GetDeviceName() == "gfx1031") ? "1" : "0");
+ 
+     compile_config += add;
+     MIOPEN_LOG_I2(add);
+@@ -607,7 +608,8 @@ miopenStatus_t BatchNormFwdTrainFusionOp
+            " -DMIO_SAVE_MEAN_VARIANCE=" + (saveBatchStats ? "1" : "0") +
+            " -DMIO_RUNNING_RESULT=" + ((savePopStats) ? "1" : "0") +
+            " -DMIO_BN_VARIANT=" + std::to_string(variant) +
+-           " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0");
++           " -DMIO_BN_GFX1030=" + ((handle.GetDeviceName() == "gfx1030") ? "1" : "0") +
++           " -DMIO_BN_GFX1031=" + ((handle.GetDeviceName() == "gfx1031") ? "1" : "0");
+ 
+     compile_config += add;
+     MIOPEN_LOG_I2(add);
+--- MIOpen-rocm-5.1.3/src/solver/batchnorm/backward_per_activation.cpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/solver/batchnorm/backward_per_activation.cpp	2022-09-01 18:36:18.638980266 +0800
+@@ -113,6 +113,7 @@ BnBwdTrainingPerActivation::GetSolution(
+             {"MIO_BN_GRP1", ylocalsize},
+             {"MIO_BN_GRP2", zlocalsize},
+             {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")},
++            {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")},
+         };
+ 
+         kernel.comp_options = build_params.GenerateFor(kbp::OpenCL{});
+--- MIOpen-rocm-5.1.3/src/solver/batchnorm/backward_spatial_multiple.cpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/solver/batchnorm/backward_spatial_multiple.cpp	2022-09-01 18:36:18.638980266 +0800
+@@ -210,6 +210,7 @@ ConvSolution BnBwdTrainingSpatialMultipl
+             {"MIO_BN_GRP1", ylocalsize},
+             {"MIO_BN_GRP2", zlocalsize},
+             {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")},
++            {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")},
+             {"MIO_LAYOUT_NHWC", static_cast<int>(problem.IsLayoutNHWC())},
+         };
+ 
+--- MIOpen-rocm-5.1.3/src/solver/batchnorm/backward_spatial_single.cpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/solver/batchnorm/backward_spatial_single.cpp	2022-09-01 18:36:18.638980266 +0800
+@@ -247,6 +247,7 @@ BnBwdTrainingSpatialSingle::GetSolution(
+ 
+             build_params << KernelBuildParameters{
+                 {"MIO_BN_GFX1030", (handle.GetDeviceName() == "gfx1030") ? "1" : "0"},
++				{"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")},
+             };
+ 
+             kernel.comp_options = build_params.GenerateFor(kbp::OpenCL{});
+--- MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_inference.cpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/solver/batchnorm/forward_inference.cpp	2022-09-01 18:36:18.638980266 +0800
+@@ -103,6 +103,7 @@ ConvSolution BnFwdInference::GetSolution
+             {"MIO_BN_GRP1", ylocalsize},
+             {"MIO_BN_GRP2", zlocalsize},
+             {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")},
++            {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")},
+         };
+ 
+         kernel.comp_options = build_params.GenerateFor(kbp::OpenCL{});
+--- MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_per_activation.cpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/solver/batchnorm/forward_per_activation.cpp	2022-09-01 18:36:18.638980266 +0800
+@@ -105,6 +105,7 @@ BnFwdTrainingPerActivation::GetSolution(
+             {"MIO_BN_GRP1", ylocalsize},
+             {"MIO_BN_GRP2", zlocalsize},
+             {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")},
++            {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")},
+         };
+ 
+         auto kernel = KernelInfo{};
+--- MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_spatial_multiple.cpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/solver/batchnorm/forward_spatial_multiple.cpp	2022-09-01 18:36:18.638980266 +0800
+@@ -177,6 +177,7 @@ ConvSolution BnFwdTrainingSpatialMultipl
+             {"MIO_BN_GRP1", ylocalsize},
+             {"MIO_BN_GRP2", zlocalsize},
+             {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")},
++            {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")},
+             {"MIO_LAYOUT_NHWC", static_cast<int>(problem.IsLayoutNHWC())},
+         };
+ 
+--- MIOpen-rocm-5.1.3/src/solver/batchnorm/forward_spatial_single.cpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/solver/batchnorm/forward_spatial_single.cpp	2022-09-01 18:36:18.638980266 +0800
+@@ -211,6 +211,7 @@ BnFwdTrainingSpatialSingle::GetSolution(
+             {"MIO_BN_GRP1", ylocalsize},
+             {"MIO_BN_GRP2", zlocalsize},
+             {"MIO_BN_GFX1030", ((handle.GetDeviceName() == "gfx1030") ? "1" : "0")},
++            {"MIO_BN_GFX1031", ((handle.GetDeviceName() == "gfx1031") ? "1" : "0")},
+             {"MIO_LAYOUT_NHWC", static_cast<int>(problem.IsLayoutNHWC())},
+         };
+ 
+--- MIOpen-rocm-5.1.3/src/target_properties.cpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/src/target_properties.cpp	2022-09-01 18:36:18.630980283 +0800
+@@ -54,6 +54,7 @@ static std::string GetDeviceNameFromMap(
+         {"Vega10", "gfx900"},
+         {"gfx901", "gfx900"},
+         {"10.3.0 Sienna_Cichlid 18", "gfx1030"},
++        {"10.3.1 Navi_flounder 18", "gfx1031"},
+     };
+ 
+     const char* const p_asciz = miopen::GetStringEnv(MIOPEN_DEBUG_ENFORCE_DEVICE{});
+--- MIOpen-rocm-5.1.3/test/CMakeLists.txt	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/test/CMakeLists.txt	2022-09-01 18:36:19.022979405 +0800
+@@ -38,6 +38,7 @@ option( MIOPEN_TEST_GFX90A "Test on gfx9
+ option( MIOPEN_TEST_GFX900 "Test on Vega10 (gfx900)" OFF )
+ option( MIOPEN_TEST_GFX906 "Test on Vega20 (gfx906)" OFF )
+ option( MIOPEN_TEST_GFX1030 "Test on Navi21 (gfx1030)" OFF )
++option( MIOPEN_TEST_GFX1031 "Test on Navi21 (gfx1031)" OFF )
+ option( MIOPEN_TEST_GPU_XNACK_ENABLED "Test as if XNACK mode is enabled" OFF )
+ option( MIOPEN_TEST_CONV Off)
+ option( MIOPEN_TEST_DEEPBENCH Off)
+@@ -74,7 +75,7 @@ endif()
+ # Also we do not detect GPU when target GPU for testing is specified explicitly.
+ set(MIOPEN_TEST_GPU_DETECTION_FAILED FALSE)
+ set(MIOPEN_NO_GPU FALSE)
+-if(NOT (MIOPEN_TEST_GFX900 OR MIOPEN_TEST_GFX906 OR MIOPEN_TEST_GFX908 OR MIOPEN_TEST_GFX90A OR MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_HIP_NOGPU))
++if(NOT (MIOPEN_TEST_GFX900 OR MIOPEN_TEST_GFX906 OR MIOPEN_TEST_GFX908 OR MIOPEN_TEST_GFX90A OR MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031 OR MIOPEN_TEST_HIP_NOGPU))
+     find_program(ROCMINFO
+         NAMES rocminfo
+         PATHS
+@@ -96,6 +97,8 @@ if(NOT (MIOPEN_TEST_GFX900 OR MIOPEN_TES
+         elseif (NOT ROCMINFO_EXIT_STATUS EQUAL 0)
+             message(WARNING "ROCMINFO FAILED, GPU TYPE UNKNOWN. Manually set respective MIOPEN_TEST_GFX* CMake variable to specify target GPU for testing.")
+             set(MIOPEN_TEST_GPU_DETECTION_FAILED TRUE)
++        elseif(ROCMINFO_OUTPUT MATCHES "gfx1031")
++            set(MIOPEN_TEST_GFX1031 ON)
+         elseif(ROCMINFO_OUTPUT MATCHES "gfx1030")
+             set(MIOPEN_TEST_GFX1030 ON)
+         elseif(ROCMINFO_OUTPUT MATCHES "gfx900")
+@@ -125,6 +128,7 @@ message(STATUS "MIOPEN_TEST_GFX906 ${MIO
+ message(STATUS "MIOPEN_TEST_GFX908 ${MIOPEN_TEST_GFX908}")
+ message(STATUS "MIOPEN_TEST_GFX90A ${MIOPEN_TEST_GFX90A}")
+ message(STATUS "MIOPEN_TEST_GFX1030 ${MIOPEN_TEST_GFX1030}")
++message(STATUS "MIOPEN_TEST_GFX1031 ${MIOPEN_TEST_GFX1031}")
+ message(STATUS "MIOPEN_TEST_GPU_XNACK_ENABLED ${MIOPEN_TEST_GPU_XNACK_ENABLED}")
+ message(STATUS "MIOPEN_TEST_GPU_DETECTION_FAILED ${MIOPEN_TEST_GPU_DETECTION_FAILED}")
+ 
+@@ -167,10 +171,10 @@ endmacro()
+ set_var_to_condition(WORKAROUND_ISSUE_1187_DEFAULT MIOPEN_TEST_GFX90A AND MIOPEN_TEST_FLOAT)
+ option( WORKAROUND_ISSUE_1187 "" ${WORKAROUND_ISSUE_1187_DEFAULT})
+ 
+-set_var_to_condition(WORKAROUND_ISSUE_1148_DEFAULT MIOPEN_TEST_GFX1030 AND MIOPEN_TEST_FLOAT)
++set_var_to_condition(WORKAROUND_ISSUE_1148_DEFAULT MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031 AND MIOPEN_TEST_FLOAT)
+ option( WORKAROUND_ISSUE_1148 "" ${WORKAROUND_ISSUE_1148_DEFAULT})
+ 
+-set_var_to_condition(WORKAROUND_ISSUE_1334_DEFAULT MIOPEN_TEST_GFX1030 AND MIOPEN_TEST_FLOAT)
++set_var_to_condition(WORKAROUND_ISSUE_1334_DEFAULT MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031 AND MIOPEN_TEST_FLOAT)
+ option( WORKAROUND_ISSUE_1334 "" ${WORKAROUND_ISSUE_1334_DEFAULT})
+ 
+ if(NOT MIOPEN_TEST_MIOTENSILE)
+@@ -216,7 +220,7 @@ if (MIOPEN_NO_GPU)
+             test_pooling3d test_perfdb)
+ endif()
+ 
+-if(MIOPEN_TEST_GFX1030)
++if(MIOPEN_TEST_GFX1030 OR MIOPEN_TEST_GFX1031)
+     if(WORKAROUND_ISSUE_1053 AND MIOPEN_TEST_ALL)
+         list(APPEND SKIP_TESTS test_lrn_test)
+     endif()
+@@ -439,7 +443,7 @@ endfunction()
+ #   If nothing is specified, the default value is taken.
+ #   Default: FLOAT_ENABLED HALF_DISABLED BF16_DISABLED INT8_DISABLED
+ #
+-# GPU types: GFX900, GFX906, GFX908, GFX90A, GFX1030
++# GPU types: GFX900, GFX906, GFX908, GFX90A, GFX1030, GFX1031
+ #   The option can be enabled or disabled by using '_ENABLED' and '_DISABLED' suffix.
+ #   If nothing is specified, the default value is taken.
+ #   Default: GFX900_ENABLED, GFX906_ENABLED, GFX908_ENABLED, GFX90A_ENABLED, GFX1030_DISABLED
+@@ -571,7 +575,7 @@ function(add_custom_test NAME)
+         set_tests_properties(${NAME} PROPERTIES RUN_SERIAL On)
+     endif()
+ 
+-    if(  (is_gfx900_check OR is_gfx906_check OR is_gfx908_check OR is_gfx1030_check OR is_gfx90a_check)
++    if(  (is_gfx900_check OR is_gfx906_check OR is_gfx908_check OR is_gfx1030_check OR is_gfx1031_check OR is_gfx90a_check)
+      AND is_full_check
+      AND is_xnack_on_check
+      AND (is_miotensile_check AND is_mlir_check)
+--- MIOpen-rocm-5.1.3/test/handle_test.cpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/test/handle_test.cpp	2022-09-01 18:36:19.018979413 +0800
+@@ -234,7 +234,7 @@ void test_warnings(kernel_type_t kern_ty
+ void test_arch_name()
+ {
+     auto&& h        = get_handle();
+-    auto known_arch = {"gfx908", "gfx90a", "gfx906", "gfx900", "gfx803", "gfx1030"};
++    auto known_arch = {"gfx908", "gfx90a", "gfx906", "gfx900", "gfx803", "gfx1030", "gfx1031"};
+     auto this_arch  = h.GetDeviceName();
+     EXPECT(std::any_of(
+         known_arch.begin(), known_arch.end(), [&](std::string arch) { return arch == this_arch; }));
+--- MIOpen-rocm-5.1.3/test/mdgraph.cpp	2022-05-08 14:08:05.000000000 +0800
++++ gfx1031/test/mdgraph.cpp	2022-09-01 18:36:19.022979405 +0800
+@@ -222,7 +222,7 @@ struct mdgraph_driver : test_driver
+         auto target    = h.GetTargetProperties();
+ 
+         auto wino_supported_arch = {
+-            "gfx1030", "gfx1012", "gfx1011", "gfx90a", "gfx908", "gfx906", "gfx900", "gfx803"};
++            "gfx1030", "gfx1031","gfx1012", "gfx1011", "gfx90a", "gfx908", "gfx906", "gfx900", "gfx803"};
+ 
+         auto is_wino_support = !xnack_enabled &&
+                                !miopen::IsDisabled(MIOPEN_DEBUG_GCN_ASM_KERNELS{}) &&
diff --git a/sci-libs/miopen/files/miopen-5.1.3-include-array.patch b/sci-libs/miopen/files/miopen-5.1.3-include-array.patch
new file mode 100644
index 000000000000..fc6a36d22548
--- /dev/null
+++ b/sci-libs/miopen/files/miopen-5.1.3-include-array.patch
@@ -0,0 +1,12 @@
+This fixes compile error upon gcc-12 libstdc++
+index 1cfb2a72c..0f4feb406 100644
+--- a/test/sequences.cpp
++++ b/test/sequences.cpp
+@@ -25,6 +25,7 @@
+  *******************************************************************************/
+ #include "test.hpp"
+ #include <miopen/sequences.hpp>
++#include <array>
+ 
+ namespace miopen {
+ namespace seq {
diff --git a/sci-libs/miopen/files/miopen-5.1.3-no-strip.patch b/sci-libs/miopen/files/miopen-5.1.3-no-strip.patch
new file mode 100644
index 000000000000..0d1d429dbb85
--- /dev/null
+++ b/sci-libs/miopen/files/miopen-5.1.3-no-strip.patch
@@ -0,0 +1,17 @@
+Don't strip for release. Let portage handle stripping.
+Index: MIOpen-rocm-5.1.3/CMakeLists.txt
+===================================================================
+--- MIOpen-rocm-5.1.3.orig/CMakeLists.txt
++++ MIOpen-rocm-5.1.3/CMakeLists.txt
+@@ -78,11 +78,6 @@ option( BUILD_DEV "Build for development
+ option(MIOPEN_ENABLE_FIN "Enable the fin driver for MIOpen"  OFF)
+ 
+ 
+-# Strip symbols for release
+-if(NOT WIN32 AND NOT APPLE)
+-    set(CMAKE_C_FLAGS_RELEASE "${CMAKE_C_FLAGS_RELEASE} -s")
+-    set(CMAKE_CXX_FLAGS_RELEASE "${CMAKE_CXX_FLAGS_RELEASE} -s")
+-endif()
+ 
+ rocm_setup_version(VERSION 2.16.0)
+ 
diff --git a/sci-libs/miopen/miopen-4.3.0.ebuild b/sci-libs/miopen/miopen-5.1.3.ebuild
similarity index 50%
rename from sci-libs/miopen/miopen-4.3.0.ebuild
rename to sci-libs/miopen/miopen-5.1.3.ebuild
index 41e9131d7714..a7d8b5083f60 100644
--- a/sci-libs/miopen/miopen-4.3.0.ebuild
+++ b/sci-libs/miopen/miopen-5.1.3.ebuild
@@ -1,9 +1,13 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-inherit cmake
+ROCM_VERSION=${PV}
+
+inherit cmake flag-o-matic llvm rocm
+
+LLVM_MAX_SLOT=14
 
 DESCRIPTION="AMD's Machine Intelligence Library"
 HOMEPAGE="https://github.com/ROCmSoftwarePlatform/MIOpen"
@@ -17,34 +21,39 @@ IUSE="debug test"
 RESTRICT="!test? ( test )"
 
 RDEPEND="
-	dev-util/hip:${SLOT}
+	>=dev-util/hip-5.1.3
 	>=dev-db/sqlite-3.17
-	dev-libs/ocl-icd
-	dev-util/rocm-clang-ocl:${SLOT}
-	sci-libs/rocBLAS:${SLOT}
-	dev-libs/boost
+	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	>=dev-libs/boost-1.72
 "
 
 DEPEND="${RDEPEND}"
 
-BDEPEND="dev-libs/half:0/1"
+BDEPEND="dev-libs/half:0/1
+	dev-util/rocm-cmake
+"
 
 S="${WORKDIR}/MIOpen-rocm-${PV}"
 
 PATCHES=(
 	"${FILESDIR}/${PN}-4.2.0-disable-no-inline-boost.patch"
 	"${FILESDIR}/${PN}-4.2.0-gcc11-numeric_limits.patch"
-	"${FILESDIR}/${PN}-4.3.0-strip-xnack-in-flags.patch"
+	"${FILESDIR}/${PN}-5.0.2-strip-xnack-in-flags.patch"
 	"${FILESDIR}/${PN}-4.3.0-fix-interface-include-in-HIP_COMPILER_FLAGS.patch"
 	"${FILESDIR}/${PN}-4.3.0-enable-test.patch"
-	"${FILESDIR}/${PN}-4.3.0-no-strip.patch"
+	"${FILESDIR}/${PN}-5.1.3-gfx1031.patch"
+	"${FILESDIR}/${PN}-5.1.3-deprecate-clang-ocl.patch"
+	"${FILESDIR}/${PN}-5.1.3-no-strip.patch"
+	"${FILESDIR}/${PN}-5.1.3-include-array.patch"
+	"${FILESDIR}/${PN}-5.1.3-avoid-metadata-error-for-vanilla-clang.patch"
 )
 
 src_prepare() {
-	sed -e "s:/opt/rocm/llvm:""${EPREFIX}""/usr/lib/llvm/roc/ NO_DEFAULT_PATH:" \
-		-e "s:/opt/rocm/hip:""${EPREFIX}""/usr/lib/hip/ NO_DEFAULT_PATH:" \
+	cmake_src_prepare
+
+	sed -e "s:/opt/rocm/llvm:$(get_llvm_prefix ${LLVM_MAX_SLOT}) NO_DEFAULT_PATH:" \
+		-e "s:/opt/rocm/hip:$(hipconfig -p) NO_DEFAULT_PATH:" \
 		-e '/set( MIOPEN_INSTALL_DIR/s:miopen:${CMAKE_INSTALL_PREFIX}:' \
-		-e '/set(MIOPEN_SYSTEM_DB_PATH/s:${CMAKE_INSTALL_PREFIX}/::' \
 		-e '/MIOPEN_TIDY_ERRORS ALL/d' \
 		-i CMakeLists.txt || die
 
@@ -53,7 +62,11 @@ src_prepare() {
 
 	sed -e "s:\${AMD_DEVICE_LIBS_PREFIX}/lib:${EPREFIX}/usr/lib/amdgcn/bitcode:" -i cmake/hip-config.cmake || die
 
-	cmake_src_prepare
+	# This plus avoid-metadata-error-for-vanilla-clang.patch fix bug mentioned
+	# in https://github.com/ROCmSoftwarePlatform/MIOpen/issues/1731
+	find src/kernels -name "*.s" -exec \
+		sed -e "s/.name: n /.name: x /g" -e "s/.name: y /.name: z /g" \
+			-e "s/.name: y,/.name: z,/g" -i {} \; || die
 }
 
 src_configure() {
@@ -65,16 +78,32 @@ src_configure() {
 		CMAKE_BUILD_TYPE="Debug"
 	fi
 
-	export CXX="${EPREFIX}/usr/lib/llvm/roc/bin/clang++"
-
 	local mycmakeargs=(
 		-DCMAKE_SKIP_RPATH=ON
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
 		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr"
 		-DMIOPEN_BACKEND=HIP
 		-DBoost_USE_STATIC_LIBS=OFF
+		-DMIOPEN_USE_MLIR=OFF
 		-DBUILD_TESTS=$(usex test ON OFF)
-		${AMDGPU_TARGETS+-DAMDGPU_TARGETS="${AMDGPU_TARGETS}"}
+		-DMIOPEN_TEST_ALL=$(usex test ON OFF)
 	)
 
-	cmake_src_configure
+	if use test; then
+		for gpu_target in ${AMDGPU_TARGETS}; do
+			mycmakeargs+=( -DMIOPEN_TEST_${gpu_target^^}=ON )
+		done
+	fi
+
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+	append-cxxflags "--rocm-path=$(hipconfig -R)"
+	append-cxxflags "--hip-device-lib-path=${EPREFIX}/usr/lib/amdgcn/bitcode"
+	CXX="$(get_llvm_prefix ${LLVM_MAX_SLOT})/bin/clang++" cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	export LD_LIBRARY_PATH="${BUILD_DIR}"/lib
+	MAKEOPTS="-j1" cmake_src_test
 }
diff --git a/sci-libs/rocBLAS/Manifest b/sci-libs/rocBLAS/Manifest
index e8bb583d38a1..ca44e7ca5686 100644
--- a/sci-libs/rocBLAS/Manifest
+++ b/sci-libs/rocBLAS/Manifest
@@ -2,3 +2,4 @@ DIST rocBLAS-5.0.2-Tensile-asm_full-navi22.tar.gz 1110323 BLAKE2B 80fab97c6f89fc
 DIST rocm-Tensile-4.3.0.tar.gz 14250149 BLAKE2B 030138eaca2a0aadd96801e6dbd72e510716dd90553ef3795c5e04e00a34a05ecae82b24f755e4033a4acfcdb1cf26291da1e7902bb090f89a010d403e832beb SHA512 126db0b413c716fba8d5be9bff7a44fd1badacbf32f3db8d0db649819177db37ebd56fd22dd3c809655f5d29675be115e698cd10bc3d0b4b23878ae3726fce47
 DIST rocm-rocBLAS-4.3.0.tar.gz 11569970 BLAKE2B f11b0acf2bbd5737b036142d3b2cc1e18c38e088a8b7db58156d478dd6718befbb82bb7fd43a38fe64a5427124c5ad5241fa37977f094e6efd195d168d3e5f65 SHA512 490ab1c1e98a8b311ad5630515c448d9bb0a2bf588a08bcbebee345e2954d616b4ffe7c2e03dadca82c590438c42afccb98fe8ba00856aece101b5ffe62ef1e0
 DIST rocm-rocBLAS-5.0.2.tar.gz 13295178 BLAKE2B e1abfa06b9ac1545732465857839dae3f3708af49439a306a2b5b1b1b392101c38c95815f2c05a0d9ed29d41b154bc2e16a4f9203a37f5e2f68ee12cc4b44a06 SHA512 2f4a74f49350ede0debcf32229a6b6b95505615723c3f2bee16e4c169a3bb966dfb1971819028f47c525f571bea5662b892e63f655b0d1d2b8f20746bc5fe770
+DIST rocm-rocBLAS-5.1.3.tar.gz 13741546 BLAKE2B af10d8cb69bee44ef5aab2dc350e1d9f3b6fddb3a840c17230c4b55b2649a4724c9f2e58c1eafdb3e2716eea016a72a35c3ddb498881b1ce682d780baa8d8b07 SHA512 5ab71838fdd0e9c5848cbf28a19d113353b619a878d8c7d05f64feb32faae2054169c95ed6e9dd6b05a2e807b57229dd2c361c4d289b6e6f17c196558640890f
diff --git a/sci-libs/rocBLAS/rocBLAS-5.1.3.ebuild b/sci-libs/rocBLAS/rocBLAS-5.1.3.ebuild
new file mode 100644
index 000000000000..d9316725fe8c
--- /dev/null
+++ b/sci-libs/rocBLAS/rocBLAS-5.1.3.ebuild
@@ -0,0 +1,114 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_BUILDER="doxygen"
+DOCS_DIR="docs"
+DOCS_DEPEND="media-gfx/graphviz"
+ROCM_VERSION=${PV}
+inherit cmake docs edo multiprocessing prefix rocm
+
+DESCRIPTION="AMD's library for BLAS on ROCm"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocBLAS"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocBLAS/archive/rocm-${PV}.tar.gz -> rocm-${P}.tar.gz
+	https://media.githubusercontent.com/media/littlewu2508/littlewu2508.github.io/main/gentoo-distfiles/${PN}-5.0.2-Tensile-asm_full-navi22.tar.gz"
+S="${WORKDIR}/${PN}-rocm-${PV}"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+BDEPEND="
+	dev-util/rocm-cmake:${SLOT}
+	dev-util/Tensile:${SLOT}
+"
+
+DEPEND="
+	dev-util/hip
+	dev-libs/msgpack
+	test? (
+		virtual/blas
+		dev-cpp/gtest
+		sys-libs/libomp
+	)
+	benchmark? (
+		virtual/blas
+		sys-libs/libomp
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.3.0-fix-glibc-2.32-and-above.patch
+	"${FILESDIR}"/${PN}-5.0.2-change-default-Tensile-library-dir.patch
+	"${FILESDIR}"/${PN}-5.0.2-cpp_lib_filesystem.patch
+	"${FILESDIR}"/${PN}-5.0.2-unbundle-Tensile.patch
+	)
+
+src_prepare() {
+	cmake_src_prepare
+	cp -a "${WORKDIR}/asm_full/" library/src/blas3/Tensile/Logic/ || die
+	# Fit for Gentoo FHS rule
+	sed -e "/PREFIX rocblas/d" \
+		-e "/<INSTALL_INTERFACE/s:include:include/rocblas:" \
+		-e "s:rocblas/include:include/rocblas:" \
+		-e "s:\\\\\${CPACK_PACKAGING_INSTALL_PREFIX}rocblas/lib:${EPREFIX}/usr/$(get_libdir)/rocblas:" \
+		-e "s:share/doc/rocBLAS:share/doc/${P}:" \
+		-e "/rocm_install_symlink_subdir( rocblas )/d" -i library/src/CMakeLists.txt || die
+
+	sed -e "s:,-rpath=.*\":\":" -i clients/CMakeLists.txt || die
+
+	eprefixify library/src/tensile_host.cpp
+}
+
+src_configure() {
+	addpredict /dev/random
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=On
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DTensile_LOGIC="asm_full"
+		-DTensile_COMPILER="hipcc"
+		-DTensile_LIBRARY_FORMAT="msgpack"
+		-DTensile_CODE_OBJECT_VERSION="V3"
+		-DTensile_TEST_LOCAL_PATH="${EPREFIX}/usr/share/Tensile"
+		-DTensile_ROOT="${EPREFIX}/usr/share/Tensile"
+		-DBUILD_WITH_TENSILE=ON
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocblas"
+		-DBUILD_TESTING=OFF
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+		-DTensile_CPU_THREADS=$(makeopts_jobs)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_compile() {
+	docs_compile
+	cmake_src_compile
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}"/clients/staging || die
+	export ROCBLAS_TEST_TIMEOUT=3600 ROCBLAS_TENSILE_LIBPATH="${BUILD_DIR}/Tensile/library"
+	export LD_LIBRARY_PATH="${BUILD_DIR}/clients:${BUILD_DIR}/library/src"
+	edob ./${PN,,}-test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dolib.so clients/librocblas_fortran_client.so
+		dobin clients/staging/rocblas-bench
+	fi
+}
diff --git a/sci-libs/rocFFT/Manifest b/sci-libs/rocFFT/Manifest
index a6b401c669d5..62c113ca488d 100644
--- a/sci-libs/rocFFT/Manifest
+++ b/sci-libs/rocFFT/Manifest
@@ -1,3 +1,4 @@
 DIST rocFFT-4.0.0.tar.gz 772176 BLAKE2B f08db9487449e707ba814a66d23992f68c140017a38f72ee45b3b224fc3e46abd40b976aef645f4432601265b38cff8939456981c686360eba135349b5d28fb5 SHA512 db9a6b49162dfb7924aa5f5dc8d42c92a5a741e03c3c0b4ece2cfb72de7506a345f3d28d31a3d7755cfe78078c448c9f952ca671e472335a4301de8702916176
 DIST rocFFT-4.3.0.tar.gz 840748 BLAKE2B 236a5faa930751d35e501a9a32ecc8b4075448ef21a0ffb0bb7ec04f4ed1cb67b908aa153b5b424e0823d3e306cf375d7c01a77d687220ed79de6d374037e003 SHA512 765d41e4018a04a53e847c03de80eec830d3e8766187fb8cb493624afa2673175347c16e6eeeebd4ad7d88bb866e58f7e572708f22238723c710b98565a0cd3d
 DIST rocFFT-5.0.2.tar.gz 837508 BLAKE2B b74d0c6edd7b232f775bffefbca829d88d9d7cd9108c27a0698f45d7fe2760d40463bcda8c710e923874b3bbfb1e83e0fe8622db4dfa28afb29392b3e135e9a5 SHA512 d6810a92a10a27dbcac8a04e8fcd56c7fa198f208da626d8938d5ff28b6ab8b89a058c7a56b5666464165e8f6bd7c4c031a94315625a3613eb02a9b8eccd9eb9
+DIST rocFFT-5.1.3.tar.gz 845470 BLAKE2B 86060ce4f8612869fedc5bc92ed6a5bb7fbc539b26c7f5ab0ded5406ab6c340f64116782285d040824e54557af87d9ddb6f907fd1550b80c3da903d3c1d5e5c0 SHA512 175402856bd4753e74ce14326569be99221e21d0ce675e007900f6982c53e1566ad0b060eec545e0f17ff4dc4811688cc1003dc986226205ee95ee6f22d1ca43
diff --git a/sci-libs/rocFFT/files/rocFFT-5.1.3-add-stdexcept-header.patch b/sci-libs/rocFFT/files/rocFFT-5.1.3-add-stdexcept-header.patch
new file mode 100644
index 000000000000..edfd89ea4b70
--- /dev/null
+++ b/sci-libs/rocFFT/files/rocFFT-5.1.3-add-stdexcept-header.patch
@@ -0,0 +1,11 @@
+Contributed-by: perestoronin https://bugs.gentoo.org/693200#c25
+--- a/library/src/include/twiddles.h
++++ b/library/src/include/twiddles.h
+@@ -14,6 +14,7 @@
+ #include <numeric>
+ #include <tuple>
+ #include <vector>
++#include <stdexcept>
+ 
+ static const size_t LTWD_BASE_DEFAULT       = 8;
+ static const size_t LARGE_TWIDDLE_THRESHOLD = 4096;
diff --git a/sci-libs/rocFFT/files/rocFFT-5.1.3-unbundle-sqlite.patch b/sci-libs/rocFFT/files/rocFFT-5.1.3-unbundle-sqlite.patch
new file mode 100644
index 000000000000..b18b55eb8048
--- /dev/null
+++ b/sci-libs/rocFFT/files/rocFFT-5.1.3-unbundle-sqlite.patch
@@ -0,0 +1,67 @@
+Disable rocFFT fetching SQLite3 and link to system libsqlite.so
+Index: rocFFT-rocm-5.1.3/library/src/CMakeLists.txt
+===================================================================
+--- rocFFT-rocm-5.1.3.orig/library/src/CMakeLists.txt
++++ rocFFT-rocm-5.1.3/library/src/CMakeLists.txt
+@@ -134,49 +134,22 @@ set( rocfft_source
+   rtcsubprocess.cpp
+   )
+ 
+-# SQLite 3.36.0 enabled the backup API by default, which we need
+-# for cache serialization.  We also want to use a static SQLite,
+-# and distro static libraries aren't typically built
+-# position-independent.
+-include( FetchContent )
+-
+-set(SQLITE_SRC_URL https://sqlite.org/2021/sqlite-amalgamation-3360000.zip CACHE STRING "Location of SQLite source code")
+-set(SQLITE_SRC_SHA256 999826fe4c871f18919fdb8ed7ec9dd8217180854dd1fe21eea96aed36186729 CACHE STRING "SHA256 hash of SQLite source code")
+-
+-# embed SQLite
+-FetchContent_Declare(sqlite_local
+-  URL ${SQLITE_SRC_URL}
+-  URL_HASH SHA256=${SQLITE_SRC_SHA256}
+-)
+-FetchContent_MakeAvailable(sqlite_local)
+-add_library( sqlite3 OBJECT ${sqlite_local_SOURCE_DIR}/sqlite3.c )
+-set_target_properties( sqlite3 PROPERTIES
+-  C_VISIBILITY_PRESET "hidden"
+-  VISIBILITY_INLINES_HIDDEN ON
+-  POSITION_INDEPENDENT_CODE ON
+-  )
+-
+-# we don't need extensions, and omitting them from SQLite removes the
+-# need for dlopen/dlclose from within rocFFT
+-target_compile_options(
+-  sqlite3
+-  PRIVATE -DSQLITE_OMIT_LOAD_EXTENSION
+-)
+-
+ set_property(
+   SOURCE rtc.cpp
+   PROPERTY OBJECT_DEPENDS ${kgen_embed_h}
+ )
+ 
++find_package( SQLite3 REQUIRED )
++
+ prepend_path( ".." rocfft_headers_public relative_rocfft_headers_public )
+ 
+ add_library( rocfft
+   ${rocfft_source}
+   ${relative_rocfft_headers_public}
+-  $<TARGET_OBJECTS:sqlite3>
+   )
+ add_library( roc::rocfft ALIAS rocfft )
+ 
++target_link_libraries( rocfft PRIVATE ${SQLite3_LIBRARIES} )
+ if( NOT WIN32 )
+   target_link_libraries( rocfft PRIVATE -lstdc++fs )
+ endif()
+@@ -209,7 +182,7 @@ endif()
+ target_include_directories( rocfft
+   PRIVATE $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/src/include>
+   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/library/src/device>
+-  ${sqlite_local_SOURCE_DIR}
++  ${SQLite3_LIBRARIES}
+   PUBLIC  $<BUILD_INTERFACE:${PROJECT_SOURCE_DIR}/library/include>
+   $<BUILD_INTERFACE:${PROJECT_BINARY_DIR}/include>
+   $<INSTALL_INTERFACE:include>
diff --git a/sci-libs/rocFFT/rocFFT-5.1.3.ebuild b/sci-libs/rocFFT/rocFFT-5.1.3.ebuild
new file mode 100644
index 000000000000..67d33f28847e
--- /dev/null
+++ b/sci-libs/rocFFT/rocFFT-5.1.3.ebuild
@@ -0,0 +1,144 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+ROCM_VERSION=${PV}
+
+inherit cmake check-reqs edo multiprocessing python-r1 rocm
+
+DESCRIPTION="Next generation FFT implementation for ROCm"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocFFT"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocFFT/archive/rocm-${PV}.tar.gz -> rocFFT-${PV}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+# RDEPEND: perfscripts? dev-python/plotly[${PYTHON_USEDEP}] # currently masked by arch/amd64/x32/package.mask
+RDEPEND="
+perfscripts? (
+	>=media-gfx/asymptote-2.61
+	dev-texlive/texlive-latex
+	dev-tex/latexmk
+	sys-apps/texinfo
+	dev-python/sympy[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/scipy[${PYTHON_USEDEP}]
+	dev-python/pandas[${PYTHON_USEDEP}] )
+${PYTHON_DEPS}"
+
+DEPEND="dev-util/hip
+	${PYTHON_DEPS}"
+
+BDEPEND="
+	test? ( dev-cpp/gtest dev-libs/boost
+	>=sci-libs/fftw-3 sys-libs/libomp )
+	>=dev-util/cmake-3.22
+	dev-util/rocm-cmake:${SLOT}
+"
+
+CHECKREQS_DISK_BUILD="7G"
+
+IUSE="benchmark perfscripts test"
+REQUIRED_USE="perfscripts? ( benchmark ) ${PYTHON_REQUIRED_USE} ${ROCM_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/rocFFT-rocm-${PV}"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-add-functional-header.patch"
+	"${FILESDIR}/${PN}-5.1.3-unbundle-sqlite.patch"
+	"${FILESDIR}/${PN}-5.0.2-add-math-header.patch"
+	"${FILESDIR}/${PN}-5.1.3-add-stdexcept-header.patch" )
+
+required_mem() {
+	if use test; then
+		echo "52G"
+	else
+		if [[ -n "${AMDGPU_TARGETS}" ]]; then
+			local NARCH=$(($(awk -F";" '{print NF-1}' <<< "${AMDGPU_TARGETS}" || die)+1)) # count how many archs user specified in ${AMDGPU_TARGETS}
+		else
+			local NARCH=7 # The default number of AMDGPU_TARGETS for rocFFT-4.3.0. May change in the future.
+		fi
+		echo "$(($(makeopts_jobs)*${NARCH}*25+2200))M" # A linear function estimating how much memory required
+	fi
+}
+
+pkg_pretend() {
+	return # leave the disk space check to pkg_setup phase
+}
+
+pkg_setup() {
+	export CHECKREQS_MEMORY=$(required_mem)
+	check-reqs_pkg_setup
+	python_setup
+}
+
+src_prepare() {
+	sed -e "s/PREFIX rocfft//" \
+		-e "/rocm_install_symlink_subdir/d" \
+		-e "/<INSTALL_INTERFACE/s,include,include/rocFFT," \
+		-i library/src/CMakeLists.txt || die
+
+	sed -e "/rocm_install_symlink_subdir/d" \
+		-e "$!N;s:PREFIX\n[ ]*rocfft:# PREFIX rocfft\n:;P;D" \
+		-i library/src/device/CMakeLists.txt || die
+
+	if use perfscripts; then
+		pushd scripts/perf || die
+		sed -e "/\/opt\/rocm/d" -e "/rocmversion/s,rocm_info.strip(),\"${PV}\"," -i perflib/specs.py || dir
+		sed -e "/^top/,+1d" -i rocfft-perf suites.py || die
+		sed -e "s,perflib,${PN}_perflib,g" -i rocfft-perf suites.py perflib/*.py || die
+		sed -e "/^top = /s,__file__).*$,\"${EPREFIX}/usr/share/${PN}-perflib\")," -i perflib/pdf.py perflib/generators.py || die
+		popd
+	fi
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=On
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-Wno-dev
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocFFT/"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_SELFTEST=$(usex test ON OFF)
+		-DPYTHON3_EXE=${EPYTHON}
+		-DBUILD_CLIENTS_RIDER=$(usex benchmark ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}/clients/staging" || die
+	export LD_LIBRARY_PATH=${BUILD_DIR}/library/src/:${BUILD_DIR}/library/src/device
+	edob ./${PN,,}-test
+	edob ./${PN,,}-selftest
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}"/clients/staging || die
+		dobin *rider
+	fi
+
+	if use perfscripts; then
+		cd "${S}"/scripts/perf || die
+		python_foreach_impl python_doexe rocfft-perf
+		python_moduleinto ${PN}_perflib
+		python_foreach_impl python_domodule perflib/*.py
+		insinto /usr/share/${PN}-perflib
+		doins *.asy suites.py
+	fi
+}
diff --git a/sci-libs/rocPRIM/Manifest b/sci-libs/rocPRIM/Manifest
index f10d002c910a..4148bf3157b2 100644
--- a/sci-libs/rocPRIM/Manifest
+++ b/sci-libs/rocPRIM/Manifest
@@ -1,3 +1,4 @@
 DIST rocPRIM-4.0.0.tar.gz 285576 BLAKE2B 44f3542068dee48c0f2bb475f4d3fd74592fe27f4ca00a7b754014deaaa7187c4363d4b2e7fe13ff771b48d2885b848b9632ef71ce85e80e0946e4e5f13495d8 SHA512 c37fce4f16788d82379459af69b9f47f2bccb3b0e655e7314a23936cc99a474afb0092f240bd950341f1b02ce93d03abce0df7ce62ffcb5d577171ce870dd1d2
 DIST rocPRIM-4.3.0.tar.gz 290071 BLAKE2B f69ada9859ef9238d4f8c50bc2b10d131c986dbd8982cc0c7f8614cd51746080aba3b3e7b0ef3e1d5006c179a823f4fcb8ce03cc0a4c88fad3cb46947c7b7fb6 SHA512 9925f832637d19360bf1624dd7a6ef931fb740ee725e35c3159a09a3c569af6f61e3337124c8e0561e60c8595d0d533a4402b91345056ff8d276c6e1dd491036
 DIST rocPRIM-5.0.2.tar.gz 364102 BLAKE2B 4e56f37c8ed02a4c4dadfab25e1e840c85c90b6f656858ad15dfa0f8de38b8f130d49a49461dfa09d3f07389e57b2a9cdefe5958b6faa80a639f98d276ca3e66 SHA512 d4d14203d721f7f62f35b2af91c261366f150a24fc21dc5a508743ee5a6246a6a3ad437db03f3ddaad5799cc2ba6d7b8d1e37a8e038eb4156d7962313e36f520
+DIST rocPRIM-5.1.3.tar.gz 374510 BLAKE2B ab6960e7bd2159ac7a0d72ba6d594684f8d47028eca0940eabd35b346ac3d432a734ec575ee71341f339a9d0dead10dfafe81fb651a3b7da681aa900a5132d0e SHA512 54e14f2b40795153b862a64c9b3d336f35feccfda725daad75fae356b0147c577735884b65218c26c370ebec710af0f84aeef3103067a50db077cf9e24d2b64a
diff --git a/sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild b/sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild
new file mode 100644
index 000000000000..c6fc2d52e88e
--- /dev/null
+++ b/sci-libs/rocPRIM/rocPRIM-5.1.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+inherit cmake rocm
+
+DESCRIPTION="HIP parallel primitives for developing performant GPU-accelerated code on ROCm"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocPRIM"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocPRIM/archive/rocm-${PV}.tar.gz -> rocPRIM-${PV}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RDEPEND="dev-util/hip
+	benchmark? ( dev-cpp/benchmark )
+	test? ( dev-cpp/gtest )"
+BDEPEND="dev-util/rocm-cmake
+	>=dev-util/cmake-3.22"
+DEPEND="${RDEPEND}"
+
+S="${WORKDIR}/rocPRIM-rocm-${PV}"
+
+RESTRICT="!test? ( test )"
+
+src_prepare() {
+	# "hcc" is depcreated, new platform ist "rocclr"
+	sed -e "/HIP_PLATFORM STREQUAL/s,hcc,rocclr," -i cmake/VerifyCompiler.cmake || die
+
+	# Install according to FHS
+	sed -e "/PREFIX rocprim/d" \
+		-e "/INSTALL_INTERFACE/s,rocprim/include,include/rocprim," \
+		-e "/DESTINATION/s,rocprim/include,include," \
+		-e "/rocm_install_symlink_subdir(rocprim)/d" \
+		-i rocprim/CMakeLists.txt || die
+
+	# disable downloading googletest and googlebenchmark
+	sed  -r -e '/Downloading/{:a;N;/\n *\)$/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	# remove GIT dependency
+	sed  -r -e '/find_package\(Git/{:a;N;/\nendif/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	# install benchmark files
+	if use benchmark; then
+		sed -e "/get_filename_component/s,\${BENCHMARK_SOURCE},${PN}_\${BENCHMARK_SOURCE}," \
+			-e "/add_executable/a\  install(TARGETS \${BENCHMARK_TARGET})" -i benchmark/CMakeLists.txt || die
+	fi
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DSKIP_RPATH=On
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	MAKEOPTS="-j1" cmake_src_test
+}
diff --git a/sci-libs/rocRAND/Manifest b/sci-libs/rocRAND/Manifest
index 1463032b13ee..e10c91878415 100644
--- a/sci-libs/rocRAND/Manifest
+++ b/sci-libs/rocRAND/Manifest
@@ -1,3 +1,5 @@
+DIST hipRAND-de941a7eb9ede2a862d719cd3ca23234a3692d07.tar.gz 80820 BLAKE2B f2894187455cf1da70c486e9efc336a01dc53589c56afe994858b2344c1e74e8d35260f70ad9cd80c5da1103dd9e98da6f5f2bf8e1ddf97023effc8a434a76ce SHA512 cdc70799ddca456c37c2a65875b98acff74800aa2b4f28d77b27c38c32428dd5edb2837bf88bfb6fcc32bdae7f2b27f1b547831bad98101b04959b7ba6b74a85
 DIST rocRAND-4.0.0.tar.gz 3105585 BLAKE2B 0466d88c286290a9cd179fac61209051f7db5323457ccad9c5f0b579439662e1fe2b8951f85101c7c31bd058bc1448e839a19dc9a3a2d4ca42eb4e0b2baf4eb4 SHA512 c02bc32a9cf7660739ecf7ef99262fb14efa2c76afb3476105eedc4264dec987351ebd461c13c9e0aef9e640b42960b2a63295479664b83924cf0d5c34a157e8
 DIST rocRAND-4.3.0.tar.gz 3107367 BLAKE2B 23cfac271c1cd4e4edcfd315aa775d4d62e6a50ffa3b9a3372d4ae427a02def52486e88b3f4f89daaa539f2653cf76c8d44afec70d8d916268bc9f27534bda4c SHA512 3eefeb55014a8ee681e1cee73e0e092bd29a81767e772e712f8f871e94380a772a433e93a59276b0cd5a364fc4e482186771809d67ebdab24b2e3020173f5e18
 DIST rocRAND-5.0.2.tar.gz 11765778 BLAKE2B f93c3530fba2b416c5ef3d227ebe65f3ee36607e6b4e1d0584c410768b9d71f86c40468bfad0935afb8ca13c7c87b20ee23f1ea89bdedcb6b3149fd932cbdbe6 SHA512 c19beb0eef8dcf4e090e53cb544f21adb61f8c9cb463c74da1c9767b1d75539bb3e296e7b8a70dee517817d181abd8c713e22770a1a4f66363150a879cbb3e48
+DIST rocRAND-5.1.3.tar.gz 11729425 BLAKE2B f61aaedb7b72ceba3868a2069c93db1e2cd88a7a0188a9d5a33f520af3b42235c0dca62495460fd5e7abbca5fe7acc01acfdc90e53ae9a6e45128df5da472f49 SHA512 12859e52b79e40fcd1fb97d0915c191bbbc24e31e00aac4dbeecb625f9978a00ece3d7a42d0f9d37516031c1fbeb66e14dcd476ea83fe32fb13e0dd5c3964a28
diff --git a/sci-libs/rocRAND/rocRAND-5.1.3.ebuild b/sci-libs/rocRAND/rocRAND-5.1.3.ebuild
new file mode 100644
index 000000000000..26ca0c5042b1
--- /dev/null
+++ b/sci-libs/rocRAND/rocRAND-5.1.3.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="Generate pseudo-random and quasi-random numbers"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocRAND"
+HIPRAND_COMMIT_HASH=de941a7eb9ede2a862d719cd3ca23234a3692d07
+SRC_URI="https://github.com/ROCmSoftwarePlatform/${PN}/archive/rocm-${PV}.tar.gz -> ${P}.tar.gz
+https://github.com/ROCmSoftwarePlatform/hipRAND/archive/${HIPRAND_COMMIT_HASH}.tar.gz -> hipRAND-${HIPRAND_COMMIT_HASH}.tar.gz"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip"
+DEPEND="${RDEPEND}
+dev-util/rocm-cmake
+test? ( dev-cpp/gtest )"
+BDEPEND="dev-util/rocm-cmake
+>=dev-util/cmake-3.22"
+
+S="${WORKDIR}/rocRAND-rocm-${PV}"
+
+src_prepare() {
+	rmdir hipRAND || die
+	mv -v ../hipRAND-${HIPRAND_COMMIT_HASH} hipRAND || die
+	# change installed include and lib dir, and avoid symlink overwrite the installed headers
+	# avoid setting RPATH
+	sed -r -e "s:(hip|roc)rand/lib:\${CMAKE_INSTALL_LIBDIR}:" \
+		-e "s:(hip|roc)rand/include:include/\1rand:" \
+		-e '/\$\{INSTALL_SYMLINK_COMMAND\}/d' \
+		-e "/INSTALL_RPATH/d" -i library/CMakeLists.txt || die
+
+	# remove GIT dependency
+	sed -e "/find_package(Git/,+4d" -i cmake/Dependencies.cmake || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=On
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_HIPRAND=ON
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARK=$(usex benchmark ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	export LD_LIBRARY_PATH="${BUILD_DIR}/library"
+	MAKEOPTS="-j1" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}"/benchmark
+		dobin benchmark_rocrand_*
+	fi
+}
diff --git a/sci-libs/rocSOLVER/Manifest b/sci-libs/rocSOLVER/Manifest
index 4a48b1da3b26..d0a72473309d 100644
--- a/sci-libs/rocSOLVER/Manifest
+++ b/sci-libs/rocSOLVER/Manifest
@@ -1,2 +1,3 @@
 DIST rocSOLVER-4.3.0.tar.gz 454249 BLAKE2B 727ae416d85c5a19983257d2a0b01836013c1d69cddf3334b2c1b808b96b401db938b46b7ecf1e7faf26ff555374d1d3abed74abbe7be47110a36b44019469ee SHA512 2910e1cfad4d17a2877e2ae572d80179b84903c632652571c01bd12856c92c22e073ea1005ed9aac04244b4c502a7e0c18d96445e57658ae8eb5b320bada549b
 DIST rocSOLVER-5.0.2.tar.gz 530085 BLAKE2B f3c3594b5ee2703424da289cc0c520a589da28f9d3f4c04d81cace35a4f77f3ca79ff9a1e7139d83d7a2ae1907083aded99b5d9fbe216d81b225dc1b9fc4105b SHA512 ab349044aba0c1b6b7d0019d15f2bdf068805d2da73790f424ae90835f2d7dd4137d0a641d8edbf98fcb190989f0d0fa57dfc448a376a19e21fd62940046b3a1
+DIST rocSOLVER-5.1.3.tar.gz 545627 BLAKE2B 2cca24a1310efba7f8c66d1614fb50704221ebc8aa50d6aba11083baf9a7427575642fd28218ce80f8a7b83d3406348c2dd18373fb32e533509d01d37cf06927 SHA512 38e7a4ed6b67e83960ad3416d1008f82f895d19dc85427cd6f9c76f00b1ce18f78a4dd73d1ab53ffe81588890cd5545315029e903e2e09b85d6cfb854d405753
diff --git a/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild b/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild
new file mode 100644
index 000000000000..e2db9aba2a19
--- /dev/null
+++ b/sci-libs/rocSOLVER/rocSOLVER-5.1.3.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake edo rocm
+
+DESCRIPTION="Implementation of a subset of LAPACK functionality on the ROCm platform"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSOLVER"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSOLVER/archive/rocm-${PV}.tar.gz -> rocSOLVER-${PV}.tar.gz"
+
+LICENSE="BSD"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+
+IUSE="test benchmark"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocBLAS:${SLOT}[${ROCM_USEDEP}]
+	=dev-libs/libfmt-8*
+	benchmark? ( virtual/blas )"
+DEPEND="${RDEPEND}"
+BDEPEND="test? ( dev-cpp/gtest
+	>=dev-util/cmake-3.22
+	virtual/blas )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-add-stdint-header.patch"
+	"${FILESDIR}/${PN}-5.0.2-libfmt8.patch"
+)
+
+RESTRICT="!test? ( test )"
+
+S=${WORKDIR}/${PN}-rocm-${PV}
+
+src_prepare() {
+	sed -e "s: PREFIX rocsolver:# PREFIX rocsolver:" -i library/src/CMakeLists.txt
+	sed -e "s:\$<INSTALL_INTERFACE\:include>:\$<INSTALL_INTERFACE\:include/rocsolver>:" -i library/src/CMakeLists.txt
+	sed -e "s:rocm_install_symlink_subdir( rocsolver ):#rocm_install_symlink_subdir( rocsolver ):" -i library/src/CMakeLists.txt
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# avoid sandbox violation
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=On
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-Wno-dev
+		-DCMAKE_INSTALL_INCLUDEDIR="${EPREFIX}/usr/include/rocsolver"
+		-DBUILD_CLIENTS_SAMPLES=NO
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}"/clients/staging || die
+	LD_LIBRARY_PATH="${BUILD_DIR}/library/src" edob ./rocsolver-test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dobin clients/staging/rocsolver-bench
+	fi
+}
diff --git a/sci-libs/rocSPARSE/Manifest b/sci-libs/rocSPARSE/Manifest
index 8c89d77bdb72..b3b836aadfbc 100644
--- a/sci-libs/rocSPARSE/Manifest
+++ b/sci-libs/rocSPARSE/Manifest
@@ -1,6 +1,7 @@
 DIST rocSPARSE-4.0.0.tar.gz 587761 BLAKE2B 25f9f0183c06b574505fe6e9011b32ea4fbe48c0a1883b8991baf45b8a2238312f352e614c0069531c986e548453b6e7b7a77f883dffea82ed41df488964b55d SHA512 4a4acf24a789ea58b53a8d06ea528a6aed8eabac21a7a3cd73011e9b31d03dceb488cc72f29c5513205f2b538d24e9dbaccda1a932bcc466cd04a65606a77b3b
 DIST rocSPARSE-4.3.0.tar.gz 809183 BLAKE2B 06a83d98572927f0f2c65f4f36194394b66a02a5ce9d3e21da04c53e9ad97809daffe02a35691aa52466f7dfb4d4a8c645b87e1e4da579de7f91323df3a41d59 SHA512 e3ee5a15d36c3002ee60aabd94c7f47b0cb9f0b5a33cefa9061df9f04b1fcc3c1503e4f01e2f36c07477179c6753827b505e9b512e8b5bfca00f76e3efd99c1d
 DIST rocSPARSE-5.0.2.tar.gz 855762 BLAKE2B dc1e84157f1eecd6bedd6620147e4f88341b94cb0f1507a6264af40c891541ef3e81a8a429b3160dac1606a855a566abbff98e458f581f5f60de31d5751682ef SHA512 4f985c0784246616dd1b3e4fd669033296e45b1f8faa1ab25143e2f085b9bf6556a495de23e9463c2ae45d6038c1cff01d18930c9762d53975e15d4d2d5d4d0a
+DIST rocSPARSE-5.1.3.tar.gz 943788 BLAKE2B f9d5fc34d74bc10f3e5bd0a18da41fe9b35a2f01aca3a74979960958fd0e7648fca96493ba9d767119a452dd75ede0733959d0d4bae84615b7a1ff212c8412a3 SHA512 735aa210bbdc3f31b0ed4defe0288606e255788e877f24ed25506d780552a779305fe5bfd692a3e720e9b286073894300fcbcf161d41e1b23abf2110a9536bf3
 DIST rocSPARSE_ASIC_320k.tar.gz 11301444 BLAKE2B a00cc4a3ededab3fb56339319e34e936645ddce2dee3c630153b37e337384c207b0a2829227fb7f4c2db1fe33383e97410ab7ad459d391c025f5410843d51cf2 SHA512 1db3af391c30a371c1ac0087436e266721474273a39d5b2b6d56408d950dcbbee004750e4dce4e3dbc4cb512f38f6d945676d7f29b62c52fd5a7fed0fe789e03
 DIST rocSPARSE_Chebyshev4.tar.gz 50165660 BLAKE2B f1a95554c8f38937f501488fabfd406b773eb980d7463cadac0de162529ac2f834c655cadd2b65f4c42a8487bc2d67c749601ae33bd789051f9e4d1e157196a0 SHA512 fdec4947a4af923d28b4be8d23690fd6d356c58f8344a5dcdd2e3fa61769d83e47a84d65316b527e6e82d9f988de2675a852367d406e44b44d784137a90b95c0
 DIST rocSPARSE_Chevron2.tar.gz 3210636 BLAKE2B 919bc19931cbcb32c09e6b623c9d3890400895dfd65e83845d351a8e3dd8b30ef43374c3c0ca3ee9708c81b5fb8886f1a4adbea6086495f08f9498f19a2279d5 SHA512 22b71deddec4f1af5b239d4065089230cf70e521102803a77ab3f16b34a0d69534817e54d81dfa7f8d1f299932c0f0424237baeb3d8289bcfffa4b902b00e256
diff --git a/sci-libs/rocSPARSE/files/rocSPARSE-5.1.3-add-stdexcept-header.patch b/sci-libs/rocSPARSE/files/rocSPARSE-5.1.3-add-stdexcept-header.patch
new file mode 100644
index 000000000000..c61c723ef4ad
--- /dev/null
+++ b/sci-libs/rocSPARSE/files/rocSPARSE-5.1.3-add-stdexcept-header.patch
@@ -0,0 +1,12 @@
+This fixes compilation issue with gcc-12
+===================================================================
+--- rocSPARSE-rocm-5.1.3.orig/clients/common/utility.cpp
++++ rocSPARSE-rocm-5.1.3/clients/common/utility.cpp
+@@ -29,6 +29,7 @@
+ 
+ #include <chrono>
+ #include <cstdlib>
++#include <stdexcept>
+ 
+ #ifdef WIN32
+ #define strcasecmp(A, B) _stricmp(A, B)
diff --git a/sci-libs/rocSPARSE/rocSPARSE-5.1.3.ebuild b/sci-libs/rocSPARSE/rocSPARSE-5.1.3.ebuild
new file mode 100644
index 000000000000..0ed300de5755
--- /dev/null
+++ b/sci-libs/rocSPARSE/rocSPARSE-5.1.3.ebuild
@@ -0,0 +1,133 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+ROCM_VERSION=${PV}
+
+inherit cmake edo python-any-r1 toolchain-funcs rocm
+
+DESCRIPTION="Basic Linear Algebra Subroutines for sparse computation"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocSPARSE"
+
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocSPARSE/archive/rocm-${PV}.tar.gz -> rocSPARSE-${PV}.tar.gz
+test? (
+https://sparse.tamu.edu/MM/SNAP/amazon0312.tar.gz -> ${PN}_amazon0312.tar.gz
+https://sparse.tamu.edu/MM/Muite/Chebyshev4.tar.gz -> ${PN}_Chebyshev4.tar.gz
+https://sparse.tamu.edu/MM/FEMLAB/sme3Dc.tar.gz -> ${PN}_sme3Dc.tar.gz
+https://sparse.tamu.edu/MM/Williams/webbase-1M.tar.gz -> ${PN}_webbase-1M.tar.gz
+https://sparse.tamu.edu/MM/Bova/rma10.tar.gz -> ${PN}_rma10.tar.gz
+https://sparse.tamu.edu/MM/JGD_BIBD/bibd_22_8.tar.gz -> ${PN}_bibd_22_8.tar.gz
+https://sparse.tamu.edu/MM/Williams/mac_econ_fwd500.tar.gz -> ${PN}_mac_econ_fwd500.tar.gz
+https://sparse.tamu.edu/MM/Williams/mc2depi.tar.gz -> ${PN}_mc2depi.tar.gz
+https://sparse.tamu.edu/MM/Hamm/scircuit.tar.gz -> ${PN}_scircuit.tar.gz
+https://sparse.tamu.edu/MM/Sandia/ASIC_320k.tar.gz -> ${PN}_ASIC_320k.tar.gz
+https://sparse.tamu.edu/MM/GHS_psdef/bmwcra_1.tar.gz -> ${PN}_bmwcra_1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos1.tar.gz -> ${PN}_nos1.tar.gz
+https://sparse.tamu.edu/MM/HB/nos2.tar.gz -> ${PN}_nos2.tar.gz
+https://sparse.tamu.edu/MM/HB/nos3.tar.gz -> ${PN}_nos3.tar.gz
+https://sparse.tamu.edu/MM/HB/nos4.tar.gz -> ${PN}_nos4.tar.gz
+https://sparse.tamu.edu/MM/HB/nos5.tar.gz -> ${PN}_nos5.tar.gz
+https://sparse.tamu.edu/MM/HB/nos6.tar.gz -> ${PN}_nos6.tar.gz
+https://sparse.tamu.edu/MM/HB/nos7.tar.gz -> ${PN}_nos7.tar.gz
+https://sparse.tamu.edu/MM/DNVS/shipsec1.tar.gz -> ${PN}_shipsec1.tar.gz
+https://sparse.tamu.edu/MM/Cote/mplate.tar.gz -> ${PN}_mplate.tar.gz
+https://sparse.tamu.edu/MM/Bai/qc2534.tar.gz -> ${PN}_qc2534.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron2.tar.gz -> ${PN}_Chevron2.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron3.tar.gz -> ${PN}_Chevron3.tar.gz
+https://sparse.tamu.edu/MM/Chevron/Chevron4.tar.gz -> ${PN}_Chevron4.tar.gz
+)"
+
+LICENSE="MIT"
+KEYWORDS="~amd64"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+SLOT="0/$(ver_cut 1-2)"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocPRIM:${SLOT}"
+DEPEND="${RDEPEND}"
+BDEPEND="test? (
+	dev-cpp/gtest
+	>=dev-util/cmake-3.22
+	$(python_gen_any_dep 'dev-python/pyyaml[${PYTHON_USEDEP}]')
+)
+benchmark? ( app-admin/chrpath )
+"
+
+RESTRICT="!test? ( test )"
+
+S="${WORKDIR}/rocSPARSE-rocm-${PV}"
+
+PATCHES=( "${FILESDIR}/${PN}-5.0.2-remove-matrices-unpacking.patch"
+	"${FILESDIR}/${PN}-5.0.2-enable-gfx1031.patch"
+	"${FILESDIR}/${PN}-5.0.2-remove-incorrect-assert.patch" )
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+	fi
+}
+
+src_prepare() {
+	sed -e "s/PREFIX rocsparse//" \
+		-e "/<INSTALL_INTERFACE/s,include,include/rocsparse," \
+		-e "/rocm_install_symlink_subdir(rocsparse)/d" \
+		-e "s:rocsparse/include:include/rocsparse:" \
+		-i "${S}/library/CMakeLists.txt" || die
+
+	# remove GIT dependency
+	sed -e "/find_package(Git/d" -i cmake/Dependencies.cmake || die
+
+	# use python interpreter specifyied by python-any-r1
+	sed -e "/COMMAND ..\/common\/rocsparse_gentest.py/s,COMMAND ,COMMAND ${EPYTHON} ," -i clients/tests/CMakeLists.txt || die
+
+	cmake_src_prepare
+
+	# Test need download data from https://sparse.tamu.edu (or other mirror site), check MD5, unpack and convert them into csr format
+	# This process is handled default by ${S}/cmake/ClientMatrices.cmake, but should be the responsibility of portage.
+	if use test; then
+		mkdir -p "${BUILD_DIR}"/clients/matrices
+		# compile and use the mtx2csr converter. Do not use any optimization flags, because it causes error!
+		edo $(tc-getCXX) deps/convert.cpp -o deps/convert
+		find "${WORKDIR}" -maxdepth 2 -regextype egrep -regex ".*/(.*)/\1\.mtx" -print0 |
+			while IFS= read -r -d '' mtxfile; do
+				destination=${BUILD_DIR}/clients/matrices/$(basename -s '.mtx' ${mtxfile}).csr
+				ebegin "Converting ${mtxfile} to ${destination}"
+				deps/convert ${mtxfile} ${destination}
+				eend $?
+			done
+	fi
+}
+
+src_configure() {
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DCMAKE_SKIP_RPATH=On
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_CLIENTS_SAMPLES=OFF
+		-DCMAKE_INSTALL_INCLUDEDIR="include/rocsparse"
+		-DBUILD_CLIENTS_TESTS=$(usex test ON OFF)
+		-DBUILD_CLIENTS_BENCHMARKS=$(usex benchmark ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	cd "${BUILD_DIR}/clients/staging" || die
+	LD_LIBRARY_PATH="${BUILD_DIR}/library" edob ./${PN,,}-test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use benchmark; then
+		cd "${BUILD_DIR}" || die
+		dobin clients/staging/rocsparse-bench
+	fi
+}
diff --git a/sci-libs/rocThrust/Manifest b/sci-libs/rocThrust/Manifest
index 1f55b8280b6b..13445c171f29 100644
--- a/sci-libs/rocThrust/Manifest
+++ b/sci-libs/rocThrust/Manifest
@@ -1,3 +1,4 @@
 DIST rocThrust-4.0.0.tar.gz 1166346 BLAKE2B 02c89e0c4ab2c888a20b7c956a73012157f2735e6ec76369a1f75fbc17bb3f995d1914106ec58562f28243fbe5f019ac230ac3313b6aacb4d8b868f3ac1f091e SHA512 476aa5706487c5801cc91908806a1a1fcb550171f63e0b2debd9b59b18c7435c484578ec456ccfabc140dd7bca7d9bb432a7ba223946b1fca22e72e7d053af2d
 DIST rocThrust-4.3.0.tar.gz 1156832 BLAKE2B a462cfaa31883253fabba584ca77622cc5a7234bd9979472a84ec77b91c60f48f1064149b86d624aaedd70262fb65fb6aadb03cc6e00939d4eed6cd11bfc0090 SHA512 8c6aa3aefd59c87cc8278930bf90021867f519c356c86a3c3ebfcdf90887b8631250b6a9a8156f77c0cbf7ddbad7881e5e1b802f1cd1305cc3a2e7d95ef4e6f3
 DIST rocThrust-5.0.2.tar.gz 1183550 BLAKE2B 88021266dc9ffcb8f5e803acfe767c52aaa04b2348d0dcb204eb74bdf44ed26eb6d98f8d85324b90fe73228b52a0ad22686b87274c868ef19ec8ded825b58ea9 SHA512 3599b9498db392d480c08873d9e84ff1c05e5417e14e43e56f190fe4490873fec37c944a3c252942d6275a4fa4af85c82d39b62b0fdb5daa82023a2df8a3228f
+DIST rocThrust-5.1.3.tar.gz 1186518 BLAKE2B 2defe71247915940917438d4f0d0a811dca7de39e5168248968fa9c165b81d94b0e20f3df9b84db1fbdcd2eb87942dec5d3adbbe1a699eb51eeb4e1b2f0a88d0 SHA512 189c70343a410cf3f3c1589ef24c68a38b5270d8780d15261a124b8250f279a3c3c7afef38e6310d57cb1741b3ee75f0b4ac0bb9dfcf4a4fb0e7e6c0516faf74
diff --git a/sci-libs/rocThrust/rocThrust-5.1.3.ebuild b/sci-libs/rocThrust/rocThrust-5.1.3.ebuild
new file mode 100644
index 000000000000..c7ef0e87fa4a
--- /dev/null
+++ b/sci-libs/rocThrust/rocThrust-5.1.3.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+ROCM_VERSION=${PV}
+
+inherit cmake rocm
+
+DESCRIPTION="HIP back-end for the parallel algorithm library Thrust"
+HOMEPAGE="https://github.com/ROCmSoftwarePlatform/rocThrust"
+SRC_URI="https://github.com/ROCmSoftwarePlatform/rocThrust/archive/rocm-${PV}.tar.gz -> rocThrust-${PV}.tar.gz"
+
+LICENSE="Apache-2.0"
+KEYWORDS="~amd64"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="benchmark test"
+REQUIRED_USE="${ROCM_REQUIRED_USE}"
+
+RESTRICT="!test? ( test )"
+
+RDEPEND="dev-util/hip
+	sci-libs/rocPRIM:${SLOT}[${ROCM_USEDEP}]
+	test? ( dev-cpp/gtest )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=dev-util/cmake-3.22"
+
+S="${WORKDIR}/rocThrust-rocm-${PV}"
+
+PATCHES=( "${FILESDIR}/${PN}-4.0-operator_new.patch" )
+
+src_prepare() {
+	sed -e "/PREFIX rocthrust/d" \
+		-e "/DESTINATION/s:rocthrust/include/thrust:include/thrust:" \
+		-e "/rocm_install_symlink_subdir(rocthrust)/d" \
+		-e "/<INSTALL_INTERFACE/s:rocthrust/include/:include/:" -i thrust/CMakeLists.txt || die
+
+	sed -e "s:\${CMAKE_INSTALL_INCLUDEDIR}:&/rocthrust:" \
+		-e "s:\${ROCM_INSTALL_LIBDIR}:\${CMAKE_INSTALL_LIBDIR}:" -i cmake/ROCMExportTargetsHeaderOnly.cmake || die
+
+	# disable downloading googletest and googlebenchmark
+	sed  -r -e '/Downloading/{:a;N;/\n *\)$/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	# remove GIT dependency
+	sed  -r -e '/find_package\(Git/{:a;N;/\nendif/!ba; d}' -i cmake/Dependencies.cmake || die
+
+	eapply_user
+	cmake_src_prepare
+}
+
+src_configure() {
+	addpredict /dev/kfd
+	addpredict /dev/dri/
+
+	local mycmakeargs=(
+		-DSKIP_RPATH=On
+		-DAMDGPU_TARGETS="$(get_amdgpu_flags)"
+		-DBUILD_TEST=$(usex test ON OFF)
+		-DBUILD_BENCHMARKS=$(usex benchmark ON OFF)
+	)
+
+	CXX=hipcc cmake_src_configure
+}
+
+src_test() {
+	check_amdgpu
+	MAKEOPTS="-j1" cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	use benchmark && dobin "${BUILD_DIR}"/benchmarks/benchmark_thrust_bench
+}
diff --git a/sci-libs/tensorflow-estimator/Manifest b/sci-libs/tensorflow-estimator/Manifest
index c272eb0e409c..6e57a118cf8d 100644
--- a/sci-libs/tensorflow-estimator/Manifest
+++ b/sci-libs/tensorflow-estimator/Manifest
@@ -1,4 +1,5 @@
 DIST bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip 201360 BLAKE2B 0173a8edb17f344b18e42026e2f8a62a1909d4694ab0be83562b6437a3f1ef38889f069269ddd2308b41062e5f375f791be0d2631a8e52ede668203779813b56 SHA512 2ba1dc316d88947c1d17ec67154c052700e3571b8d03370a9f204cf9fe94a1bd58f93a2c4a3c0b02233ee3250053a4c30a4133b5b38745858c1d04be8c9d973f
 DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c
+DIST tensorflow-estimator-2.10.tar.gz 655011 BLAKE2B 465b405bfc5b776bc9722407f0d475b4ce8a520bded4b6f0db4c9fc771b9486a4ef08ae460f2e1c8c4be1d2882b942fff79f7f08a458eaa444f1bb44eb66e91c SHA512 63cdc97d9abf3551a931372ab91e86b1cab761ea7476182ed82ac7c56884d315107b1873376385bcdfc531465c11fe0273aefe8b88e8b333d8e7b54e7d0a09eb
 DIST tensorflow-estimator-2.8.0.tar.gz 691913 BLAKE2B 7c8059ec3c5e94f67b7fbb49b508e313f0a12eac0627b04471fe1ac82c26aaae2a120a834ce3dc5a16931119ffc31a9d96935b8f727d851885fa132eb08fa2ea SHA512 02a3009fd8f9f560dea6190989af7c58402777a414cd4bf036d24546fc4a747bb8a5515a5d6fea3bdb848cb9604239b19d43096c5f125a1fa434ae8fee44cf0a
 DIST tensorflow-estimator-2.9.0.tar.gz 654755 BLAKE2B 24cd6fc0b78144f8b529ef5b502cdbf9702dc630ac28256a99d68b98b51518b65af533897e837ced6a6da11e1260847aa0e4ebdf90d37aa22bb3bcd2841bd3ea SHA512 277e398104ac92a48e481e0ee4d3bbc607ae79d0a03c6685723a2430117461c1f17090f56ab88b2ae1c86c8dfc6ec1b44a478a1b606b4432bd68d79ac0720475
diff --git a/sci-libs/tensorflow-estimator/tensorflow-estimator-2.10.ebuild b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.10.ebuild
new file mode 100644
index 000000000000..df19c5f9a037
--- /dev/null
+++ b/sci-libs/tensorflow-estimator/tensorflow-estimator-2.10.ebuild
@@ -0,0 +1,75 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+MY_PN="estimator"
+MY_PV=${PV/_rc/-rc}
+MY_P=${MY_PN}-${MY_PV}
+
+inherit bazel distutils-r1
+
+DESCRIPTION="A high-level TensorFlow API that greatly simplifies machine learning programming"
+HOMEPAGE="https://www.tensorflow.org/"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+
+bazel_external_uris="
+	https://github.com/bazelbuild/rules_cc/archive/b1c40e1de81913a3c40e5948f78719c28152486d.zip -> bazelbuild-rules_cc-b1c40e1de81913a3c40e5948f78719c28152486d.zip
+	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip"
+
+SRC_URI="https://github.com/tensorflow/${MY_PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+	${bazel_external_uris}"
+
+RDEPEND="
+	sci-libs/tensorflow[python,${PYTHON_USEDEP}]
+	sci-libs/keras[${PYTHON_USEDEP}]"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	app-arch/unzip
+	dev-java/java-config
+	>=dev-util/bazel-4.2.2"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( CONTRIBUTING.md README.md )
+
+src_unpack() {
+	unpack "${P}.tar.gz"
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	bazel_setup_bazelrc
+	default
+	python_copy_sources
+}
+
+python_compile() {
+	pushd "${BUILD_DIR}" >/dev/null || die
+
+	ebazel build //tensorflow_estimator/tools/pip_package:build_pip_package
+	ebazel shutdown
+
+	local srcdir="${T}/src-${EPYTHON/./_}"
+	mkdir -p "${srcdir}" || die
+	bazel-bin/tensorflow_estimator/tools/pip_package/build_pip_package --src "${srcdir}" || die
+
+	popd || die
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home)
+	distutils-r1_src_compile
+}
+
+python_install() {
+	pushd "${T}/src-${EPYTHON/./_}" >/dev/null || die
+	esetup.py install
+	python_optimize
+	popd || die
+}
diff --git a/sci-libs/tensorflow/Manifest b/sci-libs/tensorflow/Manifest
index e9f80627d851..52b2e9a49db2 100644
--- a/sci-libs/tensorflow/Manifest
+++ b/sci-libs/tensorflow/Manifest
@@ -4,10 +4,14 @@ DIST FXdiv-63058eff77e11aa15bf531df5dd34395ec3017c8.zip 16646 BLAKE2B 8f6ca6feee
 DIST OouraFFT-v1.0.tar.gz 110531 BLAKE2B de0e280407e21118e2bc6ca93a7caf3c4a49d0a13eda018b1497f98851af73dda4cef56460dba310336c7ed958e34feef4784ca2575a13287dec2c1ac9a5af6d SHA512 89c6e8fd57abf26351b3efb792008a1bbe62d404a4225dcae8aa666b3782a421be071bdc9760ebb0c95b5336ee5ea517d2fa43ab915045f7cf6fd76e73578079
 DIST XNNPACK-113092317754c7dea47bfb3cb49c4f59c3c1fa10.zip 14407754 BLAKE2B db0ba9250f83e413ebb9ca956bb59886d44da86054d54eed8f3fda736eff9aa424115c7b74b60298fe5ac71171e2b3ab0d6e61ce50bcee87038d5d60e6b06559 SHA512 4febbce5126d4129881106767d282a1df87b461235236861c38bb61f075b58cfbd83778576fc4f8cfc73cba4223d5dd0453391c81cf2e99008ec40a7b26a6264
 DIST XNNPACK-11b2812d64e49bab9b6c489f79067fc94e69db9f.zip 17103217 BLAKE2B fd7143588c2b8bcc14a8336922a4b5cf72358e31efa5dae236bdebe0386daf627109396336ee62b119c4696c8b37ae256cfe34be3a1e4fa449a2b76a946e05f2 SHA512 d6b807a834f1d654729397ddca47925261e74449d47f8db559b24487da668a4ed07b7cbe4d5a87c3b69941ef92c6c77cb81b2963da1309385503c38d19f60da3
+DIST XNNPACK-6b409ac0a3090ebe74d0cdfb494c4cd91485ad39.zip 18406583 BLAKE2B ea038b5470aa806c960c07833bae30b304a1e5dd5beae392ec3e871315c7fee9c12103c50e89bec3a76bc69eb98d9bbc050bd9eb1339077edbdde758aa5123f9 SHA512 5d7fe170869c39bea8183b618158a8557a4e4ea13bd7cc8dff63ea2e70cc23f63f98e493473f6f105dfe58f0220c15472eb34fa5ceb0ba547131af90cd8d85c8
 DIST apple_support.0.12.1.tar.gz 26708 BLAKE2B ed14e5d3b93797d6ecbf2dfe2cbba32c4e6468ece25b0d8e5f07c02f4218a988cb8b963db4e4a98c70f6586b12eb77a46f1dec832256fb0a4b54cc9b87524e61 SHA512 b4d3850787c0aa43fb4443dc306642b8db1ed8423ca7a4bd56e9cc27b4b3254e2c4efbf86126e5352e4d4b1a1fe93cb8662614daafce48263e6f239ecb721d54
 DIST bazel-skylib-1.0.3.tar.gz 30711 BLAKE2B 86d6db9be4e627f6695329e16e8f9b6c2d0d683142a15f62c6924941405ab1d12292818ebf16642fc8d2664b0f113a35e002210034e80de14726387fcdafd765 SHA512 e28e62214b6c1e6724d26ebbee7c0b436b13e7b054d598788c15f03a56d248378068f5d29fae722a19d4519e2568983011ff50a13577dbc1bd174464ef4a49cc
+DIST bazel-skylib-1.2.1.tar.gz 32000 BLAKE2B fc21b333689ff4da164540b6dde18809247f032a387da49ace5d1ddfce6dc83497f5fe1c9f91633c55b2afbe8f7517f8bcb05a7de8fd6208ea224c6827791fdd SHA512 b2c8e2b71d67de4fb6af34c672c8380ad295acbc788e3dd0a62b3dbfabe7d0254c67a6afcc13957509033b692ec82a21fbfce31b5b936e643e9c0ca694e411f5
 DIST bazel-toolchains-dfc67056200b674accd08d8f9a21e328098c07e2.tar.gz 1056209 BLAKE2B 7f47207bc38766a7879874d88c07ed2a2b0ab2dfb3f054f3a24b8e00c464d46f9cd3431d6ef7d8d323e20d33ec05f2a8b3a20b804b45a49c843f0cf6b3f8cb03 SHA512 a5093e3725e020b6fe6242128dea6dec9ae091248b21c1380448059d0e8233d367068d62f41748d65b56e2ecf663d26d46a5cd448c40e282f4c50dfca483baf2
+DIST bazel-toolchains-ea243d43269df23de03a797cff2347e1fc3d02bb.tar.gz 80704 BLAKE2B baf17ce1384b10d9bced2c67a3215bb8b515e8ac7bc09c98ba76395a53d02a93e520f736ebadbd8dd7ae46584089d6279f8877381442177e3bdab3afee7cd607 SHA512 2e08f3acf7f09dc9b9b9425f6dcb6fb9c241a38f2abd55899a49763321aba81fdfcd3722861682493b3c4b086788c3d2f14995d424bfcc59f6207c12869fd872
 DIST bazelbuild-platforms-0.0.2.tar.gz 5278 BLAKE2B 0c247bb6efdc30ec2c46fd7e1eeaab6aa20c29d8f9a12e6425530c0e8bd70c4fcafe4b9168c43aa43dc59d55aa27fc975acf15840f6cdb87f0bbda31eac8fb70 SHA512 11119d44627208b04be20f63e486d871866148b52f6d66e7cae3da1fd5daa3ba5b291bad9c5fd40231add8fe770dafb6b71c4b9e0a803317a4f94f7a4be7cad9
+DIST bazelbuild-platforms-0.0.5.tar.gz 5399 BLAKE2B d53aa2dbbd526d15aef24914053a5fa7c7402e1201d94a603c8148281a933292e4815f01aae7f7f166d5325f40b14d2810d6d8e03e0780329c25299c3d8ebffe SHA512 332d5954c349a7d0b801d6338bc42193a730e8ba6c75866ccef17c5053f8f29e1d185cd33a73fe5758e96e57de0c2631974f45d18bdd58c825f9a5fc231ad8b6
 DIST bazelbuild-rules_android-v0.1.1.zip 14654 BLAKE2B 1cfd5af08c6eab9602883f62d85ef1b9eb02383f73dcc31ae84af880c9ba228ae349ac6b017c550286e248347193e2c56eba30c86174432429809447dd940ed2 SHA512 80628a5e2ca9806ab031cd0c2f2999bd67f5621a83e8300a51fe6233373bdaf7c90ff8fa9551c81e60fc904c4d7b24554327ac8ed2ee101e92c4ab9319c53f4a
 DIST bazelbuild-rules_cc-081771d4a0e9d7d3aa0eed2ef389fa4700dfb23e.tar.gz 130803 BLAKE2B 406331205e8e35fc9f7f727f6f7f9697c658af800e4b90373440c433ec5cfedfe0a3986ce5b1499a2db5b7aa4dc62efac364e73639b98864d2f63076e5b209e3 SHA512 2dc8f50c405cadf10d797117b51868fa22798c4ff7cc1c4f7d4c39fa0d2e5ffbfe8269df42f90c92e0870bb8e8a9c204d3dea237a7ded03f6275657060ee9774
 DIST bazelbuild-rules_cc-40548a2974f1aea06215272d9c2b47a14a24e556.tar.gz 129521 BLAKE2B 368feec785ba0f9abb0f02d14a48ba6ff03859be9245465817c30a0174f897a2dcb6ab1503995da0b521858f96ece3b6eafe6e36cc7e2f8feeb7b6b9620a4d22 SHA512 4573fcd097b7d288024931fd5875358bba3f6db8d904b70e191e0c9a3b34280f8aecac600862883b7692f6faf96c5e8c582441f5f5eff086917b3901fbdbb40b
@@ -15,6 +19,7 @@ DIST bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz 46
 DIST bazelbuild-rules_docker-v0.10.0.tar.gz 549649 BLAKE2B e7a537b21138a5c5d9ce360e46238f57c917d2dbf5dd17887607402227cbe7c5d68aead9db0ecdb74c09eed9dac26eb86e004a9020c251152d15beb48be0e0d7 SHA512 7802107f8520c88646728800637cce54dbcefc54aa4361288a5b46e403e41998bc23e16fbe94f23a2ca52e5c33fc255af65846963c2fd0139ca1195435ce1b03
 DIST bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip 9422 BLAKE2B bbc45c97551ee8126335b611ffca6574dac843d4db9b3221b10d26487f8eecfe38ba0cd67a4039a3ad921c25fea6294c43e4f4e7a57a060a30791acd6c4f9d39 SHA512 ba06242feb711e7fb6e821fd9ac029248b4f3e466fb1acf971d0db8196f3efe4d114ef137acbe4913073f8cbe8ccab4d47d8bafa21b867b2d6a6d57f5a647f0c
 DIST bazelbuild-rules_pkg-0.2.5.tar.gz 29857 BLAKE2B 3d03ac639c45b1cdbcaaaa039f14442277e09fe0b18d6753e6d390785613890135a5cfa9025c50e02b83db325baf4d9a0ec207b083064391cd7e8037451a417b SHA512 f37ae1e52462cf77e63c7fede7f3b31e20cb79a8ffdd453ec0291f25ba2145aa819182e1a94145b3fe47a6779777e0c65ff0660e4647bab52335dae18dca995e
+DIST bazelbuild-rules_pkg-0.7.0.tar.gz 76580 BLAKE2B 77574785070b45609d12aa2c2dd53c8cef18cb2c3a326324b5add996cc31a40f725bb3b12affcfba96540cd1d64a60fb8afa789125fe0aca328c652755d12cab SHA512 2fba108997065d753e17f1e7de1db08461416d03f8832d38e25f5151bfd0ad896565db9eb56b3702b604296a19620f9b60e5c15440855d36e64865010e6f4cdc
 DIST bazelbuild-rules_proto-11bf7c25e666dd7ddacbcd4d4c4a9de7a25175f8.tar.gz 14304 BLAKE2B cdd23ef47d247f6d1b9fbaa49edbda7e1cd55ad2e3616f43ff8d21fa42888c1f36172683e47beb3f3678a2b252d9b6c82fd692711e3133862eade8b64da06ea1 SHA512 024021816b4999b62db41709e0e9354ffdc88beb61a081b061d934241f06b1aa5be3b74324cbec94d1871e60eb65209b2e6b4bb8ca4a101218eaf6196ec6a974
 DIST bazelbuild-rules_proto-a0761ed101b939e19d83b2da5f59034bffc19c12.zip 22322 BLAKE2B 733ae2d7d94e9faa6729789ee562945465af59b184ed83c2b11670111117d965b65611df0f5cf3657c637c53db4d41c2344537bbd85208b494a3c3ad9c1df26a SHA512 341d4183e00a08c22885554d5f9654f21b14316328ec5e80eadc159d20c64611d96c5632cdf97f91922d6fe53a60c00733fadb771e1c2463abf11460c9b926f5
 DIST bazelbuild-rules_python-0.0.1.tar.gz 2302092 BLAKE2B 1db52eebf2461d779f764f2afdd070d1d0dd65eb2b83ccd98c2831da1784614ca281b114064729a9f257c64eceb62975aac8362d231c84f32abdf19aee7a1852 SHA512 40fa069a4482e2f83e29dc8e109652d14d187b2ec8efdcd36e98d117de93d66a938ed74999b42a2293fcb6eccc0a111cbbcf65c5c155579214bb1b96644280a5
@@ -22,33 +27,47 @@ DIST bazelbuild-rules_swift.0.21.0.tar.gz 170336 BLAKE2B 3e9465c37b5c5a98f9ffdda
 DIST bazelbuild-rules_swift.0.25.0.tar.gz 184783 BLAKE2B 8b1ed7432cf0bc4d12cabeafcc4d9662903d33d3a17d2bf026e34dce0dd04c969bdd910efedf435762702269753516ed32f8d9001f29d694c7743bb0209efb60 SHA512 3cf2cde3ea38ff21a84b795e18056b9895ef8a7aff6c75a00f9779e4baf2faf046acd337dfd1d3583d0939fdbaef389f6a98cb69c7a8b0d9eaf1f0c480ae93ab
 DIST cub-1.9.9.zip 619595 BLAKE2B 265b797a906b03da886de88863236c9ab90daa31498ddf848fcaf5e5ee1342614ad9a41618120ca09cc4c0da3e96eeec5e20ca9d7ba3f9860c507f06d15e59e1 SHA512 8c9c0a3f66f8d518ec07f857b5625e006d52f28bade1c1478a0f37420e2f7586dc3ff029d551748a1802bb5544b16fde5388e8d5a45d61eec595201b9db7a30d
 DIST cudnn-frontend-73210a930333eaf66b42b01693bce7b70719c354.zip 16944576 BLAKE2B abe918fb4a17e9080b40c59a3d66ea520c3034e8f2e31ca8f1114cfbd0f7f41838af49dae592463243d08952e04ceb8bc9708454a62ba02a847b0874e1000a1c SHA512 febb13ca3f93d708594259c2c3b7c11137649d2df346cb47b1501f650b8d9439dddbf33ba706693f5346b0c75d8501ac105805f2ae9ec47988d2bb8840f468ec
+DIST cudnn-frontend-v0.6.2.zip 20095331 BLAKE2B 936bf79b6ed8ddd027982c55ddaf9334919a5a765b2aa0c72d63635773d1a1c8795a5b0f557b51f93738297d1107254de4afbb809afbd1f8362dfc9fd3bbb2dc SHA512 0bde357c05a2763e9de2f3f15c0f108e82436b1d678aebe77fcf56d9568273ca75b81767720324ea6ad59809a63c023e446d8af12c8dd5b567bad4f7a3abdf64
 DIST dlpack-3efc489b55385936531a06ff83425b719387ec63.tar.gz 39637 BLAKE2B 532a3ce3d0e354a73c19433f0210a64ecbf00d9134d06a0ee7462baaff3f2b981524aa630cf250595671d6673105724482c7d69e803179aac247f2020c883bd0 SHA512 3728db5213e887fd946f64ba5dc0c336be9a72a0966ee83f146148749ffc93ddb342e0735df6117d7943874c18f87de5791a28e4a57ea420bb8a4e2a5b7338bc
 DIST dlpack-790d7a083520398268d92d0bd61cf85dfa32ee98.tar.gz 45837 BLAKE2B a4a117b17c1a4d30efc41da045667a09740184bbc677be4a812146954288e3a0fdf7763481720b060330b9fd382fad0353e7b0dab224321dc83af3c336466ac3 SHA512 34ed254f3971f80d57ecf3f49e282e25405810c09dffaceb047af5088d0c2a16532b1f77cf6d49f60b31f419a01a903651adee7dfcced8c5051c441d24758835
+DIST dlpack-9351cf542ab478499294864ff3acfdab5c8c5f3d.tar.gz 76170 BLAKE2B c28873deab233d73996137c254acecc4adb0a750cee675cfd0777ccdfa91ea704e338e7166705d47e775c45b46b152834268d89c0443a08c57b4b830bd07ac71 SHA512 e6a4fe9356b8f75f96e7f9960df40e227f8e5242e609f8cc8bf28e8161bd4f58e8c6de374d9cf216edf7e0e09ca502bc158d41c3058bc6e6e7b2bbfb9c5483ff
 DIST eigen-008ff3483a8c5604639e1c4d204eae30ad737af6.tar.gz 2733792 BLAKE2B 58becba24ee639faa81d00a9690cb5ec0f1a687602bfc14b376731a91cb4aa972dc6373a706d3c39b89b0950c6ab4b59213b274e0ea53d7d0047103d3dbce6cd SHA512 cf46389aa5f22880ff88a523df2ca011d8ed2490012832c58601ff65732452f294965cb7a7eeb1cfb358053a19cc19d74f5c7165a748b1a662f99c9eb60d2c87
 DIST eigen-085c2fc5d53f391afcccce21c45e15f61c827ab1.tar.gz 2734859 BLAKE2B 2085b4ecf978aa36d6323d8ead00cd27994d5e92b341587bf5dc60e2a123c809f61be48058fdbb0e2a2f272412be847b1c95245bc159b430c727d3f831d9733a SHA512 1f5222718a538e16a0703592cc8f3f0f94fdfbb30d46f8f5d8cc3ba4716eb7ea65dc855665c9ce9f966cc2cf71d46b2ac67ef69b808c1bc3fec6a87ca19af163
+DIST eigen-0e187141679fdb91da33249d18cb79a011c0e2ea.tar.gz 2778715 BLAKE2B 6ff206bb5e91a8536579ad7257eebe42547a490d3636fedd4fb479009d837b2b85b75a83a528f6861998796137a90143c601c2a81f2378f1aea83f1f1503fc0f SHA512 de66aa844cd5f931bed0409e82d35c65a600699b55befee418673400b83830cefc10b95f52a6e4ff56d01541e1257d74a35045aa141ec2741ea7fda6f7d7889c
 DIST farmhash-0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz 467251 BLAKE2B 74fd0cf3de41a6db0aac74148f795335df58b5a3bdd370b22ae0763aba5a4952dcd0133ed300350636a4678ff54a5c59eedee749dfcef7283e21c181b88f92cb SHA512 7bc14931e488464c1cedbc17551fb90a8cec494d0e0860db9df8efff09000fd8d91e01060dd5c5149b1104ac4ac8bf7eb57e5b156b05ef42636938edad1518f1
 DIST gemmlowp-e844ffd17118c1e17d94e1ba4354c075a4577b88.zip 940590 BLAKE2B 72e8ef48e6c20d3f3510eb3a891748df386f3ac127e79cd5c594b7289826294e29be5987632800898d94d6ded9016e398672fbdabd07af8f55d458540e66ec7b SHA512 b5683bd6e1cb942d0e1e07c3bd28d83d74706c45a33b59896124f659f361bb4f93181d3ccd282d9dd61df49695b38470f138ffd2c88b6d11fe160a0266d3909a
 DIST gemmlowp-fda83bdc38b118cc6b56753bd540caa49e570745.zip 936866 BLAKE2B 0977df121a80de979a9996b58a0a8cad157db8d0862b96f95b3be1157cddbc6b40dff4fc7da4ee78f5986cbfff2a67c173155e849e772ae476398c51f3028311 SHA512 4bf036de43f5e0890f66e0b16cd9a0f52911b160f79c9c50cf403454fa9d6040df225d34e02f424da8bb8c5f7f5c002f88f4d232c61503aa825c907ad8742823
+DIST highwayhash-c13d28517a4db259d738ea4886b1f00352a3cc33.tar.gz 160745 BLAKE2B f2ffe8f13b1a8346b5b29e719c0a57f34e1fa6320d0f2d0575e4e97e813ed1a8f55acfb44b57aba70ea7d372ade18aee5ef82a881ecf457f580ffc92d6528c7b SHA512 4d6a7e8e321df82c009a0849b8da097a551f6c35a49fef65b89e731075a6af624918c0e55be9fd3a5bf07c519ab09bdefed57e0e39d4df0e79e189c468939de7
 DIST highwayhash-fd3d9af80465e4383162e4a7c5e2f406e82dd968.tar.gz 138574 BLAKE2B cecd95039fc31545ced38a1949e7cb31d6f34deef7c8923b573aa7a632576d0a9b60fd24fbc8a40b8a840a7d2442ea28382fe842178a77467772ed4ba8a2cfb6 SHA512 d25162ed266a8c9c00e6978fcf642cf924f03c0d196f971d0d6f6a3454ca7dfc82f758eabd038ac08e0a5dacc51eccb9b674f588f64692f37cb7a17150aefe4f
+DIST kissfft-131.1.0.tar.gz 52383 BLAKE2B 74e6d2e7d132a311b31c28a468e13d9772a53f0ea0abed0e0f49d8db9c183fb0646f58fd38df3e797b8577285899daf6b80446b149ce2582bb828410656d96df SHA512 bd715868ce0e93a291a0592fb1f8b960e832fc64efe863755e52b67d5addff9bcb444a1bf2570d1914c52b41dad1023d0d86400f5ea30c9fb84cd6b4f7210708
 DIST kissfft-36dbc057604f00aacfc0288ddad57e3b21cfc1b8.tar.gz 44744 BLAKE2B aeea5d23c122417ddb70a44354890242c4fb61c456fba9af79054293a1355939af51a681760ac27be55423f888649fd2826e634422c7e9cb3749a9d7f50ef990 SHA512 30f4fcd351bbcb950a27e2a77ca100ccdfd37deb17a05e7e31c3e8f1c56d7c626ab81bbd7497484e6b512e41f7b1bed714722a194b2218c669b297911101df7b
+DIST llvm-project-0538e5431afdb1fa05bdcedf70ee502ccfcd112a.tar.gz 166280516 BLAKE2B 3102aeab615f1ae59271b8d6eca559e19ce2b4648642de08857bc983a222a904271bb222fe9c388ca01f8959533c37158f503ef607cd0c189b5c0e1ba7e01964 SHA512 6f9559ce94a116602f070e231e5dd8b1d50d1cdb38ffc8099fc07d1d4d492b41a707c30da7e57bee800e7f6d811f7bf82d9bf7428ac29904621ba4760061ec87
 DIST llvm-project-2760cdc9c6e42b92d311c697c54f7d79f8d668e4.tar.gz 162328438 BLAKE2B 8a8367aff664467aca4d0f688aebc0da54634dbd9d231a5fab7161048c721d58f6236c0ed3239408c9f77ae9699a89a0840ccf109f7f4544113e4287766239b3 SHA512 3a523ecacc2bd826d8a4acb04ac676720de423c459d47db71cc081ada8bf150cf99a4e43127a138239dbbfb65914f5645f5c87ea5fe8473ed5ac42fe67637d3f
 DIST llvm-project-55c71c9eac9bc7f956a05fa9258fad4f86565450.tar.gz 156068346 BLAKE2B b7c67175a36ae493969a9a4bc9d0c808a1deb7d488445d8c91a53e807442789861779652a398f1d308e46090d0f0a00b15917d192f3ad90f94ab98ea08a952da SHA512 62a1576722ada202f7004ac00d5e79a19c5a01a0ec5fc9f159736aea75f05faf231258383ff5cd8813777ed61cf3bc2ab95ae86371674f0d1d78bf8ac875828a
 DIST llvmorg-10.0.1-openmp-10.0.1.src.tar.xz 955492 BLAKE2B 4197ecfb2e3498a95a2ba5923f2b4bdafbab645ddf2d3f1875d39752d3ab7304fb35bce918d2dc6e40e5ea809545ae0907d6bc0b94a3d68b8d96da48f5a62adc SHA512 5b6f6487feaabd2a18ef2bbb1a5f86bb567e264f9fdf56805cfdd3f65f36f21e7c1392ba5170fafb52a395fc1606b277233beba3df31dc2ab825ef8924e7a05a
+DIST nvidia-nccl-v2.12.12-1.tar.gz 269622 BLAKE2B 079c8199e4ac832ce8b92b1964aa4a58afe12f72e92f4f8318ec80aaeff9fc97bdea48d21c024ea2a80a59d0ed94e89578471e5d9627ac6e0256fcd289727256 SHA512 51297f22c43f1e5b65f8433fdfc6cb1129aafabf69f133cf643354bd60250370b32f4ae7e96df70eab75308e670bb412d7e7232a48ca4467e4d8ac4ffde62699
 DIST nvidia-nccl-v2.8.3-1.tar.gz 203650 BLAKE2B 2b4995aa04b0b204c7315420b6d130c90baadf78f709b82352701c29116fbf053878e62623b6949ab114051a4df828536764bbe9374ab817af9a56879d7d8f08 SHA512 9a17b570ebda54116b1292899e086724c57c7b8ef03f8c529f760f79294cb710f599c2fddc29ab6bc4b843271af9e824dd1af1e705b98fdcbc201f737490d8f3
 DIST oneDNN-v2.5.1.tar.gz 5807775 BLAKE2B da852ddd92d4573645448d30dc35fd68c07deef99c7280cea99a5de7c57fc8fc348cdbeff77aeef8189beaac830315d681a139be55719d9df85529bca781475f SHA512 cce14aaacdc822d606e747f30e552062ca1bd342b262568253008ed4f145cd6fe42a19421ee15245f63d009b305a39ea435a055305570cedff2752d251b7f7d4
+DIST oneDNN-v2.6.1.tar.gz 5845474 BLAKE2B 207457ff5f2f7ee59112c5b5959ba714cbe673f2f6a8ec1515bb004c9cc339c8d8c381fcd34a00d137ba12f425537a8cc847dd67b4abb4e824e2154f9a6ab31e SHA512 6fc9874b192f096a493b3f86f5a889b7b3c4ada6f067cbfe059dc449d717e15ea58dcb55896e161b197ed1818fb808c3f5d2ce285a1d1e9a3610e8ca80a48d11
 DIST oneDNN-v2.6.tar.gz 5840464 BLAKE2B 9c593a55b791d877dde5b495cfcd4c255f53a3deeedf7867d53a7cf1294e34bb8d483d11e96e1b95ae5f621016fb6db63f94c1fcdf91cc0ba4f5d0ee0f0828ef SHA512 4cb7b80bfe16920bc096e18e7d8caa56b9ab7a4dab2a091a230bcf562c09533392f4a4ccd4db22754a10293670efdea20382db0994dc47949005a4c77f14b64c
 DIST pthreadpool-b8374f80e42010941bda6c85b0e3f1a1bd77a1e0.zip 61524 BLAKE2B 924419730bc6b94ec98a13db94f177b3b70d6c763158f43fb6f9e45605e73cfce238e6c996e2bf629dbb2a5af93ae99849ddc91174fc4664d702667f7423892d SHA512 d25262b47e39058d5aa8b8197c4984a5b941587a19079a2210f738c3af34ab8e8477731c88ca80c3f812a6a04635f80300124d93cc1e099352ef2aca04bdc3ae
 DIST pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip 3787933 BLAKE2B 169620d461103f271ae927d84af27282189509b2ba2fbed2c09f9ae387b5f392eea635dfdf2d3a23e1fc19b5d467bee3f13d3e473946e42bba4b6a9a2fd60e32 SHA512 6f1c8c931b62990ab0228679efb52207a6e21cb847139c11bf6117051b7315ff87c12ed1373670d006f0bc7e3d390d59f2d28a8250d0bd7df850583ae42afdf2
+DIST pytorch-cpuinfo-5e63739504f0f8e18e941bd63b2d6d42536c7d90.tar.gz 3512335 BLAKE2B 71c14866fde3846b5f375b39fe2f081a6c219b36fc0721640971f99c53ca77c8e7f8df83992d777af32a28c645d64f27dca838bd8e60835c5497e131467b22d0 SHA512 6a61f4574661a55771c2ec31bb0919a51d0bd8c770477b254a5c14dc5323716af275c7fe3abc5aa96720d7cc929559ca66f614265d3940e076b8db2fa15c8e36
 DIST pytorch-cpuinfo-d5e37adf1406cf899d7d9ec1d317c47506ccb970.tar.gz 3489028 BLAKE2B aa6b7719eb9871b6cc71318cb4a9c2e2397e665662b7978daecd9e8380304691a78b95118eba5cbbb738c4b490352a847f6ce6b5c4ae29de0543b95ecc557cbb SHA512 ecd2115340fa82a67db7889ce286c3070d5ab9c30b02372b08aac893e90ccebc65c6b3e66aa02a9ae9c57892d2d8c3b77cb836e5fc3b88df2c75d33e574d90d2
 DIST re2-506cfa4bffd060c06ec338ce50ea3468daa6c814.tar.gz 316237 BLAKE2B 8a975bc3e78b690f70944651c7022c6d946f40b2eb5fe01b2e203141f94b890cf1ad5c72af8e7c6ff3c5242d42af5a8657ed69e3c74d9ac081beb15de6334c0c SHA512 e3e00e92700d08bc55ba0e96148ddf1e00de2d329c1fdac08691ff15976937829f66dbc84af886a4b749ad66ba4ab208d66811e97e33bb9c2d7359735406c450
+DIST re2-a276a8c738735a0fe45a6ee590fe2df69bcf4502.tar.gz 306766 BLAKE2B 54162a22afe10b392e30864729b3b210194c0dbf7926cc3536dfe3afd43e0b8abf3d01b08e0feb71a8ade19cd497aea9e9b7b34eacb85e10cc7e1c5fd62a407d SHA512 9557830cea13485bd332ccdcdd3735ea63e6bb41f4cf943ecc24a1d79b75a58c5894cfe70c4a35a07a1b2b1f3d2ffa76fbeff168fda17c72b3436cb6213121dd
 DIST rules_apple.0.33.0.tar.gz 2168079 BLAKE2B eac0462030d02a8c3237d0d5aa0ca6e34fdb076c1a31c03bb60c03f1d25f94a2882daad95ec00317bc13381e30318e95d1f618c31ca4293cc8e6ffeeaf19ed81 SHA512 917b402d3bd39ba47c7169d1a6074d60ea7935e564120ed54ae3144069742c9fc6cb38562b66f62a7000e768dfe997e7084b130e1854509c2a6bdcb91f62875c
+DIST ruy-841ea4172ba904fe3536789497f9565f2ef64129.zip 379664 BLAKE2B 82f54b4e7959ca2ff489cf0eaa7c01c5084b11174a43e2caa8f30dcd3951fb9552e513fa0488190fa73dde62719bfd8e4be59bd264fe316ec5b9852db2494ed2 SHA512 e10bed1901eb53cc0174d8723b67b7ff4f7021b5d94e8e7596879a9a625e77948f265d430b5c56f7789030874ba08bdb5263796212d9b60affd1a20694ec3317
 DIST ruy-e6c1b8dc8a8b00ee74e7268aac8b18d7260ab1ce.zip 375516 BLAKE2B d026fcb8cf5226fca9153bd5acb848f04382cf759efda334e9bdbc58cb838a54c8e26d85d8c1577cca835b82319a80a61c7be83e6f61e0dab01d8119995a6c2e SHA512 e556764ef8505509cadf6cf28bb172be96b3650b410b1ccc3a34ef4c2bb8f67e911597962dd392c6441e68d329c66a0f0215fa545df01c63912adda1b08b25ce
 DIST sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz 2569603 BLAKE2B cd66dc8a0b4ad3ea586a79ef588c8d68e4f05b6ea89e6d8119b5ee338b9046c11a747ca57c2f80a3c90fab119c05e85f5965571c9e522ccb8a312b95804d1a36 SHA512 b819d050bb38246b503f1eb3d6e7d878d0f166f3602ae3c327749b1f6ddc2b1d6ac7f768b1f1d055b98b7b98812e4643a75bcebc9728c7f615d67ca739761b3e
 DIST tensorflow-1.15.0-python-license.rst.txt 45132 BLAKE2B 8a8ace4b64fd9eda1932272704dd4fea002d2562cd9c2c94470d3ff5de58bb171ff849d3f998ea90cd779d1084d39af1267aca8400b74b701205d2e76e6a2628 SHA512 c79c42f4ceecf33c8f8778ca17b53595b75d5d0bdf30b11058cf01dd70a6351f530ca9dd846460aba14edc1d5876f7bf6fa0f9f49f7915590b0f54d267ce3856
+DIST tensorflow-2.10.0.tar.gz 66644994 BLAKE2B 5d6cda635d9cba90d9d170a9af137d7d1f9e37d8bfd15993fd1724fc16d1642b7894c8aadf9115a2ee876562c0af0c60bdb34f181e87478909dced125a3f2780 SHA512 bf8a6f16393499c227fc70f27bcfb6d44ada53325aee2b217599309940f60db8ee00dd90e3d82b87d9c309f5621c404edab55e97ab8bfa09e4fc67859b9e3967
 DIST tensorflow-2.8.0.tar.gz 65416640 BLAKE2B 0446678db956e6f583a4a79d93d89285be0aafe1b62a83fad8b88f1d9bebd82de1e83661477d6e959934413a0176f25ce063bef608ed429576fd1439350713ea SHA512 9cddb78c0392b7810e71917c3731f895e31c250822031ac7f498bf20435408c640b2fba4de439fa4a47c70dbff38b86e50fed2971df1f1916f23f9490241cfed
 DIST tensorflow-2.9.0.tar.gz 66647793 BLAKE2B bc12e0735e5c0eb9dfbd31c6e855d820045a165c9b6d09a6a26af54a38de5b6feabae7bc49539d6a5d5333516f49a91e3d94c08b4fc01e044062bb1f8b156f2c SHA512 1196f8bdf1e3dba53b1d96f32d5f99f1f372a06feafa46147b636f19ad7de0e877a82619770e6393c2cd72093147b848d1cc30a0a989826f7ab2c1f7a06b08b6
+DIST tensorflow-patches-2.10.0.tar.bz2 2951 BLAKE2B c97643e19048511ac142408323bc03f04f1bda75332cbca15cafd4e6184190905812c9096960236498390b6fadbcf111aeb34696d177dd006dd2d6bd2cd9ff4e SHA512 188cc59e2aa3065c5c5a038c9aab9dda784c194f424478d5a8cf14762fbc63780023d364b05963964b9a6db5f464dfb4e4ad9be0d4cf0c792695d7e9815311cd
 DIST tensorflow-patches-2.8.0.tar.bz2 7950 BLAKE2B 21961f7b12294c51e1ed97445f02845502bb680b502bffea57732468417ef1c556246b29f630392e7045efe909452a44055b827b7b75533f5b8440240abf0508 SHA512 454b0a909f04b63e5f9de598981077c21ba9bee22b4251566c298ed7c7a7e6edae628b1f995de4f9fb1b84e4b80e6b42c19cdf363de13e43534994bf7e2b17b8
 DIST tensorflow-patches-2.9.0.tar.bz2 10683 BLAKE2B c2e783004ad779d96d7b794a051baa484649b9f090c06dded15cd0357435da22a5abfa877d2b0a7622df7cb9cea8e0d691666f7aacc5962c390d7aed71426f5e SHA512 8df1888d48a61fa84b64d43a849a6fce5302cb1259fa093d0485a915ad1fe87f9c09a8f75d371ce164c5d0b631ba9110d87501109cb8afe0993b686f5f3c1cf9
 DIST tensorflow-runtime-093ed77f7d50f75b376f40a71ea86e08cedb8b80.tar.gz 15323415 BLAKE2B 5d4277b032bdb7002d1766abb2300c48728057d0bb81559d44f567a4b2a33a0b90d9298471677838159fdbe062328f64a2a7db839975a7359e1cca82c83ec812 SHA512 e9dc796739cfc7ed9a03ac7fa7896959da8312d95afb53d9c50c14218393f772c2196f27c01353d95b0d723bb6893fe8037f32de80c4009ade018abdba863621
+DIST tensorflow-runtime-6ca793b5d862ef6c50f242d77a811f06cce9b60a.tar.gz 15397674 BLAKE2B 89131434c6d8bf93cfc6ba14ec5455b188ec6527398444a5042d6d17631f9e2c1d192847a6e48338ac9a18d7c63531779d4c7c77183761d7e51ca3e7b6ea17a3 SHA512 b29f616f41ba5fb5639eafba82f2dfc51702eb9937ad720f547d285097c17f1291fa1131e7771d58fc2924c489e7779abc7c04fe230ceb917f4ba751a3893f0e
 DIST tensorflow-runtime-c3e082762b7664bbc7ffd2c39e86464928e27c0c.tar.gz 15263217 BLAKE2B cb782725c7e876ee39c2d9dab589c40ebbfea6b1002bd7809464514e46c5cdff30defcfac9c0bea3863d6c525ea919c201874774c194252f70ea44ea45da5f61 SHA512 2f01b37e7f042d35f6fb854db67afc46451b6d9120317dca8bb255e53825460ab9ad34a6cf6e2cd2728bb2117e2aa056f826ccacdcf4f898512715d58f5b4339
 DIST tensorflow-toolchains-v1.3.2.tar.gz 98057 BLAKE2B 01dda11552a989344c9efb0aceb16aea632fbd97ef4687bfd7d6967631ea6ad81c5d2de065a793a25048781b57f881bf2cadf9ba1aabe0f23c836cf062e32278 SHA512 cdf32e849ca4fda6417bd0e1243501e8f9416086dc0dddf3535229c6be33368010584f4709e5acf2b81a4fdee53c27cf81fed1a940db100819851432ec5756fc
diff --git a/sci-libs/tensorflow/tensorflow-2.10.0.ebuild b/sci-libs/tensorflow/tensorflow-2.10.0.ebuild
new file mode 100644
index 000000000000..fa51174d5a79
--- /dev/null
+++ b/sci-libs/tensorflow/tensorflow-2.10.0.ebuild
@@ -0,0 +1,419 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_OPTIONAL=1
+PYTHON_COMPAT=( python3_{8,9,10} )
+MY_PV=${PV/_rc/-rc}
+MY_P=${PN}-${MY_PV}
+DEP_VER="$(ver_cut 1-2)"
+
+inherit bazel check-reqs cuda distutils-r1 flag-o-matic prefix toolchain-funcs
+
+DESCRIPTION="Computation framework using data flow graphs for scalable machine learning"
+HOMEPAGE="https://www.tensorflow.org/"
+
+RESTRICT="test" # Tests need GPU access
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE="cuda mpi +python xla"
+CPU_USE_FLAGS_X86="sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma3 fma4"
+for i in $CPU_USE_FLAGS_X86; do
+	IUSE+=" cpu_flags_x86_${i}"
+done
+
+# distfiles that bazel uses for the workspace, will be copied to basel-distdir
+# pkgcheck complains but do NOT change the .zip to .tar.gz, bazel requires the exact tarball (basename and sha256).
+# the build will fail if different archives are used.
+bazel_external_uris="
+	https://github.com/bazelbuild/platforms/releases/download/0.0.5/platforms-0.0.5.tar.gz -> bazelbuild-platforms-0.0.5.tar.gz
+	https://github.com/bazelbuild/apple_support/releases/download/0.12.1/apple_support.0.12.1.tar.gz
+	https://github.com/bazelbuild/bazel-skylib/releases/download/1.2.1/bazel-skylib-1.2.1.tar.gz
+	https://github.com/bazelbuild/bazel-toolchains/archive/ea243d43269df23de03a797cff2347e1fc3d02bb.tar.gz -> bazel-toolchains-ea243d43269df23de03a797cff2347e1fc3d02bb.tar.gz
+	https://github.com/bazelbuild/rules_android/archive/v0.1.1.zip -> bazelbuild-rules_android-v0.1.1.zip
+	https://github.com/bazelbuild/rules_apple/releases/download/0.33.0/rules_apple.0.33.0.tar.gz
+	https://github.com/bazelbuild/rules_cc/archive/081771d4a0e9d7d3aa0eed2ef389fa4700dfb23e.tar.gz -> bazelbuild-rules_cc-081771d4a0e9d7d3aa0eed2ef389fa4700dfb23e.tar.gz
+	https://github.com/bazelbuild/rules_closure/archive/308b05b2419edb5c8ee0471b67a40403df940149.tar.gz -> bazelbuild-rules_closure-308b05b2419edb5c8ee0471b67a40403df940149.tar.gz
+	https://github.com/bazelbuild/rules_docker/releases/download/v0.10.0/rules_docker-v0.10.0.tar.gz -> bazelbuild-rules_docker-v0.10.0.tar.gz
+	https://github.com/bazelbuild/rules_java/archive/7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip -> bazelbuild-rules_java-7cf3cefd652008d0a64a419c34c13bdca6c8f178.zip
+	https://github.com/bazelbuild/rules_pkg/releases/download/0.7.0/rules_pkg-0.7.0.tar.gz -> bazelbuild-rules_pkg-0.7.0.tar.gz
+	https://github.com/bazelbuild/rules_proto/archive/11bf7c25e666dd7ddacbcd4d4c4a9de7a25175f8.tar.gz -> bazelbuild-rules_proto-11bf7c25e666dd7ddacbcd4d4c4a9de7a25175f8.tar.gz
+	https://github.com/bazelbuild/rules_python/releases/download/0.0.1/rules_python-0.0.1.tar.gz -> bazelbuild-rules_python-0.0.1.tar.gz
+	https://github.com/bazelbuild/rules_swift/releases/download/0.25.0/rules_swift.0.25.0.tar.gz -> bazelbuild-rules_swift.0.25.0.tar.gz
+	https://github.com/dmlc/dlpack/archive/9351cf542ab478499294864ff3acfdab5c8c5f3d.tar.gz -> dlpack-9351cf542ab478499294864ff3acfdab5c8c5f3d.tar.gz
+	https://github.com/google/farmhash/archive/0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz -> farmhash-0d859a811870d10f53a594927d0d0b97573ad06d.tar.gz
+	https://github.com/google/gemmlowp/archive/e844ffd17118c1e17d94e1ba4354c075a4577b88.zip -> gemmlowp-e844ffd17118c1e17d94e1ba4354c075a4577b88.zip
+	https://github.com/google/highwayhash/archive/c13d28517a4db259d738ea4886b1f00352a3cc33.tar.gz -> highwayhash-c13d28517a4db259d738ea4886b1f00352a3cc33.tar.gz
+	https://github.com/google/re2/archive/a276a8c738735a0fe45a6ee590fe2df69bcf4502.tar.gz -> re2-a276a8c738735a0fe45a6ee590fe2df69bcf4502.tar.gz
+	https://github.com/google/ruy/archive/841ea4172ba904fe3536789497f9565f2ef64129.zip -> ruy-841ea4172ba904fe3536789497f9565f2ef64129.zip
+	https://github.com/joe-kuo/sobol_data/archive/835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz -> sobol_data-835a7d7b1ee3bc83e575e302a985c66ec4b65249.tar.gz
+	https://github.com/llvm/llvm-project/archive/0538e5431afdb1fa05bdcedf70ee502ccfcd112a.tar.gz -> llvm-project-0538e5431afdb1fa05bdcedf70ee502ccfcd112a.tar.gz
+	https://github.com/llvm/llvm-project/releases/download/llvmorg-10.0.1/openmp-10.0.1.src.tar.xz -> llvmorg-10.0.1-openmp-10.0.1.src.tar.xz
+	https://github.com/mborgerding/kissfft/archive/131.1.0.tar.gz -> kissfft-131.1.0.tar.gz
+	https://github.com/oneapi-src/oneDNN/archive/refs/tags/v2.6.1.tar.gz -> oneDNN-v2.6.1.tar.gz
+	https://github.com/petewarden/OouraFFT/archive/v1.0.tar.gz -> OouraFFT-v1.0.tar.gz
+	https://github.com/pytorch/cpuinfo/archive/5916273f79a21551890fd3d56fc5375a78d1598d.zip -> pytorch-cpuinfo-5916273f79a21551890fd3d56fc5375a78d1598d.zip
+	https://github.com/pytorch/cpuinfo/archive/5e63739504f0f8e18e941bd63b2d6d42536c7d90.tar.gz -> pytorch-cpuinfo-5e63739504f0f8e18e941bd63b2d6d42536c7d90.tar.gz
+	https://github.com/tensorflow/runtime/archive/6ca793b5d862ef6c50f242d77a811f06cce9b60a.tar.gz -> tensorflow-runtime-6ca793b5d862ef6c50f242d77a811f06cce9b60a.tar.gz
+	https://gitlab.com/libeigen/eigen/-/archive/0e187141679fdb91da33249d18cb79a011c0e2ea/eigen-0e187141679fdb91da33249d18cb79a011c0e2ea.tar.gz
+	https://github.com/google/XNNPACK/archive/6b409ac0a3090ebe74d0cdfb494c4cd91485ad39.zip -> XNNPACK-6b409ac0a3090ebe74d0cdfb494c4cd91485ad39.zip
+	https://github.com/Maratyszcza/pthreadpool/archive/b8374f80e42010941bda6c85b0e3f1a1bd77a1e0.zip -> pthreadpool-b8374f80e42010941bda6c85b0e3f1a1bd77a1e0.zip
+	https://github.com/Maratyszcza/FP16/archive/4dfe081cf6bcd15db339cf2680b9281b8451eeb3.zip -> FP16-4dfe081cf6bcd15db339cf2680b9281b8451eeb3.zip
+	https://github.com/Maratyszcza/FXdiv/archive/63058eff77e11aa15bf531df5dd34395ec3017c8.zip -> FXdiv-63058eff77e11aa15bf531df5dd34395ec3017c8.zip
+	cuda? (
+		https://github.com/NVIDIA/cudnn-frontend/archive/v0.6.2.zip -> cudnn-frontend-v0.6.2.zip
+		https://github.com/NVlabs/cub/archive/1.9.9.zip -> cub-1.9.9.zip
+		https://github.com/nvidia/nccl/archive/v2.12.12-1.tar.gz -> nvidia-nccl-v2.12.12-1.tar.gz
+	)
+	python? (
+		https://github.com/intel/ARM_NEON_2_x86_SSE/archive/1200fe90bb174a6224a525ee60148671a786a71f.tar.gz -> ARM_NEON_2_x86_SSE-1200fe90bb174a6224a525ee60148671a786a71f.tar.gz
+		https://storage.googleapis.com/mirror.tensorflow.org/docs.python.org/2.7/_sources/license.rst.txt -> tensorflow-1.15.0-python-license.rst.txt
+	)"
+
+SRC_URI="https://github.com/${PN}/${PN}/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz
+		https://dev.gentoo.org/~perfinion/patches/tensorflow-patches-${PVR}.tar.bz2
+		${bazel_external_uris}"
+
+# abseil-cpp-20211102.0-r0 does not work with NVCC
+RDEPEND="
+	app-arch/snappy
+	>=dev-cpp/abseil-cpp-20211102-r2:=
+	dev-db/lmdb
+	dev-db/sqlite
+	dev-libs/double-conversion
+	dev-libs/icu:=
+	>=dev-libs/jsoncpp-1.9.2:=
+	>=dev-libs/nsync-1.25.0
+	dev-libs/openssl:0=
+	>=dev-libs/protobuf-3.13.0:=
+	>=dev-libs/re2-0.2019.06.01:=
+	media-libs/giflib
+	media-libs/libjpeg-turbo
+	media-libs/libpng:0
+	>=net-libs/grpc-1.28:=
+	net-misc/curl
+	sys-libs/zlib
+	>=sys-apps/hwloc-2:=
+	cuda? (
+		<dev-util/nvidia-cuda-toolkit-11.8_pre:=[profiler]
+		=dev-libs/cudnn-8*
+	)
+	mpi? ( virtual/mpi )
+	python? (
+		${PYTHON_DEPS}
+		>=dev-libs/flatbuffers-2.0.6:=
+		dev-python/absl-py[${PYTHON_USEDEP}]
+		>=dev-python/astor-0.7.1[${PYTHON_USEDEP}]
+		dev-python/astunparse[${PYTHON_USEDEP}]
+		dev-python/clang-python[${PYTHON_USEDEP}]
+		dev-python/dill[${PYTHON_USEDEP}]
+		dev-python/flatbuffers[${PYTHON_USEDEP}]
+		>=dev-python/gast-0.3.3[${PYTHON_USEDEP}]
+		dev-python/h5py[${PYTHON_USEDEP}]
+		>=dev-python/numpy-1.19[${PYTHON_USEDEP}]
+		>=dev-python/google-pasta-0.1.8[${PYTHON_USEDEP}]
+		>=dev-python/opt-einsum-3.3.0[${PYTHON_USEDEP}]
+		>=dev-python/protobuf-python-3.13.0[${PYTHON_USEDEP}]
+		dev-python/pybind11[${PYTHON_USEDEP}]
+		dev-python/six[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		dev-python/termcolor[${PYTHON_USEDEP}]
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+		>=dev-python/grpcio-1.28[${PYTHON_USEDEP}]
+		>=dev-python/wrapt-1.11.1[${PYTHON_USEDEP}]
+		>=net-libs/google-cloud-cpp-0.10.0
+		>=sci-visualization/tensorboard-${DEP_VER}[${PYTHON_USEDEP}]
+	)"
+DEPEND="${RDEPEND}
+	python? (
+		dev-python/mock
+		dev-python/setuptools
+	)"
+PDEPEND="python? (
+		>=sci-libs/keras-${DEP_VER}[${PYTHON_USEDEP}]
+		>=sci-libs/tensorflow-estimator-${DEP_VER}[${PYTHON_USEDEP}]
+	)"
+BDEPEND="
+	app-arch/unzip
+	>=dev-libs/protobuf-3.8.0
+	dev-java/java-config
+	>=dev-util/bazel-5.1.1
+	cuda? (
+		>=dev-util/nvidia-cuda-toolkit-9.1[profiler]
+	)
+	!python? ( dev-lang/python )
+	python? (
+		dev-python/cython
+		dev-python/mock
+		>=dev-python/grpcio-tools-1.28
+	)"
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+S="${WORKDIR}/${MY_P}"
+
+DOCS=( AUTHORS CONTRIBUTING.md ISSUE_TEMPLATE.md README.md RELEASE.md )
+CHECKREQS_MEMORY="5G"
+CHECKREQS_DISK_BUILD="10G"
+
+get-cpu-flags() {
+	local i f=()
+	# Keep this list in sync with tensorflow/core/platform/cpu_feature_guard.cc.
+	for i in sse sse2 sse3 sse4_1 sse4_2 avx avx2 fma4; do
+		use cpu_flags_x86_${i} && f+=( -m${i/_/.} )
+	done
+	use cpu_flags_x86_fma3 && f+=( -mfma )
+	echo "${f[*]}"
+}
+
+pkg_setup() {
+	local num_pythons_enabled
+	num_pythons_enabled=0
+	count_impls() {
+		num_pythons_enabled=$((${num_pythons_enabled} + 1))
+	}
+	use python && python_foreach_impl count_impls
+
+	# 10G to build C/C++ libs, 6G per python impl
+	CHECKREQS_DISK_BUILD="$((10 + 6 * ${num_pythons_enabled}))G"
+	check-reqs_pkg_setup
+}
+
+src_unpack() {
+	# Only unpack the main distfile
+	unpack "${P}.tar.gz"
+	unpack tensorflow-patches-${PVR}.tar.bz2
+	bazel_load_distfiles "${bazel_external_uris}"
+}
+
+src_prepare() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+
+	append-flags $(get-cpu-flags)
+	append-cxxflags -std=c++17
+	export BUILD_CXXFLAGS+=" -std=c++17"
+	filter-flags '-fvtable-verify=@(std|preinit)'
+	bazel_setup_bazelrc
+
+	eapply "${WORKDIR}"/patches/*.patch
+
+	# Relax version checks in setup.py
+	sed -i "/^    '/s/==/>=/g" tensorflow/tools/pip_package/setup.py || die
+	sed -i "/config_googleapis/d" tensorflow/workspace0.bzl || die
+
+	# Prefixify hard-coded command locations
+	hprefixify -w /host_compiler_prefix/ third_party/gpus/cuda_configure.bzl
+
+	default
+	use python && python_copy_sources
+
+	use cuda && cuda_add_sandbox
+}
+
+src_configure() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
+
+	do_configure() {
+		export CC_OPT_FLAGS=" "
+		export TF_ENABLE_XLA=$(usex xla 1 0)
+		export TF_NEED_OPENCL_SYCL=0
+		export TF_NEED_OPENCL=0
+		export TF_NEED_COMPUTECPP=0
+		export TF_NEED_ROCM=0
+		export TF_NEED_MPI=$(usex mpi 1 0)
+		export TF_SET_ANDROID_WORKSPACE=0
+
+		if use python; then
+			export PYTHON_BIN_PATH="${PYTHON}"
+			export PYTHON_LIB_PATH="$(python_get_sitedir)"
+		else
+			export PYTHON_BIN_PATH="$(which python)"
+			export PYTHON_LIB_PATH="$(python -c 'from distutils.sysconfig import *; print(get_python_lib())')"
+		fi
+
+		export TF_NEED_CUDA=$(usex cuda 1 0)
+		export TF_DOWNLOAD_CLANG=0
+		export TF_CUDA_CLANG=0
+		export TF_NEED_TENSORRT=0
+		if use cuda; then
+			export TF_CUDA_PATHS="${EPREFIX}/opt/cuda"
+			export GCC_HOST_COMPILER_PATH="$(cuda_gccdir)/$(tc-getCC)"
+			export TF_CUDA_VERSION="$(cuda_toolkit_version)"
+			export TF_CUDNN_VERSION="$(cuda_cudnn_version)"
+			einfo "Setting CUDA version: $TF_CUDA_VERSION"
+			einfo "Setting CUDNN version: $TF_CUDNN_VERSION"
+
+			if [[ $(cuda-config -s) != *$(gcc-version)* ]]; then
+				ewarn "TensorFlow is being built with Nvidia CUDA support. Your default compiler"
+				ewarn "version is not supported by the currently installed CUDA. TensorFlow will"
+				ewarn "instead be compiled using: ${GCC_HOST_COMPILER_PATH}."
+				ewarn "If the build fails with linker errors try rebuilding the relevant"
+				ewarn "dependencies using the same compiler version."
+			fi
+
+			if [[ -z "$TF_CUDA_COMPUTE_CAPABILITIES" ]]; then
+				ewarn "WARNING: TensorFlow 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 TensorFlow with the CUDA compute capability that is optimal for your GPU,"
+				ewarn "set TF_CUDA_COMPUTE_CAPABILITIES in your make.conf, and re-emerge tensorflow."
+				ewarn "For example, to use CUDA capability 7.5 & 3.5, add: TF_CUDA_COMPUTE_CAPABILITIES=7.5,3.5"
+				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
+		fi
+
+		# com_googlesource_code_re2 weird branch using absl, doesnt work with released re2
+		#com_github_googleapis_googleapis
+		local SYSLIBS=(
+			absl_py
+			astor_archive
+			astunparse_archive
+			boringssl
+			com_github_googlecloudplatform_google_cloud_cpp
+			com_github_grpc_grpc
+			com_google_absl
+			com_google_protobuf
+			curl
+			cython
+			dill_archive
+			double_conversion
+			flatbuffers
+			functools32_archive
+			gast_archive
+			gif
+			hwloc
+			icu
+			jsoncpp_git
+			libjpeg_turbo
+			lmdb
+			nasm
+			nsync
+			opt_einsum_archive
+			org_sqlite
+			pasta
+			png
+			pybind11
+			six_archive
+			snappy
+			tblib_archive
+			termcolor_archive
+			typing_extensions_archive
+			wrapt
+			zlib
+		)
+
+		export TF_SYSTEM_LIBS="${SYSLIBS[@]}"
+		export TF_IGNORE_MAX_BAZEL_VERSION=1
+
+		# This is not autoconf
+		./configure || die
+
+		echo 'build --config=noaws --config=nohdfs --config=nonccl' >> .bazelrc || die
+		echo 'build --define tensorflow_mkldnn_contraction_kernel=0' >> .bazelrc || die
+		echo "build --action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die
+		echo "build --host_action_env=KERAS_HOME=\"${T}/.keras\"" >> .bazelrc || die
+
+		for cflag in $($(tc-getPKG_CONFIG) jsoncpp --cflags)
+		do
+			echo "build --copt=\"${cflag}\"" >> .bazelrc || die
+			echo "build --host_copt=\"${cflag}\"" >> .bazelrc || die
+		done
+	}
+	if use python; then
+		python_foreach_impl run_in_build_dir do_configure
+	else
+		do_configure
+	fi
+}
+
+src_compile() {
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
+
+	if use python; then
+		python_setup
+		BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}" || die
+	fi
+
+	# fail early if any deps are missing
+	ebazel build -k --nobuild \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so \
+		//tensorflow:libtensorflow_cc.so \
+		$(usex python '//tensorflow/tools/pip_package:build_pip_package' '')
+
+	ebazel build \
+		//tensorflow:libtensorflow_framework.so \
+		//tensorflow:libtensorflow.so
+	ebazel build //tensorflow:libtensorflow_cc.so
+	ebazel build //tensorflow:install_headers
+	ebazel shutdown
+
+	do_compile() {
+		ebazel build //tensorflow/tools/pip_package:build_pip_package
+		ebazel shutdown
+	}
+	BUILD_DIR="${S}"
+	cd "${BUILD_DIR}" || die
+	use python && python_foreach_impl run_in_build_dir do_compile
+}
+
+src_install() {
+	local i l
+	export JAVA_HOME=$(java-config --jre-home) # so keepwork works
+	export KERAS_HOME="${T}/.keras" # otherwise sandbox violation writing ~/.keras
+
+	do_install() {
+		einfo "Installing ${EPYTHON} files"
+		local srcdir="${T}/src-${MULTIBUILD_VARIANT}"
+		mkdir -p "${srcdir}" || die
+		bazel-bin/tensorflow/tools/pip_package/build_pip_package --src "${srcdir}" || die
+		cd "${srcdir}" || die
+		esetup.py install
+
+		# libtensorflow_framework.so is in /usr/lib already
+		rm -f "${D}/$(python_get_sitedir)"/${PN}/lib${PN}_framework.so* || die
+		rm -f "${D}/$(python_get_sitedir)"/${PN}_core/lib${PN}_framework.so* || die
+		python_optimize
+	}
+
+	if use python; then
+		python_foreach_impl run_in_build_dir do_install
+
+		# Symlink to python-exec scripts
+		for i in "${ED}"/usr/lib/python-exec/*/*; do
+			n="${i##*/}"
+			[[ -e "${ED}/usr/bin/${n}" ]] || dosym ../lib/python-exec/python-exec2 "/usr/bin/${n}"
+		done
+
+		python_setup
+		local BUILD_DIR="${S}-${EPYTHON/./_}"
+		cd "${BUILD_DIR}" || die
+	fi
+
+	einfo "Installing headers"
+	insinto /usr/include/${PN}/
+	doins -r bazel-bin/tensorflow/include/*
+
+	einfo "Installing libs"
+	# Generate pkg-config file
+	${PN}/c/generate-pc.sh --prefix="${EPREFIX}"/usr --libdir=$(get_libdir) --version=${MY_PV} || die
+	insinto /usr/$(get_libdir)/pkgconfig
+	doins ${PN}.pc ${PN}_cc.pc
+
+	for l in libtensorflow{,_framework,_cc}.so; do
+		dolib.so bazel-bin/tensorflow/${l}
+		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1)
+		dolib.so bazel-bin/tensorflow/${l}.$(ver_cut 1-3)
+	done
+
+	einstalldocs
+
+	# Workaround for https://bugs.gentoo.org/831927
+	export MAKEOPTS="-j1"
+}
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index df399032aa59..563a9856a81a 100644
Binary files a/sci-mathematics/Manifest.gz and b/sci-mathematics/Manifest.gz differ
diff --git a/sci-mathematics/z3/z3-4.11.2.ebuild b/sci-mathematics/z3/z3-4.11.2.ebuild
index 4c7fa51d483e..9733d67afd2e 100644
--- a/sci-mathematics/z3/z3-4.11.2.ebuild
+++ b/sci-mathematics/z3/z3-4.11.2.ebuild
@@ -14,7 +14,7 @@ S=${WORKDIR}/z3-${P}
 
 SLOT="0/$(ver_cut 1-2)"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="doc examples gmp isabelle java python"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
diff --git a/sci-misc/Manifest.gz b/sci-misc/Manifest.gz
index c436802206c0..e14d4e487cda 100644
Binary files a/sci-misc/Manifest.gz and b/sci-misc/Manifest.gz differ
diff --git a/sci-misc/cdfplayer/cdfplayer-12.2.0.ebuild b/sci-misc/cdfplayer/cdfplayer-12.2.0.ebuild
index a5abe4c0c16b..f36a206877d7 100644
--- a/sci-misc/cdfplayer/cdfplayer-12.2.0.ebuild
+++ b/sci-misc/cdfplayer/cdfplayer-12.2.0.ebuild
@@ -6,7 +6,7 @@ EAPI=6
 inherit desktop multilib versionator
 
 DESCRIPTION="Wolfram Player for the interactive Computable Document Format (CDF)"
-SRC_URI="WolframPlayer_12.2.0_LINUX.sh"
+SRC_URI="WolframPlayer_${PV}_LINUX.sh"
 HOMEPAGE="http://www.wolfram.com/cdf-player/"
 
 LICENSE="WolframCDFPlayer"
diff --git a/sci-visualization/Manifest.gz b/sci-visualization/Manifest.gz
index 4a41c669100b..a54b65fda9a6 100644
Binary files a/sci-visualization/Manifest.gz and b/sci-visualization/Manifest.gz differ
diff --git a/sci-visualization/tensorboard/Manifest b/sci-visualization/tensorboard/Manifest
index e87e03b85480..15c3f7786956 100644
--- a/sci-visualization/tensorboard/Manifest
+++ b/sci-visualization/tensorboard/Manifest
@@ -1,2 +1,3 @@
+DIST tensorboard-2.10.0.zip 5873469 BLAKE2B b03a804682275abd83482e6dc8e62bef4301d796ef5bd2b02bed8d15ab16ff4bd19f1b9e3488e12ea6c03e1b7a85fd69a6a226f0a5378da2067c661b7f1f2f7e SHA512 04da20089d7e24e2c519da24bb8ad32f622386799e28403e036d40c29bc99011cc374480176776b0801df0e37eb2b0e93a987d2a97cd7406eabb75bfd649a311
 DIST tensorboard-2.8.0.zip 5776309 BLAKE2B b06c740fbe01c707e937018184e286fb7221391715c5ca6d843a89c9dd3a364b8693e748ccbde735d074b0abdbca65d4e2dd9a6e57b4ede61f78a661bd16e702 SHA512 3d937e41ac0abfe44cfab12f0b5269de45615c512499107a239bb348df7f3ccaabf283afcea2a7bac4a34d7b9318947c709a84154d0d2e61912138c31c86673f
 DIST tensorboard-2.9.0.zip 5797045 BLAKE2B e91988637a0e30fcd6341f02bc5e83ba92ae1f6e65a2aa5ddb1626ec4bb95a97d1306984b899279281e5d5f5ac70be76669ddc87524910861429e02259269b79 SHA512 244e117de989a56efc4120b6374d5cc6c31bb233e234cf95df9ddf7cbd0ec494b925dae238c59f3663087136bbf789284096f20b300f0b4c56c9de7faddc520b
diff --git a/sci-visualization/tensorboard/tensorboard-2.10.0.ebuild b/sci-visualization/tensorboard/tensorboard-2.10.0.ebuild
new file mode 100644
index 000000000000..33cd44742483
--- /dev/null
+++ b/sci-visualization/tensorboard/tensorboard-2.10.0.ebuild
@@ -0,0 +1,66 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8,9,10} )
+inherit python-r1
+
+DESCRIPTION="TensorFlow's Visualization Toolkit"
+HOMEPAGE="https://www.tensorflow.org/"
+SRC_URI="https://files.pythonhosted.org/packages/py3/${PN::1}/${PN}/${P}-py3-none-any.whl -> ${P}.zip"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+IUSE=""
+REQUIRED_USE=${PYTHON_REQUIRED_USE}
+
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-python/bleach[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-1.6.3[${PYTHON_USEDEP}]
+	>=dev-python/google-auth-oauthlib-0.4.1[${PYTHON_USEDEP}]
+	dev-python/grpcio[${PYTHON_USEDEP}]
+	dev-python/html5lib[${PYTHON_USEDEP}]
+	dev-python/markdown[${PYTHON_USEDEP}]
+	dev-python/numpy[${PYTHON_USEDEP}]
+	dev-python/protobuf-python[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	>=dev-python/setuptools-41[${PYTHON_USEDEP}]
+	dev-python/werkzeug[${PYTHON_USEDEP}]
+	dev-python/wheel[${PYTHON_USEDEP}]
+	>=dev-python/scipy-1.4.1[${PYTHON_USEDEP}]"
+BDEPEND="app-arch/unzip
+	${PYTHON_DEPS}"
+PDEPEND="sci-libs/tensorflow[python,${PYTHON_USEDEP}]"
+
+S="${WORKDIR}"
+
+src_prepare() {
+	eapply_user
+
+	sed -i -e '/_vendor.__init__/d' -e '/_vendor.bleach/d' -e '/_vendor.html5lib/d' -e '/_vendor.webencodings/d' \
+		"${S}/${P}.dist-info/RECORD" || die "failed to unvendor"
+	grep -q "_vendor" "${S}/${P}.dist-info/RECORD" && die "More vendored deps found"
+
+	find "${S}/${PN}" -name '*.py' -exec sed -i \
+		-e 's/^from tensorboard\._vendor import /import /' \
+		-e 's/^from tensorboard\._vendor\./from /' \
+		{} + || die "failed to unvendor"
+
+	rm -rf "${S}/${PN}/_vendor" || die
+
+	sed -i -e '/tensorboard-plugin-/d' "${S}/${P}.dist-info/METADATA" || die "failed to remove plugin deps"
+	sed -i -e '/tensorboard-data-server/d' "${S}/${P}.dist-info/METADATA" || die "failed to remove data-server deps"
+	sed -i -e 's/google-auth-oauthlib.*$/google-auth-oauthlib/' "${S}/${P}.dist-info/METADATA" \
+		|| die "failed to relax oauth deps"
+}
+
+src_install() {
+	do_install() {
+		python_domodule "${PN}"
+		python_domodule "${P}.dist-info"
+	}
+	python_foreach_impl do_install
+}
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 703811ea08ee..e8a38173cf3c 100644
Binary files a/sys-apps/Manifest.gz and b/sys-apps/Manifest.gz differ
diff --git a/sys-apps/baobab/Manifest b/sys-apps/baobab/Manifest
index 3b0e05f34092..bafb02ea22b8 100644
--- a/sys-apps/baobab/Manifest
+++ b/sys-apps/baobab/Manifest
@@ -1,2 +1,3 @@
 DIST baobab-41.0.tar.xz 586228 BLAKE2B 8c06dd4c62dd377e2338df280dd1f78dcd6e0c13713f06bb126f96e658e42b9ed5f1cffa9f7445f2d854cf42c09b93d72f4ff82a80df5dd4a4d395978fe2ecff SHA512 4f41cac42491afb98855771a621573689f2b35c0a2602799af9f88adf901a5c62c9f8e4b70be43ed27024deba860b128bc22b8a7782ac207a5746b4df6b65aa0
 DIST baobab-42.0.tar.xz 588392 BLAKE2B ec2525b6643a9ab2ecedcbb7b7a54419859116808d9287bfcc694cf22d314b5dc34e71483718353685f3a246c87b4b492e7c3fb69c7044dea605ae3e8737d0f1 SHA512 21837bfe901034ed3450f6937d3ede1e567d16a5ae308db91029dc2ff4bb523b36f9408f7489c6798140de039e928f49969a1ed741027da0ae8377be6352ba08
+DIST baobab-43.0.tar.xz 594832 BLAKE2B 1cf42a475bf08ddf85d3fb2944f80e274eeb47d1e3f44fcfba9e53c9302a5c3f5fcbe9378dc74059199e2ed38945af16eca2456f7cede9b45228b90e14ae8b96 SHA512 d368bde1ba1fafbe908c5e8e0e5cd9d593d3f3cc551a7b1f3be68624bd7ee8b1dac6374fc9031c7d4c53240dda739974b5c71653227251bb5b8fbcd332900b91
diff --git a/sys-apps/baobab/baobab-43.0.ebuild b/sys-apps/baobab/baobab-43.0.ebuild
new file mode 100644
index 000000000000..9275faf00175
--- /dev/null
+++ b/sys-apps/baobab/baobab-43.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+PYTHON_COMPAT=( python3_{8..11} )
+inherit gnome.org gnome2-utils meson python-any-r1 vala xdg
+
+DESCRIPTION="Disk usage browser for GNOME"
+HOMEPAGE="https://wiki.gnome.org/Apps/Baobab"
+
+LICENSE="GPL-2+ FDL-1.1+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	>=dev-libs/glib-2.44:2
+	>=gui-libs/gtk-4.4.0:4
+	>=gui-libs/libadwaita-1.2:1=
+"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	${PYTHON_DEPS}
+	$(vala_depend)
+	>=gui-libs/libadwaita-1.2:1=[vala]
+	dev-util/itstool
+	>=sys-devel/gettext-0.21
+	virtual/pkgconfig
+"
+
+src_prepare() {
+	default
+	vala_setup
+	xdg_environment_reset
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+	gnome2_schemas_update
+}
+
+pkg_postrm() {
+	xdg_pkg_postrm
+	gnome2_schemas_update
+}
diff --git a/sys-apps/dbus/dbus-1.14.0-r5.ebuild b/sys-apps/dbus/dbus-1.14.0-r6.ebuild
similarity index 99%
rename from sys-apps/dbus/dbus-1.14.0-r5.ebuild
rename to sys-apps/dbus/dbus-1.14.0-r6.ebuild
index 64f28fbcc48f..9099c43f85b6 100644
--- a/sys-apps/dbus/dbus-1.14.0-r5.ebuild
+++ b/sys-apps/dbus/dbus-1.14.0-r6.ebuild
@@ -34,7 +34,10 @@ BDEPEND="
 COMMON_DEPEND="
 	>=dev-libs/expat-2.1.0
 	elogind? ( sys-auth/elogind )
-	selinux? ( sys-libs/libselinux )
+	selinux? (
+		sys-process/audit
+		sys-libs/libselinux
+	)
 	systemd? ( sys-apps/systemd:0= )
 	X? (
 		x11-libs/libX11
diff --git a/sys-apps/dmidecode/Manifest b/sys-apps/dmidecode/Manifest
index 3b0473fab549..c411b41d00d9 100644
--- a/sys-apps/dmidecode/Manifest
+++ b/sys-apps/dmidecode/Manifest
@@ -1,2 +1 @@
-DIST dmidecode-3.3.tar.xz 56372 BLAKE2B 7a4557a203702da5d5d6722c72870342e18458b3777d095656e9d5c3a5f80cc712d16b775fa16e4ae9326965a789d393092d45651a449444e268438c1d16773e SHA512 dc77f40a7898011cea1b747d4677be2fbe8f52ec6ac460a5656de2f3389eca83bc416d6494acbe759971b5afce37b78f21ab55c34d62b1105b800e31566d1d22
 DIST dmidecode-3.4.tar.xz 61420 BLAKE2B f9f0429c5128692c2d1d560580552285ea900c1c9ef6f68f0e2133ae1ef05b85a943e882f915d3ef969b7a7e3f3f6bbc4ec391e7bd3d98092976ddbf02421c49 SHA512 62990b6159e5a7c8688d37e44957e7948391d2c6afeabaa4514ba9dad2d08b020297676e2dbbfcb6471efc6fb6f3682750422931a953f78f358bb3dd3745e95b
diff --git a/sys-apps/dmidecode/dmidecode-3.3.ebuild b/sys-apps/dmidecode/dmidecode-3.3.ebuild
deleted file mode 100644
index 4bf9154f283b..000000000000
--- a/sys-apps/dmidecode/dmidecode-3.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="DMI (Desktop Management Interface) table related utilities"
-HOMEPAGE="https://www.nongnu.org/dmidecode/"
-SRC_URI="https://savannah.nongnu.org/download/${PN}/${P}.tar.xz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="-* ~alpha amd64 arm arm64 ~ia64 ~loong ~mips ppc ppc64 ~riscv x86 ~x86-solaris"
-IUSE="selinux"
-
-RDEPEND="selinux? ( sec-policy/selinux-dmidecode )"
-DEPEND=""
-
-src_prepare() {
-	default
-	sed -i \
-		-e "/^prefix/s:/usr/local:${EPREFIX}/usr:" \
-		-e "/^docdir/s:dmidecode:${PF}:" \
-		-e '/^PROGRAMS !=/d' \
-		Makefile || die
-}
-
-src_compile() {
-	emake \
-		CFLAGS="${CFLAGS} ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		CC="$(tc-getCC)"
-}
-
-pkg_postinst() {
-	if [[ ${CHOST} == *-solaris* ]] ; then
-		einfo "dmidecode needs root privileges to read /dev/xsvc"
-		einfo "To make dmidecode useful, either run as root, or chown and setuid the binary."
-		einfo "Note that /usr/sbin/ptrconf and /usr/sbin/ptrdiag give similar"
-		einfo "information without requiring root privileges."
-	fi
-}
diff --git a/sys-apps/file/file-5.42.ebuild b/sys-apps/file/file-5.42.ebuild
deleted file mode 100644
index 0b9cc3af8dba..000000000000
--- a/sys-apps/file/file-5.42.ebuild
+++ /dev/null
@@ -1,161 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DISTUTILS_USE_PEP517=setuptools
-DISTUTILS_OPTIONAL=1
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1 libtool toolchain-funcs multilib-minimal
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/glensc/file.git"
-	inherit autotools git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/file.asc
-	inherit verify-sig
-	SRC_URI="ftp://ftp.astron.com/pub/file/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( ftp://ftp.astron.com/pub/file/${P}.tar.gz.asc )"
-
-	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"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-file )"
-fi
-
-DESCRIPTION="Identify a file's format by scanning binary data for patterns"
-HOMEPAGE="https://www.darwinsys.com/file/"
-
-LICENSE="BSD-2"
-SLOT="0"
-IUSE="bzip2 lzma python seccomp static-libs zlib"
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="
-	bzip2? ( app-arch/bzip2[${MULTILIB_USEDEP}] )
-	lzma? ( app-arch/xz-utils[${MULTILIB_USEDEP}] )
-	python? (
-		${PYTHON_DEPS}
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	)
-	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )"
-RDEPEND="${DEPEND}
-	python? ( !dev-python/python-magic )
-	seccomp? ( sys-libs/libseccomp[${MULTILIB_USEDEP}] )"
-BDEPEND+="
-	python? (
-		${PYTHON_DEPS}
-		${DISTUTILS_DEPS}
-	)"
-
-PATCHES=(
-	"${FILESDIR}/file-5.39-portage-sandbox.patch" #713710 #728978
-	"${FILESDIR}/file-5.40-seccomp-fstatat64-musl.patch" #789336, not upstream yet
-)
-
-src_prepare() {
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	# don't let python README kill main README, bug ##60043
-	mv python/README.md python/README.python.md || die
-	# bug #662090
-	sed 's@README.md@README.python.md@' -i python/setup.py || die
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--enable-fsect-man5
-		$(use_enable bzip2 bzlib)
-		$(use_enable lzma xzlib)
-		$(use_enable seccomp libseccomp)
-		$(use_enable static-libs static)
-		$(use_enable zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-build_src_configure() {
-	local myeconfargs=(
-		--disable-shared
-		--disable-libseccomp
-		--disable-bzlib
-		--disable-xzlib
-		--disable-zlib
-	)
-
-	econf_build "${myeconfargs[@]}"
-}
-
-need_build_file() {
-	# when cross-compiling, we need to build up our own file
-	# because people often don't keep matching host/target
-	# file versions, bug #362941
-	tc-is-cross-compiler && ! has_version -b "~${CATEGORY}/${P}"
-}
-
-src_configure() {
-	local ECONF_SOURCE="${S}"
-
-	if need_build_file ; then
-		mkdir -p "${WORKDIR}"/build || die
-		cd "${WORKDIR}"/build || die
-		build_src_configure
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	if multilib_is_native_abi ; then
-		emake
-	else
-		# bug #586444
-		emake -C src magic.h
-		emake -C src libmagic.la
-	fi
-}
-
-src_compile() {
-	if need_build_file ; then
-		# bug #586444
-		emake -C "${WORKDIR}"/build/src magic.h
-		emake -C "${WORKDIR}"/build/src file
-		local -x PATH="${WORKDIR}/build/src:${PATH}"
-	fi
-
-	multilib-minimal_src_compile
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_compile
-	fi
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi ; then
-		default
-	else
-		emake -C src install-{nodist_includeHEADERS,libLTLIBRARIES} DESTDIR="${D}"
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog MAINT # README
-
-	# Required for `file -C`
-	insinto /usr/share/misc/magic
-	doins -r magic/Magdir/*
-
-	if use python ; then
-		cd python || die
-		distutils-r1_src_install
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/gentoo-functions/Manifest b/sys-apps/gentoo-functions/Manifest
index bffbec5a87b2..d25f2f43a4a7 100644
--- a/sys-apps/gentoo-functions/Manifest
+++ b/sys-apps/gentoo-functions/Manifest
@@ -1,4 +1 @@
-DIST gentoo-functions-0.14.tar.gz 11330 BLAKE2B 72543941f2954e35d3671c1c482eda44ae00cf0c636a1d706c5b90c56dfbb985d20c156b6de650e5d33ff9fac0abaf9fc50b1172832c2bd5276f6adfe5baf3b8 SHA512 e1e0fee9f3e8b79478aaf2b9a54c8623c858e62f72f2885ea88f7006631cf513bdfaac7122f2a5fc97379bde57851793bf7d6c63a1c63a6923a7f13a73d803fc
-DIST gentoo-functions-0.15.tar.gz 11236 BLAKE2B da3df4ee809c33a7aa275757380584abcc70dc5f54d32b2e9d3336a9453cfc935e932df065a65a7458b885a449774713fead5aea99ea5e7ee522e5493d35482b SHA512 b2a42e5b43c487d62e036eade88b5cc8e0f4eb249c783837a0293cdbba4ed8a1eea8742d531885bcc56eefa337853c41d257b6a9880fc0e7420b490bb6f98fd4
-DIST gentoo-functions-0.16.tar.bz2 10769 BLAKE2B aa85c97bf07e86631f9d11fc93252099925fb798a12483bead1e270799f44d3107c28e370925c948484a3f490247caf4c17b0068a160af7f72bec0f941699c95 SHA512 aa1f1bfbdd1e7ea51b2cceaae36b15a457b726ecc4fbed5bb3e5475d88b8142642df97b729303085716b1e3c7c92da58fa3b6842af5a04152e9f4c563d3d4b12
 DIST gentoo-functions-0.17.tar.bz2 10798 BLAKE2B 1b725945421ab36b1412f9addc22e9fe299c0e6460790ee2832b9f63d4c06b86bb0d054b01505640a5dc1e62f3cd257628717fec852116a4c8b2c9f9d2d149ee SHA512 6a3de93b5e4d761a53a622f41e6079606cc4ad8a964771d49dafdefbb632afdf722fd055d261e494aa0be956c4160c49a775ab40c927c5340b8e4da275ef51fb
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
deleted file mode 100644
index f78a9ce16ce8..000000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-0.14.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2014-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-fi
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Base functions required by all Gentoo systems"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-src_configure() {
-	tc-export CC
-	append-lfs-flags
-	export ROOTPREFIX="${EPREFIX}"
-	export PREFIX="${EPREFIX}/usr"
-}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.15.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.15.ebuild
deleted file mode 100644
index 9214af16efb6..000000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-0.15.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2014-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.tar.gz"
-	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
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Base functions required by all Gentoo systems"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-src_configure() {
-	tc-export CC
-	append-lfs-flags
-	export ROOTPREFIX="${EPREFIX}"
-	export PREFIX="${EPREFIX}/usr"
-}
diff --git a/sys-apps/gentoo-functions/gentoo-functions-0.16.ebuild b/sys-apps/gentoo-functions/gentoo-functions-0.16.ebuild
deleted file mode 100644
index cf5513d3fcf8..000000000000
--- a/sys-apps/gentoo-functions/gentoo-functions-0.16.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2014-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-if [[ ${PV} == 9999* ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gentoo-functions.git"
-else
-	SRC_URI="https://gitweb.gentoo.org/proj/gentoo-functions.git/snapshot/${P}.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 ~x86-winnt"
-fi
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Base functions required by all Gentoo systems"
-HOMEPAGE="https://gitweb.gentoo.org/proj/gentoo-functions.git"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-src_configure() {
-	tc-export CC
-	append-lfs-flags
-	export ROOTPREFIX="${EPREFIX}"
-	export PREFIX="${EPREFIX}/usr"
-}
diff --git a/sys-apps/gptfdisk/files/gptfdisk-1.0.9-popt_segv.patch b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-popt_segv.patch
new file mode 100644
index 000000000000..470defd33cf6
--- /dev/null
+++ b/sys-apps/gptfdisk/files/gptfdisk-1.0.9-popt_segv.patch
@@ -0,0 +1,22 @@
+--- a/gptcl.cc
++++ b/gptcl.cc
+@@ -156,9 +156,10 @@
+ 
+    // Assume first non-option argument is the device filename....
+    device = (char*) poptGetArg(poptCon);
+-   poptResetContext(poptCon);
+ 
+    if (device != NULL) {
++      device = strdup(device);
++      poptResetContext(poptCon);
+       JustLooking(); // reset as necessary
+       BeQuiet(); // Tell called functions to be less verbose & interactive
+       if (LoadPartitions((string) device)) {
+@@ -498,6 +499,7 @@
+          cerr << "Error encountered; not saving changes.\n";
+          retval = 4;
+       } // if
++      free(device);
+    } // if (device != NULL)
+    poptFreeContext(poptCon);
+    return retval;
diff --git a/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild b/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild
new file mode 100644
index 000000000000..5ccaa186a5da
--- /dev/null
+++ b/sys-apps/gptfdisk/gptfdisk-1.0.9-r2.ebuild
@@ -0,0 +1,61 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic toolchain-funcs
+
+DESCRIPTION="GPT partition table manipulator for Linux"
+HOMEPAGE="https://www.rodsbooks.com/gdisk/"
+SRC_URI="mirror://sourceforge/${PN}/${PN}/${PV}/${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"
+IUSE="ncurses static"
+
+# libuuid from util-linux is required.
+RDEPEND="!static? (
+		dev-libs/popt
+		ncurses? ( sys-libs/ncurses:=[unicode(+)] )
+		kernel_linux? ( sys-apps/util-linux )
+	)"
+DEPEND="
+	${RDEPEND}
+	static? (
+		dev-libs/popt[static-libs(+)]
+		ncurses? ( sys-libs/ncurses:=[unicode(+),static-libs(+)] )
+		kernel_linux? ( sys-apps/util-linux[static-libs(+)] )
+	)
+	virtual/pkgconfig
+"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.0.9-libuuid.patch" #844073
+	"${FILESDIR}/${PN}-1.0.9-popt_segv.patch" #872131
+)
+
+src_prepare() {
+	default
+
+	tc-export CXX PKG_CONFIG
+
+	if ! use ncurses ; then
+		sed -i \
+			-e '/^all:/s: cgdisk::' \
+			Makefile || die
+	fi
+
+	sed \
+		-e '/g++/s:=:?=:g' \
+		-e 's:-lncursesw:$(shell $(PKG_CONFIG) --libs ncursesw):g' \
+		-i Makefile || die
+
+	use static && append-ldflags -static
+}
+
+src_install() {
+	dosbin gdisk sgdisk $(usex ncurses cgdisk '') fixparts
+	doman *.8
+	dodoc NEWS README
+}
diff --git a/sys-apps/hdparm/Manifest b/sys-apps/hdparm/Manifest
index 296abbef6274..42981fcdd846 100644
--- a/sys-apps/hdparm/Manifest
+++ b/sys-apps/hdparm/Manifest
@@ -1,3 +1,2 @@
-DIST hdparm-9.63.tar.gz 140252 BLAKE2B 41ee3dda11f17ec9c125b7d680f07ca2d88c3692e2436b8d2550dbd58546b1dde8e61cdf5312c5b09d687dad81826bd848c8eabcb3e01ab09ac6cfb082699238 SHA512 1d09dc2c79c31f45fa242dd5bf259e84281d1464e49ada9fd53bb6d58cb0458046e534a93f9d6de18478ca5db50b6d36ecbe5b784c0c681a1db29f15fadd525c
 DIST hdparm-9.64.tar.gz 140307 BLAKE2B 0196f3ccec4005c542b834d8426cc6f64694783da3d4a064e898e25d17aab3aa0d9621276607169f2104c9a9804f9020554d836ded9efb16367a8ac4c9c9b146 SHA512 c561825143d8872cc2940bd6ba72162f91792bd63b6a8511058e79cc96feb6a4a9d22275581ef2eefab64a4035587b3a63175ccc58fa46f1059b4680d9d58ec4
 DIST hdparm-9.65.tar.gz 140425 BLAKE2B 79b1c16e7807f82a992ed7f22faef57045c56da4a281fbd8db3b8846b193ccc4b42329fa6abbebf8b652fbefb13aa0f18dfa726e802e8e1a45c94f414fb303b9 SHA512 4ffc8902b90cee10d68af8ddb9f3b9454d523ecd49cdaaed254b4d7a999462a8ad5ec1bb5d7684b09fefa41b5941ab533b167dad290003b51c795a633ca88913
diff --git a/sys-apps/hdparm/hdparm-9.63.ebuild b/sys-apps/hdparm/hdparm-9.63.ebuild
deleted file mode 100644
index 3488ffc74343..000000000000
--- a/sys-apps/hdparm/hdparm-9.63.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic
-
-DESCRIPTION="Utility to change hard drive performance parameters"
-HOMEPAGE="https://sourceforge.net/projects/hdparm/"
-SRC_URI="mirror://sourceforge/hdparm/${P}.tar.gz"
-
-LICENSE="BSD GPL-2" # GPL-2 only
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="static"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9.60-build.patch
-)
-
-src_prepare() {
-	default
-	use static && append-ldflags -static
-}
-
-src_configure() {
-	tc-export CC
-	export STRIP=:
-}
-
-src_install() {
-	into /
-	dosbin hdparm contrib/idectl
-
-	newinitd "${FILESDIR}"/hdparm-init-8 hdparm
-	newconfd "${FILESDIR}"/hdparm-conf.d.3 hdparm
-
-	doman hdparm.8
-	dodoc hdparm.lsm Changelog README.acoustic hdparm-sysconfig
-	docinto wiper
-	dodoc wiper/{README.txt,wiper.sh}
-	docompress -x /usr/share/doc/${PF}/wiper/wiper.sh
-}
diff --git a/sys-apps/irqbalance/Manifest b/sys-apps/irqbalance/Manifest
index 7349c47125af..3bd5bb846cfb 100644
--- a/sys-apps/irqbalance/Manifest
+++ b/sys-apps/irqbalance/Manifest
@@ -1,2 +1 @@
-DIST irqbalance-1.8.0.tar.gz 55238 BLAKE2B 0181ee57c4ddbdb55e1529cfd7da4b875320eff65cb606f925f0b4f4243b51e1349d4aba38690a78d7deab6d3f55ae8d6c45af44a904f03d7127678202f288db SHA512 3d757198dbe680b010ed9233d73cbf3b4a150e6b07ef97d3e94f5fa0472a22b0b3800868634340fb413a18683ff95ff6a8f7fa51ace65d870651336479e32740
 DIST irqbalance-1.9.0.tar.gz 55779 BLAKE2B 11df51b03a473da10340c0c9ca9a28b3d9f9ed81e202e434b135a4be1cf54bc5558b33a4a922eba89bdd8cebbd6d3448527507fa72f03c4ff494ae83d513854e SHA512 878977da5eff18e53bdceeaa4aca952f73ba8b03eb028cf176816af971ffc65f0b1f1bb3a68e3a2502491895cc2b9438652dc97d5696232bb2f64860109e9a24
diff --git a/sys-apps/irqbalance/irqbalance-1.8.0-r1.ebuild b/sys-apps/irqbalance/irqbalance-1.8.0-r1.ebuild
deleted file mode 100644
index a815655e61b5..000000000000
--- a/sys-apps/irqbalance/irqbalance-1.8.0-r1.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools systemd linux-info
-
-DESCRIPTION="Distribute hardware interrupts across processors on a multiprocessor system"
-HOMEPAGE="https://github.com/Irqbalance/irqbalance"
-SRC_URI="https://github.com/Irqbalance/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 x86"
-IUSE="caps +numa selinux tui"
-
-DEPEND="
-	dev-libs/glib:2
-	caps? ( sys-libs/libcap-ng )
-	numa? ( sys-process/numactl )
-	tui? ( sys-libs/ncurses:=[unicode(+)] )
-"
-BDEPEND="
-	virtual/pkgconfig
-"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-irqbalance )
-"
-
-pkg_setup() {
-	CONFIG_CHECK="~PCI_MSI"
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	# Follow systemd policies
-	# https://wiki.gentoo.org/wiki/Project:Systemd/Ebuild_policy
-	sed \
-		-e 's/ $IRQBALANCE_ARGS//' \
-		-e '/EnvironmentFile/d' \
-		-i misc/irqbalance.service || die
-
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with caps libcap-ng)
-		$(use_enable numa)
-		$(use_with tui irqbalance-ui)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/irqbalance.init.4 irqbalance
-	newconfd "${FILESDIR}"/irqbalance.confd-1 irqbalance
-	systemd_dounit misc/irqbalance.service
-}
diff --git a/sys-apps/kbd/Manifest b/sys-apps/kbd/Manifest
index 18b8b26b539f..760515e63a39 100644
--- a/sys-apps/kbd/Manifest
+++ b/sys-apps/kbd/Manifest
@@ -1,2 +1 @@
-DIST kbd-2.4.0.tar.xz 1120700 BLAKE2B aa5fc1067d3414b9fa18f35dd81dcc050cdf10bd8692221b6e5304e94c4f90055386ce1f79d2bd092241f9ce15ffd36d5c00d1a15725166d16183f475be4a2e3 SHA512 c3823e40878ed4cb5b90edf753dba37a7fc3189b7b08a2e59a7830cac23a7a7daf31dedef1fcc130698c7508bc2a037c8ab54e749d0cdbf51756e346f2ed5abb
 DIST kbd-2.5.1.tar.xz 1491952 BLAKE2B aab4c3d78c28709bf562b54fe94c0533d5c33185e183bf3eb944f89147b250d9df9b30b64a06eb4742feafe8c05a6aa491a7f007b4d6d9077bc19a4628ba05ae SHA512 74855f486aff5fc2f93a6cb29460a590c94eac653b001574e1b4eb1300ea99dfed9222f9e5d1d3a05a112a6880591d5c44ed6e76b8a64edf744ecb0892f562d0
diff --git a/sys-apps/kbd/kbd-2.4.0.ebuild b/sys-apps/kbd/kbd-2.4.0.ebuild
deleted file mode 100644
index d857523a184d..000000000000
--- a/sys-apps/kbd/kbd-2.4.0.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit autotools git-r3
-	#EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/legion/kbd.git"
-	EGIT_REPO_URI="https://github.com/legionus/kbd.git"
-	EGIT_BRANCH="master"
-else
-	if [[ $(ver_cut 3) -lt 90 ]] ; then
-		SRC_URI="https://www.kernel.org/pub/linux/utils/kbd/${P}.tar.xz"
-		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	else
-		inherit autotools
-		SRC_URI="https://github.com/legionus/kbd/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	fi
-fi
-
-DESCRIPTION="Keyboard and console utilities"
-HOMEPAGE="http://kbd-project.org/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="nls pam test"
-#RESTRICT="!test? ( test )"
-# Need to check autotest bit (see bug #732868)
-RESTRICT="test"
-
-RDEPEND="
-	app-arch/gzip
-	pam? (
-		!app-misc/vlock
-		sys-libs/pam
-	)
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	virtual/pkgconfig
-	test? ( dev-libs/check )
-"
-
-src_unpack() {
-	if [[ ${PV} == "9999" ]] ; then
-		git-r3_src_unpack
-	else
-		default
-	fi
-
-	# Rename conflicting keymaps to have unique names, bug #293228
-	cd "${S}"/data/keymaps/i386 || die
-	mv fgGIod/trf.map fgGIod/trf-fgGIod.map || die
-	mv olpc/es.map olpc/es-olpc.map || die
-	mv olpc/pt.map olpc/pt-olpc.map || die
-	mv qwerty/cz.map qwerty/cz-qwerty.map || die
-}
-
-src_prepare() {
-	default
-	if [[ ${PV} == "9999" ]] || [[ $(ver_cut 3) -ge 90 ]] ; then
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		# USE="test" installs .a files
-		--disable-static
-		$(use_enable nls)
-		$(use_enable pam vlock)
-		$(use_enable test tests)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	docinto html
-	dodoc docs/doc/*.html
-
-	# USE="test" installs .la files
-	find "${ED}" -type f -name "*.la" -delete || die
-}
diff --git a/sys-apps/kexec-tools/Manifest b/sys-apps/kexec-tools/Manifest
index 3f1cd08e7ece..c9011dde6bd8 100644
--- a/sys-apps/kexec-tools/Manifest
+++ b/sys-apps/kexec-tools/Manifest
@@ -1,3 +1,2 @@
 DIST kexec-tools-2.0.22.tar.xz 303564 BLAKE2B 977c741eabf9b6b882550713ba59b18289b4f997fb382e96338efce6d04a9390fea952fc46ca72fd0a0b782261841ab2002da84b1819f955e63996eac900b0f7 SHA512 7580860f272eee5af52139809f12961e5a5d3a65f4e191183ca9c845410425d25818945ac14ed04a60e6ce474dc2656fc6a14041177b0bf703f450820c7d6aba
-DIST kexec-tools-2.0.23.tar.xz 304024 BLAKE2B 0150985093dc0012d3870c127ac5eab81d4cc839c0a79ff20224d1a409462a194d7e304f54ed8f0952e4d325dbff11bcbe1565b2c57c45c212302810dc06ed62 SHA512 b6e3b967cacc31c434b185d25da4d53c822ae4bbcec26ef9d6cb171f294fdcc80913d381e686a0a41e025187835f4dc088052ff88efe75a021d7624c8b1a1ed8
 DIST kexec-tools-2.0.24.tar.xz 303808 BLAKE2B 8188602f1b843c1dccc0307131f8c9ec0426c6cb3de898040352c1fed5f6d4bd7c58a0c2bf54290b91c8fe3401180df682959ee6c41693d07acc199c087c7db2 SHA512 ef7cf78246e2d729d81a3649791a5a23c385353cc75cbe8ef279616329fdaccc876d614c7f51e1456822a13a11520296070d9897467d24310399909e049c3822
diff --git a/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild b/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
deleted file mode 100644
index b69a3c09e13d..000000000000
--- a/sys-apps/kexec-tools/kexec-tools-2.0.23.ebuild
+++ /dev/null
@@ -1,124 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit libtool linux-info systemd
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3 autotools
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/kexec/kexec-tools.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kexec/${P/_/-}.tar.xz"
-	[[ "${PV}" == *_rc* ]] || \
-	KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-fi
-
-DESCRIPTION="Load another kernel from the currently executing Linux kernel"
-HOMEPAGE="https://kernel.org/pub/linux/utils/kernel/kexec/"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="booke lzma xen zlib"
-
-REQUIRED_USE="lzma? ( zlib )"
-
-DEPEND="
-	lzma? ( app-arch/xz-utils )
-	zlib? ( sys-libs/zlib )"
-RDEPEND="${DEPEND}"
-
-S="${WORKDIR}/${P/_/-}"
-
-CONFIG_CHECK="~KEXEC"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.0.4-disable-kexec-test.patch
-	"${FILESDIR}"/${PN}-2.0.4-out-of-source.patch
-)
-
-pkg_setup() {
-	# GNU Make's $(COMPILE.S) passes ASFLAGS to $(CCAS), CCAS=$(CC)
-	export ASFLAGS="${CCASFLAGS}"
-}
-
-src_prepare() {
-	default
-
-	# Append PURGATORY_EXTRA_CFLAGS flags set by configure, instead of overriding them completely.
-	sed -e "/^PURGATORY_EXTRA_CFLAGS =/s/=/+=/" -i Makefile.in || die
-
-	if [[ "${PV}" == 9999 ]] ; then
-		eautoreconf
-	else
-		elibtoolize
-	fi
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with booke)
-		$(use_with lzma)
-		$(use_with xen)
-		$(use_with zlib)
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	# Respect CFLAGS for purgatory.
-	# purgatory/Makefile uses PURGATORY_EXTRA_CFLAGS variable.
-	# -mfunction-return=thunk and -mindirect-branch=thunk conflict with
-	# -mcmodel=large which is added by build system.
-	# Replace them with -mfunction-return=thunk-inline and -mindirect-branch=thunk-inline.
-	local flag flags=()
-	for flag in ${CFLAGS}; do
-		[[ ${flag} == -mfunction-return=thunk ]] && flag="-mfunction-return=thunk-inline"
-		[[ ${flag} == -mindirect-branch=thunk ]] && flag="-mindirect-branch=thunk-inline"
-		flags+=("${flag}")
-	done
-	local -x PURGATORY_EXTRA_CFLAGS="${flags[*]}"
-
-	default
-}
-
-src_install() {
-	default
-
-	dodoc "${FILESDIR}"/README.Gentoo
-
-	newinitd "${FILESDIR}"/kexec-r2.init kexec
-	newconfd "${FILESDIR}"/kexec.conf-2.0.4 kexec
-
-	insinto /etc
-	doins "${FILESDIR}"/kexec.conf
-
-	insinto /etc/kernel/postinst.d
-	doins "${FILESDIR}"/90_kexec
-
-	systemd_dounit "${FILESDIR}"/kexec.service
-}
-
-pkg_postinst() {
-	if systemd_is_booted || has_version sys-apps/systemd; then
-		elog "For systemd support the new config file is"
-		elog "   /etc/kexec.conf"
-		elog "Please adopt it to your needs as there is no autoconfig anymore"
-	fi
-
-	local n_root_args=$(grep -o -- '\<root=' /proc/cmdline 2>/dev/null | wc -l)
-	local has_rootpart_set=no
-	if [[ -f "${EROOT}/etc/conf.d/kexec" ]]; then
-		if grep -q -E -- '^ROOTPART=' "${EROOT}/etc/conf.d/kexec" 2>/dev/null; then
-			has_rootpart_set=yes
-		fi
-	fi
-
-	if [[ ${n_root_args} -gt 1 && "${has_rootpart_set}" == "no"  ]]; then
-		ewarn "WARNING: Multiple root arguments (root=) on kernel command-line detected!"
-		ewarn "This was probably caused by a previous version of ${PN}."
-		ewarn "Please reboot system once *without* kexec to avoid boot problems"
-		ewarn "in case running system and initramfs do not agree on detected"
-		ewarn "root device name!"
-	fi
-}
diff --git a/sys-apps/kmod/Manifest b/sys-apps/kmod/Manifest
index 8001e3ac896a..0471cb625242 100644
--- a/sys-apps/kmod/Manifest
+++ b/sys-apps/kmod/Manifest
@@ -1,2 +1 @@
-DIST kmod-29.tar.xz 560160 BLAKE2B 1362b6e7c07f66594074f07239d0f7a64e6efeb928483ed027b22a4ac77b916c631d1c03780b0515714a87847a716c35341edb1ced04a1795b4c7f8942d3207a SHA512 557cdcaec75e5a1ceea2d10862c944e9a65ef54f6ee9da6dc98ce4582418fdc9958aab2e14a84807db61daf36ec4fcdc23a36376c39d5dc31d1823ca7cd47998
 DIST kmod-30.tar.xz 567484 BLAKE2B c5cb690dbb8fad66ac603648ff330794b417ff2fa2f8f61b6e9cb76dab93f984128b3d83a826203f39f3fb94f174f0db7395db6a47e52e8b7c561486f9d00778 SHA512 e2cd34e600a72e44710760dfda9364b790b8352a99eafbd43e683e4a06f37e6b5c0b5d14e7c28070e30fc5fc6ceddedf7b97f3b6c2c5c2d91204fefd630b9a3e
diff --git a/sys-apps/kmod/kmod-29-r2.ebuild b/sys-apps/kmod/kmod-29-r2.ebuild
deleted file mode 100644
index d6f72bfcac71..000000000000
--- a/sys-apps/kmod/kmod-29-r2.ebuild
+++ /dev/null
@@ -1,205 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools libtool bash-completion-r1 python-r1
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="library and tools for managing linux kernel modules"
-HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib +zstd"
-
-# Upstream does not support running the test suite with custom configure flags.
-# I was also told that the test suite is intended for kmod developers.
-# So we have to restrict it.
-# See bug #408915.
-RESTRICT="test"
-
-# - >=zlib-1.2.6 required because of bug #427130
-# - Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
-# - >=zstd-1.5.2-r1 required for bug #771078
-RDEPEND="!sys-apps/module-init-tools
-	!sys-apps/modutils
-	!<sys-apps/openrc-0.13.8
-	!<sys-apps/systemd-216-r3
-	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
-	python? ( ${PYTHON_DEPS} )
-	pkcs7? ( >=dev-libs/openssl-1.1.0:= )
-	zlib? ( >=sys-libs/zlib-1.2.6 )
-	zstd? ( >=app-arch/zstd-1.5.2-r1:= )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-util/gtk-doc
-		dev-util/gtk-doc-am
-	)
-	lzma? ( virtual/pkgconfig )
-	python? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		virtual/pkgconfig
-	)
-	zlib? ( virtual/pkgconfig )
-"
-if [[ ${PV} == 9999* ]]; then
-	BDEPEND="${BDEPEND}
-		dev-libs/libxslt"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( NEWS README TODO )
-
-src_prepare() {
-	default
-
-	if [[ ! -e configure ]] || use doc ; then
-		if use doc; then
-			cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
-			gtkdocize --copy --docdir libkmod/docs || die
-		else
-			touch libkmod/docs/gtk-doc.make
-		fi
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	# Restore possibility of running --enable-static, bug #472608
-	sed -i \
-		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
-		$(use_enable debug)
-		$(usex doc '--enable-gtk-doc' '')
-		$(use_enable static-libs static)
-		$(use_enable tools)
-		$(use_with lzma xz)
-		$(use_with pkcs7 openssl)
-		$(use_with zlib)
-		$(use_with zstd)
-	)
-
-	local ECONF_SOURCE="${S}"
-
-	kmod_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		run_in_build_dir econf "${myeconfargs[@]}" "$@"
-	}
-
-	BUILD_DIR="${WORKDIR}/build"
-	kmod_configure --disable-python
-
-	if use python; then
-		python_foreach_impl kmod_configure --enable-python
-	fi
-}
-
-src_compile() {
-	emake -C "${BUILD_DIR}"
-
-	if use python; then
-		local native_builddir="${BUILD_DIR}"
-
-		python_compile() {
-			emake -C "${BUILD_DIR}" -f Makefile -f - python \
-				VPATH="${native_builddir}:${S}" \
-				native_builddir="${native_builddir}" \
-				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
-				<<< 'python: $(pkgpyexec_LTLIBRARIES)'
-		}
-
-		python_foreach_impl python_compile
-	fi
-}
-
-src_install() {
-	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
-
-	einstalldocs
-
-	if use python; then
-		local native_builddir="${BUILD_DIR}"
-
-		python_install() {
-			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
-				VPATH="${native_builddir}:${S}" \
-				install-pkgpyexecLTLIBRARIES \
-				install-dist_pkgpyexecPYTHON
-			python_optimize
-		}
-
-		python_foreach_impl python_install
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	if use tools; then
-		local cmd
-		for cmd in depmod insmod modprobe rmmod; do
-			dosym ../bin/kmod /sbin/${cmd}
-		done
-
-		# These are also usable as normal user
-		for cmd in lsmod modinfo; do
-			dosym kmod /bin/${cmd}
-		done
-	fi
-
-	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
-	softdep uhci_hcd pre: ehci_hcd
-	softdep ohci_hcd pre: ehci_hcd
-	EOF
-
-	insinto /lib/modprobe.d
-	# bug #260139
-	doins "${T}"/usb-load-ehci-first.conf
-
-	newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
-}
-
-pkg_postinst() {
-	if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then
-		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${EROOT}"/etc/runlevels/boot/static-nodes
-	fi
-
-	# Add kmod to the runlevel automatically if this is the first install of this package.
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${EROOT}"/etc/runlevels/sysinit
-		fi
-		if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes
-		fi
-	fi
-
-	if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then
-		if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
-			ewarn
-			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
-			ewarn "kernel modules to have required static nodes!"
-			ewarn "Run this command:"
-			ewarn "\trc-update add kmod-static-nodes sysinit"
-		fi
-	fi
-}
diff --git a/sys-apps/kmod/kmod-29.ebuild b/sys-apps/kmod/kmod-29.ebuild
deleted file mode 100644
index 215876687c49..000000000000
--- a/sys-apps/kmod/kmod-29.ebuild
+++ /dev/null
@@ -1,203 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7..10} )
-
-inherit autotools bash-completion-r1 multilib python-r1
-
-if [[ ${PV} == 9999* ]]; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/utils/kernel/${PN}/${PN}.git"
-	inherit git-r3
-else
-	SRC_URI="https://www.kernel.org/pub/linux/utils/kernel/kmod/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-	#inherit libtool
-fi
-
-DESCRIPTION="library and tools for managing linux kernel modules"
-HOMEPAGE="https://git.kernel.org/?p=utils/kernel/kmod/kmod.git"
-
-LICENSE="LGPL-2"
-SLOT="0"
-IUSE="debug doc +lzma pkcs7 python static-libs +tools +zlib zstd"
-
-# Upstream does not support running the test suite with custom configure flags.
-# I was also told that the test suite is intended for kmod developers.
-# So we have to restrict it.
-# See bug #408915.
-RESTRICT="test"
-
-# >=zlib-1.2.6 required because of bug #427130
-# Block systemd below 217 for -static-nodes-indicate-that-creation-of-static-nodes-.patch
-RDEPEND="!sys-apps/module-init-tools
-	!sys-apps/modutils
-	!<sys-apps/openrc-0.13.8
-	!<sys-apps/systemd-216-r3
-	lzma? ( >=app-arch/xz-utils-5.0.4-r1 )
-	python? ( ${PYTHON_DEPS} )
-	pkcs7? ( >=dev-libs/openssl-1.1.0:0= )
-	zlib? ( >=sys-libs/zlib-1.2.6 )
-	zstd? ( >=app-arch/zstd-1.4.4 )"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	doc? (
-		dev-util/gtk-doc
-		dev-util/gtk-doc-am
-	)
-	lzma? ( virtual/pkgconfig )
-	python? (
-		dev-python/cython[${PYTHON_USEDEP}]
-		virtual/pkgconfig
-		)
-	zlib? ( virtual/pkgconfig )
-"
-if [[ ${PV} == 9999* ]]; then
-	BDEPEND="${BDEPEND}
-		dev-libs/libxslt"
-fi
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DOCS=( NEWS README TODO )
-
-src_prepare() {
-	default
-
-	if [[ ! -e configure ]] || use doc ; then
-		if use doc; then
-			cp "${BROOT}"/usr/share/aclocal/gtk-doc.m4 m4 || die
-			gtkdocize --copy --docdir libkmod/docs || die
-		else
-			touch libkmod/docs/gtk-doc.make
-		fi
-		eautoreconf
-	else
-		elibtoolize
-	fi
-
-	# Restore possibility of running --enable-static wrt #472608
-	sed -i \
-		-e '/--enable-static is not supported by kmod/s:as_fn_error:echo:' \
-		configure || die
-}
-
-src_configure() {
-	local myeconfargs=(
-		--bindir="${EPREFIX}/bin"
-		--enable-shared
-		--with-bashcompletiondir="$(get_bashcompdir)"
-		--with-rootlibdir="${EPREFIX}/$(get_libdir)"
-		$(use_enable debug)
-		$(usex doc '--enable-gtk-doc' '')
-		$(use_enable static-libs static)
-		$(use_enable tools)
-		$(use_with lzma xz)
-		$(use_with pkcs7 openssl)
-		$(use_with zlib)
-		$(use_with zstd)
-	)
-
-	local ECONF_SOURCE="${S}"
-
-	kmod_configure() {
-		mkdir -p "${BUILD_DIR}" || die
-		run_in_build_dir econf "${myeconfargs[@]}" "$@"
-	}
-
-	BUILD_DIR="${WORKDIR}/build"
-	kmod_configure --disable-python
-
-	if use python; then
-		python_foreach_impl kmod_configure --enable-python
-	fi
-}
-
-src_compile() {
-	emake -C "${BUILD_DIR}"
-
-	if use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_compile() {
-			emake -C "${BUILD_DIR}" -f Makefile -f - python \
-				VPATH="${native_builddir}:${S}" \
-				native_builddir="${native_builddir}" \
-				libkmod_python_kmod_{kmod,list,module,_util}_la_LIBADD='$(PYTHON_LIBS) $(native_builddir)/libkmod/libkmod.la' \
-				<<< 'python: $(pkgpyexec_LTLIBRARIES)'
-		}
-
-		python_foreach_impl python_compile
-	fi
-}
-
-src_install() {
-	emake -C "${BUILD_DIR}" DESTDIR="${D}" install
-	einstalldocs
-
-	if use python; then
-		local native_builddir=${BUILD_DIR}
-
-		python_install() {
-			emake -C "${BUILD_DIR}" DESTDIR="${D}" \
-				VPATH="${native_builddir}:${S}" \
-				install-pkgpyexecLTLIBRARIES \
-				install-dist_pkgpyexecPYTHON
-			python_optimize
-		}
-
-		python_foreach_impl python_install
-	fi
-
-	find "${ED}" -type f -name "*.la" -delete || die
-
-	if use tools; then
-		local cmd
-		for cmd in depmod insmod modprobe rmmod; do
-			dosym ../bin/kmod /sbin/${cmd}
-		done
-
-		# These are also usable as normal user
-		for cmd in lsmod modinfo; do
-			dosym kmod /bin/${cmd}
-		done
-	fi
-
-	cat <<-EOF > "${T}"/usb-load-ehci-first.conf
-	softdep uhci_hcd pre: ehci_hcd
-	softdep ohci_hcd pre: ehci_hcd
-	EOF
-
-	insinto /lib/modprobe.d
-	doins "${T}"/usb-load-ehci-first.conf #260139
-
-	newinitd "${FILESDIR}"/kmod-static-nodes-r1 kmod-static-nodes
-}
-
-pkg_postinst() {
-	if [[ -L ${EROOT}/etc/runlevels/boot/static-nodes ]]; then
-		ewarn "Removing old conflicting static-nodes init script from the boot runlevel"
-		rm -f "${EROOT}"/etc/runlevels/boot/static-nodes
-	fi
-
-	# Add kmod to the runlevel automatically if this is the first install of this package.
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if [[ ! -d ${EROOT}/etc/runlevels/sysinit ]]; then
-			mkdir -p "${EROOT}"/etc/runlevels/sysinit
-		fi
-		if [[ -x ${EROOT}/etc/init.d/kmod-static-nodes ]]; then
-			ln -s /etc/init.d/kmod-static-nodes "${EROOT}"/etc/runlevels/sysinit/kmod-static-nodes
-		fi
-	fi
-
-	if [[ -e ${EROOT}/etc/runlevels/sysinit ]]; then
-		if ! has_version sys-apps/systemd && [[ ! -e ${EROOT}/etc/runlevels/sysinit/kmod-static-nodes ]]; then
-			ewarn
-			ewarn "You need to add kmod-static-nodes to the sysinit runlevel for"
-			ewarn "kernel modules to have required static nodes!"
-			ewarn "Run this command:"
-			ewarn "\trc-update add kmod-static-nodes sysinit"
-		fi
-	fi
-}
diff --git a/sys-apps/pciutils/pciutils-3.8.0.ebuild b/sys-apps/pciutils/pciutils-3.8.0.ebuild
deleted file mode 100644
index 53e69aa143eb..000000000000
--- a/sys-apps/pciutils/pciutils-3.8.0.ebuild
+++ /dev/null
@@ -1,163 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs multilib-minimal flag-o-matic
-
-DESCRIPTION="Various utilities dealing with the PCI bus"
-HOMEPAGE="https://mj.ucw.cz/sw/pciutils/ https://git.kernel.org/?p=utils/pciutils/pciutils.git"
-SRC_URI="https://mj.ucw.cz/download/linux/pci/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="dns +kmod static-libs +udev zlib"
-REQUIRED_USE="static-libs? ( !udev )"
-
-# Have the sub-libs in RDEPEND with [static-libs] since, logically,
-# our libpci.a depends on libz.a/etc... at runtime.
-LIB_DEPEND="zlib? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+),${MULTILIB_USEDEP}] )"
-DEPEND="kmod? ( sys-apps/kmod )
-	udev? ( >=virtual/libudev-208[${MULTILIB_USEDEP}] )
-	static-libs? ( ${LIB_DEPEND} )
-	!static-libs? ( ${LIB_DEPEND//static-libs([+-]),} )"
-RDEPEND="${DEPEND}
-	sys-apps/hwdata"
-# See bug #847133 re binutils check
-BDEPEND="sys-apps/which
-	|| ( >=sys-devel/binutils-2.37:* sys-devel/lld sys-devel/native-cctools )
-	kmod? ( virtual/pkgconfig )"
-
-MULTILIB_WRAPPED_HEADERS=( /usr/include/pci/config.h )
-
-switch_config() {
-	[[ $# -ne 2 ]] && return 1
-	local opt=$1 val=$2
-
-	sed "s@^\(${opt}=\).*\$@\1${val}@" -i Makefile || die
-	return 0
-}
-
-check_binutils_version() {
-	if [[ -z ${I_KNOW_WHAT_I_AM_DOING} ]] && ! tc-ld-is-gold && ! tc-ld-is-lld ; then
-		# Okay, hopefully it's Binutils' bfd.
-		# bug #847133
-
-		# Convert this:
-		# ```
-		# GNU ld (Gentoo 2.38 p4) 2.38
-		# Copyright (C) 2022 Free Software Foundation, Inc.
-		# This program is free software; you may redistribute it under the terms of
-		# the GNU General Public License version 3 or (at your option) a later version.
-		# This program has absolutely no warranty.
-		# ```
-		#
-		# into...
-		# ```
-		# 2.38
-		# ```
-		local ver=$($(tc-getLD) --version 2>&1 | head -1 | rev | cut -d' ' -f1 | rev)
-
-		if ! [[ ${ver} =~ [0-9].[0-9][0-9] ]] ; then
-			# Skip if unrecognised format so we don't pass something
-			# odd into ver_cut.
-			return
-		fi
-
-		ver_major=$(ver_cut 1 "${ver}")
-		ver_minor=$(ver_cut 2 "${ver}")
-
-		# We use 2.37 here, not 2.35, as https://github.com/pciutils/pciutils/issues/98 mentions
-		# because we've had other miscompiles with older Binutils (not just build failures!)
-		# and we don't want people running any unsupported versions of Binutils. An example
-		# of this is where glibc is completely broken with old binutils: bug #802036. It's
-		# just not sustainable to support.
-		if [[ ${ver_major} -eq 2 && ${ver_minor} -lt 37 ]] ; then
-			eerror "Old version of binutils activated! ${P} cannot be built with an old version."
-			eerror "Please follow these steps:"
-			eerror "1. Select a newer binutils (>= 2.37) using binutils-config"
-			eerror "2. Run: . /etc/profile"
-			eerror "3. Try emerging again with: emerge -v1 ${CATEGORY}/${P}"
-			eerror "4. Complete your world upgrade if you were performing one."
-			eerror "4. Perform a depclean (emerge -acv)"
-			eerror "\tYou MUST depclean after every world upgrade in future!"
-			die "Old binutils found! Change to a newer ld using binutils-config (bug #847133)."
-		fi
-	fi
-}
-
-pkg_pretend() {
-	[[ ${MERGE_TYPE} != binary ]] && check_binutils_version
-}
-
-pkg_setup() {
-	[[ ${MERGE_TYPE} != binary ]] && check_binutils_version
-}
-
-src_prepare() {
-	default
-
-	if use static-libs ; then
-		cp -pPR "${S}" "${S}.static" || die
-		mv "${S}.static" "${S}/static" || die
-	fi
-
-	multilib_copy_sources
-}
-
-multilib_src_configure() {
-	# bug #471102
-	append-lfs-flags
-}
-
-pemake() {
-	emake \
-		HOST="${CHOST}" \
-		CROSS_COMPILE="${CHOST}-" \
-		CC="$(tc-getCC)" \
-		AR="$(tc-getAR)" \
-		PKG_CONFIG="$(tc-getPKG_CONFIG)" \
-		RANLIB="$(tc-getRANLIB)" \
-		DNS=$(usex dns) \
-		IDSDIR='$(SHAREDIR)/hwdata' \
-		MANDIR='$(SHAREDIR)/man' \
-		PREFIX="${EPREFIX}/usr" \
-		SHARED="yes" \
-		STRIP="" \
-		ZLIB=$(usex zlib) \
-		PCI_COMPRESSED_IDS=0 \
-		PCI_IDS=pci.ids \
-		LIBDIR="\${PREFIX}/$(get_libdir)" \
-		LIBKMOD=$(multilib_native_usex kmod) \
-		HWDB=$(usex udev) \
-		"$@"
-}
-
-multilib_src_compile() {
-	pemake OPT="${CFLAGS}" all
-
-	if use static-libs ; then
-		pemake \
-			-C "${BUILD_DIR}"/static \
-			OPT="${CFLAGS}" \
-			SHARED="no" \
-			lib/libpci.a
-	fi
-}
-
-multilib_src_install() {
-	pemake DESTDIR="${D}" install install-lib
-
-	use static-libs && dolib.a "${BUILD_DIR}"/static/lib/libpci.a
-}
-
-multilib_src_install_all() {
-	dodoc ChangeLog README TODO
-
-	rm "${ED}"/usr/sbin/update-pciids "${ED}"/usr/share/man/man8/update-pciids.8* || die
-	rm -r "${ED}"/usr/share/hwdata || die
-
-	newinitd "${FILESDIR}"/init.d-pciparm pciparm
-	newconfd "${FILESDIR}"/conf.d-pciparm pciparm
-}
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 57e49ae99ace..69b78c74faf9 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -1,3 +1,2 @@
 DIST pcsc-lite-1.9.7.tar.bz2 784685 BLAKE2B 74848b06ce9e497287cc4a8f307a194d766091a35af46300bd1dcdbf730c3f86f14928ff2e576ac83c07a37234b866e0b2cb3afd3d963b8570051c5c4880f4b9 SHA512 0c7f6c0efcfd6f6996e9e751dd0dd9969590b19144099aa6003c089d95d5ffdfddf3a50b82ece31e0f22e8213317dd827e5fbb4cdde614818b81a80c434788dd
-DIST pcsc-lite-1.9.8.tar.bz2 787198 BLAKE2B ba7297e567e5ad7fdb8041d6cddd61e772795d725d91be7f041493a2404a42acf51b41a4e0e82765f4d2a93517d8d9345abd7520dc03eeb48d2eb83bb6082390 SHA512 6275eee849c5572264f5a1ef1ea2a2db5fec9c4129b348bd6e2c1d4444c46c945b8ecab682c003913e9d06da7034b383199b6e392ae178ffae296017e7c61812
 DIST pcsc-lite-1.9.9.tar.bz2 789914 BLAKE2B 4a28e71e5fb23685f8ef1e0c577157708a3130e2f0eb3cb5d93c4da307d40578a862fce6726f8e4b7c6296b86f953448eb0748412d8933cc2e58a28daf285190 SHA512 748ec3d82ff48af1a8dc5a581863e5d94adc47ab8f3158ceb838c2b521ece3a746b737c7b4bb2ba8b545be85ff18b9639443864e50b2e065cf2fbfdf79ef9700
diff --git a/sys-apps/pcsc-lite/pcsc-lite-1.9.8-r2.ebuild b/sys-apps/pcsc-lite/pcsc-lite-1.9.8-r2.ebuild
deleted file mode 100644
index 6ec37345d133..000000000000
--- a/sys-apps/pcsc-lite/pcsc-lite-1.9.8-r2.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit python-single-r1 systemd tmpfiles udev multilib-minimal
-
-DESCRIPTION="PC/SC Architecture smartcard middleware library"
-HOMEPAGE="https://pcsclite.apdu.fr https://github.com/LudovicRousseau/PCSC"
-SRC_URI="https://pcsclite.apdu.fr/files/${P}.tar.bz2"
-
-# GPL-2 is there for the init script; everything else comes from
-# upstream.
-LICENSE="BSD ISC MIT GPL-3+ GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-# This is called libusb so that it doesn't fool people in thinking that
-# it is _required_ for USB support. Otherwise they'll disable udev and
-# that's going to be worse.
-IUSE="doc embedded libusb policykit selinux systemd +udev"
-REQUIRED_USE="^^ ( udev libusb ) ${PYTHON_REQUIRED_USE}"
-
-# No dependencies need the MULTILIB_DEPS because the libraries are actually
-# standalone, the deps are only needed for the daemon itself.
-DEPEND="
-	libusb? ( virtual/libusb:1 )
-	udev? ( virtual/libudev:= )
-	policykit? ( >=sys-auth/polkit-0.111 )
-	acct-group/openct
-	acct-group/pcscd
-	acct-user/pcscd
-	${PYTHON_DEPS}"
-RDEPEND="${DEPEND}
-	selinux? ( sec-policy/selinux-pcscd )"
-BDEPEND="
-	sys-devel/flex
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.8.11-polkit-pcscd.patch
-	"${FILESDIR}"/${PN}-1.9.8-systemd-user.patch
-)
-
-multilib_src_configure() {
-	ECONF_SOURCE="${S}" econf \
-		--disable-maintainer-mode \
-		--disable-strict \
-		--enable-usbdropdir="${EPREFIX}"/usr/$(get_libdir)/readers/usb \
-		--enable-ipcdir=/run/pcscd \
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)" \
-		$(multilib_native_use_enable doc documentation) \
-		$(multilib_native_use_enable embedded) \
-		$(multilib_native_use_enable systemd libsystemd) \
-		$(multilib_native_use_enable udev libudev) \
-		$(multilib_native_use_enable libusb) \
-		$(multilib_native_use_enable policykit polkit)
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	dodoc HELP SECURITY
-
-	newinitd "${FILESDIR}"/pcscd-init.7 pcscd
-	dotmpfiles "${FILESDIR}"/pcscd.conf
-
-	if use udev; then
-		exeinto "$(get_udevdir)"
-		newexe "${FILESDIR}"/pcscd-udev pcscd.sh
-
-		insinto "$(get_udevdir)"/rules.d
-		newins "${FILESDIR}"/99-pcscd-hotplug-r1.rules 99-pcscd-hotplug.rules
-	fi
-
-	python_fix_shebang "${ED}"/usr/bin/pcsc-spy
-
-	find "${ED}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	elog "Starting from version 1.6.5, pcsc-lite will start as user nobody in"
-	elog "the pcscd group, to avoid running as root."
-	elog
-	elog "This also means you need the newest drivers available so that the"
-	elog "devices get the proper owner."
-	elog
-	elog "Furthermore, a conf.d file is no longer installed by default, as"
-	elog "the default configuration does not require one. If you need to"
-	elog "pass further options to pcscd, create a file and set the"
-	elog "EXTRA_OPTS variable."
-	elog
-
-	if use udev; then
-		elog "Hotplug support is provided by udev rules."
-		elog "When using OpenRC you additionally need to tell it to hotplug"
-		elog "pcscd by setting this variable in /etc/rc.conf:"
-		elog
-		elog "    rc_hotplug=\"pcscd\""
-	fi
-
-	tmpfiles_process pcscd.conf
-
-	use udev && udev_reload
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-}
diff --git a/sys-apps/plocate/Manifest b/sys-apps/plocate/Manifest
index 067c35962f41..7f10636208e0 100644
--- a/sys-apps/plocate/Manifest
+++ b/sys-apps/plocate/Manifest
@@ -1,2 +1 @@
-DIST plocate-1.1.15.tar.gz 73274 BLAKE2B 72dba287ba3357d2fa541542bf5e9d283eac672b7f3b2eebab687ecec930d6e91400eeb0f24c97d6133d69cae0308bc4473b7c8cbc5e263dd18ae8a7728a42a4 SHA512 772f82af38fd7b61fa51ac31f71d4a855542cfa617867da54b5ad8202f49f9e1861064a01e9b8f0937c3da902d84f19a50c1d0e4f037a491a9a6819b2413cfa1
 DIST plocate-1.1.16.tar.gz 73397 BLAKE2B b6706145e9cba8b386761229cfbf23f8a9490596210b0a8dc467dfa6a6ed5b349c8f84cfcbe0430e89691afb50e257a3d331b1dcdc638611407587c8b623e72b SHA512 01dfc3ba434e6164f3e582fb102bd7ec0167a8f93e4cf9c3e72af804a8eda9b69b04fec20ee34fc19549d810b97076342f3a83b46705d0311ada6004d05da26c
diff --git a/sys-apps/plocate/plocate-1.1.15.ebuild b/sys-apps/plocate/plocate-1.1.15.ebuild
deleted file mode 100644
index 5df0276d30a1..000000000000
--- a/sys-apps/plocate/plocate-1.1.15.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
-
-inherit linux-info meson systemd
-
-DESCRIPTION="Posting locate is a much faster locate"
-HOMEPAGE="https://plocate.sesse.net/"
-SRC_URI="https://plocate.sesse.net/download/${P}.tar.gz"
-
-# GPL-2 for updatedb
-# GPL-2+ for plocate itself
-LICENSE="GPL-2 GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~x86"
-IUSE="+io-uring"
-
-RDEPEND="
-	acct-group/locate
-	app-arch/zstd:=
-	io-uring? ( sys-libs/liburing:= )
-	!sys-apps/mlocate
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.1.15-meson-use-feature-option-for-libiouring.patch
-)
-
-pkg_setup() {
-	if use io-uring && linux_config_exists; then
-		if ! linux_chkconfig_present IO_URING; then
-			ewarn "CONFIG_IO_URING must be enabled for USE=io-uring"
-		fi
-	fi
-}
-
-src_prepare() {
-	# We'll install the manpage ourself to locate.1
-	sed -i "/install_man('plocate.1')/d" meson.build || die
-
-	default
-}
-
-src_configure() {
-	local emesonargs=(
-		-Dlocategroup=locate
-		-Dinstall_systemd=true
-		-Dinstall_cron=false
-		-Dsystemunitdir="$(systemd_get_systemunitdir)"
-		"$(meson_feature io-uring use_libiouring)"
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-	dodoc README NEWS
-	newman "${S}"/${PN}.1 locate.1
-	dosym plocate /usr/bin/locate
-
-	insinto /etc
-	doins "${FILESDIR}"/updatedb.conf
-	doins "${FILESDIR}"/plocate-cron.conf
-	fperms 0644 /etc/{updatedb,plocate-cron}.conf
-
-	insinto /etc/cron.daily
-	# Ensure that the cron file has the same name as the
-	# systemd-timer, to avoid plocate being run twice daily on systems
-	# with a systemd compatiblity layer. See also bug #780351.
-	newins "${FILESDIR}"/plocate.cron plocate-updatedb
-	fperms 0755 /etc/cron.daily/plocate-updatedb
-
-	systemd_dounit "${BUILD_DIR}"/${PN}-updatedb.service "${S}"/${PN}-updatedb.timer
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
-		elog "The database for the locate command is generated daily by a cron job,"
-		elog "if you install for the first time you can run the updatedb command manually now."
-		elog
-		elog "Note that the ${EROOT}/etc/updatedb.conf file is generic,"
-		elog "please customize it to your system requirements."
-	fi
-}
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index 62e23d8bef0b..d3dcb99100e8 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -1,2 +1,3 @@
 DIST portage-3.0.30.tar.bz2 1157316 BLAKE2B 56939618f4915f77dca6bb85d4a7cf98e50133b524f68a0b192c0a928ca209a0cb944c174dda78f1b5a071c02c190857ea8a7ecd514301c45e897b302542f52e SHA512 accec770f63180b6d5d4cd08ef50f0cd01aa5701104156523f1a735d8ec3313a3b513629a33d8863285736515b6a3d56fc21498404da3a0f89b196655a98db7d
 DIST portage-3.0.36.tar.bz2 1114026 BLAKE2B a8a535ae309c32955eae6a491cbc97f809fb67111688087aa98ac28df4bc97fcb3d9a4ce7c5dbdfbb7f21891a7524f671ff3e3ccbed425503c66bde591266957 SHA512 94b39718871e895c1170271ad072eaa72c995a7e7a06bda9ee76cde2e3949682da7a996780a83cc33c4647915f942fe9d4a7b9b6dfd9319143eb1453cee3b3de
+DIST portage-3.0.37.tar.bz2 1113712 BLAKE2B 531ff47c3a5cd45b4b33c83d96cedfd91750ad693755361d41632d2bb4352268a849accc5b452ad77106ff1ec625b3b4fea12da816f2c9675288148856b5ce09 SHA512 2eab8486d4a580ba0d91833b5306a4b8e11a1b120f44adbb81b8dc3a2aa1e6e5dd21e280471f3a74d5ac52ee00a3019c1d0b5621f5c9d523366ff29920400624
diff --git a/sys-apps/portage/portage-3.0.37.ebuild b/sys-apps/portage/portage-3.0.37.ebuild
new file mode 100644
index 000000000000..26815216586a
--- /dev/null
+++ b/sys-apps/portage/portage-3.0.37.ebuild
@@ -0,0 +1,273 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( pypy3 python3_{8..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-20180706
+			>=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/file-5.41
+		>=sys-apps/coreutils-6.4
+	)"
+# 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=(
+	)
+
+	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
+
+		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
+	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.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
+}
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 51f5ec63c5d1..a039393f9440 100644
Binary files a/sys-auth/Manifest.gz and b/sys-auth/Manifest.gz differ
diff --git a/sys-auth/fprintd/fprintd-1.94.1.ebuild b/sys-auth/fprintd/fprintd-1.94.1.ebuild
index cca15ee2f37a..54b26b7b3ee6 100644
--- a/sys-auth/fprintd/fprintd-1.94.1.ebuild
+++ b/sys-auth/fprintd/fprintd-1.94.1.ebuild
@@ -14,7 +14,7 @@ SRC_URI="https://gitlab.freedesktop.org/libfprint/${PN}/-/archive/v${PV}/${MY_P}
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ia64 ppc ~riscv sparc x86"
+KEYWORDS="~alpha amd64 arm ~arm64 ~ia64 ppc ~riscv sparc x86"
 IUSE="doc pam systemd test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-boot/Manifest.gz b/sys-boot/Manifest.gz
index e725a1c3cd95..867b1a575c4b 100644
Binary files a/sys-boot/Manifest.gz and b/sys-boot/Manifest.gz differ
diff --git a/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
index 6e23f2cb51d4..ba84fd2db50a 100644
--- a/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
+++ b/sys-boot/dvhtool/dvhtool-1.0.1-r2.ebuild
@@ -7,7 +7,7 @@ inherit autotools toolchain-funcs
 
 DESCRIPTION="Tool to copy kernel(s) into the volume header on SGI MIPS-based workstations"
 HOMEPAGE="http://packages.debian.org/unstable/utils/dvhtool"
-SRC_URI="mirror://debian/pool/main/d/dvhtool/dvhtool_1.0.1.orig.tar.gz"
+SRC_URI="mirror://debian/pool/main/d/dvhtool/dvhtool_${PV}.orig.tar.gz"
 
 LICENSE="GPL-2"
 SLOT="0"
diff --git a/sys-boot/efibootmgr/efibootmgr-17.ebuild b/sys-boot/efibootmgr/efibootmgr-17-r1.ebuild
similarity index 98%
rename from sys-boot/efibootmgr/efibootmgr-17.ebuild
rename to sys-boot/efibootmgr/efibootmgr-17-r1.ebuild
index 416014829fed..4867892f28f8 100644
--- a/sys-boot/efibootmgr/efibootmgr-17.ebuild
+++ b/sys-boot/efibootmgr/efibootmgr-17-r1.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ~riscv x86"
 
 RDEPEND="
+	dev-libs/popt
 	sys-apps/pciutils
 	>=sys-libs/efivar-37:=
 "
diff --git a/sys-boot/efibootmgr/efibootmgr-18.ebuild b/sys-boot/efibootmgr/efibootmgr-18-r1.ebuild
similarity index 97%
rename from sys-boot/efibootmgr/efibootmgr-18.ebuild
rename to sys-boot/efibootmgr/efibootmgr-18-r1.ebuild
index e2fdcd543553..05dc26fb19e5 100644
--- a/sys-boot/efibootmgr/efibootmgr-18.ebuild
+++ b/sys-boot/efibootmgr/efibootmgr-18-r1.ebuild
@@ -14,6 +14,7 @@ SLOT="0"
 KEYWORDS="amd64 arm arm64 ~ia64 ~loong ~riscv x86"
 
 RDEPEND="
+	dev-libs/popt
 	sys-apps/pciutils
 	>=sys-libs/efivar-37:=
 "
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index c22590f7a5ca..4620e9ae43e6 100644
Binary files a/sys-devel/Manifest.gz and b/sys-devel/Manifest.gz differ
diff --git a/sys-devel/autoconf/autoconf-2.69-r6.ebuild b/sys-devel/autoconf/autoconf-2.69-r6.ebuild
deleted file mode 100644
index dd453cd78d3b..000000000000
--- a/sys-devel/autoconf/autoconf-2.69-r6.ebuild
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz
-		ftp://alpha.gnu.org/pub/gnu/${PN}/${P}.tar.xz
-		https://dev.gentoo.org/~polynomial-c/dist/${P}-runstatedir_patches.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-inherit toolchain-autoconf
-
-DESCRIPTION="Used to create autoconfiguration files"
-HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
-
-LICENSE="GPL-3+"
-SLOT="${PV}"
-IUSE="emacs"
-
-BDEPEND="
-	>=sys-devel/m4-1.4.16
-	>=dev-lang/perl-5.6
-"
-RDEPEND="
-	${BDEPEND}
-	>=sys-devel/autoconf-wrapper-13
-	!~sys-devel/${P}:2.5
-"
-
-[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
-
-PDEPEND="emacs? ( app-emacs/autoconf-mode )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.69-perl-5.26.patch
-	"${FILESDIR}"/${P}-fix-libtool-test.patch
-	"${FILESDIR}"/${PN}-2.69-perl-5.26-2.patch
-	"${FILESDIR}"/${P}-make-tests-bash5-compatible.patch
-
-	"${WORKDIR}"/patches/${P}-texinfo.patch
-)
-
-src_prepare() {
-	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		PATCHES+=( "${FILESDIR}"/${PN}-2.61-darwin.patch )
-	fi
-
-	# Save timestamp to avoid later makeinfo call
-	touch -r doc/{,old_}autoconf.texi || die
-
-	toolchain-autoconf_src_prepare
-
-	# Restore timestamp to avoid makeinfo call
-	# We already have an up to date autoconf.info page at this point.
-	touch -r doc/{old_,}autoconf.texi || die
-}
diff --git a/sys-devel/autoconf/autoconf-2.71-r2.ebuild b/sys-devel/autoconf/autoconf-2.71-r2.ebuild
deleted file mode 100644
index aa7f260aed6d..000000000000
--- a/sys-devel/autoconf/autoconf-2.71-r2.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/autoconf.git"
-	inherit git-r3
-else
-	# For _beta handling replace with real version number
-	MY_PV="${PV}"
-	MY_P="${PN}-${MY_PV}"
-	#PATCH_TARBALL_NAME="${PN}-2.70-patches-01"
-	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.xz
-		https://alpha.gnu.org/pub/gnu/${PN}/${MY_P}.tar.xz"
-	#SRC_URI+=" https://dev.gentoo.org/~polynomial-c/${PATCH_TARBALL_NAME}.tar.xz"
-
-	if ! [[ ${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
-	S="${WORKDIR}"/${MY_P}
-fi
-
-inherit toolchain-autoconf
-
-DESCRIPTION="Used to create autoconfiguration files"
-HOMEPAGE="https://www.gnu.org/software/autoconf/autoconf.html"
-
-LICENSE="GPL-3"
-SLOT="${PV/_*}"
-IUSE="emacs"
-
-# for 2.71, our Perl time resolution patch changes our min Perl from 5.6
-# (vanilla upstream for 2.71) to 5.8.
-BDEPEND=">=sys-devel/m4-1.4.16
-	>=dev-lang/perl-5.8"
-RDEPEND="${BDEPEND}
-	>=sys-devel/autoconf-wrapper-15
-	sys-devel/gnuconfig
-	!~sys-devel/${P}:2.5"
-[[ ${PV} == 9999 ]] && BDEPEND+=" >=sys-apps/texinfo-4.3"
-PDEPEND="emacs? ( app-emacs/autoconf-mode )"
-
-PATCHES=(
-	"${FILESDIR}"/${P}-time.patch
-	"${FILESDIR}"/${P}-make-4.4.patch
-)
-
-src_prepare() {
-	# usr/bin/libtool is provided by binutils-apple, need gnu libtool
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		PATCHES+=( "${FILESDIR}"/${PN}-2.71-darwin.patch )
-	fi
-
-	# Save timestamp to avoid later makeinfo call
-	touch -r doc/{,old_}autoconf.texi || die
-
-	local pdir
-	for pdir in "${WORKDIR}"/{upstream_,}patches ; do
-		if [[ -d "${pdir}" ]] ; then
-			eapply ${pdir}
-		fi
-	done
-
-	toolchain-autoconf_src_prepare
-
-	# Restore timestamp to avoid makeinfo call
-	# We already have an up to date autoconf.info page at this point.
-	touch -r doc/{old_,}autoconf.texi || die
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	toolchain-autoconf_src_install
-
-	local f
-	for f in config.{guess,sub} ; do
-		ln -fs ../../gnuconfig/${f} \
-			"${ED}"/usr/share/autoconf-*/build-aux/${f} || die
-	done
-}
diff --git a/sys-devel/crossdev/Manifest b/sys-devel/crossdev/Manifest
index b43e700f0b59..a95db5967e5d 100644
--- a/sys-devel/crossdev/Manifest
+++ b/sys-devel/crossdev/Manifest
@@ -1,6 +1,2 @@
-DIST crossdev-20211121.tar.xz 28700 BLAKE2B bfe637dcd3c5b6d45e289d6298de18cab4b70b5d21a817a9207b91360b489457b9ee10266a1c2641f8dfac09dffb166bf1565a7e519ba41f84c6d5c2000f5158 SHA512 5189fa7639b819dfffc8f994bb557d8d83f115b82cd61d938db77fdcf16a33cc9d0147f9708b3bed22fdc4ace27ac863436813ebad94876ae767172ac0cbb9ce
-DIST crossdev-20220205.tar.xz 29088 BLAKE2B 46e90557f0a6df49e4f6ab7be6495514a188c4366868290d3b6b879ad1e5741e1600bca237735290f7e9278d441534569853b582cd85b96581c6ae0517cb4c54 SHA512 72e7cf690d49a87b32f6fdad2462fd4156e4e35a3f0b5f30911012a2b7936bb999575f757547a7a805c0cfdd1fd0caa8b23bf61e72c4333096314043ed565f40
-DIST crossdev-20220424.tar.xz 29316 BLAKE2B 8b026c165b643262ef934fb2daec5484bc2a2e8c2cafbaca08ecb81c2870a6306dd834c9f72bca8cbe219d1b24274fef0b83a88e301e66d98a1eb0825bb2e161 SHA512 3c2ac2d9c79140c6e0aa7ac9fa7838499f003c6c9c1260abf4b0b7883d2179ef1ded5ab0ba14ca48d471edde5090e22a50fffbf25fd86a32d354a9541e4fd567
-DIST crossdev-20220617.tar.xz 29396 BLAKE2B e3b39edfb4cbd5808851b56d86646bc879ea875b5e320802d86073236474e3aa80c5dbefc42ef4799528334bfb5a2a0abb5c0b344ebdce39ec01aac59306eb84 SHA512 bdc5ea519e4cd6275e8171ff7cd35c8ae45b6240fefd278997e247c8b0758bff6563f7e2613072e179ec4735155f05236f32385fe13579c5e955f761e0859e43
 DIST crossdev-20220709.tar.xz 29408 BLAKE2B dc96be5d86b343215564c2c15e91314c5ed88c765cec4f222b08a7e942ab5fb230915a0cdc3245719c0b12b4ce579066c6a88ae8e7ef4e44b80d8f0c5ddf7663 SHA512 f27929db8b4f7036408a0db18d46eb84312e1cef279336e13a07422ed3a154f3a21821d2d5ada66c0fca37bd70750413dab87b795c957a0a81cb9f27ebce2b90
 DIST crossdev-20220818.tar.xz 29452 BLAKE2B 2fdb9ef8e5ffc1eb7ca16b38a428726646b4283131e7de3cde2fd48f30c96091303d13b8f392ef6ffc0e09c6cf230f0ea6f031426f82cef3650933b1485742d2 SHA512 3c103ad84a5614c7783bb12ca8e5ce4b5d1bb25b89c429678600d62f9fd066a2a4f9617db61b6d583b7564181ea794bed577668e6fb5d7cfcfab25d9c5e94624
diff --git a/sys-devel/crossdev/crossdev-20211121.ebuild b/sys-devel/crossdev/crossdev-20211121.ebuild
deleted file mode 100644
index fe3c418c3092..000000000000
--- a/sys-devel/crossdev/crossdev-20211121.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-"
-BDEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20220205.ebuild b/sys-devel/crossdev/crossdev-20220205.ebuild
deleted file mode 100644
index fe3c418c3092..000000000000
--- a/sys-devel/crossdev/crossdev-20220205.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git"
-else
-	SRC_URI="mirror://gentoo/${P}.tar.xz
-		https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-"
-BDEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20220424.ebuild b/sys-devel/crossdev/crossdev-20220424.ebuild
deleted file mode 100644
index 8c680c914ad0..000000000000
--- a/sys-devel/crossdev/crossdev-20220424.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git"
-else
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-"
-BDEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ "${PV}" == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/crossdev/crossdev-20220617.ebuild b/sys-devel/crossdev/crossdev-20220617.ebuild
deleted file mode 100644
index 1701b22179d5..000000000000
--- a/sys-devel/crossdev/crossdev-20220617.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-if [[ ${PV} == "99999999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/crossdev.git"
-else
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz
-		https://dev.gentoo.org/~vapier/dist/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-DESCRIPTION="Gentoo Cross-toolchain generator"
-HOMEPAGE="https://wiki.gentoo.org/wiki/Project:Crossdev"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-RDEPEND="
-	>=sys-apps/portage-2.1
-	>=app-portage/portage-utils-0.55
-	app-shells/bash
-	sys-apps/gentoo-functions
-"
-BDEPEND="app-arch/xz-utils"
-
-src_install() {
-	default
-
-	if [[ ${PV} == "99999999" ]] ; then
-		sed -i "s:@CDEVPV@:${EGIT_VERSION}:" "${ED}"/usr/bin/crossdev || die
-	fi
-}
diff --git a/sys-devel/gcc-config/Manifest b/sys-devel/gcc-config/Manifest
index 96afcff2b4a5..92a9393a2a8d 100644
--- a/sys-devel/gcc-config/Manifest
+++ b/sys-devel/gcc-config/Manifest
@@ -1,2 +1,3 @@
 DIST gcc-config-2.4.tar.xz 17552 BLAKE2B 631645a5cc9f3e7ab0ff089960ee3d0b2ecea29aa96f839a03a86985db512bf0d182b67a7b1bb73b95808c04523f32d6b8c122cdfbe8dbf94e7d319a1e49a23c SHA512 852b4aefaccfae1d91c551e226ac28110fa23f9668075c190a5fb9129c86d2f3e4994e96b7a5e8a2801883c5a5b16d9fbf3e9066e6b6a423055fdefa490793c7
 DIST gcc-config-2.5.tar.xz 17664 BLAKE2B fa7133a54d3b49df20d3ae6036a65602c8a0d9e8668e2874a87d080add241a31322a3f4694bff8a5fe61957740603862539c0d9750e446d36beb2fb42ff0ba27 SHA512 20a8d62192faf54101352cfb6ca00503c9b2ab83aefecd94c4c887302a000d78334545a3424603a66a50e5f3ff07b67b16828813407893df5d94051776252b83
+DIST gcc-config-2.6.tar.xz 17772 BLAKE2B 5f06ac46c64fd241be9e7b95e277395623f015016c5abbe5e3275dce3fbf326d998a897a915b87387c878a1b57cdc847a6f95fa0b7ca00aa954c13d00a6e7d09 SHA512 27de726b266b2f58f28a4eab0a77141a8c0cfc9e939f4f0ee8dd382578a1cdececd30a4ae15bab858fec01a533c41248c9858f25d5d7314c36e8f2fcd57df429
diff --git a/sys-devel/gcc-config/gcc-config-2.6.ebuild b/sys-devel/gcc-config/gcc-config-2.6.ebuild
new file mode 100644
index 000000000000..7ff12f007e38
--- /dev/null
+++ b/sys-devel/gcc-config/gcc-config-2.6.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} == 9999 ]]; then
+	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
+	inherit git-r3
+else
+	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+fi
+
+DESCRIPTION="Utility to manage compilers"
+HOMEPAGE="https://gitweb.gentoo.org/proj/gcc-config.git/"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="+cc-wrappers +native-symlinks"
+
+RDEPEND=">=sys-apps/gentoo-functions-0.10"
+
+_emake() {
+	emake \
+		PV="${PVR}" \
+		SUBLIBDIR="$(get_libdir)" \
+		USE_CC_WRAPPERS="$(usex cc-wrappers)" \
+		USE_NATIVE_LINKS="$(usex native-symlinks)" \
+		TOOLCHAIN_PREFIX="${CHOST}-" \
+		"$@"
+}
+
+src_compile() {
+	_emake
+}
+
+src_install() {
+	_emake DESTDIR="${D}" install
+}
+
+pkg_postinst() {
+	# Do we have a valid multi ver setup ?
+	local x
+	for x in $(gcc-config -C -l 2>/dev/null | awk '$NF == "*" { print $2 }') ; do
+		gcc-config ${x}
+	done
+
+	# USE flag change can add or delete files in /usr/bin worth recaching
+	if [[ ! ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
+		eselect compiler-shadow update all
+	fi
+
+	if ! has_version "sys-devel/gcc[gcj(-)]" && [[ -x "${EROOT}"/usr/bin/gcj ]] ; then
+		# Warn about obsolete /usr/bin/gcj for bug #804178
+		ewarn "Obsolete GCJ wrapper found: ${EROOT}/usr/bin/gcj!"
+		ewarn "Please delete this file unless you know it is needed (e.g. custom gcj install)."
+		ewarn "If you have no idea what this means, please delete the file:"
+		ewarn " rm ${EROOT}/usr/bin/gcj"
+	fi
+}
diff --git a/sys-devel/gcc-config/gcc-config-9999.ebuild b/sys-devel/gcc-config/gcc-config-9999.ebuild
index 67c6a7ee6316..7ff12f007e38 100644
--- a/sys-devel/gcc-config/gcc-config-9999.ebuild
+++ b/sys-devel/gcc-config/gcc-config-9999.ebuild
@@ -1,14 +1,14 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://anongit.gentoo.org/git/proj/gcc-config.git"
 	inherit git-r3
 else
 	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}.tar.xz"
-	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"
 fi
 
 DESCRIPTION="Utility to manage compilers"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index 0f5d44005e68..29268c2d4f1a 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -1,12 +1,9 @@
-DIST gcc-10-20220901.tar.xz 71753520 BLAKE2B 882d6b8a5eb0ea445e774b8ca076e82ad8bcbf01b65d0ee7edfba7a4f0c09037076f996b3758130f83919c3768bf75ba5be0f6990fd01a61adc3cb305056374d SHA512 1bbe0e182227fc4d66c53b55da97a903f59656bf5870fdd5215b33152c977e33abfd5404741cb4d6712aee92cfce831062e3410d16209f33ab2101c1db364255
-DIST gcc-10-20220908.tar.xz 71756288 BLAKE2B 4ebe4c1d2d655a975049fc148f9458064658130b48ddd7d6ce9f156ba7a90e79d30381d9fec7b3f1725d924fbbf272a8a6720e97d61b6afbea91fcb48ae35e59 SHA512 dcf7dac5a0bbd879a9ae40203fe85adf4bf326d160fa8a180b5c1005e445d8ea866becb4b1864bde80eb905483cd47e8ea514432aef820f017a57d4f30d7b7d7
 DIST gcc-10-20220915.tar.xz 71759056 BLAKE2B 0c337b0d4d17ad8c19b79b7b05d2c8250e04e2b137a39e796a569d7321f4c2375239972e0a02b9b35769a653677a109a0040f43ea195d8fe698657ef22416680 SHA512 1ef13b14b2bd5c16ee576cc1270b11be77b26d28202db78d52b63aa5d516c8e8caf56e04964e30c6eed8d7a53e5860db718c3f3dbc63f7a598b29baaaaa35d29
 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570
 DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88175d3f1d67d32c6bee1780d252d86947059bd624992e6292610e86c9012f4d901a1a54df0d184dd023d404a0707700e SHA512 aa8fb42f20587f8519e7b06037da4d8f7d386b63e228b239a0445a51df4e401940fcd81482381d966622054aef3e0db06d1def5c74ac3d3dcc9c75c3b966c758
 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
 DIST gcc-10.5.0-musl-patches-1.tar.xz 3816 BLAKE2B 5995f934a40665d877342853fde8b414eed8770c72e6b11b295b7e7b3c9d38d7407dff63b5751f4449f6fa842c02e87f156cc868e7436a8313f7c8514242d255 SHA512 b93cc54cd7b78fdc487df7c449b03bbfd10094e45f3f8eef20cd69f27a68a14817fe662a2ec119b384eea2dad0491b70f838d010457e386700030b76457afad6
 DIST gcc-10.5.0-patches-0.tar.xz 16188 BLAKE2B 3fe3163c4960ff02eb792b2d00b9b20e1c2b44ad2d2e79661ffa0a5795b1bb631bce83c506f485765a7b971e6d391ebc1803c327f0d8d06e457610f5d6074c90 SHA512 fde1fec92df535416221827d48daf7d498f675da5697bc15bb4e17ccfedf6e6705dd28f57a3c9ebc8065b49328246fa5aa1fd90bd88bc27fe2b7b3e924f0df15
-DIST gcc-11-20220902.tar.xz 75785408 BLAKE2B d35d2dd3a3a3b1ae63facb55e93893155b59963ed9a9fc3650122fbb7f2274090e375ce41762587bee69c02f79b72f4f1c8e9b8e84035c41a1e9b269b4984f92 SHA512 4ee62df741b16212366a91a8124ac0fa5a8245565deabbc24f88b3379b5b9fbfebc04cd0b6e14ba2e1ef8d0624e3d52a763e259cfe1572489ba6797f3c713571
 DIST gcc-11-20220909.tar.xz 75778496 BLAKE2B 6905614b33c1fa74caf409e4a6e87d0d38464e3f965ba92bba4167608af1143e69540b023626578437bcc4d631f94fc60e72e09b32c586be5c1dd6d29774b275 SHA512 22afab5e99cf787aac0eac2b4e5b7f663dd2a9fa82f4d13c08fca8b79007f5937cdbd8c5d49ae31d4b3267def09c9030c5c1dad4bd28c8d28050c4273810cc5d
 DIST gcc-11-20220916.tar.xz 75795008 BLAKE2B b208fc0364f2412e77afe599f3c907b44976ec656f2320a10f6e6fac13084a178dd55dd3fedb8f2bf2b97220cb3844c67804cdac39b56cdd429a13c31d7454d4 SHA512 7e59d8b0cf1f4ce598b8bd8fc2a9938ca7c5c0caee43a29eff329ce89303511fc1f1b3e36a3f1172907bd52865cdd63d1c1ddadfbc8f8750b9c5467513f48441
 DIST gcc-11.3.0-musl-patches-1.tar.xz 3856 BLAKE2B f511f8b4c0696771d906beee9645b5d009ea4b673602baa1ca562d6f23c5b0caf2012aae93578671624617c4286e3937d79a7383d6a03bb438c5b774a06fe8e6 SHA512 cd375ff2affb213475acaabf02989b1f05d719d972970ea0304d20a816986807390893d1401826f3b497787642f35d90a244195f8e466db41e8d768366057334
@@ -14,16 +11,10 @@ DIST gcc-11.3.0-patches-7.tar.xz 15184 BLAKE2B 426f00feaa982a35d2c459e7a2c2e9d29
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
 DIST gcc-11.4.0-musl-patches-0.tar.xz 3844 BLAKE2B f3f1be6718e3cf08e553a1a2319a85e13368279849f6f3ab89ad7abe505316afacf5084846c0cb133bdcb5c918244644242c194e6ce55455a26e67b3983d73ef SHA512 a81db52d21de364137461dcff7e1af696df4a02fa26452f90439ae4af14ccbffe68eb4ee93ae56257490ab8aa36b4bff37c4e1f2cf4dd4624b3a6fb4cb50b7ac
 DIST gcc-11.4.0-patches-2.tar.xz 14224 BLAKE2B d3030c19a7bd8bd082fd39b35c3e80883ae541ab28232513ba60095fe81f5fe1fbdc54829a1556b2d278328033f6eb8a81e9ee268a6020b554388a60842b02e6 SHA512 60aa19f00fb29b7c8a68c73de274e24559dc896f551d47153ea511b202941caa950c0aff62ad28d057a8ed16f2aec2c06e681e7286d65ab3610b6948d7bb840a
-DIST gcc-12-20220827.tar.xz 79135916 BLAKE2B bcb8de57a2a65eb242a6c3784d9b79fce0af759ae63b6654ed807973224ab4114a700ac1f2811eadaf1647f1838b4719b8eaaa94593e91377b64cd5fb207e987 SHA512 9c15debedfe2707cdcf7ef865a7467e7652826c392e6c241578bb839c53ab5a903b36e09d3eba13c7572fcb778399d4fa5fd136a81eddac98ee193223452e3b2
-DIST gcc-12-20220903.tar.xz 79131544 BLAKE2B fb5b2dbecd18ef50dd2eba3f914f6a71b59e1f51053fabb40c0ccbd8de29362d75e7cdcd8be794174f705fff64a85f402c30f66877bfc2c28c1fc970c7da6a8e SHA512 ebef6b11e20bc7b4bcef94b5e5282e20c3895f72195dcf5377889b6dba27a8c548282247e158a75beafcb33c84f86faf07fe960d01fc05ae6f7112c6ab3e9f44
-DIST gcc-12-20220910.tar.xz 79136420 BLAKE2B 53d1b45a083da03cd0edb534a81039548927b31564935f5f9788b3423782543ddee5bbb046656b61bac2b077686d1b99f7ec8dc26f7dccc0f5b0ccd2f58613f4 SHA512 6123d2dbd2f6fd68b050d2356278ecf801aae902a780c0953a0fb418baa34ee0eace6c9b037009c12ec75f42b37cc29e0c2ca3d706b07b9bd1b4f70579104dc3
 DIST gcc-12-20220917.tar.xz 79137544 BLAKE2B ddd538b339e57fce4d8ef47e18077a27b35994bb571b5ac8670fc2f833751f87557a05c3f82fc41e3c0c3ac47ac231d8392353835295874cfb24e02aa72a8662 SHA512 15071044595fcf22deca3fd4569309f7fa01e2e8d54b1c518c480ff134f1222a652b0137be98e03b495648eed3c21992d906e9c9d12f265a6467581adc2dc1ee
 DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45695e858abee73a255e44dc6e0a225339e4cad40aab0d51dfe9a55d5aa4b4001f5726064bb2eea3212a0874b2d27e229abd7 SHA512 c354edcd641a9dfaf902a0ff4c44c75065d0cf1c36bbf6c3c35c2e23bff22b8f70bcf4458a5a0ef86371e9f2fafca8a54ca822e35820ff442c9458a2819c3606
 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
-DIST gcc-13-20220828.tar.xz 79804664 BLAKE2B fb77fe6fc60fb347f7910ff5210085fb619f834eaca0e20ce57f7ebf083a954b83bd56a3b3e2e5a1fa7ffc63a798e6cd786faf03bc469202ccc0cc5cd9305011 SHA512 c5222f93102c53af77b0c77ea410cc703de001b3800d5134aff5a136a8598267d0cb17b5bfecda2ae155b6d482f284814b2ab943d46d1182fbac019013a7e513
-DIST gcc-13-20220904.tar.xz 79783116 BLAKE2B af32bc9c3d836ed085329d75928f310480f3d2a5fc52c3a940b28c401d17c9680f85b917d233aa8d1da0475d1fe07b383e85a2c40eb2954f1029a5187c0af749 SHA512 e5c73978241de22f7198bd78e1f802f43b723aa97eb909647d3c26e57e944f7dc9c9f1c1a9b0bbc71a7799badcc5fcb58ba80b7f27de3ed97be025ffa3f893cc
-DIST gcc-13-20220911.tar.xz 79849716 BLAKE2B 1d8b34141b813be770b55b4a2f56eaff15c4aaa078603b605f8f616454dda27565cb50d4fb59b50897fd0a891d6567cccb5d75aaf1576981445680c0b3ab0a74 SHA512 56b55b7d869bead14c190ed425dbbf77521d770090c734510d5f9ad3da94b2c860be0a577e16221d64e6a049eac0c7aef05a9c0aefa8bc0d9257ee9e01470c8c
 DIST gcc-13-20220918.tar.xz 79822640 BLAKE2B 6c35953290e001352aac3a649de7a6dc696bcad85e5b2905bbb6863fd280ce78cfb5663a95e64a1006c869be0e7892adea85e2b1c9f799c3412f634b23f069d0 SHA512 e1b661a483d71f3f8d0dc66bbc2ce6a00bf3b3bb3142b27b07c01d46c10717ad7a95b79d44fa78e3821614032a5ab9194ff444ff280dd3304d4b030373436b6b
 DIST gcc-13.0.0-patches-1.tar.xz 11064 BLAKE2B 82a7ad193dac00475931840bcee82ef7a51718a74af224b03a41f8349e34c2a64a3eb29985b4e2bffde958c58782242eccaedaa54d950e8d51d8bb6f45868e0e SHA512 e04b510f529dd3187a08ae9cb9a894a3d3d30af81f13c43cc082fda7d26c44a3bf19d36ec02024b2ade8b8c193e9730246abeadee603c41b5873c5b785709921
 DIST gcc-8.5.0-patches-2.tar.bz2 16921 BLAKE2B 619a47f74edf05fa01c9de59d0ff7abb027a01cf0bdec91ac41046166192f4eae561684136c4a6a5e077f64754bb5b0710905129f31b0def21d88f92e6bba7fb SHA512 b6095d4570895e2c4dd58fed5756194aea27391b813e5e2de42b2749cb318c4bea2087eb0ff92c70e7f98ae4482c49d476db57be83d7beb19fd462aa61714ab2
diff --git a/sys-devel/gcc/gcc-10.4.1_p20220901.ebuild b/sys-devel/gcc/gcc-10.4.1_p20220901.ebuild
deleted file mode 100644
index bb603378916c..000000000000
--- a/sys-devel/gcc/gcc-10.4.1_p20220901.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="0"
-MUSL_VER="1"
-MUSL_GCC_VER="10.5.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-10.4.1_p20220908.ebuild b/sys-devel/gcc/gcc-10.4.1_p20220908.ebuild
deleted file mode 100644
index bb603378916c..000000000000
--- a/sys-devel/gcc/gcc-10.4.1_p20220908.ebuild
+++ /dev/null
@@ -1,58 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-#TOOLCHAIN_GCC_RC=1
-PATCH_GCC_VER="10.5.0"
-PATCH_VER="0"
-MUSL_VER="1"
-MUSL_GCC_VER="10.5.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 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-#fi
-
-RDEPEND=""
-BDEPEND="${CATEGORY}/binutils"
-
-src_prepare() {
-	local p upstreamed_patches=(
-		# add them here
-	)
-	for p in "${upstreamed_patches[@]}"; do
-		rm -v "${WORKDIR}/patch/${p}" || die
-	done
-
-	if has_version '>=sys-libs/glibc-2.32-r1'; then
-		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
-	fi
-
-	toolchain_src_prepare
-}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20220902.ebuild b/sys-devel/gcc/gcc-11.3.1_p20220902.ebuild
deleted file mode 100644
index 79b1ee62b754..000000000000
--- a/sys-devel/gcc/gcc-11.3.1_p20220902.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_SUFFIX="xz"
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="2"
-PATCH_GCC_VER="11.4.0"
-MUSL_VER="0"
-MUSL_GCC_VER="11.4.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))
-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 ~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() {
-	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/gcc/gcc-12.2.1_p20220827.ebuild b/sys-devel/gcc/gcc-12.2.1_p20220827.ebuild
deleted file mode 100644
index 97d104a8472d..000000000000
--- a/sys-devel/gcc/gcc-12.2.1_p20220827.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="1"
-PATCH_GCC_VER="12.2.0"
-MUSL_VER="1"
-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-12.2.1_p20220903.ebuild b/sys-devel/gcc/gcc-12.2.1_p20220903.ebuild
deleted file mode 100644
index 97d104a8472d..000000000000
--- a/sys-devel/gcc/gcc-12.2.1_p20220903.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="1"
-PATCH_GCC_VER="12.2.0"
-MUSL_VER="1"
-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-12.2.1_p20220910.ebuild b/sys-devel/gcc/gcc-12.2.1_p20220910.ebuild
deleted file mode 100644
index 97d104a8472d..000000000000
--- a/sys-devel/gcc/gcc-12.2.1_p20220910.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="sam"
-PATCH_VER="1"
-PATCH_GCC_VER="12.2.0"
-MUSL_VER="1"
-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.0_pre20220828.ebuild b/sys-devel/gcc/gcc-13.0.0_pre20220828.ebuild
deleted file mode 100644
index 641ab05e8153..000000000000
--- a/sys-devel/gcc/gcc-13.0.0_pre20220828.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="xen0n"
-PATCH_VER="1"
-PATCH_GCC_VER="13.0.0"
-MUSL_GCC_VER="13.0.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/gcc/gcc-13.0.0_pre20220904.ebuild b/sys-devel/gcc/gcc-13.0.0_pre20220904.ebuild
deleted file mode 100644
index 641ab05e8153..000000000000
--- a/sys-devel/gcc/gcc-13.0.0_pre20220904.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="xen0n"
-PATCH_VER="1"
-PATCH_GCC_VER="13.0.0"
-MUSL_GCC_VER="13.0.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/gcc/gcc-13.0.0_pre20220911.ebuild b/sys-devel/gcc/gcc-13.0.0_pre20220911.ebuild
deleted file mode 100644
index 641ab05e8153..000000000000
--- a/sys-devel/gcc/gcc-13.0.0_pre20220911.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-TOOLCHAIN_PATCH_DEV="xen0n"
-PATCH_VER="1"
-PATCH_GCC_VER="13.0.0"
-MUSL_GCC_VER="13.0.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/gnuconfig/Manifest b/sys-devel/gnuconfig/Manifest
index 0625142aef24..cfc97db052ae 100644
--- a/sys-devel/gnuconfig/Manifest
+++ b/sys-devel/gnuconfig/Manifest
@@ -1,2 +1 @@
-DIST gnuconfig-20210107.tar.xz 65944 BLAKE2B 209952ca349c9859b695df5a4f8b49df689cba47b439e715108cb66ccef7ec3742162113a2ee4948a85a96b44c45d4d553f9e41c15823403f451fea6ea61bd36 SHA512 e1485b7b719994441f49b18a88f922405f74aff2ba1df16050802a311fb5438e598d989fdb7fa008734e5ec0e567e7e90486f8bc6655787bc053ad8a89650213
 DIST gnuconfig-20220508.tar.xz 87616 BLAKE2B 80b981cc85153af1cdf5ba8ca3f4e22843443ee062dacf0fa104749cebb4d25e28c83a1ba82ae326457b4cd58fe17e0f28423e9b1d0cbd3ff53b72dbc3e414b3 SHA512 c77363d30733b509d9e2a795189d0a7a556f87c6d2333ad5b376175bd8df34c48777d27e85b766c7b557f151ee2d877c6cf94940dedb4d85793427daeed5c7cd
diff --git a/sys-devel/gnuconfig/gnuconfig-20210107.ebuild b/sys-devel/gnuconfig/gnuconfig-20210107.ebuild
deleted file mode 100644
index f0894f34d091..000000000000
--- a/sys-devel/gnuconfig/gnuconfig-20210107.ebuild
+++ /dev/null
@@ -1,63 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-if [[ ${PV} == "99999999" ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/r/config.git"
-
-	inherit git-r3
-else
-	SRC_URI="https://dev.gentoo.org/~polynomial-c/dist/${PN}/${P}.tar.xz"
-	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"
-	S="${WORKDIR}"
-fi
-
-DESCRIPTION="Updated config.sub and config.guess file from GNU"
-HOMEPAGE="https://savannah.gnu.org/projects/config"
-
-LICENSE="GPL-3+-with-autoconf-exception"
-SLOT="0"
-IUSE=""
-
-maint_pkg_create() {
-	cd "${S}"
-
-	make ChangeLog || die
-	local ver=$(gawk '{ gsub(/-/, "", $1); print $1; exit }' ChangeLog)
-	[[ ${#ver} != 8 ]] && die "invalid version '${ver}'"
-
-	cp "${FILESDIR}"/${PV}/*.patch . || die
-
-	local tar="${T}/gnuconfig-${ver}.tar.xz"
-	tar -Jcf "${tar}" ./* || die "creating tar failed"
-	einfo "Packaged tar now available:"
-	einfo "$(du -b "${tar}")"
-}
-
-src_unpack() {
-	if [[ ${PV} == "99999999" ]] ; then
-		git-r3_src_unpack
-		maint_pkg_create
-	else
-		unpack ${A}
-	fi
-}
-
-src_prepare() {
-	default
-	eapply "${S}"/*.patch
-}
-
-src_compile() { :;}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins config.{sub,guess}
-	fperms +x /usr/share/${PN}/config.{sub,guess}
-	dodoc ChangeLog
-}
diff --git a/sys-devel/mold/Manifest b/sys-devel/mold/Manifest
index f0d576a1e727..60a571295ca5 100644
--- a/sys-devel/mold/Manifest
+++ b/sys-devel/mold/Manifest
@@ -1,2 +1 @@
-DIST mold-1.4.1.tar.gz 6280266 BLAKE2B 60d0a876e0bcc8f644e4b6fffe0de14299bf2bd6e382869c87761d725dca6efa874cac37aaf94ad85038c5a24521ed3582782be943236ab81c2e4b66e6002f5e SHA512 304caf4e9d9b24170a9442a84036790407bd02609a5d07c31e5f0f6285128099cbc962571804636a5da55afda59b447c12218f9e4d402fbfa55ebc354814bdda
 DIST mold-1.4.2.tar.gz 6287845 BLAKE2B ec429f70b92c4af5be83761893028f2324fe2086fea0e9b64f1d89884c6bc8dd34e5615178ef28ff19c36d01dafc834e6f6b9a8d701d62e360ef4e0be2f065bd SHA512 17f543969e53737818b0be563aee39feac672f93e0fd712827523232b64eccb4629f3994c5a90de50b5f761886669e0946a8d463663725e774eb7d352de1ced1
diff --git a/sys-devel/mold/mold-1.4.1.ebuild b/sys-devel/mold/mold-1.4.1.ebuild
deleted file mode 100644
index ff42b7ccf9f9..000000000000
--- a/sys-devel/mold/mold-1.4.1.ebuild
+++ /dev/null
@@ -1,109 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake toolchain-funcs
-
-DESCRIPTION="A Modern Linker"
-HOMEPAGE="https://github.com/rui314/mold"
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/rui314/mold.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/rui314/mold/archive/refs/tags/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~riscv"
-fi
-
-# mold (AGPL-3)
-#  - xxhash (BSD-2)
-#  - tbb (Apache-2.0)
-LICENSE="AGPL-3 Apache-2.0 BSD-2"
-SLOT="0"
-IUSE="system-tbb"
-
-RDEPEND="
-	sys-libs/zlib
-	system-tbb? ( >=dev-cpp/tbb-2021.4.0:= )
-	!kernel_Darwin? (
-		>=dev-libs/mimalloc-2:=
-		dev-libs/openssl:=
-	)
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	# Allows us to rm the tests as before. Will be included in next
-	# release.
-	"${FILESDIR}"/mold-1.4.1-glob-tests.patch
-	# https://bugs.gentoo.org/865837
-	"${FILESDIR}"/mold-1.4.1-tbb-flags-stripping.patch
-)
-
-pkg_pretend() {
-	# Requires a c++20 compiler, see #831473
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		if tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]]; then
-			die "${PN} needs at least gcc 10"
-		elif tc-is-clang && [[ $(clang-major-version) -lt 12 ]]; then
-			die "${PN} needs at least clang 12"
-		fi
-	fi
-}
-
-src_prepare() {
-	cmake_src_prepare
-
-	# Needs unpackaged dwarfdump
-	rm test/elf/{{dead,compress}-debug-sections,compressed-debug-info}.sh || die
-
-	# Heavy tests, need qemu
-	rm test/elf/gdb-index-{compress-output,dwarf{2,3,4,5}}.sh || die
-	rm test/elf/lto-{archive,dso,gcc,llvm,version-script}.sh || die
-
-	# Sandbox sadness
-	rm test/elf/run.sh || die
-	sed -i 's|`pwd`/mold-wrapper.so|"& ${LD_PRELOAD}"|' \
-		test/elf/mold-wrapper{,2}.sh || die
-
-	# static-pie tests require glibc built with static-pie support
-	if ! has_version -d 'sys-libs/glibc[static-pie(+)]'; then
-		rm test/elf/{,ifunc-}static-pie.sh || die
-	fi
-
-	# Don't require python. The next release has this script rewritten
-	# in CMake and so this can be dropped.
-	sed -e '/find_package(Python3/d' \
-		-e '/add_dependencies/d' \
-		-e '/UpdateGitHash/,/)/d' \
-		-i CMakeLists.txt || die
-	rm update-git-hash.py || die
-	cat <<EOF>git-hash.cc
-#include <string>
-namespace mold {
-std::string mold_git_hash = "gentoo-${PVR}";
-}
-EOF
-}
-
-src_configure() {
-	local mycmakeargs=(
-		-DMOLD_ENABLE_QEMU_TESTS=OFF
-		-DMOLD_LTO=OFF # Should be up to the user to decide this with CXXFLAGS.
-		-DMOLD_USE_SYSTEM_MIMALLOC=ON
-		-DMOLD_USE_SYSTEM_TBB=$(usex system-tbb)
-	)
-	cmake_src_configure
-}
-
-src_install() {
-	dobin "${BUILD_DIR}"/${PN}
-	dolib.so "${BUILD_DIR}"/${PN}-wrapper.so
-
-	dodoc docs/{design,execstack}.md
-	doman docs/${PN}.1
-
-	dosym ${PN} /usr/bin/ld.${PN}
-	dosym ${PN} /usr/bin/ld64.${PN}
-	dosym ../../../usr/bin/${PN} /usr/libexec/${PN}/ld
-}
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 2694451e67bd..1d5c785c4d42 100644
Binary files a/sys-fs/Manifest.gz and b/sys-fs/Manifest.gz differ
diff --git a/sys-fs/btrfs-progs/Manifest b/sys-fs/btrfs-progs/Manifest
index b2d5e48c0b55..1aadf9024637 100644
--- a/sys-fs/btrfs-progs/Manifest
+++ b/sys-fs/btrfs-progs/Manifest
@@ -1,2 +1,3 @@
 DIST btrfs-progs-v5.15.1.tar.xz 2280796 BLAKE2B b460254a6261d3d04a2d265a3b4e05a89385888f7ea4f2b16ec5b73922646c7f47a546fc78ba7c009e65914125435cf38157eabffc74f5d00df2c21c844922e3 SHA512 68ed89e337ae857fdaf077eaa889e259e9f162ea2222bdaa03f4187783a8682c24d45c91b0559b901d81429ba2cd3f84087d032d354092d5512fb226bdf91549
 DIST btrfs-progs-v5.18.1.tar.xz 2293940 BLAKE2B ce2326cca51a4242895aada860e290c6af69a216dc6369673bb3321ab91bfe1c995fcc37dd0c1e15c8e28aabaedf3d6c9508bde393eb0ba4c7b9327c922f749a SHA512 265a03b0db00a231ad51bb75fb161dee0a7a51cd120a696ca0524f08ef635b18afe43b391fa9889a4a79734ccc3931e4374bd950eb26dc47ddc8482368efed0e
+DIST btrfs-progs-v5.19.1.tar.xz 2315036 BLAKE2B f1ae6901ddc8236f440d46a950923727c3f6168a220ec2c782102355fabcc2217e9617691550db203391279775d53676a2a7ad1920bfde07f39b3744b7f5fff5 SHA512 17fded8583b7392202b1bb408cbb5d42024623ac15415f95e8e56e27b43be79da6d4e6c191d39db4e5a8948390a7c216c0ea520171b0ab95438cc330084c8398
diff --git a/sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild b/sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild
new file mode 100644
index 000000000000..6390e1a15a34
--- /dev/null
+++ b/sys-fs/btrfs-progs/btrfs-progs-5.19.1.ebuild
@@ -0,0 +1,150 @@
+# Copyright 2008-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit bash-completion-r1 python-single-r1 udev
+
+libbtrfs_soname=0
+
+if [[ ${PV} != 9999 ]]; then
+	MY_PV="v${PV/_/-}"
+	SRC_URI="https://www.kernel.org/pub/linux/kernel/people/kdave/${PN}/${PN}-${MY_PV}.tar.xz"
+
+	if [[ ${PV} != *_rc* ]] ; then
+		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	fi
+
+	S="${WORKDIR}"/${PN}-${MY_PV}
+else
+	EGIT_REPO_URI="https://github.com/kdave/btrfs-progs.git"
+	EGIT_BRANCH="devel"
+	WANT_LIBTOOL="none"
+	inherit autotools git-r3
+fi
+
+DESCRIPTION="Btrfs filesystem utilities"
+HOMEPAGE="https://btrfs.wiki.kernel.org"
+
+LICENSE="GPL-2"
+SLOT="0/${libbtrfs_soname}"
+IUSE="+convert python +man reiserfs static static-libs udev +zstd"
+# Could support it with just !systemd => eudev, see mdadm, but let's
+# see if someone asks for it first.
+REQUIRED_USE="static? ( !udev )"
+
+# Tries to mount repaired filesystems
+RESTRICT="test"
+
+RDEPEND="
+	dev-libs/lzo:2=
+	sys-apps/util-linux:=[static-libs(+)?]
+	sys-libs/zlib:=
+	convert? (
+		sys-fs/e2fsprogs:=
+		reiserfs? (
+			>=sys-fs/reiserfsprogs-3.6.27
+		)
+	)
+	python? ( ${PYTHON_DEPS} )
+	udev? ( virtual/libudev:= )
+	zstd? ( app-arch/zstd:= )
+"
+DEPEND="${RDEPEND}
+	>=sys-kernel/linux-headers-5.10
+	convert? ( sys-apps/acl )
+	python? (
+		$(python_gen_cond_dep '
+			dev-python/setuptools[${PYTHON_USEDEP}]
+		')
+	)
+	static? (
+		dev-libs/lzo:2[static-libs(+)]
+		sys-apps/util-linux:0[static-libs(+)]
+		sys-libs/zlib:0[static-libs(+)]
+		convert? (
+			sys-fs/e2fsprogs[static-libs(+)]
+			reiserfs? (
+				>=sys-fs/reiserfsprogs-3.6.27[static-libs(+)]
+			)
+		)
+		zstd? ( app-arch/zstd[static-libs(+)] )
+	)
+"
+BDEPEND="virtual/pkgconfig
+	man? ( dev-python/sphinx )"
+
+if [[ ${PV} == 9999 ]]; then
+	BDEPEND+=" sys-devel/gnuconfig"
+fi
+
+REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
+
+pkg_setup() {
+	use python && python-single-r1_pkg_setup
+}
+
+src_prepare() {
+	default
+
+	if [[ ${PV} == 9999 ]]; then
+		AT_M4DIR="m4" eautoreconf
+
+		mkdir config || die
+		local automakedir="$(autotools_run_tool --at-output automake --print-libdir)"
+		[[ -e ${automakedir} ]] || die "Could not locate automake directory"
+
+		ln -s "${automakedir}"/install-sh config/install-sh || die
+		ln -s "${BROOT}"/usr/share/gnuconfig/config.guess config/config.guess || die
+		ln -s "${BROOT}"/usr/share/gnuconfig/config.sub config/config.sub || die
+	fi
+}
+
+src_configure() {
+	local myeconfargs=(
+		--bindir="${EPREFIX}"/sbin
+
+		--enable-lzo
+		--disable-experimental
+		$(use_enable convert)
+		$(use_enable man documentation)
+		$(use_enable elibc_glibc backtrace)
+		$(use_enable python)
+		$(use_enable static-libs static)
+		$(use_enable udev libudev)
+		$(use_enable zstd)
+
+		# Could support libgcrypt, libsodium, libkcapi
+		--with-crypto=builtin
+		--with-convert=ext2$(usex reiserfs ',reiserfs' '')
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_compile() {
+	emake V=1 all $(usev static)
+}
+
+src_install() {
+	local makeargs=(
+		$(usex python install_python '')
+		$(usex static install-static '')
+	)
+
+	emake V=1 DESTDIR="${D}" install "${makeargs[@]}"
+
+	newbashcomp btrfs-completion btrfs
+
+	use python && python_optimize
+}
+
+pkg_postinst() {
+	udev_reload
+}
+
+pkg_postrm() {
+	[[ -n ${REPLACED_BY_VERSION} ]] || udev_reload
+}
diff --git a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
index 76f2afe1fe01..6390e1a15a34 100644
--- a/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
+++ b/sys-fs/btrfs-progs/btrfs-progs-9999.ebuild
@@ -1,7 +1,7 @@
 # Copyright 2008-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
 
@@ -88,6 +88,7 @@ pkg_setup() {
 
 src_prepare() {
 	default
+
 	if [[ ${PV} == 9999 ]]; then
 		AT_M4DIR="m4" eautoreconf
 
diff --git a/sys-fs/mp3fs/mp3fs-1.1.1-r3.ebuild b/sys-fs/mp3fs/mp3fs-1.1.1-r4.ebuild
similarity index 93%
rename from sys-fs/mp3fs/mp3fs-1.1.1-r3.ebuild
rename to sys-fs/mp3fs/mp3fs-1.1.1-r4.ebuild
index 1fa7524c654e..222b8b14873c 100644
--- a/sys-fs/mp3fs/mp3fs-1.1.1-r3.ebuild
+++ b/sys-fs/mp3fs/mp3fs-1.1.1-r4.ebuild
@@ -19,7 +19,7 @@ DEPEND="
 	media-libs/libid3tag:=
 	media-sound/lame
 	sys-fs/fuse:0=
-	flac? ( >=media-libs/flac-1.1.4:= )
+	flac? ( >=media-libs/flac-1.1.4:=[cxx] )
 	vorbis? ( >=media-libs/libvorbis-1.3.0 )
 "
 RDEPEND="${DEPEND}"
diff --git a/sys-fs/mtools/Manifest b/sys-fs/mtools/Manifest
index d2d6e4a47709..a5f1c112d63a 100644
--- a/sys-fs/mtools/Manifest
+++ b/sys-fs/mtools/Manifest
@@ -1,3 +1,2 @@
 DIST mtools-4.0.39.tar.bz2 429751 BLAKE2B b1b04fa1614cf36245c60c3ef35de1869e53786dbc9a7e864278a51c9519c63b59fff9dffbd761fbc59782161ba201908b4a5b6792a7231fff6f27be2bea1d67 SHA512 6f84ce57a7c088b526e3e4fa7c509f1869a55b87951134d6257533d311b4a97496c44fa374de6f8cb15c645d60b9f9745ccbdf405d0d77a30a86e31ed8d54ce4
-DIST mtools-4.0.40.tar.bz2 447038 BLAKE2B 6ae2dbd2129d48528f6a36f81f44979b2dd977729e3f3f0ab5ff4aa8d29b0841cd770e2ed12f0f772676f6bcfeb3949d4fb79e240cf1d88524bbaa6cdfb4d26e SHA512 c3acf8723ae207d9eccdca3c2b55aed262175328417031397c14c7120a1e02f0c52c7fefc0145dfb09fb91f1d3e63254e7a45bc7edf50b1ecc87b7cc95d2f390
 DIST mtools-4.0.41.tar.bz2 447256 BLAKE2B 9c0d24a2340038a2f482569e9ae6e326b0ba5fbc9abac3f70637682231e0541711c970b58c3c419f6114ce046084731b2ee7efd8c1e0cf091debec8816d851b5 SHA512 930321004d55c3fee17b1ed2319080446799d3230eee8df1cf4f0bbbbf9a82685837c3bfcce0d84749516fc8b945b1db01ac0379439ca53d974141c66b58ca8c
diff --git a/sys-fs/mtools/mtools-4.0.40.ebuild b/sys-fs/mtools/mtools-4.0.40.ebuild
deleted file mode 100644
index 48f9a91845fb..000000000000
--- a/sys-fs/mtools/mtools-4.0.40.ebuild
+++ /dev/null
@@ -1,51 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic
-
-DESCRIPTION="Utilities to access MS-DOS disks from Unix without mounting them"
-HOMEPAGE="https://www.gnu.org/software/mtools/ https://savannah.gnu.org/projects/mtools"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos ~x64-solaris"
-IUSE="X"
-
-RDEPEND="!elibc_glibc? ( virtual/libiconv )
-	X? (
-		x11-libs/libICE
-		x11-libs/libXau
-		x11-libs/libSM
-		x11-libs/libX11
-		x11-libs/libXt
-	)"
-DEPEND="${RDEPEND}"
-
-src_configure() {
-	if ! use elibc_glibc && ! use elibc_musl ; then
-		# bug #447688
-		append-libs "-liconv"
-	fi
-
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/mtools
-		$(use_with X x)
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	local -a DOCS=( README* Release.notes )
-
-	default
-
-	insinto /etc/mtools
-	doins mtools.conf
-
-	# Default is fine
-	sed -i -e '/^SAMPLE FILE$/s:^:#:' "${ED}"/etc/mtools/mtools.conf || die
-}
diff --git a/sys-fs/ntfs3g/files/ntfs3g-2022.5.17-configure-bashism.patch b/sys-fs/ntfs3g/files/ntfs3g-2022.5.17-configure-bashism.patch
new file mode 100644
index 000000000000..280620d0ee68
--- /dev/null
+++ b/sys-fs/ntfs3g/files/ntfs3g-2022.5.17-configure-bashism.patch
@@ -0,0 +1,36 @@
+https://github.com/tuxera/ntfs-3g/pull/58
+
+From a008fc4b3553583369111b145172a92542de4598 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Thu, 22 Sep 2022 04:00:45 +0100
+Subject: [PATCH] configure.ac: fix bashism in fuse check
+
+configure scripts need to be runnable with a POSIX-compliant /bin/sh.
+
+On many (but not all!) systems, /bin/sh is provided by Bash, so errors
+like this aren't spotted. Notably Debian defaults to /bin/sh provided
+by dash which doesn't tolerate such bashisms as '=='.
+
+This retains compatibility with bash.
+
+Fixes configure warnings/errors like:
+```
+checking Windows OS... no
+./configure: 13360: test: xinternal: unexpected operator
+checking for pthread_create in -lpthread... yes
+checking Solaris OS... no
+```
+
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/configure.ac
++++ b/configure.ac
+@@ -228,7 +228,7 @@ esac
+ 
+ if test "x${enable_ntfs_3g}" != "xyes"; then
+ 	with_fuse="none"
+-elif test "x${with_fuse}" == "x"; then
++elif test "x${with_fuse}" = "x"; then
+ 	AC_MSG_CHECKING([fuse compatibility])
+ 	case "${target_os}" in
+ 	linux*|solaris*)
+
diff --git a/sys-fs/ntfs3g/metadata.xml b/sys-fs/ntfs3g/metadata.xml
index 910a26c2caf5..34b4fc4eb13f 100644
--- a/sys-fs/ntfs3g/metadata.xml
+++ b/sys-fs/ntfs3g/metadata.xml
@@ -25,5 +25,6 @@
 		<bugs-to>http://tuxera.com/forum/</bugs-to>
 		<remote-id type="cpe">cpe:/a:ntfs-3g:ntfs-3g</remote-id>
 		<remote-id type="sourceforge">ntfs-3g</remote-id>
+		<remote-id type="github">tuxera/ntfs-3g</remote-id>
 	</upstream>
 </pkgmetadata>
diff --git a/sys-fs/ntfs3g/ntfs3g-2022.5.17-r1.ebuild b/sys-fs/ntfs3g/ntfs3g-2022.5.17-r1.ebuild
new file mode 100644
index 000000000000..085691d55b6d
--- /dev/null
+++ b/sys-fs/ntfs3g/ntfs3g-2022.5.17-r1.ebuild
@@ -0,0 +1,94 @@
+# Copyright 2006-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools toolchain-funcs
+
+MY_P="ntfs-3g_ntfsprogs-${PV}"
+
+DESCRIPTION="Open source read-write NTFS driver that runs under FUSE"
+HOMEPAGE="http://www.tuxera.com/community/ntfs-3g-download/"
+HOMEPAGE="https://jp-andre.pagesperso-orange.fr/advanced-ntfs-3g.html"
+SRC_URI="http://tuxera.com/opensource/${MY_P}.tgz"
+
+LICENSE="GPL-2"
+# The subslot matches the SONAME major #.
+SLOT="0/89"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+IUSE="acl debug +fuse +mount-ntfs ntfsdecrypt +ntfsprogs static-libs suid xattr"
+
+RDEPEND="
+	sys-apps/util-linux:0=
+	ntfsdecrypt? (
+		>=dev-libs/libgcrypt-1.2.2:0
+		>=net-libs/gnutls-1.4.4
+	)
+"
+DEPEND="${RDEPEND}
+	sys-apps/attr
+"
+BDEPEND="
+	virtual/pkgconfig
+"
+
+S="${WORKDIR}/${MY_P}"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2022.5.17-configure-bashism.patch
+)
+
+src_prepare() {
+	default
+
+	# Only needed for bashism patch
+	eautoreconf
+}
+
+src_configure() {
+	tc-ld-disable-gold
+
+	local myconf=(
+		# passing --exec-prefix is needed as the build system is trying to be clever
+		# and install itself into / instead of /usr in order to be compatible with
+		# separate-/usr setups (which we don't support without an initrd).
+		--exec-prefix="${EPREFIX}"/usr
+
+		--disable-ldconfig
+		--enable-extras
+		$(use_enable debug)
+		$(use_enable fuse ntfs-3g)
+		$(use_enable acl posix-acls)
+		$(use_enable xattr xattr-mappings)
+		$(use_enable ntfsdecrypt crypto)
+		$(use_enable ntfsprogs)
+		$(use_enable static-libs static)
+
+		--with-uuid
+
+		# disable hd library until we have the right library in the tree and
+		# don't links to hwinfo one causing issues like bug #602360
+		--without-hd
+
+		# Needed for suid
+		# https://bugs.gentoo.org/822024
+		--with-fuse=internal
+	)
+
+	econf "${myconf[@]}"
+}
+
+src_install() {
+	default
+	if use fuse; then
+		# Plugins directory
+		keepdir "/usr/$(get_libdir)/ntfs-3g"
+		if use suid; then
+			fperms u+s /usr/bin/ntfs-3g
+		fi
+		if use mount-ntfs; then
+			dosym mount.ntfs-3g /sbin/mount.ntfs
+		fi
+	fi
+	find "${ED}" -name '*.la' -type f -delete || die
+}
diff --git a/sys-fs/quota/Manifest b/sys-fs/quota/Manifest
index ebd4c38e4346..c18c1f799be4 100644
--- a/sys-fs/quota/Manifest
+++ b/sys-fs/quota/Manifest
@@ -1 +1,2 @@
 DIST quota-4.06.tar.gz 520448 BLAKE2B 2cbadeade228d0154f3a8d455cc1aa6e85c9ad7854007e3188c9035abe4d5fdbdf97985fd2fa6308f486ffbe60461e0fe1139f1ec0ca415ce08292d74e0ddde1 SHA512 cece46b8e3a82e8afcf8bfc9f6b310ec91afe034102cebc031bc7d7e04287fdbffb21ab1d3e6e1825175cffa4bad0a4ecbefec0efee028d961b14ac626d5c871
+DIST quota-4.09.tar.gz 523191 BLAKE2B 30b3828a45dcd7d99ff053f362917c138b1f0bcbde5f6fd3dfc1b48cb12615e5673d852f9276f2b370f9c799a2103e220d91ddf6a770aaaf8944cfb5c1131a74 SHA512 003d45f33543d4c87446e6547079cdae293b8dade01c58cf3626623721a1400ee07681395ad656c23a9ea2a62ab27c6ad24ad55600890e6e25334aba27ab1ad5
diff --git a/sys-fs/quota/files/quota-4.09-configure-bashism.patch b/sys-fs/quota/files/quota-4.09-configure-bashism.patch
new file mode 100644
index 000000000000..5866d3873dde
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.09-configure-bashism.patch
@@ -0,0 +1,16 @@
+https://sourceforge.net/p/linuxquota/patches/56/
+
+configure: WARNING: tcpd.h not found
+./configure: 8453: test: X: unexpected operator
+checking that generated files are newer than configure... done
+--- a/configure.ac
++++ b/configure.ac
+@@ -283,7 +283,7 @@ AC_ARG_WITH([pid-dir],
+     [AS_HELP_STRING([--with-pid-dir=DIRECTORY], [Create PID files in this directory instead of /var/run])],
+     [with_pid_dir="$withval"]
+ )
+-AS_IF([test "X$with_pid_dir" == "X" -o "$with_pid_dir" == "yes" -o "$with_pid_dir" == "no"],[
++AS_IF([test "X$with_pid_dir" = "X" -o "$with_pid_dir" = "yes" -o "$with_pid_dir" = "no"],[
+     with_pid_dir="/var/run"
+ ])
+ AC_DEFINE_UNQUOTED([PID_DIR], ["$with_pid_dir"], [Directory for PID files])
diff --git a/sys-fs/quota/files/quota-4.09-gettext-version.patch b/sys-fs/quota/files/quota-4.09-gettext-version.patch
new file mode 100644
index 000000000000..1dc194f8b473
--- /dev/null
+++ b/sys-fs/quota/files/quota-4.09-gettext-version.patch
@@ -0,0 +1,14 @@
+https://sourceforge.net/p/linuxquota/bugs/142/
+
+Avoids e.g. egrep warnings.
+--- a/configure.ac
++++ b/configure.ac
+@@ -43,7 +43,7 @@ AC_CHECK_FUNC([nl_langinfo], [
+ # Gettext support
+ # ===============
+ AM_GNU_GETTEXT([external])
+-AM_GNU_GETTEXT_VERSION([0.12.1])
++AM_GNU_GETTEXT_VERSION([0.21])
+ 
+ AS_IF([test "$enable_nls" != "no"], [
+     enable_nls="yes"
diff --git a/sys-fs/quota/quota-4.09.ebuild b/sys-fs/quota/quota-4.09.ebuild
new file mode 100644
index 000000000000..2c2297f50915
--- /dev/null
+++ b/sys-fs/quota/quota-4.09.ebuild
@@ -0,0 +1,84 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools
+
+DESCRIPTION="Linux quota tools"
+HOMEPAGE="https://sourceforge.net/projects/linuxquota/"
+SRC_URI="mirror://sourceforge/linuxquota/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="ldap netlink nls rpc tcpd"
+
+RDEPEND="
+	sys-fs/e2fsprogs
+	ldap? ( >=net-nds/openldap-2.3.35:= )
+	netlink? (
+		sys-apps/dbus
+		dev-libs/libnl:3
+	)
+	rpc? (
+		elibc_glibc? ( sys-libs/glibc[-rpc(-)] )
+		net-libs/libtirpc:=
+		net-libs/rpcsvc-proto
+	)
+	tcpd? ( sys-apps/tcp-wrappers )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="nls? ( sys-devel/gettext )"
+PDEPEND="rpc? ( net-nds/rpcbind )"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.09-configure-bashism.patch
+	"${FILESDIR}"/${PN}-4.09-gettext-version.patch
+)
+
+src_prepare() {
+	default
+
+	# Only needed for bashism patch and stale macros patch
+	eautoreconf
+}
+
+src_configure() {
+	local myeconfargs=(
+		--enable-ext2direct
+		$(use_enable nls)
+		$(use_enable ldap ldapmail)
+		$(use_enable netlink)
+		$(use_enable rpc)
+		$(use_enable rpc rpcsetquota)
+	)
+
+	econf "${myeconfargs[@]}"
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dodoc doc/* README.* Changelog
+
+	insinto /etc
+	insopts -m0644
+	doins warnquota.conf quotatab
+
+	newinitd "${FILESDIR}"/quota.rc7 quota
+	newconfd "${FILESDIR}"/quota.confd quota
+
+	if use rpc ; then
+		newinitd "${FILESDIR}"/rpc.rquotad.initd rpc.rquotad
+	fi
+
+	if use ldap ; then
+		insinto /etc/openldap/schema
+		insopts -m0644
+		doins "${FILESDIR}"/ldap-scripts/quota.schema
+
+		exeinto /usr/share/quota/ldap-scripts
+		doexe "${FILESDIR}"/ldap-scripts/*.pl
+		doexe "${FILESDIR}"/ldap-scripts/edquota_editor
+	fi
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index e837c28feba9..cd0d1d68fb73 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 6279c56715a9..20c9668b3f96 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -1,18 +1,6 @@
 DIST genpatches-4.14-297.base.tar.xz 5775104 BLAKE2B 70aea407f18b7c777d16573c30ad310d4275096910e0c24f73ae14e87e111a6e33d16430673791c2390ac2c8a9541bea5b6dce492a1655c87e319f106acaaa87 SHA512 86a0c3ea93276dc0c27bae38de5d641b8db23feb7dce708ef7043aa9ecd1f97a3f0d1e28f49b994fcb2b5b24cb2a5bd8aeaaaea2ef1876114eb56edfa415a231
 DIST genpatches-4.14-297.experimental.tar.xz 5712 BLAKE2B acfa053f39fc3f0b34bdb579c788ba0b2fdba89687accf93fde5a3e475dcc8a402cf845b0b6e530902fcb36cedc9c36bcf6aef41b3b1a3cc0e96c393421b0e74 SHA512 850d8c73805fb43e62fef4ede5d54eb415048858b30d49f446c1c55bd5102978e8aae0be353300d7295b75bddc2ae521653ccc8b10b166daed616085900cee27
 DIST genpatches-4.14-297.extras.tar.xz 3656 BLAKE2B 7677e00d7cb635deacf1ab1db2c8f6a062c9d6d694a88d75cc48fdb98293c302bb4289cbf114be94ccc1c49826ef8a10ebdd85aa93cdde7eef3ecae7d1d7d032 SHA512 238b117d29afde4734adf69f25d10428c976efe38d3a4da1afb79f220bc6adf377fc3b9befcd82da024286e6a1c6365de427dcbc677ce00c4fe7e878d987a172
-DIST genpatches-4.14-300.base.tar.xz 5794308 BLAKE2B b17fc764d91dd61c21f8be2a1239ab8bfa1c81df66f40d45f5942d81611890072df39c198dcd58fdc379e326541b75b1a2f46df61dd64e183c78ba9caa86dca6 SHA512 4ab66e2788df34f63330e12d8c46e8d0f19d888ea654f71c68504c24bc9fbe907cc1bfe38614242c0bba0734830e2847cf6ddeed8c04e9d76343f9c6273c4315
-DIST genpatches-4.14-300.experimental.tar.xz 5712 BLAKE2B 6015379531c2345ebfb1cae18bffedfc53e8e7741b14c51a0a2d305de2efa7c62e8c43a3ce745d8988b8d147512566e09d6e389782a316de68f0f23c86460389 SHA512 ba4bfee69eeb068439361644dc248f57bf9eb9242bef0e516ef5613f3b988023554477b9e047c0c0b8b113a6526759a8a8dd534b232f007a907a24a7150c4c82
-DIST genpatches-4.14-300.extras.tar.xz 3656 BLAKE2B 103f061db8a79fb05036c723c203cb3ca5dba4e9498715cb6587d2b447ea8d807dde9df1d5e74a3bbe4cebfcc2c50a51beb3d80d6b79d1e48aecc99d23629676 SHA512 0a79d8839eaf22475e54474c049245c8b3e62110e604549dd086325e4654ac2b9ab982a0700e7cf3d66d599368d6db2f6145a03ccdb07703d62d80de8b873b3f
-DIST genpatches-4.14-301.base.tar.xz 5804348 BLAKE2B b1c9ade93e379d7e281c4f6d1e11de4778af9e4caabe80ab294d57c2d40fd0704fc30b6d281dc56ace9ade92f99a53a5e92cf143239516bf5fe2c3b1678e92b2 SHA512 bbad16c9f6a271c12ed10c3dc2055dad139c27645c449709b20157130485a9ca1ab6e9d5bdb24b1635d59ac887118131a85b3f09606dd48067aed087a7163914
-DIST genpatches-4.14-301.experimental.tar.xz 5708 BLAKE2B 5d4c3def13ad4728a7793305da5d005b2631151889530a60c409fb9f41bde62cfc520aca51cf48fae819552a727a18a17904d8cab9044ee0b45a596cca80d7d9 SHA512 84fdbcecc42ed937d15237bb0010a3601516ce6ea1df3c71b1d7ef20051cdbb001e4a15de1e8795aab4bd340f985476b059918c5067e1aa554ef4b185a6d9920
-DIST genpatches-4.14-301.extras.tar.xz 3656 BLAKE2B 74009e3b7921088b1edf09286d405b057d93e047924b7e4b7aa62c9d11a7eb59ed92a650be70319db5a63f61e34fce48d5f41197dd2871f0646629601d460263 SHA512 f44f4aba1664416bb9ab9db886e094c20384ca9f5fdf03a27e0084d8b04abc068b53efdc17d08cbf6f4530acc9e09f27830b9de1bb0d31e559d7abb3626e658d
-DIST genpatches-4.14-302.base.tar.xz 5844008 BLAKE2B e2b13f0623fe8e77e0833fc542d85fb06fd68200cdf853270fab86e9ca40054dfeb5764a5c9fb0d9d0f8735017a13635f507136242db3abb01b9fb1b2d300458 SHA512 711dc056e793ac8edda4df489f8a18a01b4792c860d437648287ba4d17a922a28664471c72037651aff75b31b62ca86750f915323d74d8569a073443b6b7e419
-DIST genpatches-4.14-302.experimental.tar.xz 5708 BLAKE2B 0ccf9515715d5264510e18fcee5d944c478235d483bf8f895eed6025e21296f211a2c0198638db71272fd70d4742f51daf27dfad8ba1091260b7d13b89d6b61e SHA512 dc161f71b499a56e66e3846b5eec8c266bcf3c52fd415b603285edcb0563fe08d716b26411d82afc95b99f84117cf129ba3b4b366fb8954647fa4bd73a910aa4
-DIST genpatches-4.14-302.extras.tar.xz 3656 BLAKE2B b84627b57c9aafb67c405a24f80c77390d6974a4ceeb9a86b31a9029ca1c75d8859c53af75cf2c955b56358b1a32c6d5cba7aaeb4b369615df241fd76df379b2 SHA512 a25075d55fd306d70307ebe6bede8480e8dd86830b926f815ce07e19ea3afb079553940c7f254d3fce95939402884d6eff2085c2f531443f8bf286a6cdc9c472
-DIST genpatches-4.14-303.base.tar.xz 5852552 BLAKE2B c57656a4febfe96463625de3a3206c1175566ff45c13ec3da13a74c4b6a3cec03031ed7294a4eaccb1d48f389c0aa60b7133926414d65cc9f6469beea69d7f60 SHA512 a6348236f57694f2bc48fade9516ab0ac33de8e7e26faa091d6c45838eaacb6911eb07e81653692602d003ae48acf5139ae63421064e2ca760a56c2c908ad8cb
-DIST genpatches-4.14-303.experimental.tar.xz 5708 BLAKE2B 92f03ae563a7d9cad7c677263bbe092b16e3a1c2b29e59583d40911c9a2f37811d282737f4d98c1d014ab05243acd4c87faecf2334e94700ece87c436da730d4 SHA512 4c65694741bf81eab8f90b3d019f58dc6e82ae938d7ebce4d9fec60543697f8293309ccd8c79d8cf6929b4fdc34c43f91dd7548f6dc8c52091beb84e41c80368
-DIST genpatches-4.14-303.extras.tar.xz 3656 BLAKE2B 2f250a314ad5e159a47b06fee8e38b3e5cb9be6fa1abce2773d33255b664c073513c81377c52e2ac3272b1dbd2ee194f805c816a5e6b0413291fb99b0f81966f SHA512 8efa20a34d986cef8a37b9af22fc1107805e2b795b43ed3834f309c615882f363b16311c1a3fed3318badea6a0a4faf8b9ee2c9902a607b6ebcd26515823b2a2
 DIST genpatches-4.14-304.base.tar.xz 5863064 BLAKE2B 80e98fd30f6a6419c2afce0574d46e13799ec21285e58e984dacdb53bcd610b01eb262cb2f2b3ad603569ce2f51a16345e7a17095ef2748c839402ddac2467f3 SHA512 6566b3bee292ec71ba36ec1459629baa030831c4fead9e5b414192d3e6f07b0bf197c798d795751d948dc8fd197482551598ddc71633fc34f3c0ac4571b3dedc
 DIST genpatches-4.14-304.experimental.tar.xz 5708 BLAKE2B db262e17158ac68fd88403c2297b5759cea2201b7955edefbc7c05552634c2162a620fb8b335ce9ad5259117fbf654b3885f332329652e6b5b80518f5439b04f SHA512 fa1d05c2ea4b129e2d096978277000e3e5c5aed25aa8975c9052c25d81d16a9c388502d4e483b38ad191b5325e9ab5b4bf24577a3b64b3a16b57d8e095ae3d21
 DIST genpatches-4.14-304.extras.tar.xz 3652 BLAKE2B 707ca59e29f21cc1d6cf8b579bc85e8f9dc6e574fb60c0ba1c8022ff4afa9c72c3811adc623013de190d3553511973c75b4dd2362d5108c62bf1a72d1abcc5e6 SHA512 7915857fe0bef51c0152b9187cffd3744e659bf196b3beb708cffb05a77085137b9c6fe5e284bd9e3ff25f21a90962f20b78a1ab42c732e2752b897867ef1868
@@ -22,15 +10,6 @@ DIST genpatches-4.14-305.extras.tar.xz 3656 BLAKE2B d7d2fe65fa9015de8f7cc2b72991
 DIST genpatches-4.19-249.base.tar.xz 5600204 BLAKE2B aff3a7c269f42dc509a2d71285c90737e4e6872bba67f9ed5ba6599ea57cd4710152f31b4916cf3bfcdd6f4a0115953723b5f4851c2b2ebc247a3c9322bce90b SHA512 9fbd1b6c0a83478d20695c0a29a5ce61c296173317bda3226f76f5b6d588c3bf141ad7170b9397eb76e1454ee68e48ade8550af33add15e8568e753da6955173
 DIST genpatches-4.19-249.experimental.tar.xz 5460 BLAKE2B 07bfb98c286bf7d893e5b4b9478dc3428236262b66d39160ce0a34b713d87d382b614e35e5d418305658da0706a67b0fa93e4926007a0c3fdf48131fad6a499e SHA512 753abcb94e38ac8282bf5f9a49a1b2fc65db67ce8ff473c2f5969213922e79996c447de0cb1a776e013c2e07753d4ae6a03189f6bde7da3470e0644cadb61a88
 DIST genpatches-4.19-249.extras.tar.xz 3664 BLAKE2B 3f5a8d3f6d6acc48e1d1c82e7cf5bca7b9fcbede5b2362637ef82b4d36b406ff91b01654ca3c1129f3ca40377db35926b02ee6bb87c2ab27357e08b7554d3ba5 SHA512 f25835630b6f09037f706394ae173ffc0d4a41300d3a9065f241f322175bbb630bcf882de3c6a2cce2059045a10fdb2cfc4358ad8ebfc68c161331b84100846f
-DIST genpatches-4.19-254.base.tar.xz 5649516 BLAKE2B cabf9ee4329d35c9f6ddf28da294af4221189860806c6f0fc79f66e6049895beba7757290d7436c92425715e6415bade97fcdf534693c343ab119c999f0df541 SHA512 036a2114ccc8cc6549a171c3af053864b4783337a6fc4fe4be5695e8f8c4ec9c48bf7dd990225322d2a6c456d669157fc593bd5c1053bf0ea2763a5072215e48
-DIST genpatches-4.19-254.experimental.tar.xz 5460 BLAKE2B 374c5a3ada1432bcc6afc7f7713ab28e29a0f0524c63bcac2affaf6dacbec2dffa2e51d4c85b0dfaa2f1d2fa18935a2a741124aea2044d1683ac527f66ffdceb SHA512 8dd1970cfa64d5c36814d773dfb5369081500d6e35245ff5e13aaeb50b5d1b951cfad46161466d12280f44cef59d085a393b5412f9fc7e442673d15f68b7ac1f
-DIST genpatches-4.19-254.extras.tar.xz 3664 BLAKE2B 0c261e4457c4922a31c2de110091f3ac30b92c30af77a543ca8a88b198f6d3de5182326e0e0466f5931cb8cdd2b8bb2b70a235cab7de778a67779f224f26f00e SHA512 e09e100f1031e017b534f285f838ad5b4f4abbe4d520b82d5aa36f27bf87274a18bc8fb3249f6416a7eb6f15c83dd911fc755cc814f8400447cbe7a041262f44
-DIST genpatches-4.19-255.base.tar.xz 5699948 BLAKE2B f204053b931867176f46ae361fd5de2c36398aff545fef7e5da19da41587300c193ede5432fd0630cf39a9d3fbe2c9578ab070a1ae88399dfe55c5f432f73d49 SHA512 66f5aae9e99dce0f2c19190bd76a65ca2120b2b61d3b8c2c97f86d50a088f8f85f75689e8a9ff03a246ec7b3337f2d3a14f54b1c1030bfd863ab3afba69995eb
-DIST genpatches-4.19-255.experimental.tar.xz 5460 BLAKE2B 7a5207a0a5b1edcbd05ed07256d7bd357b9f0d90c8d0d8c7ea1cb26dde5e3583bb9d6ffac20d6367e2f27955394410e78961eaf380f96d258b3bcb01e4a426d9 SHA512 04ff693ee0de12c04c312967d6ede6f448aad624cededbaaf7b2a12f03658915220b463a626be51f33a8fa1f141d3b89f25f784b01ba24776ed24be9647c9872
-DIST genpatches-4.19-255.extras.tar.xz 3664 BLAKE2B 4ac9065f4914e29b91760369a122f1d2516d746d9c7b76f2648238d8bf08ccdba2dd339ddca70393ef910664ddff4c000bd1abca9af7b1e07331f2aec3e42a94 SHA512 454b960cbdbd5843581602212e9c962fbd73337ca5c09c0ff449055c04588e6d2d2972c61750bf6c2b3930018cf182cc33669f40e73eddc13caa930681f686e9
-DIST genpatches-4.19-256.base.tar.xz 5714236 BLAKE2B 0bb3dfa91bc81e74a945b27d13b8a400f53888ea894650f99e3538442583b8d9ae284763c159f234bc998936134a2a3f10ac8cdc40234046eb06507971910f79 SHA512 7fcdd29c5500f12e1d823ff7b1fa9e3c33a6978e5f79559778b0a1f995b5d96a5654f7cfe47317388fde1cb10b61a5eefe61dfab0081a9423dc670d292df1515
-DIST genpatches-4.19-256.experimental.tar.xz 5464 BLAKE2B ded78c1d095f2837ee328a8da4eb20653319e02f2e2736f3bc5158035bb2ffaa8b6e8d791275b202885b73febf34256d8819621bcdea79af1cd83e494d78fe6e SHA512 7fd1d8cc4cd3a70df9edb390eb1863220cf5e5de4d5c2a7a5fdf1ff8696be37c448d33e3ec4533e01a440f2e4662dc9357be1c6764c1bb4e4aca7361dea47e06
-DIST genpatches-4.19-256.extras.tar.xz 3664 BLAKE2B 81a7bde84fcb2485507dcc8002cdc8fbbe9801c48da96dececa15e540c830d4d90df29d17ed5ff34365c658b3df14ec968c397c8c53e2ffa41a943a6eed2465d SHA512 c9eb4337261b2a3d98179e2b4c0d50789dbba3aad26e91f71b4078335a85653fcae27c148efa38036eb0bfe04c8011f75e0091079ddfb530a79e7a99b302aaa0
 DIST genpatches-4.19-257.base.tar.xz 5727008 BLAKE2B 4c5ab4c98861d461d67a909db806c0007a57487bf2ad3c91049c813759c9503b21001932534a087562e0f06c89300e418b8e54067dce852a3440f94d1aae8a0b SHA512 1fcc64e9cb05b5f0beb8370b8d5b4dcbfc6a3d2a187a4da34e4e30480603142a7786d1f0d2c366a88c2f007d67eb3aae6963f6d993cd2dd5d2b6299517308dba
 DIST genpatches-4.19-257.experimental.tar.xz 5464 BLAKE2B 03286f075b1522dc0830126cb0b99536dbffaa2ae77b20e9b9c7b1bcffdfe3490de6df67de2f3d133f5f2a1f35c926e14cb59e8b7df6d86a4c5a3581e45a8324 SHA512 1f8fa1c112df79122e27962cfefa2d50469c04f2796f54333a0df3b288f892c5e2cd448f0efaaf53e6eedba7696700b3e0a3217594a96c677005d8f6a83fe1be
 DIST genpatches-4.19-257.extras.tar.xz 3664 BLAKE2B e6be75d52ba5edfcb37a60f3ba50b465c4e5d456755fac776235feecaee57fab267ccf9e2d11f5ed2409d30aac63a8b553c803ddd68910e6ad85b0c27d68a6f5 SHA512 d0c449942fea4cc2a6c45dd015d1e91e8eb1659f0ab1f3f7ce50af308cd3b37050f1b00820cfc6a6dd85d90fddd66c0caadc41782799d70e546c72f993670259
@@ -40,18 +19,6 @@ DIST genpatches-4.19-258.extras.tar.xz 3664 BLAKE2B 039cd2e9d1eb5ac8d5cd6493cf07
 DIST genpatches-4.9-324.base.tar.xz 5256552 BLAKE2B e264347c300df06aba685dc116100b82cd5f611971aacb22fb2832467cba51bcb6379b5543cbb89bbe05a94966cd12960996de3df8338bd30272e15dd54513a9 SHA512 1a93982191932dfd3ccc3bd80727a6c00e7a6326b196725468b1740f19c50ae7020afc67cde474c5e0ca0ce4c6cabbbfbddca980752bf5f22c7782ce76efd97b
 DIST genpatches-4.9-324.experimental.tar.xz 106360 BLAKE2B 6453e139134cb068f59d2c855c2d74cfb09fb450fcd0061c92d8951a45b85bf2b69dc9777649e183b463a86b3c4cba9bbb6ff7d53e9bdebe341a2cada4f57900 SHA512 aef60a9b2235487775790fc799749aaba052bc5325e2a1f328dbdc09e42857bfb73995c9de66067fbceb028588716201c023edbe30156ca3f9a7329b5ce63987
 DIST genpatches-4.9-324.extras.tar.xz 3672 BLAKE2B a0fa11eb759f5ef643c17a31ca86ad2e68d78de9e038664508fe0ee598057c351735aed675aa7e8aadaa1358e79fc860ccd357dd6811befccab02da0a18a226c SHA512 78eb0ada42db6ec736556c55910587fc6ee05f18a185a48532e2db3910d8da407243fe07a547b33607aca626e1ef948dda513457e71798df2210a9e1649a2771
-DIST genpatches-4.9-327.base.tar.xz 5271596 BLAKE2B 98a620dd68ee28b827acd72151d0e01e834427b5ff433c2a9702d3e30ecf8cd2d463b2c34fe8aa559196981c6a6681b87311a4b4ea74914f67363416628d9c4b SHA512 6c59586b6220cce2ac3adf70820e0863ae0132d3f7cc77cbf1ffb6bf10d0c5a8e5eb8df60cc46398fd60de5e82cd4a4df87c394444971583c99a9672d3b95c62
-DIST genpatches-4.9-327.experimental.tar.xz 106396 BLAKE2B a175832ec2adf636a64cb739c9c0111827ca9951d20878abdf151185449c12f778ad4397172584927c3aa1619a0b61c2b6b4b6a77f264fa75227e4b74ea159a0 SHA512 d59ce6e521c1f76e5314a2e0fa4c9a220d0f0b919c7ce9e8cf9ea321a1067e8189cbf35b9798741cde2f253c3c377229a387419dde58bb3728100bbce7e5984b
-DIST genpatches-4.9-327.extras.tar.xz 3676 BLAKE2B 4df82f5fce49054efcc3cc1ec68a691ddfd52448bb5425ec119ac1afe4c858fc9bccab4d590c0ad9980ef3336fce8e24a3aa5993b04780d60b18ee9f7a2408b4 SHA512 4fc62397cbb9c37e97f230b13f47a0e1eab645c9795bd100d39f016f76972cc0dca053ea3b42857dd54a8b2e6186d4c8448e6d756754b2335e398cf4606d2076
-DIST genpatches-4.9-328.base.tar.xz 5278864 BLAKE2B 2e445025ce40a0422d9d95aaadf6ca17fc76107edfdf2ff5c7a3aeb2922a740f3c422f7c350aedcfa3af60f3a5e268d1a705a7c4682a72989e6b39da08983600 SHA512 77bbce0383d602ea897e8ba89ec9a59504b4217388302ea44e39a4394ec71ffc4355e24833ef0980a622f43a8cff86fdc9b6046313fef0c56cb9c32777b010cd
-DIST genpatches-4.9-328.experimental.tar.xz 106388 BLAKE2B 13ab516bee3a7094b671f0d03a4c1a754fb3dc8f4107ce274ecfbc4389f2b89c830f6817a77553d0eac7ca2df3e4ae7c54473d9c77ed0d5494139ddc545836a1 SHA512 63aadf90dc59048d7757b6a68d2fbdd5269762709faf4ce0442e443d22f95611fc0b7fb419b217313697eb4ebcdc336ef9055f97719a2ae0b370ee36f9f7b23d
-DIST genpatches-4.9-328.extras.tar.xz 3676 BLAKE2B 067652688a8184345d797196a11d125e5a698483e403781c12770040b5a5d0116767f357a3997847c1e2c36106ef0f6eaff0b7dd961dc5ffad341e13f35b607a SHA512 b6450fc2aeb6a719399b6bb3e760f671a7db522691eb8777e9cfe73bcf1ab3e6849dcff490b73f7271a72af4ef82b1a188509ff326682ce49bb13069cf51d913
-DIST genpatches-4.9-329.base.tar.xz 5298328 BLAKE2B cb9c80d686125f008de7d396d2e23330291e3410587c089c1cf566ad8edca8a11f2c9ac1438f1ad366feb1a0324c36c1d4efc752983f6acb4c06d24513f13ff5 SHA512 0687516b96175b219fe2332cb120aec56742b8b1c44ea9a0c5bdd38169cce21251de49186c393bd81f9739b415a7e007956eafce583c4c07aabc10ffa2940159
-DIST genpatches-4.9-329.experimental.tar.xz 106356 BLAKE2B 9ab66dcf5fca27cd1c9ce52fa077f5d34678ee7fdd78bd1c8849dea99a9801312b8aefb150fdd0bbdf67e4cbe3f0d3a66fb7452e448d25833f72f275a71d718c SHA512 e6453baf8db5cfaae72bb04ed56e89288738eb4160e835b7a11f10021712cdb809f08b1cbf9750f70a281c4273d19c1e23ebb3d486c048ed3979244eea7513a0
-DIST genpatches-4.9-329.extras.tar.xz 3676 BLAKE2B 272bd53fdaf6f50f8f8a24d62e1e3c2e278bf519668c865f845e176d81f9dc8f7b3a3a5c4e110325636a7f72c93b7b430c744f4f85844df5fc9eb0fe1d50eb49 SHA512 541afbceb88a2715789e7e3d5b86ab15ac2fa6ba7a6b69a468a00d65c8b5edddd7796eb765f3cc1645c4022ba9a0a0f958b30a9dbe92cea4b20db13b6211c0ad
-DIST genpatches-4.9-330.base.tar.xz 5305160 BLAKE2B 5c4273daba2294cd013f57b355047305b51efa5e16636182231ba42c02261cd26d02370f5c603d024235b0b4455812b00f0404f929d08dc6a3afbf8420c42c48 SHA512 75851f921f2ed89196ef7c65ee4af950e18b29501ecdc8ad3f097b85f5ca05b16b840782247c33a80d4403daa40b137c54a7555ea46ac1d8345f7b1071b813db
-DIST genpatches-4.9-330.experimental.tar.xz 106400 BLAKE2B 8fea5a488817e7e216bd99b00887c4c03adc09ebaf0443f41c9d8fbc715b1bd3d385d166987fb584d14f56a7224ba67db56726a7eac9a492098225f69bccf16d SHA512 d09a079d404ccc3fb840fc3307b72e50826f0dff497c175fad6ebc549fcc082dbd7171cf32929d30cf296ef09d37d138063197ee63755ec2afad55956ba8b329
-DIST genpatches-4.9-330.extras.tar.xz 3676 BLAKE2B a4b70eb90d01d06355204013baf1ca366a8f08cddbcc4454785ca61202526b81701a23005e37aea88b9aa2df9c81b07dc8b6bc6b70ab05f0f9d27b5dbdad0ad9 SHA512 a15dbe9ef7b3b92f4e2225d397637398792f1fa811e1f84324c4803f08f09ed29f435e1336318dff4c74487fc95b4ab51549f55f43b14a832b3321829675203b
 DIST genpatches-4.9-331.base.tar.xz 5312812 BLAKE2B 833bfe0876720272798b2660ad73dd5b9d221715fa114dcb91ee52b3c9211d9a88f08bd3a7a4a1a5ed3917cea802d8d1408796e66ae5aa6bfee820d618dd3f15 SHA512 2f6e3676bcee8b1c35c45d631882c36bdb155d39cf23b87c314f25e633b4646712b0a5b496d2625b6d0c13208eef774068ce91e4f0e0aff704ca54fa2b7d3ef7
 DIST genpatches-4.9-331.experimental.tar.xz 106384 BLAKE2B fa21188e53543a4444438525eb86e3be9eb2a1c794daaa04f0dd92a6be767b392cf1de69a358c9f8b9e6b56f886099b38dcfd1df02ae94da40580b9044186b5f SHA512 fcba59211223ca40c1f4e04ee70995ed52f8834583067ea2de00e777c292b07eb7fb5af7cfc5e302e586b6d67d5dc50ea41b40ea521bd58f077b99d6beee3cc6
 DIST genpatches-4.9-331.extras.tar.xz 3676 BLAKE2B dc948d2b3897bd2548d815e775ce0a664929888cd4e65c0b874d7a82bbf4e62b176670bcf2bab755671cecaa29aa81838433a67d6711b9535c734ff5f112682f SHA512 2c4be456187e1f5e6e2f5827c6330d95fdfacb6359f724e0b5e0bd6fa13a3381cf8cd8043a15ee2a78583b68841a8581fb76360625c4dd867f32bc839aea67d8
@@ -61,21 +28,6 @@ DIST genpatches-4.9-332.extras.tar.xz 3676 BLAKE2B a1eb027f76856b2c08625186c24dc
 DIST genpatches-5.10-144.base.tar.xz 3907764 BLAKE2B 41b8ce08ca73879811e11d91f9365ddfbbc15617a4b825ba00144e71feb86e0ef24b3418b77b203a13ad6299237085a2a1c796beb6ac9aa98a5990a39fd1dd02 SHA512 1b946439d9cf6d97df1acadd7b36ef657fac40ff98b31e2237f3cc412e9efd6d4d1d409339af9d48779dbd9d88aac124f67e07afcf99e7760f93afb6d226131c
 DIST genpatches-5.10-144.experimental.tar.xz 16876 BLAKE2B 7be06890636984bcfec45818726c48dee9b2de69a3278bad8a79b1f9d4443695bf9fa56132b4f41c21564a43fe309f1191b2ce794430f6a697c58308d32396ff SHA512 677edca73f20e9c41fda7c400daf4870d00141cbd6ba8ced934ce785e3e6270db15f820ba5561202687fd437aa64ad2f71bb1a3f397c577d7d1dde90e1cc79e1
 DIST genpatches-5.10-144.extras.tar.xz 3868 BLAKE2B 0d956a61fb525b8ce3b14c215a0c0a6ffa46f21fcf87a63884d31418946a64de0c680472a62fc9bc0d83f67b49dfe88ed373e3ff2ba2f369a0909e3947b27c16 SHA512 c870f84b1a4ae7b95518d08ab46fc7e632a47884e43a9c774be34335ebf825388136ed360f5129c8c97567600e79ce2889d64d9b60a1a8bd2a5b4052e74e2973
-DIST genpatches-5.10-147.base.tar.xz 4073808 BLAKE2B 0e1214facddef3b26bab742ca4164773162e6954996bb8e5137707c6728e0deacd4bd2679f276edc0cd03669a0d03a5c7744918efa1189877e38608dc393d065 SHA512 84f5bc607c10a08a03c8afe8617719827588b49ff9ca6401fd128806ec91fd6d07cfff6ca313f5a49e9a1b37b9aba2aff9bd0f597d65bb7c36236e148a04b397
-DIST genpatches-5.10-147.experimental.tar.xz 16868 BLAKE2B 101d56d3766d75cf98845adf20ec87607a3037467b58fdfd4dcbf97f049746d1968384e2c513c8a46742f8724f8d17dc71dc36773b32c437b8f0090b0a0fedc8 SHA512 1ed0e8cb5ee5382f4d982100f936d2726b8e0db8d4f5bd0cc061bdb2736a0c8223decac985752fe571a0619208fdf2f3e70aa8c5093808b93833a41a60310c90
-DIST genpatches-5.10-147.extras.tar.xz 3868 BLAKE2B 1f12eea29cda808c434364d0f60ae931819a53d20bf632a12f140c47a001387987688eef1a90a31227a6ccfc217c5db3839d06527a7bcc1877d30c98dc47e21d SHA512 492274da82c010f4d7f33dcf623789a9be51ee711d19076657b091b1e91ed70ff6010aba5e7778c9769eaef28216baa01d3f373fb76c595db38b4763ff182740
-DIST genpatches-5.10-148.base.tar.xz 4073792 BLAKE2B e616bc6554bd62cea093c35eb019d041ee00c637f6e4bdaf9946ced3915b53a21afc0a8d3cffb115316f475f4dbe13acd5eea524a2c8f3d9975ddf66ba66922e SHA512 dc8f66b5f69b93db609b7a42dbbefb27fdceea5f7b387bf9ac2e73a49a71dfaa984a5795e43ca8fd7847b8e3acd302b0bd9679bb3def9b4cf8e9897c8d41916b
-DIST genpatches-5.10-148.experimental.tar.xz 16876 BLAKE2B 87f1703fc5d8f5b54d6a8bf3c96708d1d827ab8dc509bc1cead6b8e8fd6b33a67a28b72cf79c4c24a85b10f883c55977a1026e9641b3504f985c481a963f626f SHA512 133e50baafc48622c97aaa79af0daac741496bc1bc4fcfc0caad7f50e29d6ef83f3a9bca3bba0664b292885b0fcb8981b724e9fee100e31cd958cf1758ea58fb
-DIST genpatches-5.10-148.extras.tar.xz 3868 BLAKE2B b31650f269b6d5df5f0b7e743c1c4f0e93e90c2abc6f5f7a73ba58ca8cd4ba59f0510889c9a6e27a9afbba4abb1ff633089b4afa3f35347a64bfca5ebc0a4c3f SHA512 b15ce7e0abba8b76e7a6d5a59b9cd06f6aab9f7a3fe91eb4b5e4010e99101031191807870647fa2010143895d5839c47470d1acb593958722fe56629d64c8b93
-DIST genpatches-5.10-149.base.tar.xz 4094572 BLAKE2B 45a25b910fc88f030d97ef5870925df3bfb05d50bf95cb3cfdc4d98ed24c006ae026b88b29ec5db4087671c0a440a4c47132272e6ae965b1c336fa1c567dddbd SHA512 4898ea729def7fbbb14f04a578405a4e96e03e425de696db4d2bc86cfa6942c063f8c8cc79801f85ac38edbb5f0f5851073418bf5df32784ec7efd242318dd97
-DIST genpatches-5.10-149.experimental.tar.xz 16860 BLAKE2B bde244043cb30f554e0204feb4497f91fcb41d8205bade4ab15d2d6fbc8a52b4798158b58503bb54e5dccff99c2604256954fbb8648ad5b43bfc661a11b89db9 SHA512 16da039305c015b718a8646aea71449cfb656ed8e9e38efb9e2be32d53a263819637b8aa14e6d9d065cda23b8c322d7a388d56f924954d5543f9766ca48f32be
-DIST genpatches-5.10-149.extras.tar.xz 3868 BLAKE2B 2667cf3c9d447c855b6b6cea4b9100a300077fe74eae84b69fa0a6ee861c787e44e96518bceb93f1c2be83fd8f04251ebfca673dcd9da4ebf2ab98041a3dee4f SHA512 73bda9933661f78482eaa048c1467d1f3acbef606676547d1ef3c64c5ff95475d6d40153a47f247868a2cbf697e5a4d21d58b57b3be6763ef3de869c31b5ede6
-DIST genpatches-5.10-150.base.tar.xz 4102688 BLAKE2B 4460fa61263bc1c753f856867b4aa533a5e96be1acabb6c770b97854b90fc54022876dbaacb5acef40be6a257db914efd800f328ff5bc79b2ac3b75aca9c5f4b SHA512 2337973c65408a4c14af7f7e34e17f62b8f0e5191ffa821d17de35364724d01036ed3867a32c2b09fef8edc68769ff04d01bf01f7db2c02a2750e2019d270533
-DIST genpatches-5.10-150.experimental.tar.xz 16872 BLAKE2B 51c2b6c130a80275821fe6437d9e078170c0cadc465fe103168c0a57fa2ca436a968b8f189526c32dc8c013152a4fb786bd22be97fa068ca2fe5523f2aa91636 SHA512 007a992998158ab606785b2de328945d1c75f70db7cf47668d68521e9c2c87edf6482b4ec0b1a613e65dd1070f6d6d80f7ea9b5a245c66148b7656c90e090161
-DIST genpatches-5.10-150.extras.tar.xz 3868 BLAKE2B 92e49d3a7830cc36aa27c760453024123fff849dbbea36c983f267144edce15257470937e670e5da5f9b4fb90e659095f8f839faa5e30f8317130ea7c3d2cb4c SHA512 010479e3a3c61e01ecd6dfd7ad38c34d07eb10f424505d4f30004566c3cf7066f0d2668be5d2ee86092297ba347014e3468e1cd53372ce81c73a378cf1a8fc5f
-DIST genpatches-5.10-151.base.tar.xz 4118864 BLAKE2B 2b61b0ba7ba6bf36a35b86c2f3ddeae3fb1f0e6285cf68d828aae4b99c62003727a0dd9c57263fcbc10e39a4cc1fa14a7bd4e00029e1dbc558548c4f1478f19f SHA512 0a8923710df2b03aa71a064df637b5a2e48aeb3e240c416d67054003106918953c6b23f3051971cc8afa9785140cf7b8e02670fde145d86c6e2ab86088aadcc0
-DIST genpatches-5.10-151.experimental.tar.xz 16868 BLAKE2B 0581a1803da77866e089315a5e0ac6db907a3f98cef45d0dd5c99a69f4778b36a41df8d4261c7c62c7f977f7aff46f2091884ad0aa1d0eb90e7859ff4dc6a11b SHA512 6e95ffceb7e1d9dd4fe8a3512214c1e0c18cc8cdc5fe27f1099eee0c2cc2cfb309b43d10916d658410043ebfd61b6949fade2900224e88774aaec4b45ecda08d
-DIST genpatches-5.10-151.extras.tar.xz 3872 BLAKE2B 4d023b4fc664a09f661ae1176d25068a2a693d231ee64058cf68538737e28c6f3a8cb706689bbb39280d2d9e8f15570996e1d258cca5b184a931f2bb1c900a16 SHA512 936d693f98553978bd8c35db3b3d48be639ae039da1d76f8f2cbe5d5bd85944e61046da5e0c6ac7c5a9e10bfa605b5b4ccf02db8a1f8ce886f4010fd85c75791
 DIST genpatches-5.10-152.base.tar.xz 4136848 BLAKE2B d9a29db5ff2e649e3ce01112923a6e3dd9938fdc06eca1010adf725bb1d7ef11e66562f81349cd3df1191d6c64b4e5ff0311c7b4a0cee26a40d024424f91073f SHA512 c0d642c0d56f3f93e7250d548afe417e9f2fcc073f759d54a33c5a70f8c781075d9d77bef76b92a52a9369a60df5d9cc7bd79e03b0110d8bd5861b2c0e848d4d
 DIST genpatches-5.10-152.experimental.tar.xz 16872 BLAKE2B 8d21911c3c271d54c6dab7101e140fc9de42fd35687b0a605e7f64fa7df62055fbded5faedb1a3bc9d42a303d0237af864908711a06255538567b6d26441e268 SHA512 2aae62405f0478cc93710f84895ce184074110d791486cbd7d9addc7c53c84ed15187554e9dbc9f46503db9e7e8bdbd36b83b6688eb4516537c2442ce0559f3a
 DIST genpatches-5.10-152.extras.tar.xz 3868 BLAKE2B 2e24016827949d894cb2623e2a9271ec6a7af14e655cbcba65c3631fb3b8aa9ad673fdffb1a767695068537c95db722fce9dcec79d5f3f4d4d5f87a36290f017 SHA512 80180e2869f27b6515c54a7ef6411fe76eeaf777936a13648488469021681fcc01c462a0a933f9446b618632ee3c139d8e1355cda30ef2ac3befad33c79da7ab
@@ -85,21 +37,6 @@ DIST genpatches-5.10-153.extras.tar.xz 3868 BLAKE2B 4baa8ba350a6b0f02715d65646b0
 DIST genpatches-5.15-63.base.tar.xz 2523256 BLAKE2B 99979433623fad89d9a237f80f126e43f8d3a013cbf0ba77c3b5a4f2d02ee5bddc8d52be4a88f758225fd0ddc6a26946f9b08011b75404830fe44132e5fa5297 SHA512 4c582e0348e8d1d8ff7747c49a09a4fedd9c6b64e7f40c13fedfef0407557aaaf65cd7fb45a41b8175c8b15fe274261960f7af74459e353329fe378bfaef0fe6
 DIST genpatches-5.15-63.experimental.tar.xz 5416 BLAKE2B 15f4bec8ad60aeca18c9af152cd7ad505da4dad900e9d3bb12225b1cdd6893b53eea320ac1213240ec3bd169abb518a081dabbd4c64c63eb9aad5239425a8faa SHA512 794cd9c41fa86bd28199af6145acac8bba4fce15944f1f54061452501fc0dbc9a0670dbc42c6caf4b2f0972e512f028e20a61141c58f8490f69a03f6ee540c93
 DIST genpatches-5.15-63.extras.tar.xz 3932 BLAKE2B 372a8997239e0c1cb97db2fe02e5c3e2f8f26c29705f8210d1eb30168fa0a77209491111b64e399d4846b185ddd2141171cb13e5da5ae85e620e382262256a6c SHA512 461eb99b6e124a648bdaacb015c7b413e102cb28768bb149a154d1c4fc570ae241a73c5bc64024b385ac8eac831a6bf65e79bd93f168fb93f94b0fae133080f7
-DIST genpatches-5.15-66.base.tar.xz 2799948 BLAKE2B 971d8676d351bd8203076bf9f325b60142d7576e3a9373bca9ed1f4960604a0b9275da0707862365c194bd5fe7370aaf3b73a876185d88ae8d2c52f79f2c5fc6 SHA512 3dcb3909e8921f845cae61a61485b69941560e603f4067564e1cfef684dfdb0d963b511a4e5d120b67fee659d1beb9eeb1f6ca5ac08b39544bd7239d9e407f8f
-DIST genpatches-5.15-66.experimental.tar.xz 5420 BLAKE2B 1b294b987046d92d946ff841a6ad5646d663a1759d12b2471c6a6251ee5a1b692b2f3fd6731c806c7bf42c2362b411c949e9b157f0456de1a724b60313f1d738 SHA512 d9546db01d7b9908c9cfa3a5684e7d277fb4e5bfcbb8203828f3d67f71063d8b33aab6908ae712976f4470ad4e00f64ed84c4db8d12cc215902dacf5bab6c2f3
-DIST genpatches-5.15-66.extras.tar.xz 3932 BLAKE2B c8b7c822a3c1ecb3080ed90f0b137091ab8f8dbc0077cbc7cca6cd29a3a21ebfbefdc927bc46bee4fb75312e04047d62ecd437e971dd1b66033082b81c9519cb SHA512 0616ca7294543ad4fba7cc6e5722181cb6822f1fddbb82b45ed53633cbc50e7795beb78ab675d81479c2ef984d6497070451a15acc6d41c2f4c5c5eb96ba49d1
-DIST genpatches-5.15-67.base.tar.xz 2856328 BLAKE2B a92c3afb5e0a6605587744c68b3bec4c63848e0c09469d99080258d97d3e96a0adae175600d7dbb00e566f4383ab00c6981585acf343111218aa21e503901f7d SHA512 3d100c04ce9e440177ff2156b8ce0c0443414963a47fc1c51a86a08cce998ad0b6289e70455ecd2965009226036486c1b6ee3768b1782aaad976cd144f9b48cb
-DIST genpatches-5.15-67.experimental.tar.xz 5424 BLAKE2B 04529b9e693e57faa64b8434c18221d027275058bd77f8f7fecbc7141c0954a9b819cdf59827bf8e65419c7bc6022d54101c35f361ae86810d97585bc60c625f SHA512 6ebbb99434fc974d2a8dfe29c77788fba85e517e91241470a9e9caea18fadc06db975b686c08f5b605f6e045bdc1d0d8097e5a4ba4a43647f52ff546c5810628
-DIST genpatches-5.15-67.extras.tar.xz 3936 BLAKE2B 168a92a9db40e6014864a96aff71fb87b351d7127c5eedc8e062e753ae65d7ebc628e9b0eded328f17e88562592d80522ccdd31a549c8104aee51e2833f81134 SHA512 0f2bdfa87ec2a610870089c903b301dc86dac52f4969386074a439be90674c4835800cf9250d8844b1ec3df88cc8dc0b31e4582ea309b7c817066a1341c692b2
-DIST genpatches-5.15-68.base.tar.xz 2897744 BLAKE2B e1aebd74737e787df999aabb0153b7aab4b5df05d049e9a6260a3bacf8e827b4f767fe6fe8d07bea71a0e5ee7655d864da67736c17756ec1119a66fc58a4b82a SHA512 79996709882f76cae25639f273f2829d5ae671714f699008d7fbed68595e7cdd93e9d79c801e9f1eaf6ea89fbfe9df3302773e6f728f8cb5de4bd69b36fea65d
-DIST genpatches-5.15-68.experimental.tar.xz 5424 BLAKE2B bc10eca3f46e2fc6ee764b955f9018d616da4bc0837c20dfee40f2901e34c99698527fd040f881e1ec4bdcfaff31578f4f4e68f46965351d54eca4b94bd0bf4b SHA512 8d63d94c2bcd684f636c33eb95fc844da593dc9234a7d1f6ed87c41ffcf49021b36565db269105c0a15660d5688655d6e8395c4d66446f09c666fe978d08a8f0
-DIST genpatches-5.15-68.extras.tar.xz 3932 BLAKE2B 34fd77b8464322ad369de5b86dd8dc83ce7510bca139d4e6036b0b2ab34d1c80698b5f965e44a09dd25ee3b4d80abbccc5920e7984803be2451281c74ff735ea SHA512 970a1e5a03f786d05bb1ae9217a467442f16344fffcf2c77a2572c6db656b0fcd5b3329eae193999c47bbb45c8b02f0fd9010760ef74a6aacc474729f0ee9369
-DIST genpatches-5.15-69.base.tar.xz 2924208 BLAKE2B fc4f14592624fe2516c917425c04eaeb7e45073fb77e5830fefee93e3d25c448c8a523862ae89cab99220599c7ab5992d03cb5f81354236f77bc2e21ee802fe9 SHA512 ebfcc2c23304a6b316ecf226fab1200cedc7893093c99ca50cca4c1ad393dc5abcaaa0f2d4789909425a8eae2ebf57d4651f95eddfe40ac39522c95de59961d9
-DIST genpatches-5.15-69.experimental.tar.xz 5424 BLAKE2B 52c0545a16f3a40d509f10681ec52f4c1058fb203c19984c75db2127a56595e1511556a4d619b33a4b7e6795ce0085f5f191d0c6269690195208f45b6b4d19e6 SHA512 57ec5d37f49292e88c1123b79df6206434fefc7409000d8c2d0bf774c3206c4749e8bca0143a2597e2594d874c660b44af800c0974b86613ff8edf7b8de78dc0
-DIST genpatches-5.15-69.extras.tar.xz 3932 BLAKE2B 03a0b738dd90047356abd306bcdee18e7468d111dcff28cfe4bc39c7328d146c69178b1fdd19cef92c0076ad981e845f2ad37778a0907bcf0fa572011d747b08 SHA512 bf29f35d834d6113b68a3ab0a2c2ab2b241c2fa13e47f59669d23a6510cbfb29d24f5947582b2c24f2e4e3170e798d6d0a4171c47973399431a32b76a770488a
-DIST genpatches-5.15-71.base.tar.xz 2956404 BLAKE2B 20b54274b121a6e15d8960cc62e63e822db1d5fcf3a3e2f3810b70026015b405af6c5840702e418a13da2a712653f06a3f5d8af3de2157e40f1b41c8e0299a44 SHA512 ca2e20c2b6db7b2d064730650c1645524558d91de787aa947849541f2a6b0d29c919307373b6ab0a62cccaa0bddfed382c7aaf5d4b00620e1ce97d4983ade3c9
-DIST genpatches-5.15-71.experimental.tar.xz 5420 BLAKE2B 87960749b822f27cac4711e14dbc71a7c6e06575556151b5a9761be426c13ca7ed710219bddb785662321ab8691efb93d3b0d8035a55792ea223bc33604cad83 SHA512 96e6701f537ee8979d19a93383d04c4ca6074fee7dbc411afe1cda85ffa0bc28e4e221801c86e971bfd094ee8c13b5d8cd4e4f00d0de8e7a9520955a0c49f8d9
-DIST genpatches-5.15-71.extras.tar.xz 3932 BLAKE2B 53ae8469ceaf8524672ef9f7155dc092558135681438ca8dc233dcf99d458a538902ee805d8572b8ec47203966177e3cf199c47ba3ff48ceff7ae1e7844c2707 SHA512 c35adfff42a907787088d7756f77672f321b5311e08c639bf4fefa344517ea5f1d038e50bc3bbac3e321c16ad3b0ee9a35ca96f031820817ebe063b79a98a7fb
 DIST genpatches-5.15-72.base.tar.xz 2987972 BLAKE2B be108e6921f5a04605ab7c557e1ed50ce092a85eb36e6d60b4edc630457437eb89736dd992fb823522f3ca9c3ca530f3e437ad8f8b38a130bb56bc887070e1a5 SHA512 fdb5806584961dde27c7760ff4c20f6c7d08682bb998522a577dfa52a8fa021cea991c46db5efd1ab76e060e73bc38fb5728d0fae2c65f0846828c57779d6b39
 DIST genpatches-5.15-72.experimental.tar.xz 5424 BLAKE2B f26e3ebd164f39e1a2ad696f953a28576d081e195f0af7f63713281e6a0e18a6fce0a5f55320448003f835296a3203c1d7803addf58dc72f49e38018adf15972 SHA512 26589b45e58f9e56e1287aa100b1e5fbbc05f00cb128d7326a5c599b2725139a76c11a781ff45c504b749c0c9a589105a93620ad7d5069327d2749aa442d1854
 DIST genpatches-5.15-72.extras.tar.xz 3932 BLAKE2B 00c700eb5307d1834977c88e134fc2bea16f258d6eb374e6cb6d85c522cbf1730d6e2e937e7abb392350de8aa3cff6811f5ac0d3b93822fbd9a43c20abb525c2 SHA512 a08ba388711c30d3c101ebbdfb671c63f85ce3d07ba4545c3b01b70687d65f31fd9a1afadecdc49f0d9b113c5596df878acebd425b868ffd9111a555d4ced47d
@@ -115,30 +52,12 @@ DIST genpatches-5.19-11.extras.tar.xz 3804 BLAKE2B 3186d10e8a31ca501f36ae3e7945a
 DIST genpatches-5.19-12.base.tar.xz 780072 BLAKE2B fe63576626355f3fa1638ca4de11e63342b6302c068401bd6990b56ab96d28f7bfe3066dbacd28022e5117347980e19df06dce20b021d67fe5830c71bc722470 SHA512 ae55b6c32eabe68ea2a1d4a319b0ecd5204be1236275b6d113c9fb44ff449df61e9a10c28399b4c1853763779145c71708f67206e98ca51fa535a90e3b316ebb
 DIST genpatches-5.19-12.experimental.tar.xz 72040 BLAKE2B a60e5cabbaaddc70094fa9046016c25e129d44214653311330c62e7a21aa4fa5d51483943c3496b2ba4536fa15dd4b07b175a28b5615f8221eeba250300a3054 SHA512 5639444bbcea0f877f1a97415282cd987f8570257a5ef9043d255453bdd76d371210a383ba9a9ae3631c384bc3f87848a815585970d5a0f06588f8631c221551
 DIST genpatches-5.19-12.extras.tar.xz 3808 BLAKE2B 29b7c4bea18c4c56ca2944282ef1153d5394150029f680712c08b6bb41af8d8a44337768835561f90294f06635951d8dff2d56261e85c875aaabd395d39485c2 SHA512 0a30f8b0a70c9c0b6b87595236a08de5ce1b5d55df88c9878e23b3e87d7d22128da4302ea18f83ac83b66d647c0ad304a65c3c74e9084f555844bb276607a922
-DIST genpatches-5.19-6.base.tar.xz 595780 BLAKE2B 87db7f493d421ed3f0991278f16aeb984485ef5f5ef390d18cc37b27e2dec27704c1575e5ef0a475da6a5e87d68a119899d4a827c81a368c255d45887ea8a681 SHA512 2af94e970216f5297ad791496d6245fab8a0c037d5dd57161f2428dcc9c742414f0073c35be515bf6714a4962f7cc13a023e590e15902c6d68921e93a8bfeec3
-DIST genpatches-5.19-6.experimental.tar.xz 72060 BLAKE2B d403221fc0063092be8bb9fe12e0bdaab88db64d11b16c4c4d516a301bebd0066e9f410312ba421c97b22a8622283616db072d0b8bb4a4ae88aee91c360804a9 SHA512 561e669a0f8eed98cd62e95f3bec7d47fe9bfa636af399edfbf8954e683cbce62cdc8010473ba9a2ee167ba8a8873568bdf647f3ec632d485d09d7adbac36871
-DIST genpatches-5.19-6.extras.tar.xz 3772 BLAKE2B 48f01ce8b863f73dd12e06d51e9716e6b5ca6694ed0612aabfd51e6a05a4289cdccddc6061c84a5c0c32878f6b030343e31bc29dc77161226b70d1b09448337b SHA512 550123defebfd2a2d0651840cdf6ce5b47f7b79c874fd97c766e758c72f7412053f682f1d3187788ed15a59b73e09356937329d1ca49b90fa0565cf25dec44d2
-DIST genpatches-5.19-7.base.tar.xz 595844 BLAKE2B 3e29621bc36b5928eedb30e0f7bd5e1276a1c211b722bff1a6270b52a6f8ce2e08f79ef78992a8cfa6f8820a47e547b6ebfeb258ab94fffb6cf74828ebbd4f9a SHA512 67422129756abfd1b3f604ed4b3d681e113f050692e226bb023a57ce20a035bb23f6528ac165b62d6d433d631689544038b6e6fcf8efc8bdc3dc8b260cce8951
-DIST genpatches-5.19-7.experimental.tar.xz 72096 BLAKE2B ef414e40c626d90e6e053e574abd3c4346d8d705ae72e77d9f64b3101796aece93a26d1a71bb5890715df2e25e441d1375b5029c1859afa024d34dd38c9bab99 SHA512 6a5f4ff265da4ea3dcad09232068bbb40e32ec6421e403188844f031133e62522236de00378ae0fa18c60ddf091e23478f36d4757e53881b1d25ad78d70fbb3f
-DIST genpatches-5.19-7.extras.tar.xz 3804 BLAKE2B 0e8d63c6c31f92541c7963cfb22e5c22cac474e6494bf1e99685a89b7d2a9c636ced6c24f868f4250320b5130aacb553657bb1f0f197c2f0a3f0855d43cbaabd SHA512 34eb34563538ff84339622f0f3837bb8e9341f6abe1f19a3db5148e83ea4025ef61c3a05c105ba413e94f1c088ff8663f2acb9679eafe441656ca51cb19876b7
-DIST genpatches-5.19-8.base.tar.xz 643396 BLAKE2B c383c7efc908fa3e8ebdfb750d92df6adfa1e0d00f253eae40fb5db5b84f8848a5c1a4fdcda693da998b1ba9d1afb1019cbc2574ceff2b099d2125ead515efc3 SHA512 ebd5eaaefbd362d85fa8cb95b0ca4192bf7a0835ec58ea25def13e502f87f74bcc29219083f39b85462b262f526f771270b5a8d93ff49126e1653d948a9ccb9d
-DIST genpatches-5.19-8.experimental.tar.xz 72040 BLAKE2B 4aced298aadb3c8ce61c1f9d86549994712bf216a9d4ad749d4d6b70cde883ed31c4befd933ad64f7b0f4cc7aa46ec13354cb2081586ea9e1106bd1993b6bc75 SHA512 fcef9b71bf95303c728bd56655b66987fd7b27f93f7be86b420f99e6efae0b1731ed1771a04cff2a09da44d2b4775efa98ca9e2b78fd1b11c8779fa347c0a423
-DIST genpatches-5.19-8.extras.tar.xz 3808 BLAKE2B 8cad0dd5deaca8f8b379c96cfad02add0cfe7498f17e84d11e6b809e366ae0476734bd003b287456459febe2ff4c1fa7b3e54c47243cd571a34ffb1cd927a1ea SHA512 a183d09ba7b1fc3f89b7754709df8d093ba70b09f71e237844214d65bc5821b6328c436c7ef697c30bfd38fc833bd178497190a2e73914a03ec0dfa4cbcdf7f2
 DIST genpatches-5.19-9.base.tar.xz 665036 BLAKE2B 0d0f0305b82cf97240237cbde866bccd757a27ef91d23843feaa5d05be9f4d647165ad69b796d21a30bd7d92674b6be873aa529052a41ef8c200ee781a3bcc6a SHA512 e86ae26fdc5e0cedad066be47ac7d162ac7f546f253855394abf5c6da02a1c2ad99ab601fbb54775ab36720ac3e8161c9bd3fce2ddcf1ab451e30bd680ebf33b
 DIST genpatches-5.19-9.experimental.tar.xz 72036 BLAKE2B 9f279de7bb819c16819f513cffbef678039583b0a96241cb27bf33021325b53bafcf137dd5d7572de47aac38f73f0ccf4271f612d1b451c2583a4425b0d9ce73 SHA512 5bf670c77e0a5c2b336de20cb7cdb4b592b47f3d5137d45bc2489ad126cd11522ac41fc9d8f5ffb030496d5b7f58e7075cba2bc8f1253b859676a68b2e043d87
 DIST genpatches-5.19-9.extras.tar.xz 3804 BLAKE2B fd1717b9506bb6077e9b595b8c5a1b3e6a73c417999a480ba1ea9636f48d636b16727f3e99cffdcfb9c13f9db1bd3e4b8c19386f9e6737fde5beaa45d5f75f2f SHA512 08abd0533cbfbf2a14bbe61588ee19063dfa5f0b38df9571079dfe7d31b5a76d4aba30cf8c9261b4c3c7bfea7539231fde262c7ab7c402948dec88e4fc9d9d5d
 DIST genpatches-5.4-208.base.tar.xz 4869104 BLAKE2B 3e9038248ddcfd22d67248e65199cca89bd2b8b3aa99aafcee63e5c294dc360c01d7d7eda809e1c18b06a9356363c575339197b2425bcafa8676cad68c17f90e SHA512 880fd09492e5cb0fa8a94e2df5fdf912be59210f1f142a456e3f80c31142e92bee3161bd77038b606616442cf3396b3961a24422de3056f72b4556d06262d3a5
 DIST genpatches-5.4-208.experimental.tar.xz 16908 BLAKE2B ae7e40749a5bf9e80bb0c417a735c1a29cf88131e60a4054cb3ca021911f35d37a1b4ee185a7fa1227a068ae7967fc27c3db817dfc84fbee462e2779cf99a02f SHA512 3afae20a8afc9795516b60cdac904fc7e60e234a57b8f77fdd2738a0b881ba80780b47b5ff4c42a26707ff2168e6824a72507bcbff262450f816dd006abae975
 DIST genpatches-5.4-208.extras.tar.xz 1812 BLAKE2B 3e5b8cae462a748eb36af66c4ebc393fc09882a1fa23cce6f82a078ea5598c23c2ecbe7029d6e2060735fe342b3a7bb5c235dcf16081bba0f05a6b88501af991 SHA512 b550dce1b6d090959eaacd523ee1be258fbf9db84309054c3cce9beb0bae710ff2e1c23f480310072fb08f7456bdf825b3ba76d57e999fc1597368df93e65677
-DIST genpatches-5.4-215.base.tar.xz 4945872 BLAKE2B 7a0e2098f86258afe07e27a460aa8602f62fe646c918668d0f1bc03307e009ea275de198445c19a5e0727c459bdd00379c1bf86eab44265eb73a072e295b82ce SHA512 dcd26f17ecbda5b2918e98f5cec369ff9e98fa323ae39f0172bf771cdb2125312d93bbc2f1d5f46cb9ba381ff9d0fd339ecc0eac8000db90c8c2b0e07016c313
-DIST genpatches-5.4-215.experimental.tar.xz 16900 BLAKE2B fb4974250b59caa5f313f70c5144c13028c73c443f09773408c294a7685555239ddc6e8681e67730a5d9b3729409f39125c4bffa9a8224fa8626c19728cbf3a4 SHA512 186443fba9518029c02def350b45a2c7c62e36508ee2ad5f06e3f94bc5a88fa3b44b101dc88a6f7c31bd59c76296ecd19c5151bc079981c03830060ab94dd5ba
-DIST genpatches-5.4-215.extras.tar.xz 1812 BLAKE2B 26646412d59a947f1ed77792269296818ed1189aad3f30748e877e947119bd87a6a916f3ecb61a6effaa7346a31e1844eba123144e5055e5567e0be315578225 SHA512 bb45c3f3c617c9446390c15296e02ff0d01d67d96ff8e941fe14a1658e2e6845f2918f2c716cf7739dc5a0bf2dcfabb19f55bb77f51ee8a7b34c5ed2b263a959
-DIST genpatches-5.4-216.base.tar.xz 5015752 BLAKE2B fd736588b9cbf9ba0a48ad838a17eda669e56d9d0ec4dd903f5bcd31ffa2c428d14ebc7bc35a709b3da7bf7f22403c5b01a9314dda60ef955d7674af836e2481 SHA512 62cd9deb29f863babbc9dc5116e5c5bcb34c0f29325276da80fc9b040004ba9fcfcde380779bf8ea8039f3098da88c59e7fdcd2d0f6d6aa5034df59ac9b55914
-DIST genpatches-5.4-216.experimental.tar.xz 16900 BLAKE2B 9e376bca25e745bbc483040ca5121c892e6211b18d5b23707d456ccaabbfd2c370bf3939b145d6959c5c83c0d0811bc20311ab532f58f04ab597ce8008ba05ed SHA512 be46f3af40236444a6cd4a467aa37eb4231982a6fbeee8b46b9c07aaa3ec526d603b7a39a229f6bc560abd7cfa015797cb76c796098ae5214de22bcd39f53b05
-DIST genpatches-5.4-216.extras.tar.xz 1812 BLAKE2B 7dfc1025fc395883debc819c3fd5840c423d8b3f1973104906545086d35a966551fec967da9ec976257e231c4270c7b091e7641353f89c254c974b848607e5fa SHA512 aaa70a72cfe0989f5ebf2e3f57cf55c6faec4e2c605fef7ecfd425c47574765fc0a2ad5a7b9fcfe33dd70060b52d4dcd44d2849fa0fe203612c0ebacd2b171a6
-DIST genpatches-5.4-217.base.tar.xz 5035852 BLAKE2B 45b15e86b35e7f669a4f009261f0f2c0b174579850f8b99be07e60ab7561a1f35ecc48be927621f31a9f97ecf08256af784650b0991aac7d35fe7fcc8ff19afe SHA512 c8f898cb5178e67bda970c273ac1e18a37f8dedc1e813fe8429546eb83ac808ef40e008935c726924557e9669888a9571a162d75965d6c8b11d052ed1c66d482
-DIST genpatches-5.4-217.experimental.tar.xz 16900 BLAKE2B 0cba680fa1268e9a5f21bcd80959b107894c31d7053fdc4e1561a105840faf23e06032a7f816ed5cd644c58009f6ae85b3888b686c44189ac5c4eb667b2ba183 SHA512 25ac01836e2ed40e4324f614c60f30325bb0d203b70b9e5287044123a3ae8116ed1482875d12d0fe83b0da5e54ef09470f1347216451a520f6bb23838397aa89
-DIST genpatches-5.4-217.extras.tar.xz 1812 BLAKE2B 5d8cdb3ee45a1180bc94540338f3dafc08da96a849e818ee54be9cfeea59e5fdca2946cebcf2211c256978242d337671398cbaba38581f5d66e7c0f1f692fecb SHA512 55b4465034fbfbefcb0e22e782dbf7f7e3c9d74975cbe737fb0e2c57ed116d84857970074507dd449d55e8b8eb61e4dde725f5fa9e24c6dbbf83c57570007b33
 DIST genpatches-5.4-218.base.tar.xz 5055868 BLAKE2B 2dde93f13540d5268d3855b6c4b57f3746badb0db68564bd9f0a5b80cf63138dfb77a1d60be7c9256a36a7685e90299a8e28690debe2e8bad9e23e2d31dbe470 SHA512 884f469ef288aedaa2e9271fce5cbce8254247b64cc4e4594fd176b62f65133910f8e50d2458f8c822db5683beb02316b71c71e69c71ae2331baafe1d421f347
 DIST genpatches-5.4-218.experimental.tar.xz 16888 BLAKE2B 39a6f850522d542a94f4f84664ff6579c971b27d421821bde450d61bd623528cbd3ade0d1093af888974de05efeaa7ad2050a9734ed6c9de4399547939150ca3 SHA512 e8736aaee90824ac0d3072c69c1075f52f7344807ce0033dd403abffab79f3d8f7ebea3abc8f229bcb7d9a3bb1ef8c8fffa543e76ce2da908e5838ee180e28c1
 DIST genpatches-5.4-218.extras.tar.xz 1812 BLAKE2B 3d98f3ae24c5612a9427c88943474b1ca8efbba31bf5e0c0f012b4bc41d1ed980042221a77374a19813d2ba02eab944343aebe2b45aac893352a27e6330dd74f SHA512 31a3790fc98eadb717e9dd9ae9a3c0f4d8d36a2fd9023f407c6c5cc8e4018f89c74535c44f7fda34e3f7b48a0116c4bd1a4770bb98bc60a264e9c541cb767d8b
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.286.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.286.ebuild
index aa3b8386c120..c14ce3fc80cd 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.286.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.286.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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.14.289.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.289.ebuild
deleted file mode 100644
index ed8feec8bee3..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.289.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="300"
-
-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.14.290.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.290.ebuild
deleted file mode 100644
index a1bf435a1589..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.290.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="301"
-
-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.14.291.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.291.ebuild
deleted file mode 100644
index 892a2e396d60..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.291.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="302"
-
-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.14.292.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.292.ebuild
deleted file mode 100644
index 47ebf21137f3..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.292.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="303"
-
-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.14.294.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.14.294.ebuild
index b4a349ce506d..291539ffc9d9 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.14.294.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.14.294.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="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.250.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.250.ebuild
index 066af92b2aaf..0f9a58e940ab 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.250.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.250.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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.19.255.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.255.ebuild
deleted file mode 100644
index 6673a8996b2e..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.255.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="254"
-
-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.256.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.256.ebuild
deleted file mode 100644
index 78db0224eaf5..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.256.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="255"
-
-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.257.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.257.ebuild
deleted file mode 100644
index c8478e0f309b..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.257.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="256"
-
-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.259.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.19.259.ebuild
index e2b216fc0acc..105885762a2a 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.19.259.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.19.259.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="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.321.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.321.ebuild
index 38fce1de5376..bc1c2fe09c9f 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.321.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.321.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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-4.9.324.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.324.ebuild
deleted file mode 100644
index bdd8de84cab2..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.324.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="327"
-
-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.9.325.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.325.ebuild
deleted file mode 100644
index 55375c323faa..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.325.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="328"
-
-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.9.326.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.326.ebuild
deleted file mode 100644
index 1115d0beaf38..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.326.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="329"
-
-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.9.327.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.327.ebuild
deleted file mode 100644
index 513588598a47..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.327.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="330"
-
-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.9.329.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-4.9.329.ebuild
index a4a1c1cf50da..9dea5278124c 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-4.9.329.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-4.9.329.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="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.135.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.135.ebuild
index fbe871f52a1d..eced71c4d9ea 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.135.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.135.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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.138.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.138.ebuild
deleted file mode 100644
index 0559e47d8272..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.138.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="147"
-
-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.10.139.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.139.ebuild
deleted file mode 100644
index ecae947b3dd3..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.139.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="148"
-
-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.10.140.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.140.ebuild
deleted file mode 100644
index d5acda24ff7f..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.140.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="149"
-
-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.10.141.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.141.ebuild
deleted file mode 100644
index 6fd367f0f540..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.141.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="150"
-
-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.10.142.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.142.ebuild
deleted file mode 100644
index 6273e584589c..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.142.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="151"
-
-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.10.144.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.144.ebuild
index d89fe328f9b0..4ef0139cc22d 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.144.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.144.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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.59.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.59.ebuild
index 44ccc0a001dd..577ac260f5d2 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.59.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.59.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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.62.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.62.ebuild
deleted file mode 100644
index 9ae5d50946bd..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.62.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="66"
-
-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.63.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.63.ebuild
deleted file mode 100644
index c7ed0297b1d2..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.63.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="67"
-
-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.64.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.64.ebuild
deleted file mode 100644
index 11381b28e83a..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.64.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="68"
-
-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.65.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.65.ebuild
deleted file mode 100644
index 2e69e40e9d73..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.65.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="69"
-
-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.67.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.67.ebuild
deleted file mode 100644
index 9e37e0b7a9ac..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.67.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="71"
-
-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.69.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.69.ebuild
index 441b245f5b49..51997d69e53c 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.69.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.69.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 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.19.4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.19.4.ebuild
deleted file mode 100644
index 1c875bff34ab..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.19.4.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 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="6"
-K_NODRYRUN="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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.19.5.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.19.5.ebuild
deleted file mode 100644
index a2cbfdd3b332..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.19.5.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 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="7"
-K_NODRYRUN="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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.19.6.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.19.6.ebuild
deleted file mode 100644
index f9e48f774380..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.19.6.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 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="8"
-K_NODRYRUN="1"
-
-inherit kernel-2
-detect_version
-detect_arch
-
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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.203.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.203.ebuild
index d9f606a8e198..b1d28e9b7bfe 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.203.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.203.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"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.210.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.210.ebuild
deleted file mode 100644
index ad7402bfb026..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.210.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="215"
-
-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.4.211.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.211.ebuild
deleted file mode 100644
index bb48f24909c7..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.211.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="216"
-
-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.4.212.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.212.ebuild
deleted file mode 100644
index a4ea25e27075..000000000000
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.212.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-ETYPE="sources"
-K_WANT_GENPATCHES="base extras experimental"
-K_GENPATCHES_VER="217"
-
-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.4.214.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.214.ebuild
index d48e03567b07..3fb58ecff059 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.214.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.214.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="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index b3376b8b3f0b..38bdd4d969ac 100644
Binary files a/sys-libs/Manifest.gz and b/sys-libs/Manifest.gz differ
diff --git a/sys-libs/glibc/glibc-2.36-r3.ebuild b/sys-libs/glibc/glibc-2.36-r3.ebuild
index 5e0dceed3be4..1c3abc020acc 100644
--- a/sys-libs/glibc/glibc-2.36-r3.ebuild
+++ b/sys-libs/glibc/glibc-2.36-r3.ebuild
@@ -26,8 +26,7 @@ PATCH_DEV=dilfridge
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-	KEYWORDS=""
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 fi
diff --git a/sys-libs/libcap/Manifest b/sys-libs/libcap/Manifest
index 70fc4be5fef6..eac0ea4e63a6 100644
--- a/sys-libs/libcap/Manifest
+++ b/sys-libs/libcap/Manifest
@@ -1,2 +1 @@
-DIST libcap-2.64.tar.xz 175704 BLAKE2B 078ce2505a79c1bd4ca0a8eaf3444178bc19a566f0505d28c6959f86fbbac2fe2fc88c06fd0d988087a6e20e8ec66a2633146cea957f0f3fd92eaff4f81d7c66 SHA512 3c5cf478cef249585ee1a0dfd75c6b41b0daf4e1ecb59dce894eac5523841aa79ca499be4161f73193dd8e7363edcd51063f3e281930cee939ebd50983eecbaf
 DIST libcap-2.65.tar.xz 179852 BLAKE2B 9417c5c22fa2fc03df08667dca802c2e190f17af3cda86021de175bd315cbef8607cff51ee2a9c0b6cee7a09c536dbdc43c01549e0540c335966f0afaf9268c3 SHA512 de34cd7fecfe9b688ee08e56c71d4f39a3a05f6414f88577faaadfcd5111a0ae1824af3e76a5b8199131a8df6e87e47fdcb3570c364999e4626f2ab8fafb8671
diff --git a/sys-libs/libcap/libcap-2.64.ebuild b/sys-libs/libcap/libcap-2.64.ebuild
deleted file mode 100644
index 264d6b5c9a52..000000000000
--- a/sys-libs/libcap/libcap-2.64.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit multilib-minimal toolchain-funcs pam usr-ldscript
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/libs/libcap/libcap.git"
-else
-	SRC_URI="https://www.kernel.org/pub/linux/libs/security/linux-privs/libcap2/${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="POSIX 1003.1e capabilities"
-HOMEPAGE="https://sites.google.com/site/fullycapable/"
-
-# it's available under either of the licenses
-LICENSE="|| ( GPL-2 BSD )"
-SLOT="0"
-IUSE="pam static-libs tools"
-
-# While the build system optionally uses gperf, we don't DEPEND on it because
-# the build automatically falls back when it's unavailable.  #604802
-PDEPEND="pam? ( sys-libs/pam[${MULTILIB_USEDEP}] )"
-DEPEND="${PDEPEND}
-	sys-kernel/linux-headers"
-BDEPEND="
-	sys-apps/diffutils
-	tools? ( dev-lang/go )"
-
-QA_FLAGS_IGNORED="sbin/captree" # go binaries don't use LDFLAGS
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.62-ignore-RAISE_SETFCAP-install-failures.patch
-)
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-run_emake() {
-	local args=(
-		AR="$(tc-getAR)"
-		CC="$(tc-getCC)"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		RANLIB="$(tc-getRANLIB)"
-		exec_prefix="${EPREFIX}"
-		lib_prefix="${EPREFIX}/usr"
-		lib="$(get_libdir)"
-		prefix="${EPREFIX}/usr"
-		PAM_CAP="$(usex pam yes no)"
-		DYNAMIC=yes
-		GOLANG="$(multilib_native_usex tools yes no)"
-	)
-	emake "${args[@]}" "$@"
-}
-
-src_configure() {
-	tc-export_build_env BUILD_CC
-	multilib-minimal_src_configure
-}
-
-multilib_src_compile() {
-	run_emake
-}
-
-multilib_src_test() {
-	run_emake test
-}
-
-multilib_src_install() {
-	# no configure, needs explicit install line #444724#c3
-	run_emake DESTDIR="${D}" install
-
-	gen_usr_ldscript -a cap
-	gen_usr_ldscript -a psx
-	if ! use static-libs ; then
-		rm "${ED}"/usr/$(get_libdir)/lib{cap,psx}.a || die
-	fi
-
-	# install pam plugins ourselves
-	rm -rf "${ED}"/usr/$(get_libdir)/security || die
-
-	if use pam ; then
-		dopammod pam_cap/pam_cap.so
-		dopamsecurity '' pam_cap/capability.conf
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc CHANGELOG README doc/capability.notes
-}
diff --git a/sys-libs/libsemanage/libsemanage-3.4.ebuild b/sys-libs/libsemanage/libsemanage-3.4-r1.ebuild
similarity index 97%
rename from sys-libs/libsemanage/libsemanage-3.4.ebuild
rename to sys-libs/libsemanage/libsemanage-3.4-r1.ebuild
index 21cb4842a918..4a4578c17b4b 100644
--- a/sys-libs/libsemanage/libsemanage-3.4.ebuild
+++ b/sys-libs/libsemanage/libsemanage-3.4-r1.ebuild
@@ -26,7 +26,8 @@ LICENSE="GPL-2"
 SLOT="0/2"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
+RDEPEND="app-arch/bzip2[${MULTILIB_USEDEP}]
+	>=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
 	>=sys-libs/libselinux-${PV}:=[${MULTILIB_USEDEP}]
 	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
 	${PYTHON_DEPS}"
diff --git a/sys-libs/libsemanage/libsemanage-9999.ebuild b/sys-libs/libsemanage/libsemanage-9999.ebuild
index 2a19bc2117d1..d61c33250b11 100644
--- a/sys-libs/libsemanage/libsemanage-9999.ebuild
+++ b/sys-libs/libsemanage/libsemanage-9999.ebuild
@@ -26,7 +26,8 @@ LICENSE="GPL-2"
 SLOT="0/2"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 
-RDEPEND=">=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
+RDEPEND="app-arch/bzip2[${MULTILIB_USEDEP}]
+	>=sys-libs/libsepol-${PV}:=[${MULTILIB_USEDEP}]
 	>=sys-libs/libselinux-${PV}:=[${MULTILIB_USEDEP}]
 	>=sys-process/audit-2.2.2[${MULTILIB_USEDEP}]
 	${PYTHON_DEPS}"
diff --git a/sys-libs/libxcrypt/Manifest b/sys-libs/libxcrypt/Manifest
index 8e0a4b158e80..96779be2c5c3 100644
--- a/sys-libs/libxcrypt/Manifest
+++ b/sys-libs/libxcrypt/Manifest
@@ -1,3 +1,2 @@
 DIST libxcrypt-4.4.20-autotools.tar.xz 628688 BLAKE2B 4c23af2a765495758e52c8e95d53d1c1d911fea011375160c4f10e468939734fcc7198cc327fafa4d5c90afa6d4c56dfe6d1b56c2c17bbc015b44cffcd7bcc8b SHA512 5b7504e9d83df12af7d11864e88d1034ed9ce0a837ef061044c5c7fe603d7f3e5613ddf20b30613a7943735120cd058f2117401d59879afcba34ce0e48ae62ee
-DIST libxcrypt-4.4.27-autotools.tar.xz 619240 BLAKE2B 13dd5730fded0684c8e7321fee8a786663ff1080a6ca248bd718c4f6c9f6bd2853689c347be9f9ae51ebc1281aaa2143dfc020149382d259e7eefe66ac8b675e SHA512 f13ae1e69bf5850abb47a28f9ac3e3b0a8b3123adc53d39fd39a26d53847bf6e3fdca751e086cd80ce4e5d9ee419b09148c247cbe5f663b3019b66f82cdc5f5c
 DIST libxcrypt-4.4.28-autotools.tar.xz 618560 BLAKE2B c56d510201651e36cbd950b5a0a32273fdbce1f053109aa5867b2c6a57e2a896c34c981c1a2e732a8f34539b754ebe7f50d1b5bf59f9549a75ad6420921f3e1d SHA512 3c60fd32dea308152c4272522c29668c83e88bea47c98b9fe796ed70f5460ad2a9616ffbe789c03e417b28d3c792361b16031bda3d8bc5b6c06f0ebdc66c8217
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
deleted file mode 100644
index 60500e99a483..000000000000
--- a/sys-libs/libxcrypt/libxcrypt-4.4.27.ebuild
+++ /dev/null
@@ -1,225 +0,0 @@
-# Copyright 2004-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-# NEED_BOOTSTRAP is for developers to quickly generate a tarball
-# for publishing to the tree.
-NEED_BOOTSTRAP="no"
-inherit multibuild multilib python-any-r1 toolchain-funcs multilib-minimal
-
-DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
-HOMEPAGE="https://github.com/besser82/libxcrypt"
-if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
-	inherit autotools
-	SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools.tar.xz"
-fi
-
-LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
-SLOT="0/1"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+compat split-usr static-libs system test"
-REQUIRED_USE="split-usr? ( system )"
-RESTRICT="!test? ( test )"
-
-DEPEND="system? (
-		elibc_glibc? (
-			sys-libs/glibc[-crypt(+)]
-			!sys-libs/glibc[crypt(+)]
-		)
-		!sys-libs/musl
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-lang/perl
-	test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
-
-python_check_deps() {
-	python_has_version "dev-python/passlib[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if has "distcc" ${FEATURES} ; then
-		ewarn "Please verify all distcc nodes are using the same versions of GCC (>= 10) and Binutils!"
-		ewarn "Older/mismatched versions of GCC may lead to a misbehaving library: bug #823179."
-
-		if [[ ${BUILD_TYPE} != "binary" ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]] ; then
-			die "libxcrypt is known to fail to build or be broken at runtime with < GCC 10 (bug #823179)!"
-		fi
-	fi
-}
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=(
-		$(usex compat 'xcrypt_compat' '')
-		xcrypt_nocompat
-	)
-
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# WARNING: Please read on bumping or applying patches!
-	#
-	# There are two circular dependencies to be aware of:
-	# 1)
-	#	if we're bootstrapping configure and makefiles:
-	#		libxcrypt -> automake -> perl -> libxcrypt
-	#
-	#   mitigation:
-	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`
-	#		and the ebuild uses that.
-	#		(Don't include the pre-generated Perl artefacts.)
-	#
-	#	solution for future:
-	#		Upstream are working on producing `make dist` tarballs.
-	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
-	#
-	# 2)
-	#	configure *unconditionally* needs Perl at build time to generate
-	#	a list of enabled algorithms based on the set passed to `configure`:
-	#		libxcrypt -> perl -> libxcrypt
-	#
-	#	mitigation:
-	#		None at the moment.
-	#
-	#	solution for future:
-	#		Not possible right now. Upstream intend on depending on Perl for further
-	#		configuration options.
-	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
-	#
-	# Therefore, on changes (inc. bumps):
-	#	* You must check whether upstream have started providing tarballs with bootstrapped
-	#	  auto{conf,make};
-	#
-	#	* diff the build system changes!
-	#
-	if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
-		# Facilitate our split variant build for compat + non-compat
-		eapply "${FILESDIR}"/${PN}-4.4.19-multibuild.patch
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# Avoid possible "illegal instruction" errors with gold
-	# bug #821496
-	tc-ld-disable-gold
-
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-get_xclibdir() {
-	printf -- "%s/%s/%s\n" \
-		"$(usex split-usr '' '/usr')" \
-		"$(get_libdir)" \
-		"$(usex system '' 'xcrypt')"
-}
-
-multilib_src_configure() {
-	local -a myconf=(
-		--disable-werror
-		--libdir="${EPREFIX}"$(get_xclibdir)
-		--with-pkgconfigdir="${EPREFIX}/usr/$(get_libdir)/pkgconfig"
-		--includedir="${EPREFIX}/usr/include/$(usex system '' 'xcrypt')"
-	)
-
-	case "${MULTIBUILD_ID}" in
-		xcrypt_compat-*)
-			myconf+=(
-				--disable-static
-				--disable-xcrypt-compat-files
-				--enable-obsolete-api=yes
-			)
-			;;
-		xcrypt_nocompat-*)
-			myconf+=(
-				--enable-obsolete-api=no
-				$(use_enable static-libs static)
-			)
-		;;
-		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
-	emake check
-}
-
-src_test() {
-	multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant multilib-minimal_src_install
-
-	(
-		shopt -s failglob || die "failglob failed"
-
-		# Make sure our man pages do not collide with glibc or man-pages.
-		for manpage in "${ED}"/usr/share/man/man3/crypt{,_r}.?*; do
-			mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
-				|| die "mv failed"
-		done
-	) || die "failglob error"
-
-	# Remove useless stuff from installation
-	find "${ED}"/usr/share/doc/${PF} -type l -delete || die
-	find "${ED}" -name '*.la' -delete || die
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Don't install the libcrypt.so symlink for the "compat" version
-	case "${MULTIBUILD_ID}" in
-		xcrypt_compat-*)
-			rm "${ED}"$(get_xclibdir)/libcrypt$(get_libname) \
-				|| die "failed to remove extra compat libraries"
-		;;
-		xcrypt_nocompat-*)
-			if use split-usr; then
-				(
-					if use static-libs; then
-						# .a files are installed to /$(get_libdir) by default
-						# Move static libraries to /usr prefix or portage will abort
-						shopt -s nullglob || die "failglob failed"
-						static_libs=( "${ED}"/$(get_xclibdir)/*.a )
-
-						if [[ -n ${static_libs[*]} ]]; then
-							dodir "/usr/$(get_xclibdir)"
-							mv "${static_libs[@]}" "${ED}/usr/$(get_xclibdir)" \
-								|| die "Moving static libs failed"
-						fi
-					fi
-
-					if use system; then
-						# Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
-						# to allow linker to correctly find shared libraries.
-						shopt -s failglob || die "failglob failed"
-
-						for lib_file in "${ED}"$(get_xclibdir)/*$(get_libname); do
-							lib_file_basename="$(basename "${lib_file}")"
-							lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
-							dosym "../../$(get_libdir)/${lib_file_target}" "/usr/$(get_xclibdir)/${lib_file_basename}"
-						done
-
-						rm "${ED}"$(get_xclibdir)/*$(get_libname) || die "Removing symlinks in incorrect location failed"
-					fi
-				)
-			fi
-		;;
-		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
-	esac
-}
diff --git a/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild b/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
deleted file mode 100644
index 0a364e88a43d..000000000000
--- a/sys-libs/libxcrypt/libxcrypt-4.4.28.ebuild
+++ /dev/null
@@ -1,271 +0,0 @@
-# Copyright 2004-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-# NEED_BOOTSTRAP is for developers to quickly generate a tarball
-# for publishing to the tree.
-NEED_BOOTSTRAP="no"
-inherit multibuild multilib python-any-r1 toolchain-funcs multilib-minimal
-
-DESCRIPTION="Extended crypt library for descrypt, md5crypt, bcrypt, and others"
-HOMEPAGE="https://github.com/besser82/libxcrypt"
-if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
-	inherit autotools
-	SRC_URI="https://github.com/besser82/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-else
-	SRC_URI="https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${P}-autotools.tar.xz"
-fi
-
-LICENSE="LGPL-2.1+ public-domain BSD BSD-2"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+compat split-usr static-libs system test"
-REQUIRED_USE="split-usr? ( system )"
-RESTRICT="!test? ( test )"
-
-export CTARGET=${CTARGET:-${CHOST}}
-if [[ ${CTARGET} == ${CHOST} ]] ; then
-	if [[ ${CATEGORY/cross-} != ${CATEGORY} ]] ; then
-		export CTARGET=${CATEGORY/cross-}
-	fi
-fi
-
-is_cross() {
-	local enabled_abis=( $(multilib_get_enabled_abis) )
-	[[ "${#enabled_abis[@]}" -le 1 ]] && [[ ${CHOST} != ${CTARGET} ]]
-}
-
-DEPEND="system? (
-		elibc_glibc? (
-			${CATEGORY}/glibc[-crypt(+)]
-			!${CATEGORY}/glibc[crypt(+)]
-		)
-		!${CATEGORY}/musl
-	)
-"
-RDEPEND="${DEPEND}"
-BDEPEND="dev-lang/perl
-	test? ( $(python_gen_any_dep 'dev-python/passlib[${PYTHON_USEDEP}]') )"
-
-python_check_deps() {
-	python_has_version "dev-python/passlib[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if has "distcc" ${FEATURES} ; then
-		ewarn "Please verify all distcc nodes are using the same versions of GCC (>= 10) and Binutils!"
-		ewarn "Older/mismatched versions of GCC may lead to a misbehaving library: bug #823179."
-
-		if [[ ${BUILD_TYPE} != "binary" ]] && tc-is-gcc && [[ $(gcc-major-version) -lt 10 ]] ; then
-			die "libxcrypt is known to fail to build or be broken at runtime with < GCC 10 (bug #823179)!"
-		fi
-	fi
-}
-
-pkg_setup() {
-	MULTIBUILD_VARIANTS=(
-		$(usex compat 'xcrypt_compat' '')
-		xcrypt_nocompat
-	)
-
-	use test && python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	# WARNING: Please read on bumping or applying patches!
-	#
-	# There are two circular dependencies to be aware of:
-	# 1)
-	#	if we're bootstrapping configure and makefiles:
-	#		libxcrypt -> automake -> perl -> libxcrypt
-	#
-	#   mitigation:
-	#		toolchain@ manually runs `make dist` after running autoconf + `./configure`
-	#		and the ebuild uses that.
-	#		(Don't include the pre-generated Perl artefacts.)
-	#
-	#	solution for future:
-	#		Upstream are working on producing `make dist` tarballs.
-	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
-	#
-	# 2)
-	#	configure *unconditionally* needs Perl at build time to generate
-	#	a list of enabled algorithms based on the set passed to `configure`:
-	#		libxcrypt -> perl -> libxcrypt
-	#
-	#	mitigation:
-	#		None at the moment.
-	#
-	#	solution for future:
-	#		Not possible right now. Upstream intend on depending on Perl for further
-	#		configuration options.
-	#		https://github.com/besser82/libxcrypt/issues/134#issuecomment-871833573
-	#
-	# Therefore, on changes (inc. bumps):
-	#	* You must check whether upstream have started providing tarballs with bootstrapped
-	#	  auto{conf,make};
-	#
-	#	* diff the build system changes!
-	#
-	if [[ ${NEED_BOOTSTRAP} == "yes" ]] ; then
-		# Facilitate our split variant build for compat + non-compat
-		eapply "${FILESDIR}"/${PN}-4.4.19-multibuild.patch
-		eautoreconf
-	fi
-}
-
-src_configure() {
-	# Avoid possible "illegal instruction" errors with gold
-	# bug #821496
-	tc-ld-disable-gold
-
-	multibuild_foreach_variant multilib-minimal_src_configure
-}
-
-get_xcprefix() {
-	if is_cross; then
-		echo "${EPREFIX}/usr/${CTARGET}"
-	else
-		echo "${EPREFIX}"
-	fi
-}
-
-get_xclibdir() {
-	printf -- "%s/%s/%s/%s\n" \
-		"$(get_xcprefix)" \
-		"$(usex split-usr '' '/usr')" \
-		"$(get_libdir)" \
-		"$(usex system '' 'xcrypt')"
-}
-
-get_xcincludedir() {
-	printf -- "%s/usr/include/%s\n" \
-		"$(get_xcprefix)" \
-		"$(usex system '' 'xcrypt')"
-}
-
-get_xcmandir() {
-	printf -- "%s/usr/share/man\n" \
-		"$(get_xcprefix)"
-}
-
-get_xcpkgconfigdir() {
-	printf -- "%s/usr/%s/pkgconfig\n" \
-		"$(get_xcprefix)" \
-		"$(get_libdir)"
-}
-
-multilib_src_configure() {
-	local -a myconf=(
-		--disable-werror
-		--libdir=$(get_xclibdir)
-		--with-pkgconfigdir=$(get_xcpkgconfigdir)
-		--includedir=$(get_xcincludedir)
-		--mandir="$(get_xcmandir)"
-	)
-
-	case "${MULTIBUILD_ID}" in
-		xcrypt_compat-*)
-			myconf+=(
-				--disable-static
-				--disable-xcrypt-compat-files
-				--enable-obsolete-api=yes
-			)
-			;;
-		xcrypt_nocompat-*)
-			myconf+=(
-				--enable-obsolete-api=no
-				$(use_enable static-libs static)
-			)
-		;;
-		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
-	esac
-
-	ECONF_SOURCE="${S}" econf "${myconf[@]}"
-}
-
-src_compile() {
-	multibuild_foreach_variant multilib-minimal_src_compile
-}
-
-multilib_src_test() {
-	emake check
-}
-
-src_test() {
-	multibuild_foreach_variant multilib-minimal_src_test
-}
-
-src_install() {
-	multibuild_foreach_variant multilib-minimal_src_install
-
-	(
-		shopt -s failglob || die "failglob failed"
-
-		# Make sure our man pages do not collide with glibc or man-pages.
-		for manpage in "${D}$(get_xcmandir)"/man3/crypt{,_r}.?*; do
-			mv -n "${manpage}" "$(dirname "${manpage}")/xcrypt_$(basename "${manpage}")" \
-				|| die "mv failed"
-		done
-	) || die "failglob error"
-
-	# Remove useless stuff from installation
-	find "${ED}"/usr/share/doc/${PF} -type l -delete || die
-	find "${ED}" -name '*.la' -delete || die
-
-	# workaround broken upstream cross-* --docdir by installing files in proper locations
-	if is_cross; then
-		insinto "$(get_xcprefix)"/usr/share
-		doins -r "${ED}"/usr/share/doc
-		rm -r "${ED}"/usr/share/doc || die
-	fi
-}
-
-multilib_src_install() {
-	emake DESTDIR="${D}" install
-
-	# Don't install the libcrypt.so symlink for the "compat" version
-	case "${MULTIBUILD_ID}" in
-		xcrypt_compat-*)
-			rm "${D}"$(get_xclibdir)/libcrypt$(get_libname) \
-				|| die "failed to remove extra compat libraries"
-		;;
-		xcrypt_nocompat-*)
-			if use split-usr; then
-				(
-					if use static-libs; then
-						# .a files are installed to /$(get_libdir) by default
-						# Move static libraries to /usr prefix or portage will abort
-						shopt -s nullglob || die "failglob failed"
-						static_libs=( "${D}"/$(get_xclibdir)/*.a )
-
-						if [[ -n ${static_libs[*]} ]]; then
-							dodir "/usr/$(get_xclibdir)"
-							mv "${static_libs[@]}" "${ED}/usr/$(get_xclibdir)" \
-								|| die "Moving static libs failed"
-						fi
-					fi
-
-					if use system; then
-						# Move versionless .so symlinks from /$(get_libdir) to /usr/$(get_libdir)
-						# to allow linker to correctly find shared libraries.
-						shopt -s failglob || die "failglob failed"
-
-						for lib_file in "${D}"$(get_xclibdir)/*$(get_libname); do
-							lib_file_basename="$(basename "${lib_file}")"
-							lib_file_target="$(basename "$(readlink -f "${lib_file}")")"
-							dosym "../../$(get_libdir)/${lib_file_target}" "/usr/$(get_xclibdir)/${lib_file_basename}"
-						done
-
-						rm "${D}"$(get_xclibdir)/*$(get_libname) || die "Removing symlinks in incorrect location failed"
-					fi
-				)
-			fi
-		;;
-		*) die "Unexpected MULTIBUILD_ID: ${MULTIBUILD_ID}";;
-	esac
-}
diff --git a/sys-libs/musl/musl-1.2.3.ebuild b/sys-libs/musl/musl-1.2.3.ebuild
index 0b037ad8b0ee..a7b1acd0c36c 100644
--- a/sys-libs/musl/musl-1.2.3.ebuild
+++ b/sys-libs/musl/musl-1.2.3.ebuild
@@ -13,7 +13,7 @@ else
 
 	SRC_URI="https://musl.libc.org/releases/${P}.tar.gz"
 	SRC_URI+=" verify-sig? ( https://musl.libc.org/releases/${P}.tar.gz.asc )"
-	KEYWORDS="-* amd64 arm arm64 ~mips ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="-* amd64 arm arm64 ~mips ppc ppc64 ~riscv x86"
 
 	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-musl )"
 fi
diff --git a/sys-libs/readline/Manifest b/sys-libs/readline/Manifest
index d6c13fa4f2c7..e9401bc73e6f 100644
--- a/sys-libs/readline/Manifest
+++ b/sys-libs/readline/Manifest
@@ -1,7 +1,5 @@
 DIST readline-8.1.tar.gz 2993288 BLAKE2B f0feca1ea3517b2b613adacac8c997cce0e86aa2f410c82a40ce1a2e128067112b4c68dbf25b808291c28c47583345abac994ce10b8d117958afcb96ee5e7c69 SHA512 27790d0461da3093a7fee6e89a51dcab5dc61928ec42e9228ab36493b17220641d5e481ea3d8fee5ee0044c70bf960f55c7d3f1a704cf6b9c42e5c269b797e00
 DIST readline-8.1.tar.gz.sig 95 BLAKE2B 8a297ef2ebf815ac53f02d6395aa2ff9f24234aef6b9793bfcd5a610cd3a5024182ad8ec8beb75eadd5cf876c57cd56d4226075578a86e0e2421d2e9b1677aa5 SHA512 42a6052d5882f16e5b6f8cd16433d793a9cbb43cf1886b2d858dc65ce067a4c39c8dda7331e52f76426c43de02c358f9ffdaf5c8fd7b089479008c1e5aa19112
-DIST readline-8.2-rc3.tar.gz 3043957 BLAKE2B 49d68306f84add2f4e07a151c417aae9829761d0c94aaab5c2ec4dde49bcfdbd8c43907a5f5a00366850309c30a725f2628641e7105257108569efbc70420588 SHA512 136a04e070457b7152325951cd9e414d5598bcc28e41d31f6651d21b584a08282bab7c0e07edf786ef6855a6cdc346ab55ee670d06de7fdda7847a1c9b551e03
-DIST readline-8.2-rc3.tar.gz.sig 95 BLAKE2B 4af655b0a4d3faf5f9be011459f56737f48204d7d6757cd8571f5a3cfd7bc1e820def8fb7227b5431d19660a48713e5a04c95d8f5ea43439483f3ce858cb1d77 SHA512 06aec40b24f67eff72dc53b902b6f1c5df926a56b4d67df530b6243200d261747d3d2112b16ff83f921376437cfd941b8ddbe157babf9302ce60ff54a022e65d
 DIST readline-8.2-rc4.tar.gz 3044180 BLAKE2B 5338abf9ab2548f81d90017edef206cc887a5ec67e528c56ebdd2cd9b2032a2e039b1f563dbd074c0df9b071fde1dbd0d0b5e5f35ccd3eb138d9ed9b276dac03 SHA512 29df7bfd81ca7899bf515428f1e7aac2df50bafa701c9c1bfdbf2c6934b4fa712de0e8d1ddb55f398db412e03ab8a4b17a5a270acaab2f1087026998ca97c190
 DIST readline-8.2-rc4.tar.gz.sig 95 BLAKE2B d077365719b6cc44d2b9030697e64dce445b3583f812e981d86bb3bf0baf0d5e207a52191d16916533ed022be84f06c2b3b36bc3aa91389e7a3205ef596c4e1b SHA512 f1b8eeb0957a8bf64e7a1fbaa50267d5e37bdc88cb22e56b6f89a23d3871d6e5eb5f17888a8e0bb7bccf850f95b07bf06708617945fd24a98b213ce7de5b2a72
 DIST readline81-001 2454 BLAKE2B 7ec4e5c39a224a70643b44b88bcfef5198e199c76f2a34f0b0ce24f1747dd46be49ddf93871c474cda64322b4358127fec4c2401d19422f84934546bbe1f3bf2 SHA512 cfbef10bdeb562a302ccf214878d02ebadf799343b3d2d7996a282f81bcfde83997ba6dcc9a8477af4dd7c73bca74105ca00a81e42ed13321672bd2930550e54
diff --git a/sys-libs/readline/readline-8.1_p1-r1.ebuild b/sys-libs/readline/readline-8.1_p1-r1.ebuild
deleted file mode 100644
index 36d25d6c4aad..000000000000
--- a/sys-libs/readline/readline-8.1_p1-r1.ebuild
+++ /dev/null
@@ -1,199 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/
-PLEVEL="${PV##*_p}"
-MY_PV="${PV/_p*}"
-MY_PV="${MY_PV/_/-}"
-MY_P="${PN}-${MY_PV}"
-[[ ${PV} != *_p* ]] && PLEVEL=0
-patches() {
-	[[ ${PLEVEL} -eq 0 ]] && return 1
-	local opt=$1
-	eval set -- {1..${PLEVEL}}
-	set -- $(printf "${PN}${MY_PV/\.}-%03d " "$@")
-	if [[ ${opt} == -s ]] ; then
-		echo "${@/#/${DISTDIR}/}"
-	else
-		local u
-		for u in ftp://ftp.cwru.edu/pub/bash mirror://gnu/${PN} ; do
-			printf "${u}/${PN}-${MY_PV}-patches/%s " "$@"
-		done
-	fi
-}
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html"
-
-case ${PV} in
-	*_alpha*|*_beta*|*_rc*)
-		SRC_URI+=" ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	;;
-	*)
-		SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz $(patches)"
-	;;
-esac
-
-LICENSE="GPL-3"
-SLOT="0/8"  # subslot matches SONAME major
-[[ "${PV}" == *_rc* ]] || \
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="static-libs +unicode utils"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch #385091
-	"${FILESDIR}"/${PN}-7.0-headers.patch
-	"${FILESDIR}"/${PN}-8.0-headers.patch
-	"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
-	"${FILESDIR}"/${PN}-8.1-windows-signals.patch
-)
-
-# Needed because we don't want the patches being unpacked
-# (which emits annoying and useless error messages)
-src_unpack() {
-	unpack ${MY_P}.tar.gz
-}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 $(patches -s)
-	default
-
-	if use prefix && [[ ! -x "${BROOT}"/usr/bin/pkg-config ]] ; then
-		# If we're bootstrapping, make a guess. We don't have pkg-config
-		# around yet. bug #818103.
-		# Incorrectly populating this leads to underlinked libreadline.
-		local ncurses_libs
-		local ncurses_libs_suffix=$(usex unicode w '')
-
-		ncurses_libs="-lncurses${ncurses_libs_suffix}"
-
-		if has_version "sys-libs/ncurses[tinfo(+)]" ; then
-			ncurses_libs+=" -ltinfo${ncurses_libs_suffix}"
-		fi
-	else
-		# Force ncurses linking. #71420
-		# Use pkg-config to get the right values. #457558
-		local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
-	fi
-
-	sed -i \
-		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
-		support/shobj-conf || die
-	sed -i \
-		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
-		examples/rlfe/configure || die
-
-	# fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
-	# objformat for years, so we don't want to rely on that.
-	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
-	ln -s ../.. examples/rlfe/readline || die # for local readline headers
-}
-
-src_configure() {
-	# fix implicit decls with widechar funcs
-	append-cppflags -D_GNU_SOURCE
-	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
-	# Make sure configure picks a better ar than `ar`. #484866
-	export ac_cv_prog_AR=$(tc-getAR)
-
-	# Force the test since we used sed above to force it.
-	export bash_cv_termcap_lib=ncurses
-
-	# Control cross-compiling cases when we know the right answer.
-	# In cases where the C library doesn't support wide characters, readline
-	# itself won't work correctly, so forcing the answer below should be OK.
-	if tc-is-cross-compiler ; then
-		use kernel_Winnt || export bash_cv_func_sigsetjmp='present'
-		export bash_cv_func_ctype_nonascii='yes'
-		export bash_cv_wcwidth_broken='no' #503312
-	fi
-
-	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
-	# so we can re-use the config cache file between the two.
-	append-ldflags -L.
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--cache-file="${BUILD_DIR}"/config.cache
-		--with-curses
-		$(use_enable static-libs static)
-	)
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		mkdir -p examples/rlfe || die
-		cd examples/rlfe || die
-		ECONF_SOURCE="${S}"/examples/rlfe \
-		econf --cache-file="${BUILD_DIR}"/config.cache
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# code is full of AC_TRY_RUN()
-		cd examples/rlfe || die
-		local l
-		for l in readline history ; do
-			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
-			ln -s ../../lib${l}.a lib${l}.a || die
-		done
-		emake
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		gen_usr_ldscript -a readline history #4411
-
-		if use utils && ! tc-is-cross-compiler; then
-			dobin examples/rlfe/rlfe
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
-	dodoc USAGE
-	docinto ps
-	dodoc doc/*.ps
-}
-pkg_preinst() {
-	# bug #29865
-	# Reappeared in #595324 with paludis so keeping this for now...
-	preserve_old_lib \
-		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 7)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify \
-		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 7)
-}
diff --git a/sys-libs/readline/readline-8.2_rc3.ebuild b/sys-libs/readline/readline-8.2_rc3.ebuild
deleted file mode 100644
index 4bc9fb0d90a8..000000000000
--- a/sys-libs/readline/readline-8.2_rc3.ebuild
+++ /dev/null
@@ -1,246 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# There's no standard way of versioning the point releases upstream
-# make anyway, so while this was added for RC versions, it's fine
-# in general.
-QA_PKGCONFIG_VERSION=$(ver_cut 1-2)
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/chetramey.asc
-inherit flag-o-matic multilib multilib-minimal preserve-libs toolchain-funcs usr-ldscript verify-sig
-
-# Official patches
-# See ftp://ftp.cwru.edu/pub/bash/readline-8.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
-		9999|*_alpha*|*_beta*|*_rc*)
-			return 1
-			;;
-		*)
-			return 0
-			;;
-	esac
-}
-
-[[ ${PV} != *_p* ]] && PLEVEL=0
-
-DESCRIPTION="Another cute console display library"
-HOMEPAGE="https://tiswww.case.edu/php/chet/readline/rltop.html https://git.savannah.gnu.org/cgit/readline.git"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.savannah.gnu.org/git/readline.git"
-	EGIT_BRANCH=devel
-	inherit git-r3
-elif is_release ; then
-	SRC_URI="mirror://gnu/${PN}/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${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="mirror://gnu/${PN}/${MY_P}.tar.gz ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz"
-	SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${MY_P}.tar.gz.sig ftp://ftp.cwru.edu/pub/bash/${MY_P}.tar.gz.sig )"
-fi
-
-if ! is_release ; then
-	inherit autotools
-fi
-
-LICENSE="GPL-3"
-SLOT="0/8"  # subslot matches SONAME major
-if is_release ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-IUSE="static-libs +unicode utils"
-
-RDEPEND=">=sys-libs/ncurses-5.9-r3:=[static-libs?,unicode(+)?,${MULTILIB_USEDEP}]"
-DEPEND="${RDEPEND}"
-BDEPEND="virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-chetramey )"
-
-S="${WORKDIR}/${MY_P}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-5.0-no_rpath.patch
-	"${FILESDIR}"/${PN}-6.2-rlfe-tgoto.patch # bug #385091
-	"${FILESDIR}"/${PN}-7.0-headers.patch
-	"${FILESDIR}"/${PN}-8.0-headers.patch
-
-	# TODO: rebase
-	#"${FILESDIR}"/${PN}-8.0-darwin-shlib-versioning.patch
-)
-
-src_unpack() {
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	else
-		# Needed because we don't want the patches being unpacked
-		# (which emits annoying and useless error messages)
-		verify-sig_src_unpack
-		unpack ${MY_P}.tar.gz
-	fi
-}
-
-src_prepare() {
-	[[ ${PLEVEL} -gt 0 ]] && eapply -p0 "${MY_PATCHES[@]}"
-
-	default
-
-	is_release || eautoreconf
-
-	if use prefix && [[ ! -x "${BROOT}"/usr/bin/pkg-config ]] ; then
-		# If we're bootstrapping, make a guess. We don't have pkg-config
-		# around yet. bug #818103.
-		# Incorrectly populating this leads to underlinked libreadline.
-		local ncurses_libs
-		local ncurses_libs_suffix=$(usex unicode w '')
-
-		ncurses_libs="-lncurses${ncurses_libs_suffix}"
-
-		if has_version "sys-libs/ncurses[tinfo(+)]" ; then
-			ncurses_libs+=" -ltinfo${ncurses_libs_suffix}"
-		fi
-	else
-		# Force ncurses linking, bug #71420.
-		# Use pkg-config to get the right values, bug #457558.
-		local ncurses_libs=$($(tc-getPKG_CONFIG) ncurses$(usex unicode w '') --libs)
-	fi
-
-	sed -i \
-		-e "/^SHLIB_LIBS=/s:=.*:='${ncurses_libs}':" \
-		support/shobj-conf || die
-	sed -i \
-		-e "/^[[:space:]]*LIBS=.-lncurses/s:-lncurses:${ncurses_libs}:" \
-		examples/rlfe/configure || die
-
-	# Fix building under Gentoo/FreeBSD; upstream FreeBSD deprecated
-	# objformat for years, so we don't want to rely on that.
-	sed -i -e '/objformat/s:if .*; then:if true; then:' support/shobj-conf || die
-
-	# For local readline headers
-	ln -s ../.. examples/rlfe/readline || die
-}
-
-src_configure() {
-	# Fix implicit decls with widechar funcs
-	append-cppflags -D_GNU_SOURCE
-	# https://lists.gnu.org/archive/html/bug-readline/2010-07/msg00013.html
-	append-cppflags -Dxrealloc=_rl_realloc -Dxmalloc=_rl_malloc -Dxfree=_rl_free
-
-	# Make sure configure picks a better ar than `ar`, bug #484866
-	export ac_cv_prog_AR="$(tc-getAR)"
-
-	# Force the test since we used sed above to force it.
-	export bash_cv_termcap_lib=ncurses
-
-	# Control cross-compiling cases when we know the right answer.
-	# In cases where the C library doesn't support wide characters, readline
-	# itself won't work correctly, so forcing the answer below should be OK.
-	if tc-is-cross-compiler ; then
-		use kernel_Winnt || export bash_cv_func_sigsetjmp="present"
-		export bash_cv_func_ctype_nonascii="yes"
-		# bug #503312
-		export bash_cv_wcwidth_broken="no"
-	fi
-
-	# This is for rlfe, but we need to make sure LDFLAGS doesn't change
-	# so we can re-use the config cache file between the two.
-	append-ldflags -L.
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myeconfargs=(
-		--cache-file="${BUILD_DIR}"/config.cache
-		--with-curses
-		$(use_enable static-libs static)
-	)
-
-	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# Code is full of AC_TRY_RUN()
-		mkdir -p examples/rlfe || die
-		cd examples/rlfe || die
-
-		ECONF_SOURCE="${S}"/examples/rlfe econf --cache-file="${BUILD_DIR}"/config.cache
-	fi
-}
-
-multilib_src_compile() {
-	emake
-
-	if use utils && multilib_is_native_abi && ! tc-is-cross-compiler ; then
-		# Code is full of AC_TRY_RUN()
-		cd examples/rlfe || die
-		local l
-		for l in readline history ; do
-			ln -s ../../shlib/lib${l}$(get_libname)* lib${l}$(get_libname) || die
-			ln -s ../../lib${l}.a lib${l}.a || die
-		done
-		emake
-	fi
-}
-
-multilib_src_install() {
-	default
-
-	if multilib_is_native_abi ; then
-		# bug #4411
-		gen_usr_ldscript -a readline history
-
-		if use utils && ! tc-is-cross-compiler; then
-			dobin examples/rlfe/rlfe
-		fi
-	fi
-}
-
-multilib_src_install_all() {
-	HTML_DOCS="doc/history.html doc/readline.html doc/rluserman.html" einstalldocs
-
-	dodoc USAGE
-	docinto ps
-	dodoc doc/*.ps
-}
-pkg_preinst() {
-	# bug #29865
-	# Reappeared in bug #595324 with paludis so keeping this for now...
-	preserve_old_lib \
-		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 7)
-}
-
-pkg_postinst() {
-	preserve_old_lib_notify \
-		/$(get_libdir)/lib{history,readline}$(get_libname 4) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 5) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 6) \
-		/$(get_libdir)/lib{history,readline}$(get_libname 7)
-}
diff --git a/sys-libs/timezone-data/Manifest b/sys-libs/timezone-data/Manifest
index 65941e002ac5..3fb362f00a02 100644
--- a/sys-libs/timezone-data/Manifest
+++ b/sys-libs/timezone-data/Manifest
@@ -1,6 +1,2 @@
-DIST tzcode2021e.tar.gz 273644 BLAKE2B 3331477d8107fb30b2c37d3a3afb212dda7ecf53aa553ea5070537bd1a4a01bf62e70adb2fb14c025e22d272d96ee51e9e5089c5c9790682d3c43cda0ded8680 SHA512 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a
-DIST tzcode2022a.tar.gz 275632 BLAKE2B f9b3bb5eedc51896c2a1dd77fe8118518c8a1f35152325fa6c4163e11dd34aeb0c88b16b17a27ad022feb2f6818996ec0e40e06a7e1edd454187f586c3739070 SHA512 3f047a6f414ae3df4a3d6bb9b39a1790833d191ae48e6320ab9438cd326dc455475186a02c44e4cde96b48101ab000880919b1e0e8092aed7254443ed2c831ed
 DIST tzcode2022c.tar.gz 280190 BLAKE2B 4c66b84da8b1e535b92f8be8f0a1fa32f3b050f3e7676370e3094b5098e7670455e506160f364c61cfba1a919b769da8864a5347f240107c750c723fcc5caa2f SHA512 3373fa16a12007415c3dc3a75c4a0d61d6ae54968eeecedcdf4bcfd7f554020a15c4687dde107b90462b75d848eebe1e200c33322ebe0d3f1ad11bc769cade06
-DIST tzdata2021e.tar.gz 422509 BLAKE2B e0e1189a1bbfb2ee641b9c4c8d00775372638d46d7aea72ff0c4bcb02b38a65eedaf89e6b272e054245c940369a50c2573e6fc720414e4ab3d45adeda8ed9c75 SHA512 c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119
-DIST tzdata2022a.tar.gz 425833 BLAKE2B 0af5b785a6f5d871b017237ad58d3d9bedd0de38cf18ac51b32cd8df9811215af7af913d8cd3966de695ce65df3f49f52e239196e93b953094763814cc56ecd0 SHA512 542e4559beac8fd8c4af7d08d816fd12cfe7ffcb6f20bba4ff1c20eba717749ef96e5cf599b2fe03b5b8469c0467f8cb1c893008160da281055a123dd9e810d9
 DIST tzdata2022c.tar.gz 432721 BLAKE2B 087a0e728c6052f91142ef11ad2092e573de99d787ed1e8ff62476b870ff2e3d222a19df01ad624cf06e543aa7e40df89dcd888b9e5fd12f8b5af90bdffc9ac9 SHA512 e2ae92abac6d87ce4ab4ba9012e868e1791b842e083293489debc0c671b9cf135b5b70426dacb6dbebbf6eba24463205225ae45bb7df891a086b25475f85ee0b
diff --git a/sys-libs/timezone-data/timezone-data-2021e.ebuild b/sys-libs/timezone-data/timezone-data-2021e.ebuild
deleted file mode 100644
index 0569f80588bc..000000000000
--- a/sys-libs/timezone-data/timezone-data-2021e.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="https://www.iana.org/time-zones"
-SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="nls leaps-timezone zic-slim"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!sys-libs/glibc[vanilla(+)]"
-
-src_unpack() {
-	mkdir -p "${S}" && cd "${S}" || die
-	default
-}
-
-src_prepare() {
-	default
-
-	# check_web contacts validator.w3.org
-	sed -i -e 's/check_tables check_web/check_tables/g' \
-		Makefile || die "Failed to disable check_web"
-
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-src_configure() {
-	tc-export CC
-
-	append-lfs-flags #471102
-
-	if use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	fi
-
-	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
-
-	# Upstream default is 'slim', but it breaks quite a few programs
-	# that parse /etc/localtime directly: bug# 747538.
-	append-cppflags -DZIC_BLOAT_DEFAULT='\"'$(usex zic-slim slim fat)'\"'
-
-	LDLIBS=""
-	if use nls ; then
-		# See if an external libintl is available. #154181 #578424
-		local c="${T}/test"
-		echo 'main(){}' > "${c}.c"
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
-			LDLIBS+=" -lintl"
-		fi
-	fi
-}
-
-_emake() {
-	emake \
-		REDO=$(usex leaps-timezone posix_right posix_only) \
-		TOPDIR="${EPREFIX}" \
-		ZICDIR='$(TOPDIR)/usr/bin' \
-		"$@"
-}
-
-src_compile() {
-	_emake \
-		AR="$(tc-getAR)" \
-		cc="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			AR="$(tc-getBUILD_AR)" \
-			cc="$(tc-getBUILD_CC)" \
-			RANLIB="$(tc-getBUILD_RANLIB)" \
-			CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_test() {
-	# VALIDATE_ENV is used for extended/web based tests.  Punt on them.
-	emake check VALIDATE_ENV=true
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
-	rm -rf "${D}/nukeit" "${ED}/etc" || die
-
-	insinto /usr/share/zoneinfo
-	doins "${S}"/leap-seconds.list
-
-	# Delete man pages installed by man-pages package.
-	rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
-	dodoc CONTRIBUTING README NEWS *.html
-}
-
-get_TIMEZONE() {
-	local tz src="${EROOT}/etc/timezone"
-	if [[ -e ${src} ]] ; then
-		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
-	else
-		tz="FOOKABLOIE"
-	fi
-	[[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
-	local tz=$(get_TIMEZONE)
-	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
-		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
-		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
-		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
-		eerror "be using right/xxx for the system timezone as it breaks programs."
-		die "Please fix your timezone setting"
-	fi
-
-	# Trim the symlink by hand to avoid portage's automatic protection checks.
-	rm -f "${EROOT}"/usr/share/zoneinfo/posix
-
-	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
-		elog "Support for accessing posix/ and right/ directly has been dropped to match"
-		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
-		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
-		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
-	fi
-}
-
-configure_tz_data() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime"
-
-	# If it's a symlink, assume the user knows what they're doing and
-	# they're managing it themselves. #511474
-	if [[ -L "${etc_lt}" ]] ; then
-		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
-		return 0
-	fi
-
-	if ! tz=$(get_TIMEZONE) ; then
-		einfo "Assuming your empty ${src} file is what you want; skipping update."
-		return 0
-	fi
-
-	if [[ "${tz}" == "FOOKABLOIE" ]] ; then
-		einfo "You do not have a timezone set in ${src}; skipping update."
-		return 0
-	fi
-
-	local tzpath="${EROOT}/usr/share/zoneinfo/${tz}"
-
-	if [[ ! -e ${tzpath} ]]; then
-		ewarn "The timezone specified in ${src} is not valid."
-		return 1
-	fi
-
-	if [[ -f ${etc_lt} ]]; then
-		# If a regular file already exists, copy over it.
-		ewarn "Found a regular file at ${etc_lt}."
-		ewarn "Some software may expect a symlink instead."
-		ewarn "You may convert it to a symlink by removing the file and running:"
-		ewarn "  emerge --config sys-libs/timezone-data"
-		einfo "Copying ${tzpath} to ${etc_lt}."
-		cp -f "${tzpath}" "${etc_lt}"
-	else
-		# Otherwise, create a symlink and remove the timezone file.
-		tzpath="../usr/share/zoneinfo/${tz}"
-		einfo "Linking ${tzpath} at ${etc_lt}."
-		if ln -snf "${tzpath}" "${etc_lt}"; then
-			einfo "Removing ${src}."
-			rm -f "${src}"
-		fi
-	fi
-}
-
-pkg_config() {
-	configure_tz_data
-}
-
-pkg_postinst() {
-	configure_tz_data
-}
diff --git a/sys-libs/timezone-data/timezone-data-2022a.ebuild b/sys-libs/timezone-data/timezone-data-2022a.ebuild
deleted file mode 100644
index 7a4135560885..000000000000
--- a/sys-libs/timezone-data/timezone-data-2022a.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-
-inherit toolchain-funcs flag-o-matic
-
-code_ver=${PV}
-data_ver=${PV}
-DESCRIPTION="Timezone data (/usr/share/zoneinfo) and utilities (tzselect/zic/zdump)"
-HOMEPAGE="https://www.iana.org/time-zones"
-SRC_URI="https://www.iana.org/time-zones/repository/releases/tzdata${data_ver}.tar.gz
-	https://www.iana.org/time-zones/repository/releases/tzcode${code_ver}.tar.gz"
-
-LICENSE="BSD public-domain"
-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="nls leaps-timezone zic-slim"
-
-DEPEND="nls? ( virtual/libintl )"
-RDEPEND="${DEPEND}
-	!sys-libs/glibc[vanilla(+)]"
-
-src_unpack() {
-	mkdir -p "${S}" && cd "${S}" || die
-	default
-}
-
-src_prepare() {
-	default
-
-	# check_web contacts validator.w3.org
-	sed -i -e 's/check_tables check_web/check_tables/g' \
-		Makefile || die "Failed to disable check_web"
-
-	tc-is-cross-compiler && cp -pR "${S}" "${S}"-native
-}
-
-src_configure() {
-	tc-export CC
-
-	append-lfs-flags #471102
-
-	if use elibc_Darwin ; then
-		append-cppflags -DSTD_INSPIRED #138251
-	fi
-
-	append-cppflags -DHAVE_GETTEXT=$(usex nls 1 0) -DTZ_DOMAIN='\"libc\"'
-
-	# Upstream default is 'slim', but it breaks quite a few programs
-	# that parse /etc/localtime directly: bug# 747538.
-	append-cppflags -DZIC_BLOAT_DEFAULT='\"'$(usex zic-slim slim fat)'\"'
-
-	LDLIBS=""
-	if use nls ; then
-		# See if an external libintl is available. #154181 #578424
-		local c="${T}/test"
-		echo 'main(){}' > "${c}.c"
-		if $(tc-getCC) ${CPPFLAGS} ${CFLAGS} ${LDFLAGS} "${c}.c" -o "${c}" -lintl 2>/dev/null ; then
-			LDLIBS+=" -lintl"
-		fi
-	fi
-}
-
-_emake() {
-	emake \
-		REDO=$(usex leaps-timezone posix_right posix_only) \
-		TOPDIR="${EPREFIX}" \
-		ZICDIR='$(TOPDIR)/usr/bin' \
-		"$@"
-}
-
-src_compile() {
-	_emake \
-		AR="$(tc-getAR)" \
-		cc="$(tc-getCC)" \
-		RANLIB="$(tc-getRANLIB)" \
-		CFLAGS="${CFLAGS} -std=gnu99 ${CPPFLAGS}" \
-		LDFLAGS="${LDFLAGS}" \
-		LDLIBS="${LDLIBS}"
-	if tc-is-cross-compiler ; then
-		_emake -C "${S}"-native \
-			AR="$(tc-getBUILD_AR)" \
-			cc="$(tc-getBUILD_CC)" \
-			RANLIB="$(tc-getBUILD_RANLIB)" \
-			CFLAGS="${BUILD_CFLAGS} ${BUILD_CPPFLAGS}" \
-			LDFLAGS="${BUILD_LDFLAGS}" \
-			LDLIBS="${LDLIBS}" \
-			zic
-	fi
-}
-
-src_test() {
-	# VALIDATE_ENV is used for extended/web based tests.  Punt on them.
-	emake check VALIDATE_ENV=true
-}
-
-src_install() {
-	local zic=""
-	tc-is-cross-compiler && zic="zic=${S}-native/zic"
-	_emake install ${zic} DESTDIR="${D}" LIBDIR="/nukeit"
-	rm -rf "${D}/nukeit" "${ED}/etc" || die
-
-	insinto /usr/share/zoneinfo
-	doins "${S}"/leap-seconds.list
-
-	# Delete man pages installed by man-pages package.
-	rm "${ED}"/usr/share/man/man5/tzfile.5* "${ED}"/usr/share/man/man8/{tzselect,zdump,zic}.8 || die
-	dodoc CONTRIBUTING README NEWS *.html
-}
-
-get_TIMEZONE() {
-	local tz src="${EROOT}/etc/timezone"
-	if [[ -e ${src} ]] ; then
-		tz=$(sed -e 's:#.*::' -e 's:[[:space:]]*::g' -e '/^$/d' "${src}")
-	else
-		tz="FOOKABLOIE"
-	fi
-	[[ -z ${tz} ]] && return 1 || echo "${tz}"
-}
-
-pkg_preinst() {
-	local tz=$(get_TIMEZONE)
-	if [[ ${tz} == right/* || ${tz} == posix/* ]] ; then
-		eerror "The right & posix subdirs are no longer installed as subdirs -- they have been"
-		eerror "relocated to match upstream paths as sibling paths.  Further, posix/xxx is the"
-		eerror "same as xxx, so you should simply drop the posix/ prefix.  You also should not"
-		eerror "be using right/xxx for the system timezone as it breaks programs."
-		die "Please fix your timezone setting"
-	fi
-
-	# Trim the symlink by hand to avoid portage's automatic protection checks.
-	rm -f "${EROOT}"/usr/share/zoneinfo/posix
-
-	if has_version "<=${CATEGORY}/${PN}-2015c" ; then
-		elog "Support for accessing posix/ and right/ directly has been dropped to match"
-		elog "upstream.  There is no need to set TZ=posix/xxx as it is the same as TZ=xxx."
-		elog "For TZ=right/, you can use TZ=../zoneinfo-leaps/xxx instead.  See this post"
-		elog "for details: https://mm.icann.org/pipermail/tz/2015-February/022024.html"
-	fi
-}
-
-configure_tz_data() {
-	# make sure the /etc/localtime file does not get stale #127899
-	local tz src="${EROOT}/etc/timezone" etc_lt="${EROOT}/etc/localtime"
-
-	# If it's a symlink, assume the user knows what they're doing and
-	# they're managing it themselves. #511474
-	if [[ -L "${etc_lt}" ]] ; then
-		einfo "Assuming your ${etc_lt} symlink is what you want; skipping update."
-		return 0
-	fi
-
-	if ! tz=$(get_TIMEZONE) ; then
-		einfo "Assuming your empty ${src} file is what you want; skipping update."
-		return 0
-	fi
-
-	if [[ "${tz}" == "FOOKABLOIE" ]] ; then
-		einfo "You do not have a timezone set in ${src}; skipping update."
-		return 0
-	fi
-
-	local tzpath="${EROOT}/usr/share/zoneinfo/${tz}"
-
-	if [[ ! -e ${tzpath} ]]; then
-		ewarn "The timezone specified in ${src} is not valid."
-		return 1
-	fi
-
-	if [[ -f ${etc_lt} ]]; then
-		# If a regular file already exists, copy over it.
-		ewarn "Found a regular file at ${etc_lt}."
-		ewarn "Some software may expect a symlink instead."
-		ewarn "You may convert it to a symlink by removing the file and running:"
-		ewarn "  emerge --config sys-libs/timezone-data"
-		einfo "Copying ${tzpath} to ${etc_lt}."
-		cp -f "${tzpath}" "${etc_lt}"
-	else
-		# Otherwise, create a symlink and remove the timezone file.
-		tzpath="../usr/share/zoneinfo/${tz}"
-		einfo "Linking ${tzpath} at ${etc_lt}."
-		if ln -snf "${tzpath}" "${etc_lt}"; then
-			einfo "Removing ${src}."
-			rm -f "${src}"
-		fi
-	fi
-}
-
-pkg_config() {
-	configure_tz_data
-}
-
-pkg_postinst() {
-	configure_tz_data
-}
diff --git a/sys-libs/zlib/Manifest b/sys-libs/zlib/Manifest
index fda947e4d9d9..64bfa1e36767 100644
--- a/sys-libs/zlib/Manifest
+++ b/sys-libs/zlib/Manifest
@@ -1,5 +1,4 @@
 DIST zlib-1.2.11-cygwin-gzopen_w.patch 1170 BLAKE2B fe351436716634bd823da8c2811d332327d335d450d89bee85d7713b09dd454fe6aee264b044a41bf3be603aa36d67943ba6c7d8b46470e180e9b639728b5274 SHA512 14cc63a17fbf6afb6c8a8dd0b92df9807b48e0faf09c88f952083f10716ae62be8de2a0e1424b77fb538605b88898b381160521f2872afdda59e12bd27535c5a
-DIST zlib-1.2.11.tar.gz 607698 BLAKE2B 6bfc4bca5dcadba8a0d4121a2b3ed0bfe440c261003521862c8e6381f1a6f0a72d3fc037351d30afd7ef321e8e8d2ec817c046ac749f2ca0c97fbdc2f7e840b7 SHA512 73fd3fff4adeccd4894084c15ddac89890cd10ef105dd5e1835e1e9bbb6a49ff229713bd197d203edfa17c2727700fce65a2a235f07568212d820dca88b528ae
 DIST zlib-1.2.12.tar.gz 1490071 BLAKE2B 76e7b26f8dc761b0eae6276cc32bc36fa74a88197699c95d158c1548f97b80db5e39d21144ecd6ee3eb90c42730aa5f387f9952d9a3f0930b56e9dfcd12f1e67 SHA512 cc2366fa45d5dfee1f983c8c51515e0cff959b61471e2e8d24350dea22d3f6fcc50723615a911b046ffc95f51ba337d39ae402131a55e6d1541d3b095d6c0a14
 DIST zlib-1.2.12.tar.gz.asc 235 BLAKE2B bb1efc89b10b894ebc8e8008ee3e98104348f197fae54d298d62057a2d8b8d7246de937962b531189f80ad64a803112300a73862cba121cbf6a6d5ac5f9bc40c SHA512 5c1144371a83b83f9f1d008aa9297e23c0db992cab6c4a8966f9320e70c6186867d62753511d6a663b0fe181cd37fe256c53586358a42ea348ccc0747b1a7153
 DIST zlib-1.2.7-cygwin-minizip.patch 2626 BLAKE2B 885f1fda877c0b783618b163702fb46126b7db572767cd4edb86bd92db1f432c887ef1724e70c8319c26886368dba3a962af5284ec0875c20ec8ad2245fd100a SHA512 e372f1e06311e843eca2092e182c41abb009b5e9880b60292d708e4bc0de5a9e4c43d49b25b0c09df4784bc46a1254472bc5cdbdd8d6c762a9f6a145a555bfe7
diff --git a/sys-libs/zlib/zlib-1.2.11-r4.ebuild b/sys-libs/zlib/zlib-1.2.11-r4.ebuild
deleted file mode 100644
index f81dba33f73c..000000000000
--- a/sys-libs/zlib/zlib-1.2.11-r4.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-AUTOTOOLS_AUTO_DEPEND="no"
-inherit autotools multilib-minimal usr-ldscript
-
-CYGWINPATCHES=(
-	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch"
-	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> ${PN}-1.2.7-cygwin-minizip.patch"
-)
-
-DESCRIPTION="Standard (de)compression library"
-HOMEPAGE="https://zlib.net/"
-SRC_URI="https://zlib.net/${P}.tar.gz
-	https://zlib.net/fossils/${P}.tar.gz
-	http://www.gzip.org/zlib/${P}.tar.gz
-	http://www.zlib.net/current/beta/${P}.tar.gz
-	elibc_Cygwin? ( ${CYGWINPATCHES[*]} )"
-
-LICENSE="ZLIB"
-SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="minizip static-libs"
-
-BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
-# See #309623 for libxml2
-RDEPEND="
-	!<dev-libs/libxml2-2.7.7
-	!sys-libs/zlib-ng[compat]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.11-fix-deflateParams-usage.patch
-	"${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch #658536
-)
-
-src_prepare() {
-	default
-
-	if use elibc_Cygwin ; then
-		local p
-		for p in "${CYGWINPATCHES[@]}" ; do
-			# Strip out the "... -> " from the array
-			eapply -p2 "${DISTDIR}/${p#*> }"
-		done
-	fi
-
-	if use minizip ; then
-		cd contrib/minizip || die
-		eautoreconf
-	fi
-
-	case ${CHOST} in
-	*-cygwin*)
-		# do not use _wopen, is a mingw symbol only
-		sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die
-		# zlib1.dll is the mingw name, need cygz.dll
-		# cygz.dll is loaded by toolchain, put into subdir
-		sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die
-		;;
-	esac
-
-	case ${CHOST} in
-	*-mingw*|mingw*|*-cygwin*)
-		# uses preconfigured Makefile rather than configure script
-		multilib_copy_sources
-		;;
-	esac
-}
-
-echoit() { echo "$@"; "$@"; }
-
-multilib_src_configure() {
-	case ${CHOST} in
-	*-mingw*|mingw*|*-cygwin*)
-		;;
-	*)
-		local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167
-		local myconf=(
-			--shared
-			--prefix="${EPREFIX}/usr"
-			--libdir="${EPREFIX}/usr/$(get_libdir)"
-			${uname:+--uname=${uname}}
-		)
-		# not an autoconf script, so can't use econf
-		echoit "${S}"/configure "${myconf[@]}" || die
-		;;
-	esac
-
-	if use minizip ; then
-		local minizipdir="contrib/minizip"
-		mkdir -p "${BUILD_DIR}/${minizipdir}" || die
-		cd ${minizipdir} || die
-		ECONF_SOURCE="${S}/${minizipdir}" \
-		econf $(use_enable static-libs static)
-	fi
-}
-
-multilib_src_compile() {
-	case ${CHOST} in
-	*-mingw*|mingw*|*-cygwin*)
-		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
-		sed \
-			-e 's|@prefix@|'"${EPREFIX}"'/usr|g' \
-			-e 's|@exec_prefix@|${prefix}|g' \
-			-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
-			-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
-			-e 's|@includedir@|${prefix}/include|g' \
-			-e 's|@VERSION@|'${PV}'|g' \
-			zlib.pc.in > zlib.pc || die
-		;;
-	*)
-		emake
-		;;
-	esac
-	use minizip && emake -C contrib/minizip
-}
-
-sed_macros() {
-	# clean up namespace a little #383179
-	# we do it here so we only have to tweak 2 files
-	sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die
-}
-
-multilib_src_install() {
-	case ${CHOST} in
-	*-mingw*|mingw*|*-cygwin*)
-		emake -f win32/Makefile.gcc install \
-			BINARY_PATH="${ED}/usr/bin" \
-			LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
-			INCLUDE_PATH="${ED}/usr/include" \
-			SHARED_MODE=1
-		# overwrites zlib.pc created from win32/Makefile.gcc #620136
-		insinto /usr/$(get_libdir)/pkgconfig
-		doins zlib.pc
-		;;
-
-	*)
-		emake install DESTDIR="${D}" LDCONFIG=:
-		gen_usr_ldscript -a z
-		;;
-	esac
-	sed_macros "${ED}"/usr/include/*.h
-
-	if use minizip ; then
-		emake -C contrib/minizip install DESTDIR="${D}"
-		sed_macros "${ED}"/usr/include/minizip/*.h
-	fi
-
-	if use minizip; then
-		# This might not exist if slibtool is used.
-		# https://bugs.gentoo.org/816756
-		rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die
-	fi
-
-	if ! use static-libs ; then
-		# https://bugs.gentoo.org/419645
-		rm "${ED}"/usr/$(get_libdir)/libz.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc FAQ README ChangeLog doc/*.txt
-	use minizip && dodoc contrib/minizip/*.txt
-}
diff --git a/sys-libs/zlib/zlib-1.2.11-r5.ebuild b/sys-libs/zlib/zlib-1.2.11-r5.ebuild
deleted file mode 100644
index c24cdc4a3552..000000000000
--- a/sys-libs/zlib/zlib-1.2.11-r5.ebuild
+++ /dev/null
@@ -1,169 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-AUTOTOOLS_AUTO_DEPEND="no"
-inherit autotools multilib-minimal usr-ldscript
-
-CYGWINPATCHES=(
-	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch"
-	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> ${PN}-1.2.7-cygwin-minizip.patch"
-)
-
-DESCRIPTION="Standard (de)compression library"
-HOMEPAGE="https://zlib.net/"
-SRC_URI="https://zlib.net/${P}.tar.gz
-	https://zlib.net/fossils/${P}.tar.gz
-	http://www.gzip.org/zlib/${P}.tar.gz
-	http://www.zlib.net/current/beta/${P}.tar.gz
-	elibc_Cygwin? ( ${CYGWINPATCHES[*]} )"
-
-LICENSE="ZLIB"
-SLOT="0/1" # subslot = SONAME
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
-IUSE="minizip static-libs"
-
-BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )"
-# See #309623 for libxml2
-RDEPEND="
-	!<dev-libs/libxml2-2.7.7
-	!sys-libs/zlib-ng[compat]
-"
-DEPEND="${RDEPEND}"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.11-fix-deflateParams-usage.patch
-	"${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch #658536
-	"${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch #831628
-)
-
-src_prepare() {
-	default
-
-	if use elibc_Cygwin ; then
-		local p
-		for p in "${CYGWINPATCHES[@]}" ; do
-			# Strip out the "... -> " from the array
-			eapply -p2 "${DISTDIR}/${p#*> }"
-		done
-	fi
-
-	if use minizip ; then
-		cd contrib/minizip || die
-		eautoreconf
-	fi
-
-	case ${CHOST} in
-	*-cygwin*)
-		# do not use _wopen, is a mingw symbol only
-		sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die
-		# zlib1.dll is the mingw name, need cygz.dll
-		# cygz.dll is loaded by toolchain, put into subdir
-		sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die
-		;;
-	esac
-
-	case ${CHOST} in
-	*-mingw*|mingw*|*-cygwin*)
-		# uses preconfigured Makefile rather than configure script
-		multilib_copy_sources
-		;;
-	esac
-}
-
-echoit() { echo "$@"; "$@"; }
-
-multilib_src_configure() {
-	case ${CHOST} in
-	*-mingw*|mingw*|*-cygwin*)
-		;;
-	*)
-		local uname=$("${EPREFIX}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3) #347167
-		local myconf=(
-			--shared
-			--prefix="${EPREFIX}/usr"
-			--libdir="${EPREFIX}/usr/$(get_libdir)"
-			${uname:+--uname=${uname}}
-		)
-		# not an autoconf script, so can't use econf
-		echoit "${S}"/configure "${myconf[@]}" || die
-		;;
-	esac
-
-	if use minizip ; then
-		local minizipdir="contrib/minizip"
-		mkdir -p "${BUILD_DIR}/${minizipdir}" || die
-		cd ${minizipdir} || die
-		ECONF_SOURCE="${S}/${minizipdir}" \
-		econf $(use_enable static-libs static)
-	fi
-}
-
-multilib_src_compile() {
-	case ${CHOST} in
-	*-mingw*|mingw*|*-cygwin*)
-		emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
-		sed \
-			-e 's|@prefix@|'"${EPREFIX}"'/usr|g' \
-			-e 's|@exec_prefix@|${prefix}|g' \
-			-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
-			-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
-			-e 's|@includedir@|${prefix}/include|g' \
-			-e 's|@VERSION@|'${PV}'|g' \
-			zlib.pc.in > zlib.pc || die
-		;;
-	*)
-		emake
-		;;
-	esac
-	use minizip && emake -C contrib/minizip
-}
-
-sed_macros() {
-	# clean up namespace a little #383179
-	# we do it here so we only have to tweak 2 files
-	sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die
-}
-
-multilib_src_install() {
-	case ${CHOST} in
-	*-mingw*|mingw*|*-cygwin*)
-		emake -f win32/Makefile.gcc install \
-			BINARY_PATH="${ED}/usr/bin" \
-			LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
-			INCLUDE_PATH="${ED}/usr/include" \
-			SHARED_MODE=1
-		# overwrites zlib.pc created from win32/Makefile.gcc #620136
-		insinto /usr/$(get_libdir)/pkgconfig
-		doins zlib.pc
-		;;
-
-	*)
-		emake install DESTDIR="${D}" LDCONFIG=:
-		gen_usr_ldscript -a z
-		;;
-	esac
-	sed_macros "${ED}"/usr/include/*.h
-
-	if use minizip ; then
-		emake -C contrib/minizip install DESTDIR="${D}"
-		sed_macros "${ED}"/usr/include/minizip/*.h
-	fi
-
-	if use minizip; then
-		# This might not exist if slibtool is used.
-		# https://bugs.gentoo.org/816756
-		rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die
-	fi
-
-	if ! use static-libs ; then
-		# https://bugs.gentoo.org/419645
-		rm "${ED}"/usr/$(get_libdir)/libz.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc FAQ README ChangeLog doc/*.txt
-	use minizip && dodoc contrib/minizip/*.txt
-}
diff --git a/sys-libs/zlib/zlib-1.2.12-r2.ebuild b/sys-libs/zlib/zlib-1.2.12-r2.ebuild
deleted file mode 100644
index 5741a146d6fb..000000000000
--- a/sys-libs/zlib/zlib-1.2.12-r2.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-# Worth keeping an eye on 'develop' branch upstream for possible backports.
-AUTOTOOLS_AUTO_DEPEND="no"
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/madler.asc
-inherit autotools multilib-minimal usr-ldscript verify-sig
-
-CYGWINPATCHES=(
-	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.11-gzopen_w.patch -> ${PN}-1.2.11-cygwin-gzopen_w.patch"
-	"https://github.com/cygwinports/zlib/raw/22a3462cae33a82ad966ea0a7d6cbe8fc1368fec/1.2.7-minizip-cygwin.patch -> ${PN}-1.2.7-cygwin-minizip.patch"
-)
-
-DESCRIPTION="Standard (de)compression library"
-HOMEPAGE="https://zlib.net/"
-SRC_URI="https://zlib.net/${P}.tar.gz
-	https://zlib.net/fossils/${P}.tar.gz
-	https://www.gzip.org/zlib/${P}.tar.gz
-	https://www.zlib.net/current/beta/${P}.tar.gz
-	verify-sig? ( https://zlib.net/${P}.tar.gz.asc )
-	elibc_Cygwin? ( ${CYGWINPATCHES[*]} )"
-
-LICENSE="ZLIB"
-SLOT="0/1" # subslot = SONAME
-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"
-IUSE="minizip static-libs"
-
-RDEPEND="!sys-libs/zlib-ng[compat]"
-DEPEND="${RDEPEND}"
-BDEPEND="minizip? ( ${AUTOTOOLS_DEPEND} )
-	verify-sig? ( sec-keys/openpgp-keys-madler )"
-
-PATCHES=(
-	# Don't install unexpected & unused crypt.h header (which would clash with other pkgs)
-	# Pending upstream. bug #658536
-	"${FILESDIR}"/${PN}-1.2.11-minizip-drop-crypt-header.patch
-
-	# Respect AR, RANLIB, NM during build. Pending upstream. bug #831628
-	"${FILESDIR}"/${PN}-1.2.11-configure-fix-AR-RANLIB-NM-detection.patch
-
-	# Respect LDFLAGS during configure tests. Pending upstream
-	"${FILESDIR}"/${PN}-1.2.12-use-LDFLAGS-in-configure.patch
-
-	# Fix broken CC logic
-	"${FILESDIR}"/${P}-fix-CC-logic-in-configure.patch
-
-	# Backport for Java (and others), bug #836370
-	"${FILESDIR}"/${P}-CRC-buggy-input.patch
-)
-
-src_prepare() {
-	default
-
-	if use elibc_Cygwin ; then
-		local p
-		for p in "${CYGWINPATCHES[@]}" ; do
-			# Strip out the "... -> " from the array
-			eapply -p2 "${DISTDIR}/${p#*> }"
-		done
-	fi
-
-	if use minizip ; then
-		cd contrib/minizip || die
-		eautoreconf
-	fi
-
-	case ${CHOST} in
-		*-cygwin*)
-			# Do not use _wopen, it's a mingw-only symbol
-			sed -i -e '/define WIDECHAR/d' "${S}"/gzguts.h || die
-
-			# zlib1.dll is the mingw name, need cygz.dll
-			# cygz.dll is loaded by toolchain, put into subdir
-			sed -i -e 's|zlib1.dll|win32/cygz.dll|' win32/Makefile.gcc || die
-
-			;;
-	esac
-
-	case ${CHOST} in
-		*-mingw*|mingw*|*-cygwin*)
-			# Uses preconfigured Makefile rather than configure script
-			multilib_copy_sources
-
-			;;
-	esac
-}
-
-echoit() { echo "$@"; "$@"; }
-
-multilib_src_configure() {
-	case ${CHOST} in
-		*-mingw*|mingw*|*-cygwin*)
-			;;
-
-		*)
-			# bug #347167
-			local uname=$("${BROOT}"/usr/share/gnuconfig/config.sub "${CHOST}" | cut -d- -f3)
-
-			local myconf=(
-				--shared
-				--prefix="${EPREFIX}/usr"
-				--libdir="${EPREFIX}/usr/$(get_libdir)"
-				${uname:+--uname=${uname}}
-			)
-
-			# Not an autoconf script, so can't use econf
-			echoit "${S}"/configure "${myconf[@]}" || die
-
-			;;
-	esac
-
-	if use minizip ; then
-		local minizipdir="contrib/minizip"
-		mkdir -p "${BUILD_DIR}/${minizipdir}" || die
-
-		cd ${minizipdir} || die
-		ECONF_SOURCE="${S}/${minizipdir}" econf $(use_enable static-libs static)
-	fi
-}
-
-multilib_src_compile() {
-	case ${CHOST} in
-		*-mingw*|mingw*|*-cygwin*)
-			emake -f win32/Makefile.gcc STRIP=true PREFIX=${CHOST}-
-			sed \
-				-e 's|@prefix@|'"${EPREFIX}"'/usr|g' \
-				-e 's|@exec_prefix@|${prefix}|g' \
-				-e 's|@libdir@|${exec_prefix}/'$(get_libdir)'|g' \
-				-e 's|@sharedlibdir@|${exec_prefix}/'$(get_libdir)'|g' \
-				-e 's|@includedir@|${prefix}/include|g' \
-				-e 's|@VERSION@|'${PV}'|g' \
-				zlib.pc.in > zlib.pc || die
-			;;
-
-		*)
-			emake
-
-			;;
-	esac
-
-	use minizip && emake -C contrib/minizip
-}
-
-sed_macros() {
-	# Clean up namespace a little, bug #383179
-	# We do it here so we only have to tweak 2 files
-	sed -i -r 's:\<(O[FN])\>:_Z_\1:g' "$@" || die
-}
-
-multilib_src_install() {
-	case ${CHOST} in
-		*-mingw*|mingw*|*-cygwin*)
-			emake -f win32/Makefile.gcc install \
-				BINARY_PATH="${ED}/usr/bin" \
-				LIBRARY_PATH="${ED}/usr/$(get_libdir)" \
-				INCLUDE_PATH="${ED}/usr/include" \
-				SHARED_MODE=1
-
-			# Overwrites zlib.pc created from win32/Makefile.gcc, bug #620136
-			insinto /usr/$(get_libdir)/pkgconfig
-			doins zlib.pc
-
-			;;
-
-		*)
-			emake install DESTDIR="${D}" LDCONFIG=:
-			gen_usr_ldscript -a z
-
-			;;
-	esac
-
-	sed_macros "${ED}"/usr/include/*.h
-
-	if use minizip ; then
-		emake -C contrib/minizip install DESTDIR="${D}"
-		sed_macros "${ED}"/usr/include/minizip/*.h
-	fi
-
-	if use minizip; then
-		# This might not exist if slibtool is used.
-		# bug #816756
-		rm -f "${ED}"/usr/$(get_libdir)/libminizip.la || die
-	fi
-
-	if ! use static-libs ; then
-		# bug #419645
-		rm "${ED}"/usr/$(get_libdir)/libz.a || die
-	fi
-}
-
-multilib_src_install_all() {
-	dodoc FAQ README ChangeLog doc/*.txt
-	use minizip && dodoc contrib/minizip/*.txt
-}
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index f874518b9aeb..d40a3f682285 100644
Binary files a/sys-process/Manifest.gz and b/sys-process/Manifest.gz differ
diff --git a/sys-process/at/Manifest b/sys-process/at/Manifest
index d35a168605b6..11ae77710258 100644
--- a/sys-process/at/Manifest
+++ b/sys-process/at/Manifest
@@ -1,3 +1,2 @@
 DIST at_3.2.2.orig.tar.gz 127677 BLAKE2B f4b0e1cd09d1e679d0bcc287462300827d12663927dce1534a74bd4ecd670f903a81cd6147c03b0e55192655c2a99250c27ad0e9892342d91b0279210fb79a64 SHA512 e6f5aeddd89438aadff627d654ebc821a0b0e1a600ebaacc8a5fd3ec2c7c716f593757d00501311736d28f6d4276899667d6901d70836af208ff7d181b5b680f
-DIST at_3.2.4.orig.tar.gz 132124 BLAKE2B cd5a0c70d3a72bd6667166f17442dcc1a59371e0527ba7da79375e49dc5f8558ef62bface0517b5205ac32e280e88efb12cfe493982a06b9716dd68331bcad01 SHA512 e1d3a1394e90686d4f99784aa3b49fccfda137f0cfb69b3369cff4bce8bda745c8bbf5ca9b8e0863a927eda1b16652562294ff0d4eafa11d121de8de321156a2
 DIST at_3.2.5.orig.tar.gz 132660 BLAKE2B 30cd8e53aff8176ceea62f2a34c0cc0706b35fc187c2da58f86ec6ca4cec4701bfab9d932949d57b9750a18841d315d7c9a4289691f209c899598991f6541a32 SHA512 542e8948bbdc1d06934070cbfe242688b541ef6342c6b0351255f8b9d7a3ed915a9304b5cf5442dfc15845b3d2b926ebecbfc5bccd204519d0a2775b27f8139c
diff --git a/sys-process/at/at-3.2.2-r4.ebuild b/sys-process/at/at-3.2.2-r4.ebuild
deleted file mode 100644
index fe7662ea1a4c..000000000000
--- a/sys-process/at/at-3.2.2-r4.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools pam systemd
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="Queues jobs for later execution"
-HOMEPAGE="http://blog.calhariz.com/index.php/tag/at https://packages.qa.debian.org/a/at.html"
-SRC_URI="http://software.calhariz.com/at/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/a/at/${MY_P}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="pam selinux"
-
-DEPEND="
-	acct-group/at
-	acct-user/at
-	virtual/mta
-	pam? ( sys-libs/pam )
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${DEPEND}
-	virtual/mta
-	virtual/logger
-	selinux? ( sec-policy/selinux-at )
-"
-BDEPEND="
-	>=sys-devel/autoconf-2.64
-	sys-devel/bison
-	>=sys-devel/flex-2.5.4a
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.8-more-deny.patch
-	"${FILESDIR}"/${PN}-3.1.14-Makefile.patch
-	# fix parallel make issues, bug #244884
-	"${FILESDIR}"/${PN}-3.1.10.2-Makefile.in-parallel-make-fix.patch
-	"${FILESDIR}"/${PN}-3.1.13-configure.in-fix-PAM-automagick-dep.patch
-	# Fix parallel make issue (bug #408375)
-	"${FILESDIR}"/${PN}-3.1.13-parallel-make-fix.patch
-	"${FILESDIR}"/${PN}-3.1.13-getloadavg.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/at
-		--with-jobdir="${EPREFIX}"/var/spool/at/atjobs
-		--with-atspool="${EPREFIX}"/var/spool/at/atspool
-		--with-etcdir="${EPREFIX}"/etc/at
-		--with-daemon_username=at
-		--with-daemon_groupname=at
-		$(usex pam '' --without-pam)
-		$(use_with selinux)
-	)
-	econf ${myeconfargs[@]}
-}
-
-src_install() {
-	emake install IROOT="${D}"
-
-	newinitd "${FILESDIR}"/atd.rc9 atd
-	newconfd "${FILESDIR}"/atd.confd atd
-
-	if use pam ; then
-		newpamd "${FILESDIR}"/at.pamd-3.1.13-r1 atd
-	fi
-
-	# Preserve existing .SEQ files (bug #386625)
-	local seq_file="${EROOT}/var/spool/at/atjobs/.SEQ"
-	if [[ -f "${seq_file}" ]] ; then
-		einfo "Preserving existing .SEQ file (bug #386625)."
-		cp -p "${seq_file}" "${ED}"/var/spool/at/atjobs/ || die
-	fi
-
-	systemd_dounit "${FILESDIR}/atd.service"
-	keepdir /var/spool/at/atspool
-}
-
-pkg_postinst() {
-	einfo "Forcing correct permissions on /var/spool/at"
-	local atspooldir="${EROOT}/var/spool/at"
-	chown at:at "${atspooldir}/atjobs"
-	chmod 1770  "${atspooldir}/atjobs"
-	chown at:at "${atspooldir}/atjobs/.SEQ"
-	chmod 0600  "${atspooldir}/atjobs/.SEQ"
-	chown at:at "${atspooldir}/atspool"
-	chmod 1770  "${atspooldir}/atspool"
-}
diff --git a/sys-process/at/at-3.2.4.ebuild b/sys-process/at/at-3.2.4.ebuild
deleted file mode 100644
index 413b02bb81e8..000000000000
--- a/sys-process/at/at-3.2.4.ebuild
+++ /dev/null
@@ -1,97 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools pam systemd
-
-MY_P="${PN}_${PV}"
-
-DESCRIPTION="Queues jobs for later execution"
-HOMEPAGE="http://blog.calhariz.com/index.php/tag/at https://packages.qa.debian.org/a/at.html"
-SRC_URI="http://software.calhariz.com/at/${MY_P}.orig.tar.gz
-	mirror://debian/pool/main/a/at/${MY_P}.orig.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~sparc ~x86"
-IUSE="pam selinux"
-
-DEPEND="
-	acct-group/at
-	acct-user/at
-	virtual/mta
-	pam? ( sys-libs/pam )
-	selinux? ( sys-libs/libselinux )
-"
-RDEPEND="${DEPEND}
-	virtual/mta
-	virtual/logger
-	selinux? ( sec-policy/selinux-at )
-"
-BDEPEND="
-	>=sys-devel/autoconf-2.64
-	sys-devel/bison
-	>=sys-devel/flex-2.5.4a
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.8-more-deny.patch
-	"${FILESDIR}"/${PN}-3.1.14-Makefile.patch
-	# fix parallel make issues, bug #244884
-	"${FILESDIR}"/${PN}-3.1.10.2-Makefile.in-parallel-make-fix.patch
-	"${FILESDIR}"/${PN}-3.1.13-configure.in-fix-PAM-automagick-dep.patch
-	# Fix parallel make issue (bug #408375)
-	"${FILESDIR}"/${PN}-3.1.13-parallel-make-fix.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		--sysconfdir="${EPREFIX}"/etc/at
-		--with-jobdir="${EPREFIX}"/var/spool/at/atjobs
-		--with-atspool="${EPREFIX}"/var/spool/at/atspool
-		--with-etcdir="${EPREFIX}"/etc/at
-		--with-daemon_username=at
-		--with-daemon_groupname=at
-		$(usex pam '' --without-pam)
-		$(use_with selinux)
-	)
-	econf ${myeconfargs[@]}
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/atd.rc9 atd
-	newconfd "${FILESDIR}"/atd.confd atd
-
-	if use pam ; then
-		newpamd "${FILESDIR}"/at.pamd-3.1.13-r1 atd
-	fi
-
-	# Preserve existing .SEQ files (bug #386625)
-	local seq_file="${EROOT}/var/spool/at/atjobs/.SEQ"
-	if [[ -f "${seq_file}" ]] ; then
-		einfo "Preserving existing .SEQ file (bug #386625)."
-		cp -p "${seq_file}" "${ED}"/var/spool/at/atjobs/ || die
-	fi
-
-	systemd_dounit "${FILESDIR}/atd.service"
-	keepdir /var/spool/at/atspool
-}
-
-pkg_postinst() {
-	einfo "Forcing correct permissions on /var/spool/at"
-	local atspooldir="${EROOT}/var/spool/at"
-	chown at:at "${atspooldir}/atjobs"
-	chmod 1770  "${atspooldir}/atjobs"
-	chown at:at "${atspooldir}/atjobs/.SEQ"
-	chmod 0600  "${atspooldir}/atjobs/.SEQ"
-	chown at:at "${atspooldir}/atspool"
-	chmod 1770  "${atspooldir}/atspool"
-}
diff --git a/sys-process/at/at-3.2.5.ebuild b/sys-process/at/at-3.2.5.ebuild
index 779022e71919..f0a0dbb0a119 100644
--- a/sys-process/at/at-3.2.5.ebuild
+++ b/sys-process/at/at-3.2.5.ebuild
@@ -14,7 +14,7 @@ SRC_URI="http://software.calhariz.com/at/${MY_P}.orig.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="pam selinux"
 
 DEPEND="
diff --git a/sys-process/cronie/Manifest b/sys-process/cronie/Manifest
index ad71e811a63a..7de940b99a44 100644
--- a/sys-process/cronie/Manifest
+++ b/sys-process/cronie/Manifest
@@ -1,3 +1 @@
-DIST cronie-1.5.7.tar.gz 148739 BLAKE2B 3e9f8b78a29d2304e2ece7ce2b794b80e6023428d5b07f21936f3690eae2741b9e6814f966d8e3cb3d4f9daf32b3fe730ce6adebb76f8779c3f5039d2a19b6a4 SHA512 cddf1ffd518bf8daed8ae2634ace41da669f6d1039b1936b602200e2f2902944d8e84c80f73f6ab67b2fa755c4192f9181cf44d87bc893201b756367ab55148e
-DIST cronie-1.6.0.tar.gz 149859 BLAKE2B 0b63b07d8138c74c57ff0cbe1ae3cd3abb21178116322327d06cbc5e12a0c54e5f2512fb9f810787721f7ad1bba897f206b96fd83645bbfeeace734eedbcaf3d SHA512 9d078e2f8ffc0d2feaa16d419fcccf354f8de8021869b14d315b6f0a0acbd888da98fb47888b71672354ec221bbbaf5b77a543b909ae44b0fc6d2b39394ddf5b
 DIST cronie-1.6.1.tar.gz 149913 BLAKE2B 7b563b90f386a8df09398661e2b3ddc1f83d6c0d19290a02c0622be461e1d160218572adf132d634c60ef8fd0a4bb100e830b90e26270c28c75a69591ccc18a6 SHA512 1e095df9670ec25d6629f4cf2cacd82c6c1cb1487a859815a7881a1d130e4f18f9976396f773abae24dadc232166bb6467bbaeac1cb0254209fcadf3530d5e6f
diff --git a/sys-process/cronie/cronie-1.5.7.ebuild b/sys-process/cronie/cronie-1.5.7.ebuild
deleted file mode 100644
index e4bba82a5797..000000000000
--- a/sys-process/cronie/cronie-1.5.7.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools cron flag-o-matic pam systemd
-
-DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron"
-HOMEPAGE="https://github.com/cronie-crond/cronie"
-SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
-
-LICENSE="ISC BSD BSD-2 GPL-2"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+anacron +inotify pam selinux"
-
-DEPEND="
-	acct-group/crontab
-	pam? ( sys-libs/pam )
-	anacron? (
-		!sys-process/anacron
-		!sys-process/systemd-cron
-		elibc_musl? ( sys-libs/obstack-standalone )
-	)
-"
-RDEPEND="${DEPEND}
-	sys-apps/debianutils
-"
-
-#cronie supports /etc/crontab
-CRON_SYSTEM_CRONTAB="yes"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.3-systemd.patch"
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with inotify)
-		$(use_with pam)
-		$(use_with selinux)
-		$(use_enable anacron)
-		--enable-syscrontab
-		--with-daemon_username=cron
-		--with-daemon_groupname=cron
-	)
-
-	if use anacron ; then
-		if use elibc_musl ; then
-			append-cflags "-lobstack"
-		fi
-	fi
-	SPOOL_DIR="/var/spool/cron/crontabs" \
-	ANACRON_SPOOL_DIR="/var/spool/anacron" \
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docrondir -m 1730 -o root -g crontab
-	fowners root:crontab /usr/bin/crontab
-	fperms 2751 /usr/bin/crontab
-
-	newconfd "${S}"/crond.sysconfig ${PN}
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}-crontab" crontab
-	newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
-
-	insinto /etc/cron.d
-	doins contrib/0hourly
-
-	newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
-
-	if use pam ; then
-		newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
-	fi
-
-	systemd_newunit contrib/cronie.systemd cronie.service
-
-	if use anacron ; then
-		local anacrondir="/var/spool/anacron"
-		keepdir ${anacrondir}
-		fowners root:cron ${anacrondir}
-		fperms 0750 ${anacrondir}
-
-		insinto /etc
-		doins contrib/anacrontab
-
-		insinto /etc/cron.hourly
-		doins contrib/0anacron
-		fperms 0750 /etc/cron.hourly/0anacron
-	else
-		insinto /etc/cron.d
-		doins contrib/dailyjobs
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	cron_pkg_postinst
-
-	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
-		ewarn "You should restart ${PN} daemon or else you might experience segfaults"
-		ewarn "or ${PN} not working reliably anymore."
-		einfo "(see https://bugs.gentoo.org/557406 for details.)"
-	fi
-}
diff --git a/sys-process/cronie/cronie-1.6.0-r2.ebuild b/sys-process/cronie/cronie-1.6.0-r2.ebuild
deleted file mode 100644
index 6f15a911b057..000000000000
--- a/sys-process/cronie/cronie-1.6.0-r2.ebuild
+++ /dev/null
@@ -1,119 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools cron flag-o-matic pam systemd
-
-DESCRIPTION="Cronie is a standard UNIX daemon cron based on the original vixie-cron"
-HOMEPAGE="https://github.com/cronie-crond/cronie"
-SRC_URI="https://github.com/cronie-crond/cronie/archive/${P}.tar.gz"
-
-LICENSE="ISC BSD BSD-2 GPL-2"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-IUSE="+anacron +inotify pam selinux"
-
-DEPEND="
-	acct-group/crontab
-	pam? ( sys-libs/pam )
-	anacron? (
-		!sys-process/anacron
-		!sys-process/systemd-cron
-		elibc_musl? ( sys-libs/obstack-standalone )
-	)
-"
-RDEPEND="${DEPEND}
-	sys-apps/debianutils
-"
-
-#cronie supports /etc/crontab
-CRON_SYSTEM_CRONTAB="yes"
-
-S="${WORKDIR}/${PN}-${P}"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.5.3-systemd.patch"
-	"${FILESDIR}/${P}-crontab_entries_regression.patch" #836888
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	local myeconfargs=(
-		$(use_with inotify)
-		$(use_with pam)
-		$(use_with selinux)
-		$(use_enable anacron)
-		--enable-syscrontab
-		# Required for correct pidfile location #835814
-		--runstatedir="${EPREFIX}/run"
-		--with-daemon_username=cron
-		--with-daemon_groupname=cron
-	)
-
-	if use anacron ; then
-		if use elibc_musl ; then
-			append-cflags "-lobstack"
-		fi
-	fi
-	SPOOL_DIR="/var/spool/cron/crontabs" \
-	ANACRON_SPOOL_DIR="/var/spool/anacron" \
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-
-	docrondir -m 1730 -o root -g crontab
-	fowners root:crontab /usr/bin/crontab
-	fperms 2751 /usr/bin/crontab
-
-	newconfd "${S}"/crond.sysconfig ${PN}
-
-	insinto /etc
-	newins "${FILESDIR}/${PN}-crontab" crontab
-	newins "${FILESDIR}/${PN}-1.2-cron.deny" cron.deny
-
-	insinto /etc/cron.d
-	doins contrib/dailyjobs
-
-	newinitd "${FILESDIR}/${PN}-1.3-initd" ${PN}
-
-	if use pam ; then
-		newpamd "${FILESDIR}/${PN}-1.4.3-pamd" crond
-	fi
-
-	systemd_newunit contrib/cronie.systemd cronie.service
-
-	if use anacron ; then
-		local anacrondir="/var/spool/anacron"
-		keepdir ${anacrondir}
-		fowners root:cron ${anacrondir}
-		fperms 0750 ${anacrondir}
-
-		insinto /etc
-		doins contrib/anacrontab
-
-		insinto /etc/cron.hourly
-		doins contrib/0anacron
-		fperms 0750 /etc/cron.hourly/0anacron
-
-		insinto /etc/cron.d
-		doins contrib/0hourly
-	fi
-
-	einstalldocs
-}
-
-pkg_postinst() {
-	cron_pkg_postinst
-
-	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
-		ewarn "You should restart ${PN} daemon or else you might experience segfaults"
-		ewarn "or ${PN} not working reliably anymore."
-		einfo "(see https://bugs.gentoo.org/557406 for details.)"
-	fi
-}
diff --git a/sys-process/cronie/cronie-1.6.1.ebuild b/sys-process/cronie/cronie-1.6.1-r1.ebuild
similarity index 98%
rename from sys-process/cronie/cronie-1.6.1.ebuild
rename to sys-process/cronie/cronie-1.6.1-r1.ebuild
index 0a609cc5a6ca..97bb68713f7a 100644
--- a/sys-process/cronie/cronie-1.6.1.ebuild
+++ b/sys-process/cronie/cronie-1.6.1-r1.ebuild
@@ -21,6 +21,7 @@ DEPEND="
 		!sys-process/systemd-cron
 		elibc_musl? ( sys-libs/obstack-standalone )
 	)
+	selinux? ( sys-libs/libselinux )
 "
 RDEPEND="${DEPEND}
 	sys-apps/debianutils
diff --git a/sys-process/cronie/files/cronie-1.6.0-crontab_entries_regression.patch b/sys-process/cronie/files/cronie-1.6.0-crontab_entries_regression.patch
deleted file mode 100644
index 160c03116415..000000000000
--- a/sys-process/cronie/files/cronie-1.6.0-crontab_entries_regression.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From 62e53f1cdb9c1e12a01ee7814c92cd937d50328d Mon Sep 17 00:00:00 2001
-From: w30023233 <wangyuhang27@huawei.com>
-Date: Wed, 23 Mar 2022 15:40:01 +0800
-Subject: [PATCH] Fix regression in handling 1-5 crontab entries
-
----
- src/entry.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/src/entry.c b/src/entry.c
-index e9e258b..bb7cb62 100644
---- a/src/entry.c
-+++ b/src/entry.c
-@@ -595,6 +595,7 @@ get_range(bitstr_t * bits, int low, int high, const char *names[],
- 				return (EOF);
- 
- 			case R_RANGE:
-+				unget_char(ch, file);
- 				if (get_number(&num2, low, names, file) != EOF) {
- 					state = R_RANGE_NUM2;
- 					break;
diff --git a/sys-process/htop/Manifest b/sys-process/htop/Manifest
index a84a0344d1f4..dee143fae774 100644
--- a/sys-process/htop/Manifest
+++ b/sys-process/htop/Manifest
@@ -1,4 +1 @@
-DIST htop-3.1.2.tar.gz 387656 BLAKE2B a9682b6f3475fbae6ab7fd57330271190ec32267c5a8f2aac845cd18c566eaa9beed642c1e67fbc9606f120df600c27ed2ef0480a29ef304875a99898c1f10e4 SHA512 7e08b820042e480ca61137ff24b468804b49b95c1bbedaf82029dd79d29c2c541c5211284ec075692203788bbb868a9d4326ffd24c68419e22eec13ae5012700
-DIST htop-3.2.0.tar.gz 393712 BLAKE2B fff50fce1dd58d5738ca4a75a8b4078aa34e9544798c81bb18a2674823ab13a93ecec8c00d034704ecaab6a871efa2b021550dc1f0a03aa86f638c28e84f769e SHA512 174eaa7333fa60e40f67148560c53125e7aaf46a48e7f3ecfa2daa68553c94b3d076d03320afd479dcee07e739c0ff286a81b67cbc994782c33e798d3ed4605c
-DIST htop-3.2.1.tar.gz 397632 BLAKE2B 301bc421b3ff8136a70603c523dd719d38703288114712a6e178c1a348b1bc9b9d578cdf3cf8fe99a9bcd2d5721cd2a10caeeeb4614b24c4f20a8e103c37d236 SHA512 d7b76e28ee870ac572ba1d9606dec6f9475346a00e599ca15838017c97683f1fc1be40417b9c1e76128cacc8a60ff9ba88c6b237be1835d309f98329b25644fc
 DIST htop-3.2.1.tar.xz 406048 BLAKE2B 7addefca7de8f0867220e6415f4585f7e6ecf655d6245e4a8e120552ac738544fde1c2d8e24ce1139209caad23994316e8be9611f6ed0253d60547158d17ff24 SHA512 f412c10ebdec4fb026fb93a79a9b0b84612ad5a0d28e37f06713e6c895f70e92cbd09a8737d04f3d51102295d7a419eb2c3ec3907b96f553fda8ff3d1a2142b6
diff --git a/sys-process/htop/htop-3.1.2-r1.ebuild b/sys-process/htop/htop-3.1.2-r1.ebuild
deleted file mode 100644
index e390c41f80e9..000000000000
--- a/sys-process/htop/htop-3.1.2-r1.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools linux-info python-any-r1 xdg-utils
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
-SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-IUSE="caps debug delayacct hwloc lm-sensors llvm-libunwind openvz unicode unwind vserver"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	sys-libs/ncurses:=[unicode(+)?]
-	hwloc? ( sys-apps/hwloc:= )
-	unwind? (
-		!llvm-libunwind? ( sys-libs/libunwind:= )
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-	)
-	kernel_linux? (
-		caps? ( sys-libs/libcap )
-		delayacct? ( dev-libs/libnl:3 )
-		lm-sensors? ( sys-apps/lm-sensors )
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-S="${WORKDIR}/${P/_}"
-
-pkg_setup() {
-	if ! has_version sys-process/lsof; then
-		ewarn "To use lsof features in htop (what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	[[ ${CBUILD} != ${CHOST} ]] && export ac_cv_file__proc_{meminfo,stat}=yes #328971
-
-	local myeconfargs=(
-		--enable-unicode
-		$(use_enable debug)
-		$(use_enable hwloc)
-		$(use_enable !hwloc affinity)
-		$(use_enable openvz)
-		$(use_enable unicode)
-		$(use_enable unwind)
-		$(use_enable vserver)
-	)
-
-	if use kernel_linux ; then
-		myeconfargs+=(
-			$(use_enable caps capabilities)
-			$(use_enable delayacct)
-			$(use_enable lm-sensors sensors)
-		)
-	else
-		if use kernel_Darwin ; then
-			# Upstream default to checking but --enable-affinity
-			# overrides this. Simplest to just disable on Darwin
-			# given it works on BSD anyway.
-			myeconfargs+=( --disable-affinity )
-		fi
-
-		myeconfargs+=(
-			--disable-capabilities
-			--disable-delayacct
-			--disable-sensors
-		)
-	fi
-
-	econf ${myeconfargs[@]}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/sys-process/htop/htop-3.2.0.ebuild b/sys-process/htop/htop-3.2.0.ebuild
deleted file mode 100644
index 97ec0972056e..000000000000
--- a/sys-process/htop/htop-3.2.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools linux-info python-any-r1 xdg-utils
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
-SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-IUSE="caps debug delayacct hwloc lm-sensors llvm-libunwind openvz unicode unwind vserver"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	sys-libs/ncurses:=[unicode(+)?]
-	hwloc? ( sys-apps/hwloc:= )
-	unwind? (
-		!llvm-libunwind? ( sys-libs/libunwind:= )
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-	)
-	kernel_linux? (
-		caps? ( sys-libs/libcap )
-		delayacct? ( dev-libs/libnl:3 )
-		lm-sensors? ( sys-apps/lm-sensors )
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-S="${WORKDIR}/${P/_}"
-
-pkg_setup() {
-	if ! has_version sys-process/lsof ; then
-		ewarn "To use lsof features in htop (what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	if [[ ${CBUILD} != ${CHOST} ]] ; then
-		export ac_cv_file__proc_{meminfo,stat}=yes #328971
-	fi
-
-	local myeconfargs=(
-		--enable-unicode
-		$(use_enable debug)
-		$(use_enable hwloc)
-		$(use_enable !hwloc affinity)
-		$(use_enable openvz)
-		$(use_enable unicode)
-		$(use_enable unwind)
-		$(use_enable vserver)
-	)
-
-	if use kernel_linux ; then
-		myeconfargs+=(
-			$(use_enable caps capabilities)
-			$(use_enable delayacct)
-			$(use_enable lm-sensors sensors)
-		)
-	else
-		if use kernel_Darwin ; then
-			# Upstream default to checking but --enable-affinity
-			# overrides this. Simplest to just disable on Darwin
-			# given it works on BSD anyway.
-			myeconfargs+=( --disable-affinity )
-		fi
-
-		myeconfargs+=(
-			--disable-capabilities
-			--disable-delayacct
-			--disable-sensors
-		)
-	fi
-
-	econf ${myeconfargs[@]}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/sys-process/htop/htop-3.2.1.ebuild b/sys-process/htop/htop-3.2.1.ebuild
deleted file mode 100644
index 97ec0972056e..000000000000
--- a/sys-process/htop/htop-3.2.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit autotools linux-info python-any-r1 xdg-utils
-
-DESCRIPTION="interactive process viewer"
-HOMEPAGE="https://htop.dev/ https://github.com/htop-dev/htop"
-SRC_URI="https://github.com/htop-dev/${PN}/archive/${PV/_}.tar.gz -> ${P}.tar.gz"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-LICENSE="BSD GPL-2+"
-SLOT="0"
-IUSE="caps debug delayacct hwloc lm-sensors llvm-libunwind openvz unicode unwind vserver"
-
-BDEPEND="virtual/pkgconfig"
-RDEPEND="
-	sys-libs/ncurses:=[unicode(+)?]
-	hwloc? ( sys-apps/hwloc:= )
-	unwind? (
-		!llvm-libunwind? ( sys-libs/libunwind:= )
-		llvm-libunwind? ( sys-libs/llvm-libunwind:= )
-	)
-	kernel_linux? (
-		caps? ( sys-libs/libcap )
-		delayacct? ( dev-libs/libnl:3 )
-		lm-sensors? ( sys-apps/lm-sensors )
-	)
-"
-DEPEND="${RDEPEND}
-	${PYTHON_DEPS}"
-
-DOCS=( ChangeLog README )
-
-CONFIG_CHECK="~TASKSTATS ~TASK_XACCT ~TASK_IO_ACCOUNTING ~CGROUPS"
-
-S="${WORKDIR}/${P/_}"
-
-pkg_setup() {
-	if ! has_version sys-process/lsof ; then
-		ewarn "To use lsof features in htop (what processes are accessing"
-		ewarn "what files), you must have sys-process/lsof installed."
-	fi
-
-	python-any-r1_pkg_setup
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-}
-
-src_configure() {
-	if [[ ${CBUILD} != ${CHOST} ]] ; then
-		export ac_cv_file__proc_{meminfo,stat}=yes #328971
-	fi
-
-	local myeconfargs=(
-		--enable-unicode
-		$(use_enable debug)
-		$(use_enable hwloc)
-		$(use_enable !hwloc affinity)
-		$(use_enable openvz)
-		$(use_enable unicode)
-		$(use_enable unwind)
-		$(use_enable vserver)
-	)
-
-	if use kernel_linux ; then
-		myeconfargs+=(
-			$(use_enable caps capabilities)
-			$(use_enable delayacct)
-			$(use_enable lm-sensors sensors)
-		)
-	else
-		if use kernel_Darwin ; then
-			# Upstream default to checking but --enable-affinity
-			# overrides this. Simplest to just disable on Darwin
-			# given it works on BSD anyway.
-			myeconfargs+=( --disable-affinity )
-		fi
-
-		myeconfargs+=(
-			--disable-capabilities
-			--disable-delayacct
-			--disable-sensors
-		)
-	fi
-
-	econf ${myeconfargs[@]}
-}
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/sys-process/numactl/numactl-2.0.14-r1.ebuild b/sys-process/numactl/numactl-2.0.14-r1.ebuild
index d05f47076bb7..4d8877a49392 100644
--- a/sys-process/numactl/numactl-2.0.14-r1.ebuild
+++ b/sys-process/numactl/numactl-2.0.14-r1.ebuild
@@ -3,6 +3,14 @@
 
 EAPI=8
 
+if [[ ${PV} != 2.0.14 ]] ; then
+	eerror "Please do not bump to 2.0.15! It's broken:"
+	eerror "https://github.com/numactl/numactl/issues/135"
+	eerror "It's also missing a dist tarball:"
+	eerror "https://github.com/numactl/numactl/issues/140"
+	die "Please check ebuild!"
+fi
+
 inherit autotools multilib-minimal
 
 DESCRIPTION="Utilities and libraries for NUMA systems"
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index bf99089e270a..9232ccbd8f67 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,7 +1,3 @@
-DIST parallel-20220522.tar.bz2 2372671 BLAKE2B e32f62930a4147dc950f5bdab1da58bef19c83b75e7257511d44257ef1569b40a34c670c63831f46daabcb390a197b7293aabb66f2dacd9848dd64910fd3b912 SHA512 45dd1abe8652d29cd054505263b4ed792f42d7d6799ebdbfec07c21d54437d7243a054adff1d6c987eb85260d7ead2a9bb4dacb9d54a8a5b332218e27cf4f62c
-DIST parallel-20220522.tar.bz2.sig 2080 BLAKE2B 52d49780713d113344232c572f325109f35df966f3f9840ed7522b9414e7860bd8117f42e1ef1d5be22471e455f6f189766bcc40e3d2afb689bfda64de08ade8 SHA512 6b3cd5f93bc3db979fa0ae70a565ccea2a2dc37fc534b76fb8660092ec63244e550470782e477d815d619c540237afb7e124316a5e89d6ddeaf89689c1810ee5
-DIST parallel-20220622.tar.bz2 2378286 BLAKE2B a0fdb1ab330360c28d85ea5608760a961e663a5401b900e6e8eee944250bf233ae1e3f66e6a2b9d54f0c32702127593dab787d29eda636bd457dcc5d4b046785 SHA512 d01d86cd2ac373534d147eee8aa666fe26e7207362ea9c036c3744125f72c936d15cf2059429636454f21c8e8c6b3a60c8d761ddfde97ba7388d2cd00495bfa4
-DIST parallel-20220622.tar.bz2.sig 2080 BLAKE2B f013d329dd3e6d46341638965582ef5eb7358b8dff5e858279808a38d8543dd900fcc248433e30a3a715e1726be10dad5597deec23519bb33a904006f72a92d8 SHA512 097ca0f3ca9afe96045738fe050f94ba588e7728ae7cbf4f695b7f1f6c148ccc1565839aec2ba3ce4ccaf888331365b9b7265aa434806ef2c76139e2ba2f0e82
 DIST parallel-20220722.tar.bz2 1851613 BLAKE2B 76d9edddac82b5077d6416cf629dc02d427c93a42907f84a467a45805efe99154eaa175755a4a4c9a9d86df480842daef7064b1d324671eeb6c08fdbab3e7b70 SHA512 b3bee9861ad9537055f00ebc7a1593697cb9f53167bd79fb612b9567a1d19edb7b770e5e68cee410bf2a146f3c48608e7a47254972f28ca0418d725b8d2088d3
 DIST parallel-20220722.tar.bz2.sig 2080 BLAKE2B cf71695489b67cfc458e361db3dd5d195a12e127a7b48f8fbc6ce557ffc2d9e30137a462dae0f99361194313997ebc414cb1d3242a84bddb5dc233a9cc9721fb SHA512 5ade3326fa66ac544698cb43b9225bde9ccb77bae0e938c9d7e9f1ea27d254c2bb3a49a3601c430f31a4c651fc52dea9fee909cbbbf0d5c5138543358671c94d
 DIST parallel-20220822.tar.bz2 2389888 BLAKE2B 95e94064eaecf661a46d45f33f61c51c3873b38935adcb9705678f44e4583d4338d9914ca2b5be87f3551148ad9889cb11beda11ac5771d840337d5a1d33c1c4 SHA512 d2dc3b2e59eb777e24c4564c7a9b8460ae85d587b32aa50358583d90f1beea8f321c5e93bd6adf34731a447d7fc22942c81e27a75a4b0b02616af2887be6db12
diff --git a/sys-process/parallel/parallel-20220522.ebuild b/sys-process/parallel/parallel-20220522.ebuild
deleted file mode 100644
index 98ebb581b101..000000000000
--- a/sys-process/parallel/parallel-20220522.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2022 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 ~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/sys-process/parallel/parallel-20220622-r1.ebuild b/sys-process/parallel/parallel-20220622-r1.ebuild
deleted file mode 100644
index dded39ea7a57..000000000000
--- a/sys-process/parallel/parallel-20220622-r1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 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 autotools 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 ~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 )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-20220622-makefile-completions-deux.patch
-)
-
-src_prepare() {
-	default
-
-	# Only for Makefile/completions patch
-	eautoreconf
-}
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index f7e7482d1828..1c588c881b12 100644
Binary files a/virtual/Manifest.gz and b/virtual/Manifest.gz differ
diff --git a/virtual/rust/rust-1.63.0.ebuild b/virtual/rust/rust-1.63.0.ebuild
index b7da1d054aa3..a7d950afd9b7 100644
--- a/virtual/rust/rust-1.63.0.ebuild
+++ b/virtual/rust/rust-1.63.0.ebuild
@@ -9,7 +9,7 @@ DESCRIPTION="Virtual for Rust language compiler"
 
 LICENSE=""
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 IUSE="rustfmt"
 
 BDEPEND=""
diff --git a/virtual/rust/rust-1.64.0.ebuild b/virtual/rust/rust-1.64.0.ebuild
new file mode 100644
index 000000000000..93722254cd73
--- /dev/null
+++ b/virtual/rust/rust-1.64.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit multilib-build
+
+DESCRIPTION="Virtual for Rust language compiler"
+
+LICENSE=""
+SLOT="0"
+#KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="rustfmt"
+
+BDEPEND=""
+RDEPEND="|| (
+	~dev-lang/rust-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+	~dev-lang/rust-bin-${PV}[rustfmt?,${MULTILIB_USEDEP}]
+)"
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 1e6ea879f0af..1dd2392d6e66 100644
Binary files a/www-client/Manifest.gz and b/www-client/Manifest.gz differ
diff --git a/www-client/chromium-bin/Manifest b/www-client/chromium-bin/Manifest
index 247cfe45cf9b..0fc2bc6be634 100644
--- a/www-client/chromium-bin/Manifest
+++ b/www-client/chromium-bin/Manifest
@@ -1,11 +1,11 @@
-DIST chromium-bin-104.0.5112.101-1-common-aarch64.tar.xz 3149688 BLAKE2B 77c9be16dcfe8c1d073bce316a6832f82a52a067ac82167743a6f03b79d9c84b44904801f711b47fadf331514c1a08f0b602694b92a3f6761db183b30a89aef9 SHA512 4b88e1dcc4a4219744944778e7d36684c8b17eefdb3858a70781f24b8978a064779c5a6f9dc1c912bc55e946a2b8dc5a22e9554002229b1f4788114dd79588a5
-DIST chromium-bin-104.0.5112.101-1-common-i686.tar.xz 3160916 BLAKE2B 49d147e99fe8cb1b05112363609cface8522d90885ec94f5e2f91dc5aaa012d64b3bd53af4815a1b99ef82114343c8c9893729ef1e9d31afd984fe242a015a3b SHA512 03946b9f74d07b419bbe113cb923199b1f438024d44aedd48fc0e81c618f7c5671c1ab218ee8386936362a5be8c95db2f55b99609d0244c68d83d402c6d88b0c
-DIST chromium-bin-104.0.5112.101-1-common-x86_64.tar.xz 3213208 BLAKE2B c5ea2908cfd98fc5d2c37b52d4b30017125b18522637b68b7526e46b6410ef357227e1cbfb06388172972af9aae85e3ea99b460fbf651f735eb7067868d43740 SHA512 ab5b4b9a31abe6243a7972e90d08870057ae1866843dc4d29506f664ca29a7920d90449f689ae771d87dacb36be6c076e1e307cbccc47d9bc18915c4cd086644
-DIST chromium-bin-104.0.5112.101-1-common.tar.xz 4451064 BLAKE2B 5c3bcc1355f5f9e58e619bcd102a1f9da0b1e1881d3bd8eb2751a98d677f84b3d0fa9f2e7d1ae39b383a3ea3094f16cb6f54f341cdb271ad0ad754fc1e3baa14 SHA512 87f7befc40a51572f556bb90feefe77b7f59c46a1d688215d2ea8aa73576884544466b4af50e2d33dc7d03e9df7381c0cecf4e70dd5b9733e44d4feb8424644e
-DIST chromium-bin-104.0.5112.101-1-l10n.tar.xz 5028548 BLAKE2B 3824e60dae4c53e6ee5534c48afd0253fa6a35d5b5dbc0fde808b97082c5f1df04c5fd101a3017df525bc33e3ec2137f6ee59ff32b96804a520d34c93aa06036 SHA512 d465e080cdb69e4109aeb6a6c70f610951279bd6bcd401b105af8007ce4522eda353c0a72a98b6fd1a40b4772171ec82f58b09754ec9429d576c42b590b332c1
-DIST chromium-bin-104.0.5112.101-1-wayland-aarch64.tar.xz 81740896 BLAKE2B 2e03d4fc42d47033df36be71b2ea92467b74b29324ea14f2d9fa6e6f38d9b5cd46bd398e0fd07dfe5d90c8f9b221d0b9d8920c185bc63a3e666cc1f40afbd669 SHA512 aa20caaccb7d618fb8a6c1541c50b60f8ab9ad989acc3b2dd25f63e3474458418d0316fb8401d6392fd606ccc535c405057de87890130552a78b577f2a98ec46
-DIST chromium-bin-104.0.5112.101-1-wayland-i686.tar.xz 84291980 BLAKE2B 26e0fd2353f2ac6fbb9dd49345fdf34f9d9631f7aad318aee3350a9dc91e67d4ea9dfba36b65d44731d9fcc2318ac49727d6b9029ca56bc885ffb3fc4bcad9d6 SHA512 c6546b9debb143773baa267a0aa58634c8d01adcfa3a37d2f7bf20aece9c0231f10d6ca54da85c29c75701a336ddef8a0e6757af377e36fb40b942c3c3c139cc
-DIST chromium-bin-104.0.5112.101-1-wayland-x86_64.tar.xz 83428744 BLAKE2B 96ad32d3fbee261962382ea0044e379cb42c4e4f5eea58c941ed1bea595cfe5dbc58d73c6853ac47095898eeebb0af8c6f3444cd8191ae7fdf94ce73d280c857 SHA512 bc2c0be64938a9dd5aab49f3a1e6e9869b73c4e30123f3fb2cd1f9144bbbc15e75054f2776e192e9a09afd7939d2440eaf6c2749e2367e4b7dcb7df2117178dd
-DIST chromium-bin-104.0.5112.101-1-x11-aarch64.tar.xz 81525248 BLAKE2B 308b352c1c7e6fb41811757d9ca2dbdd0d4c41e8d7ffc4232572774d24775bc4e087fb05fab5b6692fd360c2d70c7bf40708f1cd1bb028df917d60c5cb7f2fc0 SHA512 f4145b730468543652e21348a01e36d6cd6f8726a9ea4c641f1e0e4489b8c68c41bea034ebd41dc3edfde8e56fb5604dc100efef5a95ac2f7fab78d7113bcde0
-DIST chromium-bin-104.0.5112.101-1-x11-i686.tar.xz 84087564 BLAKE2B d75caa75e66bcf194b1673a3783ca4a24b3a99e34b33e7b378006f0492be717316f930175652bc5a5332e2ae74ec4601ab95f4a26ddce87b2e00303cdca335df SHA512 9d98fcf0eadc847272f668a540e7d6e93b46ccfa99aa31dcfeac83c92f6db58c9884c6ac31848432814c3804fd0a359d1873c28065bbf0c46f73737271cfef07
-DIST chromium-bin-104.0.5112.101-1-x11-x86_64.tar.xz 83261500 BLAKE2B 32a3a1c5f4c0e257a5a95b1b41b3ef891f0986b832b8d8a4f43c6c68af152980006915c37994549548fb0d33d873f088cfb0adacf92ba1404f70ddd5d6e06d6c SHA512 298bac1a25d10463bc82197aa61253b7be90e6ea2867e4b51ed3727d781609a9f13af8edd4917351a558b59647497759500b3e86dea43ff6aff9b00a3be77c76
+DIST chromium-bin-105.0.5195.125-1-common-aarch64.tar.xz 3194260 BLAKE2B efb112b7a0994aa6443ae7a5278452995b47935b274a12a99b1997772204b93e24dc832b2ba8ce6d1185b07e658cbbf7708d6454a00730f965fbf6a21d851dd0 SHA512 fc24383463d23b4ef2ea21f7bb0dd4f55e948a089c684f81b8065829ee694edc8faee7066440a6b4c8a683c045227d61121cfe60508b54430777082ef93a8335
+DIST chromium-bin-105.0.5195.125-1-common-i686.tar.xz 3201128 BLAKE2B a1c9c8eda92eeb5bf226f981467a6ce6d312f356a87ba6f8c25ed5fd86ee172cf9d738bb168015f136bc9a13ab006e243dfcd98b200b1f52fc762172a15a47bc SHA512 78e633dbf28cc99b4e6000579018506cd236a68cfb2d0207a51e35d3dba7498812780ea6a7abd9a64541461cc7cf7d120d2f72cb4f78e1d4f5676a71ed4e6f3b
+DIST chromium-bin-105.0.5195.125-1-common-x86_64.tar.xz 3259792 BLAKE2B c160c7fd780c52f6bddfcc0e60e230b212dea56ad0a3e9ea2f93ca66874e77d59775f33be2b2c9dd00d74c32c5bdae31adc063c305c2c43f90a3900dbce4e4e5 SHA512 1892118948d0caca2ff93edec66730956702aad23a116032664ccea3d66b516b685622514fc3707b435898678e9c250a2bce16c95630f7eb582ed53e852f2c32
+DIST chromium-bin-105.0.5195.125-1-common.tar.xz 4466452 BLAKE2B 679301e1a7328b31e39dcdac512f7a488efb4957f46f22748bbfa0644861719a52e5381e835f20f03217ee24b46d61c9273c48d901040718d69c39befbd05539 SHA512 8884635db7be53a3307dba3ec65a8fd129f0412c982513787e072c9a979c03154f528555b203c785d36ccacdd63369287e1f8125838fd779be20a9cb9ce99abe
+DIST chromium-bin-105.0.5195.125-1-l10n.tar.xz 5119916 BLAKE2B 966e99f04dc7c79367002c00a4a5365bca0ecbea6eec22b27a22f17c910f8e11079099be37f9ee54ba7d730a68e7f209d565cab0869d7881a1672b4a2e04491c SHA512 be3cff579fd8c7f6fc856dee7c012327925e7d7f67e31e5d18ea5304947669e03ce0b05090c1acc50eb09b86956acc97bcf75ced79d829c1a9c5f08e6882931a
+DIST chromium-bin-105.0.5195.125-1-wayland-aarch64.tar.xz 82688520 BLAKE2B c398000cfa02841ec0a2b3f479ee7ccd64e6dd66a42002413fc9fb7117d4ab819e9df3a61f73c4ca649b53f6d39a42e3905701236da490cdfde3afd810fab700 SHA512 38d5b4821b822206e895fea659bd209c7b4dd89918133705612dc5be79480872c57565b04b8e7a3f36ab9582722162b0aa80d7153ef6b89ea2a0f75fac95e916
+DIST chromium-bin-105.0.5195.125-1-wayland-i686.tar.xz 85020156 BLAKE2B 12cef0a47d6b2414411f49b2ffcb8f56f52302c00f8d96380aa9a2699878736373ff78829194de13ff6c4ed22be8e9170b7f548c6a5dc5326a1a5377fd89b4cd SHA512 d52be0db399b741c1cd5586eb0f70c3aa1a5bc9df7dd88e7db7ea361a4778af18a7baa6f76c219d96c64e6d6deb707a3f191d9c57aaee5e12fe70574c38517b4
+DIST chromium-bin-105.0.5195.125-1-wayland-x86_64.tar.xz 84310036 BLAKE2B e1f2834ea70a62e48c33a019e0f284a546991c5024550a7c5fbf790ddce018ce4badff484213b6ff2b23c161f8041125821ecb4f80892f0cbc9216ddbc0b64be SHA512 82ad92bda5b40af4e832f8035ace56cabfa4b042f6b75ae0df4b60ab8e739c044ea77fc81ed1346413ff7bdc94b3356c03414043eef3c2653332dc5e5b6e0acb
+DIST chromium-bin-105.0.5195.125-1-x11-aarch64.tar.xz 82483584 BLAKE2B 1cafd3ce23bdf59d1bbd2771efd4d637ce5194e03b43bc66b2570db2ef2e59d9c063186363395b8c930136bcfc90d3047b26b68e0eb6977fdd2f87dce9ce09b5 SHA512 ac655790242cf6b465bf99706094a8421772154c58cd35e275d26c86b807b4fffc5f4eb4dea0d7c2bee7d6e26654f5b4c79caf5f10a81e7679af6759726327c5
+DIST chromium-bin-105.0.5195.125-1-x11-i686.tar.xz 84796860 BLAKE2B 0043e98ba4a1e9b0f019275d3d66c90eb652cdd223584dea5939b160bf108c7c44341a228c8a487f77637545907933d41d8d92995a968229c4b7c6eaf76cebd0 SHA512 2090e4f044d1c23aac5ccff4e947e153b4c614d1f0ffd0329fd9d83e5a964c31f3c9646f3a939754474e7137e327f10d785bbe8ada7e6f2dfe8de1437a0a973f
+DIST chromium-bin-105.0.5195.125-1-x11-x86_64.tar.xz 84129140 BLAKE2B 26cf5879c932b8d6c123ec500d25febc86e4e2ef3e84224116d3f99b3c70016f8621bea09df64525695ce4eaaf393612c3e02a32110d8be76536ccda0641a10f SHA512 0b0d45bd3a3801c47e1c207ef321ba61e5b0cc6f28f812b1f5544d5943209e35a7ebcf15feaded144946fff9d0931926f66ffee61c8783b7e6f1b7e5b9fb2128
diff --git a/www-client/chromium-bin/chromium-bin-104.0.5112.101-r1.ebuild b/www-client/chromium-bin/chromium-bin-105.0.5195.125.ebuild
similarity index 99%
rename from www-client/chromium-bin/chromium-bin-104.0.5112.101-r1.ebuild
rename to www-client/chromium-bin/chromium-bin-105.0.5195.125.ebuild
index df4e400c36a9..9488132711a2 100644
--- a/www-client/chromium-bin/chromium-bin-104.0.5112.101-r1.ebuild
+++ b/www-client/chromium-bin/chromium-bin-105.0.5195.125.ebuild
@@ -48,7 +48,10 @@ RDEPEND="
 	dev-libs/nspr
 	>=dev-libs/nss-3.26
 	media-libs/alsa-lib
-	|| ( media-libs/flac:0/0 media-libs/flac-compat:8.3.0 )
+	|| (
+		media-libs/flac:0/0
+		media-libs/flac-compat:8.3.0
+	)
 	media-libs/fontconfig
 	>=media-libs/freetype-2.11.0-r1
 	media-libs/libjpeg-turbo
diff --git a/www-client/chromium/Manifest b/www-client/chromium/Manifest
index ee4490efa464..b33e830fa32f 100644
--- a/www-client/chromium/Manifest
+++ b/www-client/chromium/Manifest
@@ -1,8 +1,6 @@
-DIST chromium-104-patchset-2.tar.xz 6168 BLAKE2B 57e9f2090315d2fa9baa0d285e40fd7809b35a897fba7684672d04850c2b59ea1bc11383654a8178ece2d4baa9bb2e248898d2435618b9e8a995461d6e92ac53 SHA512 f23effc604051c18acfad3bfb974efd4aa675b84135f4eb95e0dd97261dcc9099f283a8015854c375499370f4155bb9fad51fca59555ec2f41f2d7ab90be7208
-DIST chromium-104.0.5112.101.tar.xz 1510110428 BLAKE2B 33b5ac2339d88e03096f3ca8cba9b388eeea2f120ab137a38d3e6d0c03315136cfb9f01a4c7b52b5eb7e78921d00a502dfcab3c0cf167074fbc197490fd3866b SHA512 a955cee81e983212c27a972db8e4857000e626b5e85ce07db71b7f19a4f1a10b675fb4d3df055265681670b4166dc96a3b597a00cf60b837016be9c81e6972b1
 DIST chromium-105-patchset-1.tar.xz 9116 BLAKE2B 7728b83899e19b3c0ba4a69c660b68af7ea549a0144c15ab9fa972001441d9d145de20b7a1bafabf2b0667335b7436f6374c9934d4433160805c31bc743e867e SHA512 8f97aecf7b24c3f676bc74b88382dc4a5d967a090a4b4890971cb342973b0a20fd563c658b1c3fdaf036e830317d97470143ab78b28f336b315d491217368a81
 DIST chromium-105.0.5195.102.tar.xz 1597977496 BLAKE2B dada382717f8d48c87f586ba190aa4b4dff32929d70efe54dc091e42087b6f1744d3fdc16d9f601674fda28f5146808f0de419dec95f5ebfcd2b61fb62db0ef6 SHA512 a5b569e1a019863cd27e03b7e834ecef284e170a41f8ff29b9d22101a45474b5157720e52e7f7438a217b8b00707bd3c414c83257c18f2d9f4d5ee46e2e06e9e
-DIST chromium-105.0.5195.52.tar.xz 1597749968 BLAKE2B 642a5601157ed4b05aa3446755d06fb304fe3c577ef58e17a92969dd9c8764aeb21fcfe35fe58f9665a85e3b7350f89ed7e1e68173d8995c29dc3f72fde32139 SHA512 a2ba0d5d988cd6e12c92d3706b74c70502cd1783cccdea26a1a452b0f05cc1e7dca81d6c22af3224343fea640b3281d96cc55873d774e004700aaa511f2dc232
+DIST chromium-105.0.5195.125.tar.xz 1597584952 BLAKE2B 690c10de16bbb92b6b69950c378f16a469b29176ad57de6d1f0827358c1443c25c273b962c434bcca38f1868e4e762115b61ee292ada2d5be12e7d19fbbac0af SHA512 a8aaa24d779b69ee8173ed45006c9e7d6ada57de465cfa0a15720f3cd72d271f0560cedf8ae4aa0fde45ae6b750bb4577dcb23349d9cb49a036a7f0a4a5d68ac
 DIST chromium-106-patchset-1.tar.xz 5660 BLAKE2B b1003aa49aed07ac097607e67cb48bab11b8790c6b4c8f241bb8677baff372771b76076195713164ee71c81b8211fc400e52598b63a3cc03ff7a32ef5d1b0226 SHA512 7eb2818a8449cb2c90198e2d7f228adaed4c7c50de1833ebf59ff895512bd033d3a55398349f1ac797661d1d0b3c201b74b54f4b1d4e375e280795a4a20ba5aa
 DIST chromium-106.0.5249.12.tar.xz 1610862824 BLAKE2B 35d0d8af2fc3d71560b0913560a1fa18cd1c72f173d1dc89f0ac76e6ef5e34c11dda6a619d00805158d8e051f4946d2d1b81fe2cf1deffbeb039f8e4aeff9ba7 SHA512 4727331dba888cc6d1f2e8faa85867c132bbf359e6718e8eee12735396e60b6817421f9a3c1baf97b926ea6f2e3cd02322379754416da0c5228fd98b7d6e006c
 DIST chromium-profiler-0.1.tar 269066240 BLAKE2B 6897387b63ff9a724b67f2e8799fe803dc75da376da809e752d19d6f5cf98bd84ac24161d07ac4a967577279e9ad5a8a46f0825332a7ee933a27693d6dc95611 SHA512 3fb6132599d28455d1b5c04d856ea7623e49b0b0b96f021c31d0952c4ba57d69d0a1cae6f0b91470a235221c89cc0d3bb38303ff02594ed0739712e6e2f8dbcc
diff --git a/www-client/chromium/chromium-104.0.5112.101.ebuild b/www-client/chromium/chromium-104.0.5112.101.ebuild
deleted file mode 100644
index 200c78ad9df4..000000000000
--- a/www-client/chromium/chromium-104.0.5112.101.ebuild
+++ /dev/null
@@ -1,1194 +0,0 @@
-# Copyright 2009-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="xml(+)"
-LLVM_MAX_SLOT=14
-
-CHROMIUM_LANGS="af am ar bg bn ca cs da de el en-GB es es-419 et fa fi fil fr gu he
-	hi hr hu id it ja kn ko lt lv ml mr ms nb nl pl pt-BR pt-PT ro ru sk sl sr
-	sv sw ta te th tr uk ur vi zh-CN zh-TW"
-
-VIRTUALX_REQUIRED="pgo"
-
-inherit check-reqs chromium-2 desktop flag-o-matic llvm ninja-utils pax-utils python-any-r1 readme.gentoo-r1 toolchain-funcs virtualx xdg-utils
-
-DESCRIPTION="Open-source version of Google Chrome web browser"
-HOMEPAGE="https://chromium.org/"
-PATCHSET="2"
-PATCHSET_NAME="chromium-$(ver_cut 1)-patchset-${PATCHSET}"
-SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}.tar.xz
-	https://github.com/stha09/chromium-patches/releases/download/${PATCHSET_NAME}/${PATCHSET_NAME}.tar.xz
-	pgo? ( https://blackhole.sk/~kabel/src/chromium-profiler-0.1.tar )"
-
-LICENSE="BSD"
-SLOT="0/stable"
-KEYWORDS="amd64 arm64"
-IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
-REQUIRED_USE="
-	component-build? ( !suid !libcxx )
-	screencast? ( wayland )
-	!headless? ( || ( X wayland ) )
-	pgo? ( X !wayland )
-"
-
-COMMON_X_DEPEND="
-	x11-libs/libXcomposite:=
-	x11-libs/libXcursor:=
-	x11-libs/libXdamage:=
-	x11-libs/libXfixes:=
-	>=x11-libs/libXi-1.6.0:=
-	x11-libs/libXrandr:=
-	x11-libs/libXrender:=
-	x11-libs/libXtst:=
-	x11-libs/libxshmfence:=
-"
-
-COMMON_SNAPSHOT_DEPEND="
-	system-icu? ( >=dev-libs/icu-71.1:= )
-	>=dev-libs/libxml2-2.9.4-r3:=[icu]
-	dev-libs/nspr:=
-	>=dev-libs/nss-3.26:=
-	!libcxx? ( >=dev-libs/re2-0.2019.08.01:= )
-	dev-libs/libxslt:=
-	media-libs/fontconfig:=
-	>=media-libs/freetype-2.11.0-r1:=
-	system-harfbuzz? ( >=media-libs/harfbuzz-3:0=[icu(-)] )
-	media-libs/libjpeg-turbo:=
-	system-png? ( media-libs/libpng:=[-apng] )
-	>=media-libs/libwebp-0.4.0:=
-	media-libs/mesa:=[gbm(+)]
-	>=media-libs/openh264-1.6.0:=
-	sys-libs/zlib:=
-	x11-libs/libdrm:=
-	!headless? (
-		dev-libs/glib:2
-		>=media-libs/alsa-lib-1.0.19:=
-		pulseaudio? ( media-sound/pulseaudio:= )
-		sys-apps/pciutils:=
-		kerberos? ( virtual/krb5 )
-		vaapi? ( >=x11-libs/libva-2.7:=[X?,wayland?] )
-		X? (
-			x11-libs/libX11:=
-			x11-libs/libXext:=
-			x11-libs/libxcb:=
-		)
-		x11-libs/libxkbcommon:=
-		wayland? (
-			dev-libs/wayland:=
-			screencast? ( media-video/pipewire:= )
-		)
-	)
-"
-
-COMMON_DEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	app-arch/bzip2:=
-	dev-libs/expat:=
-	system-ffmpeg? (
-		>=media-video/ffmpeg-4.3:=
-		|| (
-			media-video/ffmpeg[-samba]
-			>=net-fs/samba-4.5.10-r1[-debug(-)]
-		)
-		>=media-libs/opus-1.3.1:=
-	)
-	net-misc/curl[ssl]
-	sys-apps/dbus:=
-	media-libs/flac:=
-	sys-libs/zlib:=[minizip]
-	!headless? (
-		X? ( ${COMMON_X_DEPEND} )
-		>=app-accessibility/at-spi2-atk-2.26:2
-		>=app-accessibility/at-spi2-core-2.26:2
-		>=dev-libs/atk-2.26
-		media-libs/mesa:=[X?,wayland?]
-		cups? ( >=net-print/cups-1.3.11:= )
-		virtual/udev
-		x11-libs/cairo:=
-		x11-libs/gdk-pixbuf:2
-		x11-libs/pango:=
-	)
-"
-RDEPEND="${COMMON_DEPEND}
-	!headless? (
-		|| (
-			x11-libs/gtk+:3[X?,wayland?]
-			gui-libs/gtk:4[X?,wayland?]
-		)
-		x11-misc/xdg-utils
-	)
-	virtual/ttf-fonts
-	selinux? ( sec-policy/selinux-chromium )
-"
-DEPEND="${COMMON_DEPEND}
-	!headless? (
-		gtk4? ( gui-libs/gtk:4[X?,wayland?] )
-		!gtk4? ( x11-libs/gtk+:3[X?,wayland?] )
-	)
-"
-
-depend_clang_llvm_version() {
-	echo "sys-devel/clang:$1"
-	echo "sys-devel/llvm:$1"
-	echo "=sys-devel/lld-$1*"
-}
-
-depend_clang_llvm_versions() {
-	local _v
-	if [[ $# -gt 1 ]]; then
-		echo "|| ("
-		for _v in "$@"; do
-			echo "("
-			depend_clang_llvm_version "${_v}"
-			echo ")"
-		done
-		echo ")"
-	elif [[ $# -eq 1 ]]; then
-		depend_clang_llvm_version "$1"
-	fi
-}
-
-BDEPEND="
-	${COMMON_SNAPSHOT_DEPEND}
-	${PYTHON_DEPS}
-	$(python_gen_any_dep '
-		dev-python/setuptools[${PYTHON_USEDEP}]
-	')
-	>=app-arch/gzip-1.7
-	libcxx? ( >=sys-devel/clang-12 )
-	lto? ( $(depend_clang_llvm_versions 13 14 15) )
-	pgo? (
-		>=dev-python/selenium-3.141.0
-		>=dev-util/web_page_replay_go-20220314
-		$(depend_clang_llvm_versions 13 14 15)
-	)
-	dev-lang/perl
-	>=dev-util/gn-0.1807
-	>=dev-util/gperf-3.0.3
-	>=dev-util/ninja-1.7.2
-	dev-vcs/git
-	>=net-libs/nodejs-7.6.0[inspector]
-	>=sys-devel/bison-2.4.3
-	sys-devel/flex
-	virtual/pkgconfig
-	js-type-check? ( virtual/jre )
-"
-
-# These are intended for ebuild maintainer use to force clang if GCC is broken.
-: ${CHROMIUM_FORCE_CLANG=no}
-
-if [[ ${CHROMIUM_FORCE_CLANG} == yes ]]; then
-	BDEPEND+=" >=sys-devel/clang-12"
-fi
-
-if ! has chromium_pkg_die ${EBUILD_DEATH_HOOKS}; then
-	EBUILD_DEATH_HOOKS+=" chromium_pkg_die";
-fi
-
-DISABLE_AUTOFORMATTING="yes"
-DOC_CONTENTS="
-Some web pages may require additional fonts to display properly.
-Try installing some of the following packages if some characters
-are not displayed properly:
-- media-fonts/arphicfonts
-- media-fonts/droid
-- media-fonts/ipamonafont
-- media-fonts/noto
-- media-fonts/ja-ipafonts
-- media-fonts/takao-fonts
-- media-fonts/wqy-microhei
-- media-fonts/wqy-zenhei
-
-To fix broken icons on the Downloads page, you should install an icon
-theme that covers the appropriate MIME types, and configure this as your
-GTK+ icon theme.
-
-For native file dialogs in KDE, install kde-apps/kdialog.
-
-To make password storage work with your desktop environment you may
-have install one of the supported credentials management applications:
-- app-crypt/libsecret (GNOME)
-- kde-frameworks/kwallet (KDE)
-If you have one of above packages installed, but don't want to use
-them in Chromium, then add --password-store=basic to CHROMIUM_FLAGS
-in /etc/chromium/default.
-"
-
-python_check_deps() {
-	python_has_version "dev-python/setuptools[${PYTHON_USEDEP}]"
-}
-
-needs_clang() {
-	[[ ${CHROMIUM_FORCE_CLANG} == yes ]] || use libcxx || use lto || use pgo
-}
-
-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 lto || use pgo ) && ! 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
-
-	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
-}
-
-pre_build_checks() {
-	if [[ ${MERGE_TYPE} != binary ]]; then
-		[[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && ( use lto || use pgo ) && llvm_pkg_setup
-
-		local -x CPP="$(tc-getCXX) -E"
-		if tc-is-gcc && ! ver_test "$(gcc-version)" -ge 9.2; then
-			die "At least gcc 9.2 is required"
-		fi
-		if use pgo && tc-is-cross-compiler; then
-			die "The pgo USE flag cannot be used when cross-compiling"
-		fi
-		if needs_clang || tc-is-clang; then
-			tc-is-cross-compiler && CPP=${CBUILD}-clang++ || CPP=${CHOST}-clang++
-			CPP+=" -E"
-			if ! ver_test "$(clang-major-version)" -ge 12; then
-				die "At least clang 12 is required"
-			fi
-		fi
-		if [[ ${EBUILD_PHASE_FUNC} == pkg_setup ]] && use js-type-check; then
-			"${BROOT}"/usr/bin/java -version 2>1 > /dev/null || die "Java VM not setup correctly"
-		fi
-	fi
-
-	# Check build requirements, bug #541816 and bug #471810 .
-	CHECKREQS_MEMORY="4G"
-	CHECKREQS_DISK_BUILD="12G"
-	tc-is-cross-compiler && CHECKREQS_DISK_BUILD="13G"
-	if use lto || use pgo; then
-		CHECKREQS_MEMORY="9G"
-		CHECKREQS_DISK_BUILD="12G"
-		tc-is-cross-compiler && CHECKREQS_DISK_BUILD="15G"
-		use pgo && CHECKREQS_DISK_BUILD="19G"
-	fi
-	if is-flagq '-g?(gdb)?([1-9])'; then
-		if use custom-cflags || use component-build; then
-			CHECKREQS_DISK_BUILD="25G"
-		fi
-		if ! use component-build; then
-			CHECKREQS_MEMORY="16G"
-		fi
-	fi
-	check-reqs_${EBUILD_PHASE_FUNC}
-}
-
-pkg_pretend() {
-	pre_build_checks
-
-	if use headless; then
-		local headless_unused_flags=("cups" "kerberos" "pulseaudio" "vaapi" "wayland")
-		for myiuse in ${headless_unused_flags[@]}; do
-			use ${myiuse} && ewarn "Ignoring USE=${myiuse} since USE=headless is set."
-		done
-	fi
-}
-
-pkg_setup() {
-	pre_build_checks
-
-	chromium_suid_sandbox_check_kernel_config
-
-	# nvidia-drivers does not work correctly with Wayland due to unsupported EGLStreams
-	if use wayland && ! use headless && has_version "x11-drivers/nvidia-drivers"; then
-		ewarn "Proprietary nVidia driver does not work with Wayland. You can disable"
-		ewarn "Wayland by setting DISABLE_OZONE_PLATFORM=true in /etc/chromium/default."
-	fi
-}
-
-src_prepare() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local PATCHES=(
-		"${WORKDIR}/patches"
-		"${FILESDIR}/chromium-93-InkDropHost-crash.patch"
-		"${FILESDIR}/chromium-98-EnumTable-crash.patch"
-		"${FILESDIR}/chromium-98-gtk4-build.patch"
-		"${FILESDIR}/chromium-104-tflite-system-zlib.patch"
-		"${FILESDIR}/chromium-104-swiftshader-no-wayland.patch"
-		"${FILESDIR}/chromium-104-v8-neon.patch"
-		"${FILESDIR}/chromium-use-oauth2-client-switches-as-default.patch"
-		"${FILESDIR}/chromium-shim_headers.patch"
-		"${FILESDIR}/chromium-cross-compile.patch"
-	)
-
-	default
-
-	mkdir -p third_party/node/linux/node-linux-x64/bin || die
-	ln -s "${EPREFIX}"/usr/bin/node third_party/node/linux/node-linux-x64/bin/node || die
-
-	# adjust python interpreter version
-	sed -i -e "s|\(^script_executable = \).*|\1\"${EPYTHON}\"|g" .gn || die
-
-	local keeplibs=(
-		base/third_party/cityhash
-		base/third_party/double_conversion
-		base/third_party/dynamic_annotations
-		base/third_party/icu
-		base/third_party/nspr
-		base/third_party/superfasthash
-		base/third_party/symbolize
-		base/third_party/valgrind
-		base/third_party/xdg_mime
-		base/third_party/xdg_user_dirs
-		buildtools/third_party/libc++
-		buildtools/third_party/libc++abi
-		chrome/third_party/mozilla_security_manager
-		courgette/third_party
-		net/third_party/mozilla_security_manager
-		net/third_party/nss
-		net/third_party/quic
-		net/third_party/uri_template
-		third_party/abseil-cpp
-		third_party/angle
-		third_party/angle/src/common/third_party/base
-		third_party/angle/src/common/third_party/smhasher
-		third_party/angle/src/common/third_party/xxhash
-		third_party/angle/src/third_party/libXNVCtrl
-		third_party/angle/src/third_party/trace_event
-		third_party/angle/src/third_party/volk
-		third_party/apple_apsl
-		third_party/axe-core
-		third_party/blink
-		third_party/boringssl
-		third_party/boringssl/src/third_party/fiat
-		third_party/breakpad
-		third_party/breakpad/breakpad/src/third_party/curl
-		third_party/brotli
-		third_party/catapult
-		third_party/catapult/common/py_vulcanize/third_party/rcssmin
-		third_party/catapult/common/py_vulcanize/third_party/rjsmin
-		third_party/catapult/third_party/beautifulsoup4-4.9.3
-		third_party/catapult/third_party/html5lib-1.1
-		third_party/catapult/third_party/polymer
-		third_party/catapult/third_party/six
-		third_party/catapult/tracing/third_party/d3
-		third_party/catapult/tracing/third_party/gl-matrix
-		third_party/catapult/tracing/third_party/jpeg-js
-		third_party/catapult/tracing/third_party/jszip
-		third_party/catapult/tracing/third_party/mannwhitneyu
-		third_party/catapult/tracing/third_party/oboe
-		third_party/catapult/tracing/third_party/pako
-		third_party/ced
-		third_party/cld_3
-		third_party/closure_compiler
-		third_party/cpuinfo
-		third_party/crashpad
-		third_party/crashpad/crashpad/third_party/lss
-		third_party/crashpad/crashpad/third_party/zlib
-		third_party/crc32c
-		third_party/cros_system_api
-		third_party/dav1d
-		third_party/dawn
-		third_party/dawn/third_party/gn/webgpu-cts
-		third_party/dawn/third_party/khronos
-		third_party/depot_tools
-		third_party/devscripts
-		third_party/devtools-frontend
-		third_party/devtools-frontend/src/front_end/third_party/acorn
-		third_party/devtools-frontend/src/front_end/third_party/additional_readme_paths.json
-		third_party/devtools-frontend/src/front_end/third_party/axe-core
-		third_party/devtools-frontend/src/front_end/third_party/chromium
-		third_party/devtools-frontend/src/front_end/third_party/codemirror
-		third_party/devtools-frontend/src/front_end/third_party/diff
-		third_party/devtools-frontend/src/front_end/third_party/i18n
-		third_party/devtools-frontend/src/front_end/third_party/intl-messageformat
-		third_party/devtools-frontend/src/front_end/third_party/lighthouse
-		third_party/devtools-frontend/src/front_end/third_party/lit-html
-		third_party/devtools-frontend/src/front_end/third_party/lodash-isequal
-		third_party/devtools-frontend/src/front_end/third_party/marked
-		third_party/devtools-frontend/src/front_end/third_party/puppeteer
-		third_party/devtools-frontend/src/front_end/third_party/wasmparser
-		third_party/devtools-frontend/src/test/unittests/front_end/third_party/i18n
-		third_party/devtools-frontend/src/third_party
-		third_party/distributed_point_functions
-		third_party/dom_distiller_js
-		third_party/eigen3
-		third_party/emoji-segmenter
-		third_party/farmhash
-		third_party/fdlibm
-		third_party/fft2d
-		third_party/flatbuffers
-		third_party/fp16
-		third_party/freetype
-		third_party/fusejs
-		third_party/fxdiv
-		third_party/highway
-		third_party/libgifcodec
-		third_party/liburlpattern
-		third_party/libzip
-		third_party/gemmlowp
-		third_party/google_input_tools
-		third_party/google_input_tools/third_party/closure_library
-		third_party/google_input_tools/third_party/closure_library/third_party/closure
-		third_party/googletest
-		third_party/hunspell
-		third_party/iccjpeg
-		third_party/inspector_protocol
-		third_party/jinja2
-		third_party/jsoncpp
-		third_party/jstemplate
-		third_party/khronos
-		third_party/leveldatabase
-		third_party/libaddressinput
-		third_party/libaom
-		third_party/libaom/source/libaom/third_party/fastfeat
-		third_party/libaom/source/libaom/third_party/vector
-		third_party/libaom/source/libaom/third_party/x86inc
-		third_party/libavif
-		third_party/libgav1
-		third_party/libjingle
-		third_party/libjxl
-		third_party/libphonenumber
-		third_party/libsecret
-		third_party/libsrtp
-		third_party/libsync
-		third_party/libudev
-		third_party/libva_protected_content
-		third_party/libvpx
-		third_party/libvpx/source/libvpx/third_party/x86inc
-		third_party/libwebm
-		third_party/libx11
-		third_party/libxcb-keysyms
-		third_party/libxml/chromium
-		third_party/libyuv
-		third_party/llvm
-		third_party/lottie
-		third_party/lss
-		third_party/lzma_sdk
-		third_party/mako
-		third_party/maldoca
-		third_party/maldoca/src/third_party/tensorflow_protos
-		third_party/maldoca/src/third_party/zlibwrapper
-		third_party/markupsafe
-		third_party/mesa
-		third_party/metrics_proto
-		third_party/minigbm
-		third_party/modp_b64
-		third_party/nasm
-		third_party/nearby
-		third_party/neon_2_sse
-		third_party/node
-		third_party/node/node_modules/polymer-bundler/lib/third_party/UglifyJS2
-		third_party/one_euro_filter
-		third_party/openscreen
-		third_party/openscreen/src/third_party/mozilla
-		third_party/openscreen/src/third_party/tinycbor/src/src
-		third_party/ots
-		third_party/pdfium
-		third_party/pdfium/third_party/agg23
-		third_party/pdfium/third_party/base
-		third_party/pdfium/third_party/bigint
-		third_party/pdfium/third_party/freetype
-		third_party/pdfium/third_party/lcms
-		third_party/pdfium/third_party/libopenjpeg20
-		third_party/pdfium/third_party/libpng16
-		third_party/pdfium/third_party/libtiff
-		third_party/pdfium/third_party/skia_shared
-		third_party/perfetto
-		third_party/perfetto/protos/third_party/chromium
-		third_party/pffft
-		third_party/ply
-		third_party/polymer
-		third_party/private-join-and-compute
-		third_party/private_membership
-		third_party/protobuf
-		third_party/protobuf/third_party/six
-		third_party/pthreadpool
-		third_party/pyjson5
-		third_party/qcms
-		third_party/rnnoise
-		third_party/s2cellid
-		third_party/securemessage
-		third_party/shell-encryption
-		third_party/simplejson
-		third_party/skia
-		third_party/skia/include/third_party/skcms
-		third_party/skia/include/third_party/vulkan
-		third_party/skia/third_party/skcms
-		third_party/skia/third_party/vulkan
-		third_party/smhasher
-		third_party/snappy
-		third_party/sqlite
-		third_party/swiftshader
-		third_party/swiftshader/third_party/astc-encoder
-		third_party/swiftshader/third_party/llvm-subzero
-		third_party/swiftshader/third_party/marl
-		third_party/swiftshader/third_party/subzero
-		third_party/swiftshader/third_party/SPIRV-Headers/include/spirv
-		third_party/swiftshader/third_party/SPIRV-Tools
-		third_party/tensorflow-text
-		third_party/tflite
-		third_party/tflite/src/third_party/eigen3
-		third_party/tflite/src/third_party/fft2d
-		third_party/ruy
-		third_party/six
-		third_party/ukey2
-		third_party/unrar
-		third_party/utf
-		third_party/vulkan
-		third_party/web-animations-js
-		third_party/webdriver
-		third_party/webgpu-cts
-		third_party/webrtc
-		third_party/webrtc/common_audio/third_party/ooura
-		third_party/webrtc/common_audio/third_party/spl_sqrt_floor
-		third_party/webrtc/modules/third_party/fft
-		third_party/webrtc/modules/third_party/g711
-		third_party/webrtc/modules/third_party/g722
-		third_party/webrtc/rtc_base/third_party/base64
-		third_party/webrtc/rtc_base/third_party/sigslot
-		third_party/widevine
-		third_party/woff2
-		third_party/wuffs
-		third_party/x11proto
-		third_party/xcbproto
-		third_party/xnnpack
-		third_party/zxcvbn-cpp
-		third_party/zlib/google
-		url/third_party/mozilla
-		v8/src/third_party/siphash
-		v8/src/third_party/valgrind
-		v8/src/third_party/utf8-decoder
-		v8/third_party/inspector_protocol
-		v8/third_party/v8
-
-		# gyp -> gn leftovers
-		base/third_party/libevent
-		third_party/speech-dispatcher
-		third_party/usb_ids
-		third_party/xdg-utils
-	)
-	if ! use system-ffmpeg; then
-		keeplibs+=( third_party/ffmpeg third_party/opus )
-	fi
-	if ! use system-icu; then
-		keeplibs+=( third_party/icu )
-	fi
-	if ! use system-png; then
-		keeplibs+=( third_party/libpng )
-	fi
-	if use libcxx; then
-		keeplibs+=( third_party/re2 )
-	fi
-	if use system-harfbuzz; then
-		keeplibs+=( third_party/harfbuzz-ng/utils )
-	else
-		keeplibs+=( third_party/harfbuzz-ng )
-	fi
-	if use wayland && ! use headless ; then
-		keeplibs+=( third_party/wayland )
-	fi
-	if use arm64 || use ppc64 ; then
-		keeplibs+=( third_party/swiftshader/third_party/llvm-10.0 )
-	fi
-	# we need to generate ppc64 stuff because upstream does not ship it yet
-	# it has to be done before unbundling.
-	if use ppc64; then
-		pushd third_party/libvpx >/dev/null || die
-		mkdir -p source/config/linux/ppc64 || die
-		# requires git and clang, bug #832803
-		sed -i -e "s|^update_readme||g; s|clang-format|${EPREFIX}/bin/true|g" \
-			generate_gni.sh || die
-		./generate_gni.sh || die
-		popd >/dev/null || die
-
-		pushd third_party/ffmpeg >/dev/null || die
-		cp libavcodec/ppc/h264dsp.c libavcodec/ppc/h264dsp_ppc.c || die
-		cp libavcodec/ppc/h264qpel.c libavcodec/ppc/h264qpel_ppc.c || die
-		popd >/dev/null || die
-	fi
-
-	# Remove most bundled libraries. Some are still needed.
-	build/linux/unbundle/remove_bundled_libraries.py "${keeplibs[@]}" --do-remove || die
-
-	if use js-type-check; then
-		ln -s "${EPREFIX}"/usr/bin/java third_party/jdk/current/bin/java || die
-	fi
-
-	# bundled eu-strip is for amd64 only and we don't want to pre-stripped binaries
-	mkdir -p buildtools/third_party/eu-strip/bin || die
-	ln -s "${EPREFIX}"/bin/true buildtools/third_party/eu-strip/bin/eu-strip || die
-}
-
-chromium_configure() {
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	local myconf_gn=""
-
-	# Make sure the build system will use the right tools, bug #340795.
-	tc-export AR CC CXX NM
-
-	if needs_clang && ! tc-is-clang; then
-		# Force clang since gcc is either broken or build is using libcxx.
-		if tc-is-cross-compiler; then
-			CC="${CBUILD}-clang -target ${CHOST} --sysroot ${ESYSROOT}"
-			CXX="${CBUILD}-clang++ -target ${CHOST} --sysroot ${ESYSROOT}"
-			BUILD_CC=${CBUILD}-clang
-			BUILD_CXX=${CBUILD}-clang++
-		else
-			CC=${CHOST}-clang
-			CXX=${CHOST}-clang++
-		fi
-		strip-unsupported-flags
-	fi
-
-	if tc-is-clang; then
-		myconf_gn+=" is_clang=true clang_use_chrome_plugins=false"
-	else
-		myconf_gn+=" is_clang=false"
-	fi
-
-	# Force lld for lto or pgo builds only, otherwise disable, bug 641556
-	if use lto || use pgo; then
-		myconf_gn+=" use_lld=true"
-	else
-		myconf_gn+=" use_lld=false"
-	fi
-
-	if use lto || use pgo; then
-		AR=llvm-ar
-		NM=llvm-nm
-		if tc-is-cross-compiler; then
-			BUILD_AR=llvm-ar
-			BUILD_NM=llvm-nm
-		fi
-	fi
-
-	# Define a custom toolchain for GN
-	myconf_gn+=" custom_toolchain=\"//build/toolchain/linux/unbundle:default\""
-
-	if tc-is-cross-compiler; then
-		tc-export BUILD_{AR,CC,CXX,NM}
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" v8_snapshot_toolchain=\"//build/toolchain/linux/unbundle:host\""
-		myconf_gn+=" pkg_config=\"$(tc-getPKG_CONFIG)\""
-		myconf_gn+=" host_pkg_config=\"$(tc-getBUILD_PKG_CONFIG)\""
-
-		# setup cups-config, build system only uses --libs option
-		if use cups; then
-			mkdir "${T}/cups-config" || die
-			cp "${ESYSROOT}/usr/bin/${CHOST}-cups-config" "${T}/cups-config/cups-config" || die
-			export PATH="${PATH}:${T}/cups-config"
-		fi
-
-		# Don't inherit PKG_CONFIG_PATH from environment
-		local -x PKG_CONFIG_PATH=
-	else
-		myconf_gn+=" host_toolchain=\"//build/toolchain/linux/unbundle:default\""
-	fi
-
-	# GN needs explicit config for Debug/Release as opposed to inferring it from build directory.
-	myconf_gn+=" is_debug=false"
-
-	# enable DCHECK with USE=debug only, increases chrome binary size by 30%, bug #811138.
-	# DCHECK is fatal by default, make it configurable at runtime, #bug 807881.
-	myconf_gn+=" dcheck_always_on=$(usex debug true false)"
-	myconf_gn+=" dcheck_is_configurable=$(usex debug true false)"
-
-	# Component build isn't generally intended for use by end users. It's mostly useful
-	# for development and debugging.
-	myconf_gn+=" is_component_build=$(usex component-build true false)"
-
-	# Disable nacl, we can't build without pnacl (http://crbug.com/269560).
-	myconf_gn+=" enable_nacl=false"
-
-	# Use system-provided libraries.
-	# TODO: freetype -- remove sources (https://bugs.chromium.org/p/pdfium/issues/detail?id=733).
-	# TODO: use_system_hunspell (upstream changes needed).
-	# TODO: use_system_protobuf (bug #525560).
-	# TODO: use_system_sqlite (http://crbug.com/22208).
-
-	# libevent: https://bugs.gentoo.org/593458
-	local gn_system_libraries=(
-		flac
-		fontconfig
-		freetype
-		# Need harfbuzz_from_pkgconfig target
-		#harfbuzz-ng
-		libdrm
-		libjpeg
-		libwebp
-		libxml
-		libxslt
-		openh264
-		zlib
-	)
-	if use system-ffmpeg; then
-		gn_system_libraries+=( ffmpeg opus )
-	fi
-	if use system-icu; then
-		gn_system_libraries+=( icu )
-	fi
-	if use system-png; then
-		gn_system_libraries+=( libpng )
-	fi
-	# re2 library interface relies on std::string and std::vector
-	if ! use libcxx; then
-		gn_system_libraries+=( re2 )
-	fi
-	build/linux/unbundle/replace_gn_files.py --system-libraries "${gn_system_libraries[@]}" || die
-
-	# See dependency logic in third_party/BUILD.gn
-	myconf_gn+=" use_system_harfbuzz=$(usex system-harfbuzz true false)"
-
-	# Disable deprecated libgnome-keyring dependency, bug #713012
-	myconf_gn+=" use_gnome_keyring=false"
-
-	# Optional dependencies.
-	myconf_gn+=" enable_js_type_check=$(usex js-type-check true false)"
-	myconf_gn+=" enable_hangout_services_extension=$(usex hangouts true false)"
-	myconf_gn+=" enable_widevine=$(usex widevine true false)"
-
-	if use headless; then
-		myconf_gn+=" use_cups=false"
-		myconf_gn+=" use_kerberos=false"
-		myconf_gn+=" use_pulseaudio=false"
-		myconf_gn+=" use_vaapi=false"
-		myconf_gn+=" rtc_use_pipewire=false"
-	else
-		myconf_gn+=" use_cups=$(usex cups true false)"
-		myconf_gn+=" use_kerberos=$(usex kerberos true false)"
-		myconf_gn+=" use_pulseaudio=$(usex pulseaudio true false)"
-		myconf_gn+=" use_vaapi=$(usex vaapi true false)"
-		myconf_gn+=" rtc_use_pipewire=$(usex screencast true false)"
-		myconf_gn+=" gtk_version=$(usex gtk4 4 3)"
-	fi
-
-	# TODO: link_pulseaudio=true for GN.
-
-	myconf_gn+=" disable_fieldtrial_testing_config=true"
-
-	# Never use bundled gold binary. Disable gold linker flags for now.
-	# Do not use bundled clang.
-	# Trying to use gold results in linker crash.
-	myconf_gn+=" use_gold=false use_sysroot=false"
-	myconf_gn+=" use_custom_libcxx=$(usex libcxx true false)"
-
-	# Disable pseudolocales, only used for testing
-	myconf_gn+=" enable_pseudolocales=false"
-
-	# Disable code formating of generated files
-	myconf_gn+=" blink_enable_generated_code_formatting=false"
-
-	ffmpeg_branding="$(usex proprietary-codecs Chrome Chromium)"
-	myconf_gn+=" proprietary_codecs=$(usex proprietary-codecs true false)"
-	myconf_gn+=" ffmpeg_branding=\"${ffmpeg_branding}\""
-
-	# Set up Google API keys, see http://www.chromium.org/developers/how-tos/api-keys .
-	# Note: these are for Gentoo use ONLY. For your own distribution,
-	# please get your own set of keys. Feel free to contact chromium@gentoo.org
-	# for more info. The OAuth2 credentials, however, have been left out.
-	# Those OAuth2 credentials have been broken for quite some time anyway.
-	# Instead we apply a patch to use the --oauth2-client-id= and
-	# --oauth2-client-secret= switches for setting GOOGLE_DEFAULT_CLIENT_ID and
-	# GOOGLE_DEFAULT_CLIENT_SECRET at runtime. This allows signing into
-	# Chromium without baked-in values.
-	local google_api_key="AIzaSyDEAOvatFo0eTgsV_ZlEzx0ObmepsMzfAc"
-	myconf_gn+=" google_api_key=\"${google_api_key}\""
-	local myarch="$(tc-arch)"
-
-	# Avoid CFLAGS problems, bug #352457, bug #390147.
-	if ! use custom-cflags; then
-		replace-flags "-Os" "-O2"
-		strip-flags
-
-		# Debug info section overflows without component build
-		# Prevent linker from running out of address space, bug #471810 .
-		if ! use component-build || use x86; then
-			filter-flags "-g*"
-		fi
-
-		# Prevent libvpx/xnnpack build failures. Bug 530248, 544702, 546984, 853646.
-		if [[ ${myarch} == amd64 || ${myarch} == x86 ]]; then
-			filter-flags -mno-mmx -mno-sse2 -mno-ssse3 -mno-sse4.1 -mno-avx -mno-avx2 -mno-fma -mno-fma4 -mno-xop -mno-sse4a
-		fi
-	fi
-
-	if [[ $myarch = amd64 ]] ; then
-		myconf_gn+=" target_cpu=\"x64\""
-		ffmpeg_target_arch=x64
-	elif [[ $myarch = x86 ]] ; then
-		myconf_gn+=" target_cpu=\"x86\""
-		ffmpeg_target_arch=ia32
-
-		# This is normally defined by compiler_cpu_abi in
-		# build/config/compiler/BUILD.gn, but we patch that part out.
-		append-flags -msse2 -mfpmath=sse -mmmx
-	elif [[ $myarch = arm64 ]] ; then
-		myconf_gn+=" target_cpu=\"arm64\""
-		ffmpeg_target_arch=arm64
-	elif [[ $myarch = arm ]] ; then
-		myconf_gn+=" target_cpu=\"arm\""
-		ffmpeg_target_arch=$(usex cpu_flags_arm_neon arm-neon arm)
-	elif [[ $myarch = ppc64 ]] ; then
-		myconf_gn+=" target_cpu=\"ppc64\""
-		ffmpeg_target_arch=ppc64
-	else
-		die "Failed to determine target arch, got '$myarch'."
-	fi
-
-	# Make sure that -Werror doesn't get added to CFLAGS by the build system.
-	# Depending on GCC version the warnings are different and we don't want
-	# the build to fail because of that.
-	myconf_gn+=" treat_warnings_as_errors=false"
-
-	# Disable fatal linker warnings, bug 506268.
-	myconf_gn+=" fatal_linker_warnings=false"
-
-	# Disable external code space for V8 for ppc64. It is disabled for ppc64
-	# by default, but cross-compiling on amd64 enables it again.
-	if tc-is-cross-compiler; then
-		if ! use amd64 && ! use arm64; then
-			myconf_gn+=" v8_enable_external_code_space=false"
-		fi
-	fi
-
-	# Bug 491582.
-	export TMPDIR="${WORKDIR}/temp"
-	mkdir -p -m 755 "${TMPDIR}" || die
-
-	# https://bugs.gentoo.org/654216
-	addpredict /dev/dri/ #nowarn
-
-	#if ! use system-ffmpeg; then
-	if false; then
-		local build_ffmpeg_args=""
-		if use pic && [[ "${ffmpeg_target_arch}" == "ia32" ]]; then
-			build_ffmpeg_args+=" --disable-asm"
-		fi
-
-		# Re-configure bundled ffmpeg. See bug #491378 for example reasons.
-		einfo "Configuring bundled ffmpeg..."
-		pushd third_party/ffmpeg > /dev/null || die
-		chromium/scripts/build_ffmpeg.py linux ${ffmpeg_target_arch} \
-			--branding ${ffmpeg_branding} -- ${build_ffmpeg_args} || die
-		chromium/scripts/copy_config.sh || die
-		chromium/scripts/generate_gn.py || die
-		popd > /dev/null || die
-	fi
-
-	# Disable unknown warning message from clang.
-	if tc-is-clang; then
-		append-flags -Wno-unknown-warning-option
-		if tc-is-cross-compiler; then
-			export BUILD_CXXFLAGS+=" -Wno-unknown-warning-option"
-			export BUILD_CFLAGS+=" -Wno-unknown-warning-option"
-		fi
-	fi
-
-	# Disable opaque pointers, https://crbug.com/1316298
-	if tc-is-clang; then
-		if test-flag-CXX -Xclang -no-opaque-pointers; then
-			append-flags -Xclang -no-opaque-pointers
-			if tc-is-cross-compiler; then
-				export BUILD_CXXFLAGS+=" -Xclang -no-opaque-pointers"
-				export BUILD_CFLAGS+=" -Xclang -no-opaque-pointers"
-			fi
-		fi
-	fi
-
-	# Explicitly disable ICU data file support for system-icu/headless builds.
-	if use system-icu || use headless; then
-		myconf_gn+=" icu_use_data_file=false"
-	fi
-
-	# Enable ozone wayland and/or headless support
-	myconf_gn+=" use_ozone=true ozone_auto_platforms=false"
-	myconf_gn+=" ozone_platform_headless=true"
-	if use headless; then
-		myconf_gn+=" ozone_platform=\"headless\""
-		myconf_gn+=" use_xkbcommon=false use_gtk=false"
-		myconf_gn+=" use_glib=false use_gio=false"
-		myconf_gn+=" use_pangocairo=false use_alsa=false"
-		myconf_gn+=" use_libpci=false use_udev=false"
-		myconf_gn+=" enable_print_preview=false"
-		myconf_gn+=" enable_remoting=false"
-	else
-		myconf_gn+=" use_system_libdrm=true"
-		myconf_gn+=" use_system_minigbm=true"
-		myconf_gn+=" use_xkbcommon=true"
-		myconf_gn+=" ozone_platform_x11=$(usex X true false)"
-		myconf_gn+=" ozone_platform_wayland=$(usex wayland true false)"
-		myconf_gn+=" ozone_platform=$(usex wayland \"wayland\" \"x11\")"
-	fi
-
-	# Results in undefined references in chrome linking, may require CFI to work
-	if use arm64; then
-		myconf_gn+=" arm_control_flow_integrity=\"none\""
-	fi
-
-	# Enable official builds
-	myconf_gn+=" is_official_build=$(usex official true false)"
-	myconf_gn+=" use_thin_lto=$(usex lto true false)"
-	myconf_gn+=" thin_lto_enable_optimizations=$(usex lto true false)"
-	if use official; then
-		# Allow building against system libraries in official builds
-		sed -i 's/OFFICIAL_BUILD/GOOGLE_CHROME_BUILD/' \
-			tools/generate_shim_headers/generate_shim_headers.py || die
-		# Disable CFI: unsupported for GCC, requires clang+lto+lld
-		myconf_gn+=" is_cfi=false"
-		# Don't add symbols to build
-		myconf_gn+=" symbol_level=0"
-	fi
-
-	if use pgo; then
-		myconf_gn+=" chrome_pgo_phase=${1}"
-		if [[ "$1" == "2" ]]; then
-			myconf_gn+=" pgo_data_path=\"${2}\""
-		fi
-	else
-		# Disable PGO, because profile data is only compatible with >=clang-11
-		myconf_gn+=" chrome_pgo_phase=0"
-	fi
-
-	# user CXXFLAGS might overwrite -march=armv8-a+crc+crypto, bug #851639
-	if use arm64 && tc-is-gcc; then
-		sed -i '/^#if HAVE_ARM64_CRC32C/a #pragma GCC target ("+crc+crypto")' \
-			third_party/crc32c/src/src/crc32c_arm64.cc || die
-	fi
-
-	einfo "Configuring Chromium..."
-	set -- gn gen --args="${myconf_gn} ${EXTRA_GN}" out/Release
-	echo "$@"
-	"$@" || die
-}
-
-src_configure() {
-	chromium_configure $(usex pgo 1 0)
-}
-
-chromium_compile() {
-	# Final link uses lots of file descriptors.
-	ulimit -n 2048
-
-	# Calling this here supports resumption via FEATURES=keepwork
-	python_setup
-
-	# Don't inherit PYTHONPATH from environment, bug #789021, #812689
-	local -x PYTHONPATH=
-
-	#"${EPYTHON}" tools/clang/scripts/update.py --force-local-build --gcc-toolchain /usr --skip-checkout --use-system-cmake --without-android || die
-
-	# Build mksnapshot and pax-mark it.
-	local x
-	for x in mksnapshot v8_context_snapshot_generator; do
-		if tc-is-cross-compiler; then
-			eninja -C out/Release "host/${x}"
-			pax-mark m "out/Release/host/${x}"
-		else
-			eninja -C out/Release "${x}"
-			pax-mark m "out/Release/${x}"
-		fi
-	done
-
-	# Even though ninja autodetects number of CPUs, we respect
-	# user's options, for debugging with -j 1 or any other reason.
-	eninja -C out/Release chrome chromedriver
-	use suid && eninja -C out/Release chrome_sandbox
-
-	pax-mark m out/Release/chrome
-}
-
-# This function is called from virtx, and must always return so that Xvfb
-# session isn't left running. If we return 1, virtx will call die().
-chromium_profile() {
-	einfo "Profiling for PGO"
-
-	pushd "${WORKDIR}/chromium-profiler-"* >/dev/null || return 1
-
-	# Remove old profdata in case profiling was interrupted.
-	rm -rf "${1}" || return 1
-
-	if ! "${EPYTHON}" ./chromium_profiler.py \
-		--chrome-executable "${S}/out/Release/chrome" \
-		--chromedriver-executable "${S}/out/Release/chromedriver.unstripped" \
-		--add-arg no-sandbox --add-arg disable-dev-shm-usage \
-		--profile-output "${1}"; then
-		eerror "Profiling failed"
-		return 1
-	fi
-
-	popd >/dev/null || return 1
-}
-
-src_compile() {
-	if use pgo; then
-		local profdata
-
-		profdata="${WORKDIR}/chromium.profdata"
-
-		if [[ ! -e "${WORKDIR}/.pgo-profiled" ]]; then
-			chromium_compile
-			virtx chromium_profile "$profdata"
-
-			touch "${WORKDIR}/.pgo-profiled" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-configured" ]]; then
-			# Remove phase 1 output
-			rm -r out/Release || die
-
-			chromium_configure 2 "$profdata"
-
-			touch "${WORKDIR}/.pgo-phase-2-configured" || die
-		fi
-
-		if [[ ! -e "${WORKDIR}/.pgo-phase-2-compiled" ]]; then
-			chromium_compile
-			touch "${WORKDIR}/.pgo-phase-2-compiled" || die
-		fi
-	else
-		chromium_compile
-	fi
-
-	mv out/Release/chromedriver{.unstripped,} || die
-
-	# Build manpage; bug #684550
-	sed -e 's|@@PACKAGE@@|chromium-browser|g;
-		s|@@MENUNAME@@|Chromium|g;' \
-		chrome/app/resources/manpage.1.in > \
-		out/Release/chromium-browser.1 || die
-
-	# Build desktop file; bug #706786
-	sed -e 's|@@MENUNAME@@|Chromium|g;
-		s|@@USR_BIN_SYMLINK_NAME@@|chromium-browser|g;
-		s|@@PACKAGE@@|chromium-browser|g;
-		s|\(^Exec=\)/usr/bin/|\1|g;' \
-		chrome/installer/linux/common/desktop.template > \
-		out/Release/chromium-browser-chromium.desktop || die
-
-	# Build vk_swiftshader_icd.json; bug #827861
-	sed -e 's|${ICD_LIBRARY_PATH}|./libvk_swiftshader.so|g' \
-		third_party/swiftshader/src/Vulkan/vk_swiftshader_icd.json.tmpl > \
-		out/Release/vk_swiftshader_icd.json || die
-}
-
-src_install() {
-	local CHROMIUM_HOME="/usr/$(get_libdir)/chromium-browser"
-	exeinto "${CHROMIUM_HOME}"
-	doexe out/Release/chrome
-
-	if use suid; then
-		newexe out/Release/chrome_sandbox chrome-sandbox
-		fperms 4755 "${CHROMIUM_HOME}/chrome-sandbox"
-	fi
-
-	doexe out/Release/chromedriver
-	doexe out/Release/chrome_crashpad_handler
-
-	ozone_auto_session () {
-		use X && use wayland && ! use headless && echo true || echo false
-	}
-	local sedargs=( -e
-			"s:/usr/lib/:/usr/$(get_libdir)/:g;
-			s:@@OZONE_AUTO_SESSION@@:$(ozone_auto_session):g"
-	)
-	sed "${sedargs[@]}" "${FILESDIR}/chromium-launcher-r7.sh" > chromium-launcher.sh || die
-	doexe chromium-launcher.sh
-
-	# It is important that we name the target "chromium-browser",
-	# xdg-utils expect it; bug #355517.
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium-browser
-	# keep the old symlink around for consistency
-	dosym "${CHROMIUM_HOME}/chromium-launcher.sh" /usr/bin/chromium
-
-	dosym "${CHROMIUM_HOME}/chromedriver" /usr/bin/chromedriver
-
-	# Allow users to override command-line options, bug #357629.
-	insinto /etc/chromium
-	newins "${FILESDIR}/chromium.default" "default"
-
-	pushd out/Release/locales > /dev/null || die
-	chromium_remove_language_paks
-	popd
-
-	insinto "${CHROMIUM_HOME}"
-	doins out/Release/*.bin
-	doins out/Release/*.pak
-	(
-		shopt -s nullglob
-		local files=(out/Release/*.so out/Release/*.so.[0-9])
-		[[ ${#files[@]} -gt 0 ]] && doins "${files[@]}"
-	)
-
-	if ! use system-icu && ! use headless; then
-		doins out/Release/icudtl.dat
-	fi
-
-	doins -r out/Release/locales
-	doins -r out/Release/MEIPreload
-
-	# Install vk_swiftshader_icd.json; bug #827861
-	doins out/Release/vk_swiftshader_icd.json
-
-	if [[ -d out/Release/swiftshader ]]; then
-		insinto "${CHROMIUM_HOME}/swiftshader"
-		doins out/Release/swiftshader/*.so
-	fi
-
-	# Install icons
-	local branding size
-	for size in 16 24 32 48 64 128 256 ; do
-		case ${size} in
-			16|32) branding="chrome/app/theme/default_100_percent/chromium" ;;
-				*) branding="chrome/app/theme/chromium" ;;
-		esac
-		newicon -s ${size} "${branding}/product_logo_${size}.png" \
-			chromium-browser.png
-	done
-
-	# Install desktop entry
-	domenu out/Release/chromium-browser-chromium.desktop
-
-	# Install GNOME default application entry (bug #303100).
-	insinto /usr/share/gnome-control-center/default-apps
-	newins "${FILESDIR}"/chromium-browser.xml chromium-browser.xml
-
-	# Install manpage; bug #684550
-	doman out/Release/chromium-browser.1
-	dosym chromium-browser.1 /usr/share/man/man1/chromium.1
-
-	readme.gentoo_create_doc
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-	readme.gentoo_print_elog
-
-	if ! use headless; then
-		if use vaapi; then
-			elog "VA-API is disabled by default at runtime. You have to enable it"
-			elog "by adding --enable-features=VaapiVideoDecoder to CHROMIUM_FLAGS"
-			elog "in /etc/chromium/default."
-		fi
-		if use screencast; then
-			elog "Screencast is disabled by default at runtime. Either enable it"
-			elog "by navigating to chrome://flags/#enable-webrtc-pipewire-capturer"
-			elog "inside Chromium or add --enable-features=WebRTCPipeWireCapturer"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-		if use gtk4; then
-			elog "Chromium prefers GTK3 over GTK4 at runtime. To override this"
-			elog "behavior you need to pass --gtk-version=4, e.g. by adding it"
-			elog "to CHROMIUM_FLAGS in /etc/chromium/default."
-		fi
-	fi
-}
diff --git a/www-client/chromium/chromium-105.0.5195.52.ebuild b/www-client/chromium/chromium-105.0.5195.125.ebuild
similarity index 99%
rename from www-client/chromium/chromium-105.0.5195.52.ebuild
rename to www-client/chromium/chromium-105.0.5195.125.ebuild
index ac3e04c87ec0..d250e9ebaf24 100644
--- a/www-client/chromium/chromium-105.0.5195.52.ebuild
+++ b/www-client/chromium/chromium-105.0.5195.125.ebuild
@@ -24,7 +24,7 @@ SRC_URI="https://commondatastorage.googleapis.com/chromium-browser-official/${P}
 
 LICENSE="BSD"
 SLOT="0/stable"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="~amd64 arm64"
 IUSE="+X component-build cups cpu_flags_arm_neon debug gtk4 +hangouts headless +js-type-check kerberos libcxx lto +official pgo pic +proprietary-codecs pulseaudio screencast selinux +suid +system-ffmpeg +system-harfbuzz +system-icu +system-png vaapi wayland widevine"
 REQUIRED_USE="
 	component-build? ( !suid !libcxx )
diff --git a/www-client/chromium/files/chromium-104-swiftshader-no-wayland.patch b/www-client/chromium/files/chromium-104-swiftshader-no-wayland.patch
deleted file mode 100644
index 75f78f36bc3d..000000000000
--- a/www-client/chromium/files/chromium-104-swiftshader-no-wayland.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/third_party/swiftshader/src/Vulkan/BUILD.gn
-+++ b/third_party/swiftshader/src/Vulkan/BUILD.gn
-@@ -16,14 +16,22 @@ import("//build_overrides/build.gni")
- import("../swiftshader.gni")
- import("vulkan.gni")
- 
-+if (is_linux) {
-+  import("//build/config/ozone.gni")
-+}
-+
- # Need a separate config to ensure the warnings are added to the end.
- config("swiftshader_libvulkan_private_config") {
-   if (is_linux) {
-     defines = [
-       "VK_USE_PLATFORM_XCB_KHR",
--      "VK_USE_PLATFORM_WAYLAND_KHR",
-       "VK_EXPORT=__attribute__((visibility(\"default\")))",
-     ]
-+    if (ozone_platform_wayland) {
-+      defines += [
-+        "VK_USE_PLATFORM_WAYLAND_KHR",
-+      ]
-+    }
-   } else if (is_chromeos) {
-     defines = [
-       "VK_EXPORT=__attribute__((visibility(\"default\")))",
---- a/third_party/swiftshader/src/WSI/BUILD.gn
-+++ b/third_party/swiftshader/src/WSI/BUILD.gn
-@@ -42,15 +42,19 @@ swiftshader_source_set("WSI") {
- 
-   if (is_linux) {
-     sources += [
--      "WaylandSurfaceKHR.cpp",
--      "WaylandSurfaceKHR.hpp",
-       "XcbSurfaceKHR.cpp",
-       "XcbSurfaceKHR.hpp",
--      "libWaylandClient.cpp",
--      "libWaylandClient.hpp",
-       "libXCB.cpp",
-       "libXCB.hpp",
-     ]
-+    if (ozone_platform_wayland) {
-+      sources += [
-+        "WaylandSurfaceKHR.cpp",
-+        "WaylandSurfaceKHR.hpp",
-+        "libWaylandClient.cpp",
-+        "libWaylandClient.hpp",
-+      ]
-+    }
-   }
- 
-   if (is_win) {
diff --git a/www-client/chromium/files/chromium-104-v8-neon.patch b/www-client/chromium/files/chromium-104-v8-neon.patch
deleted file mode 100644
index ee573f8862e6..000000000000
--- a/www-client/chromium/files/chromium-104-v8-neon.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 0fc6592cf8867f0cd6d8d41b43392fb52d359649 Mon Sep 17 00:00:00 2001
-From: Jose Dapena Paz <jdapena@igalia.com>
-Date: Tue, 07 Jun 2022 15:44:35 +0200
-Subject: [PATCH] GCC: fix compilation of NEON64 extract_first_nonzero_index
-
-GCC fails to compile extract_first_nonzero_index because of the
-signedness type mismatch in the NEON intrinsics.
-
-Bug: chromium:819294
-Change-Id: I9b73e5fa1d5fbf161740ab1b5d77f5c494369dfa
-Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/3693709
-Reviewed-by: Toon Verwaest <verwaest@chromium.org>
-Commit-Queue: José Dapena Paz <jdapena@igalia.com>
-Cr-Commit-Position: refs/heads/main@{#81063}
----
-
-diff --git a/v8/src/objects/simd.cc b/v8/src/objects/simd.cc
-index d3cedfe..0a73b9c 100644
---- a/v8/src/objects/simd.cc
-+++ b/v8/src/objects/simd.cc
-@@ -95,24 +95,21 @@
- }
- 
- template <>
--inline int extract_first_nonzero_index(int32x4_t v) {
--  int32x4_t mask = {4, 3, 2, 1};
-+inline int extract_first_nonzero_index(uint32x4_t v) {
-+  uint32x4_t mask = {4, 3, 2, 1};
-   mask = vandq_u32(mask, v);
-   return 4 - vmaxvq_u32(mask);
- }
- 
- template <>
--inline int extract_first_nonzero_index(int64x2_t v) {
--  int32x4_t mask = {2, 0, 1, 0};  // Could also be {2,2,1,1} or {0,2,0,1}
--  mask = vandq_u32(mask, vreinterpretq_s32_s64(v));
-+inline int extract_first_nonzero_index(uint64x2_t v) {
-+  uint32x4_t mask = {2, 0, 1, 0};  // Could also be {2,2,1,1} or {0,2,0,1}
-+  mask = vandq_u32(mask, vreinterpretq_u32_u64(v));
-   return 2 - vmaxvq_u32(mask);
- }
- 
--template <>
--inline int extract_first_nonzero_index(float64x2_t v) {
--  int32x4_t mask = {2, 0, 1, 0};  // Could also be {2,2,1,1} or {0,2,0,1}
--  mask = vandq_u32(mask, vreinterpretq_s32_f64(v));
--  return 2 - vmaxvq_u32(mask);
-+inline int32_t reinterpret_vmaxvq_u64(uint64x2_t v) {
-+  return vmaxvq_u32(vreinterpretq_u32_u64(v));
- }
- #endif
- 
-@@ -204,14 +201,14 @@
-   }
- #elif defined(NEON64)
-   if constexpr (std::is_same<T, uint32_t>::value) {
--    VECTORIZED_LOOP_Neon(int32x4_t, int32x4_t, vdupq_n_u32, vceqq_u32,
-+    VECTORIZED_LOOP_Neon(uint32x4_t, uint32x4_t, vdupq_n_u32, vceqq_u32,
-                          vmaxvq_u32)
-   } else if constexpr (std::is_same<T, uint64_t>::value) {
--    VECTORIZED_LOOP_Neon(int64x2_t, int64x2_t, vdupq_n_u64, vceqq_u64,
--                         vmaxvq_u32)
-+    VECTORIZED_LOOP_Neon(uint64x2_t, uint64x2_t, vdupq_n_u64, vceqq_u64,
-+                         reinterpret_vmaxvq_u64)
-   } else if constexpr (std::is_same<T, double>::value) {
--    VECTORIZED_LOOP_Neon(float64x2_t, float64x2_t, vdupq_n_f64, vceqq_f64,
--                         vmaxvq_f64)
-+    VECTORIZED_LOOP_Neon(float64x2_t, uint64x2_t, vdupq_n_f64, vceqq_f64,
-+                         reinterpret_vmaxvq_u64)
-   }
- #else
-   UNREACHABLE();
diff --git a/www-client/firefox/firefox-102.3.0.ebuild b/www-client/firefox/firefox-102.3.0.ebuild
index 97b4bbe530ca..8a217d14bd9a 100644
--- a/www-client/firefox/firefox-102.3.0.ebuild
+++ b/www-client/firefox/firefox-102.3.0.ebuild
@@ -57,7 +57,7 @@ SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}
 DESCRIPTION="Firefox Web Browser"
 HOMEPAGE="https://www.mozilla.com/firefox"
 
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 arm64 ~ppc64 x86"
 
 SLOT="esr"
 LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
@@ -1112,7 +1112,7 @@ src_install() {
 	# Install menu
 	local app_name="Mozilla ${MOZ_PN^}"
 	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
-	local desktop_filename="${PN}.desktop"
+	local desktop_filename="${PN}-esr.desktop"
 	local exec_command="${PN}"
 	local icon="${PN}"
 	local use_wayland="false"
diff --git a/www-client/google-chrome-beta/Manifest b/www-client/google-chrome-beta/Manifest
index 4a0a794011bc..baf6643df8c7 100644
--- a/www-client/google-chrome-beta/Manifest
+++ b/www-client/google-chrome-beta/Manifest
@@ -1 +1 @@
-DIST google-chrome-beta_106.0.5249.40-1_amd64.deb 93187168 BLAKE2B d354643a5b474617f84ae516e35ff131907fc892fb6966654496ede8c767e81e6bf483e240d54cb9551fcba4912ad14fb6b3208604f3f4c3218cfc7a13d1c1a2 SHA512 67b0d32f3725d962029656e797cfe9037a1138e8db10a57bad827507b393a582a7c549fcd81f5e7f578c8b172c1e8e15bd0e602b81d0b6fadab239b656ce3830
+DIST google-chrome-beta_106.0.5249.51-1_amd64.deb 92133400 BLAKE2B 2af13abd846a3a6b7dbd0bbc33c5322b7434c45f7426ace49bc730634d70807be7416204cd3fa5a2c904016052e5da6f10ee5d725e9aa7278595b79cb10291e1 SHA512 7c7ffc0fc6c26f229756e2f774eda883215c607fa61a7944ace4e0e9b9365b52fabc73ec7f6c2324acf6090ff452975768d861a26403fd561b81e6feeffd6ebc
diff --git a/www-client/google-chrome-beta/google-chrome-beta-106.0.5249.40.ebuild b/www-client/google-chrome-beta/google-chrome-beta-106.0.5249.51.ebuild
similarity index 100%
rename from www-client/google-chrome-beta/google-chrome-beta-106.0.5249.40.ebuild
rename to www-client/google-chrome-beta/google-chrome-beta-106.0.5249.51.ebuild
diff --git a/www-client/microsoft-edge-dev/Manifest b/www-client/microsoft-edge-dev/Manifest
index ba64c4ce5685..1568aec14283 100644
--- a/www-client/microsoft-edge-dev/Manifest
+++ b/www-client/microsoft-edge-dev/Manifest
@@ -1,3 +1,3 @@
-DIST microsoft-edge-dev_106.0.1363.0-1_amd64.deb 135085364 BLAKE2B 9d151d3511e7c22a0284df01b07bf609fce7cf5f8975c31e1ae477d631954dc3405103b9cb9d41801d37f4cd9b4bf6b4dd0a2cc9db177ae9a17b14fdc8b07677 SHA512 800306775c28baecbae58355e5bb7c550df3e5387c34a1898aa8f5bcfa5c86f44542fb4f167431c066602436e36c04fba631e48c753115d78854a5bf89e50a23
 DIST microsoft-edge-dev_106.0.1370.4-1_amd64.deb 135600160 BLAKE2B dcbbf27455fdbafbea5b4c40d21cd13822a6adf85376bf27f38303600cf705dbbd0b556c2c8cd4053f8c465df1c0e655f37e0228a08c07847db0732c337de84a SHA512 1bb13b84289909a17704f0dd37e4e948b5d38b2e83feee65b9f39b692beac6127159833b652aeb48ee22c8ce6de8588289b84b333e27846665255b8db9572bd1
 DIST microsoft-edge-dev_107.0.1375.0-1_amd64.deb 135871108 BLAKE2B 49605e1a11b312abdcd0e4c41778ab6dd4874a22ec8a0fe2936bb35f6b2f768060ef21308559b2f7735cbd8ae45368465c58a975620f26dbeec7d7cd012eec03 SHA512 84e19e31591f7cba8c274bfe4e4fedd505e8178fd859e9fdc0c66ab03b226a426f3775c71114c72175dff39da978467d87f5e6285783777245afaafa44061858
+DIST microsoft-edge-dev_107.0.1387.2-1_amd64.deb 135254440 BLAKE2B e6eb23ae7b458c9bf660169277c153625c01bd9c6704770b3c7b9edc9af2cccf9459e0ab24d62c624e3ab8a9e350e72eda345e58156708b99bb0f004ddc9332f SHA512 628cd0ce6969efeb6ddf1b3de667d7016ad1e12fb03ff3706c3cce72bfa5446fe186070ccec1276ac04e63197f27110def2dc28a6c1beba4d2e13314ddc29ba3
diff --git a/www-client/microsoft-edge-dev/microsoft-edge-dev-106.0.1363.0.ebuild b/www-client/microsoft-edge-dev/microsoft-edge-dev-107.0.1387.2.ebuild
similarity index 100%
rename from www-client/microsoft-edge-dev/microsoft-edge-dev-106.0.1363.0.ebuild
rename to www-client/microsoft-edge-dev/microsoft-edge-dev-107.0.1387.2.ebuild
diff --git a/www-client/pybugz/pybugz-0.13-r1.ebuild b/www-client/pybugz/pybugz-0.13-r1.ebuild
deleted file mode 100644
index 9b656c02fba0..000000000000
--- a/www-client/pybugz/pybugz-0.13-r1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..9} )
-PYTHON_REQ_USE="readline(+)"
-
-if [ "${PV}" = "9999" ]; then
-	EGIT_REPO_URI="https://github.com/williamh/pybugz.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/williamh/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x86-solaris"
-fi
-
-inherit bash-completion-r1 distutils-r1
-
-DESCRIPTION="Command line interface to (Gentoo) Bugzilla"
-HOMEPAGE="https://github.com/williamh/pybugz"
-
-LICENSE="GPL-2"
-SLOT="0"
-
-DEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-RDEPEND="dev-python/setuptools[${PYTHON_USEDEP}]"
-
-python_install_all() {
-	distutils-r1_python_install_all
-	newbashcomp contrib/bash-completion bugz
-
-	insinto /usr/share/zsh/site-functions
-	newins contrib/zsh-completion _pybugz
-}
diff --git a/www-client/pybugz/pybugz-0.13-r2.ebuild b/www-client/pybugz/pybugz-0.13-r2.ebuild
index 5f7d372a34c4..5d0921645af2 100644
--- a/www-client/pybugz/pybugz-0.13-r2.ebuild
+++ b/www-client/pybugz/pybugz-0.13-r2.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="readline(+)"
+PYTHON_REQ_USE="readline(+),ssl(+)"
 
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/williamh/pybugz.git"
diff --git a/www-client/pybugz/pybugz-9999.ebuild b/www-client/pybugz/pybugz-9999.ebuild
index 927c47f7b3bb..fa21df76a7c2 100644
--- a/www-client/pybugz/pybugz-9999.ebuild
+++ b/www-client/pybugz/pybugz-9999.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE="readline(+)"
+PYTHON_REQ_USE="readline(+),ssl(+)"
 
 if [ "${PV}" = "9999" ]; then
 	EGIT_REPO_URI="https://github.com/williamh/pybugz.git"
diff --git a/www-plugins/Manifest.gz b/www-plugins/Manifest.gz
index 07986678c527..43078332cf24 100644
Binary files a/www-plugins/Manifest.gz and b/www-plugins/Manifest.gz differ
diff --git a/www-plugins/chrome-binary-plugins/Manifest b/www-plugins/chrome-binary-plugins/Manifest
index 4074a81a1f9c..2506405e28ef 100644
--- a/www-plugins/chrome-binary-plugins/Manifest
+++ b/www-plugins/chrome-binary-plugins/Manifest
@@ -1,3 +1,3 @@
-DIST google-chrome-beta_106.0.5249.40-1_amd64.deb 93187168 BLAKE2B d354643a5b474617f84ae516e35ff131907fc892fb6966654496ede8c767e81e6bf483e240d54cb9551fcba4912ad14fb6b3208604f3f4c3218cfc7a13d1c1a2 SHA512 67b0d32f3725d962029656e797cfe9037a1138e8db10a57bad827507b393a582a7c549fcd81f5e7f578c8b172c1e8e15bd0e602b81d0b6fadab239b656ce3830
+DIST google-chrome-beta_106.0.5249.51-1_amd64.deb 92133400 BLAKE2B 2af13abd846a3a6b7dbd0bbc33c5322b7434c45f7426ace49bc730634d70807be7416204cd3fa5a2c904016052e5da6f10ee5d725e9aa7278595b79cb10291e1 SHA512 7c7ffc0fc6c26f229756e2f774eda883215c607fa61a7944ace4e0e9b9365b52fabc73ec7f6c2324acf6090ff452975768d861a26403fd561b81e6feeffd6ebc
 DIST google-chrome-stable_105.0.5195.125-1_amd64.deb 91239488 BLAKE2B 4f83bc55ef54d4e4454449c474e680fdd271c97da8e896d48efb8c953ddea4eccdb730f4b2d5d35e2830e2cd1f9f2a852906edaa43c9f8a205962e789cb6ab8f SHA512 80e4ed357e9a117e00f0a4d2531369990ad6ea542a65c21808ebb6f31bca7fda801c02a300c3afc8df12f97c424167f50a8520e5792759eb670e7b0041358cc1
 DIST google-chrome-unstable_107.0.5300.0-1_amd64.deb 93552136 BLAKE2B e7cfc6cd961b93141f8982b42e3e9ecff12eac6211bab11689226357efc907c971097a8f837131cd5b6fe2f03917e79bd36a450cbe70f069fb86f94ca440d3b7 SHA512 bdca987a7fd448da78521133aabbdd67acd2c131af9c0721536ff50c756199181b2445bf6dd422a9038f3a5cdbea183a85dba216531a9fd94dc12b8484426385
diff --git a/www-plugins/chrome-binary-plugins/chrome-binary-plugins-106.0.5249.40_beta.ebuild b/www-plugins/chrome-binary-plugins/chrome-binary-plugins-106.0.5249.51_beta.ebuild
similarity index 100%
rename from www-plugins/chrome-binary-plugins/chrome-binary-plugins-106.0.5249.40_beta.ebuild
rename to www-plugins/chrome-binary-plugins/chrome-binary-plugins-106.0.5249.51_beta.ebuild
diff --git a/x11-drivers/Manifest.gz b/x11-drivers/Manifest.gz
index f0386bd3f6ba..8e8287fb3741 100644
Binary files a/x11-drivers/Manifest.gz and b/x11-drivers/Manifest.gz differ
diff --git a/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.154-clang15-x86.patch b/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.154-clang15-x86.patch
new file mode 100644
index 000000000000..2038b3da157a
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-drivers-390.154-clang15-x86.patch
@@ -0,0 +1,28 @@
+Kernel's makefiles pass -Werror=strict-prototypes which
+trigger errors with clang15+
+https://bugs.gentoo.org/870238
+--- a/kernel/nvidia/nvlink_linux.c
++++ b/kernel/nvidia/nvlink_linux.c
+@@ -639 +639 @@
+-void * NVLINK_API_CALL nvlink_allocLock()
++void * NVLINK_API_CALL nvlink_allocLock(void)
+--- a/kernel/nvidia/os-interface.c
++++ b/kernel/nvidia/os-interface.c
+@@ -879 +879 @@
+-NV_STATUS NV_API_CALL os_flush_cpu_cache()
++NV_STATUS NV_API_CALL os_flush_cpu_cache(void)
+@@ -886 +886 @@
+-NV_STATUS NV_API_CALL os_flush_cpu_cache_all()
++NV_STATUS NV_API_CALL os_flush_cpu_cache_all(void)
+@@ -944 +944 @@
+-void NV_API_CALL os_flush_cpu_write_combine_buffer()
++void NV_API_CALL os_flush_cpu_write_combine_buffer(void)
+@@ -1073 +1073 @@
+-NvU32 NV_API_CALL os_get_cpu_number()
++NvU32 NV_API_CALL os_get_cpu_number(void)
+@@ -1080 +1080 @@
+-NvU32 NV_API_CALL os_get_cpu_count()
++NvU32 NV_API_CALL os_get_cpu_count(void)
+@@ -1155 +1155 @@
+-void NV_API_CALL os_dump_stack()
++void NV_API_CALL os_dump_stack(void)
diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
index 14d1ff0122f7..7a9cab0fed5d 100644
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-390.154.ebuild
@@ -73,7 +73,6 @@ BDEPEND="
 QA_PREBUILT="opt/bin/* usr/lib*"
 
 PATCHES=(
-	"${FILESDIR}"/nvidia-drivers-390.154-clang15.patch
 	"${FILESDIR}"/nvidia-extras-390.154-clang16.patch
 	"${FILESDIR}"/nvidia-modprobe-390.141-uvm-perms.patch
 	"${FILESDIR}"/nvidia-settings-390.141-fno-common.patch
@@ -152,6 +151,8 @@ src_prepare() {
 	rm nvidia-settings && mv nvidia-settings{-${PV},} || die
 	rm nvidia-xconfig && mv nvidia-xconfig{-${PV},} || die
 
+	eapply "${FILESDIR}"/nvidia-drivers-390.154-clang15$(usev {,-}x86).patch
+
 	default
 
 	# prevent detection of incomplete kernel DRM support (bug #603818)
diff --git a/x11-libs/Manifest.gz b/x11-libs/Manifest.gz
index 82725ba55695..7582a1afff8c 100644
Binary files a/x11-libs/Manifest.gz and b/x11-libs/Manifest.gz differ
diff --git a/x11-libs/goffice/Manifest b/x11-libs/goffice/Manifest
index d959bf89a608..570ee5ede37f 100644
--- a/x11-libs/goffice/Manifest
+++ b/x11-libs/goffice/Manifest
@@ -1 +1,2 @@
 DIST goffice-0.10.52.tar.xz 2436944 BLAKE2B 13c2d28cd9bd081d4636325e3df14193d5ffad913f4f9fa78251d848f293eeca5ee265058b2c9662b5bd48957b39f31714eb41469f3228359dba1923f918bea5 SHA512 8636bdfd436a0b5853aead6ecf09ae39c5059b2d9044cf04c9f2e0f4d2572aaa07e51cfd123b0dd153877d1c0d5f4af78a031d63b03c724bf1e8282d2e1cc841
+DIST goffice-0.10.53.tar.xz 2442336 BLAKE2B 8fda50c5d9f8223c082ea9f03334313b051bce47d18b3879c2d8a7c2bbce753f468b5135f0a3c49c54b8a695ee6f1dc355dc806c92e77f41f2d0c64b2bc30bf0 SHA512 cd2d0f49f803cb2f01b3a690bfbe3ea4be5c09e00e8ef643055f56c16549529b7c2c098b87286062d3a5048c1f64d600f74082f53710d8ed8cbb34cb6829dafd
diff --git a/x11-libs/goffice/goffice-0.10.53.ebuild b/x11-libs/goffice/goffice-0.10.53.ebuild
new file mode 100644
index 000000000000..2bcc131cd893
--- /dev/null
+++ b/x11-libs/goffice/goffice-0.10.53.ebuild
@@ -0,0 +1,64 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org libtool
+
+DESCRIPTION="A library of document-centric objects and utilities"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/goffice/"
+
+LICENSE="GPL-2"
+SLOT="0.10"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris"
+IUSE="+introspection"
+
+# FIXME: add lasem to tree
+RDEPEND="
+	>=app-text/libspectre-0.2.6:=
+	>=dev-libs/glib-2.40.0:2
+	>=dev-libs/libxml2-2.4.12:2
+	dev-libs/libxslt
+	>=gnome-base/librsvg-2.22:2
+	>=gnome-extra/libgsf-1.14.24:=[introspection?]
+	>=x11-libs/cairo-1.10:=[svg]
+	>=x11-libs/gdk-pixbuf-2.22:2
+	>=x11-libs/gtk+-3.20:3
+	>=x11-libs/pango-1.24:=
+	x11-libs/libXext:=
+	x11-libs/libXrender:=
+	introspection? (
+		>=dev-libs/gobject-introspection-1:=
+		>=gnome-extra/libgsf-1.14.23:=
+	)"
+DEPEND="${RDEPEND}"
+BDEPEND="
+	dev-lang/perl
+	dev-util/glib-utils
+	>=dev-util/gtk-doc-am-1.12
+	>=dev-util/intltool-0.35
+	virtual/perl-Compress-Raw-Zlib
+	virtual/perl-Getopt-Long
+	virtual/perl-IO-Compress
+	virtual/pkgconfig"
+
+src_prepare() {
+	default
+	elibtoolize
+}
+
+src_configure() {
+	econf \
+		--disable-gtk-doc \
+		--disable-maintainer-mode \
+		--without-lasem \
+		--with-gtk \
+		--with-config-backend=gsettings \
+		$(use_enable introspection)
+}
+
+src_install() {
+	default
+	dodoc MAINTAINERS
+
+	find "${ED}" -name '*.la' -delete || die
+}
diff --git a/x11-misc/Manifest.gz b/x11-misc/Manifest.gz
index c26b83b4c353..38f1ebb4ecd2 100644
Binary files a/x11-misc/Manifest.gz and b/x11-misc/Manifest.gz differ
diff --git a/x11-misc/bbcd/bbcd-0.3.1-r5.ebuild b/x11-misc/bbcd/bbcd-0.3.1-r5.ebuild
new file mode 100644
index 000000000000..87a0f10e9752
--- /dev/null
+++ b/x11-misc/bbcd/bbcd-0.3.1-r5.ebuild
@@ -0,0 +1,44 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic
+
+DESCRIPTION="Basic CD Player for blackbox wm"
+HOMEPAGE="http://tranber1.free.fr/bbcd.html"
+SRC_URI="http://tranber1.free.fr/${P}.tar.gz"
+LICENSE="GPL-2"
+
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~x86"
+IUSE=""
+
+RDEPEND=">=media-libs/libcdaudio-0.99.12-r4
+	x11-libs/libX11"
+DEPEND="${RDEPEND}
+	x11-libs/libXt"
+
+PATCHES=(
+	"${FILESDIR}"/${P}_${PV}a.diff
+	"${FILESDIR}"/${P}-gcc3.3.patch
+	"${FILESDIR}"/${P}-gcc4.3.patch
+)
+
+src_prepare() {
+	default
+	eautoreconf
+}
+
+src_configure() {
+	append-cxxflags -std=c++14
+	econf \
+		--with-x \
+		--x-includes=/usr/include/X11 \
+		--x-libraries=/usr/lib64/x86_64-linux-gnu
+}
+
+src_install() {
+	default
+	rm "${ED}/usr/share/bbtools/README.bbcd" || die
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 70c0ba493ee3..af32db34a8b0 100644
Binary files a/x11-terms/Manifest.gz and b/x11-terms/Manifest.gz differ
diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest
index 3ea236ddc574..72aaaddc4ea9 100644
--- a/x11-terms/kitty-shell-integration/Manifest
+++ b/x11-terms/kitty-shell-integration/Manifest
@@ -1 +1,2 @@
 DIST kitty-0.26.2.tar.xz 4716932 BLAKE2B fbbd1bbeb42bfb5be1348ead4605d45f93a90e31e707444c901b9f4c20b42d470c1e3cec9e0f135f04ad49bb472824fb7445932403127e8cbc639b5dac6ee982 SHA512 4bfb3d9438bb018dc10503be610df4e6e8bb1f9459b5131f46fde6279ba5423e44dbbcb86a2dc2602ee208266edc78074f6496e99761cf43f7081ea9e88175f7
+DIST kitty-0.26.3.tar.xz 4730520 BLAKE2B a2d8cccc76eb295256ac420700e941ac9cb0e79c9717a93226cc30db63ab047dcd0be2e11b36b44c7c15daa0b77a451242d32f71024cee724869ba8937b93dd5 SHA512 77a518cd3ec4bb059907f16d01068914951cadbbcf803dcbfae13cc9ce144f65a886d7e986c7191019a0be9ccf902f086c72a24287458d083cbd3fd136d2c589
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.3.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.3.ebuild
new file mode 100644
index 000000000000..4c3e987c411b
--- /dev/null
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.3.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Shell integration scripts for kitty, a GPU-based terminal emulator"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
+S="${WORKDIR}/kitty-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+RESTRICT="test" # intended to be ran on the full kitty package
+
+src_compile() { :; }
+
+src_install() {
+	# install the whole directory in the upstream suggested location
+	# for consistency (i.e. less variation between distros if someone
+	# ssh into Gentoo), then set symlinks to autoload where possible
+	# (these exit immediately if KITTY_SHELL_INTEGRATION is unset)
+	insinto /usr/share/kitty
+	doins -r shell-integration
+
+	dosym -r {/usr/share/kitty/shell-integration/bash,/etc/bash/bashrc.d}/kitty.bash
+
+	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_completions.d/kitty.fish
+	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_conf.d/kitty-shell-integration.fish
+
+	dosym -r /usr/share/{kitty/shell-integration/zsh/completions,zsh/site-functions}/_kitty
+	# zsh integration is handled automatically without needing to modify rc files,
+	# but may require user intervention depending on zsh invocation or if remote
+
+	# this is used internally by the ssh kitten and is not useful there
+	rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die
+}
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 3ea236ddc574..72aaaddc4ea9 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1 +1,2 @@
 DIST kitty-0.26.2.tar.xz 4716932 BLAKE2B fbbd1bbeb42bfb5be1348ead4605d45f93a90e31e707444c901b9f4c20b42d470c1e3cec9e0f135f04ad49bb472824fb7445932403127e8cbc639b5dac6ee982 SHA512 4bfb3d9438bb018dc10503be610df4e6e8bb1f9459b5131f46fde6279ba5423e44dbbcb86a2dc2602ee208266edc78074f6496e99761cf43f7081ea9e88175f7
+DIST kitty-0.26.3.tar.xz 4730520 BLAKE2B a2d8cccc76eb295256ac420700e941ac9cb0e79c9717a93226cc30db63ab047dcd0be2e11b36b44c7c15daa0b77a451242d32f71024cee724869ba8937b93dd5 SHA512 77a518cd3ec4bb059907f16d01068914951cadbbcf803dcbfae13cc9ce144f65a886d7e986c7191019a0be9ccf902f086c72a24287458d083cbd3fd136d2c589
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.26.3.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.26.3.ebuild
new file mode 100644
index 000000000000..35ff98034a87
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.26.3.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
+S="${WORKDIR}/kitty-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+RESTRICT="test" # intended to be ran on the full kitty package
+
+BDEPEND="sys-libs/ncurses"
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr/share/terminfo
+	tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die
+}
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index f6aeece75d47..385893a86dc9 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,2 +1,4 @@
 DIST kitty-0.26.2.tar.xz 4716932 BLAKE2B fbbd1bbeb42bfb5be1348ead4605d45f93a90e31e707444c901b9f4c20b42d470c1e3cec9e0f135f04ad49bb472824fb7445932403127e8cbc639b5dac6ee982 SHA512 4bfb3d9438bb018dc10503be610df4e6e8bb1f9459b5131f46fde6279ba5423e44dbbcb86a2dc2602ee208266edc78074f6496e99761cf43f7081ea9e88175f7
 DIST kitty-0.26.2.tar.xz.sig 566 BLAKE2B 4f36d131143ad4c1ea3dbdd7b094cbfd7ece133e573ec95714d5b778a80cb58b3b89ab02f575442aaf1618985e37528285009bb724721e5d48b1ffc611175672 SHA512 8ec0f237eb0b9f868ea703ab8b5cb85405f9360ad8e7402a0e5a3c4f3268a5a127359a9444c0e7cf05f364ea5dfeb31f9657a110fadc34bb6ed870ef939a4ada
+DIST kitty-0.26.3.tar.xz 4730520 BLAKE2B a2d8cccc76eb295256ac420700e941ac9cb0e79c9717a93226cc30db63ab047dcd0be2e11b36b44c7c15daa0b77a451242d32f71024cee724869ba8937b93dd5 SHA512 77a518cd3ec4bb059907f16d01068914951cadbbcf803dcbfae13cc9ce144f65a886d7e986c7191019a0be9ccf902f086c72a24287458d083cbd3fd136d2c589
+DIST kitty-0.26.3.tar.xz.sig 566 BLAKE2B 6e8e622bec031416b0f591c0b53f53ba874c977511c447ab625f52bc7fca04f1003ca5db4cc4138336f5afc4f729b2b8b6e0f5d77e296033422774665fbd5ba3 SHA512 4a8fd60ca1baa619790909243a620f816c44a28a8d889633c5b433af0f46cd1c92bcbcbbd9db942c385764387958db294cdeb3cdffc0369a79d56f41ccb81b57
diff --git a/x11-terms/kitty/kitty-0.26.3.ebuild b/x11-terms/kitty/kitty-0.26.3.ebuild
new file mode 100644
index 000000000000..3ee9cbb30121
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.26.3.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+else
+	inherit verify-sig
+	SRC_URI="
+		https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.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 ~x86"
+fi
+
+DESCRIPTION="Fast, feature-rich, GPU-based terminal"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+X test transfer wayland"
+REQUIRED_USE="
+	|| ( X wayland )
+	${PYTHON_REQUIRED_USE}"
+RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )"
+
+# dlopen: fontconfig,libglvnd
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/openssl:=
+	media-libs/fontconfig
+	media-libs/harfbuzz:=
+	media-libs/lcms:2
+	media-libs/libglvnd[X?]
+	media-libs/libpng:=
+	sys-apps/dbus
+	sys-libs/zlib:=
+	x11-libs/libxkbcommon[X?]
+	x11-misc/xkeyboard-config
+	~x11-terms/kitty-shell-integration-${PV}
+	~x11-terms/kitty-terminfo-${PV}
+	X? ( x11-libs/libX11 )
+	transfer? ( net-libs/librsync:= )
+	wayland? ( dev-libs/wayland )"
+DEPEND="
+	${RDEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXcursor
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+	)
+	wayland? ( dev-libs/wayland-protocols )"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-libs/ncurses
+	virtual/pkgconfig
+	test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') )
+	wayland? ( dev-util/wayland-scanner )"
+[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
+
+src_prepare() {
+	default
+
+	# seds unfortunately feel easier on maintainenance than patches here
+	sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
+		-e "$(usev !X '/gl_libs =/s/=.*/= []/')" \
+		-e "/num_workers =/s/=.*/= $(makeopts_jobs)/" \
+		-e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \
+		-i setup.py || die
+
+	if use !transfer; then
+		sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die
+		rm -r kittens/transfer || die
+	fi
+
+	# test relies on 'who' command which doesn't detect users with pid-sandbox
+	rm kitty_tests/utmp.py || die
+
+	# test may fail/hang depending on environment and shell initialization scripts
+	rm kitty_tests/{shell_integration,ssh}.py || die
+
+	# skip docs for live version
+	[[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die
+}
+
+src_compile() {
+	tc-export CC
+	export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
+
+	local conf=(
+		--disable-link-time-optimization
+		--ignore-compiler-warnings
+		--libdir-name=$(get_libdir)
+		--shell-integration="enabled no-rc"
+		--update-check-interval=0
+		--verbose
+	)
+
+	edo ${EPYTHON} setup.py linux-package "${conf[@]}"
+	use test && edo ${EPYTHON} setup.py build-launcher "${conf[@]}"
+
+	[[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die
+	rm -r linux-package/share/terminfo || die
+}
+
+src_test() {
+	KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty
+}
+
+src_install() {
+	insinto /usr
+	doins -r linux-package/.
+
+	fperms +x /usr/bin/kitty \
+		/usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick
+	optfeature "audio-based terminal bell support" media-libs/libcanberra
+	optfeature "opening links from the terminal" x11-misc/xdg-utils
+}
diff --git a/x11-themes/Manifest.gz b/x11-themes/Manifest.gz
index 354bbf0a32d4..4b8fcef1b029 100644
Binary files a/x11-themes/Manifest.gz and b/x11-themes/Manifest.gz differ
diff --git a/x11-themes/gnome-backgrounds/Manifest b/x11-themes/gnome-backgrounds/Manifest
index 5b36fbc699f5..5549d92c6049 100644
--- a/x11-themes/gnome-backgrounds/Manifest
+++ b/x11-themes/gnome-backgrounds/Manifest
@@ -1 +1,2 @@
 DIST gnome-backgrounds-42.0.tar.xz 51639368 BLAKE2B 3dc288732a91d53e2db9cfca5e529c3a6bda4d272645090751349485836a3c6807bdc071a9ae9ae58032265155a04c2b381cb7479fe913608cf9e39ff0ae79ed SHA512 31cfbc52ec96bc4ce77960620a895af7f10c1fc4d474b589d49f3d1198b41792ab443bf8d7a661e71778455ab066f034c7fb6655e96db028990de0788e464e1d
+DIST gnome-backgrounds-43.tar.xz 32816552 BLAKE2B b6b954ed102afd81e7ca1c370acb449b2ab4acec458306b4a740f2669037a9a8f741a9b4403cb509ad6df04cfa39ba6bed6b771e0b7d20d974a436480967de71 SHA512 e41e87e20da6a7d4c88d6b68832615709c3cf5d28fbb1a9c1a2af1db7e9c1db56ede141ac45df2164c6d919cb72f81e6e7d014bfe1f340759cd386c3a05217c2
diff --git a/x11-themes/gnome-backgrounds/gnome-backgrounds-43.ebuild b/x11-themes/gnome-backgrounds/gnome-backgrounds-43.ebuild
new file mode 100644
index 000000000000..e03c75cbe327
--- /dev/null
+++ b/x11-themes/gnome-backgrounds/gnome-backgrounds-43.ebuild
@@ -0,0 +1,14 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit gnome.org meson
+
+DESCRIPTION="A set of backgrounds packaged with the GNOME desktop"
+HOMEPAGE="https://gitlab.gnome.org/GNOME/gnome-backgrounds"
+
+LICENSE="CC-BY-SA-2.0 CC-BY-SA-3.0 CC-BY-2.0 CC-BY-4.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+BDEPEND=">=sys-devel/gettext-0.19.8"
diff --git a/x11-wm/Manifest.gz b/x11-wm/Manifest.gz
index 01a182974a90..551698e37dd7 100644
Binary files a/x11-wm/Manifest.gz and b/x11-wm/Manifest.gz differ
diff --git a/x11-wm/dwm/dwm-6.3.ebuild b/x11-wm/dwm/dwm-6.3.ebuild
index 555ed365accd..e7d213a52362 100644
--- a/x11-wm/dwm/dwm-6.3.ebuild
+++ b/x11-wm/dwm/dwm-6.3.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 	EGIT_REPO_URI="https://git.suckless.org/dwm"
 else
 	SRC_URI="https://dl.suckless.org/${PN}/${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm arm64 ppc ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"