Adding metadata

1002 files changed, 6889 insertions, 9096 deletions

diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index 6bfdbc24dbd2..24684ab9d829 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -5,3 +5,4 @@ DIST aws-cli-1.27.85.gh.tar.gz 2378716 BLAKE2B c3bc3294d11815eb7607020e78d0349a1
 DIST aws-cli-1.27.86.gh.tar.gz 2379304 BLAKE2B 8bca8deaf377def250e772bd7568f7d4b82b7be4ba951a95529b8b8eb13d9ac8be791a7e9588bb01fa7167d3304224e2db426f25e25d7af94de298dd5ebf673d SHA512 9c98965c03685ba806a16531c68ec75c043b8c94eb64238d7500894211e3e9b500d00111132122226502ad3ea588bf09ae470a862d6d97b880a06808c96dfe6d
 DIST aws-cli-1.27.87.gh.tar.gz 2381669 BLAKE2B eb279545fcab3ac279ee127acbd4e06f15d365bf0c4d9b17e682d852de81acf2b94ef197ed8444ca5d6ffb5a3ba814d6ace72bcf7ed956bfbbd955508942d6ec SHA512 23af96758d9664f3ae72f2abcb2c94817f2bd9a7b68564eb2eabbd7fb121247bedb77a3e5d24e04975ab5db101dee47bd5b6324152a6132891b542c402898c3a
 DIST aws-cli-1.27.88.gh.tar.gz 2382383 BLAKE2B a97e1235add4bf34b73e4def10771e54af03d6afb9a2a3ed4d4d78a8fdd26c07f400c6ead8afa926a4516069e6f42c2b08b335028ef3caccc9bca8ca2e783c06 SHA512 0eb1858ea6a6af408f16972c66778e84fc9e0f08cfb3734417fb747fb3505fde587954c2645309ba444bd5bf2ebb6a550569321afd3899844623f79d0a5cce8e
+DIST aws-cli-1.27.89.gh.tar.gz 2382599 BLAKE2B 3a2dae3cc1928e149dd605de1e9a350989e1cf4f813dc14466ba40c0a2747e69b6a8c5716d48f2526920798f0d341dcaa7ec0c2fd95af1b5decd3830814a243b SHA512 9a90c933e5ae3f25271ec369607cb6c44adf96dc9d324205714c9790b6744d7f2c8e4c6b901d4bb4f58b6871c315e0543b3f846cf530e7f95ed31d196f8c3326
diff --git a/app-admin/awscli/awscli-1.27.89.ebuild b/app-admin/awscli/awscli-1.27.89.ebuild
new file mode 100644
index 000000000000..62c19f3a63fb
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.89.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit bash-completion-r1 distutils-r1 multiprocessing
+
+MY_P=aws-cli-${PV}
+DESCRIPTION="Universal Command Line Environment for AWS"
+HOMEPAGE="
+	https://github.com/aws/aws-cli/
+	https://pypi.org/project/awscli/
+"
+SRC_URI="
+	https://github.com/aws/aws-cli/archive/${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+# botocore is x.(y+2).z
+BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 2)).$(ver_cut 3-)"
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/docutils[${PYTHON_USEDEP}]
+	dev-python/rsa[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	!app-admin/awscli-bin
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-forked[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+	# strip overzealous upper bounds on requirements
+	sed -i -e 's:,<[0-9.]*::' -e 's:==:>=:' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/functional/eks/test_kubeconfig.py::TestKubeconfigLoader::test_load_simple
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_env_only
+		tests/unit/customizations/eks/test_update_kubeconfig.py::TestKubeconfigSelector::test_choose_existing
+		tests/unit/customizations/eks/test_kubeconfig.py::TestKubeconfigValidator::test_valid
+	)
+
+	# integration tests require AWS credentials and Internet access
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)" --forked
+}
+
+python_install_all() {
+	newbashcomp bin/aws_bash_completer aws
+
+	insinto /usr/share/zsh/site-functions
+	newins bin/aws_zsh_completer.sh _aws
+
+	distutils-r1_python_install_all
+
+	rm "${ED}"/usr/bin/{aws.cmd,aws_bash_completer,aws_zsh_completer.sh} || die
+}
diff --git a/app-admin/puppet-agent/puppet-agent-7.23.0.ebuild b/app-admin/puppet-agent/puppet-agent-7.23.0.ebuild
index 096b3daf6369..3696f525d75c 100644
--- a/app-admin/puppet-agent/puppet-agent-7.23.0.ebuild
+++ b/app-admin/puppet-agent/puppet-agent-7.23.0.ebuild
@@ -11,7 +11,7 @@ arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/${PN:0:1}/${PN}/${PN}_${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 ~arm64"
 IUSE="puppetdb selinux"
 RESTRICT="strip"
 
diff --git a/app-admin/puppet/puppet-7.23.0.ebuild b/app-admin/puppet/puppet-7.23.0.ebuild
index 5c55684f787c..ca6e536b95e8 100644
--- a/app-admin/puppet/puppet-7.23.0.ebuild
+++ b/app-admin/puppet/puppet-7.23.0.ebuild
@@ -3,7 +3,7 @@
 
 EAPI="7"
 
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 RUBY_FAKEGEM_TASK_DOC="doc:all"
 RUBY_FAKEGEM_EXTRAINSTALL="locales"
@@ -16,7 +16,7 @@ SRC_URI="http://downloads.puppetlabs.com/puppet/${P}.tar.gz"
 
 LICENSE="Apache-2.0 GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 IUSE="augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax"
 RESTRICT="test"
 
diff --git a/app-admin/puppetdb/puppetdb-7.12.1.ebuild b/app-admin/puppetdb/puppetdb-7.12.1.ebuild
index 9d02f91ec4e8..06ae41fe587a 100644
--- a/app-admin/puppetdb/puppetdb-7.12.1.ebuild
+++ b/app-admin/puppetdb/puppetdb-7.12.1.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://downloads.puppetlabs.com/${PN}/${P}.tar.gz"
 LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND+=">=virtual/jdk-1.8.0"
 DEPEND+="acct-user/puppetdb
diff --git a/app-admin/puppetserver/puppetserver-7.9.5.ebuild b/app-admin/puppetserver/puppetserver-7.9.5.ebuild
index 98a750ee3a30..d633132c7a97 100644
--- a/app-admin/puppetserver/puppetserver-7.9.5.ebuild
+++ b/app-admin/puppetserver/puppetserver-7.9.5.ebuild
@@ -13,7 +13,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE="puppetdb"
 # will need the same keywords in puppet-agent (puppet-agent now has arm64)
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND+="
 		>=virtual/jdk-1.8.0
diff --git a/app-arch/zstd/Manifest b/app-arch/zstd/Manifest
index c039a1bd9168..a34aad325fec 100644
--- a/app-arch/zstd/Manifest
+++ b/app-arch/zstd/Manifest
@@ -1,4 +1,3 @@
 DIST zstd-1.4.9.tar.gz 1834843 BLAKE2B 907f492bd023db9459bdc292a0bc4d1b6336d92dd7041eb2b36668589c20fcb98c411b85d78f92cd16d9b4a000d9c4125b5f966a5ca777034ae78210e639315b SHA512 f529db9c094f9ae26428bf1fdfcc91c6d783d400980e0f0d802d2cf13c2be2931465ef568907e03841ff76a369a1447e7371f8799d8526edb9a513ba5c6db133
 DIST zstd-1.5.2.tar.gz 1950967 BLAKE2B 9d474e9fdcf7e5eb09d1f606712b05ca3001e8f6f7451254d8dba3f429101048532fd9c84a5b9083ae90d0457e9e1b1d48256581a1697e7db19b09d73595f070 SHA512 e107508a41fca50845cc2494e64adaba93efb95a2fa486fc962510a8ba4b2180d93067cae9870f119e88e5e8b28a046bc2240b0b23cdd8933d1fb1a6a9668c1e
 DIST zstd-1.5.4.gh.tar.gz 2161536 BLAKE2B ffc5fcbbdf4ab04bc14b5037308bf4e879d4cbaaf863462ea1e8af3f1b86b935ee6036e49298c83ac42b00472c003e32c263c977f0ae7d64f31d9ae63c5c28cb SHA512 2896a6dd6b60cc251720356babcbab6018c874eb2149121b26e28041496fc355a9cb5fd1b39c91558fcfbafb789b3d721264a0f9b5734f893d5f3cdf97016394
-DIST zstd-1.5.4.tar.gz 2178759 BLAKE2B 0c7ad42ebbf888bcd978eee95dc07f8e74c6b4ca1e1cec15ae110f5f57b66cb1d726896f71430e6219ef54ff90e722fc778147d5f77f4bff5395b0dc8b914885 SHA512 b6f64850ceb6cfed831fff3c43508d2a72338862a96dd9430b1d3ebbfcee40201c8b6dcf8b6b603e252bb96f3f283c9cb07da7f24414187f5f1fea3b51e01863
diff --git a/app-arch/zstd/files/zstd-1.5.4-crash-no-directory.patch b/app-arch/zstd/files/zstd-1.5.4-crash-no-directory.patch
new file mode 100644
index 000000000000..d64e1c1d34f0
--- /dev/null
+++ b/app-arch/zstd/files/zstd-1.5.4-crash-no-directory.patch
@@ -0,0 +1,115 @@
+https://github.com/facebook/zstd/issues/3523
+https://github.com/facebook/zstd/pull/3541
+
+From 50e8f55e7d5928af9c3411afdb4fbedb4d8f770d Mon Sep 17 00:00:00 2001
+From: "W. Felix Handte" <w@felixhandte.com>
+Date: Thu, 9 Mar 2023 12:46:37 -0500
+Subject: [PATCH 1/3] Fix Python 3.6 Incompatibility in CLI Tests
+
+--- a/tests/cli-tests/run.py
++++ b/tests/cli-tests/run.py
+@@ -535,7 +535,8 @@ def _run_script(self, script: str, cwd: str) -> None:
+             subprocess.run(
+                 args=[script],
+                 stdin=subprocess.DEVNULL,
+-                capture_output=True,
++                stdout=subprocess.PIPE,
++                stderr=subprocess.PIPE,
+                 cwd=cwd,
+                 env=env,
+                 check=True,
+
+From c4c3e11958aed4dc99ec22e3d31c405217575a8c Mon Sep 17 00:00:00 2001
+From: "W. Felix Handte" <w@felixhandte.com>
+Date: Thu, 9 Mar 2023 12:47:40 -0500
+Subject: [PATCH 2/3] Avoid Calling `setvbuf()` on Null File Pointer
+
+--- a/programs/fileio.c
++++ b/programs/fileio.c
+@@ -644,18 +644,24 @@ FIO_openDstFile(FIO_ctx_t* fCtx, FIO_prefs_t* const prefs,
+ #endif
+         if (f == NULL) {
+             DISPLAYLEVEL(1, "zstd: %s: %s\n", dstFileName, strerror(errno));
++        } else {
++            /* An increased buffer size can provide a significant performance
++             * boost on some platforms. Note that providing a NULL buf with a
++             * size that's not 0 is not defined in ANSI C, but is defined in an
++             * extension. There are three possibilities here:
++             * 1. Libc supports the extended version and everything is good.
++             * 2. Libc ignores the size when buf is NULL, in which case
++             *    everything will continue as if we didn't call `setvbuf()`.
++             * 3. We fail the call and execution continues but a warning
++             *    message might be shown.
++             * In all cases due execution continues. For now, I believe that
++             * this is a more cost-effective solution than managing the buffers
++             * allocations ourselves (will require an API change).
++             */
++            if (setvbuf(f, NULL, _IOFBF, 1 MB)) {
++                DISPLAYLEVEL(2, "Warning: setvbuf failed for %s\n", dstFileName);
++            }
+         }
+-        /* An increased buffer size can provide a significant performance boost on some platforms.
+-         * Note that providing a NULL buf with a size that's not 0 is not defined in ANSI C, but is defined
+-         * in an extension. There are three possibilities here -
+-         * 1. Libc supports the extended version and everything is good.
+-         * 2. Libc ignores the size when buf is NULL, in which case everything will continue as if we didn't
+-         *    call `setvbuf`.
+-         * 3. We fail the call and execution continues but a warning message might be shown.
+-         * In all cases due execution continues. For now, I believe that this is a more cost-effective
+-         * solution than managing the buffers allocations ourselves (will require an API change). */
+-        if(setvbuf(f, NULL, _IOFBF, 1 MB))
+-            DISPLAYLEVEL(2, "Warning: setvbuf failed for %s\n", dstFileName);
+         return f;
+     }
+ }
+
+From 957a0ae52d0f49eccd260a22ceb5f5dfed064e9f Mon Sep 17 00:00:00 2001
+From: "W. Felix Handte" <w@felixhandte.com>
+Date: Thu, 9 Mar 2023 12:48:11 -0500
+Subject: [PATCH 3/3] Add CLI Test
+
+--- /dev/null
++++ b/tests/cli-tests/file-stat/compress-file-to-dir-without-write-perm.sh
+@@ -0,0 +1,12 @@
++#!/bin/sh
++
++# motivated by issue #3523
++
++datagen > file
++mkdir out
++chmod 000 out
++
++zstd file -q --trace-file-stat -o out/file.zst
++zstd -tq out/file.zst
++
++chmod 777 out
+--- /dev/null
++++ b/tests/cli-tests/file-stat/compress-file-to-dir-without-write-perm.sh.stderr.exact
+@@ -0,0 +1,26 @@
++Trace:FileStat: > UTIL_isLink(file)
++Trace:FileStat: < 0
++Trace:FileStat: > UTIL_isConsole(2)
++Trace:FileStat: < 0
++Trace:FileStat: > UTIL_getFileSize(file)
++Trace:FileStat:  > UTIL_stat(-1, file)
++Trace:FileStat:  < 1
++Trace:FileStat: < 65537
++Trace:FileStat: > UTIL_stat(-1, file)
++Trace:FileStat: < 1
++Trace:FileStat: > UTIL_isDirectoryStat()
++Trace:FileStat: < 0
++Trace:FileStat: > UTIL_stat(-1, file)
++Trace:FileStat: < 1
++Trace:FileStat: > UTIL_isSameFile(file, out/file.zst)
++Trace:FileStat:  > UTIL_stat(-1, file)
++Trace:FileStat:  < 1
++Trace:FileStat:  > UTIL_stat(-1, out/file.zst)
++Trace:FileStat:  < 0
++Trace:FileStat: < 0
++Trace:FileStat: > UTIL_isRegularFile(out/file.zst)
++Trace:FileStat:  > UTIL_stat(-1, out/file.zst)
++Trace:FileStat:  < 0
++Trace:FileStat: < 0
++zstd: out/file.zst: Permission denied
++zstd: can't stat out/file.zst : Permission denied -- ignored 
+
diff --git a/app-arch/zstd/zstd-1.5.4-r3.ebuild b/app-arch/zstd/zstd-1.5.4-r3.ebuild
new file mode 100644
index 000000000000..a74b317a3e8d
--- /dev/null
+++ b/app-arch/zstd/zstd-1.5.4-r3.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit meson-multilib usr-ldscript
+
+DESCRIPTION="zstd fast compression library"
+HOMEPAGE="https://facebook.github.io/zstd/"
+# Drop .gh on next bump (>1.5.4), it's only here as we switched to release
+# tarball.
+SRC_URI="https://github.com/facebook/zstd/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz"
+S="${WORKDIR}"/${P}/build/meson
+
+LICENSE="|| ( BSD GPL-2 )"
+SLOT="0/1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+lzma lz4 static-libs test zlib"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	lzma? ( app-arch/xz-utils )
+	lz4? ( app-arch/lz4:= )
+	zlib? ( sys-libs/zlib )
+"
+DEPEND="${RDEPEND}"
+
+MESON_PATCHES=(
+	# Workaround until Valgrind bugfix lands
+	"${FILESDIR}"/${PN}-1.5.4-no-find-valgrind.patch
+	# Allow building tests w/o programs (useful for multilib)
+	"${FILESDIR}"/${PN}-1.5.4-tests-no-programs.patch
+)
+
+PATCHES=(
+	# Fix build w/o zlib, bug #894058
+	"${FILESDIR}"/${P}-fix-no-zlib-build.patch
+	"${FILESDIR}"/${P}-crash-no-directory.patch
+)
+
+src_prepare() {
+	cd "${WORKDIR}"/${P} || die
+	default
+
+	cd "${S}" || die
+	eapply "${MESON_PATCHES[@]}"
+}
+
+multilib_src_configure() {
+	local native_file="${T}"/meson.${CHOST}.${ABI}.ini.local
+
+	# This replaces the no-find-valgrind patch once bugfix lands in a meson
+	# release + we can BDEPEND on it (https://github.com/mesonbuild/meson/pull/11372)
+	cat >> ${native_file} <<-EOF || die
+	[binaries]
+	valgrind='valgrind-falseified'
+	EOF
+
+	local emesonargs=(
+		-Ddefault_library=$(multilib_native_usex static-libs both shared)
+
+		$(meson_native_true bin_programs)
+		$(meson_native_true bin_contrib)
+		$(meson_use test bin_tests)
+
+		$(meson_native_use_feature zlib)
+		$(meson_native_use_feature lzma)
+		$(meson_native_use_feature lz4)
+
+		--native-file "${native_file}"
+	)
+
+	meson_src_configure
+}
+
+multilib_src_install() {
+	meson_src_install
+
+	multilib_is_native_abi && gen_usr_ldscript -a zstd
+}
diff --git a/app-arch/zstd/zstd-1.5.4.ebuild b/app-arch/zstd/zstd-1.5.4.ebuild
deleted file mode 100644
index b933a78b2570..000000000000
--- a/app-arch/zstd/zstd-1.5.4.ebuild
+++ /dev/null
@@ -1,82 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-minimal toolchain-funcs usr-ldscript
-
-DESCRIPTION="zstd fast compression library"
-HOMEPAGE="https://facebook.github.io/zstd/"
-SRC_URI="https://github.com/facebook/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( BSD GPL-2 )"
-SLOT="0/1"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-IUSE="+lzma lz4 static-libs zlib"
-
-RDEPEND="
-	lzma? ( app-arch/xz-utils )
-	lz4? ( app-arch/lz4 )
-	zlib? ( sys-libs/zlib )
-"
-DEPEND="${RDEPEND}"
-
-src_prepare() {
-	default
-	multilib_copy_sources
-}
-
-mymake() {
-	emake \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		AR="$(tc-getAR)" \
-		PREFIX="${EPREFIX}/usr" \
-		LIBDIR="${EPREFIX}/usr/$(get_libdir)" \
-		V=1 \
-		HAVE_LZMA="$(multilib_native_usex lzma 1 0)" \
-		HAVE_LZ4="$(multilib_native_usex lz4 1 0)" \
-		HAVE_ZLIB="$(multilib_native_usex zlib 1 0)" \
-		"${@}"
-}
-
-multilib_src_compile() {
-	local libzstd_targets=( libzstd{,.a}-mt )
-
-	mymake -C lib ${libzstd_targets[@]} libzstd.pc
-
-	if multilib_is_native_abi ; then
-		mymake zstd
-		mymake -C contrib/pzstd
-	fi
-}
-
-multilib_src_test() {
-	if multilib_is_native_abi ; then
-		# 'test' runs more tests than 'check'.
-		mymake -C tests test
-		mymake -C contrib/pzstd test
-	else
-		mymake check
-	fi
-}
-
-multilib_src_install() {
-	mymake -C lib DESTDIR="${D}" install
-
-	if multilib_is_native_abi ; then
-		mymake -C programs DESTDIR="${D}" install
-
-		gen_usr_ldscript -a zstd
-
-		mymake -C contrib/pzstd DESTDIR="${D}" install
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	if ! use static-libs; then
-		find "${ED}" -name "*.a" -delete || die
-	fi
-}
diff --git a/app-containers/docker-cli/Manifest b/app-containers/docker-cli/Manifest
index 4435c5ed58a5..004811e7d36f 100644
--- a/app-containers/docker-cli/Manifest
+++ b/app-containers/docker-cli/Manifest
@@ -1 +1,2 @@
 DIST docker-cli-20.10.22.tar.gz 7590020 BLAKE2B ab003a9af2b441a9bad9c27345dea2e82087cfc8a8ac865adeb2e47e91be4bd9b27f499ae95b0ddcddb66d27c3498938682dcd10d5e3bef41fc18ce1f034a476 SHA512 550346904d172725f48c4de0e34fa95123c7022b14980d30cd01df0c9e154ac817f19e24b61538f8cbc23db090de56977c8b885b96f99583e8a5f773691280a6
+DIST docker-cli-23.0.1.tar.gz 6215114 BLAKE2B 4449de9fdc64f45daf6dbbe762bf6e2320aa32bed1aba90a3c1c81df343f3c3a667e62e950896f5d2b12e33d758507b4cec7d6ed3b06c3815ad528be2c47510a SHA512 77d30945160dc4d9c50354c57d2efed49b99c872c8782f6ad121e6dc1489899d8967ba95cca36499c1b59bc5ef71f4a6b516c635b0cf41b50722bb71597aa496
diff --git a/app-containers/docker-cli/docker-cli-23.0.1.ebuild b/app-containers/docker-cli/docker-cli-23.0.1.ebuild
new file mode 100644
index 000000000000..78a598ba9c32
--- /dev/null
+++ b/app-containers/docker-cli/docker-cli-23.0.1.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+GIT_COMMIT=a5ee5b1dfc
+EGO_PN="github.com/docker/cli"
+MY_PV=${PV/_/-}
+inherit bash-completion-r1  golang-vcs-snapshot
+
+DESCRIPTION="the command line binary for docker"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="https://github.com/docker/cli/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+# KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="hardened selinux"
+
+RDEPEND="!<app-containers/docker-20.10.1
+	selinux? ( sec-policy/selinux-docker )"
+BDEPEND="
+	>=dev-lang/go-1.16.6
+	dev-go/go-md2man"
+
+RESTRICT="installsources strip test"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+src_prepare() {
+	default
+	sed -i 's@dockerd\?\.exe@@g' contrib/completion/bash/docker || die
+}
+
+src_compile() {
+	export DISABLE_WARN_OUTSIDE_CONTAINER=1
+	export GOPATH="${WORKDIR}/${P}"
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
+		emake \
+		LDFLAGS="$(usex hardened '-extldflags -fno-PIC' '')" \
+		VERSION="${PV}" \
+		GITCOMMIT="${GIT_COMMIT}" \
+		dynbinary
+
+	# build man pages
+	# see "cli/scripts/docs/generate-man.sh" (which also does "go get" for go-md2man)
+	mkdir -p ./man/man1 || die "mkdir failed"
+	go build -o "${T}"/gen-manpages ./man ||
+		die 'build gen-manpages failed'
+	"${T}"/gen-manpages --root "$(pwd)" --target "$(pwd)"/man/man1 ||
+		die 'gen-manpages failed'
+	./man/md2man-all.sh -q ||
+		die 'md2man-all.sh failed'
+}
+
+src_install() {
+	dobin build/docker
+	doman man/man*/*
+	dobashcomp contrib/completion/bash/*
+	bashcomp_alias docker dockerd
+	insinto /usr/share/fish/vendor_completions.d/
+	doins contrib/completion/fish/docker.fish
+	insinto /usr/share/zsh/site-functions
+	doins contrib/completion/zsh/_*
+}
diff --git a/app-containers/docker-compose/Manifest b/app-containers/docker-compose/Manifest
index 8a8da99c8ed6..c3b083cdbdbd 100644
--- a/app-containers/docker-compose/Manifest
+++ b/app-containers/docker-compose/Manifest
@@ -1,3 +1,5 @@
 DIST docker-compose-1.29.2.gh.tar.gz 320320 BLAKE2B 2d1a6375127fa09661822f7148665161b45bbd234c93444ae31c1d926513fcbc9fb845f8af01d8f11788f24b7517bff5f6cea2a5da9ade897891f2dd728f26bd SHA512 09f2ae2ae7a17ab5fb3e22580f7a80f1a8253f7ad9fc8f29aca432911bcde46ed22030ff3073cdd7eff3d55aaba17f56e628a178ec05c3a9b4f28495d6045111
 DIST docker-compose-2.12.2-deps.tar.xz 139592724 BLAKE2B fd0e375e9cefe802d6d557763838959712f31391c2ac4e5e41d37ce2b6df209c35e86f255197ccb39ca04dc9ea9b04de29347570d0d1b0ed5a0b2d094c5e24a7 SHA512 af4e431dbb4735fa1a2aff2271e052479b4e4dac83f2d7a733aac9aab0ac33e00499d81b6c8a6a36aa330618a89c44993c5b27349752678ce1ac41921f12dfbe
 DIST docker-compose-2.12.2.tar.gz 305198 BLAKE2B a39a0c2266abc442f1c65ac00da9dd380df85d2aaa9429898461f12138fe64a7a6c74a45b3bb734419b7093ec69a44b49dfc57ff264a2d3cb576a78a0720db03 SHA512 dfb82ecc5a984d7193da164924c1e430d07b6378028dac7264b8084da2e315e5c5091803a5db79fe27ed06b002c62b295d873b9371bd19d4550a37a28f8ec952
+DIST docker-compose-2.16.0-deps.tar.xz 194381032 BLAKE2B 69f06124ac0b2e520b9948e4aab48c0ee9a9c5bef62ca70d70695dfe2ea3c51f69ec2b45f3e1b180b314d520a5d7028d81d5b2d760a747cb2c935c9621be374b SHA512 fd552426ac6befc55efd7dd505dc70a512dd736f12395cf7f107bdd508f95d4bf37d78ebf05e9daa4ac25fce0139c988ffd90cf2822fea8d7cf6666b6b834f8e
+DIST docker-compose-2.16.0.tar.gz 302946 BLAKE2B 3f2e03151be62982749c884af574f13798c2a85ffdf2736641a1df165fcd80c29fa611ad55a0655de6c5cf911783cd3b98392ddc4375b09da0179d774eea4959 SHA512 2158c829de298529e3192cb8e201c554f89fa7554a81eae858470db30b41d03925aa4dce9ef6d22c295625abf67ab181f851f05818dc76e2a5d6c46554d5ca3f
diff --git a/app-containers/docker-compose/docker-compose-2.16.0.ebuild b/app-containers/docker-compose/docker-compose-2.16.0.ebuild
new file mode 100644
index 000000000000..ff968eb11724
--- /dev/null
+++ b/app-containers/docker-compose/docker-compose-2.16.0.ebuild
@@ -0,0 +1,49 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit bash-completion-r1 go-module
+MY_PV=${PV/_/-}
+
+DESCRIPTION="Multi-container orchestration for Docker"
+HOMEPAGE="https://github.com/docker/compose"
+SRC_URI="https://github.com/docker/compose/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="Apache-2.0"
+SLOT="2"
+# KEYWORDS="~amd64 ~arm64"
+
+RDEPEND=">=app-containers/docker-cli-23.0.0"
+
+S="${WORKDIR}/compose-${MY_PV}"
+
+src_prepare() {
+	default
+	# do not strip
+	sed -i -e 's/-s -w//' Makefile || die
+}
+
+src_compile() {
+	emake VERSION=v${PV}
+}
+
+src_test() {
+	emake test
+}
+
+src_install() {
+	exeinto /usr/libexec/docker/cli-plugins
+	doexe bin/build/docker-compose
+	dodoc README.md
+}
+
+pkg_postinst() {
+	ewarn
+	ewarn "docker-compose 2.x is a sub command of docker"
+	ewarn "Use 'docker compose' from the command line instead of"
+	ewarn "'docker-compose'"
+	ewarn "If you need to keep 1.x around, please run the following"
+	ewarn "command before your next --depclean"
+	ewarn "# emerge --noreplace docker-compose:0"
+}
diff --git a/app-containers/docker-proxy/Manifest b/app-containers/docker-proxy/Manifest
index e5a037f6fb8b..23d1fcb131b9 100644
--- a/app-containers/docker-proxy/Manifest
+++ b/app-containers/docker-proxy/Manifest
@@ -1 +1,2 @@
 DIST docker-proxy-0.8.0_p20220601.tar.gz 3154283 BLAKE2B 7651e1862acf60988f6a8bdf3c0befc9b01a388aebda2b86610109bb6affe0d9c64d2750a911f0d1856be0dba970e9e92de2a0d393cc5c3a581d4253c574a623 SHA512 d3d9888f39a9247b6e773b0bfe63e6d248c5c155e7032cdbdd5cfacf995cb6b4cf2f0fb51e09c4554a4b994e3c3d7fc9cd2fde6cf8dda34fba6aa07218ac959c
+DIST docker-proxy-0.8.0_p20230118.tar.gz 3154267 BLAKE2B 307799d9dab73ed3ed3e537a247d70a65d9b4a51db69ae09518eb9daee949f78478ec104751d088717ca17171f604ff5c450198cc24e79cca266a1c7f61800ad SHA512 079eee720a4e755639e39fd8764f380549e715cbd6be0b46a102771a09f6cce5f085f7e568429c8c35a46f09948aea3e60de5ba2e32e22f0ee1fd9559c2d58f6
diff --git a/app-containers/docker-proxy/docker-proxy-0.8.0_p20230118.ebuild b/app-containers/docker-proxy/docker-proxy-0.8.0_p20230118.ebuild
new file mode 100644
index 000000000000..eb6dafa255b2
--- /dev/null
+++ b/app-containers/docker-proxy/docker-proxy-0.8.0_p20230118.ebuild
@@ -0,0 +1,30 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/moby/libnetwork
+GIT_COMMIT=05b93e0d3a95952f70c113b0bc5bdb538d7afdd7
+inherit golang-vcs-snapshot
+
+DESCRIPTION="Docker container networking"
+HOMEPAGE="https://github.com/docker/libnetwork"
+SRC_URI="https://github.com/moby/libnetwork/archive/${GIT_COMMIT}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+
+S=${WORKDIR}/${P}/src/${EGO_PN}
+
+# needs dockerd
+RESTRICT="strip test"
+
+src_compile() {
+	GO111MODULE=auto GOPATH="${WORKDIR}/${P}" \
+		go build -o "bin/docker-proxy" ./cmd/proxy || die
+}
+
+src_install() {
+	dobin bin/docker-proxy
+	dodoc README.md CHANGELOG.md
+}
diff --git a/app-containers/docker/Manifest b/app-containers/docker/Manifest
index 53081c19722e..6d3134907aff 100644
--- a/app-containers/docker/Manifest
+++ b/app-containers/docker/Manifest
@@ -1 +1,2 @@
 DIST docker-20.10.22.tar.gz 11232083 BLAKE2B 89dea21be77beb00a5c7fde382f1621558c676c63a85cac9664ec04130b875db649b84433ef2d9a0ca9ee221bf38a46b3af85ad6bfe920cf22a15d0cac450b99 SHA512 81aec7faedced07718e3e228e999c4774fd293cedfacd272798a0057177ddca5322a701d0f644777a69b87140cd7a7194aa93a524507f202d050eb30b1a4142c
+DIST docker-23.0.1.tar.gz 13612828 BLAKE2B ad5ff3a3c722b21e7cb0f6bab52fd66f4c0df185699b057d081cd49ee56cec3eda18d94f4236f45e57c2190831945f67c81b90a136231d6dc067ddad69a01625 SHA512 135e312b76fbd61c425713c51b1b9622491d1d03264cd5100296fec6c00778bf7d9c2c7cb0522d0474753b797a6e87552b47dad7e05e44400561a833bc8616f0
diff --git a/app-containers/docker/docker-23.0.1.ebuild b/app-containers/docker/docker-23.0.1.ebuild
new file mode 100644
index 000000000000..e8c53f5f178b
--- /dev/null
+++ b/app-containers/docker/docker-23.0.1.ebuild
@@ -0,0 +1,348 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+EGO_PN=github.com/docker/docker
+MY_PV=${PV/_/-}
+GIT_COMMIT=6051f14291
+inherit linux-info systemd udev golang-vcs-snapshot
+
+DESCRIPTION="The core functions you need to create Docker images and run Docker containers"
+HOMEPAGE="https://www.docker.com/"
+SRC_URI="https://github.com/moby/moby/archive/v${MY_PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+IUSE="apparmor aufs btrfs +container-init device-mapper hardened
+overlay seccomp selinux"
+
+DEPEND="
+	acct-group/docker
+	>=dev-db/sqlite-3.7.9:3
+	apparmor? ( sys-libs/libapparmor )
+	btrfs? ( >=sys-fs/btrfs-progs-3.16.1 )
+	device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] )
+	seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+"
+
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#runtime-dependencies
+# https://github.com/moby/moby/blob/master/project/PACKAGERS.md#optional-dependencies
+# https://github.com/moby/moby/tree/master//hack/dockerfile/install
+# make sure docker-proxy is pinned to exact version from ^,
+# for appropriate branchch/version of course
+RDEPEND="
+	${DEPEND}
+	>=net-firewall/iptables-1.4
+	sys-process/procps
+	>=dev-vcs/git-1.7
+	>=app-arch/xz-utils-4.9
+	dev-libs/libltdl
+	>=app-containers/containerd-1.6.15[apparmor?,btrfs?,device-mapper?,seccomp?]
+	~app-containers/docker-proxy-0.8.0_p20230118
+	container-init? ( >=sys-process/tini-0.19.0[static] )
+	selinux? ( sec-policy/selinux-docker )
+"
+
+# https://github.com/docker/docker/blob/master/project/PACKAGERS.md#build-dependencies
+BDEPEND="
+	>=dev-lang/go-1.16.12
+	dev-go/go-md2man
+	virtual/pkgconfig
+"
+# tests require running dockerd as root and downloading containers
+RESTRICT="installsources strip test"
+
+S="${WORKDIR}/${P}/src/${EGO_PN}"
+
+# https://bugs.gentoo.org/748984 https://github.com/etcd-io/etcd/pull/12552
+PATCHES=(
+	"${FILESDIR}/0001-Openrc-Depend-on-containerd-init-script.patch"
+)
+
+pkg_setup() {
+	# this is based on "contrib/check-config.sh" from upstream's sources
+	# required features.
+	CONFIG_CHECK="
+		~NAMESPACES ~NET_NS ~PID_NS ~IPC_NS ~UTS_NS
+		~CGROUPS ~CGROUP_CPUACCT ~CGROUP_DEVICE ~CGROUP_FREEZER ~CGROUP_SCHED ~CPUSETS ~MEMCG
+		~KEYS
+		~VETH ~BRIDGE ~BRIDGE_NETFILTER
+		~IP_NF_FILTER ~IP_NF_TARGET_MASQUERADE
+		~NETFILTER_XT_MATCH_ADDRTYPE
+		~NETFILTER_XT_MATCH_CONNTRACK
+		~NETFILTER_XT_MATCH_IPVS
+		~NETFILTER_XT_MARK
+		~IP_NF_NAT ~NF_NAT
+		~POSIX_MQUEUE
+	"
+	WARNING_POSIX_MQUEUE="CONFIG_POSIX_MQUEUE: is required for bind-mounting /dev/mqueue into containers"
+
+	if kernel_is lt 4 8; then
+		CONFIG_CHECK+="
+			~DEVPTS_MULTIPLE_INSTANCES
+		"
+	fi
+
+	if kernel_is le 5 1; then
+		CONFIG_CHECK+="
+			~NF_NAT_IPV4
+		"
+	fi
+
+	if kernel_is le 5 2; then
+		CONFIG_CHECK+="
+			~NF_NAT_NEEDED
+		"
+	fi
+
+	if kernel_is ge 4 15; then
+		CONFIG_CHECK+="
+			~CGROUP_BPF
+		"
+	fi
+
+	# optional features
+	CONFIG_CHECK+="
+		~USER_NS
+	"
+
+	if use seccomp; then
+		CONFIG_CHECK+="
+			~SECCOMP ~SECCOMP_FILTER
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~CGROUP_PIDS
+		~MEMCG_SWAP
+	"
+
+	if kernel_is le 5 8; then
+		CONFIG_CHECK+="
+			~MEMCG_SWAP_ENABLED
+		"
+	fi
+
+	CONFIG_CHECK+="
+	~!LEGASY_SYSCALL_NATIVE
+	~LEGASY_SYSCALL_emulate
+	~!LEGASY_SYSCALL_none
+	"
+	WARNING_LEGASY_SYSCALL_NONE="CONFIG_LEGASY_SYSCALL_NONE enabled: \
+		Containers with <=glibc 2.13 will not work"
+
+	if kernel_is le 4 5; then
+		CONFIG_CHECK+="
+			~MEMCG_KMEM
+		"
+	fi
+
+	if kernel_is lt 5; then
+		CONFIG_CHECK+="
+			~IOSCHED_CFQ ~CFQ_GROUP_IOSCHED
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~BLK_CGROUP ~BLK_DEV_THROTTLING
+		~CGROUP_PERF
+		~CGROUP_HUGETLB
+		~NET_CLS_CGROUP ~CGROUP_NET_PRIO
+		~CFS_BANDWIDTH ~FAIR_GROUP_SCHED ~RT_GROUP_SCHED
+		~IP_NF_TARGET_REDIRECT
+		~IP_VS
+		~IP_VS_NFCT
+		~IP_VS_PROTO_TCP
+		~IP_VS_PROTO_UDP
+		~IP_VS_RR
+		~SECURITY_SELINUX
+		~SECURITY_APPARMOR
+	"
+
+	# if ! is_set EXT4_USE_FOR_EXT2; then
+	#	check_flags EXT3_FS EXT3_FS_XATTR EXT3_FS_POSIX_ACL EXT3_FS_SECURITY
+	#	if ! is_set EXT3_FS || ! is_set EXT3_FS_XATTR || ! is_set EXT3_FS_POSIX_ACL || ! is_set EXT3_FS_SECURITY; then
+	#		echo "    $(wrap_color '(enable these ext3 configs if you are using ext3 as backing filesystem)' bold black)"
+	#	fi
+	# fi
+
+	CONFIG_CHECK+="
+		~EXT4_FS ~EXT4_FS_POSIX_ACL ~EXT4_FS_SECURITY
+	"
+
+	# if ! is_set EXT4_FS || ! is_set EXT4_FS_POSIX_ACL || ! is_set EXT4_FS_SECURITY; then
+	#	if is_set EXT4_USE_FOR_EXT2; then
+	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext3 or ext4 as backing filesystem' bold black)"
+	#	else
+	#		echo "    $(wrap_color 'enable these ext4 configs if you are using ext4 as backing filesystem' bold black)"
+	#	fi
+	# fi
+
+	# network drivers
+	CONFIG_CHECK+="
+		~VXLAN ~BRIDGE_VLAN_FILTERING
+		~CRYPTO ~CRYPTO_AEAD ~CRYPTO_GCM ~CRYPTO_SEQIV ~CRYPTO_GHASH
+		~XFRM ~XFRM_USER ~XFRM_ALGO ~INET_ESP
+	"
+	if kernel_is le 5 3; then
+		CONFIG_CHECK+="
+			~INET_XFRM_MODE_TRANSPORT
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~IPVLAN
+		"
+	CONFIG_CHECK+="
+		~MACVLAN ~DUMMY
+		"
+	CONFIG_CHECK+="
+		~NF_NAT_FTP ~NF_CONNTRACK_FTP ~NF_NAT_TFTP ~NF_CONNTRACK_TFTP
+	"
+
+	# storage drivers
+	if use aufs; then
+		CONFIG_CHECK+="
+			~AUFS_FS
+		"
+		ERROR_AUFS_FS="CONFIG_AUFS_FS: is required to be set if and only if aufs is patched to kernel instead of using standalone"
+	fi
+
+	if use btrfs; then
+		CONFIG_CHECK+="
+			~BTRFS_FS
+			~BTRFS_FS_POSIX_ACL
+		"
+	fi
+
+	if use device-mapper; then
+		CONFIG_CHECK+="
+			~BLK_DEV_DM ~DM_THIN_PROVISIONING
+		"
+	fi
+
+	CONFIG_CHECK+="
+		~OVERLAY_FS
+	"
+
+	linux-info_pkg_setup
+}
+
+src_compile() {
+	export DOCKER_GITCOMMIT="${GIT_COMMIT}"
+	export GOPATH="${WORKDIR}/${P}"
+	export VERSION=${PV}
+
+	# setup CFLAGS and LDFLAGS for separate build target
+	# see https://github.com/tianon/docker-overlay/pull/10
+	export CGO_CFLAGS="-I${ESYSROOT}/usr/include"
+	export CGO_LDFLAGS="-L${ESYSROOT}/usr/$(get_libdir)"
+
+	# let's set up some optional features :)
+	export DOCKER_BUILDTAGS=''
+	for gd in aufs btrfs device-mapper overlay; do
+		if ! use $gd; then
+			DOCKER_BUILDTAGS+=" exclude_graphdriver_${gd//-/}"
+		fi
+	done
+
+	for tag in apparmor seccomp; do
+		if use $tag; then
+			DOCKER_BUILDTAGS+=" $tag"
+		fi
+	done
+
+	if use hardened; then
+		sed -i "s/EXTLDFLAGS_STATIC='/&-fno-PIC /" hack/make.sh || die
+		grep -q -- '-fno-PIC' hack/make.sh || die 'hardened sed failed'
+		sed  "s/LDFLAGS_STATIC_DOCKER='/&-extldflags -fno-PIC /" \
+			-i hack/make/dynbinary-daemon || die
+		grep -q -- '-fno-PIC' hack/make/dynbinary-daemon || die 'hardened sed failed'
+	fi
+
+	# build daemon
+	./hack/make.sh dynbinary || die 'dynbinary failed'
+}
+
+src_install() {
+	dosym containerd /usr/bin/docker-containerd
+	dosym containerd-shim /usr/bin/docker-containerd-shim
+	dosym runc /usr/bin/docker-runc
+	use container-init && dosym tini /usr/bin/docker-init
+	newbin bundles/dynbinary-daemon/dockerd dockerd
+
+	newinitd contrib/init/openrc/docker.initd docker
+	newconfd contrib/init/openrc/docker.confd docker
+
+	systemd_dounit contrib/init/systemd/docker.{service,socket}
+
+	udev_dorules contrib/udev/*.rules
+
+	dodoc AUTHORS CONTRIBUTING.md NOTICE README.md
+	dodoc -r docs/*
+
+	# note: intentionally not using "doins" so that we preserve +x bits
+	dodir /usr/share/${PN}/contrib
+	cp -R contrib/* "${ED}/usr/share/${PN}/contrib"
+}
+
+pkg_postinst() {
+	udev_reload
+
+	elog
+	elog "To use Docker, the Docker daemon must be running as root. To automatically"
+	elog "start the Docker daemon at boot:"
+	if systemd_is_booted || has_version sys-apps/systemd; then
+		elog "  systemctl enable docker.service"
+	else
+		elog "  rc-update add docker default"
+	fi
+	elog
+	elog "To use Docker as a non-root user, add yourself to the 'docker' group:"
+	elog '  usermod -aG docker <youruser>'
+	elog
+
+	if use device-mapper; then
+		elog " Devicemapper storage driver has been deprecated"
+		elog " It will be removed in a future release"
+		elog
+	fi
+
+	if use overlay; then
+		elog " Overlay storage driver/USEflag has been deprecated"
+		elog " in favor of overlay2 (enabled unconditionally)"
+		elog
+	fi
+
+	if has_version sys-fs/zfs; then
+		elog " ZFS storage driver is available"
+		elog " Check https://docs.docker.com/storage/storagedriver/zfs-driver for more info"
+		elog
+	fi
+
+	if use cli; then
+		ewarn "Starting with docker 20.10.2, docker has been split into"
+		ewarn "two packages upstream, so Gentoo has followed suit."
+		ewarn
+		ewarn "app-containers/docker contains the daemon and"
+		ewarn "app-containers/docker-cli contains the docker command."
+		ewarn
+		ewarn "docker currently installs docker-cli using the cli use flag."
+		ewarn
+		ewarn "This use flag is temporary, so you need to take the"
+		ewarn "following actions:"
+		ewarn
+		ewarn "First, disable the cli use flag for app-containers/docker"
+		ewarn
+		ewarn "Then, if you need docker-cli and docker on the same machine,"
+		ewarn "run the following command:"
+		ewarn
+		ewarn "# emerge --noreplace docker-cli"
+		ewarn
+	fi
+}
+
+pkg_postrm() {
+	udev_reload
+}
diff --git a/app-editors/vscode/Manifest b/app-editors/vscode/Manifest
index 9e2bf57febf2..fca36d342f00 100644
--- a/app-editors/vscode/Manifest
+++ b/app-editors/vscode/Manifest
@@ -1,9 +1,6 @@
-DIST vscode-1.75.0-amd64.tar.gz 138952948 BLAKE2B 892c2ece1bfb1d2dc4fea2c3a6c062688add04f3ceca344988d240edbc4f358100bb4caa17eadc9568dbd1c3581595eb3fadd527727c02d57b63e5fd7a88533b SHA512 f4f26d5fc9c4cf8faf631ff5a0a48d446013faf33a1e932d3e8023b967dd078c370c57dff1791d97bfdeda0e92993d1aa94dce9cfeda4745bdc9c0a1cfb7aed2
-DIST vscode-1.75.0-arm.tar.gz 118400806 BLAKE2B d1c930bb871c7bbf7dccd8e3a0da9fc903dfad2066c5d8cbceb9ad3adfeb4d59089b35c75c4d5650efeaf7bb7fa9f2c84b2a499610fab3d09dc18d59122b5a47 SHA512 cdfa12e8dffdef50d3e17f58b0d516318d0e5e114b0556285d92ec81ceb2b78cea9affe9719416f7f60eea385cb49caf6879e3fd9c8d2fbf0849a1d1d9ccd704
-DIST vscode-1.75.0-arm64.tar.gz 128013515 BLAKE2B 77c2663e01397086e3917dae8e0ec3663969cf5e36135fbc7bc264f21ffc31197e5dc3dda49b3e4c2d9daf1f39d110b5c467590157ebd4d87986771bca3268c5 SHA512 0e4b4a2b2b273e590bd210d186b255a3e48ec0851c38ff27063f115088f7cf5375b14fd075b45f5d4ceb525f04c2d3fabbdd0d6b7bc192b8f6da269311b3634d
-DIST vscode-1.75.1-amd64.tar.gz 138940849 BLAKE2B 60e47682ec0073b6a0e3ffa1c9e0f151cc27c88d199afdd7fa97fd835bdbc961817eae8e17f973d0cb20cae072d02754c53f5687d6996dbee420f17332c1f43b SHA512 68498083c022252a4cecf7db505a68e25137eed3451af474cff7a1094340d64b087ca101df8cb5af5649bcd6460e219eb28f1c78604864dd40507c809e6edcc7
-DIST vscode-1.75.1-arm.tar.gz 118369140 BLAKE2B cf0a1ce9f9bb3cdd329abfd35b67457909da43c1b5887c08815d358367dc20e4231901dbd97ae854db5b78c15f6488ca0d29357af9e77ec419fc93f1c69b41cb SHA512 f8576c9e037c6ba5488c40b6a2c486a5521e65a73ef214685efa54761b9da2e20839e859f9612b3e3403bc574c87f7634a6cdfb852623c1ce18116c0aba87f23
-DIST vscode-1.75.1-arm64.tar.gz 128000146 BLAKE2B 8729178790c06b44c7a626e075cc9071a0489452157ddefcaa3c8c3039360598486d12a57b15a778f4307aa9fc28b2e201d78e28662ef83dfc3562430c63ac05 SHA512 f8b2abba64da24bf0044f7f179ec63aab94b0b52f0a42badd0df81108593aa47cb2ab343dba21ac78e7dc32d9691816a491002e2f534afc2fd2a53714f9da872
 DIST vscode-1.76.0-amd64.tar.gz 133931108 BLAKE2B ab2c5dc571b631fd19cb5457eb74de1c56a83f4e0d65d53b26747a3ef99cdeb164f04f2577bb9f345cd1e88d52c73c21eedb73bbd5d996d161a40d414838475d SHA512 2c1baca4d84dcd1abb5f7e74e1e6c9faa4cc3df83014bae94b2e5c8a1a3909decbc75f707b43562b994e50b08cb00ac1ba5bbb5aee0c26f227b43a590b93529d
 DIST vscode-1.76.0-arm.tar.gz 113679844 BLAKE2B d7b8d828285ead72c4dc7d297ebd1cc5957696d0a156f9ceb82e58efef8bd4fba46b38691b0190d9625548549b30fdfb3e2d837ebe682119d3369e69f964dd22 SHA512 b15ff5cece6773e908834779b8fe8bd42d06cf2b8b41c6acf8819d49711112b2f31e6953067bce5141ba1e5fdceca22881fc4c1751c5a25b9342da97ab4e47a3
 DIST vscode-1.76.0-arm64.tar.gz 123109503 BLAKE2B 141f1de84a64805ed88b003db5ac8d8c603c13fcde94cf3aa3f2dfe8ab6b962d4d106ebb39945490315f4680ea774f530d1dd42a825e6a6bc218238e3aba8670 SHA512 7b602a1f9ca4b29cbf737b550e7befc9a19fc7bf9225b690793987224645d12a7526a2a853e600e766390f857b9fe14b3dc064373f3e66119a37c1079fe42487
+DIST vscode-1.76.1-amd64.tar.gz 133945909 BLAKE2B d6549d58f97ffff490fcaa3a40a2e999123e27d142b626f959061b87da9827e615023b100a3c280ce256e9703aff9cef42eea4f1bf56f9e2942059a0c31322f0 SHA512 c0160ff9d243a50267cf142839ae3583b4e6fc721f6a1b3541a3203c5c66c098c5469d360590f68bb0a17ee4aba3b54a0d856e550aee492a996b7b4f6044e0b8
+DIST vscode-1.76.1-arm.tar.gz 113670868 BLAKE2B f9846bf5b8fd8d972e95ef9152b36794beba59d3536b21d55a8c0986d5ae5e11f588985242e0eeb4d24f771a00ecf71ecdb272e06d2b6cb2f9091065e80dc9ad SHA512 cff9ee94a0cdf793a2a6052952f299355f37d20550b809b6796e5bde58e6dcf4bcc8249388b60c93e348ef969a1cb110472252cd122a429dbb3eb83efa0b208f
+DIST vscode-1.76.1-arm64.tar.gz 123125455 BLAKE2B ae3e4772afc19855a1ef0f415a6621c21f9abdb7994a9fb45f62eb22499a08142f1cec6d91ca1c16700c431cfcb1a2f61f53c579f187cb1c93c2ca921e987366 SHA512 9e4c44f092efb200a0602655499d6b8185de65bca4d318204bfd9aeea219a9b546f2d16eb44dd3ef66c3eeef804750ab9c708f7338d955964dfc4c48e7aa779a
diff --git a/app-editors/vscode/vscode-1.75.1-r1.ebuild b/app-editors/vscode/vscode-1.75.1-r1.ebuild
deleted file mode 100644
index 593a70028957..000000000000
--- a/app-editors/vscode/vscode-1.75.1-r1.ebuild
+++ /dev/null
@@ -1,128 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit desktop pax-utils xdg optfeature
-
-DESCRIPTION="Multiplatform Visual Studio Code from Microsoft"
-HOMEPAGE="https://code.visualstudio.com"
-SRC_URI="
-	amd64? ( https://update.code.visualstudio.com/${PV}/linux-x64/stable -> ${P}-amd64.tar.gz )
-	arm? ( https://update.code.visualstudio.com/${PV}/linux-armhf/stable -> ${P}-arm.tar.gz )
-	arm64? ( https://update.code.visualstudio.com/${PV}/linux-arm64/stable -> ${P}-arm64.tar.gz )
-"
-S="${WORKDIR}"
-
-RESTRICT="mirror strip bindist"
-
-LICENSE="
-	Apache-2.0
-	BSD
-	BSD-1
-	BSD-2
-	BSD-4
-	CC-BY-4.0
-	ISC
-	LGPL-2.1+
-	Microsoft-vscode
-	MIT
-	MPL-2.0
-	openssl
-	PYTHON
-	TextMate-bundle
-	Unlicense
-	UoI-NCSA
-	W3C
-"
-SLOT="0"
-KEYWORDS="-* ~amd64 ~arm ~arm64"
-
-RDEPEND="
-	>=app-accessibility/at-spi2-core-2.46.0:2
-	app-crypt/libsecret[crypt]
-	dev-libs/expat
-	dev-libs/glib:2
-	dev-libs/nspr
-	dev-libs/nss
-	media-libs/alsa-lib
-	media-libs/mesa
-	net-print/cups
-	sys-apps/util-linux
-	sys-apps/dbus
-	x11-libs/cairo
-	x11-libs/gdk-pixbuf:2
-	x11-libs/gtk+:3
-	x11-libs/libdrm
-	x11-libs/libX11
-	x11-libs/libxcb
-	x11-libs/libXcomposite
-	x11-libs/libXdamage
-	x11-libs/libXext
-	x11-libs/libXfixes
-	x11-libs/libxkbcommon
-	x11-libs/libxkbfile
-	x11-libs/libXrandr
-	x11-libs/libxshmfence
-	x11-libs/pango
-"
-
-QA_PREBUILT="
-	/opt/vscode/bin/code-tunnel
-	/opt/vscode/chrome_crashpad_handler
-	/opt/vscode/chrome-sandbox
-	/opt/vscode/code
-	/opt/vscode/libEGL.so
-	/opt/vscode/libffmpeg.so
-	/opt/vscode/libGLESv2.so
-	/opt/vscode/libvk_swiftshader.so
-	/opt/vscode/libvulkan.so*
-	/opt/vscode/resources/app/extensions/*
-	/opt/vscode/resources/app/node_modules.asar.unpacked/*
-	/opt/vscode/swiftshader/libEGL.so
-	/opt/vscode/swiftshader/libGLESv2.so
-"
-
-src_install() {
-	if use amd64; then
-		cd "${WORKDIR}/VSCode-linux-x64" || die
-	elif use arm; then
-		cd "${WORKDIR}/VSCode-linux-armhf" || die
-	elif use arm64; then
-		cd "${WORKDIR}/VSCode-linux-arm64" || die
-	else
-		die "Visual Studio Code only supports amd64, arm and arm64"
-	fi
-
-	# Cleanup
-	rm -r ./resources/app/LICENSES.chromium.html ./resources/app/LICENSE.rtf ./resources/app/licenses || die
-
-	# Disable update server
-	sed -e "/updateUrl/d" -i ./resources/app/product.json || die
-
-	# Install
-	pax-mark m code
-	insinto "/opt/${PN}"
-	doins -r *
-	fperms +x /opt/${PN}/{,bin/}code
-	fperms +x /opt/${PN}/chrome_crashpad_handler
-	fperms 4711 /opt/${PN}/chrome-sandbox
-	fperms 755 /opt/${PN}/resources/app/extensions/git/dist/{askpass,git-editor,ssh-askpass}{,-empty}.sh
-	fperms -R +x /opt/${PN}/resources/app/out/vs/base/node
-	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/@vscode/ripgrep/bin/rg
-	fperms +x /opt/${PN}/resources/app/node_modules.asar.unpacked/node-pty/build/Release/spawn-helper
-	dosym "../../opt/${PN}/bin/code" "usr/bin/vscode"
-	dosym "../../opt/${PN}/bin/code" "usr/bin/code"
-	domenu "${FILESDIR}/vscode.desktop"
-	domenu "${FILESDIR}/vscode-url-handler.desktop"
-	domenu "${FILESDIR}/vscode-wayland.desktop"
-	domenu "${FILESDIR}/vscode-url-handler-wayland.desktop"
-	newicon "resources/app/resources/linux/code.png" "vscode.png"
-}
-
-pkg_postinst() {
-	xdg_pkg_postinst
-	elog "You may want to install some additional utils, check in:"
-	elog "https://code.visualstudio.com/Docs/setup#_additional-tools"
-	optfeature "keyring support inside vscode" "gnome-base/gnome-keyring"
-}
diff --git a/app-editors/vscode/vscode-1.75.0-r2.ebuild b/app-editors/vscode/vscode-1.76.1.ebuild
index 593a70028957..593a70028957 100644
--- a/app-editors/vscode/vscode-1.75.0-r2.ebuild
+++ b/app-editors/vscode/vscode-1.76.1.ebuild
diff --git a/app-editors/vscodium/Manifest b/app-editors/vscodium/Manifest
index d49bc1daea8f..3522b6fc9b93 100644
--- a/app-editors/vscodium/Manifest
+++ b/app-editors/vscodium/Manifest
@@ -1,6 +1,6 @@
-DIST vscodium-1.75.0.23033-amd64.tar.gz 121848371 BLAKE2B 412e945fd98f3ca6fd690593d09d64ec32e2a1450c117f41b99a276f6992f38de8e315af2273e659023a9acd8101a594c5e50bb7c29c7b9d688c902fca875b50 SHA512 58a3e58c9350359538841349271794e738f4734e84af7ec83a44b11fa09517dcaa6c373bb20ae271c4646f8766f405d12e7011d0398750facd9c4aa47402976c
-DIST vscodium-1.75.0.23033-arm.tar.gz 103889757 BLAKE2B ad910df8a5b245c725dcdb3d2bf4fdb602de2703a629563f6b71bad3e8ebc09a5ecf6ab1272261b7abb6aa35ea7a15ea9a8c1ee5ca52bee8deaf5b13221edf15 SHA512 9dd9b4bdc6e98c53c39ee5bde3f2001d3345de0398e848b26cca0e54cf8edd3712e4489cf3f11e7f67b9742c8dd3e9bafbf09ae5c4704a090147cfcae542e89d
-DIST vscodium-1.75.0.23033-arm64.tar.gz 114924184 BLAKE2B 47d979df3eadee60e5ea6dcbf15b58518ded7086516cb9c1444ef22c3b05eef3d3b7b733a8be889fd0a08fa5e9fc4a0e5171a573b95defc951f526b95e624b0b SHA512 506ccf023fe0f1c9c18c23ab3e77b64ba64e769226e43c577764b1ca85c940c53bdef69095bb3b2d09886a02506847a5884543191e2aead12884ffcadb7b22ae
 DIST vscodium-1.75.1.23040-amd64.tar.gz 121851555 BLAKE2B 827942e3a6b903e943fbd7200c8ae1e10e2ee3e8a05592a5dbe6677171935499bdb497aa1d76b175c0a8a4dc699ee2559c8768d83b2133ab3e337313bcbe70ec SHA512 9192915d87d55b5835dee70d10e03f6ad110075b1b32809f78cd18a7d9fefb36b3440e14c0c17dd826995a04789517c21e08e0d72a0418923f1dadf2d5ce6d22
 DIST vscodium-1.75.1.23040-arm.tar.gz 103879786 BLAKE2B 2f9d0cbdc474a248a7dbd3339a9af87f88ad477a14934a2c4ca3ae5235607a79dbf9d797b669df7a8127dbfb3081bc1612b4d899d69e95faa8a7a011a1030b21 SHA512 373c7097582d4540ac1479bbb9da53b6b13288dc5ce61fd11d952f7eb289d456bf57f8c2e16d1a3532738d082857e9abebbded1142ad36f6c6ac67e25cd1a6e7
 DIST vscodium-1.75.1.23040-arm64.tar.gz 114920913 BLAKE2B 9758ce3c71621eeb9d4975d7e1c57cb079f15b6794c320df682e2748d7fd5cc4ec5dd2dbe94e16e2c6f6e7617e333dfb08d0a80dfcd9c78b01ec9c38e800491c SHA512 3baf3abd004c67c197204e92de50fc6d056926686dd921368d63c90d216c83ae15529f3f25ddc6c20deb812823f9181ddbae3b80936ff2a441a1d51e42678a03
+DIST vscodium-1.76.1.23069-amd64.tar.gz 120798858 BLAKE2B d499b75a5c24e9aa68a5fc358bcb98fb67a67b2383cfebe0b9ae4170876fd675cde66d855f581f6cd5b4c745a03a15e345af7532510d640b4ac65b0af2413906 SHA512 a2e37eba3ec70e35f344c2cb552cd75c5d5e67ec9159ac48709d631e5324d19e9cab08f69ffc8ae1fa782aad515be6af661464dfa72ea1f18da752d1d0b48127
+DIST vscodium-1.76.1.23069-arm.tar.gz 102842431 BLAKE2B 9ede508310c87948a67c8f07f4f15f4b2e2466c3f659c1a291cb20a76a784964d7174a1003b10523779c75eb0850e2e272aa7e3a02497937136f32c138b8ebd1 SHA512 f5b99f1bd9338c69c69b9643a5c5e6ade5a3df237ac042a9fc7fdbba402244516e54ab636235a1867c6594a52a33b4af32622e70511491caac7d014b42c8e51d
+DIST vscodium-1.76.1.23069-arm64.tar.gz 113874748 BLAKE2B 8dd6d97571dd084ffa40662ce6f3788cb7f09bdc8fefdce15d2987f3819ffdf42762e4b2106b71c3fc4e02943be9c62ab12355a8e30ad405848cdc7b115780cf SHA512 92ba83d125f8d28ccbf06f3dd7219c08ab1d40630ae32f0620aee731340d957cf79b7e5c4068745d77d1d425e9ff64ec0cc859016882edc93cd553fd59fc9983
diff --git a/app-editors/vscodium/vscodium-1.75.0.23033-r2.ebuild b/app-editors/vscodium/vscodium-1.76.1.23069.ebuild
index 5c5cdb4f3682..5c5cdb4f3682 100644
--- a/app-editors/vscodium/vscodium-1.75.0.23033-r2.ebuild
+++ b/app-editors/vscodium/vscodium-1.76.1.23069.ebuild
diff --git a/app-metrics/portage-exporter/Manifest b/app-metrics/portage-exporter/Manifest
index f79a57b4631c..b7ad12a11f0b 100644
--- a/app-metrics/portage-exporter/Manifest
+++ b/app-metrics/portage-exporter/Manifest
@@ -1,2 +1,3 @@
+DIST portage-exporter-0.0.1.tar.gz 1797981 BLAKE2B dcea6218de202c72b894dc6d8b31311879ce5b2284a078e77148dc9b62320a0118ff22040dc89807f8f7526618afc982cd555925dea97dbb9a0dcd7a41d98930 SHA512 f61ae7be333e79a4ca3dd483628d588c07f2fd7d1b0c77069969431d05217c7654cbfc4676e1ffa60e0cdcae3e0e59fad238a02edbd7f32a61ad2f7e3a5c440b
 DIST portage-exporter-0_p20230307.tar.gz 32044 BLAKE2B 23e590aba88bf071568e9643b22ec51d6fcaff11b5eb5ea1e66d39cf49468238cbb80a44a865ba7bbccb631540e33ab5a417201ec995227e84d122601c868fad SHA512 1e3bd18cf44ad849b0ee0a2dc737f6d334ce9dd29d03f53a05298df2013be8c77a7ed66c3171cc6c765ad21ab7705fd747856d95ef3259cc83fac85544e81781
 DIST portage-exporter-ae39c6be10364896683ab1af0512ee8453bc153e-vendor.tar.xz 784800 BLAKE2B 600f207b15e54ab0f4c27691ce41efcdd3706bfc82c9170da3ebf2eb6283b5595bca08d7eebd3c7b5a6b2c7bcef704e70946e3fab63a537cf03ffa7dbe4a57a0 SHA512 e6e91296e8220d9fb34e0837714108d8806801d6799e49dc27b7dcaf8ddf39a92bff232ec3d616019ef5ae5c437bc81eee719ca658c299a35e8f1b165e38d3eb
diff --git a/app-metrics/portage-exporter/portage-exporter-0.0.1.ebuild b/app-metrics/portage-exporter/portage-exporter-0.0.1.ebuild
new file mode 100644
index 000000000000..5b09838cb150
--- /dev/null
+++ b/app-metrics/portage-exporter/portage-exporter-0.0.1.ebuild
@@ -0,0 +1,27 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit go-module
+
+DESCRIPTION="Prometheus exporter for Gentoo Portage"
+HOMEPAGE="https://github.com/projg2/portage-exporter"
+SRC_URI="
+	https://github.com/projg2/${PN}/releases/download/v${PV}/${P}.tar.gz
+"
+
+LICENSE="GPL-3 Apache-2.0 BSD MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+src_compile() {
+	ego build -o ${PN} ./cmd/portage-exporter/
+}
+
+src_install() {
+	dobin ${PN}
+
+	newinitd "${FILESDIR}"/${PN}.initd ${PN}
+	newconfd "${FILESDIR}"/${PN}.confd ${PN}
+}
diff --git a/app-misc/joymouse/joymouse-0.5-r1.ebuild b/app-misc/joymouse/joymouse-0.5-r2.ebuild
index 4606544b0afb..b838c7b4152e 100644
--- a/app-misc/joymouse/joymouse-0.5-r1.ebuild
+++ b/app-misc/joymouse/joymouse-0.5-r2.ebuild
@@ -1,7 +1,9 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="An application that translates joystick events to mouse events"
 HOMEPAGE="https://sourceforge.net/projects/joymouse-linux"
@@ -11,12 +13,20 @@ LICENSE="GPL-2+"
 SLOT="0"
 KEYWORDS="amd64 ~mips ~ppc x86"
 
-RDEPEND="x11-libs/libX11
-	x11-libs/libXtst"
-DEPEND="${RDEPEND}
-	x11-base/xorg-proto"
+RDEPEND="
+	x11-libs/libX11
+	x11-libs/libXtst
+"
+DEPEND="
+	${RDEPEND}
+	x11-base/xorg-proto
+"
 
 src_prepare() {
 	default
+
 	sed -i 's/printf(message/fputs(message, stdout/g' src/joymouse.c || die
+
+	# Clang 16, bug #900473
+	eautoreconf
 }
diff --git a/app-misc/pup/Manifest b/app-misc/pup/Manifest
index ccdd4eb6b6c5..499fbe8a67c7 100644
--- a/app-misc/pup/Manifest
+++ b/app-misc/pup/Manifest
@@ -1,13 +1 @@
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.0.0.mod 30 BLAKE2B cdd74965525563fa7e3db19aae87c777b2de65faeaf2987957ea3bb4c0c6a91ab82fe02bfeeab4d6f523214bc2e929628c082edb967d49309e75483ff4c3bb41 SHA512 2dfc66b2f6accb7ecaccc48cb3daa338173f4751d954cb2912025d881f17a7a2df0457b2d7420f2d93b50519a2437a763450c4d639a26b3289fce7bdec5bb144
-DIST github.com%2Ffatih%2Fcolor%2F@v%2Fv1.0.0.zip 9085 BLAKE2B 473d6d43654ad58c2a0d678e3d21b3a9cfb4c99020e80ac1dc747f14a9b298439e9ce3dc1b19b7e23dd7a423e51fdd5eec313e38723f958bcce35c2fcdb851ca SHA512 687ac62c96307c003e0feea0ba2f1d469548ccac9b4d0aacb71cc034c014e0adf2e0a28a7bf205ce83cc2b26ed74cf5bb33ae0758c7be52f583ff1d2ce82754b
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.5.mod 37 BLAKE2B 6bd675a05c0bb6f9dc12d09203d13de115801888cf8c02cb5d609f72d214b7e7ebf13a72ddfa2eb9172e9c2ba1f3e5a040f089a86ce9fe873d49288d5f7dc5a7 SHA512 3cc3ae26618b96a0fc076b18bab6f8f0f6a1064d6a9913c1015a9867fd3571d17f5d2867d72cec008e9bc7005883a596edb21424084f82ad5b572443de90f976
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.5.zip 7302 BLAKE2B 2722f5249f5d879861a664c202ab50c4f3df021f581acc9eb907b266f6d485848314f8ee158b64fa39495a84f1488a9de420debf0f4e620a621542b30de55da5 SHA512 99bcbef68f31a7b3cddb4bcdf9798156e425693ce5162eb94a9dde907734c32b3b22306015800543cfe90f85091b38d3c27d9ea4bb3fad062d0e61ac2a7a0500
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.0-20151211000621-56b76bdf51f7.mod 34 BLAKE2B 55253c2475bc0169df729915bc92689eaad2908ff7b9dd81b8a553bd75d5f866c308a85fd69d664d31b0d2d373d8d52ee1701677cbebb07e361612ab8cf17f2a SHA512 00c272b4652db259c46875641b29489ecada2602e38beede8c8bd529d73b6e123bff58f8e0f8cadd2d680a6a5485aadffa448e9445548abbd2fb424b059a31e1
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.0-20151211000621-56b76bdf51f7.zip 4529 BLAKE2B 1ae58005cb5045b50c34d312340a3b5910ec1c92159bbdc36faa45c91b6039f91f5f1dd1bbe13978b0da38be1372328a191ea264685eb3a689b8b3588b9c2bae SHA512 5ea50e219f9f6135ddd5c602eb0bde954fae805aa0c43f0f40f04cd047a3067e92984678cc1a399a3cb404eca3329982eb9bde26ce76d6ee9d8ce5bc24ad8e59
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20160720084139-4d38db76854b.mod 24 BLAKE2B dad51d0aff48ef669f448f7b41bcdb153dbdc48863761ba1cac6aa3e3eaeec838e22733e6c61796b22bcc95d9e0a274085676bf191a8072717a398a067fe9e62 SHA512 d7446d3dd844b97512470f7ff05fce72d099f7800396e2738a54d41796f0f76be07e7aea1f638fee0190c7d8ce65eefc54eebe6917a06d14da04d0c9c8f9891a
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20160720084139-4d38db76854b.zip 997252 BLAKE2B a31cecb3478f7909e927d7b92fac55544c2c608002b0ba3496a559634fb93364465e2c291253238045349a0e63bd64ab91f1b296aa3a9bf710c360ce783a47cb SHA512 3e99dca6e76b8432e142cf81defb806c98d0c6f29eba7798d00a2c004b241b311a1e224cb394b2a951337a40c91e4293b9259d11cf4690b185254f72e9a59cc1
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20160717071931-a646d33e2ee3.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20160717071931-a646d33e2ee3.zip 856605 BLAKE2B 7f9f783bae3f98715536855bfe6d5e889150ac796915599f4eb10bc100919cdbcb03034f816d55ed9ffdd8cc209bfcca1b901b8b15ca592520ffd0e20aa7879c SHA512 746c0254932cf8b4d0ed4b1950e9f82133409c600d6e550e6af92493eb67fb92bd742bd38ca81c6d74bd2b7202811a3b81d31ea464cafc0f37e11f0261b451f4
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160719205907-0a5a09ee4409.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160719205907-0a5a09ee4409.zip 4266299 BLAKE2B d6f4fb7b7d8c1bcdede7b5671044c5f032a3e66c4c4a55825b86714dc2143526b67d1bec1cca7d8b196cc4e819eda8ac199b0e794ccd900f36cf79d4ac2e541d SHA512 3244eee54399d4f659823df0b3258bacda2e26bbb6fa90b54b2d36d3dbb7aaaa3d331f7821d4efa2539185e999db28dc5a702b4ba8ea2839186a7812e969d426
-DIST pup-0.4.0_p1.tar.gz 1517147 BLAKE2B c3449382027988288aa30c8d4e26286658bdcf4042a23432ec481fde3d02d0225fc38786c085909d2fbde62467c0cf3b004edbcac78ac939de401f7ede8c5b26 SHA512 227431f0b0a2ef6d289f7807e1949d478553aa05a3d84566a73fd54ada47ad73d000036e0041ffdd8c197d814afce117e38c783f72e92a5406cbc267638ae4f7
+DIST pup-0.4.0.tar.gz 2762349 BLAKE2B f324c1d19f3d072d4679beeaf715990447db92215a1806f26e2eb5470c6434902631434dc8601cc0e29fa4a5184d2d27753889e8e884129b4caaadbbfcdeec27 SHA512 5228a283cdbc6425888b08154873e059f5808efd68eb86880d15572398e50b0a431922e6ef5e6acf04bc18c95bfd793590d5df2eccb9a041a64dc03731ec1874
diff --git a/app-misc/pup/metadata.xml b/app-misc/pup/metadata.xml
index 87a309f6766c..7cf1ac1fff23 100644
--- a/app-misc/pup/metadata.xml
+++ b/app-misc/pup/metadata.xml
@@ -2,15 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>cyber+gentoo@sysrq.in</email>
-  <name>Anna</name>
+  <email>toffanin.mauro@gmail.com</email>
+  <name>Mauro Toffanin</name>
+  <description>Maintainer. Assign bugs to him</description>
  </maintainer>
- <upstream>
-  <maintainer>
-   <email>eric.chiang.m@gmail.com</email>
-   <name>Eric Chiang</name>
-  </maintainer>
-  <bugs-to>https://github.com/ericchiang/pup/issues</bugs-to>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
+ 
+ <origin>go-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/app-misc/pup/pup-0.4.0.ebuild b/app-misc/pup/pup-0.4.0.ebuild
new file mode 100644
index 000000000000..91892198f9e1
--- /dev/null
+++ b/app-misc/pup/pup-0.4.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Go Overlay Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GOLANG_PKG_IMPORTPATH="github.com/ericchiang"
+GOLANG_PKG_ARCHIVEPREFIX="v"
+#GOLANG_PKG_IS_MULTIPLE=1
+GOLANG_PKG_HAVE_TEST=1
+
+inherit golang-single
+
+DESCRIPTION="Parsing HTML at the command line"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 x86 arm"
+
+src_test() {
+	GOLANG_PKG_IS_MULTIPLE=1
+	golang-single_src_test
+}
diff --git a/app-misc/pup/pup-0.4.0_p1.ebuild b/app-misc/pup/pup-0.4.0_p1.ebuild
deleted file mode 100644
index fd132deeb644..000000000000
--- a/app-misc/pup/pup-0.4.0_p1.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-EGO_SUM=(
-	"github.com/fatih/color v1.0.0"
-	"github.com/fatih/color v1.0.0/go.mod"
-	"github.com/mattn/go-colorable v0.0.5"
-	"github.com/mattn/go-colorable v0.0.5/go.mod"
-	"github.com/mattn/go-isatty v0.0.0-20151211000621-56b76bdf51f7"
-	"github.com/mattn/go-isatty v0.0.0-20151211000621-56b76bdf51f7/go.mod"
-	"golang.org/x/net v0.0.0-20160720084139-4d38db76854b"
-	"golang.org/x/net v0.0.0-20160720084139-4d38db76854b/go.mod"
-	"golang.org/x/sys v0.0.0-20160717071931-a646d33e2ee3"
-	"golang.org/x/sys v0.0.0-20160717071931-a646d33e2ee3/go.mod"
-	"golang.org/x/text v0.0.0-20160719205907-0a5a09ee4409"
-	"golang.org/x/text v0.0.0-20160719205907-0a5a09ee4409/go.mod"
-)
-
-go-module_set_globals
-
-COMMIT="681d7bb639334bf485476f5872c5bdab10931f9a"
-DESCRIPTION="Parsing HTML at the command line"
-HOMEPAGE="https://github.com/ericchiang/pup"
-SRC_URI="https://github.com/ericchiang/${PN}/archive/${COMMIT}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-S="${WORKDIR}/${PN}-${COMMIT}"
-
-LICENSE="BSD MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-src_compile() {
-	go build -o ${PN} . || die
-}
-
-src_install() {
-	dobin ${PN}
-}
diff --git a/app-misc/trash-cli/Manifest b/app-misc/trash-cli/Manifest
index c454aa23bb50..f3767150f32b 100644
--- a/app-misc/trash-cli/Manifest
+++ b/app-misc/trash-cli/Manifest
@@ -1,3 +1,2 @@
-DIST trash-cli-0.22.8.21.tar.gz 79315 BLAKE2B a4b0f3072d9a9091b90bec13e3a8208c58638f7dd054a788ba0126f8c803748c837dbf183513ca87a775d4efbed9e926603b2b3839f9f499963b774f59f06cd5 SHA512 9c8a40cd92c070dfcadfe2a4871c16a3cfc066568f0e079e11ff80aff53777335f1fec42245846bba04866a55ba9d11a2493950ccdcefcd7d98825508eb6ab6b
 DIST trash-cli-0.22.8.27.tar.gz 80344 BLAKE2B 309a1c429b6e052d622f5cd0f4eb211e1dcf8f5fcbe0834d359cd568527843e6a3c4cd1d61f1d1102b6e7f5b7a55fdde396b2500ca94f9410111705cdbff339b SHA512 909a521f40e2252012ed9ebafe8baff50cd2f743c9ab49df0abb41ecc177e551bde07289505f37e8dc86a0d20cdc8b521c35dd2383d17d4f9e962aa431368fe8
 DIST trash-cli-0.23.2.13.2.gh.tar.gz 104006 BLAKE2B c4187faff6618c54be3fcda2fca799d16ff614e5db2a47912aa796d72385bac8dab188977f635372372eae3f6e7d0faaea9405ac93edcd06962f6ffc2bd4694d SHA512 3894d852c01f5e3096bc5bf95220c35cfaa28e2fa555716983ad8203ce7d2206127394cdfbf3f08f0922abdbbfdb4f1a6c1db3fb0bcbda9d936612a2c7d6a7e8
diff --git a/app-misc/trash-cli/trash-cli-0.22.8.21.ebuild b/app-misc/trash-cli/trash-cli-0.22.8.21.ebuild
deleted file mode 100644
index 4983ca8415d1..000000000000
--- a/app-misc/trash-cli/trash-cli-0.22.8.21.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python scripts to manipulate trash cans via the command line"
-HOMEPAGE="https://github.com/andreafrancia/trash-cli"
-SRC_URI="https://github.com/andreafrancia/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-BDEPEND="
-	test? (
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-RDEPEND="
-	dev-python/psutil[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-src_test() {
-	local -x COLUMNS=80
-	distutils-r1_src_test
-}
diff --git a/app-misc/wego/Manifest b/app-misc/wego/Manifest
index c4ec9399eac6..41ff991c4f28 100644
--- a/app-misc/wego/Manifest
+++ b/app-misc/wego/Manifest
@@ -1,14 +1,4 @@
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.12.mod 160 BLAKE2B 63be9d239ea8c5ad48c5bdefaf634f1ef2e3913f9c1f1eb0c48ccf9185a2c14c1030d1542048acd9c7c42399ebb752a8c943e70ed7b11d199ed9067b6e906480 SHA512 f2fa86449f7da9a73f3f8781e6b3dc6ad6e7d491cb37854be0dfb5c3ee086c36f509646e6fa383b4f00c3cb96c535e581016b2a43aedbfd9fe5861bada2f7ce0
-DIST github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.12.zip 13979 BLAKE2B ab26453c09251ffa89639f5fa0579a853b7b2ee8ca9f48eb8e8b2343acb5d6dbbb67479f21341e37b9cfd28bc4d1fd7facadb8a7ee20f02d0046e8df46baa4b9 SHA512 202a6349397e9f7b4a8252867f4928c694bbba813544b9bb8b8bc4851d18c074f688e3a1f01d7b65e899f492325048705d5250394613924b98bdaece8a2373c9
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.mod 104 BLAKE2B e859512911c1621e5ba3e46249c5b9b5e4b0bae854bb3a18d7e39d6da27c93e133d43851d5e6bf2ede44fdee31801b19fe274b55a1f37b1291bf27262e2f2385 SHA512 23b01eb4023ff5018437ff98b55ada053eba49feab2777eed36d033f426c5456b143f3defbc3131dad1251205f3ffb3553e3c10bd98de80f0a462e8450d6d56c
-DIST github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.zip 8919 BLAKE2B fc84f4f16176d14f177f029cae5ecf0221a8f0ce716c499e8b5d49c8e1523673a2fbb600a769ac26be98b591b3cbc3730d447c412b2acd3eff7f878526c271a4 SHA512 c6401cf5af80ea2495cb63800ff39fb9490f212f3aae0ac1d86b3d37ce6734eb35aea00b35bd26532feab77ef80322e765925f302d77f664dd57163f67a8374e
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.mod 84 BLAKE2B d78cb89b5321a10aed4ad5abd88952a190c5051dedea0c9f43f06881be807892152edb9be4ecc9eddfc3cd7b75a441ab85559e25c60feeaf560baf829af373ff SHA512 b96cca212a7024f0039ddd3a744fe818ab2e028b8ac2fd4472ce76ee9b496de3abb0960718c1106a98cf7e6df652dcf2884fe5ed95979bd9016399ea4abd324d
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.zip 20978 BLAKE2B 1114ba9e7289e1a1423e81c4e0ff52860d9232f7e55a626e32282dfbf7a45ef53c21b843f4b6870be92e710db9c619d96f9c197eda0d8c28dac3764160e92105 SHA512 e86a3b69601be1a0a15d7bfd5d93fce8d8c06b52c55c941a9ed62b44f05d3062e436d817661af14bb42838efc45875a63eb6042b196e1684db36e0fe6ed42a7f
-DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod 39 BLAKE2B c619b92efed318039eb06878b084372e8f3f45426623a9c1f045f21bf44f86347472a28a4164f607cb9fca3c253d4c9df0dd33d1dd8baaa02230af9feb8dc7f6 SHA512 d6089badd618722b8d3584965f1a10290097f259024a444744f625fe5b439fef62c7e14f060fb8593197d003ecd6c29f0cb85700de0bdfbf2511ca66729db3bc
-DIST github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip 45731 BLAKE2B f4a1442027b29625c694298e10ec9c107edd8437d8749110cd56440dae791c0e6d88a68187240cbc521f79fa7bdc4307e4b3b4edad38d57d5834644342a066e0 SHA512 88f37961ebe3a1701265a2f5cb606e97fe4ddd09e36ff13ca8c026e98640af5d35cb930e4d12b6690a97e5d934705102554c6d2912ebbb5ee08976c698cce2db
-DIST github.com%2Fschachmat%2Fingo%2F@v%2Fv0.0.0-20170403011506-a4bdc0729a3f.mod 33 BLAKE2B 9dc686e79d167d4ef985e11a7cafb978ae6726126da040967a73bbdb99a83d37e23f765f389d3b3b47f607f73fe036ce1dddb855b3346234e8a7f5967f84c65d SHA512 bd411ee9ca744c079193dd742b191a1df13fbbf144dfda14f6a39f3246710e67c17a47d751940e1441ab40bf04caa0635ae0fb46ae47055f2206f879a527e6b9
-DIST github.com%2Fschachmat%2Fingo%2F@v%2Fv0.0.0-20170403011506-a4bdc0729a3f.zip 7295 BLAKE2B 9e00c2a437ed2fead4fcd6d192cf9bc173eeae505b1e8257a4193997a06eb4f8eae3ef80b80403c80a6abbf9f5eeb3efe51d4bf5b431abdd3b73ac2c8ba611c9 SHA512 50db8c540ac425e1f24c500cfef2699ba33711c828b1a89f94ff6122895e6c357f74fbe5247418ecfa2c94474c0140db9ecd198c571ec0152ad2b606fa2d9611
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.zip 1655907 BLAKE2B 317486eaf6a714d7d74f563e20bbe3f0581c7331e3c8e492cb075476bdd57f9ae4a75c49834cc6912f7d9ed6a54c540a78f6e2556245afc05f6480019c7abc17 SHA512 dcd3d13b504c351483c49f93884b3e8635cb0377a51cd14fbd3efe8b55f3983e401ee746bbdb7e6904e472beb09343d9d1d1d9667f2cc515e991c8f5c3bf14cf
-DIST wego-2.1.tar.gz 16499 BLAKE2B 9308d7bc3899d136bf98c8862fffd62f1984445598cda7de98a9d9bc9b6d3e3f2723bc1438a3483f3e4753ea6abb84832a6f3539a7336569f711253043ecb425 SHA512 80cc19ea34bdb536ab48ef6e074f86b58dab59f76270688ca2d4c562c5eb34f177597108f2159e6ef33ee2485c068a7904ddf7bf8d0b79cb825ca7b73b0fefa2
+DIST github.com-mattn-go-colorable-9fdad7c.tar.gz 5586 BLAKE2B 4f41090d5b803e62b3cf5ab2bab05bf726006c2ccf5fe3e1c5c9a5042375ec652d6bddd09465b1748f969b5c78615e030e72a43d299a953d4fecaf2e8eb993cc SHA512 f3f1893c535cd050bdf83e8d13d5fa5f12b58272a1a373dc17c68a0021a0bd9e72817b5784dd1276cd963bbef07424d47c877d809df787058d8c87194f70b582
+DIST github.com-mattn-go-runewidth-d037b52.tar.gz 5895 BLAKE2B 32e5b025abe0ac98eea8e35278b76f2f447f80f5110fd5f66628510fa0488095f94beab0a010c4f511df04c8a8f503315910acc22f0ba9438a324da3faeeea08 SHA512 0795a78dbf805bcf3fb9887a0bb5875c6b8579302d9207a536d5d00dc8a97a732ae95d274d3b26215d9f900299b01a5b0869561e215def6c8d35d9603b9da551
+DIST github.com-schachmat-ingo-fab41e4.tar.gz 3170 BLAKE2B e37843954694c9cf5ae0a7faf953a5483f06d85bc7521ac199a0db9e6ca052f38ffac74b9f4256a2692f3f3055f49274cb0d7e1ac96c3a892da3553963d6e2da SHA512 8aedc3e85666c228f44f563fbc0264a3cd17fc4dc25f243d92995aeeb493533439600d147eeb9e23d00f108e8002a8b9e0fb4be309353ddd08f1efdd9582b849
+DIST wego-2.0.tar.gz 11185 BLAKE2B 1bf8030a0801a80d5bd367be9a53f01c232ece40fb6f66e4dd06a72ed44e2cc1d6da27888b148c24264ed4eec460b4b9d8e4ff6e91d55e134f275b3978048ace SHA512 92073393f420f72367955b08ef64a90eadc5a72f79f9c42ee1886918923e5953da15dd9ffaefc14aa444cfe5db5f903d88ec080f9ca3490da29efe5734a200f8
diff --git a/app-misc/wego/metadata.xml b/app-misc/wego/metadata.xml
index ae4bfcd9c9ec..7cf1ac1fff23 100644
--- a/app-misc/wego/metadata.xml
+++ b/app-misc/wego/metadata.xml
@@ -2,27 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>lssndrbarbieri@gmail.com</email>
-  <name>Alessandro Barbieri</name>
-  <description>co-maintainers welcome</description>
+  <email>toffanin.mauro@gmail.com</email>
+  <name>Mauro Toffanin</name>
+  <description>Maintainer. Assign bugs to him</description>
  </maintainer>
- <longdescription lang="en">
-Features
-
-show forecast for 1 to 7 days
-nice ASCII art icons
-displayed info (metric or imperial units):
-temperature range (felt and measured)
-windspeed and direction
-viewing distance
-precipitation amount and probability
-ssl, so the NSA has a harder time learning where you live or plan to go
-multi language support
-config file for default location which can be overridden by commandline
-Automatic config management with ingo
-	</longdescription>
- <upstream>
-  <bugs-to>https://github.com/schachmat/wego/issues</bugs-to>
- </upstream>
- <origin>gentoo-guru-overlay</origin>
+ 
+ <origin>go-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/app-misc/wego/wego-2.0.ebuild b/app-misc/wego/wego-2.0.ebuild
new file mode 100644
index 000000000000..553fb4de98c2
--- /dev/null
+++ b/app-misc/wego/wego-2.0.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2020 Go Overlay Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GOLANG_PKG_IMPORTPATH="github.com/schachmat"
+GOLANG_PKG_HAVE_TEST=1
+GOLANG_PKG_USE_CGO=1
+
+GOLANG_PKG_DEPENDENCIES=(
+	"github.com/mattn/go-colorable:9fdad7c"
+	"github.com/mattn/go-runewidth:d037b52"
+	"github.com/schachmat/ingo:fab41e4"
+)
+
+inherit golang-single
+
+DESCRIPTION="Wego is a weather client for the terminal"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="amd64 x86 arm"
diff --git a/app-misc/wego/wego-2.1.ebuild b/app-misc/wego/wego-2.1.ebuild
deleted file mode 100644
index 9b3bdb344535..000000000000
--- a/app-misc/wego/wego-2.1.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-EGO_PN="github.com/schachmat/wego"
-EGO_SUM=(
-	"github.com/mattn/go-colorable v0.1.12"
-	"github.com/mattn/go-colorable v0.1.12/go.mod"
-	"github.com/mattn/go-isatty v0.0.14"
-	"github.com/mattn/go-isatty v0.0.14/go.mod"
-	"github.com/mattn/go-runewidth v0.0.13"
-	"github.com/mattn/go-runewidth v0.0.13/go.mod"
-	"github.com/rivo/uniseg v0.2.0"
-	"github.com/rivo/uniseg v0.2.0/go.mod"
-	"github.com/schachmat/ingo v0.0.0-20170403011506-a4bdc0729a3f"
-	"github.com/schachmat/ingo v0.0.0-20170403011506-a4bdc0729a3f/go.mod"
-	"golang.org/x/sys v0.0.0-20210630005230-0f9fa26af87c/go.mod"
-	"golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6"
-	"golang.org/x/sys v0.0.0-20210927094055-39ccf1dd6fa6/go.mod"
-	)
-go-module_set_globals
-
-DESCRIPTION="Wego is a weather client for the terminal"
-SRC_URI="
-	https://github.com/schachmat/wego/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}
-"
-HOMEPAGE="https://github.com/schachmat/wego"
-LICENSE="BSD ISC MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-src_compile() {
-	go build -v -x -o wego || die
-}
-
-src_install() {
-	dobin wego
-	dodoc README.md
-}
diff --git a/app-shells/antibody/Manifest b/app-shells/antibody/Manifest
index 7b40bef2b0e8..fd72acf7aa75 100644
--- a/app-shells/antibody/Manifest
+++ b/app-shells/antibody/Manifest
@@ -1,34 +1,8 @@
-DIST antibody-6.1.1.tar.gz 53625 BLAKE2B a348c022d0942b00d5e5dc2aeb257b7dbb589be592d340ec69e0a4539e1f5b4abf7c2585fd072fa82f9219b0bf3f41858095f13a475ac93d5ebacf20e429400b SHA512 0a436227d195b1e68be03d62d0f7fab0f10c4434df10e047468809a6dcf330623c54ddf4e52c459d7b816a3be977e62c6aba58408881f9a45583456e37614b04
-DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod 38 BLAKE2B 2e1a897393e3527f0f82e6ab9baf62558d9cf54b56ada5d79aa1b206128de30395d9082bc600c4aa2a17e81095e429cc5874de95047854531cccc9ea0b867de7 SHA512 072ca7ba3d5ca815f58848db201002cc572d95334aeacfe44cb226505ad20d82ce06eb2ee059650912ae499db6291822c583296cb65a66e54adce62d6d850929
-DIST github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip 66303 BLAKE2B 4b02e631a3537d577b78b1372f8496113c582bfaafc48f5ce6981ed72da6a611d6c692a85c6e7cc8aeb47c89d0fec9f491d59607ead55d5e4be256525d3173bb SHA512 d29dc8a3c82c34af07b0c393349eda79b30c988d439771e02106bf2f386ef5fc3feaebf00da3953a40bff2c5ed93880ecbf45e1607303c11a417bfffb96e2e65
-DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod 79 BLAKE2B 51cb1c2c33300626f74f843ce56c333b194b9a46230d3befe94343fe9daa62314a59b74a6d78c97415f839997fb42700c762fe02ef76240924ba52d18f723ad6 SHA512 df2dd357e057bb1fc65ef4869f64149f6446257406886e89a39f7dbc7e6c9da25a8c17567b14c8d3adefaf21fba98e0f2663924c7d32a4f82d30377ab4032162
-DIST github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.zip 7096 BLAKE2B dd3436eacdcf42567210b68830f6a9663ed91531d73aa6c2548f50e387d7081a0908478135816a599014a82e23fd6ca9c2685ce8518c6ca73bce24a9f0ff5f6d SHA512 6111f8ea08657e90dce1ae450736cbc3a6e10cd61ee5211ef4cbb1abe1862d0fa658ef2922b6778084d10af3f3c55744962162bf9fbdf48d2c42f6a15b297ea2
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip 60320 BLAKE2B 86bdbc333e5c23ccf4f805945ca9f2aecc5c242d2ae824d20127eceaa2bf7bbab239ff2799572a2c8fa206166a36e97d5eccc8fc5021743d8ad32f39cd53b9eb SHA512 7b4e4df2fea731e23e05437f26f24e32b2e99028d685b72e3a726c1cb616ada4a77ca4fb9db4a6fae48178cc5172e724b74499bc776d63a9110cb97377d5edeb
-DIST github.com%2Fgetantibody%2Ffolder%2F@v%2Fv1.0.0.mod 37 BLAKE2B 49ba5a24d557eaea97dbcab5215c9397751d67803ade4e0cf7944c4df9fa901237d0b2dcda6e84ac2107709029ced4a923dac5d0cf0956d3a9f0a9a434707804 SHA512 6e3974583d84e44e60071ef1b448ec76b04d70b5499d409289cbfc443d64573562931d92603f31c7bbea527e74b7b2812c4612b9c0b41800f29443529329c837
-DIST github.com%2Fgetantibody%2Ffolder%2F@v%2Fv1.0.0.zip 2547 BLAKE2B 971f3ed0e75d5526ae1aa5814291e02f9f2b6b22d901c0236f10f56451e5b79cf44aeca06d7cbf2604801672ecfdbbc790d4651c8dc0b3c7a865f0d08a0f54c6 SHA512 b94675f7d794357b6dc9cb346985bf5a09e8a772453a0fbb9bcb2338ff2d21eba0d549b7ec94405b828039d7d36858a9b29daa2447e549d67c33bcff04f07757
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod 179 BLAKE2B 3bb7cee3118f0d335ade107dfefc3a594dc3883564fe4c9e96d615e179d394a49a3d6cd6584ba9c684772bc3dc6479af6a168dd3841c03957252667384f6ba11 SHA512 243bf1f69c146252164ad72f853773dcc77f15d7c9e9b731bee26a95e7c8f4ce9ed9738db601b01edb82f4b3808873e1f153a6d4a0c97be0babbe65abc0f8d52
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip 98541 BLAKE2B 369a625a7b05ee56619698e8067ee7b99a9d0508db655aefd23cf42f5ee1abb150a6b262be089fce6951f84fe9f1cc0fa46b75830b851888fd17f123852558e7 SHA512 073f44125d4bbce27d69b914385e05028c4d275585e275ff1ee2ffe299059646394163dde2b6b5c175ac9379d388fe34c1c874deda4138121541e2a639d7635f
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod 155 BLAKE2B 8bba3353db8ceb3b9fe40b8fd59aacde169776a4a553a069a04836bbf15e5a9a8d7a2d39feed98dac6cb890198180fda39f26b528ff95f24c5b2bbf6601b45c3 SHA512 7c5a755a03063d47d259fda0a6c2faa63c2f30b98dbac583e106aaa817d6cde3e07551e0b5e08f3a25db4c4ca45a23cebe993ae6f3d39c88deeaf2c7d8086a06
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.zip 1876217 BLAKE2B 6ccbf46dcc9a97f60214af41470bc123c8b48a46737792d063ed6db50e937fdb87223032ff8f3c4d3f5ad0542a63e230ef70fa79ce681ab1ce71431b8a40caad SHA512 4795794202014a02396ae6e774ac5d9882d50c928660424f90798d806b1b5fd69f59e2bb23c5bf12a5841787cbc2f38142104b4427358dd527e539201415b35c
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod 25 BLAKE2B 01f7f78a0324ca728efd4d662ea130d7e200ab25805125e472720ca01feaaf2625b15bf53f51837a6913e35e060a19018928a38851d7445f39e6e42e237dfda2 SHA512 a9dd073f69c5be1153aaab6e84dd3bb1610a0df8b9882ca4c486c6625d4b5201e5032f86e5014421358dff564d93c4e67f20e5fd1d21ed5e259ddfbc90af43c0
-DIST golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.zip 27028 BLAKE2B 1148f5197f3701698ea33c6185b918fdada2b3f55d401dfb90d33731dfe80b53bfdd891df3c4fa572606cd88963de20d9b44f5296946d80aa0daedbdf6b658a7 SHA512 a93111e63671ef38bdf0ae2bd9209d6b3d7dc9ad138077d3bc22dad12f0657982667b7e88fc9a4162b0f6765184172957b05797a29a2d614c975df00b12c4aba
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip 1479123 BLAKE2B 45f0af63ffb886cbd78269a103067057346ab756631f228fc27b68459bdde97c84c100f99045e1a4a8d336513c4192b377048db8e09cefa703e94ca814d6eb07 SHA512 57783ce5463ce2a6a2d76d8ed3df08a23de896ca82e7456597a0fa55fe80bec64f899085fc727f0bf369495d1bca70a10e0f7071e7e66f6a5ecba1b4f42ffe54
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod 38 BLAKE2B e7781691d8c15b764ef6c89fcdf20e69fc28d46e8df2703b6fdc342247595c10ed25e3cc5b30cd29b81c57837f5685e4122e1b2c218a51fffbb1567c85b0835a SHA512 585188d3a75067e6b7d8a8321959fe7df80c6a19f8668a87f0d1b8687c4d2cefc039167446f6d02f7eeeb147371bc7a673348213bcb07f4d90bebc0ccf9f2015
-DIST gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip 59626 BLAKE2B 5fb595a10b7068bd2e4baea5fb28eb84f1f00960ca5ea964cd1812800ba8a34e62b3b71554dcfbdd727d5478eb5d91a00bd2bb7e89086929275e15e9261bdf2c SHA512 cdfbb32c7280c5405c4df41f00fa8b4ab2966285898a122a20f3c5f07a9e87095542be12efc09a67e4d90baa1fe51cd41f06733db7617949634409ea20e58dce
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod 95 BLAKE2B adb3684980f1d8e6c23444e91028f8db55f1bc496114eb3508dbecf9917dbc8a0a4bed7c0d761123335a75b9ffe727e180f2d6aa5f84312edb05a798185c8362 SHA512 916ff67ddb6c2ba39905db4277ce42596d9ca5a42f8aa7f47f16335e78d91a1b30419fd1b7b6967b37e248363397ec527b38d2f500b3546edda5d2bce1944379
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
+DIST antibody-2.2.2.tar.gz 19263 BLAKE2B 26db0457fff3798654d6bbe2422ca5dbf33acb39637e8eee7f67d5ae002eda7ef04a06ca528e2aeb9c094fefd46b4f55f7e946a55de3b7b7136bd320aacc5f35 SHA512 705f8c64d215f0a70891020895c5777970391461e6e8d2f357378d39191416c75205ce46b775c7f962e2a69760d882a729160c3efc3fc35452335a629a60b7b4
+DIST github.com-caarlos0-gohome-321f486.tar.gz 2559 BLAKE2B 5a367a540bb356d6ac5f65e0d0e8b4c560b0a2fe542dd3cebf282c0610bb7a7ef7f624a8bf0148a2ef0eef061ad845b04c725d1be8be93051d9d2c42b6101210 SHA512 39a9db975647ba3e9e5d017a4dfb390511e54fd7c272ab90a7fa6adba5c760806e0fb4cef19121f387d22c864155c651783e728d8556b377f6909d1d6be870b0
+DIST github.com-getantibody-folder-479aa91.tar.gz 1726 BLAKE2B ce416be0de75fcef726ee0060dfb6eb809980fb75da835fd9fb06c62c49aeb25346ab509a69c2d0ed8d65a2a2be9d2a7f0ec42f77e72308b044401b0f4eb5270 SHA512 f0b5096f8cfa0586a35e0f38ce83ffdf0546b6ecace8fd1441ddede0b17e0b24b94357c998c66ee54eaed269dccd6f86804d001abda64b0df397acbda7bb57d1
+DIST github.com-golang-crypto-f6b343c.tar.gz 1303799 BLAKE2B a2b96d283268455206f02113b31846ab636f93b49a73def2155bfaeb16ae61383a5e66a357703cc8c21d816ae15f07875aa203298a1cf33743cd0c18ace4ae89 SHA512 9a6294dc94623225d76117aa0c776dfa70a167a39702eb8c46689ed6c14f66ea8d80920dfc66c555694ed8c440607c2e38ee51b8444d760d3da5db85bff81ed0
+DIST github.com-golang-net-69d4b8a.tar.gz 766102 BLAKE2B c859316f0b65381f00b986bc42dd0b0b371d0f8a48dabd8a1f00ef4a4468a06fd59d618a17855ebc12c93f0d3b35f11af8fe7293d4afd913c4e64777864228ca SHA512 793758e4b85eb7a626c6c686f8c1b147df555b8a32fb3ec3b71c286a0d1fbaa5c08d1c34aa7e75cd880554136cf6b9ca5fb54c7efb4eac5de7fd42bda7b21536
+DIST github.com-golang-sync-450f422.tar.gz 7039 BLAKE2B 392f65a9b7bd850fc525b2c7e1ffd873fabb04658c8a00b1ab060b77e6b22bd4ad70c10e914a0981d5c2c3397357abdecd27aec84dd74b621c8f0fe0ef9c5083 SHA512 9b65928addd495115ff83fc2cbf13b19bb952d0e1a77c48f8e1c1116c8a0f435de222c0e086b8766c9eeb1650ccdf1e02a45b46c6ce025b1f44144fa55a8eb7b
+DIST github.com-kardianos-osext-c2c54e5.tar.gz 4725 BLAKE2B 6987a7b1fa546260189b272f6650fa738499230e08c9140ece62f1d9c4d65db7be10b37784b742ce15764aab51c43df99e9f2b61ef038ba4048482bf442d1c37 SHA512 178531aa30f0d67c452ffa247845a66f92a9831a5a96e67a2ad7102bd38edbdffba5277c3338e84960ced5cc2923534210bbf8787422fdd3035a6c6dd8d8dc93
+DIST github.com-urfave-cli-0bdedde.tar.gz 55656 BLAKE2B 7eeebdc63880ab4e89eddb1e4bdebc5cccdb5418d41f7eafc4f3ad2daf98b45af14adb1f134292bb2ea19bea6a08a2ac7cb3710f72628216cc1c4976ce8e3170 SHA512 5e99a82d56ef3516f49900b2cfa9c8da4f06d17b786e3cc4adff89f1541def111ccf13782843e3381b9122eb46de4f9aa8d406f2aaf94dd0bd76a736558c84ea
diff --git a/app-shells/antibody/antibody-2.2.2.ebuild b/app-shells/antibody/antibody-2.2.2.ebuild
new file mode 100644
index 000000000000..5a3687c2f61a
--- /dev/null
+++ b/app-shells/antibody/antibody-2.2.2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2020 Go Overlay Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GOLANG_PKG_IMPORTPATH="github.com/getantibody"
+GOLANG_PKG_ARCHIVEPREFIX="v"
+GOLANG_PKG_IS_MULTIPLE=1
+GOLANG_PKG_LDFLAGS="-X main.version=${PV}"
+
+GOLANG_PKG_DEPENDENCIES=(
+	"github.com/getantibody/folder:479aa91" #v1.0.0
+	"github.com/caarlos0/gohome:321f486"
+	"github.com/kardianos/osext:c2c54e5"
+	"github.com/urfave/cli:0bdedde" #v1.19.1
+	"github.com/golang/crypto:f6b343c -> golang.org/x"
+	"github.com/golang/sync:450f422 -> golang.org/x"
+	"github.com/golang/net:69d4b8a -> golang.org/x"
+)
+
+inherit golang-single
+
+DESCRIPTION="A faster and simpler antigen written in Golang"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="amd64 arm x86"
+
+RDEPEND="app-shells/zsh[unicode]
+	dev-vcs/git"
+
+RESTRICT+=" test"
diff --git a/app-shells/antibody/antibody-6.1.1-r1.ebuild b/app-shells/antibody/antibody-6.1.1-r1.ebuild
deleted file mode 100644
index 9c65147e79b4..000000000000
--- a/app-shells/antibody/antibody-6.1.1-r1.ebuild
+++ /dev/null
@@ -1,78 +0,0 @@
-# Copyright 2020-2021,2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-# NOTE: Keep EGO_SUM in sync with go.sum (with dev-go/get-ego-vendor).
-EGO_SUM=(
-	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751"
-	"github.com/alecthomas/template v0.0.0-20190718012654-fb15b899a751/go.mod"
-	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d"
-	"github.com/alecthomas/units v0.0.0-20190924025748-f65c72e2690d/go.mod"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/davecgh/go-spew v1.1.1"
-	"github.com/davecgh/go-spew v1.1.1/go.mod"
-	"github.com/getantibody/folder v1.0.0"
-	"github.com/getantibody/folder v1.0.0/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"github.com/stretchr/testify v1.4.0/go.mod"
-	"github.com/stretchr/testify v1.6.1"
-	"github.com/stretchr/testify v1.6.1/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899"
-	"golang.org/x/crypto v0.0.0-20200709230013-948cd5f35899/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208"
-	"golang.org/x/sync v0.0.0-20200625203802-6e8e738ad208/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod"
-	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae"
-	"golang.org/x/sys v0.0.0-20200625212154-ddb9806d33ae/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6"
-	"gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/yaml.v2 v2.2.2/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-)
-go-module_set_globals
-
-DESCRIPTION="Fast Zsh plugin manager"
-HOMEPAGE="https://getantibody.github.io/"
-SRC_URI="
-	https://github.com/getantibody/antibody/archive/v${PV}.tar.gz -> ${P}.tar.gz
-	${EGO_SUM_SRC_URI}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="dev-vcs/git"
-
-PATCHES=( "${FILESDIR}/${PN}-6.1.1_remove-failing-tests.patch" )
-
-src_configure() {
-	if use test; then
-		GOFLAGS="${GOFLAGS/-buildmode=pie/-buildmode=exe}" # bug 893190
-	fi
-}
-
-src_compile() {
-	local -a mygoargs=(
-		-ldflags "-X main.version=${PV}"
-	)
-	ego build "${mygoargs[@]}" || die
-}
-
-src_install() {
-	dobin antibody
-	einstalldocs
-}
diff --git a/app-shells/antibody/files/6.0.1-remove-failing-tests.patch b/app-shells/antibody/files/6.0.1-remove-failing-tests.patch
deleted file mode 100644
index 9886121cd673..000000000000
--- a/app-shells/antibody/files/6.0.1-remove-failing-tests.patch
+++ /dev/null
@@ -1,419 +0,0 @@
-From e01c41417a171bb63b985742e93b3f0fc501d25f Mon Sep 17 00:00:00 2001
-From: tastytea <tastytea@tastytea.de>
-Date: Mon, 18 May 2020 22:04:28 +0200
-Subject: [PATCH] Remove failing tests.
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-Something in project/ emitted the helpful error message “build failed”,
-so I took the sledgehammer approach in git_test.go and
-project_test.go. It is likely I deleted a bit too much. Feel free to
-replace this with a better patch.
----
- antibodylib/antibody_test.go | 105 -------------------------------
- bundle/bundle_test.go        |  51 ---------------
- project/git_test.go          | 117 -----------------------------------
- project/project_test.go      |  46 --------------
- 4 files changed, 319 deletions(-)
-
-diff --git a/antibodylib/antibody_test.go b/antibodylib/antibody_test.go
-index 752ca07..608f3dc 100644
---- a/antibodylib/antibody_test.go
-+++ b/antibodylib/antibody_test.go
-@@ -5,40 +5,11 @@ import (
- 	"io/ioutil"
- 	"os"
- 	"runtime"
--	"strings"
- 	"testing"
- 
- 	"github.com/stretchr/testify/require"
- )
- 
--func TestAntibody(t *testing.T) {
--	home := home()
--	bundles := []string{
--		"# comments also are allowed",
--		"caarlos0/ports kind:path # comment at the end of the line",
--		"caarlos0/jvm kind:path branch:gh-pages",
--		"caarlos0/zsh-open-pr     kind:zsh",
--		"",
--		"        ",
--		"  # trick play",
--		"/tmp kind:path",
--	}
--	sh, err := New(
--		home,
--		bytes.NewBufferString(strings.Join(bundles, "\n")),
--		runtime.NumCPU(),
--	).Bundle()
--	require.NoError(t, err)
--	files, err := ioutil.ReadDir(home)
--	require.NoError(t, err)
--	require.Len(t, files, 3)
--	require.Contains(t, sh, `export PATH="/tmp:$PATH"`)
--	require.Contains(t, sh, `export PATH="`+home+`/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-ports:$PATH"`)
--	require.Contains(t, sh, `export PATH="`+home+`/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-jvm:$PATH"`)
--	// nolint: lll
--	require.Contains(t, sh, `source `+home+`/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-zsh-open-pr/git-open-pr.plugin.zsh`)
--}
--
- func TestAntibodyError(t *testing.T) {
- 	home := home()
- 	bundles := bytes.NewBufferString("invalid-repo")
-@@ -46,82 +17,6 @@ func TestAntibodyError(t *testing.T) {
- 	require.Error(t, err)
- 	require.Empty(t, sh)
- }
--
--func TestMultipleRepositories(t *testing.T) {
--	home := home()
--	bundles := []string{
--		"# this block is in alphabetic order",
--		"caarlos0/git-add-remote kind:path",
--		"caarlos0/jvm",
--		"caarlos0/ports kind:path",
--		"caarlos0/zsh-git-fetch-merge kind:path",
--		"caarlos0/zsh-git-sync kind:path",
--		"caarlos0/zsh-mkc",
--		"caarlos0/zsh-open-pr kind:path",
--		"mafredri/zsh-async",
--		"rupa/z",
--		"Tarrasch/zsh-bd",
--		"wbinglee/zsh-wakatime",
--		"zsh-users/zsh-completions",
--		"zsh-users/zsh-autosuggestions",
--		"",
--		"robbyrussell/oh-my-zsh path:plugins/asdf",
--		"robbyrussell/oh-my-zsh path:plugins/autoenv",
--		"# these should be at last!",
--		"sindresorhus/pure",
--		"zsh-users/zsh-syntax-highlighting",
--		"zsh-users/zsh-history-substring-search",
--	}
--	sh, err := New(
--		home,
--		bytes.NewBufferString(strings.Join(bundles, "\n")),
--		runtime.NumCPU(),
--	).Bundle()
--	require.NoError(t, err)
--	require.Len(t, strings.Split(sh, "\n"), 31)
--}
--
--// BenchmarkDownload-8   	       1	2907868713 ns/op	  480296 B/op	    2996 allocs/op v1
--// BenchmarkDownload-8   	       1	2708120385 ns/op	  475904 B/op	    3052 allocs/op v2
--func BenchmarkDownload(b *testing.B) {
--	var bundles = strings.Join([]string{
--		"robbyrussell/oh-my-zsh path:plugins/aws",
--		"caarlos0/git-add-remote kind:path",
--		"caarlos0/jvm",
--		"caarlos0/ports kind:path",
--		"",
--		"# comment whatever",
--		"caarlos0/zsh-git-fetch-merge kind:path",
--		"robbyrussell/oh-my-zsh path:plugins/battery",
--		"caarlos0/zsh-git-sync kind:path",
--		"caarlos0/zsh-mkc",
--		"caarlos0/zsh-open-pr kind:path",
--		"robbyrussell/oh-my-zsh path:plugins/asdf",
--		"mafredri/zsh-async",
--		"rupa/z",
--		"Tarrasch/zsh-bd",
--		"",
--		"Linuxbrew/brew path:completions/zsh kind:fpath",
--		"wbinglee/zsh-wakatime",
--		"zsh-users/zsh-completions",
--		"zsh-users/zsh-autosuggestions",
--		"robbyrussell/oh-my-zsh path:plugins/autoenv",
--		"# these should be at last!",
--		"sindresorhus/pure",
--		"zsh-users/zsh-syntax-highlighting",
--		"zsh-users/zsh-history-substring-search",
--	}, "\n")
--	for i := 0; i < b.N; i++ {
--		home := home()
--		_, err := New(
--			home,
--			bytes.NewBufferString(bundles),
--			runtime.NumCPU(),
--		).Bundle()
--		require.NoError(b, err)
--	}
--}
--
- func TestHome(t *testing.T) {
- 	h, err := Home()
- 	require.NoError(t, err)
-diff --git a/bundle/bundle_test.go b/bundle/bundle_test.go
-index 9613197..83a9bda 100644
---- a/bundle/bundle_test.go
-+++ b/bundle/bundle_test.go
-@@ -9,49 +9,6 @@ import (
- 	"github.com/stretchr/testify/require"
- )
- 
--func TestSuccessfullGitBundles(t *testing.T) {
--	table := []struct {
--		line, result string
--	}{
--		{
--			"caarlos0/jvm",
--			"jvm.plugin.zsh\nfpath+=( ",
--		},
--		{
--			"caarlos0/jvm kind:path",
--			"export PATH=\"",
--		},
--		{
--			"caarlos0/jvm kind:path branch:gh-pages",
--			"export PATH=\"",
--		},
--		{
--			"caarlos0/jvm kind:dummy",
--			"",
--		},
--		{
--			"caarlos0/jvm kind:fpath",
--			"fpath+=( ",
--		},
--		{
--			"docker/cli path:contrib/completion/zsh/_docker",
--			"contrib/completion/zsh/_docker",
--		},
--	}
--	for _, row := range table {
--		row := row
--		t.Run(row.line, func(t *testing.T) {
--			t.Parallel()
--			home := home(t)
--			bundle, err := New(home, row.line)
--			require.NoError(t, err)
--			result, err := bundle.Get()
--			require.Contains(t, result, row.result)
--			require.NoError(t, err)
--		})
--	}
--}
--
- func TestZshInvalidGitBundle(t *testing.T) {
- 	home := home(t)
- 	bundle, err := New(home, "does not exist")
-@@ -78,14 +35,6 @@ func TestZshInvalidLocalBundle(t *testing.T) {
- 	require.Error(t, err)
- }
- 
--func TestZshBundleWithNoShFiles(t *testing.T) {
--	home := home(t)
--	bundle, err := New(home, "getantibody/antibody")
--	require.NoError(t, err)
--	_, err = bundle.Get()
--	require.NoError(t, err)
--}
--
- func TestPathInvalidLocalBundle(t *testing.T) {
- 	home := home(t)
- 	bundle, err := New(home, "/asduhasd/asdasda kind:path")
-diff --git a/project/git_test.go b/project/git_test.go
-index b9983f8..c014be0 100644
---- a/project/git_test.go
-+++ b/project/git_test.go
-@@ -3,125 +3,8 @@ package project
- import (
- 	"io/ioutil"
- 	"os"
--	"path/filepath"
--	"strings"
--	"testing"
--
--	"github.com/stretchr/testify/require"
- )
- 
--func TestDownloadAllKinds(t *testing.T) {
--	urls := []string{
--		"caarlos0/ports",
--		"http://github.com/caarlos0/ports",
--		"http://github.com/caarlos0/ports.git",
--		"https://github.com/caarlos0/ports",
--		"https://github.com/caarlos0/ports.git",
--		"git://github.com/caarlos0/ports.git",
--		"https://gitlab.com/caarlos0/test.git",
--		// FIXME: those fail on travis:
--		// "git@gitlab.com:caarlos0/test.git",
--		// "ssh://git@github.com/caarlos0/ports.git",
--		// "git@github.com:caarlos0/ports.git",
--	}
--	for _, url := range urls {
--		home := home()
--		require.NoError(
--			t,
--			NewGit(home, url).Download(),
--			"Repo "+url+" failed to download",
--		)
--	}
--}
--
--func TestDownloadSubmodules(t *testing.T) {
--	var home = home()
--	var proj = NewGit(home, "fribmendes/geometry")
--	var module = filepath.Join(proj.Path(), "lib/zsh-async")
--	require.NoError(t, proj.Download())
--	require.NoError(t, proj.Update())
--	files, err := ioutil.ReadDir(module)
--	require.NoError(t, err)
--	require.True(t, len(files) > 1)
--}
--
--func TestDownloadAnotherBranch(t *testing.T) {
--	home := home()
--	require.NoError(t, NewGit(home, "caarlos0/jvm branch:gh-pages").Download())
--}
--
--func TestUpdateAnotherBranch(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "caarlos0/jvm branch:gh-pages")
--	require.NoError(t, repo.Download())
--	alreadyClonedRepo := NewClonedGit(home, "https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-jvm")
--	require.NoError(t, alreadyClonedRepo.Update())
--}
--
--func TestUpdateExistentLocalRepo(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "caarlos0/ports")
--	require.NoError(t, repo.Download())
--	alreadyClonedRepo := NewClonedGit(home, "https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-ports")
--	require.NoError(t, alreadyClonedRepo.Update())
--}
--
--func TestUpdateNonExistentLocalRepo(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "caarlos0/ports")
--	require.Error(t, repo.Update())
--}
--
--func TestDownloadNonExistentRepo(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "caarlos0/not-a-real-repo")
--	require.Error(t, repo.Download())
--}
--
--func TestDownloadMalformedRepo(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "doesn-not-exist-really branch:also-nope")
--	require.Error(t, repo.Download())
--}
--
--func TestDownloadMultipleTimes(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "caarlos0/ports")
--	require.NoError(t, repo.Download())
--	require.NoError(t, repo.Download())
--	require.NoError(t, repo.Update())
--}
--
--func TestDownloadFolderNaming(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "caarlos0/ports")
--	require.Equal(
--		t,
--		home+"/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-ports",
--		repo.Path(),
--	)
--}
--
--func TestSubFolder(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "robbyrussell/oh-my-zsh path:plugins/aws")
--	require.True(t, strings.HasSuffix(repo.Path(), "plugins/aws"))
--}
--
--func TestPath(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "docker/cli path:contrib/completion/zsh/_docker")
--	require.True(t, strings.HasSuffix(repo.Path(), "contrib/completion/zsh/_docker"))
--}
--
--func TestMultipleSubFolders(t *testing.T) {
--	home := home()
--	require.NoError(t, NewGit(home, strings.Join([]string{
--		"robbyrussell/oh-my-zsh path:plugins/aws",
--		"robbyrussell/oh-my-zsh path:plugins/battery",
--	}, "\n")).Download())
--}
--
- func home() string {
- 	home, err := ioutil.TempDir(os.TempDir(), "antibody")
- 	if err != nil {
-diff --git a/project/project_test.go b/project/project_test.go
-index 88c82e3..2fd8a25 100644
---- a/project/project_test.go
-+++ b/project/project_test.go
-@@ -1,24 +1,12 @@
- package project
- 
- import (
--	"os"
--	"path/filepath"
- 	"runtime"
- 	"testing"
- 
- 	"github.com/stretchr/testify/require"
- )
- 
--func TestList(t *testing.T) {
--	home := home()
--	proj, err := New(home, "caarlos0/jvm branch:gh-pages")
--	require.NoError(t, err)
--	require.NoError(t, proj.Download())
--	list, err := List(home)
--	require.NoError(t, err)
--	require.Len(t, list, 1)
--}
--
- func TestListEmptyFolder(t *testing.T) {
- 	home := home()
- 	list, err := List(home)
-@@ -32,40 +20,6 @@ func TestListNonExistentFolder(t *testing.T) {
- 	require.Len(t, list, 0)
- }
- 
--func TestUpdate(t *testing.T) {
--	home := home()
--	repo, err := New(home, "caarlos0/ports")
--	require.NoError(t, err)
--	require.NoError(t, repo.Download())
--	require.NoError(t, repo.Update())
--}
--
--func TestUpdateHome(t *testing.T) {
--	home := home()
--	for _, tt := range []string{
--		"caarlos0/jvm",
--		"caarlos0/ports",
--		"/tmp",
--	} {
--		tt := tt
--		t.Run(tt, func(t *testing.T) {
--			proj, err := New(home, tt)
--			require.NoError(t, err)
--			require.NoError(t, proj.Download())
--			require.NoError(t, Update(home, runtime.NumCPU()))
--		})
--	}
--}
--
- func TestUpdateNonExistentHome(t *testing.T) {
- 	require.Error(t, Update("/tmp/asdasdasdasksksksksnopeeeee", runtime.NumCPU()))
- }
--
--func TestUpdateHomeWithNoGitProjects(t *testing.T) {
--	home := home()
--	repo, err := New(home, "caarlos0/jvm")
--	require.NoError(t, err)
--	require.NoError(t, repo.Download())
--	require.NoError(t, os.RemoveAll(filepath.Join(repo.Path(), ".git")))
--	require.Error(t, Update(home, runtime.NumCPU()))
--}
--- 
-2.26.2
-
diff --git a/app-shells/antibody/files/antibody-6.1.1_remove-failing-tests.patch b/app-shells/antibody/files/antibody-6.1.1_remove-failing-tests.patch
deleted file mode 100644
index 9c7f92b64de3..000000000000
--- a/app-shells/antibody/files/antibody-6.1.1_remove-failing-tests.patch
+++ /dev/null
@@ -1,422 +0,0 @@
-From 0030445c7fef2c1fcf6701d77ee1e3400c044dea Mon Sep 17 00:00:00 2001
-From: tastytea <tastytea@tastytea.de>
-Date: Mon, 19 Apr 2021 09:24:31 +0200
-Subject: [PATCH] Remove failing tests.
-
-Remove all tests which require network access. Unused imports  make the
-tests fail.
----
- antibodylib/antibody_test.go | 105 +------------------------------
- bundle/bundle_test.go        |  59 ------------------
- project/git_test.go          | 117 -----------------------------------
- project/project_test.go      |  46 --------------
- 4 files changed, 2 insertions(+), 325 deletions(-)
-
-diff --git a/antibodylib/antibody_test.go b/antibodylib/antibody_test.go
-index 752ca07..ea2d7ee 100644
---- a/antibodylib/antibody_test.go
-+++ b/antibodylib/antibody_test.go
-@@ -5,40 +5,11 @@ import (
- 	"io/ioutil"
- 	"os"
- 	"runtime"
--	"strings"
- 	"testing"
- 
- 	"github.com/stretchr/testify/require"
- )
- 
--func TestAntibody(t *testing.T) {
--	home := home()
--	bundles := []string{
--		"# comments also are allowed",
--		"caarlos0/ports kind:path # comment at the end of the line",
--		"caarlos0/jvm kind:path branch:gh-pages",
--		"caarlos0/zsh-open-pr     kind:zsh",
--		"",
--		"        ",
--		"  # trick play",
--		"/tmp kind:path",
--	}
--	sh, err := New(
--		home,
--		bytes.NewBufferString(strings.Join(bundles, "\n")),
--		runtime.NumCPU(),
--	).Bundle()
--	require.NoError(t, err)
--	files, err := ioutil.ReadDir(home)
--	require.NoError(t, err)
--	require.Len(t, files, 3)
--	require.Contains(t, sh, `export PATH="/tmp:$PATH"`)
--	require.Contains(t, sh, `export PATH="`+home+`/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-ports:$PATH"`)
--	require.Contains(t, sh, `export PATH="`+home+`/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-jvm:$PATH"`)
--	// nolint: lll
--	require.Contains(t, sh, `source `+home+`/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-zsh-open-pr/git-open-pr.plugin.zsh`)
--}
--
- func TestAntibodyError(t *testing.T) {
- 	home := home()
- 	bundles := bytes.NewBufferString("invalid-repo")
-@@ -47,80 +18,8 @@ func TestAntibodyError(t *testing.T) {
- 	require.Empty(t, sh)
- }
- 
--func TestMultipleRepositories(t *testing.T) {
--	home := home()
--	bundles := []string{
--		"# this block is in alphabetic order",
--		"caarlos0/git-add-remote kind:path",
--		"caarlos0/jvm",
--		"caarlos0/ports kind:path",
--		"caarlos0/zsh-git-fetch-merge kind:path",
--		"caarlos0/zsh-git-sync kind:path",
--		"caarlos0/zsh-mkc",
--		"caarlos0/zsh-open-pr kind:path",
--		"mafredri/zsh-async",
--		"rupa/z",
--		"Tarrasch/zsh-bd",
--		"wbinglee/zsh-wakatime",
--		"zsh-users/zsh-completions",
--		"zsh-users/zsh-autosuggestions",
--		"",
--		"robbyrussell/oh-my-zsh path:plugins/asdf",
--		"robbyrussell/oh-my-zsh path:plugins/autoenv",
--		"# these should be at last!",
--		"sindresorhus/pure",
--		"zsh-users/zsh-syntax-highlighting",
--		"zsh-users/zsh-history-substring-search",
--	}
--	sh, err := New(
--		home,
--		bytes.NewBufferString(strings.Join(bundles, "\n")),
--		runtime.NumCPU(),
--	).Bundle()
--	require.NoError(t, err)
--	require.Len(t, strings.Split(sh, "\n"), 31)
--}
--
--// BenchmarkDownload-8   	       1	2907868713 ns/op	  480296 B/op	    2996 allocs/op v1
--// BenchmarkDownload-8   	       1	2708120385 ns/op	  475904 B/op	    3052 allocs/op v2
--func BenchmarkDownload(b *testing.B) {
--	var bundles = strings.Join([]string{
--		"robbyrussell/oh-my-zsh path:plugins/aws",
--		"caarlos0/git-add-remote kind:path",
--		"caarlos0/jvm",
--		"caarlos0/ports kind:path",
--		"",
--		"# comment whatever",
--		"caarlos0/zsh-git-fetch-merge kind:path",
--		"robbyrussell/oh-my-zsh path:plugins/battery",
--		"caarlos0/zsh-git-sync kind:path",
--		"caarlos0/zsh-mkc",
--		"caarlos0/zsh-open-pr kind:path",
--		"robbyrussell/oh-my-zsh path:plugins/asdf",
--		"mafredri/zsh-async",
--		"rupa/z",
--		"Tarrasch/zsh-bd",
--		"",
--		"Linuxbrew/brew path:completions/zsh kind:fpath",
--		"wbinglee/zsh-wakatime",
--		"zsh-users/zsh-completions",
--		"zsh-users/zsh-autosuggestions",
--		"robbyrussell/oh-my-zsh path:plugins/autoenv",
--		"# these should be at last!",
--		"sindresorhus/pure",
--		"zsh-users/zsh-syntax-highlighting",
--		"zsh-users/zsh-history-substring-search",
--	}, "\n")
--	for i := 0; i < b.N; i++ {
--		home := home()
--		_, err := New(
--			home,
--			bytes.NewBufferString(bundles),
--			runtime.NumCPU(),
--		).Bundle()
--		require.NoError(b, err)
--	}
--}
-+// BenchmarkDownload-8			   1	2907868713 ns/op	  480296 B/op		2996 allocs/op v1
-+// BenchmarkDownload-8			   1	2708120385 ns/op	  475904 B/op		3052 allocs/op v2
- 
- func TestHome(t *testing.T) {
- 	h, err := Home()
-diff --git a/bundle/bundle_test.go b/bundle/bundle_test.go
-index 78c4b70..4c72d34 100644
---- a/bundle/bundle_test.go
-+++ b/bundle/bundle_test.go
-@@ -9,57 +9,6 @@ import (
- 	"github.com/stretchr/testify/require"
- )
- 
--func TestSuccessfullGitBundles(t *testing.T) {
--	table := []struct {
--		line, result string
--	}{
--		{
--			"caarlos0/jvm",
--			"jvm.plugin.zsh\nfpath+=( ",
--		},
--		{
--			"caarlos0/jvm kind:path",
--			"export PATH=\"",
--		},
--		{
--			"caarlos0/jvm kind:path branch:gh-pages",
--			"export PATH=\"",
--		},
--		{
--			"caarlos0/jvm kind:dummy",
--			"",
--		},
--		{
--			"caarlos0/jvm kind:fpath",
--			"fpath+=( ",
--		},
--		{
--			"docker/cli path:contrib/completion/zsh/_docker",
--			"contrib/completion/zsh/_docker",
--		},
--	}
--	for _, row := range table {
--		row := row
--		t.Run(row.line, func(t *testing.T) {
--			t.Parallel()
--			home := home(t)
--			bundle, err := New(home, row.line)
--			require.NoError(t, err)
--			result, err := bundle.Get()
--			require.Contains(t, result, row.result)
--			require.NoError(t, err)
--		})
--	}
--}
--
--func TestZshInvalidGitBundle(t *testing.T) {
--	home := home(t)
--	bundle, err := New(home, "does not exist")
--	require.NoError(t, err)
--	_, err = bundle.Get()
--	require.Error(t, err)
--}
--
- func TestZshLocalBundle(t *testing.T) {
- 	home := home(t)
- 	// nolint: gosec
-@@ -79,14 +28,6 @@ func TestZshInvalidLocalBundle(t *testing.T) {
- 	require.Error(t, err)
- }
- 
--func TestZshBundleWithNoShFiles(t *testing.T) {
--	home := home(t)
--	bundle, err := New(home, "getantibody/antibody")
--	require.NoError(t, err)
--	_, err = bundle.Get()
--	require.NoError(t, err)
--}
--
- func TestPathInvalidLocalBundle(t *testing.T) {
- 	home := home(t)
- 	bundle, err := New(home, "/asduhasd/asdasda kind:path")
-diff --git a/project/git_test.go b/project/git_test.go
-index f238317..c014be0 100644
---- a/project/git_test.go
-+++ b/project/git_test.go
-@@ -3,125 +3,8 @@ package project
- import (
- 	"io/ioutil"
- 	"os"
--	"path/filepath"
--	"strings"
--	"testing"
--
--	"github.com/stretchr/testify/require"
- )
- 
--func TestDownloadAllKinds(t *testing.T) {
--	urls := []string{
--		"caarlos0/ports",
--		"http://github.com/caarlos0/ports",
--		"http://github.com/caarlos0/ports.git",
--		"https://github.com/caarlos0/ports",
--		"https://github.com/caarlos0/ports.git",
--		"git://github.com/caarlos0/ports.git",
--		"https://gitlab.com/caarlos0/test.git",
--		// FIXME: those fail on travis:
--		// "git@gitlab.com:caarlos0/test.git",
--		// "ssh://git@github.com/caarlos0/ports.git",
--		// "git@github.com:caarlos0/ports.git",
--	}
--	for _, url := range urls {
--		home := home()
--		require.NoError(
--			t,
--			NewGit(home, url).Download(),
--			"Repo "+url+" failed to download",
--		)
--	}
--}
--
--func TestDownloadSubmodules(t *testing.T) {
--	var home = home()
--	var proj = NewGit(home, "fribmendes/geometry branch:master")
--	var module = filepath.Join(proj.Path(), "lib/zsh-async")
--	require.NoError(t, proj.Download())
--	require.NoError(t, proj.Update())
--	files, err := ioutil.ReadDir(module)
--	require.NoError(t, err)
--	require.True(t, len(files) > 1)
--}
--
--func TestDownloadAnotherBranch(t *testing.T) {
--	home := home()
--	require.NoError(t, NewGit(home, "caarlos0/jvm branch:gh-pages").Download())
--}
--
--func TestUpdateAnotherBranch(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "caarlos0/jvm branch:gh-pages")
--	require.NoError(t, repo.Download())
--	alreadyClonedRepo := NewClonedGit(home, "https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-jvm")
--	require.NoError(t, alreadyClonedRepo.Update())
--}
--
--func TestUpdateExistentLocalRepo(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "caarlos0/ports")
--	require.NoError(t, repo.Download())
--	alreadyClonedRepo := NewClonedGit(home, "https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-ports")
--	require.NoError(t, alreadyClonedRepo.Update())
--}
--
--func TestUpdateNonExistentLocalRepo(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "caarlos0/ports")
--	require.Error(t, repo.Update())
--}
--
--func TestDownloadNonExistentRepo(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "caarlos0/not-a-real-repo")
--	require.Error(t, repo.Download())
--}
--
--func TestDownloadMalformedRepo(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "doesn-not-exist-really branch:also-nope")
--	require.Error(t, repo.Download())
--}
--
--func TestDownloadMultipleTimes(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "caarlos0/ports")
--	require.NoError(t, repo.Download())
--	require.NoError(t, repo.Download())
--	require.NoError(t, repo.Update())
--}
--
--func TestDownloadFolderNaming(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "caarlos0/ports")
--	require.Equal(
--		t,
--		home+"/https-COLON--SLASH--SLASH-github.com-SLASH-caarlos0-SLASH-ports",
--		repo.Path(),
--	)
--}
--
--func TestSubFolder(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "robbyrussell/oh-my-zsh path:plugins/aws")
--	require.True(t, strings.HasSuffix(repo.Path(), "plugins/aws"))
--}
--
--func TestPath(t *testing.T) {
--	home := home()
--	repo := NewGit(home, "docker/cli path:contrib/completion/zsh/_docker")
--	require.True(t, strings.HasSuffix(repo.Path(), "contrib/completion/zsh/_docker"))
--}
--
--func TestMultipleSubFolders(t *testing.T) {
--	home := home()
--	require.NoError(t, NewGit(home, strings.Join([]string{
--		"robbyrussell/oh-my-zsh path:plugins/aws",
--		"robbyrussell/oh-my-zsh path:plugins/battery",
--	}, "\n")).Download())
--}
--
- func home() string {
- 	home, err := ioutil.TempDir(os.TempDir(), "antibody")
- 	if err != nil {
-diff --git a/project/project_test.go b/project/project_test.go
-index 88c82e3..2fd8a25 100644
---- a/project/project_test.go
-+++ b/project/project_test.go
-@@ -1,24 +1,12 @@
- package project
- 
- import (
--	"os"
--	"path/filepath"
- 	"runtime"
- 	"testing"
- 
- 	"github.com/stretchr/testify/require"
- )
- 
--func TestList(t *testing.T) {
--	home := home()
--	proj, err := New(home, "caarlos0/jvm branch:gh-pages")
--	require.NoError(t, err)
--	require.NoError(t, proj.Download())
--	list, err := List(home)
--	require.NoError(t, err)
--	require.Len(t, list, 1)
--}
--
- func TestListEmptyFolder(t *testing.T) {
- 	home := home()
- 	list, err := List(home)
-@@ -32,40 +20,6 @@ func TestListNonExistentFolder(t *testing.T) {
- 	require.Len(t, list, 0)
- }
- 
--func TestUpdate(t *testing.T) {
--	home := home()
--	repo, err := New(home, "caarlos0/ports")
--	require.NoError(t, err)
--	require.NoError(t, repo.Download())
--	require.NoError(t, repo.Update())
--}
--
--func TestUpdateHome(t *testing.T) {
--	home := home()
--	for _, tt := range []string{
--		"caarlos0/jvm",
--		"caarlos0/ports",
--		"/tmp",
--	} {
--		tt := tt
--		t.Run(tt, func(t *testing.T) {
--			proj, err := New(home, tt)
--			require.NoError(t, err)
--			require.NoError(t, proj.Download())
--			require.NoError(t, Update(home, runtime.NumCPU()))
--		})
--	}
--}
--
- func TestUpdateNonExistentHome(t *testing.T) {
- 	require.Error(t, Update("/tmp/asdasdasdasksksksksnopeeeee", runtime.NumCPU()))
- }
--
--func TestUpdateHomeWithNoGitProjects(t *testing.T) {
--	home := home()
--	repo, err := New(home, "caarlos0/jvm")
--	require.NoError(t, err)
--	require.NoError(t, repo.Download())
--	require.NoError(t, os.RemoveAll(filepath.Join(repo.Path(), ".git")))
--	require.Error(t, Update(home, runtime.NumCPU()))
--}
--- 
-2.26.3
-
diff --git a/app-shells/antibody/metadata.xml b/app-shells/antibody/metadata.xml
index 7dfacfef7de2..7cf1ac1fff23 100644
--- a/app-shells/antibody/metadata.xml
+++ b/app-shells/antibody/metadata.xml
@@ -2,14 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>gentoo@tastytea.de</email>
-  <name>Ronny (tastytea) Gutbrod</name>
+  <email>toffanin.mauro@gmail.com</email>
+  <name>Mauro Toffanin</name>
+  <description>Maintainer. Assign bugs to him</description>
  </maintainer>
- <longdescription lang="en">
-		Antibody is fast because it can do things concurrently, while Antigen
-		does it sequentially. It also has the advantage of using a compiled
-		language instead of a scripting one.
-	</longdescription>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>go-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/app-shells/powerline-go/Manifest b/app-shells/powerline-go/Manifest
index 52b43b61015d..eaab47262ff6 100644
--- a/app-shells/powerline-go/Manifest
+++ b/app-shells/powerline-go/Manifest
@@ -1,68 +1,6 @@
-DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod 36 BLAKE2B e15c1ef74374320cc49b3509a1fa8d7f63c8566920ba56f8b6f293e3d331f5587d45b35284af52b40f329e116f570543a7df50ab1888c4238b28c2ea583d2fda SHA512 83f296ee872570bab84dc3e3f7984f155f5a9a4f95ca7b23a5f39dd47b54eb87ceb2eaa4db00a3966def5b41fb0250de18bcde32610c350206b6d0e744353fd7
-DIST github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip 14905 BLAKE2B 9aa626472e6bebbcb1d454f892ebf3c5f953ccf952e6ca7e60715211d418ab9c8d54832f9949824702278cd753758425dda72867e61ece209da688196d13d2ef SHA512 82818b2eb7e8f7265b814f202c420e5a187fd5e9a43536a062715e1a3d1d5717acc8d2daeb1f678dd13bf5703545309ad9d4b4e78fbb6e9befd9bb7370ddaa3b
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod 34 BLAKE2B 7e09c2779bf7a84a9271e31522ebbe600a1c11b107d651d91f58c8373e4336332a3a881f3e12b382543d75f20398af66085fcb3e780eed341e870e9c30f29267 SHA512 5e079462f7e0dff0efda71f580aa185700cfa936b718a19d0e2a8c63212e47a07022dca0c282832d48e5165aae8e82aeeeb2ac3664268f1148fc772010fb860e
-DIST github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip 60546 BLAKE2B e775860f49c6ee09a6c48902d38fdf5d2d77af4cd405d8d303902170e46493301d4aa873a48b4d12a16d92dafaa65290de1fd3a42545025fbfc82f15a3881e8d SHA512 53dc5484f488ae1f8d0eb672c3431bbf9fce33dfcee83dda7929103e3650559cf703f601716984a640422f01cc640860dba0b47e16aef04d0d2452a266fefbf9
-DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod 41 BLAKE2B 62bb3af3f58b23321cc389ceca36d28e4f32cb1470b6c54c4af55ef927ba84284858765b5b333c3bbdb042826550fe4f0d22022078e2b34e340098465e21f3e8 SHA512 1e8d650a965637bd0974b8f42e207155dd1bac307e9ecf4d294cb4ee0f1c694276062d46318d113326b9c1bfdc379a7d8b8fa2c18e4a08ed9baefcae67db88d2
-DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip 79799 BLAKE2B 1677e3977fcf1499a1d6d3b0dda2f990b12a9f5464ff8a7aca6752951b395038ea2e3a38224d24eff0e6df6a2cc92f5da47daef9ceb237433bd2370d70eb7737 SHA512 9a67b0101fc1afba75179246e1498c41254d8379f78ef65877166bf9a5b7f7ac9e29f270e9186f13a26891389ab4e9ef309c4e90b2e79bffc3ade49e39fe2af1
-DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.6.mod 102 BLAKE2B c096713531ccc3c357cf951e296fa6d4cb5619a408f24097f6d61db1610a7940704e913387b051f0d7cea97b950f87d1d659b2de94942d4b6b7eeb90fba8e7e6 SHA512 8ecc75e46e529812efc2e20f6bbc044929aaeba393c291fbde9b3c9365db5c4e7c06b07dc2b4484326609521eb09cb55ab6f9d8976fe1450bf4f52a962a35429
-DIST github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.6.zip 82876 BLAKE2B ce104d907f878a396daa33fb5ce93ccd7e12b40ae38780eb281a3160823d3393af6ac0f54bd22bcb6bf87b6a3ad4278444333ae8fbe9099ce614d3613006847f SHA512 dfed3d9e05657f05a59bddb005ce040364f0a7aa49cadb8b0179ccc59bcc11df920d7795ed3524d3fa6d5c26fb577b0be66cb96c7387fc006bcc82f7797b272b
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod 105 BLAKE2B ffd22df03c1b351fb766a97818d46cc6aebeef365632d5263c90cf45a4acffdf5811da10ea2cd4747bc9691f74661c0b655961a065ed15a0194eeb4d1d12ca9b SHA512 cb203760fc6ca9c9d64811cf1342752faa5a95f27934c298407dc865f9561081210dd1b82b15ee2f5337b70d4c55d102d8884b5b9a5f70d9cbf85227a32b9713
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip 132988 BLAKE2B 48845d9df9bc0766f93a141ddc1989fcf850d76273824d62ee11297774703bed33b1dcbe77817b6eb417769ed11249d8089d248631a8c6669a75a6d34e048653 SHA512 22df4fc49c44a1e73eb72295195633bc04b67fda27df452893ae77932879b62b344455b880972e78022a61dafb30eba8b5b6a872f6c66e093323fd5d1c086466
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.7.mod 106 BLAKE2B 24d2d7974198d1bb1f72d7048091d63ed28addbdc9a128b8a20e7b66f2a437f452c3d7621fcb015218932a2e10c29d0f4d3db0339e97ec2eeebcdd7a8cec7220 SHA512 731d289da30616cc638958da98fbaed6eba9cd7b325c845bafa8f8a316c5fbfdf2eada196a0e25a50512c18d2a6aaa771d63cec0d42a25e9c8a2c7bc3d3f1cb3
-DIST github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.7.zip 132348 BLAKE2B 14bcdcadac7af94432cb33dbef2b4a33d46d98d9653fd43eef36ccd73c1617fd9fca910bf2ec03bd17e27182a831c52d6a0baa0821b3be5af8499f4a2b39ea21 SHA512 60e409c8210c4accc315004a674a397c4aa1d0fa150627756047ca3e87cbed4dd78509e76a490f7cd6989760ac0ad71fe8c712dfbf9009070a110290c2cb3126
-DIST github.com%2Flufia%2Fplan9stats%2F@v%2Fv0.0.0-20211012122336-39d0f177ccd0.mod 85 BLAKE2B a658955e102a81023bffa2ccd9e839359df45a6dc6b0c4717996b4d37a34142581ba2ad1fb64f1598a3996cd51272627903d17bc1699531b31bf70a3dd789332 SHA512 62129426bd2ab5adf804deaba8fa493c7907315b2111cf6ef4b531b5b118108fafa4b167f516faf636564172a0c0742d4d02579a477e6024547235d244decd67
-DIST github.com%2Flufia%2Fplan9stats%2F@v%2Fv0.0.0-20211012122336-39d0f177ccd0.zip 22715 BLAKE2B b6546d08d79f8104cd5f387d66d3f0d3b423f9cf0bc961c8908682a180824d415f0e038b7169049b022ae6fd7056bf59f61fd7d2d8b42ce6bf651b50df84396c SHA512 a401a89d2fb3ac61a3ee111c08d56d13ae119ec1339fcaca118e783c355dbbdbcb62b4af5e844ec710d53091f293899fcf08c167f73d78307ec6e3bc865e80fa
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod 45 BLAKE2B a7d3b1ffaf20b96cc98161ea6756d62d8380e7557859606dc7975b3de91a2d4142932d5008caf40b41d8ff2ac1ff33f672dbfac351f3e518922a036d7c116a93 SHA512 0cfd4101dd8ed90f80b7f4ce2928cd322b93855764abae65d66c5ff9888a7c8aec6ee6581c7f05d1c80db5c78003ee2afc8537fda8a3855e2349bfb8267aba61
-DIST github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip 20005 BLAKE2B c0f71323efd262296b78867d2b387a74491cfae3f4498e0dd22c036b20dd6fc1b6569171eebf267effd140ec009527fa5ccbcedda4f8cebab2679582766331ea SHA512 fad08292597cbd4a359e06f85bc7cc37b3d3d84b8046e47828259e36872063069c4ab17b7c89f2a5de4b5d0ab1ca5cc66cc515847a7887339a3a04b5f44e3c92
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod 37 BLAKE2B 94636062c94f8ff68cdcab7593a3acae7b9ffff616cad7b1d5c9cd147a4a1042d33666cbeed6fd816d6793113abfb595183097dcc46de7a3dfadc1423ed43e79 SHA512 c3d5c48cdb8ba6af7071a07cfede06e0ab67e3726d9de592a952fad40167dcbdd9621dc2c4df1bd3c28eb99d70b1b6d8d812441237c35bf492e5b7f07bd33902
-DIST github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip 12433 BLAKE2B 0c911c9d173080abd8edbbab1f47222343801d8eeae36b4add24773e3282fc2a39283fdf519a3d4483e39cdb7d9509b8570d151f46841ac1a616f312dc4cb0ba SHA512 3b85697185ba85cdef6202444ab6cabeabfad8a03d66b3839a852586b1f91ddae7897a57c8c138d5647022aa44906c7ef3c5339d520f90eeea0742a935da8cf2
-DIST github.com%2Fpower-devops%2Fperfstat%2F@v%2Fv0.0.0-20210106213030-5aafc221ea8c.mod 110 BLAKE2B 9de4d008cc21431aab57c25c65969fa5f0617caf8970e19731bb420c4485514f4d6061447102631adcf871e4c107c6918d9010fc4cbecb27ca6c345918f24d4c SHA512 35009ce4df916ef8ed7d32fe2fc4059623021ce512140546e731facdd2cce7ea26e33e3a0b65b9c087f8201cdd3bb185a38ebeb690cecd9b32ffb01f72a2f43d
-DIST github.com%2Fpower-devops%2Fperfstat%2F@v%2Fv0.0.0-20210106213030-5aafc221ea8c.zip 50352 BLAKE2B 456023e50555739ef4ac4e57aefffe033e51bfa7490b14533d949a4919af4911c1683834b445b1fb6de3a49f736cde6b7d875945dbddb4adba04dbcde7c19594 SHA512 b092a2231d4671b0352ce9a2abb49b6b5edcba4cbd9a7374bfe45606acb1ec723bd8d4a972b47b144a4d032321f4e459b9f00eb145d2ccc873b206fe44ac7745
-DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.20.12+incompatible.mod 34 BLAKE2B 790ec7277e4654961540dd09fcb7962328547009b0181183b7cb64972b872d30986d1e53ded5961588d89508c913b2b56dd7af3625d0e8d7be2253b6bcf59576 SHA512 a5f5d88a767a855b6ff24d7e2e0c4aeb81fb1365a7e81ed989b4c605a7a6c61dc52d7ce97fc672c21020ef56f597dce679184e5e8d3d199678487e6bebaa8127
-DIST github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.20.12+incompatible.zip 246866 BLAKE2B 7a04d3133b83fc5d014c0237b055b87726c109490e1afd0b9fd3000d1a318f80f4431c13fb9b5eca049bf640cb0fa404c2537cee2b4bcd7b45a0f6544ffb0f0c SHA512 6f726977ccd96c339a401e5a690f81a63e9049373d275b773e0a1cb9d8a2b53644eb204981fc3a81454000f9a7e152672ebc88a516c8cd193bed8844615ebc1e
-DIST github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.22.3.mod 390 BLAKE2B dd565a424ec4447d887340f2f0e9b1d661ada978fe2ecfc9c29dbf9e46427190e248b39104b5673602aca120dbbb5aaba1eebea25566a4cbf2b6a1ad06e3416a SHA512 2d48f39947ef813e93401abfd43dda526df80710cc70d751bdc2ad2dc353b1e274e182ecf0f7a610b9ab53f89e408a08a1113bfdccf286f5889dc934601b30f2
-DIST github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.22.3.zip 282201 BLAKE2B 496b585bc98c40429b6b944e017b0f3a96372606165b862074452445366994bce613b70d73a17acbfd380b7d446ac092cb8327174f8de404ddf752a50de7a2f5 SHA512 fe3b3357006fdc6f8a6970a739fa40a886b2517d44e3d3694fbe87f366966eb704e49c91a832014623fb677104474e325a5973036a0d5319d7eef22587308013
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod 32 BLAKE2B d698910da1ef00a70a1673b8c74105de195020ccd95d1e70c5dd1e1615210886ff9acbc9cfd03f46e99f5223b60b04695b8d362b9e0edd4e485480f802bd229a SHA512 4e366e5a60559a8863cb2a50280deb307d8bf885ca5440cce1b49a084b4cc4583b3481240125f35f161226592a43f2c0a426152f117d79b68c92c72a93f751d5
-DIST github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip 34637 BLAKE2B 9e26766ed5717903173455e60ee1b690779e286b6be3cc22f633ccf26592839d149f813a1b92775ab2a447f0c1a20960f956fe5aa4a7c56abc6642b58b7973e3 SHA512 968b76a138261cfee0d1f58ede483741328968e24d073b24affdc7ab9cbf9bb76dd9fa1785423c49471c02ea4804810ebe673bc623c4f72389b2654a64a565e1
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.1.mod 216 BLAKE2B c597010cf6690e73cd265e800f0f0bbea331fb76217457b6326f5a19481eca044aa5426fa32519870b2f0f4b3bed95768a23d3138dbcc9739b7cf7e044f50668 SHA512 197e6ef15edb27ded67ccfb636c252fe522f0930ff012341a4b593f25b5dd8282e4f658970931cfdeb8f2c5ee0b4ebac6738fe7634bf00896d12270fcbf4b31b
-DIST github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.1.zip 110051 BLAKE2B c6e41ff9819d6c9b2fe1ffe6f949a7c913f70f2859ea9af413d62cea8ce448b118af78d79cd984186551b7164d389050a058afcc8d8e80a830d215eab5a09e34 SHA512 acd43e873a2be812e1c5eb38ce418c1aeed1fcce2bd227524e1d9f6c95b036e69468c06b413db042bae0a31b2f2d35e194461fabd0ca4c58f04fa2d17f1128c4
-DIST github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.10.mod 149 BLAKE2B 83882249786146dcc2d8515210b0ec85074f636ad17ad156c39a06942f5b4254ea79db18b3ff4c7c7bcb338d338fcae8a871de8204723cd24952d6991a7ab89e SHA512 5a2f57d25108b6287bd8c567002955a8ee9ddd096e14b15255173c9484e1504a2d55148e1c6fc036bd803d451337eb73a5e142e70296ec2e5595f9c0edb21608
-DIST github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.10.zip 94228 BLAKE2B e9788e9f7308dc67d118b87627e297e13bba3a113dbccc9497db909d3bac7406c41a1838a6c093955f12c8690fd3c1019773b0e1091280d7d4b3c759e319dc07 SHA512 f7d3e460f174070d995ba223ff645af4afbc8a787749abdd657fb960b5ab6911e842e0a16465bb2c696de35e6ca6679759b9add2d979bef8cea822412722ed97
-DIST github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.4.0.mod 105 BLAKE2B c0aa71e5ce8ee0bcdc742866e0bcc4999c58d6f752900efe2dfbf6481e4e4a9b4cdc967cde305201a696fdfb72b6be4bc3ae2e9f1b481412841651a51a2c9e47 SHA512 68847f8779d1ce66a597a15ce9fb888d475df7b5d60b3e555a709264705e6dc9eaef793b61c058c86e3baaede07e4025b4e28889fa556920149cf949413b359c
-DIST github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.4.0.zip 16524 BLAKE2B 7302a26c6de5099d145c99d7a2575783e29d9dc5db3408fae6a141f97f6fa478c641a3b2905ddcd243ad99c42429f86462f91697d0acd1f5c15a86ddac963f22 SHA512 d2cc437615ff4e8e906f7d953bd0761962a55e46d5f80d29a931a5199b0d31957989bb40e6db6ed12b57fc02b24360090242ced8f0f9ba7d04c14f8976031c63
-DIST github.com%2Fyusufpapurcu%2Fwmi%2F@v%2Fv1.2.2.mod 85 BLAKE2B 5d78d97039585047c65e37810372e11b47da9c5ebfc366f8cd3d57a6a7255f7e74cf2893a495e8da27232b95b7088d525ded4440bad0d2f48f6a40c3036e73e8 SHA512 beb9936bc36ed6f2b3378fa4d688879040af43957a998af83cc26e37e57d5d8f905c1fc92f2ebc6889cc0dfd4dd0784dbf1071ae417e37f0af359014f888655e
-DIST github.com%2Fyusufpapurcu%2Fwmi%2F@v%2Fv1.2.2.zip 16087 BLAKE2B 90a51af7109347248d41ee15b74fa6b494695a6fba1dfd99e33c172705ea78413c4ffc907e6ebc1815318f1de46eebf2bd2d8a7303301359002c0342f5445d51 SHA512 cbf40294e295714e3af6ccbd4090254e3078635e4c8d13615646e6d7e905f9315c1a2151aab0f4f0beff53ef81ee9a61934790ecd63bb9e4705d1c000fbde486
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod 88 BLAKE2B aec7d0eea1278eb3d1568d5bfb4041267501ad14457ebfcbdbc5fe21473170b8616ca4028f52af2edbfd85922cbe04540b4b0df7f69f63197698143cc5557a7a SHA512 2df49895053b36fed7ea905aa73f86568fbafd79ff0a7976679d8c77cf15025129435d9dbfd89367b611b1aadbea4f4bd1835eb4efa9ea702466e443638d379e
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod 209 BLAKE2B ce8c2a54376fa42fbd394e92db1f08d4c639eb7b5e1b33ba41c8a6ad212ccaf4bc7a7c761c43449177761b06296cce60aed17b0f542978a892b1de054b23286d SHA512 d43d530154c2fda6d171696efbe118c4c021d4f3cb5d8ac9262465e0cc906257330a489f6b950465196bf30c91afeb4d4946b3aada3dc182b5c7307a8e702fc7
-DIST golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.zip 1864231 BLAKE2B a7261951977aa8143153915d72e608ef263a760de7b4977a11d0d2ead32f88ad370b993ada6344556616343a700a93edce3294df354f93d51214cfe888b97836 SHA512 1b7237562a92560aedb2527d8242b46c5a421488f638c0049812ceed87144828ca682bc4eeb87869db947479ac9e1350e5abbd31e1ff3e53734d4ea25bf5c27d
-DIST golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod 119 BLAKE2B e042b2716739483252c3340451b2c3c7b421fdf8d6b3e0333e979802fca66159596982ea63a24b6a64457b2757a0ad24cbb9ea032bab4c5377edf84a3ea18b97 SHA512 26b6c92eecd2208967336d4d23f8a71f77f9a73643ad1e5cd84dee36b2f626fffc806e4dd33acc284831a0961e2b363d898a747903235945fbfb665c5b4d5ef2
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod 24 BLAKE2B 64a70c4594f5d3c37d962c1ed07630fba8abeaf534242f8f1509af271684499252af9a2320d5bac8e44064dba344b807535e4e9dd085fc0fb47bd9304120601a SHA512 ffe50fccf7f1d200f2ebc805b190e3f10c5a3184458a38f4590e520d7ce115e1520fbabe56651bbdc2e08da4a8db5ac86d0e88728efde3ab26c64ab4e0cd604c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.zip 1837462 BLAKE2B ae87037c165e15d3a17fb2c37b59faec2af12dc9653ab4bc504f8a283679d7599704980971e8d0d43235b723f67fa8ae3d5f6005dba6073930f4731859f17416 SHA512 a5fd196d6476e16cc864616cfeb62d29a96e1132e181a261940639918fb4a8452cd473878bd8fad8ce5b269d3466657b5aa2e7771e02591f999e98eb81b55957
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip 1867927 BLAKE2B bd890b16f2adb601f5655ca3f4815bbb335fe48c961b06f316ec579ff6efa2fc8f360d7c0bf272dc2d35e9a0470235c36cee331399ed01d8c455172f39921194 SHA512 59a4db96e438a1f03af9b00070f4d3772f1eeeff72334e6bc8ad1774bf202d39f7129572cd75fb9e1ecdfc7a532c5cd91bfdbfab3ebd10228bc6733e9556f70c
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201204225414-ed752295db88.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201204225414-ed752295db88.zip 1526726 BLAKE2B 925407c90e9596006054cf2682153a06e41aa3ee21f64e2fcdbea4fea8c68785c4d7997398ee5bd3b369d3e76e60f2d971bda2f669af05cb9569e0661d239775 SHA512 c7ef93c2577c0423e952982d0cca1e2266cb0c4689d136f5d887df088ee56d73eee08ae2244a131b15deb17c2036d169de74111263a7dda7bfe92c6507d8f6b5
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210105210732-16f7687f5001.mod 33 BLAKE2B 8be160de26713fd50f15adfb6fd7fff2643ee587aa17de9385b1e315869d0ecf102fc567294666bf232aa677d1ab04ba8341157f3d9b66a0f53543a7a47cf148 SHA512 0c7b940d567c7685dcb55c76c69aedeaab2170f4f3bde458994c879bf344169f34fb3f3ca899b0f138a8b0b8be5031217b57a6edf5980e6066ff5cb92d1ff9ab
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210105210732-16f7687f5001.zip 1533792 BLAKE2B a583d3313ec93610839250754492a58cb5c719b48ef39d9770c4d595fed0ac44741aaac2290c6f9c78a9cf56ba744e18c911c8a896797b35c483bce32cf2ef30 SHA512 eb3e1a92a15e8063ddf5609d69db8624a445bbda6480672bd3595e4e62bc1744de67eb7afa86b9fdf5d331ba1066942821aa3cffab749ac669b8c4df4de9ddbe
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220128215802-99c3d69c2c27.mod 33 BLAKE2B b74677ab15ab6b31640d71b052db667b0fb585ed6d1044e26bc5e4cf8da90e1ede81f8876babea843dd322b8b707189138e70c24d13d931f1f6dd04978ac222c SHA512 85e511b1261c1935f5ee4754ad31d1d946f9e10f0af9905f44c4348d6ce5104319c03fb38517dde616698f6487b0c62788cfa96bc0ffb3b6db80accd7e552655
-DIST golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220128215802-99c3d69c2c27.zip 1702819 BLAKE2B 91e64d4d0a0954811f723849190a36b785932fc128b8f654e27b948b4422fad527b10ece4e198f76c1968f4dad55e96200161833cf4042a331f79b89c2bdcd03 SHA512 73e4190109fc29a23394a00849d96f97fd11b4857e7dbf35a9cc0faf612288c47a36d60e4d403c6774bcef218117b446563afd3b4f5acb9cf360f7a2c2209526
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod 95 BLAKE2B d86fb6e63016a8645cdec646a8ea85e1ab94e8be82123ebbe037124f353f21474e3396a64dc5f18299dc97c395759914a737699097f371c16806cc8b1e0eee64 SHA512 3295d1778ba3160c8360d99fbc648bbb4356fadd7947466f8b2f493a3c4c406515033268cf3525bdf50430b0cc31169838b5d3223842c7b1cd881e155744506e
-DIST golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.zip 23282 BLAKE2B 9bfaf8ea78b49038403d7a49abdfa9ab6cfc4fc2d71e693a15368da8cbdcd99437898f72f8a240ec7484a7f2a11405258e4cd17bab00aaaed291e2a1d1566e3f SHA512 fa88149897dd4470a7e36683de33db945e219819ce74f39f384cad03db8fd6829d47e2711dec895fafa7aa24d576dffc7cb8594a499cb1e66abeada196d502be
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod 25 BLAKE2B 31009af0fdcd0f8730c9985287e6e364ec4e5183e57e92560dbc80a2010eced51b8a90f01a82b49384268c8a0adbf69d179c205d3f68e0eb459169d2ea9528f0 SHA512 ca081ef7cccd7bbedc6843fbe0c452352661a07e1298cd02ff338ed79d807c6401d613a3cf20011189d2f98a794ffa410547b3e352eb58a6f0a84822285d391d
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod 97 BLAKE2B ed93c1d43f199d8cbd43cb25edac5de569cb78773d7f3232d59a0a4de6d174c5c100db2b02ca42c51f3e17e0f5e781ba9b5641a512b0dc72dcfaa5f6bd7d451b SHA512 f3f68808ccf5223453f765f59db1ef551b2130069eb83518878961c2d4a2044f9049f8d49df6e67699fcd2645cf90b84d35626590b2cfbca302fcf0eac76dc8b
-DIST golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip 8605233 BLAKE2B 3e9c66a40249df3915ab9de2a8de2ae0b92e4f7d645f9753e66e585ebaf86992484fcb933510b3400595182e9bc667434894697953d7078bf43f617f5ea1905d SHA512 26d09376646c1e7d99581f0fe03ea109b00879dc351996f77e6442b0fd72817d056f630a56cc167014acb55532baa4be5437bf40b4a933cfe450854c618b3508
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod 26 BLAKE2B 2a44c2cc034af3473d9a1d4e1c23b0f4542333853bfc0ecbfcf9eacacbb3593b449fcfc94d23f49ccc16e5a844bc72a3462a3e08a5c26194106a64d1f2732e0a SHA512 3c166b18c0ce47a47e95da9eeede63879a92b0205bd4589d554f7bae89699be0efa83e1f5bba8e50f47714ea23e759b07f4543fe06301995d39373da2db16fc0
-DIST golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.zip 2687668 BLAKE2B 1ffe42e6dc739c35e8c1098ced3058ba57a8bc584325010c21080bcfd29c3dd7f15e156bef3f2aeb10cfbb38aa432c757682e2260b129fba4e3478fe96d8e850 SHA512 4312878e308561593166cefcae3119e6c4ef9460edbb0a799cac0bd2f992528ffb26fb6d25f05f2ba5e39c47b4ce65f174258db36ef966c6bf5dad2e01d2578a
-DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod 37 BLAKE2B 7449be81e1998a6439070de1a0ddf5bfd1e4971c90c2e358590a9c1c41128bfc1daa42a9bbc3709506df2442ec8420e6354343a095c837be46335c180083f28a SHA512 659d18a7a3a1be45ff6dc9e7475276b82ee7f11c47d39b0c237d7f872836a1dbdfff0902f21d6cd8093663997865da92e3e5a4acf1ad6129f972dc5e667b4f05
-DIST golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip 22282 BLAKE2B 68df6b35d9043f23df13432b80074544f46833467294955ae5706713055d0cc9ababda892853c14e99c80a3571fd4a807a019a098fdd2ca695ba90c577ead5c4 SHA512 c72b8b73f89624889a2874c1b2445cb82f0e545fccf6a7761a278f3f659eb19f5f1c8585641b8f89f2bcfc3817ad2c0e267751cfeeab949e287e43af5df57e28
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod 25 BLAKE2B 6470f3d94700c4d8b3176d692bdb91646750f2c6a866ff2ef4183aff1de01f024a8757f97b4626ec0355092e5f25e7ded91cd5be845f627d107c58b1daf400d7 SHA512 9ac0f80ef05881387cb2f48f81560f3207fe586ea16495383662e6d62e43d93fac01dfe72e1d0063d3ab065331dab3a8098d7da4f1830ba1aff6f27f8e1bc1b2
-DIST gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip 39844 BLAKE2B b3dab69dbd1ebb999938c12595de7007dce9431cfeaeb5e77aba80c49918d1a4edf7fb95279e9b66686cb45deaf57a011c083e55fb66ec2c614582ba323954da SHA512 97c96a92ec86372c2f06141c30bceaa86ed62c1db34696f9542f43f3411cb0a37dea654de923a5ee054e603198179b9048e3b477da140e4092ffadc4525b9241
-DIST gopkg.in%2Fini.v1%2F@v%2Fv1.66.4.mod 23 BLAKE2B 4e15082dd2b6e386e93baa78307538fba456343420c52605d453c6309f256e8062ea4b821d70c926096ae58a8feb33c6b796726d2dcc886c58e8293f99ac92a7 SHA512 7650ff592e6f5a0393f794fbdf17a28ad228a2d29ca79685c9ab8d9ec395554f1691b2a0d061e6248cf542f89be4d9a68884f7b24de7c8ddfef9c02cfeedda73
-DIST gopkg.in%2Fini.v1%2F@v%2Fv1.66.4.zip 71583 BLAKE2B 3f86181e263d5d7c421a1f51b45bb68182cd61bca0365942ddc3a42df92425bbfa0763089323c2b57cda0398c160364eba0fbe999021b9594cf630206001103b SHA512 7f6efb9fb3804a84295ca653677e9a05b89456300922e66c81d89c863c69b89f6ae1e1954120da7eee79c06cb3c2f8885644cd70c51f38a501fccacbb0a5e73d
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod 95 BLAKE2B 888532a43aa7569fc03a62d78507081f30342eb4be40c01252683b16cd3658dd7b30d5f8a071dffe2c05f57bbee3afbc1ee4324c471788c633a878d498ff7d57 SHA512 2790882fbfa812468b9b3443630b1f1ee67a968eb20da8e4a1bfd410e4b516a8a7e77c07414b64f17e11e2151161b85d019e172cc833a45b19e66d4c70f89f82
-DIST gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip 81183 BLAKE2B 0e3222d715fe7e9e8e9a10abad817f75bdd095f9af250d6bdf1ee2881930c739111de8b526175c9204995c48e0ade9852541a7f22b0ce1261f473986a2739182 SHA512 d6f4ac547609c943adfc6b518ff03ac09da566ba2b29466abe8f6db3d5a41ae7e5c187068dce4e77271905b1aa88497ca49a43bb9bbf9c94011b7ccf1b4b2f42
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod 95 BLAKE2B fbb87f0644ec9da5d4386358d23cdb15b0d23e8212e712f16f338455a3a0ad19fbfd63e92c955c359237ddfa8bb76d6d08280eead24d321668431891eca1e8ab SHA512 307ca9123efc577ca04828996ee9d8edbb51794ccb4b8d9f169ba689e7276aa5f6ae106a04b22b7fab853ffacfebcbf74468b64eaefd57445864c1fbc77fad9d
-DIST gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip 101467 BLAKE2B 8bb0aec8e693a4c0da59f1931e1fdcf6f94a236faba149d5af91e87284f39c693d20be65248eecde739cb555e371804fa6c723a56c69e6d02a347ba908e968b1 SHA512 bee7757d760f5ba1b9f7523af358652a5cb65f2b0064da097f78450871b2636efcbab0298a9871bbb3ce8012bf95a155949251d4f61464dde510097b936b47a8
-DIST powerline-go-1.21.0.tar.gz 145144 BLAKE2B f9194f8eb68d26f481c4a333b99dc4ba7b296fd5ab943d46da684f17c9765e08bb2cb67c3e97d2979da07af0a57291a33db97167be72a7fdee7b69f294c22112 SHA512 dbb816abcc26c1fef154a3cf408164641a3c7c3e2ef7f457a0b5c1832f20f5e2a1a1e845b7bf0f24016a93e48f61e2dc4f668fb22423aec6c79c1e99799bef79
-DIST powerline-go-1.22.1.tar.gz 140398 BLAKE2B 63f94539c366aafc0f0ce00bf37c5019957d93fa1c759bd2b49758d5fef67fc13c3d1d2a5a741f434220f5843c7393c368876e564bd8c367047a36e6eaf89104 SHA512 f1404ac73f16cfc6f71ed1e7d3a630d04480d80d5602df92a58d6a925c9047c1e738ece1734b19fabe89ba6e99f338aaf85b70b23607bc19027eed1c9a1975e0
+DIST github.com-go-yaml-yaml-d670f94.tar.gz 64859 BLAKE2B 211e51960673e78e9c802357dffb550c6d59692203040b2f3d0bc9ab15f8bf5ee479918a782931238e230f36f4c77228a44632883486370f0fb9266d8b2c7c14 SHA512 daa9d622d4b717ce54af884e1f5548d7ead93486d322f808bc6cf291011a5c418d33b464fd66161bef8c18da759aa1c6182b36fb2210c5f026110776e2195ac5
+DIST github.com-golang-crypto-1875d0a.tar.gz 1446908 BLAKE2B 98e01a121a279b938cbf36eab57f19eecf0dc3627b42aafe634d32508e12ff8c919a517d26041144253f112d1bbd821686c3826808273ea48750e2ca3e36b743 SHA512 3e19787b0a7b235d337feac63971563d65b9dba75960c3f816237cb81316b550621230766ec4c8a538252593c8ea6c493a15fce62ff9d69b936c23501ccaa329
+DIST github.com-golang-sys-37707fd.tar.gz 796903 BLAKE2B 4e31f27784cdc5781628ac082d7994a5559be59268003366a3185eac6eb514495f6d82ba13c3046f1061c6abc68712ae8d0505ab7567c8e6057b90f3217c272e SHA512 580bd4cfd26d82aa8c6870eabbd289b76f2ba529ed8496428b29e482ec39bc617cdbcd2f2f2d476ee93526bd18550dcd239085b9f74fb4d24ccb87a3b357bff6
+DIST github.com-golang-text-c4d099d.tar.gz 6032701 BLAKE2B 0b719bf379a8af44ff82ce146549d6781c5f772b9704ef0a0fc623866ba15aca2e11ba54873e37c01b8e65d589e1ba5e79e0bb23e6d24c1b3c30a9975d55c262 SHA512 c67ce44326ce64ecd6a401cbb63e5d469ab351999e46eac4c963ce285693b0163d9cd37d0ac5e9fec708df151133e69cd6cc6189e8debcd172b80ee62c12694a
+DIST github.com-mattn-go-runewidth-9e777a8.tar.gz 22390 BLAKE2B 20b6793a424d2620e5ce57fad619e86e7bf251ad612322132939c3c53eeaa17c1a100aa75888209975c05e4c7f1ec099ac4c51b61f4fdd62a42d2e506c4f5b75 SHA512 85430512b8c199e7e2ae4bfa77aef58958211bf85148ea439cf26ffc30704d3bbbe21e1525df579a65e0262c7f8780ff0ec345fb76907f4c66bf715f10ff6e12
+DIST powerline-go-1.8.2.tar.gz 123629 BLAKE2B 58c3d4c13b4ca99ff7b4a6ccb84810727fd1932920c03e65fc9eaa17f3de2e874d6a339d84a6b1295d667da2d5f046432cb58a83c53d661f6009333719d1febe SHA512 3fe91a1b28b4c2a49ce05e38b47506137c373e7faf19f416515b2208f7442a9a3c804c6c5ecb12610d619342242723d990470fadb855e46ff4827537c712c172
diff --git a/app-shells/powerline-go/metadata.xml b/app-shells/powerline-go/metadata.xml
index 2f5f27ceb7ae..7cf1ac1fff23 100644
--- a/app-shells/powerline-go/metadata.xml
+++ b/app-shells/powerline-go/metadata.xml
@@ -2,9 +2,10 @@
 <!DOCTYPE pkgmetadata SYSTEM "https://liguros.gitlab.io/dtd/metadata.dtd">
 <pkgmetadata>
  <maintainer type="person">
-  <email>egorr.berd@gmail.com</email>
-  <name>Yahor Berdnikau</name>
+  <email>toffanin.mauro@gmail.com</email>
+  <name>Mauro Toffanin</name>
+  <description>Maintainer. Assign bugs to him</description>
  </maintainer>
  
- <origin>gentoo-guru-overlay</origin>
+ <origin>go-overlay</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/app-shells/powerline-go/powerline-go-1.21.0.ebuild b/app-shells/powerline-go/powerline-go-1.21.0.ebuild
deleted file mode 100644
index e64811f9251b..000000000000
--- a/app-shells/powerline-go/powerline-go-1.21.0.ebuild
+++ /dev/null
@@ -1,61 +0,0 @@
-# Copyright 2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit go-module
-
-EGO_SUM=(
-	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d"
-	"github.com/StackExchange/wmi v0.0.0-20190523213315-cbe66965904d/go.mod"
-	"github.com/go-ole/go-ole v1.2.4"
-	"github.com/go-ole/go-ole v1.2.4/go.mod"
-	"github.com/mattn/go-runewidth v0.0.9"
-	"github.com/mattn/go-runewidth v0.0.9/go.mod"
-	"github.com/shirou/gopsutil v3.20.12+incompatible"
-	"github.com/shirou/gopsutil v3.20.12+incompatible/go.mod"
-	"golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod"
-	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad"
-	"golang.org/x/crypto v0.0.0-20201221181555-eec23a3978ad/go.mod"
-	"golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod"
-	"golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-	"golang.org/x/sys v0.0.0-20210105210732-16f7687f5001"
-	"golang.org/x/sys v0.0.0-20210105210732-16f7687f5001/go.mod"
-	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221"
-	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
-	"golang.org/x/text v0.3.0/go.mod"
-	"golang.org/x/text v0.3.4"
-	"golang.org/x/text v0.3.4/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-	"gopkg.in/yaml.v2 v2.4.0"
-	"gopkg.in/yaml.v2 v2.4.0/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="A powerline like prompt for Bash, Zsh, Fish written in Go lang. "
-HOMEPAGE="https://github.com/justjanne/powerline-go"
-SRC_URI="https://github.com/justjanne/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		${EGO_SUM_SRC_URI}"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-DOCS=(README.md)
-
-src_compile() {
-	go build -o release/powerline-go . || die
-}
-
-src_install() {
-	dobin release/powerline-go
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog 'Check installed documentation to how-to add this to the shell prompt'
-}
diff --git a/app-shells/powerline-go/powerline-go-1.22.1.ebuild b/app-shells/powerline-go/powerline-go-1.22.1.ebuild
deleted file mode 100644
index f1463116738a..000000000000
--- a/app-shells/powerline-go/powerline-go-1.22.1.ebuild
+++ /dev/null
@@ -1,87 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit go-module
-
-EGO_SUM=(
-	"github.com/mattn/go-runewidth v0.0.9"
-	"github.com/mattn/go-runewidth v0.0.9/go.mod"
-	"github.com/shirou/gopsutil/v3 v3.22.3"
-	"github.com/shirou/gopsutil/v3 v3.22.3/go.mod"
-	"github.com/davecgh/go-spew v1.1.0"
-	"github.com/davecgh/go-spew v1.1.0/go.mod"
-	"github.com/pmezard/go-difflib v1.0.0"
-	"github.com/pmezard/go-difflib v1.0.0/go.mod"
-	"github.com/stretchr/objx v0.1.0"
-	"github.com/stretchr/objx v0.1.0/go.mod"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c"
-	"gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod"
-	"github.com/tklauser/numcpus v0.4.0"
-	"github.com/tklauser/numcpus v0.4.0/go.mod"
-	"github.com/go-ole/go-ole v1.2.6"
-	"github.com/go-ole/go-ole v1.2.6/go.mod"
-	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3"
-	"golang.org/x/sys v0.0.0-20190916202348-b4ddaad3f8a3/go.mod"
-	"github.com/google/go-cmp v0.5.7"
-	"github.com/google/go-cmp v0.5.7/go.mod"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543"
-	"golang.org/x/xerrors v0.0.0-20191204190536-9bdfabe68543/go.mod"
-	"github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0"
-	"github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0/go.mod"
-	"github.com/google/go-cmp v0.5.6"
-	"github.com/google/go-cmp v0.5.6/go.mod"
-	"github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c"
-	"github.com/power-devops/perfstat v0.0.0-20210106213030-5aafc221ea8c/go.mod"
-	"golang.org/x/sys v0.0.0-20201204225414-ed752295db88"
-	"golang.org/x/sys v0.0.0-20201204225414-ed752295db88/go.mod"
-	"github.com/stretchr/testify v1.7.1"
-	"github.com/stretchr/testify v1.7.1/go.mod"
-	"github.com/tklauser/go-sysconf v0.3.10"
-	"github.com/tklauser/go-sysconf v0.3.10/go.mod"
-	"github.com/yusufpapurcu/wmi v1.2.2"
-	"github.com/yusufpapurcu/wmi v1.2.2/go.mod"
-	"golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27"
-	"golang.org/x/sys v0.0.0-20220128215802-99c3d69c2c27/go.mod"
-	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221"
-	"golang.org/x/term v0.0.0-20201117132131-f5c789dd3221/go.mod"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037"
-	"golang.org/x/sys v0.0.0-20191026070338-33540a1f6037/go.mod"
-	"golang.org/x/text v0.3.4"
-	"golang.org/x/text v0.3.4/go.mod"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e"
-	"golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod"
-	"gopkg.in/ini.v1 v1.66.4"
-	"gopkg.in/ini.v1 v1.66.4/go.mod"
-	"gopkg.in/yaml.v2 v2.4.0"
-	"gopkg.in/yaml.v2 v2.4.0/go.mod"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405"
-	"gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod"
-)
-
-go-module_set_globals
-
-DESCRIPTION="A powerline like prompt for Bash, Zsh, Fish written in Go lang. "
-HOMEPAGE="https://github.com/justjanne/powerline-go"
-SRC_URI="https://github.com/justjanne/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz
-		${EGO_SUM_SRC_URI}"
-
-LICENSE="GPL-3 MIT Apache-2.0 BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64"
-
-DOCS=(README.md)
-
-src_compile() {
-	go build -o release/powerline-go . || die
-}
-
-src_install() {
-	dobin release/powerline-go
-	einstalldocs
-}
-
-pkg_postinst() {
-	elog 'Check installed documentation to how-to add this to the shell prompt'
-}
diff --git a/app-shells/powerline-go/powerline-go-1.8.2.ebuild b/app-shells/powerline-go/powerline-go-1.8.2.ebuild
new file mode 100644
index 000000000000..ddc8fc8ce943
--- /dev/null
+++ b/app-shells/powerline-go/powerline-go-1.8.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2020 Go Overlay Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+GOLANG_PKG_IMPORTPATH="github.com/justjanne"
+GOLANG_PKG_ARCHIVEPREFIX="v"
+
+GOLANG_PKG_DEPENDENCIES=(
+	"github.com/mattn/go-runewidth:9e777a8" #v0.0.2
+	"github.com/golang/crypto:1875d0a -> golang.org/x"
+	"github.com/golang/sys:37707fd -> golang.org/x"
+	"github.com/golang/text:c4d099d -> golang.org/x" #v0.2.0
+	"github.com/go-yaml/yaml:d670f94 -> gopkg.in/yaml.v2"
+)
+
+inherit golang-single
+
+DESCRIPTION="A beautiful and useful low-latency prompt for your shell"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="amd64 x86 arm"
diff --git a/dev-cpp/highway/highway-1.0.3.ebuild b/dev-cpp/highway/highway-1.0.3.ebuild
index c4d4ed034ee9..86b378e34909 100644
--- a/dev-cpp/highway/highway-1.0.3.ebuild
+++ b/dev-cpp/highway/highway-1.0.3.ebuild
@@ -13,7 +13,7 @@ if [[ "${PV}" == *9999* ]]; then
 	EGIT_REPO_URI="https://github.com/google/highway.git"
 else
 	SRC_URI="https://github.com/google/highway/archive/refs/tags/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 LICENSE="Apache-2.0"
diff --git a/dev-java/junit/junit-5.9.2.ebuild b/dev-java/junit/junit-5.9.2.ebuild
index e0fb4130e172..3e3829d25ebd 100644
--- a/dev-java/junit/junit-5.9.2.ebuild
+++ b/dev-java/junit/junit-5.9.2.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}/junit5-r${PV}"
 
 LICENSE="EPL-2.0"
 SLOT="5"
-KEYWORDS="~amd64 ~arm ~ppc64"
+KEYWORDS="~amd64 ~arm ~ppc64 ~x86"
 
 CP_DEPEND="
 	dev-java/apiguardian-api:0
diff --git a/dev-lang/nim/Manifest b/dev-lang/nim/Manifest
index cf65e8eb2065..d9c126dfd5c7 100644
--- a/dev-lang/nim/Manifest
+++ b/dev-lang/nim/Manifest
@@ -1,5 +1,5 @@
 DIST nim-1.6.10.tar.xz 5216284 BLAKE2B d5b7bdc488086260b84700e3022ff7fc45b98d78574a3d2e288c95968a580fa644e47612dc60d6e63f5e85687f5b59a28128be746abc55bd6d4527344dc3ab14 SHA512 2ba6c4db68030ace2b4dd9b7f85d2b7c882c62e8f7f68bd0b82f548c91c300ab0e03c66f56c678127058f56b75a5550dec48d68eb6d666a179994cd1a6e2cc47
-DIST nim-1.6.6.tar.xz 5149956 BLAKE2B 2fd1b40f1ecc1200255052d9e013c55287d3e01337146d0b1386d0f3fc9c14fda1e8e82ee289e782c77a573c1ae0985ea7f900f61e6b9824a9eb4b5c803c7f71 SHA512 6ea8d3f61adae48184dd0e3ac393296fd3bd5ead818e7dee949f43eccbd0b6229ebfc474353ddd63cc734f82c3247998fbfe88362061983f978ad8d0ab7fa677
+DIST nim-1.6.12.tar.xz 5180496 BLAKE2B d7c04ffdde273336770d9397dd255b7cfc442f6be9592afbfa5ceb1ac7836a8213d5cea673477ab55bd56c004cc477a6023b6a2799715f46689f3e328302e433 SHA512 17c31024ee19dfa36f25bf8a5091992b24a4adb1a817246119a2fc552075999f698a92e66243ddd5ee69d966deead37535c9aac00ebece3854c930f905eeb030
 DIST nim-1.6.8.tar.xz 5219880 BLAKE2B 16eac6f302b4ef1df14deaa0350e0e5553c7613515cc3e79cbe025af70955bef29c8261a1f91ba901023d9c53f9f00d62116301eb5a4ee4bb5314bb1e25a5755 SHA512 dd046dd393136fdcb78f463e267756bdb990b08e80e3a8be7fec1995b47a930447468e12bb9a59db6ec5546117f62ff4ccd032959879ef2d1d06a7bc5c438f83
 DIST nim-patches-1.6.6.tar.gz 1975 BLAKE2B 75490f4c61f4d920aadb2ad5908cb2773e270f80cee95f937ede8125bad5688b71840ed7f48659db892e4017437a0454b38eab18ae8b13c6b48207d0a7714371 SHA512 4d1590e7d05ad64432b943f8da9edb2b05213400181d1e07a0e40f479afbceb1997d0ea0f05a73d550afe60cf4b657f7e34840907ea16c3b9e96824e9f29e0e5
 DIST nim-patches-1.6.6_p1.tar.gz 2632 BLAKE2B 64980d9510dc48e3c566473dc618d00cafba04783882d62b12015e8435c9c0515d7726da30f0b74dca6a41aa88a9c9aed2189a65b3325c28839d0051de8a3365 SHA512 7ba251675cd564452669bf5ec3748565db818324f58506f20a5036e4b54df10f4d7c149cece8cb97c853222cfa7d4d8d26856d92aaa25e613e31c6f5c2a8243d
diff --git a/dev-lang/nim/nim-1.6.12.ebuild b/dev-lang/nim/nim-1.6.12.ebuild
new file mode 100644
index 000000000000..675ddf78b6f6
--- /dev/null
+++ b/dev-lang/nim/nim-1.6.12.ebuild
@@ -0,0 +1,198 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PATCH_PV="1.6.6_p1"
+
+inherit bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
+
+DESCRIPTION="Compiled, garbage-collected systems programming language"
+HOMEPAGE="https://nim-lang.org/"
+SRC_URI="
+	https://nim-lang.org/download/${P}.tar.xz
+	experimental? (
+		https://git.sr.ht/~cyber/${PN}-patches/archive/${PATCH_PV}.tar.gz
+			-> nim-patches-${PATCH_PV}.tar.gz
+	)
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~x86"
+IUSE="doc experimental test-js test"
+RESTRICT="!test? ( test )"
+
+DEPEND="
+	test? (
+		dev-db/sqlite:3
+		dev-libs/boehm-gc
+		dev-libs/libffi
+		dev-libs/libpcre:3
+		dev-libs/openssl
+		media-libs/libsdl
+		media-libs/libsfml
+	)
+"
+BDEPEND="
+	sys-process/parallel
+	test? (
+		test-js? (
+			net-libs/nodejs
+		)
+	)
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-0.20.0-paths.patch
+	"${FILESDIR}"/${PN}-1.6.6-csources-flags.patch
+)
+
+# Borrowed from nim-utils.eclass (guru overlay).
+nim_gen_config() {
+	cat > nim.cfg <<- EOF || die "Failed to create Nim config"
+		cc:"gcc"
+		gcc.exe:"$(tc-getCC)"
+		gcc.linkerexe:"$(tc-getCC)"
+		gcc.cpp.exe:"$(tc-getCXX)"
+		gcc.cpp.linkerexe:"$(tc-getCXX)"
+		gcc.options.speed:"${CFLAGS}"
+		gcc.options.size:"${CFLAGS}"
+		gcc.options.debug:"${CFLAGS}"
+		gcc.options.always:"${CPPFLAGS}"
+		gcc.options.linker:"${LDFLAGS}"
+		gcc.cpp.options.speed:"${CXXFLAGS}"
+		gcc.cpp.options.size:"${CXXFLAGS}"
+		gcc.cpp.options.debug:"${CXXFLAGS}"
+		gcc.cpp.options.always:"${CPPFLAGS}"
+		gcc.cpp.options.linker:"${LDFLAGS}"
+
+		$([[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && echo '--colors:"off"')
+		-d:"release"
+		--parallelBuild:"$(makeopts_jobs)"
+
+		# some tests don't work with processing hints
+		--processing:"off"
+	EOF
+}
+
+src_prepare() {
+	default
+
+	# note: there are consumers in the ::guru overlay
+	use experimental && eapply "${WORKDIR}"/nim-patches-${PATCH_PV}
+}
+
+src_configure() {
+	xdg_environment_reset  # bug 667182
+
+	unset NIMBLE_DIR
+	tc-export CC CXX LD
+
+	nim_gen_config
+
+	mkdir "${HOME}"/.parallel || die
+	touch "${HOME}"/.parallel/will-cite || die "parallel setup failed"
+}
+
+src_compile() {
+	local -x PATH="${S}/bin:${PATH}"
+
+	edo ./build.sh --parallel "$(makeopts_jobs)"
+
+	ebegin "Waiting for unfinished jobs"
+	while [[ ! -f "bin/nim" ]]; do
+		sleep 1
+	done
+	eend 0
+
+	edo ./bin/nim compile koch
+	edo ./koch boot -d:nimUseLinenoise --skipParentCfg:off
+	edo ./koch tools
+
+	if use doc; then
+		local -a docargs=(
+			# set git tag
+			--git.commit:v${PV}
+			# skip runnableExamples as some of them need net
+			--docCmd:skip
+			# make logs less verbose
+			--hints:off
+			--warnings:off
+		)
+		edo ./koch doc "${docargs[@]}"
+		HTML_DOCS=( web/upload/${PV}/. )
+	fi
+}
+
+src_test() {
+	local -x PATH="${S}/bin:${PATH}"
+	local -a nimflags=(
+		# Leave only the safe hints enabled.
+		--hint:all:off
+		--hint:User:on
+		--hint:UserRaw:on
+	)
+	local -a testament_args=(
+		--skipFrom:"${FILESDIR}/${PN}-1.6.10-testament-skipfile.txt"
+		--nim:"bin/nim"
+		--targets:"$(usex test-js 'c js' 'c')"
+	)
+
+	[[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && \
+		testament_args+=( --colors:off )
+
+	local -a categories
+	readarray -t categories < <(find tests -mindepth 1 -maxdepth 1 -type d -printf "%P\n" | sort)
+
+	# AdditionalCategories from "testament/categories.nim".
+	categories+=( debugger examples lib )
+
+	local tcat checkpoint
+	for tcat in "${categories[@]}"; do
+		# Use checkpoints for less painful testing.
+		checkpoint="${T}/.testament-${tcat}"
+		[[ -f "${checkpoint}" ]] && continue
+
+		case ${tcat} in
+			testdata )
+				:
+			;;
+			arc | ic | valgrind )
+				einfo "Skipped category '${tcat}'"
+				;;
+			* )
+				einfo "Running tests in category '${tcat}'"
+				edo ./bin/testament "${testament_args[@]}" \
+					category "${tcat}" "${nimflags[@]}"
+				;;
+		esac
+
+		touch "${checkpoint}" || die
+	done
+}
+
+src_install() {
+	local -x PATH="${S}/bin:${PATH}"
+
+	edo ./koch install "${ED}"
+	einstalldocs
+
+	# "./koch install" installs only "nim" binary but not the rest.
+	local exe
+	for exe in bin/* ; do
+		[[ "${exe}" == bin/nim ]] && continue
+		dobin "${exe}"
+	done
+
+	newbashcomp tools/nim.bash-completion nim
+	newbashcomp dist/nimble/nimble.bash-completion nimble
+
+	insinto /usr/share/zsh/site-functions
+	newins tools/nim.zsh-completion _nim
+	newins dist/nimble/nimble.zsh-completion _nimble
+
+	# Install the @nim-rebuild set for Portage.
+	insinto /usr/share/portage/config/sets
+	newins "${FILESDIR}"/nim-sets.conf nim.conf
+}
diff --git a/dev-lang/nim/nim-1.6.6-r3.ebuild b/dev-lang/nim/nim-1.6.6-r3.ebuild
deleted file mode 100644
index 6314b192e44d..000000000000
--- a/dev-lang/nim/nim-1.6.6-r3.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
-
-DESCRIPTION="compiled, garbage-collected systems programming language"
-HOMEPAGE="https://nim-lang.org/"
-SRC_URI="
-	https://nim-lang.org/download/${P}.tar.xz
-	experimental? (
-		https://git.sr.ht/~cyber/${PN}-patches/archive/${PV}.tar.gz
-			-> ${PN}-patches-${PV}.tar.gz
-	)
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="experimental"
-RESTRICT="test"  # need to sort out depends and numerous failures
-
-# BDEPEND="sys-process/parallel"
-# BDEPEND="test? ( net-libs/nodejs )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.20.0-paths.patch
-	"${FILESDIR}"/${PN}-1.6.6-csources-flags.patch
-)
-
-# Borrowed from nim-utils.eclass (guru overlay).
-nim_gen_config() {
-	cat > nim.cfg <<- EOF || die "Failed to create Nim config"
-	cc:"gcc"
-	gcc.exe:"$(tc-getCC)"
-	gcc.linkerexe:"$(tc-getCC)"
-	gcc.cpp.exe:"$(tc-getCXX)"
-	gcc.cpp.linkerexe:"$(tc-getCXX)"
-	gcc.options.speed:"${CFLAGS}"
-	gcc.options.size:"${CFLAGS}"
-	gcc.options.debug:"${CFLAGS}"
-	gcc.options.always:"${CPPFLAGS}"
-	gcc.options.linker:"${LDFLAGS}"
-	gcc.cpp.options.speed:"${CXXFLAGS}"
-	gcc.cpp.options.size:"${CXXFLAGS}"
-	gcc.cpp.options.debug:"${CXXFLAGS}"
-	gcc.cpp.options.always:"${CPPFLAGS}"
-	gcc.cpp.options.linker:"${LDFLAGS}"
-
-	$([[ "${NOCOLOR}" == true || "${NOCOLOR}" == yes ]] && echo '--colors:"off"')
-	-d:"release"
-	--parallelBuild:"$(makeopts_jobs)"
-	EOF
-}
-
-src_prepare() {
-	default
-
-	# note: there are consumers in the ::guru overlay
-	use experimental && eapply "${WORKDIR}"/${PN}-patches-${PV}
-}
-
-src_configure() {
-	xdg_environment_reset  # bug 667182
-
-	unset NIMBLE_DIR
-	tc-export CC CXX LD
-
-	nim_gen_config
-}
-
-src_compile() {
-	local -x PATH="${S}/bin:${PATH}"
-
-	# Build from C sources
-	# Compiling with sys-process/parallel fails for some reason but hopefully
-	# we'll be able to enable it later...
-	edo bash build.sh  # --parallel "$(makeopts_jobs)"
-
-	edo ./bin/nim compile koch
-	edo ./koch boot -d:nimUseLinenoise --skipParentCfg:off
-	edo ./koch tools
-}
-
-src_test() {
-	local -x PATH="${S}/bin:${PATH}"
-
-	edo ./koch test
-}
-
-src_install() {
-	local -x PATH="${S}/bin:${PATH}"
-
-	edo ./koch install "${ED}"
-
-	# "./koch install" installs only "nim" binary
-	# but not the rest
-	exeinto /usr/bin
-	local exe
-	for exe in bin/* ; do
-		[[ "${exe}" == bin/nim ]] && continue
-		doexe "${exe}"
-	done
-
-	newbashcomp tools/nim.bash-completion nim
-	newbashcomp dist/nimble/nimble.bash-completion nimble
-}
diff --git a/dev-libs/libclc/Manifest b/dev-libs/libclc/Manifest
index 1edea9832f73..b055e2dfd698 100644
--- a/dev-libs/libclc/Manifest
+++ b/dev-libs/libclc/Manifest
@@ -5,4 +5,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/dev-libs/libclc/libclc-17.0.0_pre20230225.ebuild b/dev-libs/libclc/libclc-17.0.0_pre20230225.ebuild
deleted file mode 100644
index cc2e7f476104..000000000000
--- a/dev-libs/libclc/libclc-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OpenCL C library"
-HOMEPAGE="https://libclc.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( MIT BSD )"
-SLOT="0"
-KEYWORDS=""
-IUSE="spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi"
-
-LLVM_MAX_SLOT=17
-BDEPEND="
-	${PYTHON_DEPS}
-	|| (
-		(
-			sys-devel/clang:17
-			spirv? ( dev-util/spirv-llvm-translator:17 )
-		)
-		(
-			sys-devel/clang:16
-			spirv? ( dev-util/spirv-llvm-translator:16 )
-		)
-		(
-			sys-devel/clang:15
-			spirv? ( dev-util/spirv-llvm-translator:15 )
-		)
-		(
-			sys-devel/clang:14
-			spirv? ( dev-util/spirv-llvm-translator:14 )
-		)
-		(
-			sys-devel/clang:13
-			spirv? ( dev-util/spirv-llvm-translator:13 )
-		)
-	)
-"
-
-LLVM_COMPONENTS=( libclc )
-llvm.org_set_globals
-
-llvm_check_deps() {
-	if use spirv; then
-		has_version -b "dev-util/spirv-llvm-translator:${LLVM_SLOT}" ||
-			return 1
-	fi
-	has_version -b "sys-devel/clang:${LLVM_SLOT}"
-}
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libclc_targets=()
-
-	use spirv && libclc_targets+=(
-		"spirv-mesa3d-"
-		"spirv64-mesa3d-"
-	)
-	use video_cards_nvidia && libclc_targets+=(
-		"nvptx--"
-		"nvptx64--"
-		"nvptx--nvidiacl"
-		"nvptx64--nvidiacl"
-	)
-	use video_cards_r600 && libclc_targets+=(
-		"r600--"
-	)
-	use video_cards_radeonsi && libclc_targets+=(
-		"amdgcn--"
-		"amdgcn-mesa-mesa3d"
-		"amdgcn--amdhsa"
-	)
-	[[ ${#libclc_targets[@]} ]] || die "libclc target missing!"
-
-	libclc_targets=${libclc_targets[*]}
-	local mycmakeargs=(
-		-DLIBCLC_TARGETS_TO_BUILD="${libclc_targets// /;}"
-	)
-	cmake_src_configure
-}
diff --git a/dev-libs/mpfr/mpfr-4.2.0.ebuild b/dev-libs/mpfr/mpfr-4.2.0.ebuild
index c59c7f67eece..62bf691ed9f8 100644
--- a/dev-libs/mpfr/mpfr-4.2.0.ebuild
+++ b/dev-libs/mpfr/mpfr-4.2.0.ebuild
@@ -40,7 +40,7 @@ LICENSE="LGPL-2.1"
 # preserve-libs.eclass usage to pkg_*inst! See e.g. the readline ebuild.
 SLOT="0/6" # libmpfr.so version
 if [[ ${PV} != *_rc* ]] ; then
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 fi
 IUSE="static-libs"
 
diff --git a/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch b/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch
index a77455afa8ef..eccbf30a3ea8 100644
--- a/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch
+++ b/dev-ml/lablgtk/files/lablgtk-2.18.12-Makefile.patch
@@ -1,5 +1,14 @@
 --- a/src/Makefile	2022-12-23 21:39:09.743150707 +0100
 +++ b/src/Makefile	2022-12-23 21:39:40.219667855 +0100
+@@ -23,7 +23,7 @@
+ TARGETS = varcc$(XE) lablgtktop$(XE) lablgtk2$(XB) gdk_pixbuf_mlsource$(XE) \
+ 	$(THINITOBJS) build.ml
+ 
+-all: dist byte
++all: dist byte sourceView2Enums.ml
+ world: dist byte $(CAMLBEST)
+ install: findlib-install
+ uninstall: findlib-uninstall
 @@ -617,7 +617,7 @@
  			gtk_tags.h gdk_tags.h ml_gtktext.h sourceView_tags.h wrappers.h
  
diff --git a/dev-ml/llvm-ocaml/Manifest b/dev-ml/llvm-ocaml/Manifest
index 1edea9832f73..b055e2dfd698 100644
--- a/dev-ml/llvm-ocaml/Manifest
+++ b/dev-ml/llvm-ocaml/Manifest
@@ -5,4 +5,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230225.ebuild b/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230225.ebuild
deleted file mode 100644
index 32335153cc00..000000000000
--- a/dev-ml/llvm-ocaml/llvm-ocaml-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,112 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit cmake llvm llvm.org python-any-r1
-
-DESCRIPTION="OCaml bindings for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${PV}"
-KEYWORDS=""
-IUSE="debug test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	>=dev-lang/ocaml-4.00.0:0=
-	dev-ml/ocaml-ctypes:=
-	~sys-devel/llvm-${PV}:=[debug?]
-	!sys-devel/llvm[ocaml(-)]
-"
-
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	dev-ml/findlib
-	>=dev-util/cmake-3.16
-"
-
-LLVM_COMPONENTS=( llvm cmake third-party )
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_OCAML_OUT_OF_TREE=ON
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		# disable various irrelevant deps and settings
-		-DLLVM_ENABLE_FFI=OFF
-		-DLLVM_ENABLE_TERMINFO=OFF
-		-DHAVE_HISTEDIT_H=NO
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_EH=ON
-		-DLLVM_ENABLE_RTTI=ON
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# TODO: ocamldoc
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	# also: custom rules for OCaml do not work for CPPFLAGS
-	use debug || local -x CFLAGS="${CFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	local llvm_libdir=$(llvm-config --libdir)
-	# an ugly hack; TODO: figure out a way to pass -L to ocaml...
-	cd "${BUILD_DIR}/${libdir}" || die
-	ln -s "${llvm_libdir}"/*.so . || die
-
-	if use test; then
-		local llvm_bindir=$(llvm-config --bindir)
-		# Force using system-installed tools.
-		sed -i -e "/llvm_tools_dir/s@\".*\"@\"${llvm_bindir}\"@" \
-			"${BUILD_DIR}"/test/lit.site.cfg.py || die
-	fi
-}
-
-src_compile() {
-	cmake_build ocaml_all
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-llvm-bindings-ocaml
-}
-
-src_install() {
-	DESTDIR="${D}" \
-	cmake -P "${BUILD_DIR}"/bindings/ocaml/cmake_install.cmake || die
-
-	dodoc bindings/ocaml/README.txt
-}
diff --git a/dev-python/accessible-pygments/accessible-pygments-0.0.3.ebuild b/dev-python/accessible-pygments/accessible-pygments-0.0.3.ebuild
index 5b6db291869b..88e1fb7009bd 100644
--- a/dev-python/accessible-pygments/accessible-pygments-0.0.3.ebuild
+++ b/dev-python/accessible-pygments/accessible-pygments-0.0.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/pygments-1.5[${PYTHON_USEDEP}]
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 7862b303c25f..3824431f256e 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -1,2 +1 @@
-DIST ansible-compat-2.2.7.tar.gz 47378 BLAKE2B 58f3b19400fb7646d37c585df07435e65a60f3e57d445c98e8089c6a2ed853cb5dbab682d85cee1a604e1b4de6dd137faa12bf78fe7913752839f95bd651435f SHA512 9a3863be3d755eb5a1a61ba0c526786ea3df14bc6fcabd9196559eb625ab6dfc8de7a17fdb2cdd8ad71d7d61b5e2f0543b8b5908f39d5e7d9ea45e387aa625b1
 DIST ansible-compat-3.0.1.tar.gz 62676 BLAKE2B a1d08311e1b61d8387ef82db65581df4ab7cb4a2520bff9173845fa5b9fe18d173afd4306874967fb40c007546f36d78349a503bd09ae14257a38a59e1cbb22f SHA512 27183b09f957a79254b5dfa237c2ef789dac95e86f421277878a57487a16684de862f03f6ecee6c57ab5a5dfa8c7ee2802d5e63e74ca0aebc61efa46574f0a61
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
deleted file mode 100644
index 2e7296f0d6fb..000000000000
--- a/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Contains functions that facilitate working with various versions of Ansible"
-HOMEPAGE="
-	https://pypi.org/project/ansible-compat/
-	https://github.com/ansible/ansible-compat/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~riscv"
-
-RDEPEND="
-	>=app-admin/ansible-core-2.9.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-4.6.0[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	>=dev-python/subprocess-tee-0.3.5[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-7.0.0[${PYTHON_USEDEP}]
-	test? (
-		dev-python/flaky[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-plus[${PYTHON_USEDEP}]
-	)
-"
-
-# All these tests attempt to connect to galaxy.ansible.com
-EPYTEST_DESELECT=(
-	test/test_runtime.py::test_install_collection
-	test/test_runtime.py::test_install_collection_dest
-	test/test_runtime.py::test_prepare_environment_with_collections
-	test/test_runtime.py::test_prerun_reqs_v1
-	test/test_runtime.py::test_prerun_reqs_v2
-	test/test_runtime.py::test_require_collection_no_cache_dir
-	test/test_runtime.py::test_require_collection_wrong_version
-	test/test_runtime.py::test_require_collection
-	test/test_runtime.py::test_upgrade_collection
-	test/test_runtime_example.py::test_runtime
-)
-
-distutils_enable_sphinx docs \
-	dev-python/ansible-pygments \
-	dev-python/myst-parser \
-	dev-python/sphinx_ansible_theme
-distutils_enable_tests pytest
diff --git a/dev-python/ansible-compat/ansible-compat-3.0.1.ebuild b/dev-python/ansible-compat/ansible-compat-3.0.1.ebuild
index bbea175e5664..a7845cd7c34b 100644
--- a/dev-python/ansible-compat/ansible-compat-3.0.1.ebuild
+++ b/dev-python/ansible-compat/ansible-compat-3.0.1.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv"
+KEYWORDS="amd64 ~riscv"
 
 RDEPEND="
 	>=app-admin/ansible-core-2.12[${PYTHON_USEDEP}]
diff --git a/dev-python/apispec/Manifest b/dev-python/apispec/Manifest
index 65cde9e42167..009f30a2ea84 100644
--- a/dev-python/apispec/Manifest
+++ b/dev-python/apispec/Manifest
@@ -1,3 +1,4 @@
 DIST apispec-6.0.2.gh.tar.gz 72472 BLAKE2B 0ff39ad92648cd63487f8901dc918fc1c642ce677ef73d5a7c849cdafbf7c81ac3ec51224575cd83c060930c1b2ef0ebfb3e94e1fb30f040e4dc4aa2bd221936 SHA512 aa5e2cc41d5b3c4555da929819135df30192e6f6ff08518d62674495f0d28c14e51a0aa111b289e5f9d7205f821c1fd4e28b914899ea3e15b3e20f6052258117
 DIST apispec-6.1.0.gh.tar.gz 72570 BLAKE2B 524573d188c487c57bed25f735888623d3abb848a949920bfa7ef8737b33d5fa29670d90af47eedb8b6202ddd553d04c2809285151555159c81203989fe23a2c SHA512 95d24491992572304b5c5adbb2a50668d55cb60585e32c85f718f2c211eb15c35082146fd6c88b7d3d574b4fef8f49fdd3cfe714f15d80aa657f3b48f38a40ed
 DIST apispec-6.2.0.gh.tar.gz 72921 BLAKE2B 32a0f5c607277afb4db319183777e9cdba625f17942a983ccf8b67fead459783b4d88e8bbd71c24be421aa068fb6dd96c193806b287de3d63f3456ec840132d7 SHA512 432391b42dab9cb1172bd6959346dabf639dabec85540cd6f3c0f227cbc833a8424ae6b34e3d4d79f6bf41d3cf24464d1f5584204e143c3dc2d092029a2d2cf7
+DIST apispec-6.3.0.tar.gz 77157 BLAKE2B 0ccf398f36548ea269c4e91fb512d8789bb387cff6956c0fe0426f1b3c38b6670e8c41972948d7a3f87c75e52c97fdff7570306d64c6ad41bfcb9f19e391b7de SHA512 65119851ee31cebc0bb0ddc6668e3961f870a7759bc95128e67063d0f3c6a88ddb590efc478c2e8eb8ecd7d3edd51bd51971a4e3e1e25a7486dfcb1b49e98dc4
diff --git a/dev-python/apispec/apispec-6.3.0.ebuild b/dev-python/apispec/apispec-6.3.0.ebuild
new file mode 100644
index 000000000000..1996ed2fe59c
--- /dev/null
+++ b/dev-python/apispec/apispec-6.3.0.ebuild
@@ -0,0 +1,46 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="A pluggable API specification generator"
+HOMEPAGE="
+	https://github.com/marshmallow-code/apispec/
+	https://pypi.org/project/apispec/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
+	>=dev-python/pyyaml-3.10[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/bottle[${PYTHON_USEDEP}]
+		>=dev-python/marshmallow-3.18.0[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+distutils_enable_sphinx docs \
+	dev-python/sphinx-issues \
+	dev-python/sphinx-rtd-theme
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# requires unpackaged prance
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v2
+		tests/test_ext_marshmallow_openapi.py::test_openapi_tools_validate_v3
+	)
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	epytest
+}
diff --git a/dev-python/argh/Manifest b/dev-python/argh/Manifest
index d2d07c988298..9a4a2c64e708 100644
--- a/dev-python/argh/Manifest
+++ b/dev-python/argh/Manifest
@@ -1,4 +1 @@
-DIST argh-0.26.2.tar.gz 32913 BLAKE2B 315dc36c4a98cb4a8fdab68a30ed3d4d87d1565717722ed496255d8b1b4e505277032217da4c5d750f210974890d8094c52f920044173ff2168adf7cb7f6a2bd SHA512 90382900d5cec9629dacb4459a2c9491d1425b66fa3f90d7cbf511dec846a99dbb9424f3e08f0c006da48fbf9c067078705be70b314700541fd800630e4b1707
-DIST argh-0.27.1.tar.gz 49106 BLAKE2B 48f21d920d97111656cb5b18c956c7fdda94ae242f92ebfb02c47b55d5ccc1b82b0ef8b94a721f97fb3638b15b38ce3293fbe46ab123ed9c968efdb2e881d8f3 SHA512 edddd35b2a90c6286818986945e9ea8484dd06bc263016d8c52b0e29475dbad610d673acc0918d0cf62657b1d965bb0d59e51af4c384ae0610f471c748a90999
-DIST argh-0.27.2.tar.gz 49200 BLAKE2B 4599781854feb0aa1b5251f6361bcf4e5e4f96c391fd8be3e5a3397d2a6130ec9111f36ad87dd553345a0d9d6471d20ecca7cd7462d41012c8117d2a07f18290 SHA512 9bed6d5f4ea6407be675b4b5c015e0bda5015ef78289ba9c08503687dc33d91fcda9aabdb9a94b9e3dc11020edf873e51eb1ef9d7ee0831b4f0eb0e302b83b98
 DIST argh-0.28.1.tar.gz 62511 BLAKE2B fb06ad73c5d8e8508103007a2213285f52f4d245ade288504616d42847c982a27ca94f0850f87052737c17740de705a9f8557fcafbea6f656e30ca1ed99efffb SHA512 c5d4515f5ba94a60dbcc6fa81812c192b51539ceee349129028a3d736ba1b0eac23135b31fa6d350e9fff778250365848e6c2077553849aeebbb9b67be6774dc
diff --git a/dev-python/argh/argh-0.26.2-r3.ebuild b/dev-python/argh/argh-0.26.2-r3.ebuild
deleted file mode 100644
index 960a1c56040a..000000000000
--- a/dev-python/argh/argh-0.26.2-r3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1
-
-DESCRIPTION="A simple argparse wrapper"
-HOMEPAGE="https://pythonhosted.org/argh/"
-SRC_URI="mirror://pypi/a/${PN}/${P}.tar.gz"
-
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
-LICENSE="LGPL-3"
-
-BDEPEND="
-	test? (
-		dev-python/iocapture[${PYTHON_USEDEP}]
-		dev-python/mock[${PYTHON_USEDEP}]
-	)"
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-py3.9-msgs.patch"
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/argh/argh-0.27.1.ebuild b/dev-python/argh/argh-0.27.1.ebuild
deleted file mode 100644
index 8e5716e7e64a..000000000000
--- a/dev-python/argh/argh-0.27.1.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A simple argparse wrapper"
-HOMEPAGE="
-	https://pythonhosted.org/argh/
-	https://github.com/neithere/argh/
-	https://pypi.org/project/argh/
-"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-LICENSE="LGPL-3"
-
-BDEPEND="
-	test? (
-		dev-python/iocapture[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/argh/argh-0.27.2.ebuild b/dev-python/argh/argh-0.27.2.ebuild
deleted file mode 100644
index 8e5716e7e64a..000000000000
--- a/dev-python/argh/argh-0.27.2.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-DISTUTILS_USE_PEP517=setuptools
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="A simple argparse wrapper"
-HOMEPAGE="
-	https://pythonhosted.org/argh/
-	https://github.com/neithere/argh/
-	https://pypi.org/project/argh/
-"
-
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-LICENSE="LGPL-3"
-
-BDEPEND="
-	test? (
-		dev-python/iocapture[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/argh/argh-0.28.1.ebuild b/dev-python/argh/argh-0.28.1.ebuild
index 2631d478717b..780c71ff0f84 100644
--- a/dev-python/argh/argh-0.28.1.ebuild
+++ b/dev-python/argh/argh-0.28.1.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 "
 
 SLOT="0"
-KEYWORDS="~alpha ~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="LGPL-3"
 
 BDEPEND="
diff --git a/dev-python/argh/files/argh-0.26.2-fix-py3.9-msgs.patch b/dev-python/argh/files/argh-0.26.2-fix-py3.9-msgs.patch
deleted file mode 100644
index 5835c5acbb8e..000000000000
--- a/dev-python/argh/files/argh-0.26.2-fix-py3.9-msgs.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-diff --git a/test/test_integration.py b/test/test_integration.py
-index 8899d8e..589f6d6 100644
---- a/test/test_integration.py
-+++ b/test/test_integration.py
-@@ -377,7 +377,7 @@ def test_invalid_choice():
-     p = DebugArghParser()
-     p.add_commands([cmd])
- 
--    assert run(p, 'bar', exit=True).startswith('invalid choice')
-+    assert 'invalid choice' in run(p, 'bar', exit=True)
- 
-     if sys.version_info < (3,3):
-         # Python before 3.3 exits with a less informative error
-@@ -391,7 +391,7 @@ def test_invalid_choice():
-     p = DebugArghParser()
-     p.add_commands([cmd], namespace='nest')
- 
--    assert run(p, 'nest bar', exit=True).startswith('invalid choice')
-+    assert 'invalid choice' in run(p, 'nest bar', exit=True)
- 
-     if sys.version_info < (3,3):
-         # Python before 3.3 exits with a less informative error
-@@ -511,7 +511,7 @@ def test_explicit_cmd_name():
- 
-     p = DebugArghParser()
-     p.add_commands([orig_name])
--    assert run(p, 'orig-name', exit=True).startswith('invalid choice')
-+    assert 'invalid choice' in run(p, 'orig-name', exit=True)
-     assert run(p, 'new-name').out == 'ok\n'
- 
- 
diff --git a/dev-python/aws-sam-translator/Manifest b/dev-python/aws-sam-translator/Manifest
index 616c822239f9..26f9c0190212 100644
--- a/dev-python/aws-sam-translator/Manifest
+++ b/dev-python/aws-sam-translator/Manifest
@@ -1,2 +1,3 @@
 DIST aws-sam-translator-1.59.0.gh.tar.gz 1688806 BLAKE2B 66e63f5d008b120d95b2258552ba7ea531b6dc2d0090360c3777bcac167f95a0167cf200a8b29d798699e87a060befee71f7e8316ed395eded073960b4f1a18b SHA512 558b5dfe586c0badb7b5b5f35a6b841ffe94f2e6fb68acf7c492529abfe3756760fc5d8cdb16550ebbc47671fa12e09620b445d086f008d05f80606710ec67a9
 DIST serverless-application-model-1.60.1.gh.tar.gz 4600439 BLAKE2B fabd84e66da433410ff7d54a9db9ae6aed5dd67de16669450146adb5f86ef3b0b90a1c6165b935eb1aef0df0c116a687da6c43e75f332a8a5f3f93c79338f2e4 SHA512 75e3aca9248ce599837f87bdc633fc48e9f5980f878884aef7e3b1b41a2cbe1d982d9eb6b5bd41a2057fc53b9edc4ce6fd9e016750d0757f58feaeb08f02fe3a
+DIST serverless-application-model-1.61.0.gh.tar.gz 5166263 BLAKE2B 9f787dac4761974e4114e4d3477eaf050e92d722111fef65cad3ebda1f265420aa62fc068140e102a0963679f20485e3f53968da74ba804b70a131df9535dbe7 SHA512 0d12c1b0d83c2824177a68c544177e2d80ec2e670ab469069621553745850a88e5c6143f7f529e8227c576d72e37ba007ab06ad0302282266170e0c33096b626
diff --git a/dev-python/aws-sam-translator/aws-sam-translator-1.61.0.ebuild b/dev-python/aws-sam-translator/aws-sam-translator-1.61.0.ebuild
new file mode 100644
index 000000000000..5a83e871d7a8
--- /dev/null
+++ b/dev-python/aws-sam-translator/aws-sam-translator-1.61.0.ebuild
@@ -0,0 +1,60 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1
+
+MY_P=serverless-application-model-${PV}
+DESCRIPTION="A library that transform SAM templates into AWS CloudFormation templates"
+HOMEPAGE="
+	https://github.com/aws/serverless-application-model/
+	https://pypi.org/project/aws-sam-translator/
+"
+SRC_URI="
+	https://github.com/aws/serverless-application-model/archive/v${PV}.tar.gz
+		-> ${MY_P}.gh.tar.gz
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	<dev-python/boto3-2[${PYTHON_USEDEP}]
+	>=dev-python/boto3-1.19.5[${PYTHON_USEDEP}]
+	>=dev-python/jsonschema-3.2[${PYTHON_USEDEP}]
+	<dev-python/pydantic-2[${PYTHON_USEDEP}]
+	>=dev-python/pydantic-1.8[${PYTHON_USEDEP}]
+	<dev-python/typing-extensions-5[${PYTHON_USEDEP}]
+	>=dev-python/typing-extensions-4.4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# so much noise...
+	sed -i -e '/log_cli/d' pytest.ini || die
+
+	# deps are installed by ebuild, don't try to reinstall them via pip
+	truncate --size=0 requirements/*.txt || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x AWS_DEFAULT_REGION=us-east-1
+	epytest -o addopts=
+}
diff --git a/dev-python/binaryornot/Manifest b/dev-python/binaryornot/Manifest
index 9e37c8c0ebdb..e37ca0fcbdb4 100644
--- a/dev-python/binaryornot/Manifest
+++ b/dev-python/binaryornot/Manifest
@@ -1 +1 @@
-DIST binaryornot-0.4.4.r1.tar.gz 371054 BLAKE2B 4a70e22eba51a266987308e8d1b4571ace5760f945920194a1a61f4336f33dcb655c4f0b1f760aa3502834d29a1a64ac62657e5d73eac8f1d7d02edf71db8af9 SHA512 379e71b41824b9389ea02c64223e26c57694d07b749c197e3a6b9f10558c8d502e9b93a13ae6c3a4bca49064ffc650ce822073dc312fb06e50e06b8a3f04f419
+DIST binaryornot-0.4.4.tar.gz 371054 BLAKE2B 4a70e22eba51a266987308e8d1b4571ace5760f945920194a1a61f4336f33dcb655c4f0b1f760aa3502834d29a1a64ac62657e5d73eac8f1d7d02edf71db8af9 SHA512 379e71b41824b9389ea02c64223e26c57694d07b749c197e3a6b9f10558c8d502e9b93a13ae6c3a4bca49064ffc650ce822073dc312fb06e50e06b8a3f04f419
diff --git a/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild b/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
deleted file mode 100644
index 0d916c40a3f7..000000000000
--- a/dev-python/binaryornot/binaryornot-0.4.4-r2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Ultra-lightweight pure Python package to guess whether a file is binary or text"
-HOMEPAGE="https://github.com/audreyfeldroy/binaryornot"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.r1.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~ppc64 ~riscv x86"
-
-RDEPEND=">=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/hypothesis[${PYTHON_USEDEP}] )"
-
-DOCS=( README.rst HISTORY.rst CONTRIBUTING.rst )
-
-PATCHES=(
-	# https://github.com/audreyr/binaryornot/commit/38dee57986c6679d9936a1da6f6c8182da3734f8
-	"${FILESDIR}"/${P}-tests.patch
-)
-
-distutils_enable_tests unittest
-distutils_enable_sphinx docs
diff --git a/dev-python/binaryornot/binaryornot-0.4.4-r3.ebuild b/dev-python/binaryornot/binaryornot-0.4.4-r3.ebuild
index 275f3cbc94d3..28fb62e3a4ce 100644
--- a/dev-python/binaryornot/binaryornot-0.4.4-r3.ebuild
+++ b/dev-python/binaryornot/binaryornot-0.4.4-r3.ebuild
@@ -6,18 +6,17 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Ultra-lightweight pure Python package to guess whether a file is binary or text"
 HOMEPAGE="
 	https://github.com/audreyfeldroy/binaryornot/
 	https://pypi.org/project/binaryornot/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz -> ${P}.r1.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/chardet-3.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/bitarray/Manifest b/dev-python/bitarray/Manifest
index e8704e1a2026..9e446b4039e6 100644
--- a/dev-python/bitarray/Manifest
+++ b/dev-python/bitarray/Manifest
@@ -1,5 +1 @@
-DIST bitarray-2.6.2.tar.gz 103565 BLAKE2B 07aef624bc7d36e0631082688f9803f7fb3d4c2fcb9d8ac7af0d207e56f8229c1e6a7e6ac7c0639d88b55f6d27f697cd6e4ece5cd0768d2624ac94eedabb0c60 SHA512 21a10fcc174b3e705551a6cfcf6e1b4ccb899c9d9a69e273e3c49528bcc5d889eac0dc3dbffc1f55fa561a091f8d11f3246035499cb9168192a03c6af034bd82
-DIST bitarray-2.7.0.tar.gz 120536 BLAKE2B e8e518a8293a22c81decbf3bb8ecc83d3796023bc6e3e5b75617ccc6c13b291d27d5a707d9a88e361329fa36e6f0363f4330b382b35236079f98052154bd5750 SHA512 762628d3b24315619176bf7ceaef95ba83fc87bb49c0daa23503fcb5dd54d447b4950b75b4923fbeaace2ee8a3037f228184ca5978fc8c782eb9eb3e7dd65d8d
-DIST bitarray-2.7.1.tar.gz 120656 BLAKE2B 3daeb4ad02aebbd22929cc755eadcc5bc0d7bc779c269d5e2e9de3dcc9349d3f73179cc5d5a27679dc9682127b89c32af18fd3c96f5fb03fd5325db34751e479 SHA512 ead010745825ee8758a3028267a975b92833c2d5ec76d8a1655c11ade6a76a56df8887e43342be5d4569dcb8e8c0f6534ab70bf850b0ae5a07c0189ce5feed25
-DIST bitarray-2.7.2.tar.gz 121846 BLAKE2B 542a1b3e7b7f3c8da42db93e5ee516c6138386508044ce81177bfaa2ef60713e3768d8e08e90c6619e30f685f4b5efb9fe3eabb2b8208ee0570203e94a4d3c7d SHA512 42bf4d43fefcf5d8500a004c83261b533c2e4ed486c3fa79256b99b8a0ce00873357621edf9270ce2c7ec704242ca96226e33285d9620f01aa5175d5d7cba00c
 DIST bitarray-2.7.3.tar.gz 123574 BLAKE2B 9a7a1b0025a7853434ae5e1c6e7bc5302668016f3cf8d569376644ced092ab1b3c28eeaabdf9d51d604e98a3f68f8f8d3002a87cc4dbfd897e30e6b162adf4aa SHA512 4ace2bfe78e06723bedbc263c7b2b163bbc5c35bde84f286390cbfffc8c513bbd4a4f5f775e6d0a863ded7b24cb555c7784e7dd067c3b9125abd8d62863ac684
diff --git a/dev-python/bitarray/bitarray-2.6.2.ebuild b/dev-python/bitarray/bitarray-2.6.2.ebuild
deleted file mode 100644
index 6a57a7ed5e44..000000000000
--- a/dev-python/bitarray/bitarray-2.6.2.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.7.0.ebuild b/dev-python/bitarray/bitarray-2.7.0.ebuild
deleted file mode 100644
index 4d6195f2bfd0..000000000000
--- a/dev-python/bitarray/bitarray-2.7.0.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.7.1.ebuild b/dev-python/bitarray/bitarray-2.7.1.ebuild
deleted file mode 100644
index 4d6195f2bfd0..000000000000
--- a/dev-python/bitarray/bitarray-2.7.1.ebuild
+++ /dev/null
@@ -1,24 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.7.2.ebuild b/dev-python/bitarray/bitarray-2.7.2.ebuild
deleted file mode 100644
index 06fcd3c59496..000000000000
--- a/dev-python/bitarray/bitarray-2.7.2.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Efficient arrays of booleans -- C extension"
-HOMEPAGE="
-	https://github.com/ilanschnell/bitarray/
-	https://pypi.org/project/bitarray/
-"
-
-SLOT="0"
-LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
-
-python_test() {
-	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
-}
diff --git a/dev-python/bitarray/bitarray-2.7.3.ebuild b/dev-python/bitarray/bitarray-2.7.3.ebuild
index 06fcd3c59496..3736c78dd968 100644
--- a/dev-python/bitarray/bitarray-2.7.3.ebuild
+++ b/dev-python/bitarray/bitarray-2.7.3.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="PSF-2"
-KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 x86 ~amd64-linux ~x86-linux"
 
 python_test() {
 	"${EPYTHON}" bitarray/test_bitarray.py -v || die "Tests fail with ${EPYTHON}"
diff --git a/dev-python/bitstring/Manifest b/dev-python/bitstring/Manifest
index 560aa9aaaec4..fb1367b4f5a5 100644
--- a/dev-python/bitstring/Manifest
+++ b/dev-python/bitstring/Manifest
@@ -1,2 +1 @@
-DIST bitstring-3.1.9.tar.gz 408443 BLAKE2B 747ce06fc33681cbe63d706c2dace5ebce314aea1ba45f8a5a9d65f849bcf253fa9354e39fd80731af4845993e418f27232ede47c940367b8cb425867ffee8c9 SHA512 6dc9c8d683e4415dfd685153b350bd5462117c49c7d8fcd9b2a066f927d82bb2bfae1cc5df543dd38c5e65b93d453ad13d2937f9523b77b007b1234b24ba7be1
 DIST bitstring-bitstring-4.0.1.gh.tar.gz 413983 BLAKE2B a4b424d2c139b34ce5ea81522486d0e42d82a06cfc64ce664505a2c1f1a626939b57b1755642220e2fb4219ead3a2a368006878ea05bdae59a638948b24e8b8c SHA512 f036a042f83c70b830f987114e7eb54754145296c60cd6486f398247a069c50588f3c86395a849a99e3c9b94364f1fcf4fedf4b59b80f03b6aecb38d992f5490
diff --git a/dev-python/bitstring/bitstring-3.1.9.ebuild b/dev-python/bitstring/bitstring-3.1.9.ebuild
deleted file mode 100644
index 1f51577f3b70..000000000000
--- a/dev-python/bitstring/bitstring-3.1.9.ebuild
+++ /dev/null
@@ -1,26 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="A pure Python module for creation and analysis of binary data"
-HOMEPAGE="https://github.com/scott-griffiths/bitstring"
-SRC_URI="https://github.com/scott-griffiths/${PN}/archive/${P}.tar.gz"
-S=${WORKDIR}/${PN}-${P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 x86"
-
-distutils_enable_tests unittest
-
-DOCS=( README.rst release_notes.txt )
-
-src_test() {
-	cd test || die
-	distutils-r1_src_test
-}
diff --git a/dev-python/bitstring/bitstring-4.0.1.ebuild b/dev-python/bitstring/bitstring-4.0.1.ebuild
index fb971db740f5..a802d7606927 100644
--- a/dev-python/bitstring/bitstring-4.0.1.ebuild
+++ b/dev-python/bitstring/bitstring-4.0.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="amd64 ~arm ~arm64 x86"
 
 distutils_enable_tests unittest
 
diff --git a/dev-python/blessed/blessed-1.20.0.ebuild b/dev-python/blessed/blessed-1.20.0.ebuild
index b4b5a670d254..06229f35dbb9 100644
--- a/dev-python/blessed/blessed-1.20.0.ebuild
+++ b/dev-python/blessed/blessed-1.20.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	dev-python/six[${PYTHON_USEDEP}]
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 30d2c0bbaf13..4d23a086e69d 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -5,3 +5,4 @@ DIST boto3-1.26.85.gh.tar.gz 613010 BLAKE2B 724ebf1264717652b2d671f96f34b546b1cc
 DIST boto3-1.26.86.gh.tar.gz 613310 BLAKE2B 4b16a9d637af664331a1197324219e9e58ba3569636f1707f907f44ffca284948daa2c702cc95a6fc85bc2ccb00d12bd80ffd79eb562325a709c87d9d3181880 SHA512 1a6bb7b7d3e14611099e938def383c7444801702a401003a91f47dc95656c0fb22450d670b908902b85d6caa0f20c6572f891364b20a98ef0669fdb7cdcfeb62
 DIST boto3-1.26.87.gh.tar.gz 614323 BLAKE2B b2dab2b5850777e493d7b4df7bda8cce8bb4f3b316f9551489a1942caaa0deca915cf50e4dd3e910a4ceff0d0a49ec2539dfc8bdf955745a4d5b8018453f8280 SHA512 0577e56f4cef0386e113e0ee67796ddbd8084fdb1e2b4229525f7818a8d89f1177c875b0b80f9d3334fc774fd151805f673bc29211cf4ee6e08806a5917ec619
 DIST boto3-1.26.88.gh.tar.gz 615353 BLAKE2B eecc0bf96a8f6eadc2337de0a29f993f0a7e20c691fdbc170680f749be4988f6c91963f3089e9ef51376e5829bb8493a051d376bf1375137a31a9f864b677f5b SHA512 46a013179343ec9fb8973700bec74a998e08a7346f84812d2d938e3327f686690d12236f687c66b1cfd93010a986006ce8db040b8172241d55e097b3da4adf7a
+DIST boto3-1.26.89.gh.tar.gz 615718 BLAKE2B 3257e6efafaf139daf935385c252c10929be2a4277a8f0f192afc6dbd7cc32fa8f940a4e59ebbe25931c399dedb926a3c1848bd9cc0a7f0d377acb302eabe3b0 SHA512 02ee02b05023e9184f779ab8ff21afa6f7e56f7d2e883d021b2567676c5fc57cad6b475d55316a2017c2a837c41d2f5604824f440060e2f96804c5a61ccdd143
diff --git a/dev-python/boto3/boto3-1.26.89.ebuild b/dev-python/boto3/boto3-1.26.89.ebuild
new file mode 100644
index 000000000000..9523f65d5fb9
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.89.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 506befe29b70..13dcb1d8c3ac 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -5,3 +5,4 @@ DIST botocore-1.29.85.gh.tar.gz 11218800 BLAKE2B 801e86c9ce18e77b2e4c6c004ed1015
 DIST botocore-1.29.86.gh.tar.gz 11222402 BLAKE2B ceefb618f7156f93bd5a1ccb9addaec225e049922edc6120d34047805fe878a7fb89ee668d966f70e20c0935c0e5bf5f3085dadafebd0bf9f14a873996900740 SHA512 c7846133c86f470ffbc2a189776da5cb86a52ae46441d4abb21a94100383e96ecb50bda9702dcd25ba34fe9421d1f98b8a0b427a87c92d3d18168d306ae4b37d
 DIST botocore-1.29.87.gh.tar.gz 11221589 BLAKE2B c60ce2b4d58fa660aebc143f63848d871b2c0e9ad9ce234af3e23e7fc3eef64cc59186d687b844f1c767e569c263500cbb2ec1187bd14fb594eae28e3ed8e219 SHA512 2505f0c397257fb054c5a8808cbe807c2aa86015b71400b4ee7dafecddcef197ab89399df32eb8afc4761974490d65ae3524ee3b0ce7c1cdd9fa33bc1cdb95c4
 DIST botocore-1.29.88.gh.tar.gz 11227872 BLAKE2B 1fd9bf0f147ac87c92723d23b8bcefc8c22261932081aa4530b72de8b96ef964df293100a61940e2adb088f3b6ced4a64758f3c36dbf598676949fe84115083b SHA512 d71f2f7f453ecae000491acef22da701d12e0296154b3ba81cbc0821e9266f6e95e5adefbf94fdf98333775a03d7a6d255f28963c54278f22c5c888d15a291ef
+DIST botocore-1.29.89.gh.tar.gz 11227280 BLAKE2B 41a1243972e591ea23fb2eebaa5b5fb9547bbd8ccd72fc907c487fd56ebf90d8120ceee472e34a29cd2b036926bc93bda33b564b1b7083e8984daf366eced1f8 SHA512 356298fd3be39957dd60e6268cfd2652998e62950b9060e0774c68e158506dcfea8188059b588c08f520617af38b91eb6b71c16b92f7a71f75f33cb73e7786cf
diff --git a/dev-python/botocore/botocore-1.29.89.ebuild b/dev-python/botocore/botocore-1.29.89.ebuild
new file mode 100644
index 000000000000..0f4daaa48e81
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.89.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index 1edea9832f73..b055e2dfd698 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -5,4 +5,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/dev-python/clang-python/clang-python-17.0.0_pre20230225.ebuild b/dev-python/clang-python/clang-python-17.0.0_pre20230225.ebuild
deleted file mode 100644
index f37802f5c2d7..000000000000
--- a/dev-python/clang-python/clang-python-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,54 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit llvm.org python-r1
-
-DESCRIPTION="Python bindings for sys-devel/clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-# The module is opening libclang.so directly, and doing some blasphemy
-# on top of it.
-DEPEND="
-	>=sys-devel/clang-${PV}:*
-	!sys-devel/llvm:0[clang(-),python(-)]
-	!sys-devel/clang:0[python(-)]
-"
-RDEPEND="
-	${DEPEND}
-	${PYTHON_DEPS}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	test? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-"
-
-LLVM_COMPONENTS=( clang/bindings/python )
-llvm.org_set_globals
-
-python_test() {
-	# tests rely on results from a specific clang version, so override
-	# the search path
-	local -x CLANG_LIBRARY_PATH=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)
-	local -x CLANG_NO_DEFAULT_CONFIG=1
-	"${EPYTHON}" -m unittest discover -v || die "Tests fail with ${EPYTHON}"
-}
-
-src_test() {
-	python_foreach_impl python_test
-}
-
-src_install() {
-	python_foreach_impl python_domodule clang
-}
diff --git a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
index 253845cc5a9f..f62071fc06c3 100644
--- a/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
+++ b/dev-python/colorclass/colorclass-2.2.2-r1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/dask/Manifest b/dev-python/dask/Manifest
index f74ceea2e85e..fbb62a339ed7 100644
--- a/dev-python/dask/Manifest
+++ b/dev-python/dask/Manifest
@@ -1,2 +1,3 @@
 DIST dask-2023.2.1.gh.tar.gz 8514054 BLAKE2B 6f94172cf9f921675fc53cf59e9cbbe211f576374190eecf8e17ad9943bbd1ba15fb002e7cf81f0043b4f2450a0cde7bdb6feb42a08160d0fbaee24d4a2f483a SHA512 1af031fd2992377297daff42c4f706e4e5573cce86a9158ea1fa4f09cf0c8a51ff5fb33d7bc551c16eb0a8e5052e76b32a143b2793027becb4e2367572c46219
 DIST dask-2023.3.0.gh.tar.gz 8514069 BLAKE2B 427b975010e08d23bb55606da726c64a08bf17144d50f0b4641469f30620359052434a9108510c08a7d646fd567cbeafb99afe9162a0becc3417fceecf4604d3 SHA512 1834c98edb1fd92fd022d472ec9d05497e7845d712d0e2faae27b6a408faff3678908d3109db5ae50642348a4fa6832af995f2fb67782c7a71933126699577da
+DIST dask-2023.3.1.gh.tar.gz 8520302 BLAKE2B 5b70e355ca02163d42615d504207e8186b2b5887d2c57c517876ffbc8a1bd4a3c56ea755d79696d952f802043134c4be4b0a69ff2eb4ea6da8faa80096bebdca SHA512 e4b8306a900453b27bc19055b5a5bfd0d0ed2dc143be854d8f056ede8b1e4bdc5e91a54c674201b1b1f27cbc0c9ba908e5a82a12f52d337c3cb23cbc2e6ef199
diff --git a/dev-python/dask/dask-2023.3.1.ebuild b/dev-python/dask/dask-2023.3.1.ebuild
new file mode 100644
index 000000000000..718d091d9013
--- /dev/null
+++ b/dev-python/dask/dask-2023.3.1.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{10..11} )
+
+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.21[${PYTHON_USEDEP}]
+	>=dev-python/pandas-1.3[${PYTHON_USEDEP}]
+	>=dev-python/packaging-20.0[${PYTHON_USEDEP}]
+	>=dev-python/partd-1.2.0[${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=(
+	# more tests relying on -Werror
+	"dask/array/tests/test_overlap.py::test_map_overlap_no_depth[None]"
+	dask/array/tests/test_random.py::test_RandomState_only_funcs
+	# 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]"
+	# require sqlalchemy<2.0
+	dask/dataframe/io/tests/test_sql.py
+)
+
+src_prepare() {
+	# fails with sqlalchemy-2.0, even though we don't use it x_x
+	sed -i -e '/RemovedIn20Warning/d' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest -p no:flaky -m "not network"
+}
diff --git a/dev-python/debugpy/Manifest b/dev-python/debugpy/Manifest
index 23c020c4fa83..b5ce88b5c535 100644
--- a/dev-python/debugpy/Manifest
+++ b/dev-python/debugpy/Manifest
@@ -1,2 +1 @@
-DIST debugpy-1.6.3.gh.tar.gz 6697583 BLAKE2B 38138be3294615e78995575c8f8ad1f990733be90cfaf76197c714e84f179086501417cc2d64627d3a8ecd0fa451e14e3229bd14d02353bc7512e288e8d4f092 SHA512 c055351351f6705b7bbab93ec07abba09027f1f2a52d90a242f51b4eb6fec19821fbb251b8c8e80587d1333faa4c6d7cab5dead938e9739c5c45013af8ee46a7
 DIST debugpy-1.6.6.gh.tar.gz 6942488 BLAKE2B 18c6eee2322239e5cbbacf9431fa7480abcf14a68f290d2228edc8b2ead042e7b09d19ee5bcc60be32e8a6b0b34b925eaa8246991298744f3ca74d4ed2ea3f3e SHA512 1a209bfd702d5f0649ce50b0910023e295953dd39cefdefb0b5af1d6023e629a727610789cd244e656bdf4276cee957fa463506ddaca603ab3ee85cc250dc212
diff --git a/dev-python/debugpy/debugpy-1.6.3.ebuild b/dev-python/debugpy/debugpy-1.6.3.ebuild
deleted file mode 100644
index 5fb29959730a..000000000000
--- a/dev-python/debugpy/debugpy-1.6.3.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-DISTUTILS_USE_PEP517=setuptools
-inherit distutils-r1
-
-DESCRIPTION="An implementation of the Debug Adapter Protocol for Python"
-HOMEPAGE="https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/"
-SRC_URI="
-	https://github.com/microsoft/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-# This is completely broken
-RESTRICT="test"
-
-RDEPEND="dev-python/pydevd[${PYTHON_USEDEP}]"
-BDEPEND="test? ( dev-python/pytest-timeout[${PYTHON_USEDEP}] )"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.6.1-unbundle-pydevd.patch"
-)
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# Drop unnecessary and unrecognized option
-	# __main__.py: error: unrecognized arguments: -n8
-	# Do not timeout
-	sed -e '/addopts/d' -e '/timeout/d' -i pytest.ini || die
-
-	# Unbundle dev-python/pydevd
-	rm -r src/debugpy/_vendored tests/tests/test_vendoring.py || die
-
-	distutils-r1_python_prepare_all
-}
diff --git a/dev-python/debugpy/debugpy-1.6.6.ebuild b/dev-python/debugpy/debugpy-1.6.6.ebuild
index 9e8bf2094221..820faca57896 100644
--- a/dev-python/debugpy/debugpy-1.6.6.ebuild
+++ b/dev-python/debugpy/debugpy-1.6.6.ebuild
@@ -16,7 +16,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # This is completely broken
 RESTRICT="test"
diff --git a/dev-python/debugpy/files/debugpy-1.6.1-unbundle-pydevd.patch b/dev-python/debugpy/files/debugpy-1.6.1-unbundle-pydevd.patch
deleted file mode 100644
index c8ebe384349d..000000000000
--- a/dev-python/debugpy/files/debugpy-1.6.1-unbundle-pydevd.patch
+++ /dev/null
@@ -1,94 +0,0 @@
---- a/pyproject.toml
-+++ b/pyproject.toml
-@@ -8,7 +8,6 @@ exclude = '''
- ( __pycache__
- | ^/.tox
- | ^/versioneer.py
--| ^/src/debugpy/_vendored
- | ^/src/debugpy/_version.py
- )
- '''
---- a/setup.py
-+++ b/setup.py
-@@ -18,12 +18,10 @@ del sys.path[0]
- 
- sys.path.insert(0, os.path.join(os.path.dirname(os.path.abspath(__file__)), "src"))
- import debugpy
--import debugpy._vendored
- 
- del sys.path[0]
- 
- 
--PYDEVD_ROOT = debugpy._vendored.project_root("pydevd")
- DEBUGBY_ROOT = os.path.dirname(os.path.abspath(debugpy.__file__))
- 
- 
-@@ -33,27 +31,6 @@ def get_buildplatform():
-     return None
- 
- 
--def cython_build():
--    print("Compiling extension modules (set SKIP_CYTHON_BUILD=1 to omit)")
--    subprocess.call(
--        [
--            sys.executable,
--            os.path.join(PYDEVD_ROOT, "setup_pydevd_cython.py"),
--            "build_ext",
--            "-i",
--        ]
--    )
--
--
--def iter_vendored_files():
--    # Add pydevd files as data files for this package. They are not
--    # treated as a package of their own, because we don't actually
--    # want to provide pydevd - just use our own copy internally.
--    for project in debugpy._vendored.list_all():
--        for filename in debugpy._vendored.iter_packaging_files(project):
--            yield filename
--
--
- # bdist_wheel determines whether the package is pure or not based on ext_modules.
- # However, all pydevd native modules are prebuilt and packaged as data, so they
- # should not be in the list.
-@@ -133,8 +110,6 @@ with open("DESCRIPTION.md", "r") as fh:
- 
- 
- if __name__ == "__main__":
--    if not os.getenv("SKIP_CYTHON_BUILD"):
--        cython_build()
- 
-     extras = {}
-     platforms = get_buildplatform()
-@@ -179,11 +154,9 @@ if __name__ == "__main__":
-             "debugpy.common",
-             "debugpy.launcher",
-             "debugpy.server",
--            "debugpy._vendored",
-         ],
-         package_data={
-             "debugpy": ["ThirdPartyNotices.txt"],
--            "debugpy._vendored": list(iter_vendored_files()),
-         },
-         ext_modules=ExtModules(),
-         has_ext_modules=lambda: True,
---- a/src/debugpy/server/__init__.py
-+++ b/src/debugpy/server/__init__.py
-@@ -1,7 +1,3 @@
- # Copyright (c) Microsoft Corporation. All rights reserved.
- # Licensed under the MIT License. See LICENSE in the project root
- # for license information.
--
--# "force_pydevd" must be imported first to ensure (via side effects)
--# that the debugpy-vendored copy of pydevd gets used.
--import debugpy._vendored.force_pydevd  # noqa
---- a/src/debugpy/server/attach_pid_injected.py
-+++ b/src/debugpy/server/attach_pid_injected.py
-@@ -31,7 +31,6 @@ def attach(setup):
-                 pydevd_attach_to_process_path = os.path.join(
-                     _debugpy_dir,
-                     "debugpy",
--                    "_vendored",
-                     "pydevd",
-                     "pydevd_attach_to_process",
-                 )
diff --git a/dev-python/dkimpy/Manifest b/dev-python/dkimpy/Manifest
index 0f47d5f40e67..65475cc937a3 100644
--- a/dev-python/dkimpy/Manifest
+++ b/dev-python/dkimpy/Manifest
@@ -1,2 +1,3 @@
 DIST dkimpy-1.0.5.tar.gz 59799 BLAKE2B 317e7a9e7ad1efdbbc7f4f1ce7efca70f3be4272ead3761d8bbde14d19e9f3a90af96d7bff5fba5b612cecaa166b58da4617e39a13276d0982ea38809f808b4d SHA512 af72a56a777b23318af8f8014bad03cadb93cc39f0b8c2062e15f3e5ca77a13be6f49664c9745f1fe97c592be5a63c4b0a3942da2c2c6eaa486137fdbb96528f
 DIST dkimpy-1.1.0.tar.gz 66326 BLAKE2B 3af2ab63351c117b7fa0fd2c7a2f2a98b2177511af61734d171fb69e25c5a3d629d95f8ba2832b66f57607ff447a4093ab8ebd58c931975e9ca0c1bab9469590 SHA512 d8c656d1adabbf8ef2121a36a848818ee9ce5ac9fe42c4b16ef50588870478989159f4ff3aa422ba0556a82763a9e78fde5e19195fe0b95176f2f4ff1d60c70e
+DIST dkimpy-1.1.1.tar.gz 66368 BLAKE2B 6b9107129a0857a384d90b9c7d3970177aa32edaaeb41d62dd4edc6fdf7e8c16e3160162aaed074f865d476dc3f7f20ad299f7034858c0fc59ef88c651552ae4 SHA512 46db739f48f5b3aa1605f12822bef61286767b8770685d5056fcebf8475f9cbc78265c792a0371226ffaa97a55703acc6f6ae63c44944cf29a392c8bf51d49b9
diff --git a/dev-python/dkimpy/dkimpy-1.1.1.ebuild b/dev-python/dkimpy/dkimpy-1.1.1.ebuild
new file mode 100644
index 000000000000..d79133359238
--- /dev/null
+++ b/dev-python/dkimpy/dkimpy-1.1.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 optfeature pypi
+
+DESCRIPTION="DKIM and ARC email signing and verification library"
+HOMEPAGE="
+	https://launchpad.net/dkimpy/
+	https://pypi.org/project/dkimpy/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~x86"
+
+RDEPEND="
+	dev-python/dnspython[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/authres[${PYTHON_USEDEP}]
+		dev-python/pynacl[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+pkg_postinst() {
+	optfeature "ARC support" dev-python/authres
+	optfeature "ed25519 capability" dev-python/pynacl
+	optfeature "asyncio support" dev-python/aiodns
+}
diff --git a/dev-python/flask-babel/Manifest b/dev-python/flask-babel/Manifest
index 1b3ddf0891c4..7777d086db48 100644
--- a/dev-python/flask-babel/Manifest
+++ b/dev-python/flask-babel/Manifest
@@ -1,2 +1 @@
-DIST Flask-Babel-2.0.0.tar.gz 19588 BLAKE2B dbd5d6f3af38fad15a4eb6d674222473d673a9002ced21ce09a913e0bce3285b1eac9a5a85ce53c1dcebf648444164f33a5c790039a7d01184d45c7734dac05f SHA512 2ad8f80b450db0cab7dd57f46158e7e653556d60869acdb3c2469d42dceca3fa97237cc960986655091c84a1a67a057d72ed510787ccb065d171e6f35764cb1d
 DIST flask-babel-3.0.1.gh.tar.gz 20367 BLAKE2B 760b3ff9b867ad14f138b75e3e13c9d40a9dd4fab1dcef57c062677d6e52b31340403125f13427b6f57487609794176055f888a277eacc2323281f6899f115d9 SHA512 d189aac67f5671c3053efa1c8049fc364c031a77568db7a502d63e2ea09867c981c12669752f1524faecaddd4594ab064249f08b8af50dfde7267322b50ed2af
diff --git a/dev-python/flask-babel/flask-babel-2.0.0-r1.ebuild b/dev-python/flask-babel/flask-babel-2.0.0-r1.ebuild
deleted file mode 100644
index 60001a4632a0..000000000000
--- a/dev-python/flask-babel/flask-babel-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="Flask-Babel"
-MY_P="${MY_PN}-${PV}"
-DESCRIPTION="i18n and l10n support for Flask based on Babel and pytz"
-HOMEPAGE="
-	https://python-babel.github.io/flask-babel/
-	https://github.com/python-babel/flask-babel/
-	https://pypi.org/project/Flask-Babel/
-"
-SRC_URI="mirror://pypi/${MY_PN::1}/${MY_PN}/${MY_P}.tar.gz"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86"
-
-RDEPEND="
-	dev-python/Babel[${PYTHON_USEDEP}]
-	dev-python/flask[${PYTHON_USEDEP}]
-	>=dev-python/jinja-2.5[${PYTHON_USEDEP}]
-	dev-python/pytz[${PYTHON_USEDEP}]
-	dev-python/werkzeug[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/pallets-sphinx-themes
-distutils_enable_tests pytest
diff --git a/dev-python/flask-babel/flask-babel-3.0.1-r1.ebuild b/dev-python/flask-babel/flask-babel-3.0.1-r1.ebuild
index 1bb47c4387f4..b441f4c29002 100644
--- a/dev-python/flask-babel/flask-babel-3.0.1-r1.ebuild
+++ b/dev-python/flask-babel/flask-babel-3.0.1-r1.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86"
 
 RDEPEND="
 	<dev-python/Babel-3[${PYTHON_USEDEP}]
diff --git a/dev-python/fuse-python/Manifest b/dev-python/fuse-python/Manifest
index 4fb18c23d059..dea8d245b362 100644
--- a/dev-python/fuse-python/Manifest
+++ b/dev-python/fuse-python/Manifest
@@ -1 +1 @@
-DIST python-fuse-1.0.5.tar.gz 46592 BLAKE2B 9d33cf508a57b1a08f6c257ecee89386826f5f6c9be223f33c36789930baccaacab112305e264aa5c412f30bfff0562c6701b8ec1f9632d9d2e5ff8ea6013073 SHA512 e0d0cc0f3dee9416eefe430119e8f2f5a9bbc88a214d36d1d23c7e1f7ce78cc977a173f6d22c05cb928715d5c657ba29738f60453323b25299dddc08d57595d2
+DIST python-fuse-1.0.5.gh.tar.gz 46592 BLAKE2B 9d33cf508a57b1a08f6c257ecee89386826f5f6c9be223f33c36789930baccaacab112305e264aa5c412f30bfff0562c6701b8ec1f9632d9d2e5ff8ea6013073 SHA512 e0d0cc0f3dee9416eefe430119e8f2f5a9bbc88a214d36d1d23c7e1f7ce78cc977a173f6d22c05cb928715d5c657ba29738f60453323b25299dddc08d57595d2
diff --git a/dev-python/fuse-python/fuse-python-1.0.5.ebuild b/dev-python/fuse-python/fuse-python-1.0.5.ebuild
index fe3933ae0e30..4719252a2417 100644
--- a/dev-python/fuse-python/fuse-python-1.0.5.ebuild
+++ b/dev-python/fuse-python/fuse-python-1.0.5.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Python FUSE bindings"
 HOMEPAGE="https://github.com/libfuse/python-fuse"
 SRC_URI="
 	https://github.com/libfuse/python-fuse/archive/v${PV}.tar.gz
-		-> ${MY_P}.tar.gz
+		-> ${MY_P}.gh.tar.gz
 "
 S="${WORKDIR}/${MY_P}"
 
diff --git a/dev-python/ipykernel/ipykernel-6.21.3.ebuild b/dev-python/ipykernel/ipykernel-6.21.3.ebuild
index cc7b66cada60..73932e988d6c 100644
--- a/dev-python/ipykernel/ipykernel-6.21.3.ebuild
+++ b/dev-python/ipykernel/ipykernel-6.21.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/comm-0.1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/isort/Manifest b/dev-python/isort/Manifest
index 6f431d1236dc..5f6b11e3a97e 100644
--- a/dev-python/isort/Manifest
+++ b/dev-python/isort/Manifest
@@ -1,2 +1 @@
-DIST isort-5.11.4.gh.tar.gz 733368 BLAKE2B 82a9738cf48fd662c6128c7f58766e6b204d93fee73cbdd0d84850a62a1a714322dc6c31429a3b043401a963178c4aa3120e98c8f590f24799b75a92f9427798 SHA512 fd7dd8938cc700fa4a295bf1aabb9dc479e1b837e443e3210e4f2234316e207293eeb6f666b49ed2bc4f92942b3185de64439ce86ece201093072fee905766a8
 DIST isort-5.12.0.gh.tar.gz 743141 BLAKE2B a7f8deef02b57162eebe15b35e71382c654372a80dedba7eee63d0c9b0899c053fb517401585af17014db3cf9ed44089f6cbd1e2b0ed17393cc667de06bfbddd SHA512 ceb861d1a077be6fecd82fde775bded1fb676c77135e2004c92a6221762e0b3ff6c1071d17957e1add4062ec26ba6c9264e4905724f2c659339cbd0601f4b45e
diff --git a/dev-python/isort/isort-5.11.4.ebuild b/dev-python/isort/isort-5.11.4.ebuild
deleted file mode 100644
index ab52142e6ae0..000000000000
--- a/dev-python/isort/isort-5.11.4.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A python utility/library to sort imports"
-HOMEPAGE="
-	https://github.com/PyCQA/isort/
-	https://pypi.org/project/isort/
-"
-SRC_URI="
-	https://github.com/PyCQA/isort/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/tomli[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/black[${PYTHON_USEDEP}]
-		dev-python/colorama[${PYTHON_USEDEP}]
-		dev-python/hypothesis[${PYTHON_USEDEP}]
-		dev-python/natsort[${PYTHON_USEDEP}]
-		dev-python/pylama[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-vcs/git
-	)
-"
-
-distutils_enable_tests pytest
-
-src_prepare() {
-	# unbundle tomli
-	sed -i -e 's:from ._vendored ::' isort/settings.py || die
-	rm -r isort/_vendored || die
-	# leftover toml import used to determine .toml support
-	sed -i -e 's:import toml:toml = True:' tests/unit/test_isort.py || die
-	# syntax error that triggers with new poetry-core
-	sed -i -e 's:pip-shims<=0.3.4:pip-shims:' pyproject.toml || die
-
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	cp -a "${BUILD_DIR}"/{install,test} || die
-	local -x PATH=${BUILD_DIR}/test/usr/bin:${PATH}
-
-	# Install necessary plugins
-	local p
-	for p in example*/; do
-		pushd "${p}" >/dev/null || die
-		distutils_pep517_install "${BUILD_DIR}"/test
-		popd >/dev/null || die
-	done
-
-	local EPYTEST_IGNORE=(
-		# Excluded from upstream's test script
-		tests/unit/test_deprecated_finders.py
-	)
-	epytest tests/unit
-}
diff --git a/dev-python/isort/isort-5.12.0.ebuild b/dev-python/isort/isort-5.12.0.ebuild
index 3685e174a82d..398f1baf6781 100644
--- a/dev-python/isort/isort-5.12.0.ebuild
+++ b/dev-python/isort/isort-5.12.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/tomli[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild b/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
index dfb08c3b19e4..3e4079be1230 100644
--- a/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
+++ b/dev-python/jupyter_client/jupyter_client-8.0.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 
 RDEPEND="
 	>=dev-python/jupyter_core-5.1[${PYTHON_USEDEP}]
diff --git a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
index b2436118b32a..6838ac8c7560 100644
--- a/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
+++ b/dev-python/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.ebuild
@@ -18,7 +18,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	>=dev-python/jupyter_server-1.1[${PYTHON_USEDEP}]
diff --git a/dev-python/kafka-python/files/kafka-python-2.0.2-py311-test-fixes.patch b/dev-python/kafka-python/files/kafka-python-2.0.2-py311-test-fixes.patch
new file mode 100644
index 000000000000..8b983952fd47
--- /dev/null
+++ b/dev-python/kafka-python/files/kafka-python-2.0.2-py311-test-fixes.patch
@@ -0,0 +1,26 @@
+Fix tests for Py3.11
+
+Upstream-PR: https://github.com/dpkp/kafka-python/pull/2358
+
+diff --git a/test/test_assignors.py b/test/test_assignors.py
+index 67e91e131..a1214d8fa 100644
+--- a/test/test_assignors.py
++++ b/test/test_assignors.py
+@@ -661,7 +661,7 @@ def test_reassignment_with_random_subscriptions_and_changes(mocker, execution_nu
+ 
+     subscriptions = defaultdict(set)
+     for i in range(n_consumers):
+-        topics_sample = sample(all_topics, randint(1, len(all_topics) - 1))
++        topics_sample = sample(sorted(all_topics), randint(1, len(all_topics) - 1))
+         subscriptions['C{}'.format(i)].update(topics_sample)
+ 
+     member_metadata = make_member_metadata(subscriptions)
+@@ -671,7 +671,7 @@ def test_reassignment_with_random_subscriptions_and_changes(mocker, execution_nu
+ 
+     subscriptions = defaultdict(set)
+     for i in range(n_consumers):
+-        topics_sample = sample(all_topics, randint(1, len(all_topics) - 1))
++        topics_sample = sample(sorted(all_topics), randint(1, len(all_topics) - 1))
+         subscriptions['C{}'.format(i)].update(topics_sample)
+ 
+     member_metadata = {}
diff --git a/dev-python/kafka-python/kafka-python-2.0.2-r1.ebuild b/dev-python/kafka-python/kafka-python-2.0.2-r1.ebuild
index e16942c29f4c..20087f220b73 100644
--- a/dev-python/kafka-python/kafka-python-2.0.2-r1.ebuild
+++ b/dev-python/kafka-python/kafka-python-2.0.2-r1.ebuild
@@ -35,6 +35,10 @@ BDEPEND="
 	)
 "
 
+PATCHES=(
+	"${FILESDIR}/${P}-py311-test-fixes.patch"
+)
+
 distutils_enable_tests pytest
 
 EPYTEST_DESELECT=(
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 1edea9832f73..b055e2dfd698 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -5,4 +5,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/dev-python/lit/lit-17.0.0_pre20230225.ebuild b/dev-python/lit/lit-17.0.0_pre20230225.ebuild
deleted file mode 100644
index 0e39fac626c6..000000000000
--- a/dev-python/lit/lit-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,42 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 llvm.org
-
-DESCRIPTION="A stand-alone install of the LLVM suite testing tool"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-# Tests require 'FileCheck' and 'not' utilities (from llvm)
-BDEPEND="
-	test? (
-		dev-python/psutil[${PYTHON_USEDEP}]
-		sys-devel/llvm
-	)
-"
-
-LLVM_COMPONENTS=( llvm/utils/lit )
-llvm.org_set_globals
-
-# TODO: move the manpage generation here (from sys-devel/llvm)
-
-src_prepare() {
-	cd "${WORKDIR}" || die
-	distutils-r1_src_prepare
-}
-
-python_test() {
-	local -x LIT_PRESERVES_TMP=1
-	local litflags=$(get_lit_flags)
-	./lit.py ${litflags//;/ } tests || die
-}
diff --git a/dev-python/mistune/Manifest b/dev-python/mistune/Manifest
index 2e6b684c9396..e12260e28af5 100644
--- a/dev-python/mistune/Manifest
+++ b/dev-python/mistune/Manifest
@@ -1,2 +1 @@
-DIST mistune-2.0.4.tar.gz 75977 BLAKE2B f5c29a211695897240664ff9ce7891ce81fec11f6a2e3865cf07e796ddf8e5664a4055f887318e53b315ac3bbdc90a3d0976ed1fe5b74b2f7812dffa29a57bda SHA512 4d000c5791c29069b5f252f2aa5d361eb9cdf717d33f8d66dee8b4aa3bfe1242a572af63ca3dfd57324fac457fb9b5a9dff18e7da15f9036becd14cb27882dba
 DIST mistune-2.0.5.tar.gz 75854 BLAKE2B 3a69d585a5c311a81fd5259574233f514c745fa675b675810c48392cf8f52608d097ae2712a5272f94146b0fcef6f4f77b86fc78115ddeff1d1e7e08a589a7f2 SHA512 109447977a441ebbedfca2abbe62415139d94c48ae56c3d8cae04df3f93ccd1e8333b3dbb8bf61a2096b903df6c3aab2fadd0893fb82815416f17555465e98c7
diff --git a/dev-python/mistune/mistune-2.0.4.ebuild b/dev-python/mistune/mistune-2.0.4.ebuild
deleted file mode 100644
index ca2666844912..000000000000
--- a/dev-python/mistune/mistune-2.0.4.ebuild
+++ /dev/null
@@ -1,22 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The fastest markdown parser in pure Python"
-HOMEPAGE="
-	https://github.com/lepture/mistune/
-	https://pypi.org/project/mistune/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-distutils_enable_tests pytest
diff --git a/dev-python/mistune/mistune-2.0.5.ebuild b/dev-python/mistune/mistune-2.0.5.ebuild
index a2d62ac543a5..dcdd6595f5ce 100644
--- a/dev-python/mistune/mistune-2.0.5.ebuild
+++ b/dev-python/mistune/mistune-2.0.5.ebuild
@@ -16,6 +16,6 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos"
 
 distutils_enable_tests pytest
diff --git a/dev-python/mpmath/Manifest b/dev-python/mpmath/Manifest
index f77e408f7301..c856f8ba229c 100644
--- a/dev-python/mpmath/Manifest
+++ b/dev-python/mpmath/Manifest
@@ -1,2 +1 @@
-DIST mpmath-1.2.1.tar.gz 2135690 BLAKE2B a21e0ef04a025f23e32dad5839db411708266c6cf3408e97ec5c995f197b14f446c1d328bd2e9f50e1c48a2e08239ef7908fcc3aab8659118fc1e0e78106a47e SHA512 2dd908bca26162adcdce0493146d009e04d3d96db965ff2207c332504020fa6f5a5e2af97d38e8fb3e7442a26c1e93a756a8d93b378da720ab7c07753f700d10
-DIST mpmath-1.3.0.tar.gz 2136844 BLAKE2B 42b121896e1bcffe459ac5591a4e0ec41fdd708d5518b1a76bf4cc434f34e5801d77207ea9769d11b6746340aa32a84b58e089c81b5163b48a80ccc6ecd0a345 SHA512 ec703e661323035e3c973fc2e52206e793f6182ed9897e5a483cb35a22421d7869df850cdd89fc1ef4e1bb28b17b4914447116dbeed136a687e582cce0bf9e42
+DIST mpmath-1.3.0.tar.gz 508106 BLAKE2B 9d4eebbbb6788dd3ee45c8c30068ef3512043dd09ab626cbaf69b0f6bdf057a6e8c53c34e3dda7627db923f0d536a0bebf83916d8942f4dde9546bb8e0046f33 SHA512 a68028150095d743eae9669a0f70cbe6b7bcb4d27dfad6b1a96575f0885ec7306459a2a464117bab18779883ee8b4293502b4bd0ebd8672767e1d08d38f8b202
diff --git a/dev-python/mpmath/mpmath-1.2.1.ebuild b/dev-python/mpmath/mpmath-1.2.1.ebuild
deleted file mode 100644
index 845827859c59..000000000000
--- a/dev-python/mpmath/mpmath-1.2.1.ebuild
+++ /dev/null
@@ -1,38 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 virtualx
-
-DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
-HOMEPAGE="https://mpmath.org/"
-SRC_URI="https://github.com/fredrik-johansson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="gmp matplotlib"
-
-RDEPEND="
-	gmp? ( dev-python/gmpy[${PYTHON_USEDEP}] )
-	matplotlib? ( dev-python/matplotlib[${PYTHON_USEDEP}] )"
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]"
-
-distutils_enable_tests pytest
-
-src_configure() {
-	export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-	distutils-r1_src_configure
-}
-
-src_test() {
-	virtx distutils-r1_src_test
-}
-
-python_test() {
-	"${EPYTHON}" mpmath/tests/runtests.py -local || die "Tests failed with ${EPYTHON}"
-}
diff --git a/dev-python/mpmath/mpmath-1.3.0.ebuild b/dev-python/mpmath/mpmath-1.3.0.ebuild
index 078316da3079..768555b7f58b 100644
--- a/dev-python/mpmath/mpmath-1.3.0.ebuild
+++ b/dev-python/mpmath/mpmath-1.3.0.ebuild
@@ -5,15 +5,19 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1 virtualx
+
+inherit distutils-r1 pypi virtualx
 
 DESCRIPTION="Python library for arbitrary-precision floating-point arithmetic"
-HOMEPAGE="https://mpmath.org/"
-SRC_URI="https://github.com/fredrik-johansson/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+HOMEPAGE="
+	https://mpmath.org/
+	https://github.com/mpmath/mpmath/
+	https://pypi.org/project/mpmath/
+"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="gmp matplotlib"
 
 RDEPEND="
diff --git a/dev-python/mypy_extensions/mypy_extensions-1.0.0.ebuild b/dev-python/mypy_extensions/mypy_extensions-1.0.0.ebuild
index 611b278065cd..454a0cb30672 100644
--- a/dev-python/mypy_extensions/mypy_extensions-1.0.0.ebuild
+++ b/dev-python/mypy_extensions/mypy_extensions-1.0.0.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos"
 
 distutils_enable_tests pytest
 
diff --git a/dev-python/nbclassic/nbclassic-0.5.3.ebuild b/dev-python/nbclassic/nbclassic-0.5.3.ebuild
index e53c6f92d5c8..fdfbfd5c193c 100644
--- a/dev-python/nbclassic/nbclassic-0.5.3.ebuild
+++ b/dev-python/nbclassic/nbclassic-0.5.3.ebuild
@@ -17,7 +17,7 @@ HOMEPAGE="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-python/argon2-cffi[${PYTHON_USEDEP}]
diff --git a/dev-python/nbdime/Manifest b/dev-python/nbdime/Manifest
index f4b1a4c95ec7..4ca1db8df417 100644
--- a/dev-python/nbdime/Manifest
+++ b/dev-python/nbdime/Manifest
@@ -1 +1,3 @@
+DIST nbdime-3.1.1-jupyter_server2.patch 9483 BLAKE2B 767f7c848a5d840c1ac26d42f4074888163fd0bf63b774e9f79c5b7738f7f43453e35c93bdbad9cb10bb52315d67e1de6207b3463bbb885a6d095ada2bfae7ef SHA512 306764a2dd8770ee5041f5ebe076c3de5da9444166de3b77c7a6c37ef1a13c57f1adecf11e99a6f812930b133ae4ec7229de61f8a789804de77abd518f2e08b4
+DIST nbdime-3.1.1-py3.11.patch 873 BLAKE2B cc7e7a2cb7a95eb4280d1ee64b4563691c099e0c9d0613283dcbdf6cdebabc78f5c8f181006fb7176df43950ec86be880620e0381dffcf5614f8c05b78f7c4dd SHA512 e26054c7ed2c8201e3e6b6d4e18c80f3b5a3a9a21d201f2ba1f68cc2dcd0e6c4bc2d82c57cd07400f0ee6ce8a52e9a5c8e77000cd7912d3ca6b2ea53b80909fe
 DIST nbdime-3.1.1.tar.gz 7723671 BLAKE2B 2a8f0e7281e1830d6ab15bcc25c1be69e37b575e4ecde1f61f5d697be8cf556c7e3bfdf11375f47808aa812bebbbaf4bfacaa121c17fefb9cc8a80ba9ca08d1c SHA512 268c2c3f8c45dd4a55a632d55a817ee4a4283c5411b73915bb514a9b546ebcdebd7481e93a1e7ba66c30bcdc70932ba7af83de454d3d0ab9d2cfa24bc19c8d9f
diff --git a/dev-python/nbdime/nbdime-3.1.1-r2.ebuild b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
new file mode 100644
index 000000000000..13aa9d39055e
--- /dev/null
+++ b/dev-python/nbdime/nbdime-3.1.1-r2.ebuild
@@ -0,0 +1,101 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi edos2unix
+
+DESCRIPTION="Diff and merge of Jupyter Notebooks"
+HOMEPAGE="
+	https://jupyter.org/
+	https://github.com/jupyter/nbdime/
+	https://pypi.org/project/nbdime/
+"
+SRC_URI+="
+	https://github.com/jupyter/nbdime/commit/0e1cdaa77f57aa7f609d5ef7da26a52814c7ff74.patch
+		-> ${P}-jupyter_server2.patch
+	https://github.com/jupyter/nbdime/commit/f67a809262b45ed0eaedc840b0e5d979eaa6965d.patch
+		-> ${P}-py3.11.patch
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~riscv"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/GitPython[${PYTHON_USEDEP}]
+	dev-python/jinja[${PYTHON_USEDEP}]
+	dev-python/jupyter_server[${PYTHON_USEDEP}]
+	dev-python/jupyter_server_mathjax[${PYTHON_USEDEP}]
+	dev-python/nbformat[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/tornado[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/notebook[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+		dev-python/tabulate[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	dev-python/recommonmark \
+	dev-python/sphinx-rtd-theme
+distutils_enable_tests pytest
+
+PATCHES=(
+	"${DISTDIR}"/${P}-jupyter_server2.patch
+	"${DISTDIR}"/${P}-py3.11.patch
+)
+
+EPYTEST_DESELECT=(
+	nbdime/tests/test_decision_tools.py::test_build_diffs_unsorted
+	nbdime/tests/test_diff_json_conversion.py::test_diff_to_json_patch
+	nbdime/tests/test_merge_notebooks.py::test_merge_conflicts_get_diff_indices_shifted
+	nbdime/tests/test_merge_notebooks.py::test_merge_inserts_within_deleted_range
+	nbdime/tests/test_merge_notebooks.py::test_merge_interleave_cell_add_remove
+	nbdime/tests/test_merge_notebooks.py::test_merge_multiline_cell_source_conflict
+	nbdime/tests/test_merge.py::test_deep_merge_lists_delete_no_conflict__currently_expected_failures
+	nbdime/tests/test_server_extension.py::test_diff_api_checkpoint
+	nbdime/tests/test_web.py::test_api_diff
+	nbdime/tests/test_web.py::test_api_merge
+	nbdime/tests/test_web.py::test_fetch_diff
+	nbdime/tests/test_web.py::test_fetch_merge
+	nbdime/tests/test_web.py::test_offline_mathjax
+)
+
+src_prepare() {
+	edos2unix \
+		setupbase.py \
+		nbdime/tests/conftest.py \
+		nbdime/tests/test_cli_apps.py \
+		nbdime/tests/test_web.py \
+		nbdime/webapp/nbdimeserver.py
+
+	distutils-r1_src_prepare
+}
+
+python_configure_all() {
+	DISTUTILS_ARGS=( --skip-npm )
+}
+
+src_test() {
+	# user.email and user.name are not configured in the sandbox
+	git config --global user.email "larry@gentoo.org" || die
+	git config --global user.name "Larry the Cow" || die
+
+	distutils-r1_src_test
+}
+
+src_install() {
+	distutils-r1_src_install
+	mv "${ED}"{/usr,}/etc || die
+}
diff --git a/dev-python/nbsphinx/nbsphinx-0.8.12.ebuild b/dev-python/nbsphinx/nbsphinx-0.8.12.ebuild
index 308cdcb5ca87..c631ad72cfdd 100644
--- a/dev-python/nbsphinx/nbsphinx-0.8.12.ebuild
+++ b/dev-python/nbsphinx/nbsphinx-0.8.12.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="amd64 ~arm64 x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-python/docutils[${PYTHON_USEDEP}]
diff --git a/dev-python/nbval/nbval-0.10.0-r1.ebuild b/dev-python/nbval/nbval-0.10.0-r1.ebuild
index 7ecdf8e0bd47..b9a24cf11a75 100644
--- a/dev-python/nbval/nbval-0.10.0-r1.ebuild
+++ b/dev-python/nbval/nbval-0.10.0-r1.ebuild
@@ -13,7 +13,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	dev-python/coverage[${PYTHON_USEDEP}]
diff --git a/dev-python/nbxmpp/Manifest b/dev-python/nbxmpp/Manifest
index 1ed0873e3fd5..86fff1b44467 100644
--- a/dev-python/nbxmpp/Manifest
+++ b/dev-python/nbxmpp/Manifest
@@ -1,3 +1,2 @@
 DIST python-nbxmpp-3.2.5.tar.bz2 132029 BLAKE2B 846f3b47c3a9a95cf1fa1b557a007fd4901fb4acaa3160ea4b9b1cdff1e9d2c3e64bc5251b739d816f3f1c449c350d1ac44c14cbef87d14fe5a6450418451007 SHA512 577f8c7b0f5a7c69b4d980bff93f0a208ab0a660d731eb95ec63b76583194b94bd9d9f6b10fcac3951a6e6afb5d0c4da2140cbc17ef653f19ec6957b5d2e5f04
-DIST python-nbxmpp-4.1.0.tar.bz2 132973 BLAKE2B b28b7e24debecd5088234d8eb862aebdbd461511c02f0bf8b45429c3b1964706046fdc773d654b4dce7a6ec62cc1f58e5caf9f9ef2cc0c58603129232e658325 SHA512 fd977ba9e4795abec8e1367462e7ae8c38671deea1e40849e84350bdab8281595f839848a8dff6fa730f65c5b60d82826b4d660ca2f14519ce2db0bd5f092782
 DIST python-nbxmpp-4.2.0.tar.bz2 133803 BLAKE2B db63b5ca085a90913ba6cac07c214e2528bf629bab24f7256ee751fb3ae4ddf417a9d09c509a259d468fff81feaf890b639bb9145b02c957fe777101bfbe7afb SHA512 8927b867ece2be1a2610cc5221615f026bd84b242a2d257740079f86aaa61c7f6208e90c8051f570d5539189476c68a316f840240ae0a6372311f353182b2940
diff --git a/dev-python/nbxmpp/nbxmpp-4.1.0.ebuild b/dev-python/nbxmpp/nbxmpp-4.1.0.ebuild
deleted file mode 100644
index 68b1414870d9..000000000000
--- a/dev-python/nbxmpp/nbxmpp-4.1.0.ebuild
+++ /dev/null
@@ -1,35 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{10..11} )
-
-inherit distutils-r1
-
-MY_P=python-nbxmpp-${PV}
-DESCRIPTION="Python library to use Jabber/XMPP networks in a non-blocking way"
-HOMEPAGE="
-	https://dev.gajim.org/gajim/python-nbxmpp/
-	https://pypi.org/project/nbxmpp/
-"
-SRC_URI="
-	https://dev.gajim.org/gajim/python-nbxmpp/-/archive/${PV}/${MY_P}.tar.bz2
-"
-S=${WORKDIR}/${MY_P}
-
-SLOT="0"
-LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-RDEPEND="
-	dev-libs/gobject-introspection
-	net-libs/libsoup:3.0[introspection]
-	dev-python/idna[${PYTHON_USEDEP}]
-	dev-python/packaging[${PYTHON_USEDEP}]
-	>=dev-python/precis-i18n-1.0.0[${PYTHON_USEDEP}]
-	dev-python/pygobject[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests unittest
diff --git a/dev-python/nbxmpp/nbxmpp-4.2.0.ebuild b/dev-python/nbxmpp/nbxmpp-4.2.0.ebuild
index 570d6eeeb400..24eb0a76f3a8 100644
--- a/dev-python/nbxmpp/nbxmpp-4.2.0.ebuild
+++ b/dev-python/nbxmpp/nbxmpp-4.2.0.ebuild
@@ -21,7 +21,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="GPL-3"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 RDEPEND="
 	dev-libs/gobject-introspection
diff --git a/dev-python/notebook/notebook-6.5.3.ebuild b/dev-python/notebook/notebook-6.5.3.ebuild
index ccd6af26051c..804829fe6ac2 100644
--- a/dev-python/notebook/notebook-6.5.3.ebuild
+++ b/dev-python/notebook/notebook-6.5.3.ebuild
@@ -14,7 +14,7 @@ HOMEPAGE="https://jupyter.org"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="~amd64 ~riscv"
 
 RDEPEND="
 	>=dev-libs/mathjax-2.7.4
diff --git a/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild b/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
index 9aff31c4fea0..895ce2b9db19 100644
--- a/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
+++ b/dev-python/notebook_shim/notebook_shim-0.2.2-r1.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="~amd64 ~riscv ~x86"
 
 RDEPEND="
 	<dev-python/jupyter_server-3[${PYTHON_USEDEP}]
diff --git a/dev-python/openapi-schema-validator/Manifest b/dev-python/openapi-schema-validator/Manifest
index 29435bea4cb0..994357631048 100644
--- a/dev-python/openapi-schema-validator/Manifest
+++ b/dev-python/openapi-schema-validator/Manifest
@@ -1,2 +1 @@
-DIST openapi-schema-validator-0.4.1.gh.tar.gz 17478 BLAKE2B 0c215589eb72f97205c565bf7cfc77096dd9cf2a7d05d2ea7946fcbc3c8c9acb5702635f6cfe520993139ce9713c426f01b98d34b3c962ac918989f7d87f22c9 SHA512 e437309a6e741eaefa6b49bb038bd5976288bd6559fc6957d7029d9c0fed36ee368ac5fb26133a0fe54366da77ec649b5e44eb6a7926d9d5c49573afdfa3309b
 DIST openapi-schema-validator-0.4.3.gh.tar.gz 30639 BLAKE2B 370e3cc4e6c9892912dc77114ca867752f46afd1555f91a3721f41a9c4516fdffc0416f2f1028f4717ca8cc1a1ef2ec47607b7ef2b6578a0b01afb8ddb6660c8 SHA512 a930ecafe2e4c1d4d021a71fe9b8f35c496320e5c5198e2ccb57d82e01570430c4904cae7bc44578bc95be63cf5c709c5bef1d96014c3a66fca3b4495c5e455c
diff --git a/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.1.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.1.ebuild
deleted file mode 100644
index 0759adfd5061..000000000000
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-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/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/openapi-schema-validator/openapi-schema-validator-0.4.3.ebuild b/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.3.ebuild
index b01e424ca026..4724c209e7fc 100644
--- a/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.3.ebuild
+++ b/dev-python/openapi-schema-validator/openapi-schema-validator-0.4.3.ebuild
@@ -10,17 +10,17 @@ inherit distutils-r1
 
 DESCRIPTION="OpenAPI schema validation for Python"
 HOMEPAGE="
-	https://github.com/p1c2u/openapi-schema-validator/
+	https://github.com/python-openapi/openapi-schema-validator/
 	https://pypi.org/project/openapi-schema-validator/
 "
 SRC_URI="
-	https://github.com/p1c2u/openapi-schema-validator/archive/${PV}.tar.gz
+	https://github.com/python-openapi/openapi-schema-validator/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/openapi-spec-validator/Manifest b/dev-python/openapi-spec-validator/Manifest
index 2bbee3959014..475776251cef 100644
--- a/dev-python/openapi-spec-validator/Manifest
+++ b/dev-python/openapi-spec-validator/Manifest
@@ -1,2 +1 @@
-DIST openapi-spec-validator-0.5.2.gh.tar.gz 39743 BLAKE2B 92a4c4503add68c2683f4229f7b68b7cf98d38f36f3c03835b03be5e2a1092ebbb46a9f8d09bfb9e3cf7059a2a72ff01b81742986d479c2713dc6ef783718e00 SHA512 68f7d507a239c555575e2edb3bab576fd1fede9bcebde48c57361e3e764c9c19c4dc0d63e650851c2f6e7f2dd7f4efcdcd028842e259aa9e341823cd052a6e20
 DIST openapi-spec-validator-0.5.5.gh.tar.gz 57200 BLAKE2B 037566130546d2cc894dd12e0fc0d80fe9631f94085ec286a61ea810c58b48cd7837cc044388773798a7684fa4d73bb89eed643a164280433c1cd8d6a9cd42cc SHA512 4b5415216e74937a0c6f527850921f362a3183119a641d4d369cbf3e6aa19209ec7d8ff05697eed7dcd1ee6d0e8fbcc9cb8aaa0e3eb46e4da34bc7a0a4b78c00
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.2.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.2.ebuild
deleted file mode 100644
index a5db08206ae5..000000000000
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.2.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=poetry
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator"
-HOMEPAGE="
-	https://github.com/p1c2u/openapi-spec-validator/
-	https://pypi.org/project/openapi-spec-validator/
-"
-SRC_URI="
-	https://github.com/p1c2u/openapi-spec-validator/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
-	>=dev-python/jsonschema-spec-0.1.1[${PYTHON_USEDEP}]
-	>=dev-python/lazy-object-proxy-1.7.1[${PYTHON_USEDEP}]
-	<dev-python/openapi-schema-validator-0.5[${PYTHON_USEDEP}]
-	>=dev-python/openapi-schema-validator-0.3.2[${PYTHON_USEDEP}]
-	>=dev-python/pyyaml-5.1[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_DESELECT=(
-	# Internet
-	tests/integration/test_shortcuts.py::TestPetstoreV2Example
-	tests/integration/test_shortcuts.py::TestApiV2WithExampe
-	tests/integration/test_shortcuts.py::TestPetstoreV2ExpandedExample
-	tests/integration/test_shortcuts.py::TestPetstoreExample
-	tests/integration/test_shortcuts.py::TestRemoteValidatev2SpecUrl
-	tests/integration/test_shortcuts.py::TestRemoteValidatev30SpecUrl
-	tests/integration/test_shortcuts.py::TestApiWithExample
-	tests/integration/test_shortcuts.py::TestPetstoreExpandedExample
-	tests/integration/test_validate.py::TestPetstoreExample
-	tests/integration/test_validate.py::TestApiWithExample
-	tests/integration/test_validate.py::TestPetstoreExpandedExample
-	tests/integration/validation/test_validators.py
-)
-
-src_prepare() {
-	sed -i -e '/--cov/d' pyproject.toml || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.5.ebuild b/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.5.ebuild
index be69c53a8823..3e87c7982002 100644
--- a/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.5.ebuild
+++ b/dev-python/openapi-spec-validator/openapi-spec-validator-0.5.5.ebuild
@@ -10,17 +10,17 @@ inherit distutils-r1
 
 DESCRIPTION="OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator"
 HOMEPAGE="
-	https://github.com/p1c2u/openapi-spec-validator/
+	https://github.com/python-openapi/openapi-spec-validator/
 	https://pypi.org/project/openapi-spec-validator/
 "
 SRC_URI="
-	https://github.com/p1c2u/openapi-spec-validator/archive/${PV}.tar.gz
+	https://github.com/python-openapi/openapi-spec-validator/archive/${PV}.tar.gz
 		-> ${P}.gh.tar.gz
 "
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~ppc64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/jsonschema-4.0.0[${PYTHON_USEDEP}]
diff --git a/dev-python/paramiko/Manifest b/dev-python/paramiko/Manifest
index 61fca35b2344..73aaffd638ca 100644
--- a/dev-python/paramiko/Manifest
+++ b/dev-python/paramiko/Manifest
@@ -1 +1,2 @@
 DIST paramiko-3.0.0.gh.tar.gz 350348 BLAKE2B ba7211a3f3c7d4f9c0023017d96ed51511039378b4eba1ace13fbbf6902cda40aa09f2cf7b5ce9f7aee666907d9a662e9bf7eccd5d06669685b9aa25fccfa551 SHA512 3754314fcbd64bf3db5fd6a8d55babc13e639675d09e85d796e99f25eecb55b0f987c0b47bce288c3d154a2dbdb586ecc34bbb09d67786bcc13b0a94a78e6654
+DIST paramiko-3.1.0.gh.tar.gz 351910 BLAKE2B 7350626f3a8e54d8950085cbd8253f5564355abb4db7c65113c0df22674e3df0081da7299cfad779f1fcf9569b01720b6ab5dc2bde32c4a71500e79910caf4c8 SHA512 1a556a5b7a6ebc72a0c61b59f326a95c9f2784d74fdc1a171455867ba7b4b07a15741e168747b5a3a225685ad069e2d58021f54dadf7feb00f8acf65b0c07d51
diff --git a/dev-python/paramiko/paramiko-3.1.0.ebuild b/dev-python/paramiko/paramiko-3.1.0.ebuild
new file mode 100644
index 000000000000..52becc60561f
--- /dev/null
+++ b/dev-python/paramiko/paramiko-3.1.0.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="SSH2 protocol library"
+HOMEPAGE="
+	https://www.paramiko.org/
+	https://github.com/paramiko/paramiko/
+	https://pypi.org/project/paramiko/
+"
+SRC_URI="
+	https://github.com/paramiko/paramiko/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="LGPL-2.1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris"
+IUSE="examples server"
+
+RDEPEND="
+	>=dev-python/bcrypt-3.1.3[${PYTHON_USEDEP}]
+	>=dev-python/cryptography-2.5[${PYTHON_USEDEP}]
+	>=dev-python/pynacl-1.0.1[${PYTHON_USEDEP}]
+	>=dev-python/pyasn1-0.1.7[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	local PATCHES=(
+		"${FILESDIR}/${PN}-3.0.0-nih-test-deps.patch"
+	)
+
+	if ! use server; then
+		PATCHES+=( "${FILESDIR}/${PN}-2.4.2-disable-server.patch" )
+	fi
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	distutils-r1_python_install_all
+
+	if use examples; then
+		docinto examples
+		dodoc -r demos/*
+	fi
+}
diff --git a/dev-python/pefile/Manifest b/dev-python/pefile/Manifest
index ee377dabf555..c776143f6b89 100644
--- a/dev-python/pefile/Manifest
+++ b/dev-python/pefile/Manifest
@@ -1,2 +1 @@
-DIST pefile-2022.5.30.tar.gz 72899 BLAKE2B 11752fe849c91749c5272ee9157513db0690fa47a51e274d24093f47c21096e877b364e1dba9cf08d9369abb7e9133743fe98d524079559b9aa9159ece76af74 SHA512 b584472387f7f0161449d2dc0035867da8983eb2c89b488952f38a3e836d23241d46f49a1c9cde13dde4253ef3f212971df48747ea2fec6b91c4db2b7618956d
 DIST pefile-2023.2.7.gh.tar.gz 74852 BLAKE2B ddca4b8ef37af829bb1757eb4c4ba9f46c3914e05e6c13e13a8e5a3c88a608aba486deec9338400fddae4591867c0c7dcf7325cee14d42b1bb724751a3a2a7f0 SHA512 241d9846954f094ed39e61d80e7d8c1612829ec909650175e75657f9cf69c9bef9e2a115d4106bb14757125c0ffaa3e93abfb2f078e80326e78ac5818c7c2fd3
diff --git a/dev-python/pefile/files/pefile-2022.5.30-remove-future.patch b/dev-python/pefile/files/pefile-2022.5.30-remove-future.patch
deleted file mode 100644
index 7f7cc5d29d48..000000000000
--- a/dev-python/pefile/files/pefile-2022.5.30-remove-future.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-Bug: https://bugs.gentoo.org/888279
-
-From 36bf63f1185b8407ff9b4ce8c1c8e8620d8ae30f Mon Sep 17 00:00:00 2001
-From: Letu Ren <fantasquex@gmail.com>
-Date: Sun, 26 Jun 2022 22:54:27 +0800
-Subject: [PATCH] Remove future from dependencies
-
-Fix: #348
----
- ordlookup/__init__.py | 15 ++-------------
- peutils.py            |  7 -------
- setup.py              | 19 ++++---------------
- tests/pefile_test.py  |  3 ---
- 4 files changed, 6 insertions(+), 38 deletions(-)
-
-diff --git a/ordlookup/__init__.py b/ordlookup/__init__.py
-index c69aee0..8841d74 100644
---- a/ordlookup/__init__.py
-+++ b/ordlookup/__init__.py
-@@ -1,5 +1,3 @@
--from __future__ import absolute_import
--import sys
- from . import ws2_32
- from . import oleaut32
- 
-@@ -15,18 +13,9 @@
-     b"oleaut32.dll": oleaut32.ord_names,
- }
- 
--PY3 = sys.version_info > (3,)
- 
--if PY3:
--
--    def formatOrdString(ord_val):
--        return "ord{}".format(ord_val).encode()
--
--
--else:
--
--    def formatOrdString(ord_val):
--        return b"ord%d" % ord_val
-+def formatOrdString(ord_val):
-+    return "ord{}".format(ord_val).encode()
- 
- 
- def ordLookup(libname, ord_val, make_name=False):
-diff --git a/peutils.py b/peutils.py
-index 34b98f5..4d4b2bd 100644
---- a/peutils.py
-+++ b/peutils.py
-@@ -6,13 +6,6 @@
- 
- All rights reserved.
- """
--from __future__ import division
--from future import standard_library
--
--standard_library.install_aliases()
--from builtins import range
--from builtins import object
--
- import os
- import re
- import string
-diff --git a/setup.py b/setup.py
-index c8ab89f..206db6f 100755
---- a/setup.py
-+++ b/setup.py
-@@ -5,8 +5,6 @@
- import re
- import sys
- 
--if sys.version_info.major == 3:
--    from io import open
- 
- try:
-     from setuptools import setup, Command
-@@ -25,12 +23,8 @@ def _read_doc():
-     Parse docstring from file 'pefile.py' and avoid importing
-     this module directly.
-     """
--    if sys.version_info.major == 2:
--        with open('pefile.py', 'r') as f:
--            tree = ast.parse(f.read())
--    else:
--        with open('pefile.py', 'r', encoding='utf-8') as f:
--            tree = ast.parse(f.read())
-+    with open('pefile.py', 'r', encoding='utf-8') as f:
-+        tree = ast.parse(f.read())
-     return ast.get_docstring(tree)
- 
- 
-@@ -42,12 +36,8 @@ def _read_attr(attr_name):
-     __version__, __author__, __contact__,
-     """
-     regex = attr_name + r"\s+=\s+['\"](.+)['\"]"
--    if sys.version_info.major == 2:
--        with open('pefile.py', 'r') as f:
--            match = re.search(regex, f.read())
--    else:
--        with open('pefile.py', 'r', encoding='utf-8') as f:
--            match = re.search(regex, f.read())
-+    with open('pefile.py', 'r', encoding='utf-8') as f:
-+        match = re.search(regex, f.read())
-     # Second item in the group is the value of attribute.
-     return match.group(1)
- 
-@@ -89,7 +79,6 @@ def run(self):
-     python_requires=">=3.6.0",
-     packages = ['ordlookup'],
-     install_requires=[
--          'future',
-     ],
-     license="MIT",
- )
diff --git a/dev-python/pefile/pefile-2022.5.30-r1.ebuild b/dev-python/pefile/pefile-2022.5.30-r1.ebuild
deleted file mode 100644
index 8f749f0eaa12..000000000000
--- a/dev-python/pefile/pefile-2022.5.30-r1.ebuild
+++ /dev/null
@@ -1,30 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1
-
-DESCRIPTION="Module to read and work with Portable Executable (PE) files"
-HOMEPAGE="https://github.com/erocarrera/pefile"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/erocarrera/pefile.git"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-
-PATCHES=(
-	"${FILESDIR}/${P}-remove-future.patch"
-)
-
-# Unfortunately there is nothing we can test here. Upstream doesn't ship a test
-# suite inside the release files. The test fixtures in the source repo is
-# encrypted so that only their CI pipeline is able to run the tests.
diff --git a/dev-python/pefile/pefile-2023.2.7.ebuild b/dev-python/pefile/pefile-2023.2.7.ebuild
index 3262814ade2e..aaa84cd28fc7 100644
--- a/dev-python/pefile/pefile-2023.2.7.ebuild
+++ b/dev-python/pefile/pefile-2023.2.7.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/pefile/pefile-9999.ebuild b/dev-python/pefile/pefile-9999.ebuild
index 3262814ade2e..aaa84cd28fc7 100644
--- a/dev-python/pefile/pefile-9999.ebuild
+++ b/dev-python/pefile/pefile-9999.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/erocarrera/pefile/releases/download/v${PV}/${P}.tar.gz -> ${P}.gh.tar.gz"
-	KEYWORDS="~amd64 ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/platformdirs/Manifest b/dev-python/platformdirs/Manifest
index db96a879ab49..816e2bafd306 100644
--- a/dev-python/platformdirs/Manifest
+++ b/dev-python/platformdirs/Manifest
@@ -1,3 +1,4 @@
 DIST platformdirs-2.6.2.gh.tar.gz 21184 BLAKE2B 4acc85301f764d4457ace88f9fb409e4d2f8bb17b9133dc3316c4d265a7cf50019298f1ba4cef87f5999b48fd7060687f7008079de26ffe74740a4cefff9309e SHA512 704cc39ba1746055e0459139759e118bd6178fb13cc8ecf580f58d16073fbb8ade0bce8b5eb9230ccc45b19f622a41c84a06f8698ee722da9d5cec44c5f46e25
 DIST platformdirs-3.0.0.gh.tar.gz 21358 BLAKE2B b7dd6d55cc07d9e584d2e3f4a8a1e3bcd5b75eac6786c4225c9b249af9d98cbe0c8b1edc7a6180c147ad13d0a7d5c4fbc9f15cf71af03590c011f7fd4ae336a4 SHA512 36885fdb4767e2525eef48e8ede6cec8013d2e8767c7940381d642faa14382583885c2428ce7b27fc36d33048494354cb4d16b42eac2748ca4458b8c124ed01f
 DIST platformdirs-3.1.0.gh.tar.gz 21721 BLAKE2B 5f7334c0003d0dcd51473820239068dd441ecc18e7837822f824f8ca2e5f5915aa89363eee27740214b97c1c4bb258a4ffa2ab6b4963bf6e9346c13fed6dc0f0 SHA512 49ad7b15419aff2c5af5c63a8850378d688eb95aadcd0c489d26fe4eea8315caffb17136fa7cbdf4a945bebae2eb8154ddfb771ed6fdc47595eff590e0f32ccb
+DIST platformdirs-3.1.1.gh.tar.gz 21773 BLAKE2B e0e9f8d2387f3b391feb926c478852c1e189ce89ab4fb5731b95b619047c77ac0ea5209a3a64ca85ba8479552aab753900fa8ca0b7b3f1051f7f29a2cc7841aa SHA512 32929363c3d9d0589d13f3b4447fe2a77e72e0ed28dd61d6a4fc627f2064e130134fe98f07b915fa148e1066f4db0869b8aa064775aa6ff61810c87f7f084916
diff --git a/dev-python/platformdirs/platformdirs-3.1.1.ebuild b/dev-python/platformdirs/platformdirs-3.1.1.ebuild
new file mode 100644
index 000000000000..7ce354799eb2
--- /dev/null
+++ b/dev-python/platformdirs/platformdirs-3.1.1.ebuild
@@ -0,0 +1,53 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="A small Python module for determining appropriate platform-specific dirs"
+HOMEPAGE="
+	https://pypi.org/project/platformdirs/
+	https://github.com/platformdirs/platformdirs/
+"
+SRC_URI="
+	https://github.com/platformdirs/platformdirs/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~arm64-macos ~x64-macos ~x64-solaris"
+
+BDEPEND="
+	test? (
+		dev-python/appdirs[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_configure() {
+	grep -q 'build-backend = "hatchling' pyproject.toml ||
+		die "Upstream changed build-backend, recheck"
+	# write a custom pyproject.toml to ease setuptools bootstrap
+	cat > pyproject.toml <<-EOF || die
+		[build-system]
+		requires = ["flit_core >=3.2,<4"]
+		build-backend = "flit_core.buildapi"
+
+		[project]
+		name = "${PN}"
+		version = "${PV}"
+		description = 'A small Python package for determining appropriate platform-specific dirs, e.g. a "user data dir".'
+	EOF
+	# sigh
+	cat > src/platformdirs/version.py <<-EOF || die
+		__version__ = version = '${PV}'
+		__version_tuple__ = version_tuple = (${PV//./, })
+	EOF
+}
diff --git a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.13.1.ebuild b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.13.1.ebuild
index 6ffad3211c37..d7a26e0b0d8e 100644
--- a/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.13.1.ebuild
+++ b/dev-python/pydata-sphinx-theme/pydata-sphinx-theme-0.13.1.ebuild
@@ -22,7 +22,7 @@ SRC_URI="
 
 LICENSE="BSD-with-disclosure"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 
 RDEPEND="
 	dev-python/accessible-pygments[${PYTHON_USEDEP}]
diff --git a/dev-python/pydevd/Manifest b/dev-python/pydevd/Manifest
index be5b85af2bcc..aae4c501a8cd 100644
--- a/dev-python/pydevd/Manifest
+++ b/dev-python/pydevd/Manifest
@@ -1,2 +1 @@
-DIST pydevd-2.9.3.gh.tar.gz 3979334 BLAKE2B f26af62d12d89317ffc9e670c78bac2c977195897dfb858861f6d12a331714c084d11dc030efe82777d51f9cd429b54d78c7126f366fdda15ebd315121b55dcd SHA512 c8d30658e84a1edd3e4d0cd35563f50231b6a2df247fecab5e90236c4c80da10e7fe5f182b1791f86063d3228d115d32d388087605e58842505ab19aabe75444
 DIST pydevd-2.9.5.gh.tar.gz 3982897 BLAKE2B 06f0712301b419c472bcef2443a2ed277eb477041ff2e40e41b57f61649d84a7559dcae82c30ac572b14e90b98c2b9b9542c7360deded087eec92aeb0372ad67 SHA512 9aa38bc9a238e6f2956883a6318536382726013ea9e4a9d902b36d60df0cf924c279545bcdf92afdb435bfe36598982edd5805725860798fb3970b105254ba1d
diff --git a/dev-python/pydevd/pydevd-2.9.3.ebuild b/dev-python/pydevd/pydevd-2.9.3.ebuild
deleted file mode 100644
index 5edc970f883a..000000000000
--- a/dev-python/pydevd/pydevd-2.9.3.ebuild
+++ /dev/null
@@ -1,92 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit distutils-r1 toolchain-funcs
-
-MY_P="pydev_debugger_${PV//./_}"
-
-DESCRIPTION="PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)"
-HOMEPAGE="https://github.com/fabioz/PyDev.Debugger/"
-SRC_URI="
-	https://github.com/fabioz/PyDev.Debugger/archive/${MY_P}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/PyDev.Debugger-${MY_P}"
-
-LICENSE="EPL-1.0"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~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
-# then before, which is lacking the file name of the lib that was pre built:
-# gdb: No symbol table is loaded. Use the "file" command
-# This also happens outside of portage so it is not related to any *FLAGS
-RESTRICT="test"
-
-BDEPEND="
-	test? (
-		dev-python/untangle[${PYTHON_USEDEP}]
-		dev-python/numpy[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-	)
-"
-
-# Block against the version of debugpy that still bundles pydevd
-RDEPEND="
-	!<dev-python/debugpy-1.4.2
-	sys-devel/gdb
-"
-
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Drop -O3 and -flto compiler args
-	sed -i \
-		-e 's/extra_link_args = extra_compile_args\[\:\]/pass/g' \
-		-e '/extra_compile_args/d' \
-		setup.py || die
-
-	# Clean up some prebuilt files
-	rm -r third_party || die
-	cd pydevd_attach_to_process || die
-
-	# Remove these Windows files
-	rm attach_{amd64,x86}.dll || die
-	rm inject_dll_{amd64,x86}.exe || die
-	rm run_code_on_dllmain_{amd64,x86}.dll || die
-	rm -r windows winappdbg || die
-
-	# Remove these MacOS files
-	rm attach_x86_64.dylib || die
-
-	# Remove these prebuilt linux files
-	rm attach_linux_{amd64,x86}.so || die
-
-	cd linux_and_mac || die
-	rm compile_mac.sh || die
-}
-
-src_compile() {
-	pushd pydevd_attach_to_process/linux_and_mac || die
-	# recompile removed file (extracted from compile_linux.sh)
-	$(tc-getBUILD_CXX) ${CXXFLAGS} ${CPPFLAGS} -o "attach_linux_${ARCH}.so" \
-		${LDFLAGS} -nostartfiles attach.cpp -ldl || die
-	mv "attach_linux_${ARCH}.so" ../ || die
-	popd || die
-
-	distutils-r1_src_compile
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-	# Remove this duplicate that is installed directly to /usr/
-	# These files are also correctly installed to the python site-packages dir
-	rm -r "${ED}/usr/pydevd_attach_to_process" || die
-}
diff --git a/dev-python/pydevd/pydevd-2.9.5.ebuild b/dev-python/pydevd/pydevd-2.9.5.ebuild
index 6a709f34d050..c6c33a92c34d 100644
--- a/dev-python/pydevd/pydevd-2.9.5.ebuild
+++ b/dev-python/pydevd/pydevd-2.9.5.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}/PyDev.Debugger-${MY_P}"
 
 LICENSE="EPL-1.0"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 # 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/pyopencl/Manifest b/dev-python/pyopencl/Manifest
index 8c6ff082a610..bd2ca91fee07 100644
--- a/dev-python/pyopencl/Manifest
+++ b/dev-python/pyopencl/Manifest
@@ -1,2 +1 @@
-DIST pyopencl-2022.2.4.tar.gz 468743 BLAKE2B 52c0d1bfc1f01eef853efb334434eba81adfaa57d98592663145b3124110765f2afa936331e36b534abadf8d87a5c606ab32ab4452e0b8e87f1ee41c1ef2548c SHA512 b1996dec89a6921216d624e5e38407dd7ada77f137e9c245f9c2dd634dd33d208ffdad57f84739e7942c64643c37ea2d044277fed85eefb362bbc331f4be3ab0
 DIST pyopencl-2022.3.1.tar.gz 470441 BLAKE2B 86ec602f3d73a64e34fe77b7985e64db332a685b33231ad7832d7e864f3170e3eee0aed42742b9892f7950a0f672a736e169ccd0ca08a124b7f20738b348dbff SHA512 57944de69bb24f0f22fb2c0165cd4de5265f5329246fead8449d26e6cbe1204fd44ced70df9960aa54e7d285abe81d8f8a802ba62309de5f4865e882177025ae
diff --git a/dev-python/pyopencl/pyopencl-2022.2.4.ebuild b/dev-python/pyopencl/pyopencl-2022.2.4.ebuild
deleted file mode 100644
index 7c2543b687fb..000000000000
--- a/dev-python/pyopencl/pyopencl-2022.2.4.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,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"
-
-# Running tests on GPUs requires both appropriate hardware and additional permissions
-# having been granted to the user running them. Testing on CPUs with dev-libs/pocl
-# is in theory possible but has been found to be very fragile, see e.g. Bug #872308.
-RESTRICT="test"
-
-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/pyopencl/pyopencl-2022.3.1.ebuild b/dev-python/pyopencl/pyopencl-2022.3.1.ebuild
index 017e748ce824..fa3b1e7677fb 100644
--- a/dev-python/pyopencl/pyopencl-2022.3.1.ebuild
+++ b/dev-python/pyopencl/pyopencl-2022.3.1.ebuild
@@ -6,16 +6,17 @@ EAPI=8
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 DISTUTILS_USE_PEP517=setuptools
 
-inherit distutils-r1 multiprocessing
+inherit distutils-r1 multiprocessing pypi
 
 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"
+HOMEPAGE="
+	https://mathema.tician.de/software/pyopencl/
+	https://pypi.org/project/pyopencl/
+"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~ppc64"
+KEYWORDS="amd64 ~ppc64"
 IUSE="examples opengl"
 
 # Running tests on GPUs requires both appropriate hardware and additional permissions
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index 3e27af59ba89..671c7f86725b 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -1,7 +1,5 @@
 DIST python-2.7.18-docs-html.tar.bz2 4634932 BLAKE2B c48e2dede15d8186231acf65709641e0844c42e924262d6ee21a55e515aaf4d023bf394681bab780ab83998de9f409685e2d5870506810432145acc6422eff9d SHA512 db39390577ec86f13c9b6b57c01cba36fe9fd89092a773dc94f1a6a19d912759d097c4d80e765d3657b572abc731c1da9e7b4cd4c38065cd444606b906744abe
 DIST python-3.10.10-docs-html.tar.bz2 7387634 BLAKE2B 27b340b02412fc8a6f2911c2faf1da64511955432046a8580472b0445adb8272584f99c7fe41469932c948485ccdb799aea76cc9596f5a122342afccff2f7c83 SHA512 4678fc3a33e0bd53419894e98a3132f18635693dcf91846c6911a163ebd693b9af42d78ffc27fd5e522eca7376097555271b6bd85a21d1231d6b7523f4620534
-DIST python-3.10.9-docs-html.tar.bz2 7379489 BLAKE2B ab7bc918417682179d60d80685d2e22a4c8eb5f1080fc8a0469f525192426a72adaec7fba0c3c654b6ea3892b4723d2a1cc7b827c17648e7710c569bfc591d30 SHA512 06677a0c5d841833e590979cc174dc4dc7d7b67c277e5af680afc205d913e11987985e1a17d8f90538ca96fae4a9940c922c7f538dea222b7ffcd446a7168b4e
-DIST python-3.11.1-docs-html.tar.bz2 7701638 BLAKE2B 9c5452c2b8601dc5f9b681ebe8e5bbf6a74f915310554c158997bed0fdf471354c6de0eb260b31717cb9310f0d96b3a5ff497173cd17e2b278372e6af12f9ad5 SHA512 2541b13c2b7b06aa4d8750a4399f761619600d8978e691f0910365329167565d8a306d45895e3fb6c83e6b32b8e84943b0056fcd6264539500bac7a5625856ba
 DIST python-3.11.2-docs-html.tar.bz2 7779519 BLAKE2B d9e1faa1414b18923c08686097d4d65613768c404f712a8ca104f546938016afe5e47bdec25296db1792f1ec49a11ed9899b062b9fdb24e93b2f60d6f49ae82c SHA512 0a6b54b0e3579f640a78e9255ff60b6b18f36752b8949f0f19e5c2fb84c33775c761bed907fb45dc606e5bc894068086cac4935574e89421bee55e8b2127d7d8
 DIST python-3.8.16-docs-html.tar.bz2 6697934 BLAKE2B 99fb1b8e95c3719b1146e845051fa6b9fbf61fabfdd1fe6d93a44e6a46f4b4e44c9ce0adef89cfdeafc8b67d290adda21d295f492a8f54c069ad86fba4952c0b SHA512 aaffc1f4d56be0ff7fbd35c7ca690d9089f9686d957669852aff1406efad2bee52b2b965ffd652780da6048ff9d89e6bbc421e92588841b89d73af43ad4970fb
 DIST python-3.9.16-docs-html.tar.bz2 6965048 BLAKE2B 14d30cf5c444b993409751d17959bc46668d2b6e5be76e10d36adb0b8704a2a3908d829e8aa12d384efab31f8b60b462f711f2fa6adf8bc84fbdfe25e4cbc703 SHA512 38828ca880e3ed84a705dba465430f1b9623fec830662805008847c5d44ce04225ea7c2173d3eb138fd98e134fa2bb9ed84788e2b1d045bf9cf20e78e12d4472
diff --git a/dev-python/python-docs/python-docs-3.10.10.ebuild b/dev-python/python-docs/python-docs-3.10.10.ebuild
index 2ab918028481..e0ae576a6a47 100644
--- a/dev-python/python-docs/python-docs-3.10.10.ebuild
+++ b/dev-python/python-docs/python-docs-3.10.10.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-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"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-docs/python-docs-3.10.9.ebuild b/dev-python/python-docs/python-docs-3.10.9.ebuild
deleted file mode 100644
index e0ae576a6a47..000000000000
--- a/dev-python/python-docs/python-docs-3.10.9.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/dev-python/python-docs/python-docs-3.11.1.ebuild b/dev-python/python-docs/python-docs-3.11.1.ebuild
deleted file mode 100644
index e0ae576a6a47..000000000000
--- a/dev-python/python-docs/python-docs-3.11.1.ebuild
+++ /dev/null
@@ -1,23 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="HTML documentation for Python"
-HOMEPAGE="https://www.python.org/doc/"
-SRC_URI="https://www.python.org/ftp/python/doc/${PV}/python-${PV}-docs-html.tar.bz2"
-S="${WORKDIR}/python-${PV}-docs-html"
-
-LICENSE="PSF-2"
-SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
-
-src_install() {
-	rm -r _sources || die
-	docinto html
-	dodoc -r .
-
-	newenvd - 60python-docs-${SLOT} <<-EOF
-		PYTHONDOCS_${SLOT//./_}="${EPREFIX}/usr/share/doc/${PF}/html/library"
-	EOF
-}
diff --git a/dev-python/python-docs/python-docs-3.11.2.ebuild b/dev-python/python-docs/python-docs-3.11.2.ebuild
index 2ab918028481..e0ae576a6a47 100644
--- a/dev-python/python-docs/python-docs-3.11.2.ebuild
+++ b/dev-python/python-docs/python-docs-3.11.2.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-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"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/python-markdown-math/python-markdown-math-0.8-r1.ebuild b/dev-python/python-markdown-math/python-markdown-math-0.8-r1.ebuild
index 59e440c9a383..9ee3b673311d 100644
--- a/dev-python/python-markdown-math/python-markdown-math-0.8-r1.ebuild
+++ b/dev-python/python-markdown-math/python-markdown-math-0.8-r1.ebuild
@@ -4,19 +4,20 @@
 EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
 PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
+
+inherit distutils-r1 pypi
 
 DESCRIPTION="Math extension for Python-Markdown"
 HOMEPAGE="
 	https://github.com/mitya57/python-markdown-math/
 	https://pypi.org/project/python-markdown-math/
 "
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
+KEYWORDS="amd64 ~riscv x86"
 
 RDEPEND="
 	>=dev-python/markdown-3.3.7[${PYTHON_USEDEP}]
diff --git a/dev-python/python-markdown-math/python-markdown-math-0.8.ebuild b/dev-python/python-markdown-math/python-markdown-math-0.8.ebuild
deleted file mode 100644
index d531c8bdbc89..000000000000
--- a/dev-python/python-markdown-math/python-markdown-math-0.8.ebuild
+++ /dev/null
@@ -1,21 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-inherit distutils-r1
-
-DESCRIPTION="Math extension for Python-Markdown"
-HOMEPAGE="https://github.com/mitya57/python-markdown-math"
-SRC_URI="mirror://pypi/${PN::1}/${PN}/${P}.tar.gz"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 ~riscv x86"
-
-RDEPEND="
-	>=dev-python/markdown-3.0.1[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests setup.py
diff --git a/dev-python/redis/redis-4.5.1.ebuild b/dev-python/redis/redis-4.5.1.ebuild
index ae2bb8c4b96f..4f7104bcd67d 100644
--- a/dev-python/redis/redis-4.5.1.ebuild
+++ b/dev-python/redis/redis-4.5.1.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	>=dev-python/async-timeout-4.0.2[${PYTHON_USEDEP}]
diff --git a/dev-python/responses/Manifest b/dev-python/responses/Manifest
index 016066db1554..504275db8f33 100644
--- a/dev-python/responses/Manifest
+++ b/dev-python/responses/Manifest
@@ -1,2 +1,3 @@
 DIST responses-0.22.0-tomli.patch 4793 BLAKE2B d5991f55f4378d35224a19d4e85ee9786612f6b5931e52e326c46ca2b791e6e2f8985f69ebff14779948b45a6433d6b4223f8fabe615b0ad479364d941128179 SHA512 0d0bd3d10e4f38fdb236204f161ae499f876d8daadc8306b6ad02efec9277fdfdbc1c862704f49aec69cabbd52f3616acf74d3baab573f1f5418436928af3c6c
 DIST responses-0.22.0.gh.tar.gz 54094 BLAKE2B eacb1ba4fcae10d3a4e29fe1516da3f1d3ff07eacbaf65b0dd3f86ecfb36aa51527c0d89547a1480064654c49fd1233d2c3491d9afdf4eff34a4058e4f89ec0d SHA512 361e59e02df36fac0fb0ba2a070b730e485ec94fe90490c271e4ac86fae7954a551bf2486714d95c91e9d0b011f06a9d10b0d6408fd4d03234e1224cca1e9d0e
+DIST responses-0.23.1.tar.gz 72966 BLAKE2B e75db65ab98ebf7773c469dee5486b52b6f5c1f39d847c6f38a65e664c244937716c792cf009c750019043845b95c11ea38f99d68137899ef2ef48e60edc0c2a SHA512 2c05ac5c4ccca351940d3821b0830cee366cd7c9637f1e4c1e6b40c72ed2168a1036de634f03bfaaa2f7270e3825f6d9e8d31fc7a16f321f1de1cc64255454a1
diff --git a/dev-python/responses/responses-0.23.1-r1.ebuild b/dev-python/responses/responses-0.23.1-r1.ebuild
new file mode 100644
index 000000000000..eee20839d478
--- /dev/null
+++ b/dev-python/responses/responses-0.23.1-r1.ebuild
@@ -0,0 +1,50 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Utility for mocking out the Python Requests library"
+HOMEPAGE="
+	https://pypi.org/project/responses/
+	https://github.com/getsentry/responses/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+# tomli backend is optional now, with pyyaml being the new default.
+# However, keeping it unconditional here for backwards compatibility.
+RDEPEND="
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	<dev-python/requests-3[${PYTHON_USEDEP}]
+	>=dev-python/requests-2.22.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/tomli[${PYTHON_USEDEP}]
+	' 3.{8..10})
+	dev-python/tomli-w[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.10[${PYTHON_USEDEP}]
+"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-httpserver[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	# remove unnecessary RDEP on type stubs
+	sed -i -e '/types-/d' setup.py || die
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	epytest -p no:localserver
+}
diff --git a/dev-python/rst-linker/Manifest b/dev-python/rst-linker/Manifest
index eb93cf3d1a69..0aec84dfc54e 100644
--- a/dev-python/rst-linker/Manifest
+++ b/dev-python/rst-linker/Manifest
@@ -1,2 +1 @@
-DIST rst.linker-2.3.1.tar.gz 10436 BLAKE2B 0de71c1994b65c20f2ef13e1e8f9f04d431d9bd7215ca9dca2c51d78deaa55803f69432d27dd14b3b5f9d224b75f72a56ac4bba72ec3fad660af31b248a265ba SHA512 0c9f236e372ffe69c2b37983c491c5b6fdb41f1c2a4ac16d3d815bfe5e8b93b58f001d449a57e663041d69d0e13e13d17178c477a1ea37f05ba7e919fcee698c
 DIST rst.linker-2.4.0.tar.gz 11340 BLAKE2B a1ae9c811b7d6fa2821bfbf5787dce75fd3d7e5d933ec15fbac9cd3bde08cfad59fdc81b3b58dc39d1209a27ca9dd8d2ecd68034b434b3f6d15469bfb98efa3d SHA512 31e3427ecf35b433cc9650138ee36090e99003b72c69b60b530835eb624d7eb13aae4cf81cc0044b36750798a4b8aa676e53e3b9eb335430076593640a243940
diff --git a/dev-python/rst-linker/rst-linker-2.3.1.ebuild b/dev-python/rst-linker/rst-linker-2.3.1.ebuild
deleted file mode 100644
index c0222d291762..000000000000
--- a/dev-python/rst-linker/rst-linker-2.3.1.ebuild
+++ /dev/null
@@ -1,34 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-MY_PN="${PN/-/.}"
-DESCRIPTION="Sphinx plugin to add links and timestamps to the changelog"
-HOMEPAGE="
-	https://github.com/jaraco/rst.linker/
-	https://pypi.org/project/rst.linker/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${MY_PN}/${MY_PN}-${PV}.tar.gz"
-S="${WORKDIR}/${MY_PN}-${PV}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-
-RDEPEND="
-	dev-python/python-dateutil[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	>=dev-python/setuptools-scm-3.4.1[${PYTHON_USEDEP}]
-	test? (
-		dev-python/path[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/rst-linker/rst-linker-2.4.0.ebuild b/dev-python/rst-linker/rst-linker-2.4.0.ebuild
index d2cf411b01d7..2f62c107c8db 100644
--- a/dev-python/rst-linker/rst-linker-2.4.0.ebuild
+++ b/dev-python/rst-linker/rst-linker-2.4.0.ebuild
@@ -18,7 +18,7 @@ S=${WORKDIR}/${P/-/.}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 
 RDEPEND="
 	dev-python/python-dateutil[${PYTHON_USEDEP}]
diff --git a/dev-python/sentry-sdk/Manifest b/dev-python/sentry-sdk/Manifest
index da712e266f63..e3091addb126 100644
--- a/dev-python/sentry-sdk/Manifest
+++ b/dev-python/sentry-sdk/Manifest
@@ -1,3 +1 @@
 DIST sentry-python-1.16.0.gh.tar.gz 325763 BLAKE2B e53f6051a74065950c4f1ce9010a87071b4a715990643cb7e955411ffb784fabc7ca6f2ade3cc6c66eb0718c6fc4993c6035763a0937b8a1cd66289f3f026806 SHA512 7f46f6c66b0e4f97e7f64a0eba9c396fbb9ab95607ba8ecb4880bb117c4f3fff7881a6787ea814981bdfabd84ea2b172c878821877403852661e746b6fe666bb
-DIST sentry-sdk-1.14.0.gh.tar.gz 312667 BLAKE2B 02772c3313a6cdb5f872df93274b291cdbae35db8387eab3816261b446bb438afd41610580cc642299877d8f03732a1d7bae4e6ad9824a92f4126677a4a3ca1a SHA512 cd0c4ca10d61825919721335fe0413f1050bd8d1f41a2f3f4a25b843c4bf83d35610382f55dc14fe86f70cca962e30a8d9d0708a07b10730783ae09b22f20e04
-DIST sentry-sdk-1.15.0.gh.tar.gz 317804 BLAKE2B 65a45f0da5327057827f4533418d846d8d4dc4bdd2723fddd754e5391e12c50946bb2f3f7914c5ee03cfdac324d565e68158aaca8e6686dc4502a02813cd6442 SHA512 9ae477c3ddc90c4189f4cbcca8756d7b0bd2df0358afa553467b431a2a131f32c9a9df9ce0ca3cca4d98b5a14746222f21476c164bf6da09bc06d94ce7ed0afe
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.14.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.14.0.ebuild
deleted file mode 100644
index 38a944eba125..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.14.0.ebuild
+++ /dev/null
@@ -1,102 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.15.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.15.0.ebuild
deleted file mode 100644
index 547ebfaefeaf..000000000000
--- a/dev-python/sentry-sdk/sentry-sdk-1.15.0.ebuild
+++ /dev/null
@@ -1,104 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="Python client for Sentry"
-HOMEPAGE="
-	https://sentry.io/
-	https://github.com/getsentry/sentry-python/
-	https://pypi.org/project/sentry-sdk/
-"
-SRC_URI="
-	https://github.com/getsentry/sentry-python/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-S="${WORKDIR}/sentry-python-${PV}"
-
-LICENSE="PSF-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
-
-RDEPEND="
-	dev-python/urllib3[${PYTHON_USEDEP}]
-	dev-python/certifi[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/asttokens[${PYTHON_USEDEP}]
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/executing[${PYTHON_USEDEP}]
-		dev-python/fakeredis[${PYTHON_USEDEP}]
-		dev-python/flask-login[${PYTHON_USEDEP}]
-		dev-python/jsonschema[${PYTHON_USEDEP}]
-		dev-python/pyrsistent[${PYTHON_USEDEP}]
-		dev-python/pytest-aiohttp[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/pytest-forked[${PYTHON_USEDEP}]
-		dev-python/pytest-localserver[${PYTHON_USEDEP}]
-		dev-python/werkzeug[${PYTHON_USEDEP}]
-		dev-python/zope-event[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# tests require Internet access
-	tests/integrations/httpx/test_httpx.py
-	tests/integrations/requests/test_requests.py
-	tests/integrations/stdlib/test_httplib.py
-	tests/integrations/flask/test_flask.py
-	tests/integrations/django/test_basic.py
-	# wtf is it supposed to do?!
-	tests/integrations/gcp/test_gcp.py
-	# broken by rq-1.10.1 (optional dep)
-	tests/integrations/rq/test_rq.py
-	# fastapi is not packaged
-	tests/integrations/asgi/test_fastapi.py
-	# TODO
-	tests/integrations/bottle
-	# TODO: causes breakage in other tests
-	tests/integrations/starlette
-	# TODO
-	tests/integrations/tornado
-	# requires mockupdb
-	tests/integrations/pymongo
-)
-
-EPYTEST_DESELECT=(
-	# hangs
-	'tests/test_transport.py::test_transport_works'
-	# TODO
-	'tests/test_basics.py::test_auto_enabling_integrations_catches_import_error'
-	tests/test_client.py::test_databag_depth_stripping
-	tests/test_client.py::test_databag_string_stripping
-	tests/test_client.py::test_databag_breadth_stripping
-	tests/integrations/asgi/test_asgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/asgi/test_asgi.py::test_websocket
-	tests/integrations/aiohttp/test_aiohttp.py::test_transaction_style
-	tests/integrations/aiohttp/test_aiohttp.py::test_traces_sampler_gets_request_object_in_sampling_context
-	# incompatible version?
-	tests/integrations/falcon/test_falcon.py
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_too_large_event_truncated
-	# test_circular_references: apparently fragile
-	'tests/integrations/threading/test_threading.py::test_circular_references'
-	# test for new feature, fails with IndexError
-	tests/integrations/wsgi/test_wsgi.py::test_session_mode_defaults_to_request_mode_in_wsgi_handler
-	# TODO
-	tests/integrations/wsgi/test_wsgi.py::test_auto_session_tracking_with_aggregates
-	tests/integrations/wsgi/test_wsgi.py::test_profile_sent_when_profiling_enabled
-	tests/test_profiler.py::test_sample_buffer
-	tests/test_profiler.py::test_thread_scheduler_takes_first_samples
-	tests/test_profiler.py::test_thread_scheduler_takes_more_samples
-	tests/test_profiler.py::test_thread_scheduler_single_background_thread
-	# broken with py3.11, *shrug*
-	tests/test_profiler.py::test_extract_stack_with_max_depth
-	# TODO
-	tests/integrations/sqlalchemy/test_sqlalchemy.py::test_long_sql_query_preserved
-)
diff --git a/dev-python/sentry-sdk/sentry-sdk-1.16.0.ebuild b/dev-python/sentry-sdk/sentry-sdk-1.16.0.ebuild
index d3fb5e2dedf7..b2153f12465b 100644
--- a/dev-python/sentry-sdk/sentry-sdk-1.16.0.ebuild
+++ b/dev-python/sentry-sdk/sentry-sdk-1.16.0.ebuild
@@ -23,7 +23,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="PSF-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	dev-python/urllib3[${PYTHON_USEDEP}]
diff --git a/dev-python/simplejson/simplejson-3.18.3.ebuild b/dev-python/simplejson/simplejson-3.18.3.ebuild
index 7b257b42922e..30da40c4ef2a 100644
--- a/dev-python/simplejson/simplejson-3.18.3.ebuild
+++ b/dev-python/simplejson/simplejson-3.18.3.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="|| ( MIT AFL-2.1 )"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
 IUSE="+native-extensions"
 
 DOCS=( README.rst CHANGES.txt )
diff --git a/dev-python/sphinx-gallery/Manifest b/dev-python/sphinx-gallery/Manifest
index bb3182d3e3b9..cba48bb35e23 100644
--- a/dev-python/sphinx-gallery/Manifest
+++ b/dev-python/sphinx-gallery/Manifest
@@ -1,3 +1,4 @@
 DIST sphinx-gallery-0.11.1.tar.gz 393927 BLAKE2B c4c56e7bc7bfc519cd172cd104cfee902524c70de7fe76cc816d8f4612cbdf1a0786e3d5f83ea74ce7c1726eeaea5db45682efa3d873efeac49d94ab1393b9ac SHA512 514139213516851fe09aac4168d8fff72e5ce62eecdb0864f58e45d5fe6eab58b8fda749b72ae98f94b2bf8ac1a917396195d8a4d1750ec1563b30b879b12b8d
 DIST sphinx-gallery-0.12.0.tar.gz 402165 BLAKE2B 679b51041df7593a693116a558a0b297367b230f447f53821408631ef92f301e003d1c8446b4b3666b8836149f806b92a5f101993c4f0b395df983a49ef77101 SHA512 e086c9f4ca3c8f2018c88cf6d32e644735ddec0cf85a12757a36da93c6eda43bb77d64573b963fdcf7a2e24a8123ec675af48d2500eaed040ed91bde5f776b59
 DIST sphinx-gallery-0.12.1.tar.gz 402470 BLAKE2B e198679edca69be0a3ad01a3ddc45f909dbfa5771aa5f1dc3cb3bc4fc51d0b4565f28e2462c466386cd5982720b62ea28e3f4df7befbfd747042092fbf5387d8 SHA512 030423e4ff259d5e373c85bc04460598714ce8895a63537bcd96b9a903ddf44d05bfa4ecf15853f98391a9f35dc689406abb2d6fb1eaab0e40981806cd045241
+DIST sphinx-gallery-0.12.2.tar.gz 402524 BLAKE2B c872ec403adf150df540253b996e35f5d99dae17a884fad8e6a79a9b08934228e22c2b830d79cbe08cf43889738b2f0f8aa8e582851a993584d59d36adb6ced2 SHA512 c56c84ab7e4c55686b1c83791c46a83f3887c5c3a19da89baeba8aba874663d1dc4718534fadb11d3d95197c34ee9b78884095e2caeee4f58a9b0d4bba26d5d2
diff --git a/dev-python/sphinx-gallery/sphinx-gallery-0.12.2.ebuild b/dev-python/sphinx-gallery/sphinx-gallery-0.12.2.ebuild
new file mode 100644
index 000000000000..9bc40348d28e
--- /dev/null
+++ b/dev-python/sphinx-gallery/sphinx-gallery-0.12.2.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYPI_NO_NORMALIZE=1
+PYTHON_COMPAT=( python3_{7,8,9,10,11} )
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Sphinx extension to automatically generate an examples gallery"
+HOMEPAGE="
+	https://github.com/sphinx-gallery/sphinx-gallery/
+	https://sphinx-gallery.github.io/
+	https://pypi.org/project/sphinx-gallery/
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux"
+
+RDEPEND="
+	dev-python/matplotlib[${PYTHON_USEDEP}]
+	dev-python/pillow[${PYTHON_USEDEP}]
+	dev-python/sphinx[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/joblib[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e 's:--cov-report= --cov=sphinx_gallery::' setup.cfg || die
+	distutils-r1_src_prepare
+}
+
+EPYTEST_DESELECT=(
+	# Internet
+	sphinx_gallery/tests/test_docs_resolv.py::test_embed_code_links_get_data
+	sphinx_gallery/tests/test_full.py::test_run_sphinx
+	sphinx_gallery/tests/test_full.py::test_embed_links_and_styles
+	# require jupyterlite_sphinx
+	sphinx_gallery/tests/test_full.py
+	sphinx_gallery/tests/test_full_noexec.py
+	sphinx_gallery/tests/test_gen_gallery.py::test_create_jupyterlite_contents
+	sphinx_gallery/tests/test_gen_gallery.py::test_create_jupyterlite_contents_non_default_contents
+	sphinx_gallery/tests/test_gen_gallery.py::test_create_jupyterlite_contents_with_jupyterlite_disabled_via_config
+)
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index d38b31a4fc37..4381775d51ae 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,5 +1,3 @@
 DIST starlette-0.21.0.gh.tar.gz 2830353 BLAKE2B 7ff818d4687757ec8699dcd0e2582af78211787b7a0f2110da045eb4f7a8760262cf144b0af7dc9f72140b5dae1e65f7a4207ee3b165db4091c5139ce0bfcc85 SHA512 c246862604ba807141313857321d898d996eaa771ccb197546d0928a75cbb69f0e485fe90d2c817e70323146077c487436516384e1401d815c59c0ac75845e2b
-DIST starlette-0.23.1.gh.tar.gz 2830865 BLAKE2B b1eaf59421d413179ad294b240babb9b1beabbf10d8364187eb406a3b87a1412b3959b90f44ac1bbada7858c3ffc90560208bc433ca5aaf835dda1766282fe65 SHA512 9af4ab2b2e3af4e7acd2e93a9a4b4f4c8c3b56ba971f7a8faf65308d76a4f30b8ab0ab263535480af614a5082420cafb3d939c7477472710cce9241bd947139b
-DIST starlette-0.24.0.gh.tar.gz 2834269 BLAKE2B 82e1ae2cd835015f20c5421254c0facbe16c1592d1f34e95d38c94898fb30e308dd32ab8bc1856c16d600074c86300afc4aa11e2617a94a29aad9dc4dd0fbdfc SHA512 6ff38cb48efd25183971ea4578dbbd7aff537d624fe2e2b9249551b9bf559dad05da949ec52d305bb0323e37c837212e3a804c7614884e5cd4b85260ec1435cc
 DIST starlette-0.25.0.gh.tar.gz 2835696 BLAKE2B 82ed915a2ff7824a99e0f15f16a0723b8799ef43ab5b25dbbf7ee7bff7a3a1fc555e802a82950b11eb752a39e23fdf0870090a99bed568bfa82e3ecbcf42f5f3 SHA512 ecff4905c093ffd21a4b102d4ca1dba22ceebd8e73f53f984fbe58daa7a0bf9c3de9a41b1672837602142a4e14787f3b59291d05b9cb6a0dd034d58ddacd9eb1
 DIST starlette-0.26.0.post1.gh.tar.gz 2837411 BLAKE2B b5db12f5c9fa8a8e9b78ec61ce26d2caff7f4160ad2e1446d6c161c223b3efc797e6cae65171e03aa14deb33172ceadb20d78ee02bd5754bc66e0406e4bbca89 SHA512 e8f1e98b922b2b067b1d7c581e5c9a6af887f204546ce04206abaea21b0c6e16de182022a5f70153a4f0833847f510f2ccae7f685c92a7f344a581d1d3d6ca0a
diff --git a/dev-python/starlette/starlette-0.23.1.ebuild b/dev-python/starlette/starlette-0.23.1.ebuild
deleted file mode 100644
index 1d0d9c3e8306..000000000000
--- a/dev-python/starlette/starlette-0.23.1.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="amd64 arm64 ~loong ppc ppc64 ~riscv x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/python-multipart[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-3.10.0[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/starlette/starlette-0.24.0.ebuild b/dev-python/starlette/starlette-0.24.0.ebuild
deleted file mode 100644
index 81fb547c3b4e..000000000000
--- a/dev-python/starlette/starlette-0.24.0.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="The little ASGI framework that shines"
-HOMEPAGE="
-	https://www.starlette.io/
-	https://github.com/encode/starlette/
-	https://pypi.org/project/starlette/
-"
-SRC_URI="
-	https://github.com/encode/starlette/archive/${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="BSD"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	<dev-python/anyio-5[${PYTHON_USEDEP}]
-	>=dev-python/anyio-3.4.0[${PYTHON_USEDEP}]
-	>=dev-python/httpx-0.22.0[${PYTHON_USEDEP}]
-	dev-python/itsdangerous[${PYTHON_USEDEP}]
-	dev-python/jinja[${PYTHON_USEDEP}]
-	dev-python/python-multipart[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/typing-extensions-3.10.0[${PYTHON_USEDEP}]
-	' 3.8 3.9)
-"
-BDEPEND="
-	test? (
-		dev-python/trio[${PYTHON_USEDEP}]
-	)
-"
-
-EPYTEST_IGNORE=(
-	# Unpackaged 'databases' dependency
-	tests/test_database.py
-)
-
-distutils_enable_tests pytest
diff --git a/dev-python/starlette/starlette-0.25.0.ebuild b/dev-python/starlette/starlette-0.25.0.ebuild
index 37a92bfd4ce4..12ffce54b534 100644
--- a/dev-python/starlette/starlette-0.25.0.ebuild
+++ b/dev-python/starlette/starlette-0.25.0.ebuild
@@ -21,7 +21,7 @@ SRC_URI="
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 
 RDEPEND="
 	<dev-python/anyio-5[${PYTHON_USEDEP}]
diff --git a/dev-python/stripe/Manifest b/dev-python/stripe/Manifest
index 3906141145f5..82147d8d8d89 100644
--- a/dev-python/stripe/Manifest
+++ b/dev-python/stripe/Manifest
@@ -1,4 +1 @@
-DIST stripe-5.0.0.tar.gz 267241 BLAKE2B 6b4a58a355baf2d16d6de8667d1dff655c3334b58933c6172b25963f90bf072ebb5fae197faafd69285ceaaf06ba952c7012c35222df873d0453ec9fcee45cd5 SHA512 3d782abd3d6983734b6248fcb44cb69609475e14b820062882439c11ba8ba64e19f3db7984902157adaf0a80f9c26d18e7fbe414eb27bfeda95a7fae78a07577
-DIST stripe-5.1.0.tar.gz 267508 BLAKE2B 973f286c1a6a6703e903d65267465def0a99c15e65b034a690f12d51e6572412f1007eb8fa7ba9df41f4450e09c8b0584a1ce472d0815757ef1e402021daec67 SHA512 1afe76180922bfdd90c19d9a6326a98a9cc8e138fc9bb26c42f245373f8b4b93bc0144d3c41e0fd5f278fe425f6bb219cda7d4f993db845756de22c0047cb228
-DIST stripe-5.1.1.tar.gz 267508 BLAKE2B da7918aeaa50dcb0e02274a93d39db16cc02b185597b00b442437050df3842c4d9dcbf3477015b7166837845fe6d2f9f9b79fc05ace118c985254545d424b1d9 SHA512 119af52d0a3548dc73a14b3de84cf9b8c465cccc296386b045b7aa23e0db6a071f2d03e6d445c0581863055497378b2a1169bd70119eb4d5ecc62382968da2ef
 DIST stripe-5.2.0.tar.gz 267950 BLAKE2B b7312e4c7e56803fdd64507602df3527efcc964aa7bb6deae59d00df75c72c47cf179382ce6b90ffab5089e7fce9b2e03de0748a091b36dd25d93d8cf6b1d119 SHA512 e928487b690a2c7bce9013ba988ff5a1d9b0ef4b0be56852385925fd5fa4a1b9e655e05b7fa2728d38ed7834eebe621b883851e6a6db625f388866f32c9f8a15
diff --git a/dev-python/stripe/stripe-5.0.0.ebuild b/dev-python/stripe/stripe-5.0.0.ebuild
deleted file mode 100644
index 1d6cb1164377..000000000000
--- a/dev-python/stripe/stripe-5.0.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.141.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-5.1.0.ebuild b/dev-python/stripe/stripe-5.1.0.ebuild
deleted file mode 100644
index 4dca33d519d7..000000000000
--- a/dev-python/stripe/stripe-5.1.0.ebuild
+++ /dev/null
@@ -1,71 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-SRC_URI="mirror://pypi/s/${PN}/${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.151.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-5.1.1.ebuild b/dev-python/stripe/stripe-5.1.1.ebuild
deleted file mode 100644
index c27fb87fd9ae..000000000000
--- a/dev-python/stripe/stripe-5.1.1.ebuild
+++ /dev/null
@@ -1,70 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="Stripe python bindings"
-HOMEPAGE="
-	https://github.com/stripe/stripe-python/
-	https://pypi.org/project/stripe/
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND="
-	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		>=dev-util/stripe-mock-0.151.0
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		net-misc/curl
-	)
-"
-
-distutils_enable_tests pytest
-
-DOCS=( LONG_DESCRIPTION.rst CHANGELOG.md README.md )
-
-python_test() {
-	epytest tests
-}
-
-src_test() {
-	local stripe_mock_port=12111
-	local stripe_mock_max_port=12121
-	local stripe_mock_logfile="${T}/stripe_mock_${EPYTHON}.log"
-	# Try to start stripe-mock until we find a free port
-	while [[ "${stripe_mock_port}" -le "${stripe_mock_max_port}" ]]; do
-		ebegin "Trying to start stripe-mock on port ${stripe_mock_port}"
-		stripe-mock --http-port ${stripe_mock_port} &> "${stripe_mock_logfile}" &
-		local stripe_mock_pid=$!
-		sleep 2
-		# Did stripe-mock start?
-		curl --fail -u "sk_test_123:" \
-			http://127.0.0.1:${stripe_mock_port}/v1/customers &> /dev/null
-		eend $? "Port ${stripe_mock_port} unavailable"
-		if [[ $? -eq 0 ]]; then
-			einfo "stripe-mock running on port ${stripe_mock_port}"
-			break
-		fi
-		(( stripe_mock_port++ ))
-	done
-	if [[ "${stripe_mock_port}" -gt "${stripe_mock_max_port}" ]]; then
-		eerror "Unable to start stripe-mock for tests"
-		die "Please see the logfile located at: ${stripe_mock_logfile}"
-	fi
-
-	local -x STRIPE_MOCK_PORT=${stripe_mock_port}
-	distutils-r1_src_test
-
-	# Tear down stripe-mock
-	kill "${stripe_mock_pid}" || die "Unable to stop stripe-mock"
-}
diff --git a/dev-python/stripe/stripe-5.2.0.ebuild b/dev-python/stripe/stripe-5.2.0.ebuild
index c27fb87fd9ae..0614bfe7b0cd 100644
--- a/dev-python/stripe/stripe-5.2.0.ebuild
+++ b/dev-python/stripe/stripe-5.2.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 
 RDEPEND="
 	>=dev-python/requests-2.20[${PYTHON_USEDEP}]
diff --git a/dev-python/sure/Manifest b/dev-python/sure/Manifest
index f0f4797d02da..de28d9c446df 100644
--- a/dev-python/sure/Manifest
+++ b/dev-python/sure/Manifest
@@ -1,2 +1 @@
-DIST sure-2.0.0.tar.gz 46747 BLAKE2B 631923bf2fc0a972e276fbfd1918abbafec28e662669993b40ff8ca72944952d092ac662728f98a286fc9b5c8e3765d10a4d6ef1f17b17655802b971b97410af SHA512 8286846374c2bfc773444e90bf4f9c0b0d66d0229afa53af63025bfec690bf8bcc959f86c238ca5244c6a29099e955691771b0eb954af479bde2f17e51f6f1de
 DIST sure-2.0.1.tar.gz 48467 BLAKE2B 2143d073c09e46fa987c6d62ebf59aac61e1304079707cf517d7d1ee10303c21369517a1fc2836d8f1081ebbe7d9c3e68aa629d432f85622b9ff8eaab1dd2abc SHA512 f319685ebb1c00bb064bff3e86543789ec94c9a6a8192ca2e97da3513208f9cac66e9db44e945f68ab39eec696880a2c211627f9881623492946e1a14f2444f5
diff --git a/dev-python/sure/sure-2.0.0-r1.ebuild b/dev-python/sure/sure-2.0.0-r1.ebuild
deleted file mode 100644
index d316315d72a2..000000000000
--- a/dev-python/sure/sure-2.0.0-r1.ebuild
+++ /dev/null
@@ -1,37 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="idiomatic assertion toolkit with human-friendly failure messages"
-HOMEPAGE="
-	https://github.com/gabrielfalcao/sure/
-	https://pypi.org/project/sure/
-"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
-
-RDEPEND="
-	dev-python/mock[${PYTHON_USEDEP}]
-	dev-python/six[${PYTHON_USEDEP}]
-"
-
-distutils_enable_tests pytest
-
-EPYTEST_IGNORE=(
-	# requires dev-python/nose
-	tests/test_old_api.py
-)
-
-src_prepare() {
-	sed -i -e 's:--cov=sure::' setup.cfg || die
-	distutils-r1_src_prepare
-}
diff --git a/dev-python/sure/sure-2.0.1.ebuild b/dev-python/sure/sure-2.0.1.ebuild
index 3a9f0e06e81f..0cdbce4d6b55 100644
--- a/dev-python/sure/sure-2.0.1.ebuild
+++ b/dev-python/sure/sure-2.0.1.ebuild
@@ -6,18 +6,17 @@ EAPI=8
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="idiomatic assertion toolkit with human-friendly failure messages"
 HOMEPAGE="
 	https://github.com/gabrielfalcao/sure/
 	https://pypi.org/project/sure/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv sparc x86"
 
 RDEPEND="
 	dev-python/mock[${PYTHON_USEDEP}]
diff --git a/dev-python/tabulate/tabulate-0.9.0.ebuild b/dev-python/tabulate/tabulate-0.9.0.ebuild
index c5c880a43ef9..b3843a297d0c 100644
--- a/dev-python/tabulate/tabulate-0.9.0.ebuild
+++ b/dev-python/tabulate/tabulate-0.9.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 RDEPEND="
 	dev-python/wcwidth[${PYTHON_USEDEP}]
diff --git a/dev-python/tenacity/Manifest b/dev-python/tenacity/Manifest
index b13e58d363b6..66e9b25dd5b8 100644
--- a/dev-python/tenacity/Manifest
+++ b/dev-python/tenacity/Manifest
@@ -1,4 +1 @@
-DIST tenacity-8.1.0.tar.gz 37658 BLAKE2B 4f9e2ea44ac0f0ed8b694b0f60e938fadbcf65bd989e9d641f7a40750f499aa9635a70d80e406aa2ebf436ebd37cde0d88e8ecb6cb3436ba755c2d921541c8e8 SHA512 194312e80233d6edcdf30496a355b272a4de4809bbe187948a7ce9c1382958845d12401498569f2b8d4251ede2857317820779f13a65bb2e69dcb97dde9bb501
-DIST tenacity-8.2.0.tar.gz 39842 BLAKE2B 4c7b58654eff79e2b5e7412f5a920dd09df44a7699d6959dd6e1c5ee87a1e74a0c60df28239be6976368859ebabc4ab35e318a71a7ad5861d92da76a516bd721 SHA512 7bb962257200a450a5599309977c895b9e2918a195a2b60c942dad934145e85e64cf1c043e81fe1a4eb5a4a7d4eaeca626a21388297cf0983bdcea22d56553d3
-DIST tenacity-8.2.1.tar.gz 39876 BLAKE2B 5141a5ee79ee6b5664e35c06c2d95e65daf75bfcb2ea6b33418385e49f9136adde2ff99bfd8215f056f6370c7b3c2e0a755c749c164c3857c0aae4c27cc63d1b SHA512 43decc20206544165d7ad4ae67292388c45c70a126d3b1ba529529429897dafc1bf8df72a15b545a80cc1fe0eee766866e592d3f49ee6a24feddcb525dffaab8
 DIST tenacity-8.2.2.tar.gz 40186 BLAKE2B af24fa209a0f9de0bb7ddd0d0979620fdb3a41967ea2d45c8864cc9feb3237d345b85015379228dd7714d7dd3f921e190bfdea3ba5c3fe627df804de6641894d SHA512 a1e2569dd5afdc982716f22ba7c67f7a43351e9f2dbefad30854d8655fa7600300c624b7353ea7d68aa462cbf2f33cf93e643e2868e8e197a61eb1ccf25c275e
diff --git a/dev-python/tenacity/tenacity-8.1.0.ebuild b/dev-python/tenacity/tenacity-8.1.0.ebuild
deleted file mode 100644
index a49323120897..000000000000
--- a/dev-python/tenacity/tenacity-8.1.0.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,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? (
-		dev-python/tornado[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	if ! has_version "dev-python/typeguard[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/tenacity/tenacity-8.2.0.ebuild b/dev-python/tenacity/tenacity-8.2.0.ebuild
deleted file mode 100644
index 3c82a5c201f8..000000000000
--- a/dev-python/tenacity/tenacity-8.2.0.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="
-	https://github.com/jd/tenacity/
-	https://pypi.org/project/tenacity/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/tornado[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	if ! has_version "dev-python/typeguard[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/tenacity/tenacity-8.2.1.ebuild b/dev-python/tenacity/tenacity-8.2.1.ebuild
deleted file mode 100644
index 3c82a5c201f8..000000000000
--- a/dev-python/tenacity/tenacity-8.2.1.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1 pypi
-
-DESCRIPTION="General-purpose retrying library"
-HOMEPAGE="
-	https://github.com/jd/tenacity/
-	https://pypi.org/project/tenacity/
-"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
-
-BDEPEND="
-	dev-python/setuptools-scm[${PYTHON_USEDEP}]
-	test? (
-		dev-python/tornado[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=()
-
-	if ! has_version "dev-python/typeguard[${PYTHON_USEDEP}]"; then
-		EPYTEST_DESELECT+=(
-			tests/test_tenacity.py::TestRetryTyping::test_retry_type_annotations
-		)
-	fi
-
-	epytest
-}
diff --git a/dev-python/tenacity/tenacity-8.2.2.ebuild b/dev-python/tenacity/tenacity-8.2.2.ebuild
index 3c82a5c201f8..818979699c37 100644
--- a/dev-python/tenacity/tenacity-8.2.2.ebuild
+++ b/dev-python/tenacity/tenacity-8.2.2.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 
 BDEPEND="
 	dev-python/setuptools-scm[${PYTHON_USEDEP}]
diff --git a/dev-python/testfixtures/Manifest b/dev-python/testfixtures/Manifest
index c454cf0fac54..ce6eac7adac5 100644
--- a/dev-python/testfixtures/Manifest
+++ b/dev-python/testfixtures/Manifest
@@ -1,2 +1 @@
-DIST testfixtures-7.0.3.tar.gz 127280 BLAKE2B 14725f5a04a77453f1a6e1cb07b2ee8e907dcf49a845c9c75951d77160448c1037c7bfa0a759cf4061d92448203b8f4b14d611cdde32f46269b484985e654e67 SHA512 875aba5102bd43800b2f6464dc93185cd2bb5e117523cb4b3c458b2f8f8eb71f309c0a5266eeca70a7928f9992ccfe7807c67e42531c17fd82ca1c3b838d02a5
 DIST testfixtures-7.1.0.tar.gz 133026 BLAKE2B 0fbb25e97c06cdd7c94be26c56e96a70847493f71b2f0adc58f333fe2ab930a9bfb6de154a1a23a5cb2cbb1e5e87cb6d9ac95433d357de0689296e33c04078c3 SHA512 d1b2b3ca9674865a45be254a41777c2cba42d4ac3de5d77420d6d33416bfde7ba6a8ca39033cd2c217b0eb81ef5c97bf5b197dd047f9a337bbe1a3da91d9c0ef
diff --git a/dev-python/testfixtures/testfixtures-7.0.3.ebuild b/dev-python/testfixtures/testfixtures-7.0.3.ebuild
deleted file mode 100644
index 3d3fed8433e3..000000000000
--- a/dev-python/testfixtures/testfixtures-7.0.3.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-
-inherit distutils-r1
-
-DESCRIPTION="A collection of helpers and mock objects for unit tests and doc tests"
-HOMEPAGE="https://pypi.org/project/testfixtures/
-	https://github.com/Simplistix/testfixtures"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-SLOT="0"
-LICENSE="MIT"
-KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
-
-BDEPEND="
-	test? (
-		$(python_gen_impl_dep sqlite)
-		dev-python/django[${PYTHON_USEDEP}]
-		dev-python/pytest-django[${PYTHON_USEDEP}]
-		dev-python/sybil[${PYTHON_USEDEP}]
-		>=dev-python/twisted-18[${PYTHON_USEDEP}]
-		dev-python/zope-component[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_sphinx docs \
-	dev-python/furo
-distutils_enable_tests pytest
-
-python_prepare_all() {
-	# kill weird way of declaring build deps
-	sed -e '/build=/d' -i setup.py || die
-
-	distutils-r1_python_prepare_all
-}
-
-python_test() {
-	local -x PYTHONPATH="."
-	local -x DJANGO_SETTINGS_MODULE=testfixtures.tests.test_django.settings
-
-	local EPYTEST_DESELECT=(
-		# TODO
-		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_missing
-		testfixtures/tests/test_shouldwarn.py::ShouldWarnTests::test_filter_present
-	)
-
-	epytest
-}
diff --git a/dev-python/testfixtures/testfixtures-7.1.0.ebuild b/dev-python/testfixtures/testfixtures-7.1.0.ebuild
index c50e76c3183e..1bdfecad4772 100644
--- a/dev-python/testfixtures/testfixtures-7.1.0.ebuild
+++ b/dev-python/testfixtures/testfixtures-7.1.0.ebuild
@@ -16,7 +16,7 @@ HOMEPAGE="
 
 SLOT="0"
 LICENSE="MIT"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux"
 
 BDEPEND="
 	test? (
diff --git a/dev-python/tornado/tornado-6.2-r1.ebuild b/dev-python/tornado/tornado-6.2-r1.ebuild
new file mode 100644
index 000000000000..fca1e6ba5acb
--- /dev/null
+++ b/dev-python/tornado/tornado-6.2-r1.ebuild
@@ -0,0 +1,69 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="Python web framework and asynchronous networking library"
+HOMEPAGE="
+	https://www.tornadoweb.org/
+	https://github.com/tornadoweb/tornado/
+	https://pypi.org/project/tornado/
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+IUSE="examples test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/twisted-16.0.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			>=dev-python/pycurl-7.19.3.1[${PYTHON_USEDEP}]
+		' 'python*')
+	)
+"
+
+distutils_enable_sphinx docs \
+	dev-python/sphinx-rtd-theme \
+	dev-python/sphinxcontrib-asyncio
+
+src_prepare() {
+	# Disable deprecation-warnings-as-errors because tornado has a lot of stuff deprecated in 3.10
+	sed 's/warnings.filterwarnings("error", category=DeprecationWarning, module=r"tornado\\..*")//' \
+		-i tornado/test/runtests.py || die
+	# broken upstream
+	sed -i -e 's:test_multi_line_headers:_&:' \
+		tornado/test/httpclient_test.py || die
+	# network-sandbox? ipv6?
+	sed -i -e 's:test_localhost:_&:' \
+		tornado/test/netutil_test.py || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local -x ASYNC_TEST_TIMEOUT=60
+	cd "${T}" || die
+	"${EPYTHON}" -m tornado.test.runtests --verbose ||
+		die "tests failed under ${EPYTHON}"
+}
+
+python_install_all() {
+	if use examples; then
+		docinto examples
+		dodoc -r demos/.
+		docompress -x /usr/share/doc/${PF}/examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/tornado/tornado-6.2.ebuild b/dev-python/tornado/tornado-6.2.ebuild
index 42e5eb9c67c6..393b4b0cb304 100644
--- a/dev-python/tornado/tornado-6.2.ebuild
+++ b/dev-python/tornado/tornado-6.2.ebuild
@@ -7,7 +7,7 @@ DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{7,8,9,10,11} )
 PYTHON_REQ_USE="threads(+)"
 
-inherit distutils-r1
+inherit distutils-r1 pypi
 
 DESCRIPTION="Python web framework and asynchronous networking library"
 HOMEPAGE="
@@ -15,7 +15,6 @@ HOMEPAGE="
 	https://github.com/tornadoweb/tornado/
 	https://pypi.org/project/tornado/
 "
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="Apache-2.0"
 SLOT="0"
diff --git a/dev-python/translate-toolkit/Manifest b/dev-python/translate-toolkit/Manifest
index d9889a939500..e24c8a4845fa 100644
--- a/dev-python/translate-toolkit/Manifest
+++ b/dev-python/translate-toolkit/Manifest
@@ -1,4 +1,2 @@
-DIST translate-3.8.3.gh.tar.gz 1157587 BLAKE2B 4dc8ca9cb7f0040364ceeb6fae47d9189642e8383fb1c808713aeb82452690ffe5957c63d649994eae486efaa51aee664fa7b0bb199036d869a87d7a0bf21806 SHA512 ad5a814cc03ed0d41aeac60bea72133fcd47470ab254849647d674bc00b71f2afe1c0956891decc6906fafbd07c4e3d5efcf4212c0e449f3fb3fb4fdbee9aab8
 DIST translate-3.8.4.gh.tar.gz 1158012 BLAKE2B 37d26792b9382d318e359db3c7087cbf71a444c4f76c9b3fcec9311820ade1d3f346d7ff4b22983d6a49e0afd47b4277d2c0222e2982d56f52fcf7f655bd349b SHA512 28d452d9da1d1b400e88a30b9f997dd70ab2db5e6ae33a7882203bf6b59abf6bd315bee97c9f01de536dc752fde93429bb65aeb7b6386482193a68a472bd2e9a
-DIST translate-3.8.5.gh.tar.gz 1158381 BLAKE2B efa51a672bac419e0cf847099f68f33882b8a60c339b157f2a3144014e10b5c241a0817fd93755e2327afd9b9dd923f28c4f22c3a950fe95189bfb6592dd4c83 SHA512 687aadbdaeddd33de64224e33fdf2f47f3b368d5f22e8d79f580ab407595bda0fbdbbb45edeeddff4b0d583eb4238de9ecb7514289ff4ae8fb387c3d089374de
 DIST translate-3.8.6.gh.tar.gz 1158560 BLAKE2B 127083188e3f25551e1a55b4499fb2247e7fb7c751d813f6a78491ec2f1e457e0c18d3416cf05533d11e36201b36814054f4eaf94693d04351a0928a0347fa98 SHA512 271b34ac44835af2e50537ec5a6a5d4dff497fd3358fe53c92e800109a347206d544f71bee7181ec335736a462578913262ddfbb27d4bcef39f247338bc99134
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.8.3.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.8.3.ebuild
deleted file mode 100644
index 2049cf28d4a2..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.8.3.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="amd64 arm64 x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-		# Apparently a change in line wrapping x_x
-		translate/storage/test_cpo.py::TestCPOFile::test_wrap_gettext
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		translate/storage/test_fluent.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.8.4.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.8.4.ebuild
index 4fec614ce01a..2049cf28d4a2 100644
--- a/dev-python/translate-toolkit/translate-toolkit-3.8.4.ebuild
+++ b/dev-python/translate-toolkit/translate-toolkit-3.8.4.ebuild
@@ -22,7 +22,7 @@ S="${WORKDIR}"/${MY_P}
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 arm64 x86"
 IUSE="+html +ical +ini +subtitles +yaml"
 
 RDEPEND="
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.8.5.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.8.5.ebuild
deleted file mode 100644
index 4fec614ce01a..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.8.5.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-		# Apparently a change in line wrapping x_x
-		translate/storage/test_cpo.py::TestCPOFile::test_wrap_gettext
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		translate/storage/test_fluent.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-
-	python_optimize
-}
diff --git a/dev-python/translate-toolkit/translate-toolkit-3.8.6.ebuild b/dev-python/translate-toolkit/translate-toolkit-3.8.6.ebuild
deleted file mode 100644
index a817dc88f0a3..000000000000
--- a/dev-python/translate-toolkit/translate-toolkit-3.8.6.ebuild
+++ /dev/null
@@ -1,96 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit distutils-r1
-
-MY_P=translate-${PV}
-DESCRIPTION="Toolkit to convert between many translation formats"
-HOMEPAGE="
-	https://github.com/translate/translate/
-	https://pypi.org/project/translate-toolkit/
-"
-SRC_URI="
-	https://github.com/translate/translate/archive/${PV}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S="${WORKDIR}"/${MY_P}
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~x86"
-IUSE="+html +ical +ini +subtitles +yaml"
-
-RDEPEND="
-	app-text/iso-codes
-	>=dev-python/chardet-3.0.4[${PYTHON_USEDEP}]
-	dev-python/cheroot[${PYTHON_USEDEP}]
-	>=dev-python/Levenshtein-0.12.0[${PYTHON_USEDEP}]
-	>=dev-python/lxml-4.3.1[${PYTHON_USEDEP}]
-	>=dev-python/pycountry-19.8.18[${PYTHON_USEDEP}]
-	>=dev-python/pyparsing-3[${PYTHON_USEDEP}]
-	dev-python/ruamel-yaml[${PYTHON_USEDEP}]
-	sys-devel/gettext
-	html? ( dev-python/utidylib[${PYTHON_USEDEP}] )
-	ical? ( dev-python/vobject[${PYTHON_USEDEP}] )
-	ini? ( >=dev-python/iniparse-0.5[${PYTHON_USEDEP}] )
-	subtitles? ( media-video/gaupol[${PYTHON_USEDEP}] )
-	yaml? ( dev-python/pyyaml[${PYTHON_USEDEP}] )
-"
-BDEPEND="
-	test? ( dev-python/phply[${PYTHON_USEDEP}] )
-"
-
-distutils_enable_tests pytest
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Fails with network-sandbox (and even with it off but w/ softer fail)
-		'tests/xliff_conformance/test_xliff_conformance.py::test_open_office_to_xliff'
-		'tests/xliff_conformance/test_xliff_conformance.py::test_po_to_xliff'
-		# Apparently a change in line wrapping x_x
-		translate/storage/test_cpo.py::TestCPOFile::test_wrap_gettext
-	)
-	local EPYTEST_IGNORE=(
-		# unpackaged fluent.*
-		translate/storage/test_fluent.py
-	)
-
-	if ! use ini; then
-		EPYTEST_IGNORE+=(
-			translate/convert/test_ini2po.py
-			translate/convert/test_po2ini.py
-		)
-	fi
-
-	if ! use subtitles; then
-		EPYTEST_IGNORE+=(
-			translate/storage/test_subtitles.py
-		)
-	fi
-
-	# translate/storage/test_mo.py needs 'pocompile'
-	distutils_install_for_testing
-	epytest
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	if ! use html; then
-		rm "${ED}"/usr/bin/{html2po,po2html} || die
-	fi
-	if ! use ical; then
-		rm "${ED}"/usr/bin/{ical2po,po2ical} || die
-	fi
-	if ! use ini; then
-		rm "${ED}"/usr/bin/{ini2po,po2ini} || die
-	fi
-	if ! use subtitles; then
-		rm "${ED}"/usr/bin/{sub2po,po2sub} || die
-	fi
-}
diff --git a/dev-python/urllib3/Manifest b/dev-python/urllib3/Manifest
index 955b2de1b478..11ce92c79323 100644
--- a/dev-python/urllib3/Manifest
+++ b/dev-python/urllib3/Manifest
@@ -1 +1,2 @@
 DIST urllib3-1.26.14.tar.gz 300665 BLAKE2B d9373c6f88eae86bd74cbc1c20b352064135a5e3686cf594a3fc2375afa881696751a4e318970ce15adb8fadb60e334117e4d4e431eaa591ce7b13b7ce2ab606 SHA512 0a2dffcb4d3b199e1d82c2bb0d8f4e6b57466bdc43e31dbed62b392ef32e021f6d31cb53ebedef9e1a62b1113f7a370e9f0baa36e3fba942a2543473e4df0828
+DIST urllib3-1.26.15.tar.gz 301444 BLAKE2B 2681f0290a4f8b335dcdf384a0c0692cf51e88ea829f80c8c857be328b00c618978a84957da4e23826e4597fe90764eb36ab9acbbc33f9a6ec8df3e3ff3f4d48 SHA512 b6ddb29c15b2d729605a6acb7c602f18c75a937cdfe9649d35d790a59fbb1d96a8d68975ba0a4c073c9f1750e383c67b7566dbcd81b3e8611501e9f4153e9a2b
diff --git a/dev-python/urllib3/urllib3-1.26.15.ebuild b/dev-python/urllib3/urllib3-1.26.15.ebuild
new file mode 100644
index 000000000000..0d2678517dc8
--- /dev/null
+++ b/dev-python/urllib3/urllib3-1.26.15.ebuild
@@ -0,0 +1,78 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# please keep this ebuild at EAPI 8 -- sys-apps/portage dep
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{7,8,9,10,11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+PYTHON_REQ_USE="ssl(+)"
+
+inherit distutils-r1 pypi
+
+DESCRIPTION="HTTP library with thread-safe connection pooling, file post, and more"
+HOMEPAGE="
+	https://github.com/urllib3/urllib3/
+	https://pypi.org/project/urllib3/
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="brotli test"
+RESTRICT="!test? ( test )"
+
+# dev-python/{pyopenssl,cryptography,idna,certifi} are optional runtime
+# dependencies. Do not add them to RDEPEND. They should be unnecessary with
+# modern versions of python (>= 3.2).
+RDEPEND="
+	>=dev-python/PySocks-1.5.8[${PYTHON_USEDEP}]
+	<dev-python/PySocks-2.0[${PYTHON_USEDEP}]
+	dev-python/six[${PYTHON_USEDEP}]
+	brotli? ( dev-python/brotlicffi[${PYTHON_USEDEP}] )
+"
+BDEPEND="
+	test? (
+		$(python_gen_cond_dep "
+			${RDEPEND}
+			dev-python/brotlicffi[\${PYTHON_USEDEP}]
+			dev-python/mock[\${PYTHON_USEDEP}]
+			dev-python/pytest[\${PYTHON_USEDEP}]
+			dev-python/pytest-freezegun[\${PYTHON_USEDEP}]
+			>=dev-python/tornado-4.2.1[\${PYTHON_USEDEP}]
+			>=dev-python/trustme-0.5.3[\${PYTHON_USEDEP}]
+		" "${PYTHON_TESTED[@]}")
+	)
+"
+
+src_prepare() {
+	distutils-r1_src_prepare
+
+	# unbundle urllib3
+	rm src/urllib3/packages/six.py || die
+	find -name '*.py' -exec sed -i \
+		-e 's:\([.]*\|urllib3\.\)\?packages\.six:six:g' \
+		-e 's:from \([.]*\|urllib3\.\)\?packages import six:import six:g' \
+		{} + || die
+}
+
+python_test() {
+	local -x CI=1
+	# FIXME: get tornado ported
+	# please keep in sync with BDEPEND!
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local EPYTEST_DESELECT=(
+		# unstable (relies on warning count)
+		test/with_dummyserver/test_proxy_poolmanager.py::TestHTTPProxyManager::test_proxy_verified_warning
+	)
+	has "${EPYTHON}" python3.{8..10} && EPYTEST_DESELECT+=(
+		test/contrib/test_pyopenssl.py::TestPyOpenSSLHelpers::test_get_subj_alt_name
+	)
+
+	epytest
+}
diff --git a/dev-python/xlsxwriter/Manifest b/dev-python/xlsxwriter/Manifest
index 4ce53697a4e9..0e3b667d8411 100644
--- a/dev-python/xlsxwriter/Manifest
+++ b/dev-python/xlsxwriter/Manifest
@@ -1,2 +1,2 @@
-DIST XlsxWriter-RELEASE_3.0.7.gh.tar.gz 35214702 BLAKE2B 8af7a7da9f2e6fd3a8f794f906935ed9dc1389a710d8b60fbf74e419829e6d233ad122d8ce75de93a6d3229e394277fadd76239aac73e8949f7c4737430a0859 SHA512 e80b9cfa741984db5b0aebd083c0a3c12f987b1a851088bc16e52b56cadb69feb1b795c1061ebde56c7ab1bf17d7899e90b42facd45bcacf5ce6c7070208e6e9
 DIST XlsxWriter-RELEASE_3.0.8.gh.tar.gz 35224268 BLAKE2B 593236a4fa9aaa5fde3920cf3af4819afcc026b14160b61de41f7186ff594611a7f08e2a1befbd5a060f4f84c0f2541c773153c311154d1a94bba7260ae650f7 SHA512 c03e518cf517803f006fc13d314a40e54f47e4156ea16d46be023f3af727edd02aedbfe0e15da019fcec2b4f160643846f86c80c80d93be421cef33f1d11dae7
+DIST XlsxWriter-RELEASE_3.0.9.gh.tar.gz 36701357 BLAKE2B d53246e6d142395a59145dbf0ee453a014c351c8ed48eec2a2b4d370cbcc33c28c0f2703a9010c43f7bd59c1c89076a8ca814d1a8e7a233eb29301d7e03378f5 SHA512 4e0b505230bc40ab01b9015d333bb4e26b1538bdc3c1b349c71a5413ffd75741d5bee2755e8f916f278cdafe4a3097bc77203e7b678bd7834a287d3398ccb767
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.8.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.8.ebuild
index 5878ec751f37..40da2a81fa57 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.0.8.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.0.8.ebuild
@@ -23,6 +23,6 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-python/xlsxwriter/xlsxwriter-3.0.7.ebuild b/dev-python/xlsxwriter/xlsxwriter-3.0.9.ebuild
index 40da2a81fa57..5878ec751f37 100644
--- a/dev-python/xlsxwriter/xlsxwriter-3.0.7.ebuild
+++ b/dev-python/xlsxwriter/xlsxwriter-3.0.9.ebuild
@@ -23,6 +23,6 @@ S=${WORKDIR}/${MY_P}
 
 SLOT="0"
 LICENSE="BSD"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
 
 distutils_enable_tests pytest
diff --git a/dev-qt/qtimageformats/Manifest b/dev-qt/qtimageformats/Manifest
index dfbcfe603ad7..430562fe308d 100644
--- a/dev-qt/qtimageformats/Manifest
+++ b/dev-qt/qtimageformats/Manifest
@@ -1,3 +1,4 @@
 DIST qtimageformats-5.15.8-gentoo-kde-1.tar.xz 5000 BLAKE2B 1d1a5054267bf8e28051e4bdd6e2cb62f59dfc386d3d888071bab74fe818b7daec46baf9f9cd7d8bfad3e179c2d2c811e983008a7451255cf450f733988f3bb8 SHA512 68da3c1ee6f33dfdadd6e1ec7bca6a7c0f16671ebed232a4c12aac4d4fe2e61295901082362efd0b4e69c5576b35370a92063630da251bd71ff7d275825400d9
+DIST qtimageformats-5.15.8-gentoo-kde-2.tar.xz 6964 BLAKE2B 934e35ef39ba3e41d87842d5883cfef1e21f36fa3abbe20851cef33c4b652eab74b4dc704b926aaaecf6927183a36167c0879593511bf143749e51cea82feee9 SHA512 a5d1e3ef2706e4d28f0f72199f422c3c41b11836bbafee6800cfb498e242c3587c8d076ca1770e5b88e1b18590ef0a3e0bb98328aa87524c6f4c7ac385b995bb
 DIST qtimageformats-everywhere-opensource-src-5.15.8.tar.xz 1843016 BLAKE2B 55f4a0b212e63483d23a8a962ffafd826994088e00025291a502d371540e2d88217f5caeea03d40347ff756033b47ffa71e1e250673b977013b7dd5d190b0e7c SHA512 e601a1ebd0881e59c1f87df748faf63df12f552fe668d16af27a58421848ba4de822b4dc3fc54f23c17b818408b6af2edbfb0b59c29e7da8a272d25ac51d7cdd
 DIST qtimageformats-everywhere-src-6.4.2.tar.xz 1938812 BLAKE2B 65d1e5e7c415397cb411acc60fdb7ba316e986de30eb23a14c92f4fa6d3280bbb7aab2e592fd6d360052ba757472e8fd0aa35212fa3be545e07a4714bfe93ac7 SHA512 2bda0001295d1a27ee3018d7a7236525ee41f7de33d58805a71277b5a7d8f9506687a7bb9d6630e32cbcb89e340048591e9f9d29833a3bb4d8168c4779dc5320
diff --git a/dev-qt/qtimageformats/qtimageformats-5.15.8-r2.ebuild b/dev-qt/qtimageformats/qtimageformats-5.15.8-r2.ebuild
new file mode 100644
index 000000000000..be4f67c0b874
--- /dev/null
+++ b/dev-qt/qtimageformats/qtimageformats-5.15.8-r2.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+if [[ ${PV} != *9999* ]]; then
+	QT5_KDEPATCHSET_REV=2
+	KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+inherit qt5-build
+
+DESCRIPTION="Additional format plugins for the Qt image I/O system"
+
+IUSE="mng"
+
+DEPEND="
+	=dev-qt/qtcore-${QT5_PV}*
+	=dev-qt/qtgui-${QT5_PV}*
+	media-libs/libwebp:=
+	media-libs/tiff:=
+	mng? ( media-libs/libmng:= )
+"
+RDEPEND="${DEPEND}"
+
+src_configure() {
+	sed -e 's/qtConfig(jasper)/false:/' \
+		-i src/plugins/imageformats/imageformats.pro || die
+	qt_use_disable_config mng mng src/plugins/imageformats/imageformats.pro
+
+	qt5-build_src_configure
+}
diff --git a/dev-ruby/chronic/chronic-0.10.2-r1.ebuild b/dev-ruby/chronic/chronic-0.10.2-r1.ebuild
index 42b160ad19dd..e0b73a7ec84e 100644
--- a/dev-ruby/chronic/chronic-0.10.2-r1.ebuild
+++ b/dev-ruby/chronic/chronic-0.10.2-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_DOC=""
 RUBY_FAKEGEM_EXTRADOC="HISTORY.md README.md"
diff --git a/dev-ruby/hiera-eyaml/Manifest b/dev-ruby/hiera-eyaml/Manifest
index e96204128486..8bb06486fe67 100644
--- a/dev-ruby/hiera-eyaml/Manifest
+++ b/dev-ruby/hiera-eyaml/Manifest
@@ -1,3 +1 @@
-DIST hiera-eyaml-3.1.1.tar.gz 54848 BLAKE2B 8daa4925bf1fb945ddb5ce7a485c3bf2bfca8747eb0cf00530eb91307d18d3f5c73699a30631b80e7825baac3a8b0c1695bd0313906bc8c7aba9c3c00d69b9cc SHA512 3bc93ca31af96383401f28644490f5540a70cf719e47d340794daf6c8bcc7fe9800d1d1e6ba99aba344831966f8d15f1a1fd9d1522696457f0bdec79dd45a108
-DIST hiera-eyaml-3.2.2.tar.gz 59174 BLAKE2B 2e31d1d0807096757f338a3f112a2f853f9dc61d14f92720a06e8835ef5b2228cea1ef2db1d5d7a2758422158acca14e882e1fa88a3189fcc254573e15e32185 SHA512 ac7800d35cba9b11e1fcfd831419caa1fb32fc1747499f780a40005cf57a87be4562f52251b8f5482156ad98892d41fe5060e48f74a75a0d1657dd5c04b8ee92
 DIST hiera-eyaml-3.3.0.tar.gz 60385 BLAKE2B 222c0e531a0b713a0d996895168229468f131d9ce1dd786ef8337b5d9ec8a322e336bd12191253fb09e11d60682491081acd5b946a7257b6183e6533fe924811 SHA512 4bb81b87244177a4ab3ca80d0a5e67a8e6534dbdf4d489ca9f918ea97981e50d203e441cff6a35996878b6fa91815e00bdb8261e19359bb3f00efc14b1f25e0d
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild
deleted file mode 100644
index cb1acb35e03f..000000000000
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-3.1.1.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md PLUGINS.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Encrypted YAML backend for hiera"
-HOMEPAGE="https://github.com/TomPoulton/hiera-eyaml"
-SRC_URI="https://github.com/TomPoulton/hiera-eyaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/highline-1.6.19:*"
-ruby_add_rdepend "dev-ruby/optimist"
-ruby_add_rdepend "!!dev-ruby/hiera-eyaml:0" # both install the /usr/bin/eyaml binary
-
-ruby_add_bdepend "test? ( dev-util/cucumber ~dev-util/aruba-0.6.2 <app-admin/puppet-6 dev-ruby/hiera-eyaml-plaintext )"
-
-all_ruby_prepare() {
-	# Fix highline dependency to be compatible with more versions.
-	sed -i -e '/highline/ s/~>/>=/' \
-		-e '/gem.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e "s:/tmp:${T}:" \
-		features/sandbox/puppet/environments/local/modules/test/manifests/run.pp \
-		features/sandbox/puppet-hiera-merge/environments/local/modules/test/manifests/run.pp \
-		features/puppet.feature
-}
-
-each_ruby_prepare() {
-	# Run tests with the correct ruby interpreter
-	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '"${S}"'/bin/eyaml:' features/*.feature || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -S cucumber --format progress features || die
-}
diff --git a/dev-ruby/hiera-eyaml/hiera-eyaml-3.2.2.ebuild b/dev-ruby/hiera-eyaml/hiera-eyaml-3.2.2.ebuild
deleted file mode 100644
index c20c61b8599b..000000000000
--- a/dev-ruby/hiera-eyaml/hiera-eyaml-3.2.2.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-USE_RUBY="ruby26 ruby27"
-
-RUBY_FAKEGEM_TASK_DOC=""
-RUBY_FAKEGEM_EXTRADOC="README.md CHANGELOG.md PLUGINS.md"
-
-RUBY_FAKEGEM_GEMSPEC="${PN}.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Encrypted YAML backend for hiera"
-HOMEPAGE="https://github.com/TomPoulton/hiera-eyaml"
-SRC_URI="https://github.com/TomPoulton/hiera-eyaml/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="MIT"
-SLOT="3"
-KEYWORDS="~amd64 ~x86"
-IUSE="test"
-
-ruby_add_rdepend ">=dev-ruby/highline-1.6.19:*"
-ruby_add_rdepend "dev-ruby/optimist"
-ruby_add_rdepend "!!dev-ruby/hiera-eyaml:0" # both install the /usr/bin/eyaml binary
-
-ruby_add_bdepend "test? ( dev-util/cucumber ~dev-util/aruba-0.6.2 <app-admin/puppet-6 dev-ruby/hiera-eyaml-plaintext )"
-
-all_ruby_prepare() {
-	# Fix highline dependency to be compatible with more versions.
-	sed -i -e '/highline/ s/~>/>=/' \
-		-e '/gem.files/d' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	sed -i -e "s:/tmp:${T}:" \
-		features/sandbox/puppet/environments/local/modules/test/manifests/run.pp \
-		features/sandbox/puppet-hiera-merge/environments/local/modules/test/manifests/run.pp \
-		features/sandbox/puppet-envvar/environments/local/modules/test/manifests/run.pp \
-		features/puppet.feature
-}
-
-each_ruby_prepare() {
-	# Run tests with the correct ruby interpreter
-	sed -i -e 's:I run `eyaml:I run `'${RUBY}' '"${S}"'/bin/eyaml:' features/*.feature || die
-
-}
-
-each_ruby_test() {
-	${RUBY} -S cucumber --format progress features || die
-}
diff --git a/dev-ruby/highline/Manifest b/dev-ruby/highline/Manifest
index ccf43edf3690..8837783258c4 100644
--- a/dev-ruby/highline/Manifest
+++ b/dev-ruby/highline/Manifest
@@ -1 +1,2 @@
 DIST highline-2.0.3.tar.gz 234205 BLAKE2B 4748c3ad8a15e551162ab9f2eb6e176297d833d13e6f5db7898f99c71f25e8a2a01057b0438c5d30b56a66333bbba0da1a435cfa07db97f2ffc5e301157618ef SHA512 f432c8836040bcfb147a84efa2dd3feee7f3f6e03eafbf4232e9457aeef8cb9ca83fcf854d3b261f59a166666abc3f2c8fc0f1279a7efeb07dea8a13be22ebde
+DIST highline-2.1.0.tar.gz 234116 BLAKE2B e1e899093de7e162e83f4d2e694e5841cedc336063a4410cab392702241136d5eec258b53065ffcded567f0af163d04a25bbdfd0767211b059980e9e5effe7c9 SHA512 b763428d67b1eb77762b54b8e2dd39bda720589e7030db8694e793bb432fa94caa2848b23358e7eaea0ccb22d8a93e0a64aeef3865f7e9fec348bbebee19d713
diff --git a/dev-ruby/highline/highline-2.1.0.ebuild b/dev-ruby/highline/highline-2.1.0.ebuild
new file mode 100644
index 000000000000..b503aee0e9dc
--- /dev/null
+++ b/dev-ruby/highline/highline-2.1.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="Changelog.md README.md TODO"
+
+RUBY_FAKEGEM_GEMSPEC="highline.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Highline is a high-level command-line IO library for ruby"
+HOMEPAGE="https://github.com/JEG2/highline"
+SRC_URI="https://github.com/JEG2/highline/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+IUSE=""
+LICENSE="|| ( GPL-2 Ruby-BSD )"
+SLOT="$(ver_cut 1)"
+KEYWORDS="~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris"
+
+all_ruby_prepare() {
+	# fix up gemspec file not to call git
+	sed -i -e 's/git ls-files -z/find * -print0/' highline.gemspec || die
+
+	# Avoid unneeded dependencies
+	sed -i -e '/\(bundler\|code_statistics\)/ s:^:#:' \
+		-e '/PackageTask/,/end/ s:^:#:' Rakefile || die
+	sed -i -e '/simplecov/ s:^:#:' test/test_helper.rb || die
+
+	# Remove almost empty doc directory to allow rdoc recipe to work
+	rm -rf doc || die
+}
diff --git a/dev-ruby/nanotest/nanotest-0.9.4.1-r2.ebuild b/dev-ruby/nanotest/nanotest-0.9.4.1-r2.ebuild
new file mode 100644
index 000000000000..87113b2ee759
--- /dev/null
+++ b/dev-ruby/nanotest/nanotest-0.9.4.1-r2.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Extremely mynymal test framework"
+HOMEPAGE="https://github.com/mynyml/nanotest"
+LICENSE="MIT"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="0"
+IUSE=""
+
+each_ruby_test() {
+	${RUBY} -I.:lib test/test_nanotest.rb || die
+}
diff --git a/dev-ruby/pkg-config/metadata.xml b/dev-ruby/pkg-config/metadata.xml
index e9e0a934b17f..bbc78bdf5e2b 100644
--- a/dev-ruby/pkg-config/metadata.xml
+++ b/dev-ruby/pkg-config/metadata.xml
@@ -9,6 +9,8 @@
   <email>ruby@gentoo.org</email>
   <name>Gentoo Ruby Project</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="rubygems">pkg-config</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-ruby/pkg-config/pkg-config-1.5.1.ebuild b/dev-ruby/pkg-config/pkg-config-1.5.1.ebuild
index b02872e031f3..862cf2a04dd2 100644
--- a/dev-ruby/pkg-config/pkg-config-1.5.1.ebuild
+++ b/dev-ruby/pkg-config/pkg-config-1.5.1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="README.rdoc NEWS"
 
diff --git a/dev-ruby/power_assert/Manifest b/dev-ruby/power_assert/Manifest
index bf3ad5e65e72..6027d93319e3 100644
--- a/dev-ruby/power_assert/Manifest
+++ b/dev-ruby/power_assert/Manifest
@@ -1,4 +1,3 @@
-DIST power_assert-1.1.7.tar.gz 17361 BLAKE2B 54fe379af9231a1794534f0199bb587418ea6d0960f7ae5cfc3a9c484c692e08254b5bd7220120559cc1b9e6f1b85c73d0e8e58c115731faea72d70180a94336 SHA512 bc6649bf17f41f7c84611eb334b73b43a0b7c3892a46acb82ae7b43dcf43b7a556ad617a6806ce1d354796bc694cea9eef7cc47b1928102f1822a03e01160a35
 DIST power_assert-1.2.0.tar.gz 17358 BLAKE2B 8b75b34f5d80f8f52370816b916e3bc3a60493b8f52a910346c51c70770e0645566b8b7c3dd551d8bb1f1cbdac5dfcebe043457bd025d819e3782e75e41e0f16 SHA512 2f001f6223fc3fb586c7b0457f775379040e11eb83b5bdda51c02b2b24e531aecd6e12e6ec80bf9407a768ab1a10b0a6b4c8f1a92ca69ea702faf56202bb635c
 DIST power_assert-2.0.0.tar.gz 16994 BLAKE2B 5106e77566100274000c55af1bd2ff9aaf00185ed1821ac966587461919210d7460e30aefdb5a880e7ef59e4f536121371d0862df2af91cb274ed79ded8c9771 SHA512 e6faf3cf50d2c70ae421bae20b885ac858fe11b10b1a8562d9ca88afbd397fa4812631f2aa02638c273eed518091dfaa020b6c002c0559383ddca625404bcc1c
 DIST power_assert-2.0.1.tar.gz 17062 BLAKE2B 9c592c12e0722a3376fede86b1a609c4c5feec49dacdb74f5af96d7ee3024112525bdd57fd5d1763b3a599386ce6548d694f5a4b1207c356701c79046166ee42 SHA512 717d163050e45d889bbf50ee5caf4d91b143a0df45d8ed1be9588595fd485f05662d59ae6166d44b5cf987d6b2a1e77f40441f2aefd1051ff9cf679d3bcdddc6
diff --git a/dev-ruby/power_assert/power_assert-1.1.7.ebuild b/dev-ruby/power_assert/power_assert-1.1.7.ebuild
deleted file mode 100644
index 1056c61f570d..000000000000
--- a/dev-ruby/power_assert/power_assert-1.1.7.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
-
-RUBY_FAKEGEM_EXTRADOC="README.rdoc"
-
-RUBY_FAKEGEM_BINWRAP=""
-
-RUBY_FAKEGEM_GEMSPEC="power_assert.gemspec"
-
-inherit ruby-fakegem
-
-DESCRIPTION="Shows each value of variables and method calls in the expression"
-HOMEPAGE="https://github.com/k-tsj/power_assert"
-SRC_URI="https://github.com/k-tsj/power_assert/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-LICENSE="|| ( Ruby BSD-2 )"
-
-KEYWORDS="~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-
-SLOT="0"
-IUSE=""
-
-ruby_add_bdepend "test? ( dev-ruby/test-unit )"
-
-all_ruby_prepare() {
-	sed -i -e '/bundler/I s:^:#:' Rakefile test/test_helper.rb || die
-	sed -i -e '1igem "test-unit"' \
-		-e '/byebug/ s:^:#:' test/test_helper.rb || die
-
-	# Avoid git dependency
-	sed -i -e 's/git ls-files -z/find . -print0/' ${RUBY_FAKEGEM_GEMSPEC} || die
-
-	# Avoid circular dependency on byebug when bootstrapping ruby
-	sed -i -e '/byebug/ s:^:#:' -e '/test_core_ext_helper/ s:^:#:' test/test_helper.rb || die
-	rm test/test_core_ext_helper.rb test/trace_test.rb || die
-
-	# Avoid circular dependency on pry when bootstrapping ruby
-	sed -i -e '/pry/ s:^:#:' -e '/test_colorized_pp/,/^    end/ s:^:#:' test/block_test.rb || die
-}
diff --git a/dev-ruby/puppetdb-termini/puppetdb-termini-7.12.1.ebuild b/dev-ruby/puppetdb-termini/puppetdb-termini-7.12.1.ebuild
index 21001dc94028..a2b827c8e1b2 100644
--- a/dev-ruby/puppetdb-termini/puppetdb-termini-7.12.1.ebuild
+++ b/dev-ruby/puppetdb-termini/puppetdb-termini-7.12.1.ebuild
@@ -15,7 +15,7 @@ LICENSE="Apache-2.0"
 SLOT="0"
 IUSE=""
 # will need the same keywords as puppet
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
+KEYWORDS="amd64 ~arm64 ~ppc x86"
 
 RDEPEND+=""
 DEPEND+=""
diff --git a/dev-ruby/rcairo/rcairo-1.17.8.ebuild b/dev-ruby/rcairo/rcairo-1.17.8.ebuild
index 9476d5c60e1a..4f3fa7c8472b 100644
--- a/dev-ruby/rcairo/rcairo-1.17.8.ebuild
+++ b/dev-ruby/rcairo/rcairo-1.17.8.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby27"
+USE_RUBY="ruby27 ruby30 ruby31"
 
 RUBY_FAKEGEM_NAME="cairo"
 
diff --git a/dev-ruby/ruby-cairo-gobject/Manifest b/dev-ruby/ruby-cairo-gobject/Manifest
index 7f70af3b2295..c4c74d117a84 100644
--- a/dev-ruby/ruby-cairo-gobject/Manifest
+++ b/dev-ruby/ruby-cairo-gobject/Manifest
@@ -1 +1,2 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-3.5.1.tar.gz 2613400 BLAKE2B ab9b7e3b6322b5b89a6bf4d529d5b5abdfbe50b1e099cfba67f089bab3abd39c2a96b57305b13311e9c34957c57107e31708cc76ffa4c20d84af2294f7bf7bb4 SHA512 9423c18587c11b6c317a58ec817e886c99ab37b29271b1684d7c793655a121c8b20c9630347d5f248e687843fd888e2137dca5d3d232121d87565ee2707f2f21
diff --git a/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.5.1.ebuild b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.5.1.ebuild
new file mode 100644
index 000000000000..77cf9889f14d
--- /dev/null
+++ b/dev-ruby/ruby-cairo-gobject/ruby-cairo-gobject-3.5.1.ebuild
@@ -0,0 +1,17 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby cairo-gobject bindings"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE=""
+
+DEPEND+=" x11-libs/cairo"
+RDEPEND+=" x11-libs/cairo"
+
+ruby_add_rdepend "dev-ruby/rcairo
+	~dev-ruby/ruby-glib2-${PV}"
diff --git a/dev-ruby/ruby-gio2/Manifest b/dev-ruby/ruby-gio2/Manifest
index 7f70af3b2295..c4c74d117a84 100644
--- a/dev-ruby/ruby-gio2/Manifest
+++ b/dev-ruby/ruby-gio2/Manifest
@@ -1 +1,2 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-3.5.1.tar.gz 2613400 BLAKE2B ab9b7e3b6322b5b89a6bf4d529d5b5abdfbe50b1e099cfba67f089bab3abd39c2a96b57305b13311e9c34957c57107e31708cc76ffa4c20d84af2294f7bf7bb4 SHA512 9423c18587c11b6c317a58ec817e886c99ab37b29271b1684d7c793655a121c8b20c9630347d5f248e687843fd888e2137dca5d3d232121d87565ee2707f2f21
diff --git a/dev-ruby/ruby-gio2/ruby-gio2-3.5.1.ebuild b/dev-ruby/ruby-gio2/ruby-gio2-3.5.1.ebuild
new file mode 100644
index 000000000000..8613c818d0f3
--- /dev/null
+++ b/dev-ruby/ruby-gio2/ruby-gio2-3.5.1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby binding of gio-2"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/glib
+	test? ( sys-apps/dbus )"
+RDEPEND+=" dev-libs/glib"
+ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}
+	~dev-ruby/ruby-gobject-introspection-${PV}"
+
+all_ruby_prepare() {
+	ruby-ng-gnome2_all_ruby_prepare
+
+	# Avoid test requiring network access
+	rm -f test/test-resolver.rb || die
+}
+
+each_ruby_test() {
+	XDG_RUNTIME_DIR=${T} dbus-launch ${RUBY} test/run-test.rb || die
+}
diff --git a/dev-ruby/ruby-glib2/Manifest b/dev-ruby/ruby-glib2/Manifest
index 7f70af3b2295..c4c74d117a84 100644
--- a/dev-ruby/ruby-glib2/Manifest
+++ b/dev-ruby/ruby-glib2/Manifest
@@ -1 +1,2 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-3.5.1.tar.gz 2613400 BLAKE2B ab9b7e3b6322b5b89a6bf4d529d5b5abdfbe50b1e099cfba67f089bab3abd39c2a96b57305b13311e9c34957c57107e31708cc76ffa4c20d84af2294f7bf7bb4 SHA512 9423c18587c11b6c317a58ec817e886c99ab37b29271b1684d7c793655a121c8b20c9630347d5f248e687843fd888e2137dca5d3d232121d87565ee2707f2f21
diff --git a/dev-ruby/ruby-glib2/ruby-glib2-3.5.1.ebuild b/dev-ruby/ruby-glib2/ruby-glib2-3.5.1.ebuild
new file mode 100644
index 000000000000..0de91c6941c6
--- /dev/null
+++ b/dev-ruby/ruby-glib2/ruby-glib2-3.5.1.ebuild
@@ -0,0 +1,21 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby Glib2 bindings"
+KEYWORDS="~amd64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+RDEPEND+=" >=dev-libs/glib-2"
+DEPEND+=" >=dev-libs/glib-2"
+
+all_ruby_prepare() {
+	ruby-ng-gnome2_all_ruby_prepare
+
+	# Skip spawn tests since our sandbox also provides items in the
+	# environment and this makes the test fragile.
+	rm -v test/test-spawn.rb || die
+}
diff --git a/dev-ruby/ruby-gobject-introspection/Manifest b/dev-ruby/ruby-gobject-introspection/Manifest
index 7f70af3b2295..c4c74d117a84 100644
--- a/dev-ruby/ruby-gobject-introspection/Manifest
+++ b/dev-ruby/ruby-gobject-introspection/Manifest
@@ -1 +1,2 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-3.5.1.tar.gz 2613400 BLAKE2B ab9b7e3b6322b5b89a6bf4d529d5b5abdfbe50b1e099cfba67f089bab3abd39c2a96b57305b13311e9c34957c57107e31708cc76ffa4c20d84af2294f7bf7bb4 SHA512 9423c18587c11b6c317a58ec817e886c99ab37b29271b1684d7c793655a121c8b20c9630347d5f248e687843fd888e2137dca5d3d232121d87565ee2707f2f21
diff --git a/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.5.1.ebuild b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.5.1.ebuild
new file mode 100644
index 000000000000..78cb6138f3a3
--- /dev/null
+++ b/dev-ruby/ruby-gobject-introspection/ruby-gobject-introspection-3.5.1.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby GObjectIntrospection bindings"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE=""
+
+DEPEND+=" dev-libs/glib
+	dev-libs/gobject-introspection"
+RDEPEND+=" dev-libs/glib
+	dev-libs/gobject-introspection"
+
+ruby_add_rdepend "~dev-ruby/ruby-glib2-${PV}"
diff --git a/dev-ruby/ruby-poppler/Manifest b/dev-ruby/ruby-poppler/Manifest
index 7f70af3b2295..c4c74d117a84 100644
--- a/dev-ruby/ruby-poppler/Manifest
+++ b/dev-ruby/ruby-poppler/Manifest
@@ -1 +1,2 @@
 DIST ruby-gnome2-3.4.3.tar.gz 3136727 BLAKE2B 3b85136b90e7a9de14f38fbdb55d9c143719e697ff60fdd4c09921b5d0c6363cf27b7b2da55d93a95d302e62879c321df20e729d4a3d9d2e8d1f2a4afb8c6e49 SHA512 ac4614647c20080eb850d47938b00eb69730aef6672a35cf290619a5c3e01007ac59e75995e36398a0ddaed61db2f4ccdf9d26d2453fff9d5160073ee73081b8
+DIST ruby-gnome2-3.5.1.tar.gz 2613400 BLAKE2B ab9b7e3b6322b5b89a6bf4d529d5b5abdfbe50b1e099cfba67f089bab3abd39c2a96b57305b13311e9c34957c57107e31708cc76ffa4c20d84af2294f7bf7bb4 SHA512 9423c18587c11b6c317a58ec817e886c99ab37b29271b1684d7c793655a121c8b20c9630347d5f248e687843fd888e2137dca5d3d232121d87565ee2707f2f21
diff --git a/dev-ruby/ruby-poppler/ruby-poppler-3.5.1.ebuild b/dev-ruby/ruby-poppler/ruby-poppler-3.5.1.ebuild
new file mode 100644
index 000000000000..44060206a44a
--- /dev/null
+++ b/dev-ruby/ruby-poppler/ruby-poppler-3.5.1.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+USE_RUBY="ruby27 ruby30 ruby31"
+
+inherit ruby-ng-gnome2
+
+DESCRIPTION="Ruby poppler-glib bindings"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+IUSE=""
+
+RDEPEND+=" app-text/poppler[cairo,introspection]"
+DEPEND+=" app-text/poppler[cairo,introspection]"
+
+ruby_add_rdepend "
+	~dev-ruby/ruby-cairo-gobject-${PV}
+	~dev-ruby/ruby-gio2-${PV}
+"
diff --git a/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild b/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild
index 5728af528d19..36c215c8f501 100644
--- a/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild
+++ b/dev-ruby/tdiff/tdiff-0.3.4-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild b/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
index 90930b4d2aa8..e1b47024fede 100644
--- a/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
+++ b/dev-ruby/test_declarative/test_declarative-0.0.6-r1.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_TASK_TEST=""
 RUBY_FAKEGEM_TASK_DOC=""
diff --git a/dev-ruby/text/text-1.3.1-r1.ebuild b/dev-ruby/text/text-1.3.1-r1.ebuild
index 13dbdeba4ab9..7bf8a04eab96 100644
--- a/dev-ruby/text/text-1.3.1-r1.ebuild
+++ b/dev-ruby/text/text-1.3.1-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="README.rdoc"
 
diff --git a/dev-ruby/unf_ext/unf_ext-0.0.8.2.ebuild b/dev-ruby/unf_ext/unf_ext-0.0.8.2.ebuild
index 84439cff5805..fe64d468b346 100644
--- a/dev-ruby/unf_ext/unf_ext-0.0.8.2.ebuild
+++ b/dev-ruby/unf_ext/unf_ext-0.0.8.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="none"
 
@@ -20,7 +20,7 @@ HOMEPAGE="https://github.com/knu/ruby-unf_ext"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
+KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris"
 IUSE="doc test"
 
 ruby_add_bdepend "
diff --git a/dev-ruby/unicode-display_width/unicode-display_width-2.4.2.ebuild b/dev-ruby/unicode-display_width/unicode-display_width-2.4.2.ebuild
index 0be3be30a89d..f4bfe763a339 100644
--- a/dev-ruby/unicode-display_width/unicode-display_width-2.4.2.ebuild
+++ b/dev-ruby/unicode-display_width/unicode-display_width-2.4.2.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-ruby/websocket-extensions/websocket-extensions-0.1.5-r2.ebuild b/dev-ruby/websocket-extensions/websocket-extensions-0.1.5-r2.ebuild
new file mode 100644
index 000000000000..8754d315c927
--- /dev/null
+++ b/dev-ruby/websocket-extensions/websocket-extensions-0.1.5-r2.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="websocket-extensions.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Generic extension manager for WebSocket connections"
+HOMEPAGE="https://github.com/faye/websocket-extensions-ruby"
+SRC_URI="https://github.com/faye/websocket-extensions-ruby/archive/${PV}.tar.gz -> ${P}-r1.tar.gz"
+RUBY_S="${PN}-ruby-${PV}"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86"
+IUSE=""
+
+PATCHES=( "${FILESDIR}"/${P}-rspec-mocks.patch )
diff --git a/dev-ruby/windows_error/windows_error-0.1.5.ebuild b/dev-ruby/windows_error/windows_error-0.1.5.ebuild
index 61a07d8c514e..dbe004c2ac9f 100644
--- a/dev-ruby/windows_error/windows_error-0.1.5.ebuild
+++ b/dev-ruby/windows_error/windows_error-0.1.5.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
diff --git a/dev-ruby/wisper/wisper-2.0.1-r1.ebuild b/dev-ruby/wisper/wisper-2.0.1-r1.ebuild
new file mode 100644
index 000000000000..57f12cde852b
--- /dev/null
+++ b/dev-ruby/wisper/wisper-2.0.1-r1.ebuild
@@ -0,0 +1,25 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+
+RUBY_FAKEGEM_EXTRADOC="README.md"
+
+RUBY_FAKEGEM_BINWRAP=""
+
+inherit ruby-fakegem
+
+DESCRIPTION="A micro library providing objects with Publish-Subscribe capabilities"
+HOMEPAGE="https://github.com/krisleech/wisper"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE=""
+
+all_ruby_prepare() {
+	sed -i -e '/coverall/I s:^:#:' spec/spec_helper.rb || die
+}
diff --git a/dev-ruby/x25519/x25519-1.0.10.ebuild b/dev-ruby/x25519/x25519-1.0.10.ebuild
index 9033f7551f12..adf56b6d6bbf 100644
--- a/dev-ruby/x25519/x25519-1.0.10.ebuild
+++ b/dev-ruby/x25519/x25519-1.0.10.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
diff --git a/dev-ruby/xpath/metadata.xml b/dev-ruby/xpath/metadata.xml
index 246d194b7ec0..5f00057b881b 100644
--- a/dev-ruby/xpath/metadata.xml
+++ b/dev-ruby/xpath/metadata.xml
@@ -5,6 +5,8 @@
   <email>ruby@gentoo.org</email>
   <name>Gentoo Ruby Project</name>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="rubygems">xpath</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-ruby/xpath/xpath-3.2.0-r1.ebuild b/dev-ruby/xpath/xpath-3.2.0-r1.ebuild
index b1bc0903ead4..93dc28a3b062 100644
--- a/dev-ruby/xpath/xpath-3.2.0-r1.ebuild
+++ b/dev-ruby/xpath/xpath-3.2.0-r1.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="README.md"
 
@@ -12,7 +12,7 @@ RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 inherit ruby-fakegem
 
 DESCRIPTION="XPath is a Ruby DSL around a subset of XPath 1.0"
-HOMEPAGE="https://github.com/jnicklas/xpath"
+HOMEPAGE="https://github.com/teamcapybara/xpath"
 LICENSE="MIT"
 
 KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
diff --git a/dev-ruby/yajl-ruby/yajl-ruby-1.4.3.ebuild b/dev-ruby/yajl-ruby/yajl-ruby-1.4.3.ebuild
index 8c2758e3540e..e1ae1fa3528c 100644
--- a/dev-ruby/yajl-ruby/yajl-ruby-1.4.3.ebuild
+++ b/dev-ruby/yajl-ruby/yajl-ruby-1.4.3.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-USE_RUBY="ruby26 ruby27 ruby30 ruby31"
+USE_RUBY="ruby27 ruby30 ruby31 ruby32"
 
 RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
 
diff --git a/dev-util/breakpad/Manifest b/dev-util/breakpad/Manifest
index c40a261b2261..b17d5765b09e 100644
--- a/dev-util/breakpad/Manifest
+++ b/dev-util/breakpad/Manifest
@@ -1,2 +1 @@
-DIST breakpad-2022.06.04.tar.gz 5365322 BLAKE2B eec33092a9a75161d16554af22276195945f3e1c7ce9590f89010a4d11484fe4327849c1717e159a9e019ca44d437b601b7080c68bba8c95111b97d6662dfc3f SHA512 150e5e955dc9de55d5cb4c726ae6f1a2e79e9f7bb283bae2ba835b684e7fd7532a7070e9ba982b66b68c936592bc48550a22ed8ac40e829b11aa80530f338749
 DIST breakpad-2022.07.12.tar.gz 5373070 BLAKE2B 3598bcebf249c73a13eb77743ee993fb96ebf9585a68e45169afcf34fb836a126ce3b8d71e78dedd3407b843297857619de39fc38661ff80545d572dde098ea1 SHA512 872fa74520709d6510b798c7adfb7fed34a84b1831e774087515c23a005b0ea76ef7758bb565f0ff9f2153206cf53958621463fba0e055c9d31dc68f687e2b8f
diff --git a/dev-util/breakpad/breakpad-2022.06.04.ebuild b/dev-util/breakpad/breakpad-2022.06.04.ebuild
deleted file mode 100644
index 66912e949d83..000000000000
--- a/dev-util/breakpad/breakpad-2022.06.04.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit autotools
-
-CommitId=41a11409d6ba04e308adc66f5a33115e2d7c9174
-DESCRIPTION="implement a crash-reporting system."
-HOMEPAGE="https://chromium.googlesource.com/breakpad/breakpad/"
-SRC_URI="https://github.com/google/${PN}/archive/${CommitId}.tar.gz
-	-> ${P}.tar.gz"
-
-LICENSE="BSD BSD-4"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-
-RDEPEND="
-	net-misc/curl
-"
-DEPEND="${RDEPEND}
-	dev-libs/linux-syscall-support
-	dev-embedded/libdisasm
-"
-BDEPEND="test? ( dev-cpp/gtest )"
-RESTRICT="!test? ( test )"
-
-S="${WORKDIR}"/${PN}-${CommitId}
-
-PATCHES=(
-	"${FILESDIR}"/${P}-test.patch
-	"${FILESDIR}"/${P}-gentoo.patch
-)
-
-src_prepare() {
-	default
-	sed -i \
-		-e 's|"third_party/lss\(.*\)"|<lss\1>|' \
-		$(find src -name '*.cc' -o -name '*.h') \
-		|| die
-	sed -i \
-		-e '/includelss/d' \
-		-e '/third_party\/curl/d' \
-		Makefile.am \
-		|| die
-	sed -i \
-		-e "/AC_INIT/s:0.1:${PVR}:" \
-		-e "/AS_VAR_APPEND/d" \
-		configure.ac \
-		|| die
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--enable-system-test-libs \
-		|| die
-}
diff --git a/dev-util/breakpad/breakpad-2022.07.12.ebuild b/dev-util/breakpad/breakpad-2022.07.12.ebuild
index 5fb691383145..eac86e3033e5 100644
--- a/dev-util/breakpad/breakpad-2022.07.12.ebuild
+++ b/dev-util/breakpad/breakpad-2022.07.12.ebuild
@@ -26,6 +26,7 @@ BDEPEND="test? ( dev-cpp/gtest )"
 RESTRICT="!test? ( test )"
 
 PATCHES=(
+	"${FILESDIR}"/${P}-gcc13.patch
 	"${FILESDIR}"/${PN}-2022.06.04-gentoo.patch
 )
 
diff --git a/dev-util/breakpad/files/breakpad-2022.06.04-test.patch b/dev-util/breakpad/files/breakpad-2022.06.04-test.patch
deleted file mode 100644
index 7bf1d78290ab..000000000000
--- a/dev-util/breakpad/files/breakpad-2022.06.04-test.patch
+++ /dev/null
@@ -1,49 +0,0 @@
---- a/src/common/dwarf_cu_to_module_unittest.cc	2022-06-06 21:31:46.537946012 +0200
-+++ b/src/common/dwarf_cu_to_module_unittest.cc	2022-06-06 21:33:27.299716909 +0200
-@@ -780,7 +780,7 @@
-                0x2805c4531be6ca0eULL, 0x686b52155a8d4d2cULL);
- }
- 
--TEST_F(SimpleCU, UnknownAbstractOrigin) {
-+TEST_F(SimpleCU, DISABLED_UnknownAbstractOrigin) {
-   EXPECT_CALL(reporter_, UnknownAbstractOrigin(_, 1ULL)).WillOnce(Return());
-   EXPECT_CALL(reporter_, UnnamedFunction(0x11c70f94c6e87ccdLL))
-     .WillOnce(Return());
-@@ -798,7 +798,7 @@
-                0x1758a0f941b71efbULL, 0x1cf154f1f545e146ULL);
- }
- 
--TEST_F(SimpleCU, UnnamedFunction) {
-+TEST_F(SimpleCU, DISABLED_UnnamedFunction) {
-   EXPECT_CALL(reporter_, UnnamedFunction(0xe34797c7e68590a8LL))
-     .WillOnce(Return());
-   PushLine(0x72b80e41a0ac1d40ULL, 0x537174f231ee181cULL, "line-file", 14044850);
-@@ -1573,7 +1573,7 @@
-   EXPECT_STREQ("class_A::member_func_B", functions[0]->name.str().c_str());
- }
- 
--TEST_F(Specifications, UnhandledInterCU) {
-+TEST_F(Specifications, DISABLED_UnhandledInterCU) {
-   Module m("module-name", "module-os", "module-arch", "module-id");
-   DwarfCUToModule::FileContext fc("dwarf-filename", &m, false);
-   EXPECT_CALL(reporter_, UncoveredFunction(_)).WillOnce(Return());
-@@ -1630,7 +1630,7 @@
-   }
- }
- 
--TEST_F(Specifications, BadOffset) {
-+TEST_F(Specifications, DISABLED_BadOffset) {
-   PushLine(0xa0277efd7ce83771ULL, 0x149554a184c730c1ULL, "line-file", 56636272);
-   EXPECT_CALL(reporter_, UnknownSpecification(_, 0x2be953efa6f9a996ULL))
-     .WillOnce(Return());
---- a/src/common/module_unittest.cc	2022-06-06 21:33:46.167486242 +0200
-+++ b/src/common/module_unittest.cc	2022-06-06 21:34:02.480286684 +0200
-@@ -427,7 +427,7 @@
-                contents.c_str());
- }
- 
--TEST(Construct, FunctionsWithSameAddress) {
-+TEST(Construct, DISABLED_FunctionsWithSameAddress) {
-   stringstream s;
-   Module m(MODULE_NAME, MODULE_OS, MODULE_ARCH, MODULE_ID);
- 
diff --git a/dev-util/breakpad/files/breakpad-2022.07.12-gcc13.patch b/dev-util/breakpad/files/breakpad-2022.07.12-gcc13.patch
new file mode 100644
index 000000000000..9f989bf2907a
--- /dev/null
+++ b/dev-util/breakpad/files/breakpad-2022.07.12-gcc13.patch
@@ -0,0 +1,10 @@
+--- a/src/client/linux/handler/minidump_descriptor.h	2023-03-11 08:49:06.385815254 +0100
++++ b/src/client/linux/handler/minidump_descriptor.h	2023-03-11 08:49:42.758139412 +0100
+@@ -33,6 +33,7 @@
+ #include <assert.h>
+ #include <sys/types.h>
+ 
++#include <cstdint>
+ #include <string>
+ 
+ #include "client/linux/handler/microdump_extra_info.h"
diff --git a/dev-util/cucumber-core/Manifest b/dev-util/cucumber-core/Manifest
index 83b06e67fdce..ae72856381ff 100644
--- a/dev-util/cucumber-core/Manifest
+++ b/dev-util/cucumber-core/Manifest
@@ -1,2 +1,3 @@
 DIST cucumber-core-10.1.1.tar.gz 202764 BLAKE2B c5704ed4821d056aea7bf537c7193bb8965be5a6d0effad0f85f76c18e62acf7a2de981da05826fbd27c1e55122ba3ca9873729332a9840280d1638838af27c9 SHA512 c7c4de1c53a58b74e632019a9a69b3bac164da72ee3cef839d19c9548707c06ddac5e562013ca86992ca3d78ad96f23521ff69de83b3e9e614a336cc3d6ba9a6
 DIST cucumber-core-11.0.0.tar.gz 202792 BLAKE2B a85074a9bad6b91dcb2b409eee6162efed6890868b762ebd221ea2ab383a029eb7d7f605813e6e73f6bcbf4c526ffb94f26e7338e6cfdd94abf28d631bbd989e SHA512 fd2cb97d72f24e5a5c00336e4243594270546225a027ee23907256d81fdc9be01c017a4d25dea85727ca834a6d3e3fb1ae003357cf530eab9d44fc211d52f331
+DIST cucumber-core-11.1.0.tar.gz 200962 BLAKE2B 5ac40ca2114a925c93f98b363443b560f24f5103c23e6ec3ae429cfdd1c1039367a64212a87c6079aacc94a2da757f2e8f889d57f6a46ceff5ff58810101e86e SHA512 02918828b9f626ac9a6d451b5d8ce4f19df01cd628c008c4a1b2b926f27d6af1353ce4bde5cd05bd1ce560449e37cc2db971049a4b8230f0c85cf0b05d0a462d
diff --git a/dev-util/cucumber-core/cucumber-core-11.1.0.ebuild b/dev-util/cucumber-core/cucumber-core-11.1.0.ebuild
new file mode 100644
index 000000000000..2da33d44c222
--- /dev/null
+++ b/dev-util/cucumber-core/cucumber-core-11.1.0.ebuild
@@ -0,0 +1,38 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+USE_RUBY="ruby27 ruby30 ruby31"
+
+RUBY_FAKEGEM_RECIPE_TEST="rspec3"
+RUBY_FAKEGEM_EXTRADOC="CHANGELOG.md README.md"
+
+RUBY_FAKEGEM_GEMSPEC="cucumber-core.gemspec"
+
+inherit ruby-fakegem
+
+DESCRIPTION="Executable feature scenarios"
+HOMEPAGE="https://cucumber.io/"
+SRC_URI="https://github.com/cucumber/cucumber-ruby-core/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+RUBY_S="cucumber-ruby-core-${PV}"
+LICENSE="Ruby"
+
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+SLOT="$(ver_cut 1)"
+IUSE="test"
+
+ruby_add_bdepend "
+	test? (
+		>=dev-ruby/unindent-1.0
+	)"
+
+ruby_add_rdepend "
+	>=dev-util/cucumber-gherkin-23.0.1:23
+	>=dev-util/cucumber-messages-18.0.0:18
+	>=dev-util/cucumber-tag-expressions-4.1.0:4
+"
+
+all_ruby_prepare() {
+	# Avoid dependency on kramdown to keep dependency list manageable for all arches.
+	rm -f spec/readme_spec.rb || die
+}
diff --git a/dev-util/cucumber-core/metadata.xml b/dev-util/cucumber-core/metadata.xml
index 0ffac7f6bb67..e2b475cab0e2 100644
--- a/dev-util/cucumber-core/metadata.xml
+++ b/dev-util/cucumber-core/metadata.xml
@@ -4,6 +4,8 @@
  <maintainer type="person">
   <email>graaff@gentoo.org</email>
  </maintainer>
- 
+ <upstream>
+  <remote-id type="rubygems">cucumber-core</remote-id>
+ </upstream>
  <origin>gentoo-staging</origin>
 </pkgmetadata>
\ No newline at end of file
diff --git a/dev-util/cvise/cvise-2.7.0.ebuild b/dev-util/cvise/cvise-2.7.0.ebuild
index 1033e314cb90..f2b2c92e45a1 100644
--- a/dev-util/cvise/cvise-2.7.0.ebuild
+++ b/dev-util/cvise/cvise-2.7.0.ebuild
@@ -15,7 +15,7 @@ SRC_URI="
 
 LICENSE="UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 1edea9832f73..b055e2dfd698 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -5,4 +5,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/dev-util/lldb/lldb-17.0.0_pre20230225.ebuild b/dev-util/lldb/lldb-17.0.0_pre20230225.ebuild
deleted file mode 100644
index 6366c380f05a..000000000000
--- a/dev-util/lldb/lldb-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,114 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit cmake llvm llvm.org python-single-r1
-
-DESCRIPTION="The LLVM debugger"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="debug +libedit lzma ncurses +python test +xml"
-RESTRICT="test"
-REQUIRED_USE=${PYTHON_REQUIRED_USE}
-
-DEPEND="
-	libedit? ( dev-libs/libedit:0= )
-	lzma? ( app-arch/xz-utils:= )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0= )
-	xml? ( dev-libs/libxml2:= )
-	~sys-devel/clang-${PV}
-	~sys-devel/llvm-${PV}
-"
-RDEPEND="
-	${DEPEND}
-	python? (
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-		${PYTHON_DEPS}
-	)
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	python? (
-		>=dev-lang/swig-3.0.11
-		$(python_gen_cond_dep '
-			dev-python/six[${PYTHON_USEDEP}]
-		')
-	)
-	test? (
-		$(python_gen_cond_dep "
-			~dev-python/lit-${PV}[\${PYTHON_USEDEP}]
-			dev-python/psutil[\${PYTHON_USEDEP}]
-		")
-		sys-devel/lld
-	)
-"
-
-LLVM_COMPONENTS=( lldb cmake llvm/utils )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local mycmakeargs=(
-		-DLLDB_ENABLE_CURSES=$(usex ncurses)
-		-DLLDB_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLDB_ENABLE_PYTHON=$(usex python)
-		-DLLDB_ENABLE_LUA=OFF
-		-DLLDB_ENABLE_LZMA=$(usex lzma)
-		-DLLDB_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-
-		-DLLDB_INCLUDE_TESTS=$(usex test)
-
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		# TODO: fix upstream to detect this properly
-		-DHAVE_LIBDL=ON
-		-DHAVE_LIBPTHREAD=ON
-
-		# normally we'd have to set LLVM_ENABLE_TERMINFO, HAVE_TERMINFO
-		# and TERMINFO_LIBS... so just force FindCurses.cmake to use
-		# ncurses with complete library set (including autodetection
-		# of -ltinfo)
-		-DCURSES_NEED_NCURSES=ON
-
-		-DLLDB_EXTERNAL_CLANG_RESOURCE_DIR="${BROOT}/usr/lib/clang/${LLVM_MAJOR}"
-
-		-DLLVM_MAIN_SRC_DIR="${WORKDIR}/llvm"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lldb-{shell,unit}
-	# failures + hangs
-	#use python && cmake_build check-lldb-api
-}
-
-src_install() {
-	cmake_src_install
-	find "${D}" -name '*.a' -delete || die
-
-	use python && python_optimize
-}
diff --git a/eclass/ruby-ng-gnome2.eclass b/eclass/ruby-ng-gnome2.eclass
index 4c48e94df703..7abf84f6034b 100644
--- a/eclass/ruby-ng-gnome2.eclass
+++ b/eclass/ruby-ng-gnome2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # @ECLASS: ruby-ng-gnome2.eclass
@@ -45,7 +45,7 @@ ruby_add_bdepend "
 	dev-ruby/pkg-config
 	test? ( >=dev-ruby/test-unit-2 )"
 SRC_URI="mirror://sourceforge/ruby-gnome2/ruby-gnome2-all-${PV}.tar.gz"
-HOMEPAGE="https://ruby-gnome2.osdn.jp/"
+HOMEPAGE="https://ruby-gnome.github.io/"
 LICENSE="LGPL-2.1+"
 SLOT="0"
 if ver_test -ge "3.4.0"; then
diff --git a/eclass/verify-sig.eclass b/eclass/verify-sig.eclass
index 91433bf53453..f67a3b10a0bf 100644
--- a/eclass/verify-sig.eclass
+++ b/eclass/verify-sig.eclass
@@ -144,9 +144,16 @@ verify-sig_verify_detached() {
 			# gpg can't handle very long TMPDIR
 			# https://bugs.gentoo.org/854492
 			local -x TMPDIR=/tmp
-			gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \
-				gpg --verify "${sig}" "${file}" ||
-				die "PGP signature verification failed"
+			if has_version ">=app-portage/gemato-20"; then
+				gemato openpgp-verify-detached -K "${key}" \
+					"${extra_args[@]}" \
+					"${sig}" "${file}" ||
+					die "PGP signature verification failed"
+			else
+				gemato gpg-wrap -K "${key}" "${extra_args[@]}" -- \
+					gpg --verify "${sig}" "${file}" ||
+					die "PGP signature verification failed"
+			fi
 			;;
 		signify)
 			signify -V -p "${key}" -m "${file}" -x "${sig}" ||
diff --git a/games-action/ddnet/Manifest b/games-action/ddnet/Manifest
index 4da33d5200b8..75d93731a4ee 100644
--- a/games-action/ddnet/Manifest
+++ b/games-action/ddnet/Manifest
@@ -2,7 +2,7 @@ DIST cc-1.0.73.crate 57880 BLAKE2B be8d7a25a54afdd759844e76aec61526fc2bd5ca09480
 DIST cxx-1.0.71.crate 195479 BLAKE2B 956f735ad6a417337dd6e0f71ba49d21e8ad9724e288b8d05a013c76bdeb0c3565197f8fc02f861a13f68c6823a969b05852c4abc0ef48d3deb4a3ede3ce7d3c SHA512 1b770312e5ea69a9fa3882e2e507d9de4505dbf09fdab4e6cacdeed7a00122b1cc88583d7353959cd0375a380b7e8563a673c4602fc036130f248db97225b305
 DIST cxxbridge-flags-1.0.71.crate 5593 BLAKE2B 4f3c72079b42cf41c66dc779a792c76d860e7b85220508b9284b23645b8fae3911864b76719457952bb3b7e666312022def72204c2d096afa2683716cb9f0c5d SHA512 53f5783c4c15b87eac8f6c7ca911b5b3c92a5821040c4000586a118b441aaab17f798f878433436e881f0edd531d9243234cdb4bacfea16fe1f60df080a2d6b9
 DIST cxxbridge-macro-1.0.71.crate 59620 BLAKE2B ce4b5bfc016a799312cfc2000bcc7b0b701636a558b66d079e3a69ed3a4c83c3c22cbba7bcd3168107d5dd3a0728e2e8887c0089ac7ef022957cc0559ed7a2c5 SHA512 13b0f742ecf4724214b896bcd3c4fedff011751661bd657ca902f123fcb869e835ce850acb1cb9ebe0cb1d13fb9aecc74c7730586ebd465500c2e01cfe686dbc
-DIST ddnet-16.7.2.tar.gz 35917634 BLAKE2B cb1bcf786f7862f4da580b96dbda5a1604557f2c9856b08b532480364f537e2d7894a0685e6db38954a8104dee17641c776a9baa391d799499aeb51be522c189 SHA512 92846b82ea4501d7bb00ff947ea1e5bfafa29fd91dc3bc18bd110084de0c04bfcde3f6d847d684286e7297e51c67e5696265b3dec3f7877f86daa17c0d495afd
+DIST ddnet-16.8.tar.gz 35928199 BLAKE2B 21a30fcacbce5290213b18225aa53fe236aa684cce658ab7621b9ac2a7656079b012352d66bb5dfd29154884b0d3fddec1a1575ed132c4969b63bf4a0be910c6 SHA512 f46e021f833fcd9fc371b8cd2ea70408632615a6023e573dbdbed8da8ef8c36bc728f07194aff9a2a453e51bfb173402f4f6504c9b6edda95abad160b2eccf0a
 DIST link-cplusplus-1.0.6.crate 8150 BLAKE2B 82b0eb89926a7f3b7e427242ff3f65eba78f467f1ab972f7f280daf09e2be7188d8e851a21018a268871d5dc9cf7dfda4ef24952b5bc38bd722a5537504c1ddb SHA512 9f77f71f7261472de0d97b2c26efb43f3d49dafbaa1eb853340467260a65d85344e94e023540e068051108afd63cc48c6a5c8025f50922a73dc6409134418e74
 DIST proc-macro2-1.0.40.crate 40559 BLAKE2B d83cf7283393a82ca65263afc375d123bd2f48b719c9eab6859c52dc0c2b9b4b5af3090a0ebd0fedf0e1095f0bafbc443016f751a0485dc654bcd80a6f71e326 SHA512 bb179524bd41e36735010a7ec53e096359ffc3688ab97806a45ed9cfb17e8688ce352bbb8cd3bd4e15a4299e8500603c86591b17cfa31bca03f299f6f6347992
 DIST quote-1.0.20.crate 28160 BLAKE2B db257025f64817b1b58eecb8e64e63f1782d8a7fcb42ed6c3364254ec5a26705e49ce0637c880b0355b99a77473ce3083caae2cfabbd1a1a7e4fc826bae2cb7c SHA512 d12f4a425273b99ae655da11fcf5dad2609e20ad3e7d85cde08c7d09f444a5c7a3505470bad2d48b1ba8ea59ebf38ab87aa1052e47ec414acfc05dcb07d438be
diff --git a/games-action/ddnet/ddnet-16.7.2-r1.ebuild b/games-action/ddnet/ddnet-16.8.ebuild
index 63b53c3a0a89..63b53c3a0a89 100644
--- a/games-action/ddnet/ddnet-16.7.2-r1.ebuild
+++ b/games-action/ddnet/ddnet-16.8.ebuild
diff --git a/gui-apps/grim/grim-1.4.0-r1.ebuild b/gui-apps/grim/grim-1.4.0-r1.ebuild
index 71e6455cca6a..a3bbdf2d9a17 100644
--- a/gui-apps/grim/grim-1.4.0-r1.ebuild
+++ b/gui-apps/grim/grim-1.4.0-r1.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit bash-completion-r1 meson
 
 DESCRIPTION="Grab images from a Wayland compositor"
-HOMEPAGE="https://github.com/emersion/grim"
+HOMEPAGE="https://sr.ht/~emersion/grim"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
+	EGIT_REPO_URI="https://git.sr.ht/~emersion/${PN}"
 else
 	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="amd64 arm64 ~loong ~ppc64 ~riscv x86"
diff --git a/gui-apps/grim/grim-1.4.0-r3.ebuild b/gui-apps/grim/grim-1.4.0-r3.ebuild
index 11d407ffb990..c7d894147e60 100644
--- a/gui-apps/grim/grim-1.4.0-r3.ebuild
+++ b/gui-apps/grim/grim-1.4.0-r3.ebuild
@@ -6,11 +6,11 @@ EAPI=8
 inherit bash-completion-r1 meson
 
 DESCRIPTION="Grab images from a Wayland compositor"
-HOMEPAGE="https://github.com/emersion/grim"
+HOMEPAGE="https://sr.ht/~emersion/grim"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
+	EGIT_REPO_URI="https://git.sr.ht/~emersion/${PN}"
 else
 	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
diff --git a/gui-apps/grim/grim-9999.ebuild b/gui-apps/grim/grim-9999.ebuild
index 11d407ffb990..654a78d5cc27 100644
--- a/gui-apps/grim/grim-9999.ebuild
+++ b/gui-apps/grim/grim-9999.ebuild
@@ -6,14 +6,15 @@ EAPI=8
 inherit bash-completion-r1 meson
 
 DESCRIPTION="Grab images from a Wayland compositor"
-HOMEPAGE="https://github.com/emersion/grim"
+HOMEPAGE="https://sr.ht/~emersion/grim"
 
 if [[ ${PV} == 9999 ]]; then
 	inherit git-r3
-	EGIT_REPO_URI="https://github.com/emersion/${PN}.git"
+	EGIT_REPO_URI="https://git.sr.ht/~emersion/${PN}"
 else
 	SRC_URI="https://github.com/emersion/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86"
+	S="${WORKDIR}/${PN}-v${PV}"
 fi
 
 LICENSE="MIT"
diff --git a/gui-apps/grim/metadata.xml b/gui-apps/grim/metadata.xml
index 862667d283cd..0b27d549fe86 100644
--- a/gui-apps/grim/metadata.xml
+++ b/gui-apps/grim/metadata.xml
@@ -6,8 +6,8 @@
   <name>Arthur Zamarin</name>
  </maintainer>
  <upstream>
-  <changelog>https://github.com/emersion/grim/releases</changelog>
-  <bugs-to>https://github.com/emersion/grim/issues</bugs-to>
+  <changelog>https://git.sr.ht/~emersion/grim/refs</changelog>
+  <bugs-to>https://todo.sr.ht/~emersion/grim</bugs-to>
  </upstream>
  <use>
   <flag name="jpeg">Enable JPEG support.</flag>
diff --git a/media-fonts/lxgw-wenkai/Manifest b/media-fonts/lxgw-wenkai/Manifest
index 109c4f9caf86..fcfb6026e912 100644
--- a/media-fonts/lxgw-wenkai/Manifest
+++ b/media-fonts/lxgw-wenkai/Manifest
@@ -1,2 +1 @@
-DIST lxgw-wenkai-v1.245.1.tar.gz 60584493 BLAKE2B 6f70587359cf6e05dfa63b8c4fd9ced2cbb320d3b722ac48015669f84f20ed7528ab34bcc2ab0dc6069438d279008c46d915a3f86bd3013b2e1c807a3db2c9ec SHA512 f8c95c5e8486ef7c87ad40574b4f1dabddfc84fb74bfbfa1097b7c9221c1700d6933f949a5be7647a45a636d7402c5ae50fbf67a4cc63b574200daa0ab1e2dca
 DIST lxgw-wenkai-v1.250.tar.gz 61555569 BLAKE2B c1b98aa2c508f75cd83d88a24b9b69556745e527b95d908303715648d69ca09a2ef20360715def813c20e54a2756d054d3317586562954c4b1ae738c51c0cfb5 SHA512 c40f400d92890fadd6f625f2744a97df5206a0ef6b21a2d3642a97b97c39f6513f08f41daaa0c41c0367079becfcb6f7ecb7300c984b371e12cd2b37684caaa2
diff --git a/media-fonts/lxgw-wenkai/lxgw-wenkai-1.245.1.ebuild b/media-fonts/lxgw-wenkai/lxgw-wenkai-1.245.1.ebuild
deleted file mode 100644
index 40ec69277a5e..000000000000
--- a/media-fonts/lxgw-wenkai/lxgw-wenkai-1.245.1.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit font
-
-MY_P="${PN}-v${PV}"
-
-DESCRIPTION="An open-source Chinese font derived from Fontworks' Klee One"
-HOMEPAGE="https://github.com/lxgw/LxgwWenKai"
-SRC_URI="https://github.com/lxgw/LxgwWenKai/releases/download/v${PV}/${MY_P}.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="OFL-1.1"
-SLOT="0"
-KEYWORDS="amd64 ~loong"
-
-FONT_SUFFIX="ttf"
diff --git a/media-fonts/lxgw-wenkai/lxgw-wenkai-1.250.ebuild b/media-fonts/lxgw-wenkai/lxgw-wenkai-1.250.ebuild
index e979d4d78470..58a680ac7a77 100644
--- a/media-fonts/lxgw-wenkai/lxgw-wenkai-1.250.ebuild
+++ b/media-fonts/lxgw-wenkai/lxgw-wenkai-1.250.ebuild
@@ -14,6 +14,6 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~loong"
+KEYWORDS="amd64 ~loong"
 
 FONT_SUFFIX="ttf"
diff --git a/media-fonts/smiley-sans/smiley-sans-1.1.1.ebuild b/media-fonts/smiley-sans/smiley-sans-1.1.1.ebuild
index cc9a18b5bb0d..3c28d73d7b25 100644
--- a/media-fonts/smiley-sans/smiley-sans-1.1.1.ebuild
+++ b/media-fonts/smiley-sans/smiley-sans-1.1.1.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}"
 
 LICENSE="OFL-1.1"
 SLOT="0"
-KEYWORDS="~amd64 ~loong"
+KEYWORDS="amd64 ~loong"
 
 BDEPEND="app-arch/unzip"
 
diff --git a/media-libs/libde265/Manifest b/media-libs/libde265/Manifest
index 6d20c97ef4c1..32075533abd1 100644
--- a/media-libs/libde265/Manifest
+++ b/media-libs/libde265/Manifest
@@ -1,2 +1,3 @@
+DIST libde265-1.0.11.tar.gz 845996 BLAKE2B 91711132757a10f0f277800525ee6f6a3902604cc969b8756232b15b581d830951d70bccd57d7731b3ad670a3b7a0d2c22e9578f3763da65b3cdeb016422568b SHA512 2ce28558c66e20714c07bf3011bc10dccabb770649903616bc32f1c4f18beba559ef7e0e42365ead77d7e813316b8c051039dc393cd351221cbab7248b3fa34c
 DIST libde265-1.0.8.tar.gz 381963 BLAKE2B 0577623de2ef86e1122b5b5c3642a750bb222c4988a996168e060e8ffd9f5c0787d31331cc8738362d3fc3fb31e8eb659629cab068f0ff1c71de9d15ed1f2ceb SHA512 0007138cb5da0d4cad1e118c01de249580f39c387a11f490d1e1f63ad0968ee2f7951e54580f298b3dbe31e5a3d1a7fa04454e11cbb82beaf8a9aaf56f5532ed
 DIST libde265-1.0.9.tar.gz 845520 BLAKE2B 155a0ac1e14c568c0fb559beb89f3bbde67239ae2ac13dda5ad30d36b59a79d68f399c8d8192ad5190cb8286b03ab03714a9cf89ac139264773c4ff368a97b7e SHA512 225f9aa25eb6565ebf4f549d9d427ae278c4f6f67c76c51bcad79188faac0f5c93e9538357b264a7e2e9043014ccbc07750fb7d1ce1e7bb87fe2e0d1782cba61
diff --git a/media-libs/libde265/libde265-1.0.11.ebuild b/media-libs/libde265/libde265-1.0.11.ebuild
new file mode 100644
index 000000000000..ca34a4a3dccb
--- /dev/null
+++ b/media-libs/libde265/libde265-1.0.11.ebuild
@@ -0,0 +1,95 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools multilib-minimal
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strukturag/libde265/releases/download/v${PV}/${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
+fi
+
+DESCRIPTION="Open h.265 video codec implementation"
+HOMEPAGE="https://github.com/strukturag/libde265"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="enc265 dec265 sdl tools debug cpu_flags_x86_sse4_1 cpu_flags_arm_neon cpu_flags_arm_thumb"
+# IUSE+=" sherlock265" # Require libvideogfx or libswscale
+
+RDEPEND="
+	dec265? (
+		sdl? ( media-libs/libsdl )
+	)"
+
+# Sherlock265 require libvideogfx or libswscale
+#RDEPEND+="
+#	sherlock265? (
+#		media-libs/libsdl
+#		dev-qt/qtcore:5
+#		dev-qt/qtgui:5
+#		dev-qt/qtwidgets:5
+#		media-libs/libswscale
+#	)
+#"
+
+DEPEND="${RDEPEND}"
+BDEPEND="dec265? ( virtual/pkgconfig )"
+
+# Sherlock265 require libvideogfx or libswscale
+#BDEPEND+=" sherlock265? ( virtual/pkgconfig )"
+
+PATCHES=( "${FILESDIR}"/${PN}-1.0.2-qtbindir.patch )
+
+src_prepare() {
+	default
+
+	eautoreconf
+
+	# without this, headers would be missing and make would fail
+	multilib_copy_sources
+}
+
+multilib_src_configure() {
+	local myeconfargs=(
+		--enable-log-error
+		ax_cv_check_cflags___msse4_1=$(usex cpu_flags_x86_sse4_1)
+		ax_cv_check_cflags___mfpu_neon=$(usex cpu_flags_arm_neon)
+		$(use_enable cpu_flags_arm_thumb thumb)
+		$(use_enable debug log-info)
+		$(use_enable debug log-debug)
+		$(use_enable debug log-trace)
+		$(multilib_native_use_enable enc265 encoder)
+		$(multilib_native_use_enable dec265)
+	)
+
+	# myeconfargs+=( $(multilib_native_use_enable sherlock265) ) # Require libvideogfx or libswscale
+	myeconfargs+=( --disable-sherlock265 )
+
+	econf "${myeconfargs[@]}"
+}
+
+multilib_src_install() {
+	default
+
+	if multilib_is_native_abi; then
+		# Remove useless, unready and test tools
+		rm "${ED}"/usr/bin/{tests,gen-enc-table,yuv-distortion} || die
+		if ! use tools; then
+			rm "${ED}"/usr/bin/{bjoentegaard,block-rate-estim,rd-curves} || die
+			rm "${ED}"/usr/bin/acceleration_speed || die
+		fi
+	else
+		# Remove all non-native binary tools
+		rm "${ED}"/usr/bin/* || die
+	fi
+}
+
+multilib_src_install_all() {
+	find "${ED}" -name '*.la' -delete || die
+	einstalldocs
+}
diff --git a/media-libs/libde265/libde265-9999.ebuild b/media-libs/libde265/libde265-9999.ebuild
index 4146cf2ae597..ca34a4a3dccb 100644
--- a/media-libs/libde265/libde265-9999.ebuild
+++ b/media-libs/libde265/libde265-9999.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit autotools multilib-minimal
 
@@ -9,7 +9,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/strukturag/${PN}.git"
 	inherit git-r3
 else
-	SRC_URI="https://github.com/strukturag/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	SRC_URI="https://github.com/strukturag/libde265/releases/download/v${PV}/${P}.tar.gz"
 	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86"
 fi
 
@@ -56,7 +56,6 @@ src_prepare() {
 
 multilib_src_configure() {
 	local myeconfargs=(
-		--disable-static
 		--enable-log-error
 		ax_cv_check_cflags___msse4_1=$(usex cpu_flags_x86_sse4_1)
 		ax_cv_check_cflags___mfpu_neon=$(usex cpu_flags_arm_neon)
diff --git a/media-libs/libjxl/libjxl-0.8.1.ebuild b/media-libs/libjxl/libjxl-0.8.1.ebuild
index 61a7eb7e8346..f0a32bb60695 100644
--- a/media-libs/libjxl/libjxl-0.8.1.ebuild
+++ b/media-libs/libjxl/libjxl-0.8.1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/libjxl/libjxl/archive/refs/tags/v${PV}.tar.gz -> ${P
 
 LICENSE="BSD"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 IUSE="openexr"
 
 DEPEND="app-arch/brotli:=[${MULTILIB_USEDEP}]
diff --git a/media-libs/openal/openal-1.23.0.ebuild b/media-libs/openal/openal-1.23.0.ebuild
index 587f7b664b0f..b3fd182c7af9 100644
--- a/media-libs/openal/openal-1.23.0.ebuild
+++ b/media-libs/openal/openal-1.23.0.ebuild
@@ -19,7 +19,7 @@ S="${WORKDIR}"/${MY_P}
 # Some components are under BSD
 LICENSE="LGPL-2+ BSD"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux"
 IUSE="
 	alsa coreaudio debug jack oss pipewire portaudio pulseaudio sdl sndio qt5
 	cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse4_1
diff --git a/media-libs/vidstab/Manifest b/media-libs/vidstab/Manifest
index d586baac9173..d37af8ce52f7 100644
--- a/media-libs/vidstab/Manifest
+++ b/media-libs/vidstab/Manifest
@@ -1 +1,2 @@
 DIST vidstab-1.1.0.tar.gz 77736 BLAKE2B 382cec922e9e7d521f49b431a5ddb246e331e186bf11707221a6bae0ce6544278a4c855c35e0346a78e4be105057c01ad7d53671ea22cbd2500aba4640cc96c7 SHA512 e82a4b6dd854b8415952cc0a8bdea06c01ff40a497c8e98177831e29031ec535b9f47cc30d5444c47bfd91871615a1662e3991185e9eb179acf37ea601073cdf
+DIST vidstab-1.1.1.tar.gz 80717 BLAKE2B e2ce03d24358404c617816466ad3fd715999ef4d391617e9cec7923353ba2ce4ac3b3eedce67f3fadf3bd6fdfb2e4516a5b95c3fca9f613e367b1490ec78ae0a SHA512 b27ac95ab5302e9500af5a52cb09f557b9dacbdc4dc57a9781e2f9ae65a6ffea396f9819bca1f6a103f9d1896bf3061f1cb647166b14b8de8e89a1b15f010e5c
diff --git a/media-libs/vidstab/vidstab-1.1.1.ebuild b/media-libs/vidstab/vidstab-1.1.1.ebuild
new file mode 100644
index 000000000000..277ef59b6bbc
--- /dev/null
+++ b/media-libs/vidstab/vidstab-1.1.1.ebuild
@@ -0,0 +1,62 @@
+# Copyright 2018-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit cmake-multilib toolchain-funcs
+
+DESCRIPTION="Video stabilization library"
+HOMEPAGE="http://public.hronopik.de/vid.stab/"
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/georgmartius/vid.stab.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/georgmartius/vid.stab/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	S="${WORKDIR}/vid.stab-${PV}"
+fi
+
+LICENSE="GPL-2+"
+SLOT="0"
+IUSE="openmp cpu_flags_x86_sse2"
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+pkg_setup() {
+	[[ ${MERGE_TYPE} != binary ]] && use openmp && tc-check-openmp
+}
+
+src_prepare() {
+	# USE=cpu_flags_x86_sse2 instead
+	sed -E 's#include (FindSSE)##' -i CMakeLists.txt || die
+	sed -E 's#include (FindSSE)##' -i tests/CMakeLists.txt || die
+	# strip some CFLAGS
+	for FILE_TO_PATCH in {,transcode/,tests/}CMakeLists.txt; do
+		sed -E 's#(add_definitions.* )-g #\1#' -i ${FILE_TO_PATCH} || die
+		sed -E 's#(add_definitions.* )-O3 #\1#' -i ${FILE_TO_PATCH} || die
+	done
+	cmake_src_prepare
+}
+
+src_configure() {
+	local mycmakeargs=(
+		-DUSE_OMP="$(usex openmp)"
+		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
+	)
+	cmake-multilib_src_configure
+}
+
+multilib_src_test() {
+	local mycmakeargs=(
+		-DUSE_OMP="$(usex openmp)"
+		-DSSE2_FOUND="$(usex cpu_flags_x86_sse2)"
+	)
+	local CMAKE_USE_DIR="${CMAKE_USE_DIR}/tests"
+	local BUILD_DIR="${BUILD_DIR}/tests"
+	cmake_src_configure
+	cmake_build
+	"${BUILD_DIR}"/tests || die
+}
diff --git a/metadata/md5-cache/app-accessibility/rhvoice-1.6.0 b/metadata/md5-cache/app-accessibility/rhvoice-1.6.0
index d5ed0519fd03..ba9b01a5e4ea 100644
--- a/metadata/md5-cache/app-accessibility/rhvoice-1.6.0
+++ b/metadata/md5-cache/app-accessibility/rhvoice-1.6.0
@@ -12,5 +12,5 @@ RDEPEND=ao? ( media-libs/libao ) portaudio? ( media-libs/portaudio ) pulseaudio?
 REQUIRED_USE=|| ( ao portaudio pulseaudio )
 SLOT=0
 SRC_URI=https://github.com/rhvoice/rhvoice/releases/download/1.6.0/rhvoice-1.6.0.tar.gz verify-sig? ( https://github.com/rhvoice/rhvoice/releases/download/1.6.0/rhvoice-1.6.0.tar.gz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fbfd7607ea51ce19d21117d309c30e3e
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.89 b/metadata/md5-cache/app-admin/awscli-1.27.89
new file mode 100644
index 000000000000..29693073a7f2
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.27.89
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-forked[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/botocore-1.29.89[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Universal Command Line Environment for AWS
+EAPI=8
+HOMEPAGE=https://github.com/aws/aws-cli/ https://pypi.org/project/awscli/
+INHERIT=bash-completion-r1 distutils-r1 multiprocessing
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.89[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/rsa[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] !app-admin/awscli-bin python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/aws-cli/archive/1.27.89.tar.gz -> aws-cli-1.27.89.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=49e74325243b7907e30dd121cb06f7f4
diff --git a/metadata/md5-cache/app-admin/logrotate-3.20.1-r1 b/metadata/md5-cache/app-admin/logrotate-3.20.1-r1
index b28d687cd216..6cd7a075407b 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.20.1-r1
+++ b/metadata/md5-cache/app-admin/logrotate-3.20.1-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.20.1/logrotate-3.20.1.tar.xz verify-sig? ( https://github.com/logrotate/logrotate/releases/download/3.20.1/logrotate-3.20.1.tar.xz.asc )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=afb09f3ba2a133dbf71a470ea3510ca7
diff --git a/metadata/md5-cache/app-admin/logrotate-3.21.0 b/metadata/md5-cache/app-admin/logrotate-3.21.0
index 5ffb5769a3ae..6a2d4097b216 100644
--- a/metadata/md5-cache/app-admin/logrotate-3.21.0
+++ b/metadata/md5-cache/app-admin/logrotate-3.21.0
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/popt-1.5 selinux? ( sys-libs/libselinux ) acl? ( virtual/acl ) selinux? ( sec-policy/selinux-logrotate ) cron? ( virtual/cron ) virtual/tmpfiles
 SLOT=0
 SRC_URI=https://github.com/logrotate/logrotate/releases/download/3.21.0/logrotate-3.21.0.tar.xz verify-sig? ( https://github.com/logrotate/logrotate/releases/download/3.21.0/logrotate-3.21.0.tar.xz.asc )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=e4bbcd029a9a482c1f7a977b98f05779
diff --git a/metadata/md5-cache/app-admin/puppet-7.23.0 b/metadata/md5-cache/app-admin/puppet-7.23.0
index 4a7bddc6b8a9..b8ebfd3c10cb 100644
--- a/metadata/md5-cache/app-admin/puppet-7.23.0
+++ b/metadata/md5-cache/app-admin/puppet-7.23.0
@@ -1,18 +1,18 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/hiera[ruby_targets_ruby30(-)] dev-ruby/json:=[ruby_targets_ruby30(-)] dev-ruby/semantic_puppet[ruby_targets_ruby30(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby30(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby30(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby30(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby30(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby30(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) virtual/ruby-ssl[ruby_targets_ruby30(-)] dev-ruby/hocon[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/hiera[ruby_targets_ruby31(-)] dev-ruby/json:=[ruby_targets_ruby31(-)] dev-ruby/semantic_puppet[ruby_targets_ruby31(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby31(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby31(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby31(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby31(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby31(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby31(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby31(-)] ) virtual/ruby-ssl[ruby_targets_ruby31(-)] dev-ruby/hocon[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( doc? ( dev-ruby/yard[ruby_targets_ruby27(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby27(-)] dev-ruby/rack[ruby_targets_ruby27(-)] dev-ruby/rspec-its[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/yard[ruby_targets_ruby30(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby30(-)] dev-ruby/rack[ruby_targets_ruby30(-)] dev-ruby/rspec-its[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/yard[ruby_targets_ruby31(-)] ) test? ( dev-ruby/mocha[ruby_targets_ruby31(-)] dev-ruby/rack[ruby_targets_ruby31(-)] dev-ruby/rspec-its[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=A system automation and configuration management software
 EAPI=7
 HOMEPAGE=https://puppet.com/
 INHERIT=ruby-fakegem systemd tmpfiles
-IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby27 doc test test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+IUSE=augeas diff doc emacs ldap rrdtool selinux shadow sqlite vim-syntax test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=Apache-2.0 GPL-2
 PDEPEND=emacs? ( >=app-emacs/puppet-mode-0.3-r1 )
-RDEPEND=ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) virtual/tmpfiles
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/hiera[ruby_targets_ruby30(-)] dev-ruby/json:=[ruby_targets_ruby30(-)] dev-ruby/semantic_puppet[ruby_targets_ruby30(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby30(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby30(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby30(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby30(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby30(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) virtual/ruby-ssl[ruby_targets_ruby30(-)] dev-ruby/hocon[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/hiera[ruby_targets_ruby31(-)] dev-ruby/json:=[ruby_targets_ruby31(-)] dev-ruby/semantic_puppet[ruby_targets_ruby31(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby31(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby31(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby31(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby31(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby31(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby31(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby31(-)] ) virtual/ruby-ssl[ruby_targets_ruby31(-)] dev-ruby/hocon[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-ruby/hiera[ruby_targets_ruby27(-)] dev-ruby/json:=[ruby_targets_ruby27(-)] dev-ruby/semantic_puppet[ruby_targets_ruby27(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby27(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby27(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby27(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby27(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby27(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby27(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby27(-)] ) virtual/ruby-ssl[ruby_targets_ruby27(-)] dev-ruby/hocon[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/hiera[ruby_targets_ruby30(-)] dev-ruby/json:=[ruby_targets_ruby30(-)] dev-ruby/semantic_puppet[ruby_targets_ruby30(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby30(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby30(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby30(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby30(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby30(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby30(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby30(-)] ) virtual/ruby-ssl[ruby_targets_ruby30(-)] dev-ruby/hocon[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/hiera[ruby_targets_ruby31(-)] dev-ruby/json:=[ruby_targets_ruby31(-)] dev-ruby/semantic_puppet[ruby_targets_ruby31(-)] >=dev-ruby/facter-3.0.0[ruby_targets_ruby31(-)] dev-ruby/concurrent-ruby[ruby_targets_ruby31(-)] augeas? ( dev-ruby/ruby-augeas[ruby_targets_ruby31(-)] ) diff? ( dev-ruby/diff-lcs[ruby_targets_ruby31(-)] ) doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ldap? ( dev-ruby/ruby-ldap[ruby_targets_ruby31(-)] ) shadow? ( dev-ruby/ruby-shadow[ruby_targets_ruby31(-)] ) sqlite? ( dev-ruby/sqlite3[ruby_targets_ruby31(-)] ) virtual/ruby-ssl[ruby_targets_ruby31(-)] dev-ruby/hocon[ruby_targets_ruby31(-)] ) rrdtool? ( >=net-analyzer/rrdtool-1.2.23[ruby] ) selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) vim-syntax? ( >=app-vim/puppet-syntax-3.0.1 ) >=app-portage/eix-0.18.0 acct-user/puppet acct-group/puppet ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) virtual/tmpfiles
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=http://downloads.puppetlabs.com/puppet/puppet-7.23.0.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2827d36f9386868bbbce232ff1550104
+_md5_=86b26c4e8880ef23fc3f228f49e5d4e3
diff --git a/metadata/md5-cache/app-admin/puppet-agent-7.23.0 b/metadata/md5-cache/app-admin/puppet-agent-7.23.0
index 1ac48c8f1e37..1b11bb2e0f7e 100644
--- a/metadata/md5-cache/app-admin/puppet-agent-7.23.0
+++ b/metadata/md5-cache/app-admin/puppet-agent-7.23.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://puppet.com/
 INHERIT=systemd unpacker tmpfiles
 IUSE=puppetdb selinux
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 ~arm64
 LICENSE=Apache-2.0
 RDEPEND=!app-admin/puppet !dev-ruby/hiera !dev-ruby/facter app-emulation/virt-what acct-user/puppet acct-group/puppet virtual/libcrypt:= app-portage/eix sys-apps/dmidecode sys-libs/libselinux sys-libs/glibc sys-libs/readline:0/8 sys-libs/libxcrypt[compat] sys-libs/ncurses:0[tinfo] selinux? ( sys-libs/libselinux[ruby] sec-policy/selinux-puppet ) puppetdb? ( >=dev-ruby/puppetdb-termini-5.0.1 ) virtual/tmpfiles
 RESTRICT=strip
 SLOT=0
 SRC_URI=amd64? ( http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.23.0-1focal_amd64.deb ) arm64? ( http://apt.puppetlabs.com/pool/focal/puppet/p/puppet-agent/puppet-agent_7.23.0-1focal_arm64.deb )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
-_md5_=42f154f19211a6fcd31ad65763d6255d
+_md5_=49b97aaab5a2ac94cf7a7d3e866731a2
diff --git a/metadata/md5-cache/app-admin/puppetdb-7.12.1 b/metadata/md5-cache/app-admin/puppetdb-7.12.1
index 0ea703baaa83..08647c42e1eb 100644
--- a/metadata/md5-cache/app-admin/puppetdb-7.12.1
+++ b/metadata/md5-cache/app-admin/puppetdb-7.12.1
@@ -5,10 +5,10 @@ DESCRIPTION=PuppetDB collects data generated by Puppet
 EAPI=7
 HOMEPAGE=https://puppet.com/
 INHERIT=systemd tmpfiles
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0 virtual/tmpfiles
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppetdb/puppetdb-7.12.1.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a0f98e4ba91ea67c227e5e882c01bc21
+_md5_=89c6b913c1fbf9f31e147928d717b280
diff --git a/metadata/md5-cache/app-admin/puppetserver-7.9.5 b/metadata/md5-cache/app-admin/puppetserver-7.9.5
index 81b43f103878..f24a2394ebfb 100644
--- a/metadata/md5-cache/app-admin/puppetserver-7.9.5
+++ b/metadata/md5-cache/app-admin/puppetserver-7.9.5
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://puppet.com/
 INHERIT=systemd tmpfiles
 IUSE=puppetdb
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=Apache-2.0
 RDEPEND=>=virtual/jdk-1.8.0 app-admin/puppet-agent[puppetdb?] virtual/tmpfiles
 SLOT=0
 SRC_URI=https://downloads.puppetlabs.com/puppet/puppetserver-7.9.5.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5ea40afe11c9b351e57b17dd70e440be
+_md5_=8c8f3bb846250475ba4f5fef4803a5ca
diff --git a/metadata/md5-cache/app-admin/stow-2.3.1 b/metadata/md5-cache/app-admin/stow-2.3.1
index fee7b29c30c6..11ca17a8d282 100644
--- a/metadata/md5-cache/app-admin/stow-2.3.1
+++ b/metadata/md5-cache/app-admin/stow-2.3.1
@@ -12,5 +12,5 @@ RDEPEND=dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/stow/stow-2.3.1.tar.bz2 verify-sig? ( mirror://gnu/stow/stow-2.3.1.tar.bz2.sig )
-_eclasses_=perl-functions	c3fca037246e877693badea0df3b0ef8	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=perl-functions	c3fca037246e877693badea0df3b0ef8	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=0431d3145b6da5416e74912faa996451
diff --git a/metadata/md5-cache/app-antivirus/lkrg-0.9.5 b/metadata/md5-cache/app-antivirus/lkrg-0.9.5
index 358fe6e1ca00..5ea283a7d6f5 100644
--- a/metadata/md5-cache/app-antivirus/lkrg-0.9.5
+++ b/metadata/md5-cache/app-antivirus/lkrg-0.9.5
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://lkrg.org/download/lkrg-0.9.5.tar.gz verify-sig? ( https://lkrg.org/download/lkrg-0.9.5.tar.gz.sign )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=b3654a36dfb34cf3a4e5f085c125c87c
diff --git a/metadata/md5-cache/app-antivirus/lkrg-0.9.6 b/metadata/md5-cache/app-antivirus/lkrg-0.9.6
index d0fe637805c7..74e6db95103c 100644
--- a/metadata/md5-cache/app-antivirus/lkrg-0.9.6
+++ b/metadata/md5-cache/app-antivirus/lkrg-0.9.6
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virtual/dist-kernel:= ) )
 SLOT=0
 SRC_URI=https://lkrg.org/download/lkrg-0.9.6.tar.gz verify-sig? ( https://lkrg.org/download/lkrg-0.9.6.tar.gz.sign )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=b3654a36dfb34cf3a4e5f085c125c87c
diff --git a/metadata/md5-cache/app-arch/bzip2-1.0.8-r4 b/metadata/md5-cache/app-arch/bzip2-1.0.8-r4
index 268a77b48597..6f169bf8babd 100644
--- a/metadata/md5-cache/app-arch/bzip2-1.0.8-r4
+++ b/metadata/md5-cache/app-arch/bzip2-1.0.8-r4
@@ -10,5 +10,5 @@ LICENSE=BZIP2
 PDEPEND=app-alternatives/bzip2
 SLOT=0/1
 SRC_URI=https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz verify-sig? ( https://sourceware.org/pub/bzip2/bzip2-1.0.8.tar.gz.sig )
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=a5160155308108d3772eae20c1fa2453
diff --git a/metadata/md5-cache/app-arch/clzip-1.13 b/metadata/md5-cache/app-arch/clzip-1.13
index ecd4700295d1..3208d1d7683f 100644
--- a/metadata/md5-cache/app-arch/clzip-1.13
+++ b/metadata/md5-cache/app-arch/clzip-1.13
@@ -9,5 +9,5 @@ KEYWORDS=~amd64
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/clzip/clzip-1.13.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/clzip/clzip-1.13.tar.gz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=239ae955d558800e675c186dcf2d6b61
diff --git a/metadata/md5-cache/app-arch/gzip-1.12-r4 b/metadata/md5-cache/app-arch/gzip-1.12-r4
index 30c4a30d6017..3475d880e7a2 100644
--- a/metadata/md5-cache/app-arch/gzip-1.12-r4
+++ b/metadata/md5-cache/app-arch/gzip-1.12-r4
@@ -11,5 +11,5 @@ PDEPEND=app-alternatives/gzip
 RDEPEND=!app-arch/pigz[symlink(-)]
 SLOT=0
 SRC_URI=mirror://gnu/gzip/gzip-1.12.tar.xz https://alpha.gnu.org/gnu/gzip/gzip-1.12.tar.xz verify-sig? ( mirror://gnu/gzip/gzip-1.12.tar.xz.sig https://alpha.gnu.org/gnu/gzip/gzip-1.12.tar.xz.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=da95d72696c0accac7d4593ca2531f0d
diff --git a/metadata/md5-cache/app-arch/gzip-1.12_p20221228-r1 b/metadata/md5-cache/app-arch/gzip-1.12_p20221228-r1
index 710747624e47..1da80c45e2a2 100644
--- a/metadata/md5-cache/app-arch/gzip-1.12_p20221228-r1
+++ b/metadata/md5-cache/app-arch/gzip-1.12_p20221228-r1
@@ -10,5 +10,5 @@ PDEPEND=app-alternatives/gzip
 RDEPEND=!app-arch/pigz[symlink(-)]
 SLOT=0
 SRC_URI=https://meyering.net/gzip/gzip-1.12.31-7553.tar.xz -> gzip-1.12_p20221228.tar.xz verify-sig? ( https://meyering.net/gzip/gzip-1.12.31-7553.tar.xz.sig -> gzip-1.12_p20221228.tar.xz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=2d5d41d70a3564597b17e07e218d4c77
diff --git a/metadata/md5-cache/app-arch/libarchive-3.6.2-r2 b/metadata/md5-cache/app-arch/libarchive-3.6.2-r2
index e0886c77353d..4878c58dd532 100644
--- a/metadata/md5-cache/app-arch/libarchive-3.6.2-r2
+++ b/metadata/md5-cache/app-arch/libarchive-3.6.2-r2
@@ -11,5 +11,5 @@ LICENSE=BSD BSD-2 BSD-4 public-domain
 RDEPEND=acl? ( virtual/acl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) blake2? ( app-crypt/libb2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) expat? ( dev-libs/expat[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !expat? ( dev-libs/libxml2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iconv? ( virtual/libiconv[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) kernel_linux? ( xattr? ( sys-apps/attr[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ) !libressl? ( dev-libs/openssl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libressl? ( dev-libs/libressl:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.2.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzo? ( >=dev-libs/lzo-2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) nettle? ( dev-libs/nettle:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/13
 SRC_URI=https://www.libarchive.de/downloads/libarchive-3.6.2.tar.xz verify-sig? ( https://www.libarchive.de/downloads/libarchive-3.6.2.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=e65227dec0f38421c40bf37ae2102f90
diff --git a/metadata/md5-cache/app-arch/lunzip-1.13 b/metadata/md5-cache/app-arch/lunzip-1.13
index 155121b618a9..e6f334f5945b 100644
--- a/metadata/md5-cache/app-arch/lunzip-1.13
+++ b/metadata/md5-cache/app-arch/lunzip-1.13
@@ -9,5 +9,5 @@ KEYWORDS=~amd64
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/lunzip/lunzip-1.13.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/lunzip/lunzip-1.13.tar.gz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=ecfb83306116ae3b8808de70e71be817
diff --git a/metadata/md5-cache/app-arch/lzip-1.23 b/metadata/md5-cache/app-arch/lzip-1.23
index eceffbca6b06..dbb37dec88df 100644
--- a/metadata/md5-cache/app-arch/lzip-1.23
+++ b/metadata/md5-cache/app-arch/lzip-1.23
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/lzip-1.23.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/lzip-1.23.tar.gz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=05f73974aa2ad8588d2dc412f42d5412
diff --git a/metadata/md5-cache/app-arch/lziprecover-1.23 b/metadata/md5-cache/app-arch/lziprecover-1.23
index 2b16f2857dfd..485052a6d604 100644
--- a/metadata/md5-cache/app-arch/lziprecover-1.23
+++ b/metadata/md5-cache/app-arch/lziprecover-1.23
@@ -9,5 +9,5 @@ KEYWORDS=amd64 x86
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/lziprecover/lziprecover-1.23.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/lziprecover/lziprecover-1.23.tar.gz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=27f9ec51e6a6bdebe0d44e77c00f3325
diff --git a/metadata/md5-cache/app-arch/lzlib-1.13-r1 b/metadata/md5-cache/app-arch/lzlib-1.13-r1
index 2f66a1774da6..aaa77a316630 100644
--- a/metadata/md5-cache/app-arch/lzlib-1.13-r1
+++ b/metadata/md5-cache/app-arch/lzlib-1.13-r1
@@ -9,5 +9,5 @@ KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=libstdc++
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/lzlib/lzlib-1.13.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/lzlib/lzlib-1.13.tar.gz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=1f3df867efd36678a59fd7c20fc21501
diff --git a/metadata/md5-cache/app-arch/pdlzip-1.12 b/metadata/md5-cache/app-arch/pdlzip-1.12
index d19a2a83be9a..f1af2f01800a 100644
--- a/metadata/md5-cache/app-arch/pdlzip-1.12
+++ b/metadata/md5-cache/app-arch/pdlzip-1.12
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~mips ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/pdlzip/pdlzip-1.12.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/pdlzip/pdlzip-1.12.tar.gz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=03722b69852c26d26d3a8986ae3d7c37
diff --git a/metadata/md5-cache/app-arch/plzip-1.10 b/metadata/md5-cache/app-arch/plzip-1.10
index e3de0e72c8fc..87b0696d2e01 100644
--- a/metadata/md5-cache/app-arch/plzip-1.10
+++ b/metadata/md5-cache/app-arch/plzip-1.10
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=app-arch/lzlib:0=
 SLOT=0
 SRC_URI=https://download.savannah.gnu.org/releases/lzip/plzip/plzip-1.10.tar.gz verify-sig? ( https://download.savannah.gnu.org/releases/lzip/plzip/plzip-1.10.tar.gz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=053cf2cccf8f61a9939b5952098867f0
diff --git a/metadata/md5-cache/app-arch/tar-1.34-r2 b/metadata/md5-cache/app-arch/tar-1.34-r2
index 4bdde961129a..9fb9f4163a47 100644
--- a/metadata/md5-cache/app-arch/tar-1.34-r2
+++ b/metadata/md5-cache/app-arch/tar-1.34-r2
@@ -12,5 +12,5 @@ PDEPEND=app-alternatives/tar
 RDEPEND=acl? ( virtual/acl ) selinux? ( sys-libs/libselinux )
 SLOT=0
 SRC_URI=mirror://gnu/tar/tar-1.34.tar.xz https://alpha.gnu.org/gnu/tar/tar-1.34.tar.xz verify-sig? ( mirror://gnu/tar/tar-1.34.tar.xz.sig https://alpha.gnu.org/gnu/tar/tar-1.34.tar.xz.sig )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=90a81ff666fd3a66b8e13edc3427f0c7
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.10 b/metadata/md5-cache/app-arch/xz-utils-5.2.10
index d39967ee1f44..23a4a05b98c6 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.10
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.10
@@ -10,5 +10,5 @@ LICENSE=public-domain LGPL-2.1+ GPL-2+
 RESTRICT=!extra-filters? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/lzmautils/xz-5.2.10.tar.gz https://tukaani.org/xz/xz-5.2.10.tar.gz verify-sig? ( https://tukaani.org/xz/xz-5.2.10.tar.gz.sig )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=b3b15c5ae4cc8bf9503d8dd36804b52f
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.4.1 b/metadata/md5-cache/app-arch/xz-utils-5.4.1
index 4ecac7036cc5..92827ef16ada 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.4.1
+++ b/metadata/md5-cache/app-arch/xz-utils-5.4.1
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=public-domain LGPL-2.1+ GPL-2+
 SLOT=0
 SRC_URI=https://github.com/tukaani-project/xz/releases/download/v5.4.1/xz-5.4.1.tar.gz mirror://sourceforge/lzmautils/xz-5.4.1.tar.gz https://tukaani.org/xz/xz-5.4.1.tar.gz verify-sig? ( https://github.com/tukaani-project/xz/releases/download/v5.4.1/xz-5.4.1.tar.gz.sig https://tukaani.org/xz/xz-5.4.1.tar.gz.sig )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=ffdc935f2413e48620437270d84e8515
diff --git a/metadata/md5-cache/app-arch/zstd-1.5.4 b/metadata/md5-cache/app-arch/zstd-1.5.4
deleted file mode 100644
index 28a6036b2cd6..000000000000
--- a/metadata/md5-cache/app-arch/zstd-1.5.4
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) zlib? ( sys-libs/zlib )
-DESCRIPTION=zstd fast compression library
-EAPI=8
-HOMEPAGE=https://facebook.github.io/zstd/
-INHERIT=multilib-minimal toolchain-funcs usr-ldscript
-IUSE=+lzma lz4 static-libs zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-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=|| ( BSD GPL-2 )
-RDEPEND=lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4 ) zlib? ( sys-libs/zlib )
-SLOT=0/1
-SRC_URI=https://github.com/facebook/zstd/archive/v1.5.4.tar.gz -> zstd-1.5.4.tar.gz
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
-_md5_=987e858e3ca15976ed0c73823534974f
diff --git a/metadata/md5-cache/app-arch/zstd-1.5.4-r3 b/metadata/md5-cache/app-arch/zstd-1.5.4-r3
new file mode 100644
index 000000000000..f63d92fcdffc
--- /dev/null
+++ b/metadata/md5-cache/app-arch/zstd-1.5.4-r3
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4:= ) zlib? ( sys-libs/zlib )
+DESCRIPTION=zstd fast compression library
+EAPI=8
+HOMEPAGE=https://facebook.github.io/zstd/
+INHERIT=meson-multilib usr-ldscript
+IUSE=+lzma lz4 static-libs test zlib abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
+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=|| ( BSD GPL-2 )
+RDEPEND=lzma? ( app-arch/xz-utils ) lz4? ( app-arch/lz4:= ) zlib? ( sys-libs/zlib )
+RESTRICT=!test? ( test )
+SLOT=0/1
+SRC_URI=https://github.com/facebook/zstd/releases/download/v1.5.4/zstd-1.5.4.tar.gz -> zstd-1.5.4.gh.tar.gz
+_eclasses_=meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960
+_md5_=9913bb7a0516c00c72ece0b80749691b
diff --git a/metadata/md5-cache/app-containers/docker-23.0.1 b/metadata/md5-cache/app-containers/docker-23.0.1
new file mode 100644
index 000000000000..f29664706e38
--- /dev/null
+++ b/metadata/md5-cache/app-containers/docker-23.0.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-lang/go-1.16.12 dev-go/go-md2man virtual/pkgconfig virtual/pkgconfig virtual/pkgconfig >=dev-lang/go-1.10
+DEFINED_PHASES=compile install postinst postrm setup unpack
+DEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 )
+DESCRIPTION=The core functions you need to create Docker images and run Docker containers
+EAPI=7
+HOMEPAGE=https://www.docker.com/
+INHERIT=linux-info systemd udev golang-vcs-snapshot
+IUSE=apparmor aufs btrfs +container-init device-mapper hardened overlay seccomp selinux
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=acct-group/docker >=dev-db/sqlite-3.7.9:3 apparmor? ( sys-libs/libapparmor ) btrfs? ( >=sys-fs/btrfs-progs-3.16.1 ) device-mapper? ( >=sys-fs/lvm2-2.02.89[thin] ) seccomp? ( >=sys-libs/libseccomp-2.2.1 ) >=net-firewall/iptables-1.4 sys-process/procps >=dev-vcs/git-1.7 >=app-arch/xz-utils-4.9 dev-libs/libltdl >=app-containers/containerd-1.6.15[apparmor?,btrfs?,device-mapper?,seccomp?] ~app-containers/docker-proxy-0.8.0_p20230118 container-init? ( >=sys-process/tini-0.19.0[static] ) selinux? ( sec-policy/selinux-docker )
+RESTRICT=installsources strip test
+SLOT=0
+SRC_URI=https://github.com/moby/moby/archive/v23.0.1.tar.gz -> docker-23.0.1.tar.gz
+_eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	442e08c36b79f80b592ae799a7984624	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152
+_md5_=d87a1e9873c2ffda745697f333b2af49
diff --git a/metadata/md5-cache/app-containers/docker-cli-23.0.1 b/metadata/md5-cache/app-containers/docker-cli-23.0.1
new file mode 100644
index 000000000000..ecc49474f415
--- /dev/null
+++ b/metadata/md5-cache/app-containers/docker-cli-23.0.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.16.6 dev-go/go-md2man >=dev-lang/go-1.10
+DEFINED_PHASES=compile install prepare unpack
+DESCRIPTION=the command line binary for docker
+EAPI=7
+HOMEPAGE=https://www.docker.com/
+INHERIT=bash-completion-r1 golang-vcs-snapshot
+IUSE=hardened selinux
+LICENSE=Apache-2.0
+RDEPEND=!<app-containers/docker-20.10.1 selinux? ( sec-policy/selinux-docker )
+RESTRICT=installsources strip test
+SLOT=0
+SRC_URI=https://github.com/docker/cli/archive/v23.0.1.tar.gz -> docker-cli-23.0.1.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	442e08c36b79f80b592ae799a7984624	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=1c6b9a7036f17e5ddac3d397bb69b2ad
diff --git a/metadata/md5-cache/app-containers/docker-compose-2.16.0 b/metadata/md5-cache/app-containers/docker-compose-2.16.0
new file mode 100644
index 000000000000..5282c4c70fb3
--- /dev/null
+++ b/metadata/md5-cache/app-containers/docker-compose-2.16.0
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install postinst prepare test unpack
+DESCRIPTION=Multi-container orchestration for Docker
+EAPI=8
+HOMEPAGE=https://github.com/docker/compose
+INHERIT=bash-completion-r1 go-module
+LICENSE=Apache-2.0
+RDEPEND=>=app-containers/docker-cli-23.0.0
+RESTRICT=strip
+SLOT=2
+SRC_URI=https://github.com/docker/compose/archive/v2.16.0.tar.gz -> docker-compose-2.16.0.tar.gz https://dev.gentoo.org/~williamh/dist/docker-compose-2.16.0-deps.tar.xz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	go-module	f2c9bcab49079a176b3ae061c94bb344	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=3344d97103f121ecf3dc6a1e69eea71f
diff --git a/metadata/md5-cache/app-containers/docker-proxy-0.8.0_p20230118 b/metadata/md5-cache/app-containers/docker-proxy-0.8.0_p20230118
new file mode 100644
index 000000000000..93727868d381
--- /dev/null
+++ b/metadata/md5-cache/app-containers/docker-proxy-0.8.0_p20230118
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.10
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Docker container networking
+EAPI=7
+HOMEPAGE=https://github.com/docker/libnetwork
+INHERIT=golang-vcs-snapshot
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RESTRICT=strip test
+SLOT=0
+SRC_URI=https://github.com/moby/libnetwork/archive/05b93e0d3a95952f70c113b0bc5bdb538d7afdd7.tar.gz -> docker-proxy-0.8.0_p20230118.tar.gz
+_eclasses_=golang-base	9f0e420ab37bc55a318d74bab3aae891	golang-vcs-snapshot	442e08c36b79f80b592ae799a7984624
+_md5_=30abbb07818c03e3a91bf65bc414b96a
diff --git a/metadata/md5-cache/app-containers/lxc-4.0.12 b/metadata/md5-cache/app-containers/lxc-4.0.12
index 316a450da539..1bf269ad2f8e 100644
--- a/metadata/md5-cache/app-containers/lxc-4.0.12
+++ b/metadata/md5-cache/app-containers/lxc-4.0.12
@@ -12,5 +12,5 @@ PDEPEND=templates? ( app-containers/lxc-templates )
 RDEPEND=acct-group/lxc acct-user/lxc app-misc/pax-utils sys-apps/util-linux sys-libs/libcap virtual/awk caps? ( sys-libs/libcap ) io-uring? ( >=sys-libs/liburing-2:= ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.12.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-4.0.12.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	pam	01b77091d5b6560b0aeafa7fbb1bd818	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	pam	01b77091d5b6560b0aeafa7fbb1bd818	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=ff636a5cfabcf656b63601a022d0b9ed
diff --git a/metadata/md5-cache/app-containers/lxc-4.0.12_p1 b/metadata/md5-cache/app-containers/lxc-4.0.12_p1
index 8575f3fcb035..770a9a076563 100644
--- a/metadata/md5-cache/app-containers/lxc-4.0.12_p1
+++ b/metadata/md5-cache/app-containers/lxc-4.0.12_p1
@@ -12,5 +12,5 @@ PDEPEND=templates? ( app-containers/lxc-templates )
 RDEPEND=acct-group/lxc acct-user/lxc app-misc/pax-utils sys-apps/util-linux sys-libs/libcap virtual/awk caps? ( sys-libs/libcap ) io-uring? ( >=sys-libs/liburing-2:= ) pam? ( sys-libs/pam ) seccomp? ( sys-libs/libseccomp ) selinux? ( sys-libs/libselinux ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( dev-libs/libressl:0= ) )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-4.0.12.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-4.0.12.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	pam	01b77091d5b6560b0aeafa7fbb1bd818	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	pam	01b77091d5b6560b0aeafa7fbb1bd818	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=9b2aea2e1e03d45590db37137cd902ca
diff --git a/metadata/md5-cache/app-containers/lxc-5.0.1-r2 b/metadata/md5-cache/app-containers/lxc-5.0.1-r2
index be25a1f49f7a..9590718030a5 100644
--- a/metadata/md5-cache/app-containers/lxc-5.0.1-r2
+++ b/metadata/md5-cache/app-containers/lxc-5.0.1-r2
@@ -13,5 +13,5 @@ RDEPEND=acct-group/lxc acct-user/lxc sys-apps/apparmor caps? ( sys-libs/libcap[s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-5.0.1.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-5.0.1.tar.gz.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=fff4873a026e06df790b8eb6d3ae85cd
diff --git a/metadata/md5-cache/app-containers/lxc-5.0.2-r1 b/metadata/md5-cache/app-containers/lxc-5.0.2-r1
index 4c53063e11cd..ac9483127700 100644
--- a/metadata/md5-cache/app-containers/lxc-5.0.2-r1
+++ b/metadata/md5-cache/app-containers/lxc-5.0.2-r1
@@ -13,5 +13,5 @@ RDEPEND=acct-group/lxc acct-user/lxc sys-apps/apparmor caps? ( sys-libs/libcap[s
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxc/lxc-5.0.2.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxc/lxc-5.0.2.tar.gz.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=bbd5baee84f3927fd31d2330480ba0a7
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.40 b/metadata/md5-cache/app-crypt/gnupg-2.2.40
index 1f8866fef467..89bddf569f5a 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.40
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.40
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgp
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.40.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.2.40.tar.bz2.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=0c629e5a3c384a04298ea4077d4378c1
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.2.41 b/metadata/md5-cache/app-crypt/gnupg-2.2.41
index f98df428cb6e..162c4591ca66 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.2.41
+++ b/metadata/md5-cache/app-crypt/gnupg-2.2.41
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/libassuan-2.5.0 >=dev-libs/libgcrypt-1.8.0:= >=dev-libs/libgp
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.2.41.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.2.41.tar.bz2.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source	9779900d240517b0631874f05d190aae	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source	9779900d240517b0631874f05d190aae	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=80981afb24de0a3d48fc43daf8a3ab8b
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.3.8 b/metadata/md5-cache/app-crypt/gnupg-2.3.8
index e167772d90f4..40912bb8f2b1 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.3.8
+++ b/metadata/md5-cache/app-crypt/gnupg-2.3.8
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( tofu )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.3.8.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.3.8.tar.bz2.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=c7130cb95e04b2185ac98f1716d584c9
diff --git a/metadata/md5-cache/app-crypt/gnupg-2.4.0 b/metadata/md5-cache/app-crypt/gnupg-2.4.0
index 564c64660cbd..7d0f1f5cba5d 100644
--- a/metadata/md5-cache/app-crypt/gnupg-2.4.0
+++ b/metadata/md5-cache/app-crypt/gnupg-2.4.0
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( tofu )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnupg/gnupg/gnupg-2.4.0.tar.bz2 verify-sig? ( mirror://gnupg/gnupg/gnupg-2.4.0.tar.bz2.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source	9779900d240517b0631874f05d190aae	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source	9779900d240517b0631874f05d190aae	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=45d75804d32d33998850711db3d5bdca
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.17.1-r2 b/metadata/md5-cache/app-crypt/gpgme-1.17.1-r2
index dbd24b2f2e35..ab48d1be5657 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.17.1-r2
+++ b/metadata/md5-cache/app-crypt/gpgme-1.17.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_7 python_targets
 RESTRICT=!test? ( test )
 SLOT=1/11.6.15
 SRC_URI=mirror://gnupg/gpgme/gpgme-1.17.1.tar.bz2 verify-sig? ( mirror://gnupg/gpgme/gpgme-1.17.1.tar.bz2.sig )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=beae303d66fe8226cf014e91d18d1d65
diff --git a/metadata/md5-cache/app-crypt/gpgme-1.18.0-r2 b/metadata/md5-cache/app-crypt/gpgme-1.18.0-r2
index ef088449679e..baed6ffe953b 100644
--- a/metadata/md5-cache/app-crypt/gpgme-1.18.0-r2
+++ b/metadata/md5-cache/app-crypt/gpgme-1.18.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=qt5? ( cxx ) python? ( || ( python_targets_python3_7 python_targets
 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	3929d88685167435c587b740fdb5ec46	flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=35f7d3a426bb759505be0eedbc9de28c
diff --git a/metadata/md5-cache/app-crypt/pinentry-1.2.1-r1 b/metadata/md5-cache/app-crypt/pinentry-1.2.1-r1
index c41e4a7519fd..b6f22143ce4e 100644
--- a/metadata/md5-cache/app-crypt/pinentry-1.2.1-r1
+++ b/metadata/md5-cache/app-crypt/pinentry-1.2.1-r1
@@ -12,5 +12,5 @@ LICENSE=GPL-2
 RDEPEND=>=dev-libs/libassuan-2.1 >=dev-libs/libgcrypt-1.6.3 >=dev-libs/libgpg-error-1.17 efl? ( dev-libs/efl[X] ) gnome-keyring? ( app-crypt/libsecret ) ncurses? ( sys-libs/ncurses:= ) qt5? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) gtk? ( app-crypt/gcr:0[gtk] )
 SLOT=0
 SRC_URI=mirror://gnupg/pinentry/pinentry-1.2.1.tar.bz2 verify-sig? ( mirror://gnupg/pinentry/pinentry-1.2.1.tar.bz2.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmake-utils	59420c906278d16deaaa629f9d115707	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=cb8f8ee4b7785644f8a97222348100a8
diff --git a/metadata/md5-cache/app-crypt/sbctl-0.10 b/metadata/md5-cache/app-crypt/sbctl-0.10
index 2f80eeaf4af2..b88e5e390842 100644
--- a/metadata/md5-cache/app-crypt/sbctl-0.10
+++ b/metadata/md5-cache/app-crypt/sbctl-0.10
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/Foxboron/sbctl/releases/download/0.10/sbctl-0.10.tar.gz https://dev.gentoo.org/~ajak/distfiles/app-crypt/sbctl/sbctl-0.10-deps.tar.xz verify-sig? ( https://github.com/Foxboron/sbctl/releases/download/0.10/sbctl-0.10.tar.gz.sig )
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=b5c583796bd0548b5a6b2e940a9d1448
diff --git a/metadata/md5-cache/app-crypt/sbctl-0.9 b/metadata/md5-cache/app-crypt/sbctl-0.9
index 8c3807b6d254..3213135a1da9 100644
--- a/metadata/md5-cache/app-crypt/sbctl-0.9
+++ b/metadata/md5-cache/app-crypt/sbctl-0.9
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0 BSD BSD-2 MIT
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/Foxboron/sbctl/releases/download/0.9/sbctl-0.9.tar.gz https://dev.gentoo.org/~ajak/dist/sbctl-0.9-deps.tar.xz verify-sig? ( https://github.com/Foxboron/sbctl/releases/download/0.9/sbctl-0.9.tar.gz.sig )
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=e613fc92b7158532b544cab7f0b9b43c
diff --git a/metadata/md5-cache/app-crypt/signify-31 b/metadata/md5-cache/app-crypt/signify-31
index aa85dfa9d36b..9dbacf8637f3 100644
--- a/metadata/md5-cache/app-crypt/signify-31
+++ b/metadata/md5-cache/app-crypt/signify-31
@@ -11,5 +11,5 @@ LICENSE=BSD-1
 RDEPEND=!net-mail/signify >=dev-libs/libbsd-0.7
 SLOT=0
 SRC_URI=https://github.com/aperezdc/signify/releases/download/v31/signify-31.tar.xz verify-sig? ( https://github.com/aperezdc/signify/releases/download/v31/SHA256.sig -> signify-31.sha.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=50441e26ca06d7d47fe8a7d5fb8dacd2
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-5.0.0 b/metadata/md5-cache/app-crypt/yubikey-manager-5.0.0
index 4061300a1aa7..07210052d092 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-5.0.0
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-5.0.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey_manager-5.0.0.tar.gz verify-sig? ( https://developers.yubico.com/yubikey-manager/Releases/yubikey_manager-5.0.0.tar.gz.sig )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=5c44b4a2ba351feeff2dae48f2a8df6a
diff --git a/metadata/md5-cache/app-crypt/yubikey-manager-5.0.1 b/metadata/md5-cache/app-crypt/yubikey-manager-5.0.1
index 261be9bd65ce..c4190de16392 100644
--- a/metadata/md5-cache/app-crypt/yubikey-manager-5.0.1
+++ b/metadata/md5-cache/app-crypt/yubikey-manager-5.0.1
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://developers.yubico.com/yubikey-manager/Releases/yubikey_manager-5.0.1.tar.gz verify-sig? ( https://developers.yubico.com/yubikey-manager/Releases/yubikey_manager-5.0.1.tar.gz.sig )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=900b54285d4fdeaab3397b6c5abc9d8f
diff --git a/metadata/md5-cache/app-editors/vile-9.8w-r1 b/metadata/md5-cache/app-editors/vile-9.8w-r1
index 322bebfbb07f..832dd015f069 100644
--- a/metadata/md5-cache/app-editors/vile-9.8w-r1
+++ b/metadata/md5-cache/app-editors/vile-9.8w-r1
@@ -12,5 +12,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:= virtual/libcrypt:= iconv? ( virtual/libiconv ) perl? ( dev-lang/perl:= )
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/vile/current/vile-9.8w.tgz verify-sig? ( https://invisible-island.net/archives/vile/current/vile-9.8w.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=e02eb8b0e1a07f506ce63d696818c694
diff --git a/metadata/md5-cache/app-editors/vile-9.8x b/metadata/md5-cache/app-editors/vile-9.8x
index d48a9526fedc..4d3f5b913a7f 100644
--- a/metadata/md5-cache/app-editors/vile-9.8x
+++ b/metadata/md5-cache/app-editors/vile-9.8x
@@ -12,5 +12,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:= virtual/libcrypt:= iconv? ( virtual/libiconv ) perl? ( dev-lang/perl:= )
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/vile/current/vile-9.8x.tgz verify-sig? ( https://invisible-island.net/archives/vile/current/vile-9.8x.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=e02eb8b0e1a07f506ce63d696818c694
diff --git a/metadata/md5-cache/app-editors/vile-9.8y b/metadata/md5-cache/app-editors/vile-9.8y
index 97c76b072e45..b6f1eac94b15 100644
--- a/metadata/md5-cache/app-editors/vile-9.8y
+++ b/metadata/md5-cache/app-editors/vile-9.8y
@@ -12,5 +12,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-libs/ncurses-5.2:= virtual/libcrypt:= iconv? ( virtual/libiconv ) perl? ( dev-lang/perl:= )
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/vile/current/vile-9.8y.tgz verify-sig? ( https://invisible-island.net/archives/vile/current/vile-9.8y.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=55b618e207ef5a90dcbb92801bf02f1d
diff --git a/metadata/md5-cache/app-editors/vscode-1.75.1-r1 b/metadata/md5-cache/app-editors/vscode-1.75.1-r1
deleted file mode 100644
index e6e92ca228c0..000000000000
--- a/metadata/md5-cache/app-editors/vscode-1.75.1-r1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst postrm preinst
-DESCRIPTION=Multiplatform Visual Studio Code from Microsoft
-EAPI=8
-HOMEPAGE=https://code.visualstudio.com
-IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
-INHERIT=desktop pax-utils xdg optfeature
-KEYWORDS=-* ~amd64 ~arm ~arm64
-LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ Microsoft-vscode MIT MPL-2.0 openssl PYTHON TextMate-bundle Unlicense UoI-NCSA W3C
-RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret[crypt] dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/util-linux sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango
-RESTRICT=mirror strip bindist
-SLOT=0
-SRC_URI=amd64? ( https://update.code.visualstudio.com/1.75.1/linux-x64/stable -> vscode-1.75.1-amd64.tar.gz ) arm? ( https://update.code.visualstudio.com/1.75.1/linux-armhf/stable -> vscode-1.75.1-arm.tar.gz ) arm64? ( https://update.code.visualstudio.com/1.75.1/linux-arm64/stable -> vscode-1.75.1-arm64.tar.gz )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=018987b89621ebeb90d955a5c59dd453
diff --git a/metadata/md5-cache/app-editors/vscode-1.75.0-r2 b/metadata/md5-cache/app-editors/vscode-1.76.1
index 79515d3807d4..110520c51c70 100644
--- a/metadata/md5-cache/app-editors/vscode-1.75.0-r2
+++ b/metadata/md5-cache/app-editors/vscode-1.76.1
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ Microsoft-vscod
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret[crypt] dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/util-linux sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango
 RESTRICT=mirror strip bindist
 SLOT=0
-SRC_URI=amd64? ( https://update.code.visualstudio.com/1.75.0/linux-x64/stable -> vscode-1.75.0-amd64.tar.gz ) arm? ( https://update.code.visualstudio.com/1.75.0/linux-armhf/stable -> vscode-1.75.0-arm.tar.gz ) arm64? ( https://update.code.visualstudio.com/1.75.0/linux-arm64/stable -> vscode-1.75.0-arm64.tar.gz )
+SRC_URI=amd64? ( https://update.code.visualstudio.com/1.76.1/linux-x64/stable -> vscode-1.76.1-amd64.tar.gz ) arm? ( https://update.code.visualstudio.com/1.76.1/linux-armhf/stable -> vscode-1.76.1-arm.tar.gz ) arm64? ( https://update.code.visualstudio.com/1.76.1/linux-arm64/stable -> vscode-1.76.1-arm64.tar.gz )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=018987b89621ebeb90d955a5c59dd453
diff --git a/metadata/md5-cache/app-editors/vscodium-1.75.0.23033-r2 b/metadata/md5-cache/app-editors/vscodium-1.76.1.23069
index d18e81ccbcd2..b6e2486acd4f 100644
--- a/metadata/md5-cache/app-editors/vscodium-1.75.0.23033-r2
+++ b/metadata/md5-cache/app-editors/vscodium-1.76.1.23069
@@ -9,6 +9,6 @@ LICENSE=Apache-2.0 BSD BSD-1 BSD-2 BSD-4 CC-BY-4.0 ISC LGPL-2.1+ MIT MPL-2.0 ope
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2 app-crypt/libsecret[crypt] dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/util-linux sys-apps/dbus x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libdrm x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libxkbcommon x11-libs/libxkbfile x11-libs/libXrandr x11-libs/libxshmfence x11-libs/pango
 RESTRICT=strip bindist
 SLOT=0
-SRC_URI=amd64? ( https://github.com/VSCodium/vscodium/releases/download/1.75.0.23033/VSCodium-linux-x64-1.75.0.23033.tar.gz -> vscodium-1.75.0.23033-amd64.tar.gz ) arm? ( https://github.com/VSCodium/vscodium/releases/download/1.75.0.23033/VSCodium-linux-armhf-1.75.0.23033.tar.gz -> vscodium-1.75.0.23033-arm.tar.gz ) arm64? ( https://github.com/VSCodium/vscodium/releases/download/1.75.0.23033/VSCodium-linux-arm64-1.75.0.23033.tar.gz -> vscodium-1.75.0.23033-arm64.tar.gz )
+SRC_URI=amd64? ( https://github.com/VSCodium/vscodium/releases/download/1.76.1.23069/VSCodium-linux-x64-1.76.1.23069.tar.gz -> vscodium-1.76.1.23069-amd64.tar.gz ) arm? ( https://github.com/VSCodium/vscodium/releases/download/1.76.1.23069/VSCodium-linux-armhf-1.76.1.23069.tar.gz -> vscodium-1.76.1.23069-arm.tar.gz ) arm64? ( https://github.com/VSCodium/vscodium/releases/download/1.76.1.23069/VSCodium-linux-arm64-1.76.1.23069.tar.gz -> vscodium-1.76.1.23069-arm64.tar.gz )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	optfeature	1a2157392a869265b2afcb63a26c12ac	pax-utils	91d47e5d20627c717aa878b9167c62a8	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=cdaa1fcbb6bc29832ba3c09c6f73f592
diff --git a/metadata/md5-cache/app-editors/xvile-9.8w-r2 b/metadata/md5-cache/app-editors/xvile-9.8w-r2
index f382dbbc6146..880bcd4251de 100644
--- a/metadata/md5-cache/app-editors/xvile-9.8w-r2
+++ b/metadata/md5-cache/app-editors/xvile-9.8w-r2
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=~app-editors/vile-9.8w virtual/libcrypt:= >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 perl? ( dev-lang/perl:= )
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/vile/current/vile-9.8w.tgz verify-sig? ( https://invisible-island.net/archives/vile/current/vile-9.8w.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=d38865a45aed32d3928c688441afddf4
diff --git a/metadata/md5-cache/app-editors/xvile-9.8x b/metadata/md5-cache/app-editors/xvile-9.8x
index 22da7d205a30..579f6c08d1a6 100644
--- a/metadata/md5-cache/app-editors/xvile-9.8x
+++ b/metadata/md5-cache/app-editors/xvile-9.8x
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=~app-editors/vile-9.8x virtual/libcrypt:= >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 perl? ( dev-lang/perl:= )
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/vile/current/vile-9.8x.tgz verify-sig? ( https://invisible-island.net/archives/vile/current/vile-9.8x.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=557e513c2c679eba506347487e52b9f8
diff --git a/metadata/md5-cache/app-editors/xvile-9.8y b/metadata/md5-cache/app-editors/xvile-9.8y
index e7b7fb2f66d7..25e53e2e8cd5 100644
--- a/metadata/md5-cache/app-editors/xvile-9.8y
+++ b/metadata/md5-cache/app-editors/xvile-9.8y
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=~app-editors/vile-9.8y virtual/libcrypt:= >=x11-libs/libX11-1.0.0 >=x11-libs/libXt-1.0.0 >=x11-libs/libICE-1.0.0 >=x11-libs/libSM-1.0.0 >=x11-libs/libXaw-1.0.1 >=x11-libs/libXpm-3.5.4.2 perl? ( dev-lang/perl:= )
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/vile/current/vile-9.8y.tgz verify-sig? ( https://invisible-island.net/archives/vile/current/vile-9.8y.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=d431691536633777b571b34eb4b37139
diff --git a/metadata/md5-cache/app-emulation/libvirt-8.7.0-r1 b/metadata/md5-cache/app-emulation/libvirt-8.7.0-r1
index 9bd53a51d8ff..50ac7a1957e3 100644
--- a/metadata/md5-cache/app-emulation/libvirt-8.7.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-8.7.0-r1
@@ -12,5 +12,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/8.7.0
 SRC_URI=https://libvirt.org/sources/libvirt-8.7.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-8.7.0.tar.xz.asc )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=0f739977e450396d38afe2f7e44d40c6
diff --git a/metadata/md5-cache/app-emulation/libvirt-8.8.0-r1 b/metadata/md5-cache/app-emulation/libvirt-8.8.0-r1
index 1c302b5d0fa1..3566992fc699 100644
--- a/metadata/md5-cache/app-emulation/libvirt-8.8.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-8.8.0-r1
@@ -12,5 +12,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/8.8.0
 SRC_URI=https://libvirt.org/sources/libvirt-8.8.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-8.8.0.tar.xz.asc )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=64f7fa3ab60798da8c8883c74c4f362a
diff --git a/metadata/md5-cache/app-emulation/libvirt-8.9.0 b/metadata/md5-cache/app-emulation/libvirt-8.9.0
index f62c05097cda..6d17187b4d4e 100644
--- a/metadata/md5-cache/app-emulation/libvirt-8.9.0
+++ b/metadata/md5-cache/app-emulation/libvirt-8.9.0
@@ -12,5 +12,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/8.9.0
 SRC_URI=https://libvirt.org/sources/libvirt-8.9.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-8.9.0.tar.xz.asc )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=39945eff709ae202c24577922e3938aa
diff --git a/metadata/md5-cache/app-emulation/libvirt-8.9.0-r1 b/metadata/md5-cache/app-emulation/libvirt-8.9.0-r1
index 6727427a43cc..5d28af0cdd77 100644
--- a/metadata/md5-cache/app-emulation/libvirt-8.9.0-r1
+++ b/metadata/md5-cache/app-emulation/libvirt-8.9.0-r1
@@ -13,5 +13,5 @@ RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt
 REQUIRED_USE=firewalld? ( virt-network ) libvirtd? ( || ( lxc openvz qemu virtualbox xen ) ) lxc? ( caps libvirtd ) openvz? ( libvirtd ) qemu? ( libvirtd ) virt-network? ( libvirtd ) virtualbox? ( libvirtd ) xen? ( libvirtd )
 SLOT=0/8.9.0
 SRC_URI=https://libvirt.org/sources/libvirt-8.9.0.tar.xz verify-sig? ( https://libvirt.org/sources/libvirt-8.9.0.tar.xz.asc )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=f37318e1ef2ac8026e618332b47d3840
diff --git a/metadata/md5-cache/app-emulation/libvirt-9999 b/metadata/md5-cache/app-emulation/libvirt-9999
index 9ecfec3eb669..7b771b518ebb 100644
--- a/metadata/md5-cache/app-emulation/libvirt-9999
+++ b/metadata/md5-cache/app-emulation/libvirt-9999
@@ -12,5 +12,5 @@ PROPERTIES=live
 RDEPEND=acct-user/qemu app-misc/scrub >=dev-libs/glib-2.56.0 dev-libs/libgcrypt dev-libs/libnl:3 >=dev-libs/libxml2-2.9.1 >=net-analyzer/openbsd-netcat-1.105-r1 >=net-libs/gnutls-3.2.0:= net-libs/libtirpc:= >=net-misc/curl-7.18.0 sys-apps/dbus sys-apps/dmidecode sys-devel/gettext >=sys-libs/readline-7.0:= virtual/acl apparmor? ( sys-libs/libapparmor ) audit? ( sys-process/audit ) caps? ( sys-libs/libcap-ng ) dtrace? ( dev-util/systemtap ) firewalld? ( >=net-firewall/firewalld-0.6.3 ) fuse? ( sys-fs/fuse:= ) glusterfs? ( >=sys-cluster/glusterfs-3.4.1 ) iscsi? ( >=sys-block/open-iscsi-1.18.0 ) iscsi-direct? ( >=net-libs/libiscsi-1.18.0 ) libssh? ( >=net-libs/libssh-0.8.1:= ) libssh2? ( >=net-libs/libssh2-1.3 ) lvm? ( >=sys-fs/lvm2-2.02.48-r2[lvm] ) lxc? ( !sys-apps/systemd[cgroup-hybrid(-)] ) nfs? ( net-fs/nfs-utils ) numa? ( >sys-process/numactl-2.0.2 sys-process/numad ) parted? ( >=sys-block/parted-1.8[device-mapper] sys-fs/lvm2[lvm] ) pcap? ( >=net-libs/libpcap-1.8.0 ) policykit? ( acct-group/libvirt >=sys-auth/polkit-0.9 ) qemu? ( >=app-emulation/qemu-4.2 >=dev-libs/yajl-2.0.3:= ) rbd? ( sys-cluster/ceph ) sasl? ( >=dev-libs/cyrus-sasl-2.1.26 ) selinux? ( >=sys-libs/libselinux-2.0.85 ) virt-network? ( net-dns/dnsmasq[dhcp,ipv6(+),script] net-firewall/ebtables >=net-firewall/iptables-1.4.10[ipv6(+)] net-misc/radvd sys-apps/iproute2[-minimal] ) wireshark-plugins? ( >=net-analyzer/wireshark-2.6.0:= ) xen? ( >=app-emulation/xen-4.9.0 app-emulation/xen-tools:= ) udev? ( virtual/libudev:= >=x11-libs/libpciaccess-0.10.9 ) zfs? ( sys-fs/zfs ) kernel_linux? ( sys-apps/util-linux ) virtual/tmpfiles
 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/9999
-_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=0c301d9a20861fc1e8f798b6c1d2c897
diff --git a/metadata/md5-cache/app-metrics/portage-exporter-0.0.1 b/metadata/md5-cache/app-metrics/portage-exporter-0.0.1
new file mode 100644
index 000000000000..a3e5fff287cb
--- /dev/null
+++ b/metadata/md5-cache/app-metrics/portage-exporter-0.0.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=Prometheus exporter for Gentoo Portage
+EAPI=8
+HOMEPAGE=https://github.com/projg2/portage-exporter
+INHERIT=go-module
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3 Apache-2.0 BSD MIT
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://github.com/projg2/portage-exporter/releases/download/v0.0.1/portage-exporter-0.0.1.tar.gz
+_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
+_md5_=bbfd6cda3f3c7c0086b24411c097abe1
diff --git a/metadata/md5-cache/app-misc/joymouse-0.5-r1 b/metadata/md5-cache/app-misc/joymouse-0.5-r1
deleted file mode 100644
index cadf4e7b05e8..000000000000
--- a/metadata/md5-cache/app-misc/joymouse-0.5-r1
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=prepare
-DEPEND=x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto
-DESCRIPTION=An application that translates joystick events to mouse events
-EAPI=7
-HOMEPAGE=https://sourceforge.net/projects/joymouse-linux
-KEYWORDS=amd64 ~mips ~ppc x86
-LICENSE=GPL-2+
-RDEPEND=x11-libs/libX11 x11-libs/libXtst
-SLOT=0
-SRC_URI=mirror://sourceforge/joymouse-linux/joymouse-0.5.tar.gz
-_md5_=c939db067834ff4203a9b7f6d718c066
diff --git a/metadata/md5-cache/app-misc/joymouse-0.5-r2 b/metadata/md5-cache/app-misc/joymouse-0.5-r2
new file mode 100644
index 000000000000..013688a6e567
--- /dev/null
+++ b/metadata/md5-cache/app-misc/joymouse-0.5-r2
@@ -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-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=prepare
+DEPEND=x11-libs/libX11 x11-libs/libXtst x11-base/xorg-proto
+DESCRIPTION=An application that translates joystick events to mouse events
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/joymouse-linux
+INHERIT=autotools
+KEYWORDS=amd64 ~mips ~ppc x86
+LICENSE=GPL-2+
+RDEPEND=x11-libs/libX11 x11-libs/libXtst
+SLOT=0
+SRC_URI=mirror://sourceforge/joymouse-linux/joymouse-0.5.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=af35cd4f9a48c9b74579e82c4ce90ddc
diff --git a/metadata/md5-cache/app-misc/mat2-0.13.3 b/metadata/md5-cache/app-misc/mat2-0.13.3
index f277c3c24435..16ec5653b46b 100644
--- a/metadata/md5-cache/app-misc/mat2-0.13.3
+++ b/metadata/md5-cache/app-misc/mat2-0.13.3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://0xacab.org/jvoisin/mat2/-/archive/0.13.3/mat2-0.13.3.tar.gz verify-sig? ( https://0xacab.org/jvoisin/mat2/uploads/672c73a1b8b0e79cdf7187900f3cc8ca/mat2-0.13.3.tar.gz.asc )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=977c9d75edecf126293694d6a119bd98
diff --git a/metadata/md5-cache/app-misc/pup-0.4.0 b/metadata/md5-cache/app-misc/pup-0.4.0
new file mode 100644
index 000000000000..acc483633e9f
--- /dev/null
+++ b/metadata/md5-cache/app-misc/pup-0.4.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/go:0=
+DESCRIPTION=Parsing HTML at the command line
+EAPI=7
+HOMEPAGE=https://github.com/ericchiang/pup
+INHERIT=golang-single
+IUSE=debug pie test
+KEYWORDS=amd64 x86 arm
+LICENSE=MIT
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://github.com/ericchiang/pup/archive/v0.4.0.tar.gz -> pup-0.4.0.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	golang-common	0e35c9d692b2180a238dc9abf795c514	golang-single	5d5a376ad018d27d64cc6aa51bb211a5	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=6e590b4c89e7e8bf420f9470d53389b7
diff --git a/metadata/md5-cache/app-misc/pup-0.4.0_p1 b/metadata/md5-cache/app-misc/pup-0.4.0_p1
deleted file mode 100644
index 75995923458a..000000000000
--- a/metadata/md5-cache/app-misc/pup-0.4.0_p1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Parsing HTML at the command line
-EAPI=7
-HOMEPAGE=https://github.com/ericchiang/pup
-INHERIT=go-module
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=BSD MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/ericchiang/pup/archive/681d7bb639334bf485476f5872c5bdab10931f9a.tar.gz -> pup-0.4.0_p1.tar.gz mirror://goproxy//github.com/fatih/color/@v/v1.0.0.zip -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/fatih/color/@v/v1.0.0.mod -> github.com%2Ffatih%2Fcolor%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.5.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.5.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.0.5.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.0.5.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.0-20151211000621-56b76bdf51f7.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.0-20151211000621-56b76bdf51f7.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.0-20151211000621-56b76bdf51f7.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.0-20151211000621-56b76bdf51f7.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20160720084139-4d38db76854b.zip -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20160720084139-4d38db76854b.zip mirror://goproxy//golang.org/x/net/@v/v0.0.0-20160720084139-4d38db76854b.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20160720084139-4d38db76854b.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20160717071931-a646d33e2ee3.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20160717071931-a646d33e2ee3.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20160717071931-a646d33e2ee3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20160717071931-a646d33e2ee3.mod mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160719205907-0a5a09ee4409.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160719205907-0a5a09ee4409.zip mirror://goproxy//golang.org/x/text/@v/v0.0.0-20160719205907-0a5a09ee4409.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.0.0-20160719205907-0a5a09ee4409.mod
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=1e0a646af4a5eb2d48bc777abc6fd238
diff --git a/metadata/md5-cache/app-misc/trash-cli-0.22.8.21 b/metadata/md5-cache/app-misc/trash-cli-0.22.8.21
deleted file mode 100644
index d9edba300132..000000000000
--- a/metadata/md5-cache/app-misc/trash-cli-0.22.8.21
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_7(-)?,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 scripts to manipulate trash cans via the command line
-EAPI=8
-HOMEPAGE=https://github.com/andreafrancia/trash-cli
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
-LICENSE=GPL-2
-RDEPEND=dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 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/andreafrancia/trash-cli/archive/0.22.8.21.tar.gz -> trash-cli-0.22.8.21.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=18099249c370eaa1b4eb96c71a8e35cb
diff --git a/metadata/md5-cache/app-misc/wego-2.0 b/metadata/md5-cache/app-misc/wego-2.0
new file mode 100644
index 000000000000..be74da72e2bd
--- /dev/null
+++ b/metadata/md5-cache/app-misc/wego-2.0
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/go:0=
+DESCRIPTION=Wego is a weather client for the terminal
+EAPI=7
+HOMEPAGE=https://github.com/schachmat/wego
+INHERIT=golang-single
+IUSE=debug pie test
+KEYWORDS=amd64 x86 arm
+LICENSE=BSD
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://github.com/schachmat/wego/archive/2.0.tar.gz -> wego-2.0.tar.gz https://github.com/mattn/go-colorable/archive/9fdad7c.tar.gz -> github.com-mattn-go-colorable-9fdad7c.tar.gz https://github.com/mattn/go-runewidth/archive/d037b52.tar.gz -> github.com-mattn-go-runewidth-d037b52.tar.gz https://github.com/schachmat/ingo/archive/fab41e4.tar.gz -> github.com-schachmat-ingo-fab41e4.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	golang-common	0e35c9d692b2180a238dc9abf795c514	golang-single	5d5a376ad018d27d64cc6aa51bb211a5	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=299a091de65f85cd2596472600822d24
diff --git a/metadata/md5-cache/app-misc/wego-2.1 b/metadata/md5-cache/app-misc/wego-2.1
deleted file mode 100644
index 9366ebb2c260..000000000000
--- a/metadata/md5-cache/app-misc/wego-2.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install unpack
-DESCRIPTION=Wego is a weather client for the terminal
-EAPI=8
-HOMEPAGE=https://github.com/schachmat/wego
-INHERIT=go-module
-KEYWORDS=~amd64
-LICENSE=BSD ISC MIT
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/schachmat/wego/archive/refs/tags/2.1.tar.gz -> wego-2.1.tar.gz mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.12.zip -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.12.zip mirror://goproxy//github.com/mattn/go-colorable/@v/v0.1.12.mod -> github.com%2Fmattn%2Fgo-colorable%2F@v%2Fv0.1.12.mod mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.14.zip -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.zip mirror://goproxy//github.com/mattn/go-isatty/@v/v0.0.14.mod -> github.com%2Fmattn%2Fgo-isatty%2F@v%2Fv0.0.14.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.13.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.13.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.13.mod mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.zip -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.zip mirror://goproxy//github.com/rivo/uniseg/@v/v0.2.0.mod -> github.com%2Frivo%2Funiseg%2F@v%2Fv0.2.0.mod mirror://goproxy//github.com/schachmat/ingo/@v/v0.0.0-20170403011506-a4bdc0729a3f.zip -> github.com%2Fschachmat%2Fingo%2F@v%2Fv0.0.0-20170403011506-a4bdc0729a3f.zip mirror://goproxy//github.com/schachmat/ingo/@v/v0.0.0-20170403011506-a4bdc0729a3f.mod -> github.com%2Fschachmat%2Fingo%2F@v%2Fv0.0.0-20170403011506-a4bdc0729a3f.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210630005230-0f9fa26af87c.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210630005230-0f9fa26af87c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210927094055-39ccf1dd6fa6.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210927094055-39ccf1dd6fa6.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210927094055-39ccf1dd6fa6.mod
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=162e41b80d914c85844a07734a6278f4
diff --git a/metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1 b/metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1
index 6337e5c07771..71255aad4297 100644
--- a/metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1
+++ b/metadata/md5-cache/app-office/libreoffice-voikko-5.0-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=|| ( app-office/libreoffice[odk] >=app-office/libreoffice-bin-6.4.7.2_p1 ) dev-libs/voikko-fi dev-libs/libvoikko
 SLOT=0
 SRC_URI=https://www.puimula.org/voikko-sources/libreoffice-voikko/libreoffice-voikko-5.0.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/libreoffice-voikko/libreoffice-voikko-5.0.tar.gz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=8a0a0c5832cbd5dc7a71c18f93d1cecd
diff --git a/metadata/md5-cache/app-shells/antibody-2.2.2 b/metadata/md5-cache/app-shells/antibody-2.2.2
new file mode 100644
index 000000000000..df078319057a
--- /dev/null
+++ b/metadata/md5-cache/app-shells/antibody-2.2.2
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/go:0=
+DESCRIPTION=A faster and simpler antigen written in Golang
+EAPI=7
+HOMEPAGE=https://github.com/getantibody/antibody
+INHERIT=golang-single
+IUSE=debug pie
+KEYWORDS=amd64 arm x86
+LICENSE=MIT
+RDEPEND=app-shells/zsh[unicode] dev-vcs/git
+RESTRICT=mirror strip test
+SLOT=0
+SRC_URI=https://github.com/getantibody/antibody/archive/v2.2.2.tar.gz -> antibody-2.2.2.tar.gz https://github.com/getantibody/folder/archive/479aa91.tar.gz -> github.com-getantibody-folder-479aa91.tar.gz https://github.com/caarlos0/gohome/archive/321f486.tar.gz -> github.com-caarlos0-gohome-321f486.tar.gz https://github.com/kardianos/osext/archive/c2c54e5.tar.gz -> github.com-kardianos-osext-c2c54e5.tar.gz https://github.com/urfave/cli/archive/0bdedde.tar.gz -> github.com-urfave-cli-0bdedde.tar.gz https://github.com/golang/crypto/archive/f6b343c.tar.gz -> github.com-golang-crypto-f6b343c.tar.gz https://github.com/golang/sync/archive/450f422.tar.gz -> github.com-golang-sync-450f422.tar.gz https://github.com/golang/net/archive/69d4b8a.tar.gz -> github.com-golang-net-69d4b8a.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	golang-common	0e35c9d692b2180a238dc9abf795c514	golang-single	5d5a376ad018d27d64cc6aa51bb211a5	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=89c1d8fd5433b40074275d327879b40e
diff --git a/metadata/md5-cache/app-shells/antibody-6.1.1-r1 b/metadata/md5-cache/app-shells/antibody-6.1.1-r1
deleted file mode 100644
index c815900046b3..000000000000
--- a/metadata/md5-cache/app-shells/antibody-6.1.1-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile configure install unpack
-DESCRIPTION=Fast Zsh plugin manager
-EAPI=8
-HOMEPAGE=https://getantibody.github.io/
-INHERIT=go-module
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-vcs/git
-RESTRICT=!test? ( test ) strip
-SLOT=0
-SRC_URI=https://github.com/getantibody/antibody/archive/v6.1.1.tar.gz -> antibody-6.1.1.tar.gz mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.zip -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.zip mirror://goproxy//github.com/alecthomas/template/@v/v0.0.0-20190718012654-fb15b899a751.mod -> github.com%2Falecthomas%2Ftemplate%2F@v%2Fv0.0.0-20190718012654-fb15b899a751.mod mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.zip -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.zip mirror://goproxy//github.com/alecthomas/units/@v/v0.0.0-20190924025748-f65c72e2690d.mod -> github.com%2Falecthomas%2Funits%2F@v%2Fv0.0.0-20190924025748-f65c72e2690d.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.1.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.1.mod mirror://goproxy//github.com/getantibody/folder/@v/v1.0.0.zip -> github.com%2Fgetantibody%2Ffolder%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/getantibody/folder/@v/v1.0.0.mod -> github.com%2Fgetantibody%2Ffolder%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.4.0.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.4.0.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.6.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.6.1.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20200709230013-948cd5f35899.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20200709230013-948cd5f35899.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.zip -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.zip mirror://goproxy//golang.org/x/sync/@v/v0.0.0-20200625203802-6e8e738ad208.mod -> golang.org%2Fx%2Fsync%2F@v%2Fv0.0.0-20200625203802-6e8e738ad208.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190412213103-97732733099d.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190412213103-97732733099d.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20200625212154-ddb9806d33ae.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20200625212154-ddb9806d33ae.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.zip -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.zip mirror://goproxy//gopkg.in/alecthomas/kingpin.v2/@v/v2.2.6.mod -> gopkg.in%2Falecthomas%2Fkingpin.v2%2F@v%2Fv2.2.6.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.2.2.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.2.2.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=f756e3310dafbde5ae9c5c6c85679e26
diff --git a/metadata/md5-cache/app-shells/bash-5.1_p16-r2 b/metadata/md5-cache/app-shells/bash-5.1_p16-r2
index cad7d88248bd..e36013d72885 100644
--- a/metadata/md5-cache/app-shells/bash-5.1_p16-r2
+++ b/metadata/md5-cache/app-shells/bash-5.1_p16-r2
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.1:0= )
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-5.1.tar.gz verify-sig? ( mirror://gnu/bash/bash-5.1.tar.gz.sig ) mirror://gnu//bash-5.1-patches/bash51-001 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-001.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001.sig ) mirror://gnu//bash-5.1-patches/bash51-002 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-002.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002.sig ) mirror://gnu//bash-5.1-patches/bash51-003 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-003.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003.sig ) mirror://gnu//bash-5.1-patches/bash51-004 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-004.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004.sig ) mirror://gnu//bash-5.1-patches/bash51-005 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-005.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005.sig ) mirror://gnu//bash-5.1-patches/bash51-006 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-006.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006.sig ) mirror://gnu//bash-5.1-patches/bash51-007 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-007.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007.sig ) mirror://gnu//bash-5.1-patches/bash51-008 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-008.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008.sig ) mirror://gnu//bash-5.1-patches/bash51-009 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-009.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009.sig ) mirror://gnu//bash-5.1-patches/bash51-010 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-010.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010.sig ) mirror://gnu//bash-5.1-patches/bash51-011 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-011.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011.sig ) mirror://gnu//bash-5.1-patches/bash51-012 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-012.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012.sig ) mirror://gnu//bash-5.1-patches/bash51-013 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-013.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013.sig ) mirror://gnu//bash-5.1-patches/bash51-014 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-014.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014.sig ) mirror://gnu//bash-5.1-patches/bash51-015 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-015.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015.sig ) mirror://gnu//bash-5.1-patches/bash51-016 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-016.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016.sig ) https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-5.1_p16-patches.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=016a0e4806aafffa3f41cccc1599570c
diff --git a/metadata/md5-cache/app-shells/bash-5.1_p16-r3 b/metadata/md5-cache/app-shells/bash-5.1_p16-r3
index 577770b33e18..3451e73a34b1 100644
--- a/metadata/md5-cache/app-shells/bash-5.1_p16-r3
+++ b/metadata/md5-cache/app-shells/bash-5.1_p16-r3
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=>=sys-libs/ncurses-5.2-r2:0= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.1:0= )
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-5.1.tar.gz verify-sig? ( mirror://gnu/bash/bash-5.1.tar.gz.sig ) mirror://gnu//bash-5.1-patches/bash51-001 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-001.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-001.sig ) mirror://gnu//bash-5.1-patches/bash51-002 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-002.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-002.sig ) mirror://gnu//bash-5.1-patches/bash51-003 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-003.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-003.sig ) mirror://gnu//bash-5.1-patches/bash51-004 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-004.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-004.sig ) mirror://gnu//bash-5.1-patches/bash51-005 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-005.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-005.sig ) mirror://gnu//bash-5.1-patches/bash51-006 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-006.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-006.sig ) mirror://gnu//bash-5.1-patches/bash51-007 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-007.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-007.sig ) mirror://gnu//bash-5.1-patches/bash51-008 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-008.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-008.sig ) mirror://gnu//bash-5.1-patches/bash51-009 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-009.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-009.sig ) mirror://gnu//bash-5.1-patches/bash51-010 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-010.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-010.sig ) mirror://gnu//bash-5.1-patches/bash51-011 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-011.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-011.sig ) mirror://gnu//bash-5.1-patches/bash51-012 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-012.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-012.sig ) mirror://gnu//bash-5.1-patches/bash51-013 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-013.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-013.sig ) mirror://gnu//bash-5.1-patches/bash51-014 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-014.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-014.sig ) mirror://gnu//bash-5.1-patches/bash51-015 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-015.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-015.sig ) mirror://gnu//bash-5.1-patches/bash51-016 verify-sig? ( mirror://gnu//bash-5.1-patches/bash51-016.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.1-patches/bash51-016.sig ) https://dev.gentoo.org/~sam/distfiles/app-shells/bash/bash-5.1_p16-patches.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=42cac591f6db0bd47139d14f65570b4d
diff --git a/metadata/md5-cache/app-shells/bash-5.2_p15-r2 b/metadata/md5-cache/app-shells/bash-5.2_p15-r2
index 95b0dd8c7d29..8b6f4637d500 100644
--- a/metadata/md5-cache/app-shells/bash-5.2_p15-r2
+++ b/metadata/md5-cache/app-shells/bash-5.2_p15-r2
@@ -11,5 +11,5 @@ LICENSE=GPL-3+
 RDEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl ) readline? ( >=sys-libs/readline-8.2_p1:= )
 SLOT=0
 SRC_URI=mirror://gnu/bash/bash-5.2.tar.gz verify-sig? ( mirror://gnu/bash/bash-5.2.tar.gz.sig ) mirror://gnu//bash-5.2-patches/bash52-001 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-001.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-001 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-001.sig ) mirror://gnu//bash-5.2-patches/bash52-002 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-002.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-002 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-002.sig ) mirror://gnu//bash-5.2-patches/bash52-003 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-003.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-003 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-003.sig ) mirror://gnu//bash-5.2-patches/bash52-004 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-004.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-004 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-004.sig ) mirror://gnu//bash-5.2-patches/bash52-005 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-005.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-005 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-005.sig ) mirror://gnu//bash-5.2-patches/bash52-006 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-006.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-006 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-006.sig ) mirror://gnu//bash-5.2-patches/bash52-007 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-007.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-007 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-007.sig ) mirror://gnu//bash-5.2-patches/bash52-008 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-008.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-008 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-008.sig ) mirror://gnu//bash-5.2-patches/bash52-009 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-009.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-009 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-009.sig ) mirror://gnu//bash-5.2-patches/bash52-010 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-010.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-010 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-010.sig ) mirror://gnu//bash-5.2-patches/bash52-011 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-011.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-011 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-011.sig ) mirror://gnu//bash-5.2-patches/bash52-012 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-012.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-012 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-012.sig ) mirror://gnu//bash-5.2-patches/bash52-013 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-013.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-013 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-013.sig ) mirror://gnu//bash-5.2-patches/bash52-014 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-014.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-014 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-014.sig ) mirror://gnu//bash-5.2-patches/bash52-015 verify-sig? ( mirror://gnu//bash-5.2-patches/bash52-015.sig ) ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-015 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/bash-5.2-patches/bash52-015.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=16f73b18762943aaf6b5fd3e5daf92df
diff --git a/metadata/md5-cache/app-shells/bash-9999 b/metadata/md5-cache/app-shells/bash-9999
index 4b89b3b60b2e..e7b2231dceb5 100644
--- a/metadata/md5-cache/app-shells/bash-9999
+++ b/metadata/md5-cache/app-shells/bash-9999
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=>=sys-libs/ncurses-5.2-r2:= nls? ( virtual/libintl )
 SLOT=0
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2746175d34a9438b172092aabc3ef5c9
diff --git a/metadata/md5-cache/app-shells/powerline-go-1.21.0 b/metadata/md5-cache/app-shells/powerline-go-1.21.0
deleted file mode 100644
index 2a53fd77df7f..000000000000
--- a/metadata/md5-cache/app-shells/powerline-go-1.21.0
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=A powerline like prompt for Bash, Zsh, Fish written in Go lang.
-EAPI=7
-HOMEPAGE=https://github.com/justjanne/powerline-go
-INHERIT=go-module
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=GPL-3
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/justjanne/powerline-go/archive/v1.21.0.tar.gz -> powerline-go-1.21.0.tar.gz mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.zip -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.zip mirror://goproxy//github.com/!stack!exchange/wmi/@v/v0.0.0-20190523213315-cbe66965904d.mod -> github.com%2F!stack!exchange%2Fwmi%2F@v%2Fv0.0.0-20190523213315-cbe66965904d.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.4.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.4.mod mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/shirou/gopsutil/@v/v3.20.12+incompatible.zip -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.20.12+incompatible.zip mirror://goproxy//github.com/shirou/gopsutil/@v/v3.20.12+incompatible.mod -> github.com%2Fshirou%2Fgopsutil%2F@v%2Fv3.20.12+incompatible.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20190308221718-c2843e01d9a2.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20190308221718-c2843e01d9a2.mod mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.zip -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.zip mirror://goproxy//golang.org/x/crypto/@v/v0.0.0-20201221181555-eec23a3978ad.mod -> golang.org%2Fx%2Fcrypto%2F@v%2Fv0.0.0-20201221181555-eec23a3978ad.mod mirror://goproxy//golang.org/x/net/@v/v0.0.0-20190404232315-eb5bcb51f2a3.mod -> golang.org%2Fx%2Fnet%2F@v%2Fv0.0.0-20190404232315-eb5bcb51f2a3.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190215142949-d0b11bdaac8a.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190215142949-d0b11bdaac8a.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210105210732-16f7687f5001.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210105210732-16f7687f5001.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20210105210732-16f7687f5001.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20210105210732-16f7687f5001.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/text/@v/v0.3.0.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.0.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=9cab9e87efbe50f1dd1c22f92f8e2014
diff --git a/metadata/md5-cache/app-shells/powerline-go-1.22.1 b/metadata/md5-cache/app-shells/powerline-go-1.22.1
deleted file mode 100644
index b4f7d147d749..000000000000
--- a/metadata/md5-cache/app-shells/powerline-go-1.22.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=>=dev-lang/go-1.18 app-arch/unzip
-DEFINED_PHASES=compile install postinst unpack
-DESCRIPTION=A powerline like prompt for Bash, Zsh, Fish written in Go lang.
-EAPI=8
-HOMEPAGE=https://github.com/justjanne/powerline-go
-INHERIT=go-module
-KEYWORDS=~amd64 ~arm ~arm64
-LICENSE=GPL-3 MIT Apache-2.0 BSD
-RESTRICT=strip
-SLOT=0
-SRC_URI=https://github.com/justjanne/powerline-go/archive/v1.22.1.tar.gz -> powerline-go-1.22.1.tar.gz mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.zip -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.zip mirror://goproxy//github.com/mattn/go-runewidth/@v/v0.0.9.mod -> github.com%2Fmattn%2Fgo-runewidth%2F@v%2Fv0.0.9.mod mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.22.3.zip -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.22.3.zip mirror://goproxy//github.com/shirou/gopsutil/v3/@v/v3.22.3.mod -> github.com%2Fshirou%2Fgopsutil%2Fv3%2F@v%2Fv3.22.3.mod mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.zip -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.zip mirror://goproxy//github.com/davecgh/go-spew/@v/v1.1.0.mod -> github.com%2Fdavecgh%2Fgo-spew%2F@v%2Fv1.1.0.mod mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.zip -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.zip mirror://goproxy//github.com/pmezard/go-difflib/@v/v1.0.0.mod -> github.com%2Fpmezard%2Fgo-difflib%2F@v%2Fv1.0.0.mod mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.zip -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.zip mirror://goproxy//github.com/stretchr/objx/@v/v0.1.0.mod -> github.com%2Fstretchr%2Fobjx%2F@v%2Fv0.1.0.mod mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.zip -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.zip mirror://goproxy//gopkg.in/yaml.v3/@v/v3.0.0-20200313102051-9f266ea9e77c.mod -> gopkg.in%2Fyaml.v3%2F@v%2Fv3.0.0-20200313102051-9f266ea9e77c.mod mirror://goproxy//github.com/tklauser/numcpus/@v/v0.4.0.zip -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.4.0.zip mirror://goproxy//github.com/tklauser/numcpus/@v/v0.4.0.mod -> github.com%2Ftklauser%2Fnumcpus%2F@v%2Fv0.4.0.mod mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.6.zip -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.6.zip mirror://goproxy//github.com/go-ole/go-ole/@v/v1.2.6.mod -> github.com%2Fgo-ole%2Fgo-ole%2F@v%2Fv1.2.6.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20190916202348-b4ddaad3f8a3.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20190916202348-b4ddaad3f8a3.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.7.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.7.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.7.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.7.mod mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.zip -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.zip mirror://goproxy//golang.org/x/xerrors/@v/v0.0.0-20191204190536-9bdfabe68543.mod -> golang.org%2Fx%2Fxerrors%2F@v%2Fv0.0.0-20191204190536-9bdfabe68543.mod mirror://goproxy//github.com/lufia/plan9stats/@v/v0.0.0-20211012122336-39d0f177ccd0.zip -> github.com%2Flufia%2Fplan9stats%2F@v%2Fv0.0.0-20211012122336-39d0f177ccd0.zip mirror://goproxy//github.com/lufia/plan9stats/@v/v0.0.0-20211012122336-39d0f177ccd0.mod -> github.com%2Flufia%2Fplan9stats%2F@v%2Fv0.0.0-20211012122336-39d0f177ccd0.mod mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.zip -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.zip mirror://goproxy//github.com/google/go-cmp/@v/v0.5.6.mod -> github.com%2Fgoogle%2Fgo-cmp%2F@v%2Fv0.5.6.mod mirror://goproxy//github.com/power-devops/perfstat/@v/v0.0.0-20210106213030-5aafc221ea8c.zip -> github.com%2Fpower-devops%2Fperfstat%2F@v%2Fv0.0.0-20210106213030-5aafc221ea8c.zip mirror://goproxy//github.com/power-devops/perfstat/@v/v0.0.0-20210106213030-5aafc221ea8c.mod -> github.com%2Fpower-devops%2Fperfstat%2F@v%2Fv0.0.0-20210106213030-5aafc221ea8c.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201204225414-ed752295db88.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201204225414-ed752295db88.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20201204225414-ed752295db88.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20201204225414-ed752295db88.mod mirror://goproxy//github.com/stretchr/testify/@v/v1.7.1.zip -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.1.zip mirror://goproxy//github.com/stretchr/testify/@v/v1.7.1.mod -> github.com%2Fstretchr%2Ftestify%2F@v%2Fv1.7.1.mod mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.10.zip -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.10.zip mirror://goproxy//github.com/tklauser/go-sysconf/@v/v0.3.10.mod -> github.com%2Ftklauser%2Fgo-sysconf%2F@v%2Fv0.3.10.mod mirror://goproxy//github.com/yusufpapurcu/wmi/@v/v1.2.2.zip -> github.com%2Fyusufpapurcu%2Fwmi%2F@v%2Fv1.2.2.zip mirror://goproxy//github.com/yusufpapurcu/wmi/@v/v1.2.2.mod -> github.com%2Fyusufpapurcu%2Fwmi%2F@v%2Fv1.2.2.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20220128215802-99c3d69c2c27.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220128215802-99c3d69c2c27.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20220128215802-99c3d69c2c27.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20220128215802-99c3d69c2c27.mod mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.zip -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.zip mirror://goproxy//golang.org/x/term/@v/v0.0.0-20201117132131-f5c789dd3221.mod -> golang.org%2Fx%2Fterm%2F@v%2Fv0.0.0-20201117132131-f5c789dd3221.mod mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.zip -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.zip mirror://goproxy//golang.org/x/sys/@v/v0.0.0-20191026070338-33540a1f6037.mod -> golang.org%2Fx%2Fsys%2F@v%2Fv0.0.0-20191026070338-33540a1f6037.mod mirror://goproxy//golang.org/x/text/@v/v0.3.4.zip -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.zip mirror://goproxy//golang.org/x/text/@v/v0.3.4.mod -> golang.org%2Fx%2Ftext%2F@v%2Fv0.3.4.mod mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.zip -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.zip mirror://goproxy//golang.org/x/tools/@v/v0.0.0-20180917221912-90fa682c2a6e.mod -> golang.org%2Fx%2Ftools%2F@v%2Fv0.0.0-20180917221912-90fa682c2a6e.mod mirror://goproxy//gopkg.in/ini.v1/@v/v1.66.4.zip -> gopkg.in%2Fini.v1%2F@v%2Fv1.66.4.zip mirror://goproxy//gopkg.in/ini.v1/@v/v1.66.4.mod -> gopkg.in%2Fini.v1%2F@v%2Fv1.66.4.mod mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.zip -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.zip mirror://goproxy//gopkg.in/yaml.v2/@v/v2.4.0.mod -> gopkg.in%2Fyaml.v2%2F@v%2Fv2.4.0.mod mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.zip -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.zip mirror://goproxy//gopkg.in/check.v1/@v/v0.0.0-20161208181325-20d25e280405.mod -> gopkg.in%2Fcheck.v1%2F@v%2Fv0.0.0-20161208181325-20d25e280405.mod
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=8deff88f9299785a0ad8c11de87e7219
diff --git a/metadata/md5-cache/app-shells/powerline-go-1.8.2 b/metadata/md5-cache/app-shells/powerline-go-1.8.2
new file mode 100644
index 000000000000..b6f5c3d81d55
--- /dev/null
+++ b/metadata/md5-cache/app-shells/powerline-go-1.8.2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=dev-lang/go:0=
+DESCRIPTION=A beautiful and useful low-latency prompt for your shell
+EAPI=7
+HOMEPAGE=https://github.com/justjanne/powerline-go
+INHERIT=golang-single
+IUSE=debug pie
+KEYWORDS=amd64 x86 arm
+LICENSE=GPL-3
+RESTRICT=mirror strip
+SLOT=0
+SRC_URI=https://github.com/justjanne/powerline-go/archive/v1.8.2.tar.gz -> powerline-go-1.8.2.tar.gz https://github.com/mattn/go-runewidth/archive/9e777a8.tar.gz -> github.com-mattn-go-runewidth-9e777a8.tar.gz https://github.com/golang/crypto/archive/1875d0a.tar.gz -> github.com-golang-crypto-1875d0a.tar.gz https://github.com/golang/sys/archive/37707fd.tar.gz -> github.com-golang-sys-37707fd.tar.gz https://github.com/golang/text/archive/c4d099d.tar.gz -> github.com-golang-text-c4d099d.tar.gz https://github.com/go-yaml/yaml/archive/d670f94.tar.gz -> github.com-go-yaml-yaml-d670f94.tar.gz
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	golang-common	0e35c9d692b2180a238dc9abf795c514	golang-single	5d5a376ad018d27d64cc6aa51bb211a5	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=bb73af0706fbb63c371365f46b5e44f3
diff --git a/metadata/md5-cache/app-text/poppler-23.01.0 b/metadata/md5-cache/app-text/poppler-23.01.0
index a2d678356fca..2db08e7c4696 100644
--- a/metadata/md5-cache/app-text/poppler-23.01.0
+++ b/metadata/md5-cache/app-text/poppler-23.01.0
@@ -12,5 +12,5 @@ RDEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib ca
 RESTRICT=test
 SLOT=0/126
 SRC_URI=https://poppler.freedesktop.org/poppler-23.01.0.tar.xz verify-sig? ( https://poppler.freedesktop.org/poppler-23.01.0.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=d444090f21a3e303e8b5761d638e7049
diff --git a/metadata/md5-cache/app-text/poppler-23.02.0 b/metadata/md5-cache/app-text/poppler-23.02.0
index 1481251725a8..0c6cf43d0f22 100644
--- a/metadata/md5-cache/app-text/poppler-23.02.0
+++ b/metadata/md5-cache/app-text/poppler-23.02.0
@@ -12,5 +12,5 @@ RDEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib ca
 RESTRICT=test
 SLOT=0/126
 SRC_URI=https://poppler.freedesktop.org/poppler-23.02.0.tar.xz verify-sig? ( https://poppler.freedesktop.org/poppler-23.02.0.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=898da044c14e9b064f3f3305248ba8f6
diff --git a/metadata/md5-cache/app-text/poppler-23.03.0 b/metadata/md5-cache/app-text/poppler-23.03.0
index 867cc25eb038..d75c0330b92b 100644
--- a/metadata/md5-cache/app-text/poppler-23.03.0
+++ b/metadata/md5-cache/app-text/poppler-23.03.0
@@ -12,5 +12,5 @@ RDEPEND=>=media-libs/fontconfig-2.13 >=media-libs/freetype-2.10 sys-libs/zlib ca
 RESTRICT=test
 SLOT=0/126
 SRC_URI=https://poppler.freedesktop.org/poppler-23.03.0.tar.xz verify-sig? ( https://poppler.freedesktop.org/poppler-23.03.0.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=898da044c14e9b064f3f3305248ba8f6
diff --git a/metadata/md5-cache/app-text/xpdf-4.04-r2 b/metadata/md5-cache/app-text/xpdf-4.04-r2
index 5640e637cc95..0edfa415546b 100644
--- a/metadata/md5-cache/app-text/xpdf-4.04-r2
+++ b/metadata/md5-cache/app-text/xpdf-4.04-r2
@@ -12,5 +12,5 @@ LICENSE=|| ( GPL-2 GPL-3 ) i18n? ( BSD )
 RDEPEND=cups? ( dev-qt/qtprintsupport:5[cups] net-print/cups ) fontconfig? ( media-libs/fontconfig ) libpaper? ( >=app-text/libpaper-2.0:= ) utils? ( png? ( media-libs/libpng:0 ) ) dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 media-libs/freetype sys-libs/zlib dev-qt/qtsvg:5 media-fonts/urw-fonts
 SLOT=0
 SRC_URI=https://dl.xpdfreader.com/xpdf-4.04.tar.gz i18n? ( https://dl.xpdfreader.com/xpdf-arabic.tar.gz https://dl.xpdfreader.com/xpdf-chinese-simplified.tar.gz -> xpdf-chinese-simplified-20201222.tar.gz https://dl.xpdfreader.com/xpdf-chinese-traditional.tar.gz -> xpdf-chinese-traditional-20201222.tar.gz https://dl.xpdfreader.com/xpdf-cyrillic.tar.gz https://dl.xpdfreader.com/xpdf-greek.tar.gz https://dl.xpdfreader.com/xpdf-hebrew.tar.gz https://dl.xpdfreader.com/xpdf-japanese.tar.gz -> xpdf-japanese-20201222.tar.gz https://dl.xpdfreader.com/xpdf-korean.tar.gz -> xpdf-korean-20201222.tar.gz https://dl.xpdfreader.com/xpdf-latin2.tar.gz https://dl.xpdfreader.com/xpdf-thai.tar.gz https://dl.xpdfreader.com/xpdf-turkish.tar.gz ) verify-sig? ( https://dl.xpdfreader.com/xpdf-4.04.tar.gz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=57e9242c890b3659a338fd2f42984e2b
diff --git a/metadata/md5-cache/dev-cpp/highway-1.0.3 b/metadata/md5-cache/dev-cpp/highway-1.0.3
index c57f2eaa7580..c706fd237016 100644
--- a/metadata/md5-cache/dev-cpp/highway-1.0.3
+++ b/metadata/md5-cache/dev-cpp/highway-1.0.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/google/highway
 INHERIT=cmake-multilib
 IUSE=cpu_flags_arm_neon test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=Apache-2.0
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/highway/archive/refs/tags/1.0.3.tar.gz -> highway-1.0.3.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=7549b35bd2b538c8eac369a6adcf66c4
+_md5_=154afc8002e8465021d08bc41b75deb2
diff --git a/metadata/md5-cache/dev-java/bcel-6.6.0 b/metadata/md5-cache/dev-java/bcel-6.6.0
index 2a0bf364e106..b70b1e94fede 100644
--- a/metadata/md5-cache/dev-java/bcel-6.6.0
+++ b/metadata/md5-cache/dev-java/bcel-6.6.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/commons-lang:3.6 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/commons/bcel/source/bcel-6.6.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/bcel/source/bcel-6.6.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=334382a5b12c2be82f23086eb5e33fc0
diff --git a/metadata/md5-cache/dev-java/commons-collections-3.2.2-r1 b/metadata/md5-cache/dev-java/commons-collections-3.2.2-r1
index 52c54ffb1124..ecaf0ceb60fa 100644
--- a/metadata/md5-cache/dev-java/commons-collections-3.2.2-r1
+++ b/metadata/md5-cache/dev-java/commons-collections-3.2.2-r1
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://archive.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz verify-sig? ( https://archive.apache.org/dist/commons/collections/source/commons-collections-3.2.2-src.tar.gz.asc )
-_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=61692e9bdfa9f11d45ea3ae996e6ac9c
diff --git a/metadata/md5-cache/dev-java/commons-daemon-1.3.3 b/metadata/md5-cache/dev-java/commons-daemon-1.3.3
index 804cd2e6f313..03bf30e7ce6a 100644
--- a/metadata/md5-cache/dev-java/commons-daemon-1.3.3
+++ b/metadata/md5-cache/dev-java/commons-daemon-1.3.3
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/daemon/source/commons-daemon-1.3.3-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/daemon/source/commons-daemon-1.3.3-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=7902829c493349f239b87ed827604b4a
diff --git a/metadata/md5-cache/dev-java/commons-net-3.9.0 b/metadata/md5-cache/dev-java/commons-net-3.9.0
index 4bb0269ce0c4..9c2666831fe3 100644
--- a/metadata/md5-cache/dev-java/commons-net-3.9.0
+++ b/metadata/md5-cache/dev-java/commons-net-3.9.0
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=0
 SRC_URI=mirror://apache/commons/net/source/commons-net-3.9.0-src.tar.gz verify-sig? ( https://downloads.apache.org/commons/net/source/commons-net-3.9.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=dcce41fb3acf31b61d97c118010bc1a3
diff --git a/metadata/md5-cache/dev-java/junit-5.9.2 b/metadata/md5-cache/dev-java/junit-5.9.2
index 52ab107eddb4..bcfc16f9799c 100644
--- a/metadata/md5-cache/dev-java/junit-5.9.2
+++ b/metadata/md5-cache/dev-java/junit-5.9.2
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://junit.org/junit5/
 INHERIT=java-pkg-2 java-pkg-simple
 IUSE=doc migration-support suite vintage source
-KEYWORDS=~amd64 ~arm ~ppc64
+KEYWORDS=~amd64 ~arm ~ppc64 ~x86
 LICENSE=EPL-2.0
 RDEPEND=>=virtual/jre-1.8:* dev-java/apiguardian-api:0 dev-java/opentest4j:0 dev-java/open-test-reporting-events:0 dev-java/picocli:0 dev-java/univocity-parsers:0 migration-support? ( dev-java/junit:4 ) vintage? ( dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5
 SRC_URI=https://github.com/junit-team/junit5/archive/r5.9.2.tar.gz -> junit-5.9.2.tar.gz
 _eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7
-_md5_=94c6a5c7a07f86750ebe90d93df3fcbe
+_md5_=de46194f366c24f2beff6a605451e430
diff --git a/metadata/md5-cache/dev-java/log4j-api-2.19.0 b/metadata/md5-cache/dev-java/log4j-api-2.19.0
index 045fe7d92e32..310167c52eb2 100644
--- a/metadata/md5-cache/dev-java/log4j-api-2.19.0
+++ b/metadata/md5-cache/dev-java/log4j-api-2.19.0
@@ -12,5 +12,5 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 RESTRICT=test !test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz verify-sig? ( https://www.apache.org/dist/logging/log4j/2.19.0/apache-log4j-2.19.0-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=27aa05fa1790c2623c6d60c4cd05d99b
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-10.1.5 b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.5
index c2607d76a752..e54c1000418b 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-10.1.5
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.5
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=5.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=cf50e26184f54a76c3a9c592977851f3
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-8.5.85 b/metadata/md5-cache/dev-java/tomcat-el-api-8.5.85
index 2d2d91254176..43868f716447 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-8.5.85
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-8.5.85
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=f6fe1875197197849063a7fc4dcb037f
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-9.0.71 b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.71
index ece0dc1ea5aa..f6fab0761de3 100644
--- a/metadata/md5-cache/dev-java/tomcat-el-api-9.0.71
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.71
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=df8f695d1d7bbad39f5267e98f1b3de6
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.5 b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.5
index 4a23ee3bf1eb..826afafbf384 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.5
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.5
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.5:5.0 ~dev-java/tomcat-servlet-api-10.1.5:6.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=0bb551a7c7bfe9714ad793d2fe88e3b1
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.85 b/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.85
index ca02147fbc35..ba58f9716043 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.85
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-8.5.85
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-8.5.85:3.0 ~dev-java/tomcat-servlet-api-8.5.85:3.1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=6625c15023b978c345ecbbf41e4d2c87
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.71 b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.71
index 2e2423c9dcec..7125660ab8c4 100644
--- a/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.71
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.71
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.71:3.0 ~dev-java/tomcat-servlet-api-9.0.71:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=2.3
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=aa21f88ea41778645f03b852172c58a7
diff --git a/metadata/md5-cache/dev-java/tomcat-native-2.0.3-r1 b/metadata/md5-cache/dev-java/tomcat-native-2.0.3-r1
index 90fe1c528e8b..990c5da35ca0 100644
--- a/metadata/md5-cache/dev-java/tomcat-native-2.0.3-r1
+++ b/metadata/md5-cache/dev-java/tomcat-native-2.0.3-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/openssl:0/3 >=virtual/jre-1.8:* >=dev-java/java
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/tomcat/tomcat-connectors/native/2.0.3/source/tomcat-native-2.0.3-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-connectors/native/2.0.3/source/tomcat-native-2.0.3-src.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=a1c9a6ba8179f9c6668bafe36b75ab9d
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.5 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.5
index d9868995f3c0..53664662fedc 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.5
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.5
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.5:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=6.0
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=2374a7418f92bcc4545343cb34a0b633
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.85 b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.85
index 3e623dfdefa9..39e1c7bed684 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.85
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-8.5.85
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* >=dev-java/tomcat-el-api-8.5.85:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=3.1
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=3ded8a4c54cf3ab99d25dee9cf6dad3c
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.71 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.71
index 278f387243f0..a876f78ccff9 100644
--- a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.71
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.71
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.71:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
 SLOT=4.0
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=62647a5fa80f845bd380fba7c962a9fb
diff --git a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8 b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
index dcb63819e9e4..7c8892537493 100644
--- a/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
+++ b/metadata/md5-cache/dev-java/xmlgraphics-commons-2.8
@@ -12,5 +12,5 @@ RDEPEND=dev-java/commons-io:1 dev-java/commons-logging:0 >=virtual/jre-1.8:* >=d
 RESTRICT=!test? ( test )
 SLOT=2
 SRC_URI=mirror://apache/xmlgraphics/commons/source/xmlgraphics-commons-2.8-src.tar.gz verify-sig? ( https://downloads.apache.org/xmlgraphics/commons/source/xmlgraphics-commons-2.8-src.tar.gz.asc )
-_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-pkg-simple	0389d2b96f7da44c3dbabe920bbe5531	java-utils-2	eefed04ac580a259ecda1fbd966640b7	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=96f14e668236d46c2c26e991cfd6703c
diff --git a/metadata/md5-cache/dev-lang/nim-1.6.12 b/metadata/md5-cache/dev-lang/nim-1.6.12
new file mode 100644
index 000000000000..01b5718d978b
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/nim-1.6.12
@@ -0,0 +1,15 @@
+BDEPEND=sys-process/parallel test? ( test-js? ( net-libs/nodejs ) )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=test? ( dev-db/sqlite:3 dev-libs/boehm-gc dev-libs/libffi dev-libs/libpcre:3 dev-libs/openssl media-libs/libsdl media-libs/libsfml )
+DESCRIPTION=Compiled, garbage-collected systems programming language
+EAPI=8
+HOMEPAGE=https://nim-lang.org/
+INHERIT=bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
+IUSE=doc experimental test-js test
+KEYWORDS=~amd64 ~arm ~x86
+LICENSE=MIT
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://nim-lang.org/download/nim-1.6.12.tar.xz experimental? ( https://git.sr.ht/~cyber/nim-patches/archive/1.6.6_p1.tar.gz -> nim-patches-1.6.6_p1.tar.gz )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=d3f9fe9ef23eac47221c61d0cb9564db
diff --git a/metadata/md5-cache/dev-lang/nim-1.6.6-r3 b/metadata/md5-cache/dev-lang/nim-1.6.6-r3
deleted file mode 100644
index da035578a210..000000000000
--- a/metadata/md5-cache/dev-lang/nim-1.6.6-r3
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=compiled, garbage-collected systems programming language
-EAPI=8
-HOMEPAGE=https://nim-lang.org/
-INHERIT=bash-completion-r1 edo multiprocessing toolchain-funcs xdg-utils
-IUSE=experimental
-KEYWORDS=~amd64 ~arm ~x86
-LICENSE=MIT
-RESTRICT=test
-SLOT=0
-SRC_URI=https://nim-lang.org/download/nim-1.6.6.tar.xz experimental? ( https://git.sr.ht/~cyber/nim-patches/archive/1.6.6.tar.gz -> nim-patches-1.6.6.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=167ae254402ddc80e32cc00f8437311f
diff --git a/metadata/md5-cache/dev-lang/python-3.10.10 b/metadata/md5-cache/dev-lang/python-3.10.10
index f775223e3255..1ea6d98d5e05 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.10
+++ b/metadata/md5-cache/dev-lang/python-3.10.10
@@ -13,5 +13,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets
 RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://gitlab.com/liguros/distfiles/-/raw/main/Python-3.10.10.tar.xz https://gitlab.com/liguros/distfiles/-/raw/main/python-gentoo-patches-3.10.10.tar.xz verify-sig? ( https://gitlab.com/liguros/distfiles/-/raw/main/Python-3.10.10.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=259c880a54a3c58e1182975bd49e50fd
diff --git a/metadata/md5-cache/dev-lang/python-3.10.9 b/metadata/md5-cache/dev-lang/python-3.10.9
index bdf461d33ce7..35013ca83945 100644
--- a/metadata/md5-cache/dev-lang/python-3.10.9
+++ b/metadata/md5-cache/dev-lang/python-3.10.9
@@ -13,5 +13,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets
 RESTRICT=!test? ( test )
 SLOT=3.10
 SRC_URI=https://gitlab.com/liguros/distfiles/-/raw/main/Python-3.10.9.tar.xz https://gitlab.com/liguros/distfiles/-/raw/main/python-gentoo-patches-3.10.9.tar.xz verify-sig? ( https://gitlab.com/liguros/distfiles/-/raw/main/Python-3.10.9.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=73c8f18dd22482846325485b44aa2df9
diff --git a/metadata/md5-cache/dev-lang/python-3.11.1 b/metadata/md5-cache/dev-lang/python-3.11.1
index 2d5675317760..b395f8ae5335 100644
--- a/metadata/md5-cache/dev-lang/python-3.11.1
+++ b/metadata/md5-cache/dev-lang/python-3.11.1
@@ -13,5 +13,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets
 RESTRICT=!test? ( test )
 SLOT=3.11
 SRC_URI=https://gitlab.com/liguros/distfiles/-/raw/main/Python-3.11.1.tar.xz https://gitlab.com/liguros/distfiles/-/raw/main/python-gentoo-patches-3.11.1.tar.xz verify-sig? ( https://gitlab.com/liguros/distfiles/-/raw/main/Python-3.11.1.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=a3270ac5026f67dae6dbf8df830b0c9f
diff --git a/metadata/md5-cache/dev-lang/python-3.11.2 b/metadata/md5-cache/dev-lang/python-3.11.2
index 0b45022ceeac..849107882b23 100644
--- a/metadata/md5-cache/dev-lang/python-3.11.2
+++ b/metadata/md5-cache/dev-lang/python-3.11.2
@@ -13,5 +13,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets
 RESTRICT=!test? ( test )
 SLOT=3.11
 SRC_URI=https://gitlab.com/liguros/distfiles/-/raw/main/Python-3.11.2.tar.xz https://gitlab.com/liguros/distfiles/-/raw/main/python-gentoo-patches-3.11.2.tar.xz verify-sig? ( https://gitlab.com/liguros/distfiles/-/raw/main/Python-3.11.2.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=11404746b32d7636985b1329e2d148f3
diff --git a/metadata/md5-cache/dev-lang/python-3.7.15 b/metadata/md5-cache/dev-lang/python-3.7.15
index de672dfba6db..2acbdb19226e 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.15
+++ b/metadata/md5-cache/dev-lang/python-3.7.15
@@ -13,5 +13,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.15/Python-3.7.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.13.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.15/Python-3.7.15.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=8c28f87df80e2dea6ec05ec46398b9f0
diff --git a/metadata/md5-cache/dev-lang/python-3.7.16 b/metadata/md5-cache/dev-lang/python-3.7.16
index 5af08b8e25db..b00721e8f9f5 100644
--- a/metadata/md5-cache/dev-lang/python-3.7.16
+++ b/metadata/md5-cache/dev-lang/python-3.7.16
@@ -13,5 +13,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.7/3.7m
 SRC_URI=https://www.python.org/ftp/python/3.7.16/Python-3.7.16.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.7.13.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.7.16/Python-3.7.16.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=8c28f87df80e2dea6ec05ec46398b9f0
diff --git a/metadata/md5-cache/dev-lang/python-3.8.15 b/metadata/md5-cache/dev-lang/python-3.8.15
index f5b315783c5c..dfda5c657e5c 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.15
+++ b/metadata/md5-cache/dev-lang/python-3.8.15
@@ -13,5 +13,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6467e529cb2f4c89fc636485b5e81743
diff --git a/metadata/md5-cache/dev-lang/python-3.8.16 b/metadata/md5-cache/dev-lang/python-3.8.16
index b085b510bd13..7273661c2377 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.16
+++ b/metadata/md5-cache/dev-lang/python-3.8.16
@@ -13,5 +13,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-libs/libffi:= sys-apps/util-lin
 RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.16/Python-3.8.16.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.16/Python-3.8.16.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=6467e529cb2f4c89fc636485b5e81743
diff --git a/metadata/md5-cache/dev-lang/python-3.9.15-r1 b/metadata/md5-cache/dev-lang/python-3.9.15-r1
index 62dca3f8ab6e..59034c78caee 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.15-r1
+++ b/metadata/md5-cache/dev-lang/python-3.9.15-r1
@@ -13,5 +13,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets
 RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://gitlab.com/liguros/distfiles/-/raw/main/Python-3.9.15.tar.xz https://gitlab.com/liguros/distfiles/-/raw/main/python-gentoo-patches-3.9.15.tar.xz verify-sig? ( https://gitlab.com/liguros/distfiles/-/raw/main/Python-3.9.15.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=efc15a13bff058d72ffb5a3da84b1a15
diff --git a/metadata/md5-cache/dev-lang/python-3.9.16 b/metadata/md5-cache/dev-lang/python-3.9.16
index ac5a1fd16d48..f04c37b49c1d 100644
--- a/metadata/md5-cache/dev-lang/python-3.9.16
+++ b/metadata/md5-cache/dev-lang/python-3.9.16
@@ -13,5 +13,5 @@ RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets
 RESTRICT=!test? ( test )
 SLOT=3.9
 SRC_URI=https://gitlab.com/liguros/distfiles/-/raw/main/Python-3.9.16.tar.xz https://gitlab.com/liguros/distfiles/-/raw/main/python-gentoo-patches-3.9.16.tar.xz verify-sig? ( https://gitlab.com/liguros/distfiles/-/raw/main/Python-3.9.16.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=efc15a13bff058d72ffb5a3da84b1a15
diff --git a/metadata/md5-cache/dev-lang/rust-1.65.0 b/metadata/md5-cache/dev-lang/rust-1.65.0
index 766cacdee6f7..47355eab5aec 100644
--- a/metadata/md5-cache/dev-lang/rust-1.65.0
+++ b/metadata/md5-cache/dev-lang/rust-1.65.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.65
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.65.0-src.tar.xz.asc ) !system-bootstrap? ( 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 ) ) )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=401b3ad5a7e12240e213884d6d7b6dee
diff --git a/metadata/md5-cache/dev-lang/rust-1.66.1 b/metadata/md5-cache/dev-lang/rust-1.66.1
index 06dcd60a61a1..c6f05364304d 100644
--- a/metadata/md5-cache/dev-lang/rust-1.66.1
+++ b/metadata/md5-cache/dev-lang/rust-1.66.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.66
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.66.1-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=c39a1df3d886a77ab1a7a584a839ab1c
diff --git a/metadata/md5-cache/dev-lang/rust-1.67.1 b/metadata/md5-cache/dev-lang/rust-1.67.1
index 6288df7725d6..daeb7fed780e 100644
--- a/metadata/md5-cache/dev-lang/rust-1.67.1
+++ b/metadata/md5-cache/dev-lang/rust-1.67.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=test
 SLOT=stable/1.67
 SRC_URI=https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rustc-1.67.1-src.tar.xz.asc ) !system-bootstrap? ( abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=6f36e72f7565a30e94007d946c0398f9
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.65.0-r1 b/metadata/md5-cache/dev-lang/rust-bin-1.65.0-r1
index df41f2d9295e..bd1f6c9f1f6f 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.65.0-r1
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.65.0-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311 || ( dev-libs/openssl-compat:1.1.1 <
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.65.0-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2022-11-03/rust-src-1.65.0.tar.xz ) sparc? ( https://dev.gentoo.org/~sam/distfiles/dev-lang/rust-bin/rust-1.65.0-sparc64-unknown-linux-gnu.tar.xz )
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=5bd3911748a13335f023333d3b197b8d
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.66.1-r1 b/metadata/md5-cache/dev-lang/rust-bin-1.66.1-r1
index 9691c9f4e381..e7e11e5ee606 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.66.1-r1
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.66.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311 || ( dev-libs/openssl-compat:1.1.1 <
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.66.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2023-01-10/rust-src-1.66.1.tar.xz ) sparc? ( https://dev.gentoo.org/~sam/distfiles/dev-lang/rust-bin/rust-1.66.1-sparc64-unknown-linux-gnu.tar.xz )
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=e15ea0ac8b0fac1830e2ab23213950ca
diff --git a/metadata/md5-cache/dev-lang/rust-bin-1.67.1-r1 b/metadata/md5-cache/dev-lang/rust-bin-1.67.1-r1
index c79391d9929e..0973679b4b0a 100644
--- a/metadata/md5-cache/dev-lang/rust-bin-1.67.1-r1
+++ b/metadata/md5-cache/dev-lang/rust-bin-1.67.1-r1
@@ -11,5 +11,5 @@ RDEPEND=>=app-eselect/eselect-rust-20190311 || ( dev-libs/openssl-compat:1.1.1 <
 REQUIRED_USE=x86? ( cpu_flags_x86_sse2 )
 SLOT=stable
 SRC_URI=abi_x86_64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-x86_64-unknown-linux-musl.tar.xz.asc ) ) ) arm? ( https://static.rust-lang.org/dist/rust-1.67.1-arm-unknown-linux-gnueabi.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-arm-unknown-linux-gnueabi.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.1-arm-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-arm-unknown-linux-gnueabihf.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-armv7-unknown-linux-gnueabihf.tar.xz.asc ) ) arm64? ( elibc_glibc? ( https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-gnu.tar.xz.asc ) ) elibc_musl? ( https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-musl.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-aarch64-unknown-linux-musl.tar.xz.asc ) ) ) mips? ( https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-mips-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-mipsel-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-mips64-unknown-linux-gnuabi64.tar.xz.asc ) ) ppc? ( https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-powerpc-unknown-linux-gnu.tar.xz.asc ) ) ppc64? ( https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-powerpc64-unknown-linux-gnu.tar.xz.asc ) https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-powerpc64le-unknown-linux-gnu.tar.xz.asc ) ) s390? ( https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-s390x-unknown-linux-gnu.tar.xz.asc ) ) abi_x86_32? ( https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-i686-unknown-linux-gnu.tar.xz.asc ) ) riscv? ( https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz verify-sig? ( https://static.rust-lang.org/dist/rust-1.67.1-riscv64gc-unknown-linux-gnu.tar.xz.asc ) ) rust-src? ( https://static.rust-lang.org/dist/2023-02-09/rust-src-1.67.1.tar.xz )
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	rust-toolchain	2ed47174c9eddf7a0f6f6220edb0df4b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=ff4441f318a751b008926cd6e5ea46e0
diff --git a/metadata/md5-cache/dev-libs/botan-2.19.2 b/metadata/md5-cache/dev-libs/botan-2.19.2
index d8156919ed7d..13efa37b1f77 100644
--- a/metadata/md5-cache/dev-libs/botan-2.19.2
+++ b/metadata/md5-cache/dev-libs/botan-2.19.2
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=!test? ( test )
 SLOT=2/2.19
 SRC_URI=https://botan.randombit.net/releases/Botan-2.19.2.tar.xz verify-sig? ( https://botan.randombit.net/releases/Botan-2.19.2.tar.xz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=3b152b1dd1cf760ce75bec61eb232c74
diff --git a/metadata/md5-cache/dev-libs/botan-2.19.3 b/metadata/md5-cache/dev-libs/botan-2.19.3
index 7ab401d76ea0..6ff6b0eb3475 100644
--- a/metadata/md5-cache/dev-libs/botan-2.19.3
+++ b/metadata/md5-cache/dev-libs/botan-2.19.3
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=!test? ( test )
 SLOT=2/2.19
 SRC_URI=https://botan.randombit.net/releases/Botan-2.19.3.tar.xz verify-sig? ( https://botan.randombit.net/releases/Botan-2.19.3.tar.xz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=65fd2e834c753a850ac7cfe493cc616c
diff --git a/metadata/md5-cache/dev-libs/cdk-5.0.20221025 b/metadata/md5-cache/dev-libs/cdk-5.0.20221025
index d1792ddc6cf2..014e4cb254f8 100644
--- a/metadata/md5-cache/dev-libs/cdk-5.0.20221025
+++ b/metadata/md5-cache/dev-libs/cdk-5.0.20221025
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/ncurses:=[unicode(+)?]
 SLOT=0/6
 SRC_URI=https://invisible-island.net/archives/cdk/cdk-5.0-20221025.tgz verify-sig? ( https://invisible-island.net/archives/cdk/cdk-5.0-20221025.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=d52fa5cee476e835e22e1964f608c328
diff --git a/metadata/md5-cache/dev-libs/cdk-5.0.20230201 b/metadata/md5-cache/dev-libs/cdk-5.0.20230201
index 56163a41780c..77dca9ad6b16 100644
--- a/metadata/md5-cache/dev-libs/cdk-5.0.20230201
+++ b/metadata/md5-cache/dev-libs/cdk-5.0.20230201
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/ncurses:=[unicode(+)?]
 SLOT=0/6
 SRC_URI=https://invisible-island.net/archives/cdk/cdk-5.0-20230201.tgz verify-sig? ( https://invisible-island.net/archives/cdk/cdk-5.0-20230201.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=eef1090d1438e010938fec3a366088b6
diff --git a/metadata/md5-cache/dev-libs/crypto++-8.6.0 b/metadata/md5-cache/dev-libs/crypto++-8.6.0
index a14a572df57a..72e5dccb2255 100644
--- a/metadata/md5-cache/dev-libs/crypto++-8.6.0
+++ b/metadata/md5-cache/dev-libs/crypto++-8.6.0
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~loong ppc ppc64 ~riscv sparc x86 ~x64-ma
 LICENSE=Boost-1.0
 SLOT=0/8.6.0
 SRC_URI=https://www.cryptopp.com/cryptopp860.zip verify-sig? ( https://cryptopp.com/cryptopp860.zip.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=0859258e38794ef1c983db33cb231edd
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.188 b/metadata/md5-cache/dev-libs/elfutils-0.188
index 9c3e3f54a0bc..5f933d38ac3d 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.188
+++ b/metadata/md5-cache/dev-libs/elfutils-0.188
@@ -12,5 +12,5 @@ RDEPEND=!dev-libs/libelf >=sys-libs/zlib-1.2.8-r1[static-libs?,abi_x86_32(-)?,ab
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sourceware.org/elfutils/ftp/0.188/elfutils-0.188.tar.bz2 https://dev.gentoo.org/~sam/distfiles/dev-libs/elfutils/elfutils-0.187-patches.tar.xz verify-sig? ( https://sourceware.org/elfutils/ftp/0.188/elfutils-0.188.tar.bz2.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=1edfe62fcc916bcd736fa631ad5f2191
diff --git a/metadata/md5-cache/dev-libs/elfutils-0.189 b/metadata/md5-cache/dev-libs/elfutils-0.189
index 3c483f3cf28a..2fa9089c10a8 100644
--- a/metadata/md5-cache/dev-libs/elfutils-0.189
+++ b/metadata/md5-cache/dev-libs/elfutils-0.189
@@ -12,5 +12,5 @@ RDEPEND=!dev-libs/libelf >=sys-libs/zlib-1.2.8-r1[static-libs?,abi_x86_32(-)?,ab
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://sourceware.org/elfutils/ftp/0.189/elfutils-0.189.tar.bz2 https://dev.gentoo.org/~sam/distfiles/dev-libs/elfutils/elfutils-0.187-patches.tar.xz verify-sig? ( https://sourceware.org/elfutils/ftp/0.189/elfutils-0.189.tar.bz2.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=431a20b980212e538691fef5d98877be
diff --git a/metadata/md5-cache/dev-libs/icu-72.1 b/metadata/md5-cache/dev-libs/icu-72.1
index eb694767b990..6099d9b47257 100644
--- a/metadata/md5-cache/dev-libs/icu-72.1
+++ b/metadata/md5-cache/dev-libs/icu-72.1
@@ -10,5 +10,5 @@ LICENSE=BSD
 RESTRICT=!test? ( test )
 SLOT=0/72.1
 SRC_URI=https://github.com/unicode-org/icu/releases/download/release-72-1/icu4c-72_1-src.tgz verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-72-1/icu4c-72_1-src.tgz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=306fba8be97520e03f368aa2d84dbeea
diff --git a/metadata/md5-cache/dev-libs/icu-layoutex-72.1 b/metadata/md5-cache/dev-libs/icu-layoutex-72.1
index 03a9b82af3b0..6a8be2162e37 100644
--- a/metadata/md5-cache/dev-libs/icu-layoutex-72.1
+++ b/metadata/md5-cache/dev-libs/icu-layoutex-72.1
@@ -12,5 +12,5 @@ RDEPEND=~dev-libs/icu-72.1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mip
 RESTRICT=!test? ( test )
 SLOT=0/72.1
 SRC_URI=https://github.com/unicode-org/icu/releases/download/release-72-1/icu4c-72_1-src.tgz verify-sig? ( https://github.com/unicode-org/icu/releases/download/release-72-1/icu4c-72_1-src.tgz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=d7d40d37536b98f00786f21720fee7fd
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.11.7 b/metadata/md5-cache/dev-libs/libbsd-0.11.7
index cd7cb13ba5f7..656194a409ed 100644
--- a/metadata/md5-cache/dev-libs/libbsd-0.11.7
+++ b/metadata/md5-cache/dev-libs/libbsd-0.11.7
@@ -11,5 +11,5 @@ LICENSE=BSD BSD-2 BSD-4 ISC
 RDEPEND=app-crypt/libmd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.11.7.tar.xz verify-sig? ( https://libbsd.freedesktop.org/releases/libbsd-0.11.7.tar.xz.asc )
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=7fe7de5ffb7f0eccac11217e5ab58838
diff --git a/metadata/md5-cache/dev-libs/libbsd-0.11.7-r2 b/metadata/md5-cache/dev-libs/libbsd-0.11.7-r2
index 07df2dbf4f63..13489aeb7edd 100644
--- a/metadata/md5-cache/dev-libs/libbsd-0.11.7-r2
+++ b/metadata/md5-cache/dev-libs/libbsd-0.11.7-r2
@@ -11,5 +11,5 @@ LICENSE=BSD BSD-2 BSD-4 ISC
 RDEPEND=app-crypt/libmd[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0
 SRC_URI=https://libbsd.freedesktop.org/releases/libbsd-0.11.7.tar.xz verify-sig? ( https://libbsd.freedesktop.org/releases/libbsd-0.11.7.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=34b0b9a9b99d142d821cdec8b91c2f3e
diff --git a/metadata/md5-cache/dev-libs/libclc-14.0.6 b/metadata/md5-cache/dev-libs/libclc-14.0.6
index 76e2b0d7881d..5111653d7cb5 100644
--- a/metadata/md5-cache/dev-libs/libclc-14.0.6
+++ b/metadata/md5-cache/dev-libs/libclc-14.0.6
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 REQUIRED_USE=|| ( video_cards_nvidia video_cards_r600 video_cards_radeonsi )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=feef0c3c68331814ff338a059a7dec01
diff --git a/metadata/md5-cache/dev-libs/libclc-15.0.7 b/metadata/md5-cache/dev-libs/libclc-15.0.7
index a7bf770dbec0..7f17e4706495 100644
--- a/metadata/md5-cache/dev-libs/libclc-15.0.7
+++ b/metadata/md5-cache/dev-libs/libclc-15.0.7
@@ -10,5 +10,5 @@ KEYWORDS=amd64 x86
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2ac54852a3904c960dc10c6a23c374e7
diff --git a/metadata/md5-cache/dev-libs/libclc-16.0.0_rc3 b/metadata/md5-cache/dev-libs/libclc-16.0.0_rc3
index 2de06008db7f..41e611292353 100644
--- a/metadata/md5-cache/dev-libs/libclc-16.0.0_rc3
+++ b/metadata/md5-cache/dev-libs/libclc-16.0.0_rc3
@@ -9,5 +9,5 @@ IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi verify-sig
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c687472b9ac9ad1663cfb1e3fa071eb0
diff --git a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230225 b/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230225
deleted file mode 100644
index a664dc1575de..000000000000
--- a/metadata/md5-cache/dev-libs/libclc-17.0.0_pre20230225
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 >=dev-lang/python-3.7.14:3.7 ) || ( ( sys-devel/clang:17 spirv? ( dev-util/spirv-llvm-translator:17 ) ) ( sys-devel/clang:16 spirv? ( dev-util/spirv-llvm-translator:16 ) ) ( sys-devel/clang:15 spirv? ( dev-util/spirv-llvm-translator:15 ) ) ( sys-devel/clang:14 spirv? ( dev-util/spirv-llvm-translator:14 ) ) ( sys-devel/clang:13 spirv? ( dev-util/spirv-llvm-translator:13 ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!!sys-devel/llvm:0
-DESCRIPTION=OpenCL C library
-EAPI=8
-HOMEPAGE=https://libclc.llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=spirv video_cards_nvidia video_cards_r600 video_cards_radeonsi
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( MIT BSD )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=bce7226a932a31db8d7292b6e433fde7
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r2 b/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r2
index e0941a93c670..ed8088f0a00d 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r2
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r2
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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 ) cpu_flags_ppc_vsx3? ( cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.10.1.tar.bz2 verify-sig? ( mirror://gnupg/libgcrypt/libgcrypt-1.10.1.tar.bz2.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=e505c7892d8014ba173d56b1aee220e3
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r3 b/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r3
index 376c890be5af..5fc869388882 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r3
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.10.1-r3
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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 ) cpu_flags_ppc_vsx3? ( cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.10.1.tar.bz2 verify-sig? ( mirror://gnupg/libgcrypt/libgcrypt-1.10.1.tar.bz2.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=577a3021b52c91b590b1988b8e4c37c2
diff --git a/metadata/md5-cache/dev-libs/libgcrypt-1.9.4-r2 b/metadata/md5-cache/dev-libs/libgcrypt-1.9.4-r2
index 571d670e9836..e019d9139aa0 100644
--- a/metadata/md5-cache/dev-libs/libgcrypt-1.9.4-r2
+++ b/metadata/md5-cache/dev-libs/libgcrypt-1.9.4-r2
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/libgpg-error-1.25[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 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 ) cpu_flags_ppc_vsx3? ( cpu_flags_ppc_altivec cpu_flags_ppc_vsx2 ) cpu_flags_ppc_vsx2? ( cpu_flags_ppc_altivec )
 SLOT=0/20
 SRC_URI=mirror://gnupg/libgcrypt/libgcrypt-1.9.4.tar.bz2 verify-sig? ( mirror://gnupg/libgcrypt/libgcrypt-1.9.4.tar.bz2.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4e436f0a309758df3de9b6feea0b1855
diff --git a/metadata/md5-cache/dev-libs/libgpg-error-1.46-r1 b/metadata/md5-cache/dev-libs/libgpg-error-1.46-r1
index f3d3cead989f..d76edad69f6e 100644
--- a/metadata/md5-cache/dev-libs/libgpg-error-1.46-r1
+++ b/metadata/md5-cache/dev-libs/libgpg-error-1.46-r1
@@ -12,5 +12,5 @@ RDEPEND=nls? ( >=virtual/libintl-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnupg/libgpg-error/libgpg-error-1.46.tar.bz2 mirror://gnupg/libgpg-error/libgpg-error-1.46.tar.bz2.sig
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=bc1c1691fe574d17d180b33b49106da2
diff --git a/metadata/md5-cache/dev-libs/libintl-0.21.1 b/metadata/md5-cache/dev-libs/libintl-0.21.1
index c9cde3471d72..1313ee283634 100644
--- a/metadata/md5-cache/dev-libs/libintl-0.21.1
+++ b/metadata/md5-cache/dev-libs/libintl-0.21.1
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1+
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] !sys-libs/glibc !sys-libs/musl !<sys-devel/gettext-0.19.6-r1
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.21.1.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.21.1.tar.xz.sig )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=3a7f3efaf7ca810f021468fe7fb57a08
diff --git a/metadata/md5-cache/dev-libs/libksba-1.6.3 b/metadata/md5-cache/dev-libs/libksba-1.6.3
index 165e5bceaba9..bbb5c5897766 100644
--- a/metadata/md5-cache/dev-libs/libksba-1.6.3
+++ b/metadata/md5-cache/dev-libs/libksba-1.6.3
@@ -11,5 +11,5 @@ LICENSE=LGPL-3+ GPL-2+ GPL-3
 RDEPEND=>=dev-libs/libgpg-error-1.8
 SLOT=0
 SRC_URI=mirror://gnupg/libksba/libksba-1.6.3.tar.bz2 verify-sig? ( mirror://gnupg/libksba/libksba-1.6.3.tar.bz2.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=3ce1a8c4e543ea6e6af0321658bd9290
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.40-r1 b/metadata/md5-cache/dev-libs/libpcre2-10.40-r1
index 2919f69e2d39..bdf960270b61 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.40-r1
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.40-r1
@@ -12,5 +12,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-
 REQUIRED_USE=?? ( libedit readline )
 SLOT=0/3
 SRC_URI=https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre2-10.40.tar.bz2 verify-sig? ( https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.40/pcre2-10.40.tar.bz2.sig ) https://dev.gentoo.org/~sam/distfiles/dev-libs/libpcre2/libpcre2-10.36-patchset-01.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=b6889443fe87047598c6fbd3f849bc83
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.42-r1 b/metadata/md5-cache/dev-libs/libpcre2-10.42-r1
index 8ed31eecf8bb..fe527f8ec2db 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.42-r1
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.42-r1
@@ -12,5 +12,5 @@ RDEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-
 REQUIRED_USE=?? ( libedit readline )
 SLOT=0/3
 SRC_URI=https://github.com/PCRE2Project/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2 https://ftp.pcre.org/pub/pcre/pcre2-10.42.tar.bz2 verify-sig? ( https://github.com/PhilipHazel/pcre2/releases/download/pcre2-10.42/pcre2-10.42.tar.bz2.sig )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=41ecab6436c55bb66e266d8ed9d22f1d
diff --git a/metadata/md5-cache/dev-libs/libtasn1-4.19.0 b/metadata/md5-cache/dev-libs/libtasn1-4.19.0
index b62e3b8ad8b7..fe3d4dd13bd5 100644
--- a/metadata/md5-cache/dev-libs/libtasn1-4.19.0
+++ b/metadata/md5-cache/dev-libs/libtasn1-4.19.0
@@ -10,5 +10,5 @@ LICENSE=LGPL-2.1+
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=mirror://gnu/libtasn1/libtasn1-4.19.0.tar.gz verify-sig? ( mirror://gnu/libtasn1/libtasn1-4.19.0.tar.gz.sig )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=eec0cc2606ae4224400b97a4b224012f
diff --git a/metadata/md5-cache/dev-libs/libvoikko-4.3.1 b/metadata/md5-cache/dev-libs/libvoikko-4.3.1
index da0d05084f5c..f32ac312baa5 100644
--- a/metadata/md5-cache/dev-libs/libvoikko-4.3.1
+++ b/metadata/md5-cache/dev-libs/libvoikko-4.3.1
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=test
 SLOT=0
 SRC_URI=https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.3.1.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/libvoikko/libvoikko-4.3.1.tar.gz.asc )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=e372227286e4a746791f9945e7c47226
diff --git a/metadata/md5-cache/dev-libs/mpfr-4.2.0 b/metadata/md5-cache/dev-libs/mpfr-4.2.0
index 99ab5b14909e..ff2f3f8973b7 100644
--- a/metadata/md5-cache/dev-libs/mpfr-4.2.0
+++ b/metadata/md5-cache/dev-libs/mpfr-4.2.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.mpfr.org/ https://gitlab.inria.fr/mpfr
 INHERIT=multilib-minimal verify-sig
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=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.2.0/mpfr-4.2.0.tar.xz verify-sig? ( https://www.mpfr.org/mpfr-4.2.0/mpfr-4.2.0.tar.xz.asc )
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=97d2ac48ccf4cf189dcb99961f9c0cca
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
+_md5_=2efa5d5dc43226aa3e158d4082be8e4c
diff --git a/metadata/md5-cache/dev-libs/nettle-3.8.1 b/metadata/md5-cache/dev-libs/nettle-3.8.1
index 7f4cfd852fbd..16bc80c82dde 100644
--- a/metadata/md5-cache/dev-libs/nettle-3.8.1
+++ b/metadata/md5-cache/dev-libs/nettle-3.8.1
@@ -12,5 +12,5 @@ RDEPEND=gmp? ( >=dev-libs/gmp-6.1:0=[static-libs?,abi_x86_32(-)?,abi_x86_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.1.tar.gz verify-sig? ( mirror://gnu/nettle/nettle-3.8.1.tar.gz.sig )
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=1508de581016ac2461e9eac3eea6c264
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1s b/metadata/md5-cache/dev-libs/openssl-1.1.1s
index 99cbcfa52d9e..620c98dc40aa 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1s
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1s
@@ -13,5 +13,5 @@ RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[s
 RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1s.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1s.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=003af2588fa5fd41dc7d68a38f237aa0
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1t-r1 b/metadata/md5-cache/dev-libs/openssl-1.1.1t-r1
index 8054ba449a6d..b3cec8acb0b7 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1t-r1
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1t-r1
@@ -13,5 +13,5 @@ RDEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-
 RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1t.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1t.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=64e5aa5c1f23b08c746506b7074c59ac
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.7-r1 b/metadata/md5-cache/dev-libs/openssl-3.0.7-r1
index 5c550f66e417..10308b5bc4a0 100644
--- a/metadata/md5-cache/dev-libs/openssl-3.0.7-r1
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.7-r1
@@ -13,5 +13,5 @@ RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[s
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://openssl/source/openssl-3.0.7.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.7.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=064543400765363b1b781cfed9508088
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.7-r4 b/metadata/md5-cache/dev-libs/openssl-3.0.7-r4
index f38c002ed44d..52ebc96d11ff 100644
--- a/metadata/md5-cache/dev-libs/openssl-3.0.7-r4
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.7-r4
@@ -13,5 +13,5 @@ RDEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://openssl/source/openssl-3.0.7.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.7.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=a9172a36469e9f8134a7721836514963
diff --git a/metadata/md5-cache/dev-libs/openssl-3.0.8 b/metadata/md5-cache/dev-libs/openssl-3.0.8
index 6f5374adf9bf..96bb9e484dae 100644
--- a/metadata/md5-cache/dev-libs/openssl-3.0.8
+++ b/metadata/md5-cache/dev-libs/openssl-3.0.8
@@ -13,5 +13,5 @@ RDEPEND=tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-
 RESTRICT=!test? ( test )
 SLOT=0/3
 SRC_URI=mirror://openssl/source/openssl-3.0.8.tar.gz verify-sig? ( mirror://openssl/source/openssl-3.0.8.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=f6e9bc32d67f3432c704c1639c7c2b1e
diff --git a/metadata/md5-cache/dev-libs/openssl-compat-1.1.1s b/metadata/md5-cache/dev-libs/openssl-compat-1.1.1s
index c6d52f8c1665..0ff0881291bd 100644
--- a/metadata/md5-cache/dev-libs/openssl-compat-1.1.1s
+++ b/metadata/md5-cache/dev-libs/openssl-compat-1.1.1s
@@ -12,5 +12,5 @@ RDEPEND=!=dev-libs/openssl-1.1.1*:0 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[
 RESTRICT=!test? ( test )
 SLOT=1.1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1s.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1s.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=3eab7915a458b091fa411367747584fd
diff --git a/metadata/md5-cache/dev-libs/openssl-compat-1.1.1t b/metadata/md5-cache/dev-libs/openssl-compat-1.1.1t
index 14b3c5ec3421..f50eb6066760 100644
--- a/metadata/md5-cache/dev-libs/openssl-compat-1.1.1t
+++ b/metadata/md5-cache/dev-libs/openssl-compat-1.1.1t
@@ -12,5 +12,5 @@ RDEPEND=!=dev-libs/openssl-1.1.1*:0 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[
 RESTRICT=!test? ( test )
 SLOT=1.1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1t.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1t.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=c2a525e5a65e3b3662fb26fabb2264fe
diff --git a/metadata/md5-cache/dev-libs/voikko-fi-2.5-r1 b/metadata/md5-cache/dev-libs/voikko-fi-2.5-r1
index 2b56e56ce358..b35b07f52a85 100644
--- a/metadata/md5-cache/dev-libs/voikko-fi-2.5-r1
+++ b/metadata/md5-cache/dev-libs/voikko-fi-2.5-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=dev-libs/foma:= dev-libs/libvoikko
 SLOT=0
 SRC_URI=https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.5.tar.gz verify-sig? ( https://www.puimula.org/voikko-sources/voikko-fi/voikko-fi-2.5.tar.gz.asc )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=19080975b81dc93b88a8edff334ccabe
diff --git a/metadata/md5-cache/dev-libs/xalan-c-1.12-r2 b/metadata/md5-cache/dev-libs/xalan-c-1.12-r2
index 4c6905ede9ee..3ae939382eb3 100644
--- a/metadata/md5-cache/dev-libs/xalan-c-1.12-r2
+++ b/metadata/md5-cache/dev-libs/xalan-c-1.12-r2
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0
 RDEPEND=dev-libs/icu:= dev-libs/xerces-c[icu]
 SLOT=0/1.12
 SRC_URI=https://dlcdn.apache.org/xalan/xalan-c/sources/xalan_c-1.12.tar.gz verify-sig? ( https://dlcdn.apache.org/xalan/xalan-c/sources/xalan_c-1.12.tar.gz.asc )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=6130ba5b9cd35741349641c988362292
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6 b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
index 318a63534947..7210fd67447c 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=5a186ff1f324bb80320feac62dd359e9
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7 b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
index d4c7e8120f4c..8b7ebef0c371 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=70137da8ffa05df4c7ac6e11a1f6df19
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc3 b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc3
index d42246b32237..15afb6de3222 100644
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc3
+++ b/metadata/md5-cache/dev-ml/llvm-ocaml-16.0.0_rc3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm
 RESTRICT=!test? ( test )
 SLOT=0/16.0.0_rc3
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=9fdef3b11adeafe3daf07586e2db4bfb
diff --git a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230225 b/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230225
deleted file mode 100644
index fb4e86429f22..000000000000
--- a/metadata/md5-cache/dev-ml/llvm-ocaml-17.0.0_pre20230225
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 >=dev-lang/python-3.7.14:3.7 ) dev-lang/perl dev-ml/findlib >=dev-util/cmake-3.16 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.0_pre20230225:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=OCaml bindings for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-any-r1
-IUSE=debug test llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=dev-lang/ocaml-4.00.0:0= dev-ml/ocaml-ctypes:= ~sys-devel/llvm-17.0.0_pre20230225:=[debug?] !sys-devel/llvm[ocaml(-)] llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Xtensa] )
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test )
-SLOT=0/17.0.0_pre20230225
-SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9fdef3b11adeafe3daf07586e2db4bfb
diff --git a/metadata/md5-cache/dev-python/accessible-pygments-0.0.3 b/metadata/md5-cache/dev-python/accessible-pygments-0.0.3
index 2411e1dc4443..bbef6a1645a1 100644
--- a/metadata/md5-cache/dev-python/accessible-pygments-0.0.3
+++ b/metadata/md5-cache/dev-python/accessible-pygments-0.0.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/accessible-pygments/ https://github.com/Quansight-Labs/accessible-pygments/
 INHERIT=distutils-r1
 IUSE=python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/pygments-1.5[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/Quansight-Labs/accessible-pygments/archive/v0.0.3.tar.gz -> accessible-pygments-0.0.3.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=24222e0eca0192b0c7cdccc0ba58aefa
+_md5_=98d252cabf01d368dbbaaf3e70dd9066
diff --git a/metadata/md5-cache/dev-python/ansible-compat-2.2.7 b/metadata/md5-cache/dev-python/ansible-compat-2.2.7
deleted file mode 100644
index 984b0f383abb..000000000000
--- a/metadata/md5-cache/dev-python/ansible-compat-2.2.7
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools-scm-7.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-plus[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/ansible-pygments[python_targets_python3_11(-)] dev-python/myst-parser[python_targets_python3_11(-)] dev-python/sphinx_ansible_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/ansible-pygments[python_targets_python3_10(-)] dev-python/myst-parser[python_targets_python3_10(-)] dev-python/sphinx_ansible_theme[python_targets_python3_10(-)] ) ) ) test? ( >=app-admin/ansible-core-2.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Contains functions that facilitate working with various versions of Ansible
-EAPI=8
-HOMEPAGE=https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv
-LICENSE=MIT
-RDEPEND=>=app-admin/ansible-core-2.9.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/a/ansible-compat/ansible-compat-2.2.7.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=22a082da4d52cf4155bd6398a89f74b6
diff --git a/metadata/md5-cache/dev-python/ansible-compat-3.0.1 b/metadata/md5-cache/dev-python/ansible-compat-3.0.1
index 1bf3afbd24d4..b3caea07c479 100644
--- a/metadata/md5-cache/dev-python/ansible-compat-3.0.1
+++ b/metadata/md5-cache/dev-python/ansible-compat-3.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/ansible-compat/ https://github.com/ansible/ansible-compat/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv
+KEYWORDS=amd64 ~riscv
 LICENSE=MIT
 RDEPEND=>=app-admin/ansible-core-2.12[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.4.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/a/ansible-compat/ansible-compat-3.0.1.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f5570c71ac172acca82049837a1a9e7e
+_md5_=5e8f834ada37cf78731dc457527eb62e
diff --git a/metadata/md5-cache/dev-python/apispec-6.3.0 b/metadata/md5-cache/dev-python/apispec-6.3.0
new file mode 100644
index 000000000000..13f6d751707d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/apispec-6.3.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/bottle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/marshmallow-3.18.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/packaging-21.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-issues[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-issues[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-issues[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] dev-python/sphinx-issues[python_targets_python3_8(-)] dev-python/sphinx-rtd-theme[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 >=dev-python/sphinx-5.3.0[python_targets_python3_7(-)] dev-python/sphinx-issues[python_targets_python3_7(-)] dev-python/sphinx-rtd-theme[python_targets_python3_7(-)] ) ) ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,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 pluggable API specification generator
+EAPI=8
+HOMEPAGE=https://github.com/marshmallow-code/apispec/ https://pypi.org/project/apispec/
+INHERIT=distutils-r1 pypi
+IUSE=test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/packaging-21.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-3.10[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/a/apispec/apispec-6.3.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0f05eaf9d86254f409216cb4d0b5cffa
diff --git a/metadata/md5-cache/dev-python/argh-0.26.2-r3 b/metadata/md5-cache/dev-python/argh-0.26.2-r3
deleted file mode 100644
index dc11329b7f70..000000000000
--- a/metadata/md5-cache/dev-python/argh-0.26.2-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/iocapture[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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 simple argparse wrapper
-EAPI=8
-HOMEPAGE=https://pythonhosted.org/argh/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_7 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_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/argh/argh-0.26.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=f638767803176c90a5b603f8d4e2e027
diff --git a/metadata/md5-cache/dev-python/argh-0.27.1 b/metadata/md5-cache/dev-python/argh-0.27.1
deleted file mode 100644
index c98560867f79..000000000000
--- a/metadata/md5-cache/dev-python/argh-0.27.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/iocapture[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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 simple argparse wrapper
-EAPI=8
-HOMEPAGE=https://pythonhosted.org/argh/ https://github.com/neithere/argh/ https://pypi.org/project/argh/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_7 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_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/a/argh/argh-0.27.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b952bf514e04327b9b473869a3b6d70d
diff --git a/metadata/md5-cache/dev-python/argh-0.27.2 b/metadata/md5-cache/dev-python/argh-0.27.2
deleted file mode 100644
index 1a404e6de47f..000000000000
--- a/metadata/md5-cache/dev-python/argh-0.27.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/iocapture[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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 simple argparse wrapper
-EAPI=8
-HOMEPAGE=https://pythonhosted.org/argh/ https://github.com/neithere/argh/ https://pypi.org/project/argh/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_7 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_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/a/argh/argh-0.27.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b952bf514e04327b9b473869a3b6d70d
diff --git a/metadata/md5-cache/dev-python/argh-0.28.1 b/metadata/md5-cache/dev-python/argh-0.28.1
index f0dd7c6d4d92..17afdd4a3bfa 100644
--- a/metadata/md5-cache/dev-python/argh-0.28.1
+++ b/metadata/md5-cache/dev-python/argh-0.28.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pythonhosted.org/argh/ https://github.com/neithere/argh/ https://pypi.org/project/argh/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_7 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 ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=LGPL-3
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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://files.pythonhosted.org/packages/source/a/argh/argh-0.28.1.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c1a17ee6b295772dd149303de537344d
+_md5_=36d8004a917003bb66ebf12473f8bd7e
diff --git a/metadata/md5-cache/dev-python/aws-sam-translator-1.61.0 b/metadata/md5-cache/dev-python/aws-sam-translator-1.61.0
new file mode 100644
index 000000000000..221a7077fa9e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aws-sam-translator-1.61.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pydantic-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/typing-extensions-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A library that transform SAM templates into AWS CloudFormation templates
+EAPI=8
+HOMEPAGE=https://github.com/aws/serverless-application-model/ https://pypi.org/project/aws-sam-translator/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=<dev-python/boto3-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/boto3-1.19.5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-3.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/pydantic-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pydantic-1.8[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/typing-extensions-5[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/typing-extensions-4.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/aws/serverless-application-model/archive/v1.61.0.tar.gz -> serverless-application-model-1.61.0.gh.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=3b51212bb788567e5b2f86181133b284
diff --git a/metadata/md5-cache/dev-python/binaryornot-0.4.4-r2 b/metadata/md5-cache/dev-python/binaryornot-0.4.4-r2
deleted file mode 100644
index 549692d9f0fc..000000000000
--- a/metadata/md5-cache/dev-python/binaryornot-0.4.4-r2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/hypothesis[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/chardet-3.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 >=dev-python/sphinx-5.3.0[python_targets_python3_7(-)] ) ) ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Ultra-lightweight pure Python package to guess whether a file is binary or text
-EAPI=7
-HOMEPAGE=https://github.com/audreyfeldroy/binaryornot
-INHERIT=distutils-r1
-IUSE=test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~ppc64 ~riscv x86
-LICENSE=BSD
-RDEPEND=>=dev-python/chardet-3.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 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/b/binaryornot/binaryornot-0.4.4.tar.gz -> binaryornot-0.4.4.r1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8742ede2a7bf23c93b6b20762ea8cc4e
diff --git a/metadata/md5-cache/dev-python/binaryornot-0.4.4-r3 b/metadata/md5-cache/dev-python/binaryornot-0.4.4-r3
index 15797cc3117f..b61b41453d38 100644
--- a/metadata/md5-cache/dev-python/binaryornot-0.4.4-r3
+++ b/metadata/md5-cache/dev-python/binaryornot-0.4.4-r3
@@ -3,14 +3,14 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Ultra-lightweight pure Python package to guess whether a file is binary or text
 EAPI=8
 HOMEPAGE=https://github.com/audreyfeldroy/binaryornot/ https://pypi.org/project/binaryornot/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-python/chardet-3.0.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 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/b/binaryornot/binaryornot-0.4.4.tar.gz -> binaryornot-0.4.4.r1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b3344f07274d98706f9bbb83472a52c3
+SRC_URI=https://files.pythonhosted.org/packages/source/b/binaryornot/binaryornot-0.4.4.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=79cc4e83bf3d29fc32a6c00be5bfd783
diff --git a/metadata/md5-cache/dev-python/bitarray-2.6.2 b/metadata/md5-cache/dev-python/bitarray-2.6.2
deleted file mode 100644
index 587a0bbc08ea..000000000000
--- a/metadata/md5-cache/dev-python/bitarray-2.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,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 arrays of booleans -- C extension
-EAPI=8
-HOMEPAGE=https://github.com/ilanschnell/bitarray/ https://pypi.org/project/bitarray/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bitarray/bitarray-2.6.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=486775eb0e0d576089b724e354c6a9c0
diff --git a/metadata/md5-cache/dev-python/bitarray-2.7.0 b/metadata/md5-cache/dev-python/bitarray-2.7.0
deleted file mode 100644
index 7ae222690452..000000000000
--- a/metadata/md5-cache/dev-python/bitarray-2.7.0
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,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 arrays of booleans -- C extension
-EAPI=8
-HOMEPAGE=https://github.com/ilanschnell/bitarray/ https://pypi.org/project/bitarray/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bitarray/bitarray-2.7.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c8546693a9660b770c9a5643d0a6911f
diff --git a/metadata/md5-cache/dev-python/bitarray-2.7.1 b/metadata/md5-cache/dev-python/bitarray-2.7.1
deleted file mode 100644
index 84b046df9841..000000000000
--- a/metadata/md5-cache/dev-python/bitarray-2.7.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,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 arrays of booleans -- C extension
-EAPI=8
-HOMEPAGE=https://github.com/ilanschnell/bitarray/ https://pypi.org/project/bitarray/
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=mirror://pypi/b/bitarray/bitarray-2.7.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c8546693a9660b770c9a5643d0a6911f
diff --git a/metadata/md5-cache/dev-python/bitarray-2.7.2 b/metadata/md5-cache/dev-python/bitarray-2.7.2
deleted file mode 100644
index d4d67ee5eaa1..000000000000
--- a/metadata/md5-cache/dev-python/bitarray-2.7.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,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 arrays of booleans -- C extension
-EAPI=8
-HOMEPAGE=https://github.com/ilanschnell/bitarray/ https://pypi.org/project/bitarray/
-INHERIT=distutils-r1 pypi
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/b/bitarray/bitarray-2.7.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=173576c058d31290ae8b926feee175fe
diff --git a/metadata/md5-cache/dev-python/bitarray-2.7.3 b/metadata/md5-cache/dev-python/bitarray-2.7.3
index ae09a6dc97fb..16f7546c767a 100644
--- a/metadata/md5-cache/dev-python/bitarray-2.7.3
+++ b/metadata/md5-cache/dev-python/bitarray-2.7.3
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/ilanschnell/bitarray/ https://pypi.org/project/bitarray/
 INHERIT=distutils-r1 pypi
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 x86 ~amd64-linux ~x86-linux
 LICENSE=PSF-2
 RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/b/bitarray/bitarray-2.7.3.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=173576c058d31290ae8b926feee175fe
+_md5_=207f8f202485293d49a09f3ad74820b7
diff --git a/metadata/md5-cache/dev-python/bitstring-3.1.9 b/metadata/md5-cache/dev-python/bitstring-3.1.9
deleted file mode 100644
index 523d58cc3e3c..000000000000
--- a/metadata/md5-cache/dev-python/bitstring-3.1.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,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 pure Python module for creation and analysis of binary data
-EAPI=8
-HOMEPAGE=https://github.com/scott-griffiths/bitstring
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 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/scott-griffiths/bitstring/archive/bitstring-3.1.9.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=e021fc8efacba88f6193c4eb4a4b2137
diff --git a/metadata/md5-cache/dev-python/bitstring-4.0.1 b/metadata/md5-cache/dev-python/bitstring-4.0.1
index 7e54b2dbd1f9..cb6f42339f07 100644
--- a/metadata/md5-cache/dev-python/bitstring-4.0.1
+++ b/metadata/md5-cache/dev-python/bitstring-4.0.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/scott-griffiths/bitstring/ https://pypi.org/project/bitstring/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 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/scott-griffiths/bitstring/archive/bitstring-4.0.1.tar.gz -> bitstring-bitstring-4.0.1.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=04a29fa80ac24d4246b9d8dcbfe7f351
+_md5_=d7d48520b6c84f496e4ab4b29a5e6c4b
diff --git a/metadata/md5-cache/dev-python/blessed-1.20.0 b/metadata/md5-cache/dev-python/blessed-1.20.0
index 5125f5e129d0..d4dececf7d4e 100644
--- a/metadata/md5-cache/dev-python/blessed-1.20.0
+++ b/metadata/md5-cache/dev-python/blessed-1.20.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jquast/blessed/ https://pypi.org/project/blessed/
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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://files.pythonhosted.org/packages/source/b/blessed/blessed-1.20.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=64451fd1f90aa6fd12b6f4a66b66b280
+_md5_=053ce70a902aa1be5c6576ec409a43a9
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.89 b/metadata/md5-cache/dev-python/boto3-1.26.89
new file mode 100644
index 000000000000..c02e6729f362
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.26.89
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( >=dev-python/botocore-1.29.89[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.89[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.26.89.tar.gz -> boto3-1.26.89.gh.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=20741eb584c21b80ecd8fce5662b3784
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.89 b/metadata/md5-cache/dev-python/botocore-1.29.89
new file mode 100644
index 000000000000..712bedc8593e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.29.89
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ) ) test? ( dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.29.89.tar.gz -> botocore-1.29.89.gh.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=77f09afc3a6dd35ab572ceb28dee0d00
diff --git a/metadata/md5-cache/dev-python/clang-python-14.0.6 b/metadata/md5-cache/dev-python/clang-python-14.0.6
index 589a34bc6a01..0d221f00975d 100644
--- a/metadata/md5-cache/dev-python/clang-python-14.0.6
+++ b/metadata/md5-cache/dev-python/clang-python-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=36b0a20a1dc52c69649680b73e16ecdc
diff --git a/metadata/md5-cache/dev-python/clang-python-15.0.7 b/metadata/md5-cache/dev-python/clang-python-15.0.7
index 5f169eb636aa..73278ed41c5a 100644
--- a/metadata/md5-cache/dev-python/clang-python-15.0.7
+++ b/metadata/md5-cache/dev-python/clang-python-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=07cf9f8d96ab16b0939d7ce38d731841
diff --git a/metadata/md5-cache/dev-python/clang-python-16.0.0_rc3 b/metadata/md5-cache/dev-python/clang-python-16.0.0_rc3
index bc399b5afa0d..0a1e969e03af 100644
--- a/metadata/md5-cache/dev-python/clang-python-16.0.0_rc3
+++ b/metadata/md5-cache/dev-python/clang-python-16.0.0_rc3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=02473a49b4dc90ce9b8356d909bda2df
diff --git a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230225 b/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230225
deleted file mode 100644
index 809122b8bce6..000000000000
--- a/metadata/md5-cache/dev-python/clang-python-17.0.0_pre20230225
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) test? ( sys-devel/clang:17 )
-DEFINED_PHASES=install prepare test unpack
-DEPEND=>=sys-devel/clang-17.0.0_pre20230225:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)]
-DESCRIPTION=Python bindings for sys-devel/clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org python-r1
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=>=sys-devel/clang-17.0.0_pre20230225:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 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/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=02473a49b4dc90ce9b8356d909bda2df
diff --git a/metadata/md5-cache/dev-python/colorclass-2.2.2-r1 b/metadata/md5-cache/dev-python/colorclass-2.2.2-r1
index 15dffc879de3..b67e4c9997da 100644
--- a/metadata/md5-cache/dev-python/colorclass-2.2.2-r1
+++ b/metadata/md5-cache/dev-python/colorclass-2.2.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/colorclass/ https://github.com/matthewdeanmartin/colorclass/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~ppc64 x86
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/matthewdeanmartin/colorclass/archive/v2.2.2.tar.gz -> colorclass-2.2.2.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=22fb7fd32e79a0c60fb39316ff96ce2b
+_md5_=135a7d28104276f2f357fc89f2e614ae
diff --git a/metadata/md5-cache/dev-python/dask-2023.3.1 b/metadata/md5-cache/dev-python/dask-2023.3.1
new file mode 100644
index 000000000000..c68778d65423
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dask-2023.3.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/toolz[python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/moto[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numexpr[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-rerunfailures[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/scipy[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=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_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=>=dev-python/cloudpickle-0.2.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/fsspec-0.6.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/numpy-1.21[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pandas-1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-20.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/partd-1.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyyaml-5.3.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/toolz-0.8.2[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/dask/dask/archive/2023.3.1.tar.gz -> dask-2023.3.1.gh.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=2eaecb8f859a28a2eea229b669c7a03c
diff --git a/metadata/md5-cache/dev-python/debugpy-1.6.3 b/metadata/md5-cache/dev-python/debugpy-1.6.3
deleted file mode 100644
index f0cf5cac56ae..000000000000
--- a/metadata/md5-cache/dev-python/debugpy-1.6.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-timeout[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pydevd[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=An implementation of the Debug Adapter Protocol for Python
-EAPI=8
-HOMEPAGE=https://github.com/microsoft/debugpy/ https://pypi.org/project/debugpy/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_7 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=MIT
-RDEPEND=dev-python/pydevd[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 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/microsoft/debugpy/archive/v1.6.3.tar.gz -> debugpy-1.6.3.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=71ac2a04254d540deb2320ac34f6ad68
diff --git a/metadata/md5-cache/dev-python/debugpy-1.6.6 b/metadata/md5-cache/dev-python/debugpy-1.6.6
index 9930d1a1d97f..74e8b15d04c1 100644
--- a/metadata/md5-cache/dev-python/debugpy-1.6.6
+++ b/metadata/md5-cache/dev-python/debugpy-1.6.6
@@ -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_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/pydevd[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 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.6.tar.gz -> debugpy-1.6.6.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=16198ee9b1a6cdb56e63d7a446215b35
+_md5_=2f838ee4493ff00aa84fa9301a4baa12
diff --git a/metadata/md5-cache/dev-python/django-3.2.18 b/metadata/md5-cache/dev-python/django-3.2.18
index 9b88b444af01..89b5e9962131 100644
--- a/metadata/md5-cache/dev-python/django-3.2.18
+++ b/metadata/md5-cache/dev-python/django-3.2.18
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/3.2/Django-3.2.18.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-3.2.18.checksum.txt )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=32ba48c43350c331b00945f4df22e718
diff --git a/metadata/md5-cache/dev-python/django-4.0.10 b/metadata/md5-cache/dev-python/django-4.0.10
index f9a9d958b46c..4fee00c1533c 100644
--- a/metadata/md5-cache/dev-python/django-4.0.10
+++ b/metadata/md5-cache/dev-python/django-4.0.10
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/4.0/Django-4.0.10.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-4.0.10.checksum.txt )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=bf8d28d43a755fc70a0269d5aab94ea8
diff --git a/metadata/md5-cache/dev-python/django-4.1.7 b/metadata/md5-cache/dev-python/django-4.1.7
index 0a9dda300750..5f8191302f06 100644
--- a/metadata/md5-cache/dev-python/django-4.1.7
+++ b/metadata/md5-cache/dev-python/django-4.1.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://media.djangoproject.com/releases/4.1/Django-4.1.7.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-4.1.7.checksum.txt )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=73323125af3ac10ebe8328c266c750f9
diff --git a/metadata/md5-cache/dev-python/dkimpy-1.1.1 b/metadata/md5-cache/dev-python/dkimpy-1.1.1
new file mode 100644
index 000000000000..acc459328a05
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dkimpy-1.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/authres[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pynacl[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/dnspython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,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=DKIM and ARC email signing and verification library
+EAPI=8
+HOMEPAGE=https://launchpad.net/dkimpy/ https://pypi.org/project/dkimpy/
+INHERIT=distutils-r1 optfeature pypi
+IUSE=test python_targets_python3_7 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/dnspython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/d/dkimpy/dkimpy-1.1.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=7e085e8cec8fd78b67ae350735122cdd
diff --git a/metadata/md5-cache/dev-python/flask-babel-2.0.0-r1 b/metadata/md5-cache/dev-python/flask-babel-2.0.0-r1
deleted file mode 100644
index f60a40461989..000000000000
--- a/metadata/md5-cache/dev-python/flask-babel-2.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/pallets-sphinx-themes[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/pallets-sphinx-themes[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/pallets-sphinx-themes[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] dev-python/pallets-sphinx-themes[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 >=dev-python/sphinx-5.3.0[python_targets_python3_7(-)] dev-python/pallets-sphinx-themes[python_targets_python3_7(-)] ) ( >=dev-python/pypy3-7.3.7:0 >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/pallets-sphinx-themes[python_targets_pypy3(-)] ) ) ) test? ( dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=i18n and l10n support for Flask based on Babel and pytz
-EAPI=8
-HOMEPAGE=https://python-babel.github.io/flask-babel/ https://github.com/python-babel/flask-babel/ https://pypi.org/project/Flask-Babel/
-INHERIT=distutils-r1
-IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~riscv x86
-LICENSE=BSD
-RDEPEND=dev-python/Babel[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jinja-2.5[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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-Babel/Flask-Babel-2.0.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5f127b6b34ead9b3e318b445242d112f
diff --git a/metadata/md5-cache/dev-python/flask-babel-3.0.1-r1 b/metadata/md5-cache/dev-python/flask-babel-3.0.1-r1
index 71fbba46deae..1800c17b7723 100644
--- a/metadata/md5-cache/dev-python/flask-babel-3.0.1-r1
+++ b/metadata/md5-cache/dev-python/flask-babel-3.0.1-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://python-babel.github.io/flask-babel/ https://github.com/python-babel/flask-babel/ https://pypi.org/project/flask-babel/
 INHERIT=distutils-r1
 IUSE=doc test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm arm64 ~riscv x86
 LICENSE=BSD
 RDEPEND=<dev-python/Babel-3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/flask-3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jinja-4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytz[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/python-babel/flask-babel/archive/v3.0.1.tar.gz -> flask-babel-3.0.1.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a89e04c6f3a7e39f9b3bba709b1b6da6
+_md5_=cc969caa6cfb6f661aa241768e4867c3
diff --git a/metadata/md5-cache/dev-python/fuse-python-1.0.5 b/metadata/md5-cache/dev-python/fuse-python-1.0.5
index e7ca21841bae..994578f8dcad 100644
--- a/metadata/md5-cache/dev-python/fuse-python-1.0.5
+++ b/metadata/md5-cache/dev-python/fuse-python-1.0.5
@@ -11,6 +11,6 @@ LICENSE=GPL-2
 RDEPEND=sys-fs/fuse:0= python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
-SRC_URI=https://github.com/libfuse/python-fuse/archive/v1.0.5.tar.gz -> python-fuse-1.0.5.tar.gz
+SRC_URI=https://github.com/libfuse/python-fuse/archive/v1.0.5.tar.gz -> python-fuse-1.0.5.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0161026d23d94f6e702f800f6cef416f
+_md5_=80bfb03a65ee4057831e7d59d45c58cf
diff --git a/metadata/md5-cache/dev-python/ipykernel-6.21.3 b/metadata/md5-cache/dev-python/ipykernel-6.21.3
index a251f7b67508..8b47a8458632 100644
--- a/metadata/md5-cache/dev-python/ipykernel-6.21.3
+++ b/metadata/md5-cache/dev-python/ipykernel-6.21.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/ipython/ipykernel/ https://pypi.org/project/ipykernel/
 INHERIT=distutils-r1 pypi virtualx
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 test
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/comm-0.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/debugpy-1.6.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/ipython-7.23.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-4.12[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/matplotlib-inline-0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nest_asyncio[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-20[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5.4.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/i/ipykernel/ipykernel-6.21.3.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=cb746490d8237de61eaa4e094ee5d5d1
+_md5_=5820256add9f7266a3083010794a21d8
diff --git a/metadata/md5-cache/dev-python/isort-5.11.4 b/metadata/md5-cache/dev-python/isort-5.11.4
deleted file mode 100644
index da150827852a..000000000000
--- a/metadata/md5-cache/dev-python/isort-5.11.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/black[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hypothesis[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/natsort[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pylama[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-vcs/git ) test? ( dev-python/tomli[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_python3_7(-)?,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 utility/library to sort imports
-EAPI=8
-HOMEPAGE=https://github.com/PyCQA/isort/ https://pypi.org/project/isort/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_7 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=MIT
-RDEPEND=dev-python/tomli[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 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/PyCQA/isort/archive/5.11.4.tar.gz -> isort-5.11.4.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1634f90ca527a2ccf431e3c426d4d884
diff --git a/metadata/md5-cache/dev-python/isort-5.12.0 b/metadata/md5-cache/dev-python/isort-5.12.0
index 699b003cd387..c9a21e275640 100644
--- a/metadata/md5-cache/dev-python/isort-5.12.0
+++ b/metadata/md5-cache/dev-python/isort-5.12.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/PyCQA/isort/ https://pypi.org/project/isort/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/tomli[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 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/PyCQA/isort/archive/5.12.0.tar.gz -> isort-5.12.0.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=dc04a6065d0249884324a9abab495790
+_md5_=bc2e9b78452ea523931843e3cad5d5f1
diff --git a/metadata/md5-cache/dev-python/jupyter_client-8.0.3 b/metadata/md5-cache/dev-python/jupyter_client-8.0.3
index ed43a05d5c64..49c4729a64b1 100644
--- a/metadata/md5-cache/dev-python/jupyter_client-8.0.3
+++ b/metadata/md5-cache/dev-python/jupyter_client-8.0.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/jupyter_client/ https://pypi.org/project/jupyter-client/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jupyter_core-5.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-dateutil-2.8.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-23.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/traitlets[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-4.8.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[threads(+)] )
 REQUIRED_USE=|| ( python_targets_python3_7 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://files.pythonhosted.org/packages/source/j/jupyter_client/jupyter_client-8.0.3.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a623869d7a952a4f1d3a3f969c79c89c
+_md5_=7c98a482af4d7623f35bdea4185f4013
diff --git a/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6 b/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
index 72b16947d524..0b2e35cfc617 100644
--- a/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
+++ b/metadata/md5-cache/dev-python/jupyter_server_mathjax-0.2.6
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter-server/jupyter_server_mathjax/ https://pypi.org/project/jupyter-server-mathjax/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=BSD
 RDEPEND=>=dev-python/jupyter_server-1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 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/j/jupyter_server_mathjax/jupyter_server_mathjax-0.2.6.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=09766636b19d7cdbb246125703f24a56
+_md5_=b0b83e3d144570c11fcfa97864b99e87
diff --git a/metadata/md5-cache/dev-python/kafka-python-2.0.2-r1 b/metadata/md5-cache/dev-python/kafka-python-2.0.2-r1
index 922be7b08508..18aaa4e9a4ec 100644
--- a/metadata/md5-cache/dev-python/kafka-python-2.0.2-r1
+++ b/metadata/md5-cache/dev-python/kafka-python-2.0.2-r1
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/dpkp/kafka-python/archive/2.0.2.tar.gz -> kafka-python-2.0.2.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=5925666c6b5239178b8a56ff46da029b
+_md5_=4060b94e423156fe8e263a212ce13bc0
diff --git a/metadata/md5-cache/dev-python/libvirt-python-8.7.0 b/metadata/md5-cache/dev-python/libvirt-python-8.7.0
index 12d08147fd87..7c250f0d5fec 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-8.7.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-8.7.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-8.7.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-8.7.0.tar.gz.asc )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=4c61cc725cdf173dd5277bc5b4fcee1d
diff --git a/metadata/md5-cache/dev-python/libvirt-python-8.8.0 b/metadata/md5-cache/dev-python/libvirt-python-8.8.0
index e731e5bdcddb..112b3bf03eb0 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-8.8.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-8.8.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-8.8.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-8.8.0.tar.gz.asc )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=3140382e34c4f6331078b2524c680b77
diff --git a/metadata/md5-cache/dev-python/libvirt-python-8.9.0 b/metadata/md5-cache/dev-python/libvirt-python-8.9.0
index 4760b257d492..19457556b066 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-8.9.0
+++ b/metadata/md5-cache/dev-python/libvirt-python-8.9.0
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://libvirt.org/sources/python/libvirt-python-8.9.0.tar.gz verify-sig? ( https://libvirt.org/sources/python/libvirt-python-8.9.0.tar.gz.asc )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=a4343922a800975da79b7153271ff85f
diff --git a/metadata/md5-cache/dev-python/libvirt-python-9999 b/metadata/md5-cache/dev-python/libvirt-python-9999
index 42692bf316a4..67486a1936ab 100644
--- a/metadata/md5-cache/dev-python/libvirt-python-9999
+++ b/metadata/md5-cache/dev-python/libvirt-python-9999
@@ -11,5 +11,5 @@ RDEPEND=app-emulation/libvirt:= python_targets_python3_7? ( >=dev-lang/python-3.
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=bf2ea2711fc3c8d89cbfa1a491efb83b
diff --git a/metadata/md5-cache/dev-python/lit-14.0.6 b/metadata/md5-cache/dev-python/lit-14.0.6
index 31b1e302f474..b75158368e81 100644
--- a/metadata/md5-cache/dev-python/lit-14.0.6
+++ b/metadata/md5-cache/dev-python/lit-14.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=d39a0f0660605d7f8001a52751507d4d
diff --git a/metadata/md5-cache/dev-python/lit-15.0.7 b/metadata/md5-cache/dev-python/lit-15.0.7
index 7832a7cd3fe1..015b8daf6902 100644
--- a/metadata/md5-cache/dev-python/lit-15.0.7
+++ b/metadata/md5-cache/dev-python/lit-15.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=d39a0f0660605d7f8001a52751507d4d
diff --git a/metadata/md5-cache/dev-python/lit-16.0.0_rc3 b/metadata/md5-cache/dev-python/lit-16.0.0_rc3
index 959ab31df60b..c903abc0dbbf 100644
--- a/metadata/md5-cache/dev-python/lit-16.0.0_rc3
+++ b/metadata/md5-cache/dev-python/lit-16.0.0_rc3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=900d859b859986ec768dbe5b6fc00533
diff --git a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230225 b/metadata/md5-cache/dev-python/lit-17.0.0_pre20230225
deleted file mode 100644
index 550228969625..000000000000
--- a/metadata/md5-cache/dev-python/lit-17.0.0_pre20230225
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=test? ( dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/llvm ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,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 stand-alone install of the LLVM suite testing tool
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=distutils-r1 llvm.org
-IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 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/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=91b411657285a8978df97932cb8276ae
diff --git a/metadata/md5-cache/dev-python/mistune-2.0.4 b/metadata/md5-cache/dev-python/mistune-2.0.4
deleted file mode 100644
index e5de73424888..000000000000
--- a/metadata/md5-cache/dev-python/mistune-2.0.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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 fastest markdown parser in pure Python
-EAPI=8
-HOMEPAGE=https://github.com/lepture/mistune/ https://pypi.org/project/mistune/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_7 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 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=BSD
-RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/mistune/mistune-2.0.4.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=690436898f01d6eb8961c4350bee460e
diff --git a/metadata/md5-cache/dev-python/mistune-2.0.5 b/metadata/md5-cache/dev-python/mistune-2.0.5
index 1cef0addd3bf..0b87b4616098 100644
--- a/metadata/md5-cache/dev-python/mistune-2.0.5
+++ b/metadata/md5-cache/dev-python/mistune-2.0.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/lepture/mistune/ https://pypi.org/project/mistune/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_7 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 ~amd64-linux ~x86-linux ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~x64-macos
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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://files.pythonhosted.org/packages/source/m/mistune/mistune-2.0.5.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=82b49b8b6450fc850baf5bba87eda2ca
+_md5_=4c6851417105cea47ae550c8ed8f30ed
diff --git a/metadata/md5-cache/dev-python/mpmath-1.2.1 b/metadata/md5-cache/dev-python/mpmath-1.2.1
deleted file mode 100644
index 4f8790e80db7..000000000000
--- a/metadata/md5-cache/dev-python/mpmath-1.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( gmp? ( dev-python/gmpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) matplotlib? ( dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_python3_7(-)?,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_7 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) matplotlib? ( dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 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	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=208f953ea7696f52f7a637f7fed9f0d4
diff --git a/metadata/md5-cache/dev-python/mpmath-1.3.0 b/metadata/md5-cache/dev-python/mpmath-1.3.0
index a67e1b77d2bf..9aa527193250 100644
--- a/metadata/md5-cache/dev-python/mpmath-1.3.0
+++ b/metadata/md5-cache/dev-python/mpmath-1.3.0
@@ -2,15 +2,15 @@ BDEPEND=test? ( gmp? ( dev-python/gmpy[python_targets_python3_7(-)?,python_targe
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python library for arbitrary-precision floating-point arithmetic
 EAPI=8
-HOMEPAGE=https://mpmath.org/
-INHERIT=distutils-r1 virtualx
+HOMEPAGE=https://mpmath.org/ https://github.com/mpmath/mpmath/ https://pypi.org/project/mpmath/
+INHERIT=distutils-r1 pypi virtualx
 IUSE=gmp matplotlib test python_targets_python3_7 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
+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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) matplotlib? ( dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 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.3.0.tar.gz -> mpmath-1.3.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
-_md5_=e3d93faefa99932dcdf6e3168ebdc6c6
+SRC_URI=https://files.pythonhosted.org/packages/source/m/mpmath/mpmath-1.3.0.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=6a00db88d5e1202808cb0eadfbaaf3ad
diff --git a/metadata/md5-cache/dev-python/mypy_extensions-1.0.0 b/metadata/md5-cache/dev-python/mypy_extensions-1.0.0
index 538447d29c86..853c1778f08d 100644
--- a/metadata/md5-cache/dev-python/mypy_extensions-1.0.0
+++ b/metadata/md5-cache/dev-python/mypy_extensions-1.0.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.mypy-lang.org/ https://github.com/python/mypy_extensions/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-macos
 LICENSE=MIT
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/python/mypy_extensions/archive/1.0.0.tar.gz -> mypy_extensions-1.0.0.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4068484a0643b9961cefa9f7acb9f2fc
+_md5_=5ea1172473a3c1144e75a28888610870
diff --git a/metadata/md5-cache/dev-python/nbclassic-0.5.3 b/metadata/md5-cache/dev-python/nbclassic-0.5.3
index 32e56e6836bd..ca6cc6e24d9d 100644
--- a/metadata/md5-cache/dev-python/nbclassic-0.5.3
+++ b/metadata/md5-cache/dev-python/nbclassic-0.5.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/nbclassic/ https://pypi.org/project/nbclassic/
 INHERIT=distutils-r1 pypi xdg-utils
 IUSE=test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=BSD
 RDEPEND=dev-python/argon2-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython_genutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-6.1.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-4.6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbconvert-5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/notebook_shim-0.1.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prometheus_client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/send2trash-1.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/notebook-7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 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://files.pythonhosted.org/packages/source/n/nbclassic/nbclassic-0.5.3.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8ce1e324a43930615f4d5eea9884a0ba
+_md5_=d4d6a70c56cc57ac2f332541ad20b8c8
diff --git a/metadata/md5-cache/dev-python/nbdime-3.1.1-r2 b/metadata/md5-cache/dev-python/nbdime-3.1.1-r2
new file mode 100644
index 000000000000..64469fd3b0fa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/nbdime-3.1.1-r2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/notebook[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-timeout[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tabulate[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx-rtd-theme[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 >=dev-python/sphinx-5.3.0[python_targets_python3_7(-)] dev-python/recommonmark[python_targets_python3_7(-)] dev-python/sphinx-rtd-theme[python_targets_python3_7(-)] ) ) ) test? ( dev-python/colorama[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/GitPython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter_server[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter_server_mathjax[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tornado[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Diff and merge of Jupyter Notebooks
+EAPI=8
+HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/nbdime/ https://pypi.org/project/nbdime/
+INHERIT=distutils-r1 pypi edos2unix
+IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=BSD
+RDEPEND=dev-python/colorama[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/GitPython[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter_server[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter_server_mathjax[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tornado[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/n/nbdime/nbdime-3.1.1.tar.gz https://github.com/jupyter/nbdime/commit/0e1cdaa77f57aa7f609d5ef7da26a52814c7ff74.patch -> nbdime-3.1.1-jupyter_server2.patch https://github.com/jupyter/nbdime/commit/f67a809262b45ed0eaedc840b0e5d979eaa6965d.patch -> nbdime-3.1.1-py3.11.patch
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	edos2unix	33e347e171066657f91f8b0c72ec8773	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4d6f4eebbaad4aa686f924b6fb040393
diff --git a/metadata/md5-cache/dev-python/nbsphinx-0.8.12 b/metadata/md5-cache/dev-python/nbsphinx-0.8.12
index 415e406eb017..0cb9b57cd24b 100644
--- a/metadata/md5-cache/dev-python/nbsphinx-0.8.12
+++ b/metadata/md5-cache/dev-python/nbsphinx-0.8.12
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/spatialaudio/nbsphinx/ https://pypi.org/project/nbsphinx/
 INHERIT=distutils-r1
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=MIT
 RDEPEND=dev-python/docutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbconvert[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-1.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=mirror://pypi/n/nbsphinx/nbsphinx-0.8.12.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0723abb081cc2dd5a30b6a4cfc7a9e6f
+_md5_=992018997dbfb8962af2b2fd607729b3
diff --git a/metadata/md5-cache/dev-python/nbval-0.10.0-r1 b/metadata/md5-cache/dev-python/nbval-0.10.0-r1
index a8de636b4c93..f2dfa2028b1a 100644
--- a/metadata/md5-cache/dev-python/nbval-0.10.0-r1
+++ b/metadata/md5-cache/dev-python/nbval-0.10.0-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/computationalmodelling/nbval
 INHERIT=distutils-r1
 IUSE=test doc python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=BSD
 RDEPEND=dev-python/coverage[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jupyter_client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 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/n/nbval/nbval-0.10.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=de4d72bdc8337480962297d4cf38af05
+_md5_=40abec80457500cb18776167c5dda86e
diff --git a/metadata/md5-cache/dev-python/nbxmpp-4.1.0 b/metadata/md5-cache/dev-python/nbxmpp-4.1.0
deleted file mode 100644
index 8a2c9b33f139..000000000000
--- a/metadata/md5-cache/dev-python/nbxmpp-4.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-libs/gobject-introspection net-libs/libsoup:3.0[introspection] dev-python/idna[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/precis-i18n-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/unittest-or-fail[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Python library to use Jabber/XMPP networks in a non-blocking way
-EAPI=8
-HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/ https://pypi.org/project/nbxmpp/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
-LICENSE=GPL-3
-RDEPEND=dev-libs/gobject-introspection net-libs/libsoup:3.0[introspection] dev-python/idna[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/precis-i18n-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygobject[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/4.1.0/python-nbxmpp-4.1.0.tar.bz2
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b12c320eeb6a6a4534c44e5fc1015125
diff --git a/metadata/md5-cache/dev-python/nbxmpp-4.2.0 b/metadata/md5-cache/dev-python/nbxmpp-4.2.0
index a8e97ee7a6e6..00ae01684ffe 100644
--- a/metadata/md5-cache/dev-python/nbxmpp-4.2.0
+++ b/metadata/md5-cache/dev-python/nbxmpp-4.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://dev.gajim.org/gajim/python-nbxmpp/ https://pypi.org/project/nbxmpp/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-3
 RDEPEND=dev-libs/gobject-introspection net-libs/libsoup:3.0[introspection] dev-python/idna[python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/precis-i18n-1.0.0[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygobject-3.42[python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://dev.gajim.org/gajim/python-nbxmpp/-/archive/4.2.0/python-nbxmpp-4.2.0.tar.bz2
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7dba4caa3768976608a30ec57ce45a91
+_md5_=d43ae69164dd55a95fe5cf8c4eebc030
diff --git a/metadata/md5-cache/dev-python/notebook-6.5.3 b/metadata/md5-cache/dev-python/notebook-6.5.3
index 4451254b406b..8215e3ba46cc 100644
--- a/metadata/md5-cache/dev-python/notebook-6.5.3
+++ b/metadata/md5-cache/dev-python/notebook-6.5.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org
 INHERIT=distutils-r1 pypi xdg-utils
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=~amd64 ~riscv
 LICENSE=BSD
 PDEPEND=>=dev-python/nbconvert-4.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 RDEPEND=>=dev-libs/mathjax-2.7.4 dev-python/argon2-cffi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipykernel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ipython_genutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_core-4.6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_client-5.3.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nbclassic-0.4.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/nbformat[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/nest_asyncio-1.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/prometheus_client[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyzmq-17[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/send2trash-1.8.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/terminado-0.8.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-6.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/traitlets-4.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[threads(+)] )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://files.pythonhosted.org/packages/source/n/notebook/notebook-6.5.3.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9eb13ad1e4b5cb10ec2163aa2c1e893c
+_md5_=68060ddf69672fa92078ec78e6007c66
diff --git a/metadata/md5-cache/dev-python/notebook_shim-0.2.2-r1 b/metadata/md5-cache/dev-python/notebook_shim-0.2.2-r1
index c58ed6269422..4713ee0bc481 100644
--- a/metadata/md5-cache/dev-python/notebook_shim-0.2.2-r1
+++ b/metadata/md5-cache/dev-python/notebook_shim-0.2.2-r1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://jupyter.org/ https://github.com/jupyter/notebook_shim/ https://pypi.org/project/notebook-shim/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=~amd64 ~riscv ~x86
 LICENSE=BSD
 RDEPEND=<dev-python/jupyter_server-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jupyter_server-1.8[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 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/n/notebook_shim/notebook_shim-0.2.2.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=52df26e03c569e0a969b36cd54081eee
+_md5_=44c5da0bdff25192740e0c26f0c8bf4e
diff --git a/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.1 b/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.1
deleted file mode 100644
index 4c39fbd4ea23..000000000000
--- a/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/isodate[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7(-)?,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_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7 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/isodate[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7(-)?,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_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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.4.1.tar.gz -> openapi-schema-validator-0.4.1.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c97a61c1e710651a8eeda16b1b5a06f4
diff --git a/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.3 b/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.3
index 05921ea488c4..ba36c199a31f 100644
--- a/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.3
+++ b/metadata/md5-cache/dev-python/openapi-schema-validator-0.4.3
@@ -2,15 +2,15 @@ BDEPEND=test? ( >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_ta
 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/
+HOMEPAGE=https://github.com/python-openapi/openapi-schema-validator/ https://pypi.org/project/openapi-schema-validator/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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.4.3.tar.gz -> openapi-schema-validator-0.4.3.gh.tar.gz
+SRC_URI=https://github.com/python-openapi/openapi-schema-validator/archive/0.4.3.tar.gz -> openapi-schema-validator-0.4.3.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=376a7dbfecaff552d93dfaa88fd56d12
+_md5_=3ec3c45ad4725e0740cdb45af9f83286
diff --git a/metadata/md5-cache/dev-python/openapi-spec-validator-0.5.2 b/metadata/md5-cache/dev-python/openapi-spec-validator-0.5.2
deleted file mode 100644
index 98edb61633e5..000000000000
--- a/metadata/md5-cache/dev-python/openapi-spec-validator-0.5.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-spec-0.1.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lazy-object-proxy-1.7.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.5[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-schema-validator-0.3.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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 2.0 (aka Swagger) and OpenAPI 3.0 spec validator
-EAPI=8
-HOMEPAGE=https://github.com/p1c2u/openapi-spec-validator/ https://pypi.org/project/openapi-spec-validator/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_7 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/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-spec-0.1.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lazy-object-proxy-1.7.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.5[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-schema-validator-0.3.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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-spec-validator/archive/0.5.2.tar.gz -> openapi-spec-validator-0.5.2.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=494885d638b8cb7069ba770d1886249d
diff --git a/metadata/md5-cache/dev-python/openapi-spec-validator-0.5.5 b/metadata/md5-cache/dev-python/openapi-spec-validator-0.5.5
index 15071894d9fe..a543ceb5e144 100644
--- a/metadata/md5-cache/dev-python/openapi-spec-validator-0.5.5
+++ b/metadata/md5-cache/dev-python/openapi-spec-validator-0.5.5
@@ -2,15 +2,15 @@ BDEPEND=test? ( >=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_ta
 DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=OpenAPI 2.0 (aka Swagger) and OpenAPI 3.0 spec validator
 EAPI=8
-HOMEPAGE=https://github.com/p1c2u/openapi-spec-validator/ https://pypi.org/project/openapi-spec-validator/
+HOMEPAGE=https://github.com/python-openapi/openapi-spec-validator/ https://pypi.org/project/openapi-spec-validator/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-python/jsonschema-4.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-spec-0.1.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lazy-object-proxy-1.7.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/openapi-schema-validator-0.5[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/openapi-schema-validator-0.3.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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-spec-validator/archive/0.5.5.tar.gz -> openapi-spec-validator-0.5.5.gh.tar.gz
+SRC_URI=https://github.com/python-openapi/openapi-spec-validator/archive/0.5.5.tar.gz -> openapi-spec-validator-0.5.5.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ba74052dc462f2029f92440a39a1860a
+_md5_=857344cf54f67ccbdb1825f84a38446c
diff --git a/metadata/md5-cache/dev-python/paramiko-3.1.0 b/metadata/md5-cache/dev-python/paramiko-3.1.0
new file mode 100644
index 000000000000..332fbda93de8
--- /dev/null
+++ b/metadata/md5-cache/dev-python/paramiko-3.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/bcrypt-3.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pynacl-1.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=SSH2 protocol library
+EAPI=8
+HOMEPAGE=https://www.paramiko.org/ https://github.com/paramiko/paramiko/ https://pypi.org/project/paramiko/
+INHERIT=distutils-r1
+IUSE=examples server test python_targets_python3_7 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris
+LICENSE=LGPL-2.1
+RDEPEND=>=dev-python/bcrypt-3.1.3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/cryptography-2.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pynacl-1.0.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyasn1-0.1.7[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_7 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/paramiko/paramiko/archive/3.1.0.tar.gz -> paramiko-3.1.0.gh.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c12696cbdf69911ec738502b3cdc9692
diff --git a/metadata/md5-cache/dev-python/pefile-2022.5.30-r1 b/metadata/md5-cache/dev-python/pefile-2022.5.30-r1
deleted file mode 100644
index 0c8879955ecd..000000000000
--- a/metadata/md5-cache/dev-python/pefile-2022.5.30-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Module to read and work with Portable Executable (PE) files
-EAPI=8
-HOMEPAGE=https://github.com/erocarrera/pefile
-INHERIT=distutils-r1
-IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm ~arm64 x86
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/erocarrera/pefile/releases/download/v2022.5.30/pefile-2022.5.30.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bb78cd4c390a8355e0dc6386153ff411
diff --git a/metadata/md5-cache/dev-python/pefile-2023.2.7 b/metadata/md5-cache/dev-python/pefile-2023.2.7
index 3a57ba8192da..4ee51382ef0f 100644
--- a/metadata/md5-cache/dev-python/pefile-2023.2.7
+++ b/metadata/md5-cache/dev-python/pefile-2023.2.7
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://github.com/erocarrera/pefile
 INHERIT=distutils-r1
 IUSE=python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=MIT
 RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://github.com/erocarrera/pefile/releases/download/v2023.2.7/pefile-2023.2.7.tar.gz -> pefile-2023.2.7.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7bd42553c37b76995d0d00e3960677dc
+_md5_=156dc97fb8f261c737dee7185e7fe816
diff --git a/metadata/md5-cache/dev-python/pefile-9999 b/metadata/md5-cache/dev-python/pefile-9999
index 80f4b2073953..d57a617a2fe3 100644
--- a/metadata/md5-cache/dev-python/pefile-9999
+++ b/metadata/md5-cache/dev-python/pefile-9999
@@ -11,4 +11,4 @@ RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_target
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7bd42553c37b76995d0d00e3960677dc
+_md5_=156dc97fb8f261c737dee7185e7fe816
diff --git a/metadata/md5-cache/dev-python/platformdirs-3.1.1 b/metadata/md5-cache/dev-python/platformdirs-3.1.1
new file mode 100644
index 000000000000..54f2af747572
--- /dev/null
+++ b/metadata/md5-cache/dev-python/platformdirs-3.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/appdirs[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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 small Python module for determining appropriate platform-specific dirs
+EAPI=8
+HOMEPAGE=https://pypi.org/project/platformdirs/ https://github.com/platformdirs/platformdirs/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_7 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 ~arm64-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/platformdirs/platformdirs/archive/3.1.1.tar.gz -> platformdirs-3.1.1.gh.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4983f600c2e48bfd5ad54afc0efd57d8
diff --git a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.13.1 b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.13.1
index ad5835591fd0..f74b5b2ce05f 100644
--- a/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.13.1
+++ b/metadata/md5-cache/dev-python/pydata-sphinx-theme-0.13.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pydata/pydata-sphinx-theme/ https://pypi.org/project/pydata-sphinx-theme/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=BSD-with-disclosure
 RDEPEND=dev-python/accessible-pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/Babel[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/beautifulsoup4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/docutils[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sphinx-4.2[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 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/pydata/pydata-sphinx-theme/archive/v0.13.1.tar.gz -> pydata-sphinx-theme-0.13.1.gh.tar.gz https://files.pythonhosted.org/packages/py3/p/pydata-sphinx-theme/pydata_sphinx_theme-0.13.1-py3-none-any.whl
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d7603a606a966ee3ccc6349fb60f14eb
+_md5_=343428f35e051b77faf2064299369455
diff --git a/metadata/md5-cache/dev-python/pydevd-2.9.3 b/metadata/md5-cache/dev-python/pydevd-2.9.3
deleted file mode 100644
index 02b1acb10cc9..000000000000
--- a/metadata/md5-cache/dev-python/pydevd-2.9.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/untangle[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( !<dev-python/debugpy-1.4.2 sys-devel/gdb >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=PyDev.Debugger (used in PyDev, PyCharm and VSCode Python)
-EAPI=8
-HOMEPAGE=https://github.com/fabioz/PyDev.Debugger/
-INHERIT=distutils-r1 toolchain-funcs
-IUSE=test python_targets_python3_7 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=EPL-1.0
-RDEPEND=!<dev-python/debugpy-1.4.2 sys-devel/gdb python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 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/fabioz/PyDev.Debugger/archive/pydev_debugger_2_9_3.tar.gz -> pydevd-2.9.3.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=092620d4e96fb9ce994d75dbdb4ab57c
diff --git a/metadata/md5-cache/dev-python/pydevd-2.9.5 b/metadata/md5-cache/dev-python/pydevd-2.9.5
index 6ff88f91ff4f..3581c6d90c7b 100644
--- a/metadata/md5-cache/dev-python/pydevd-2.9.5
+++ b/metadata/md5-cache/dev-python/pydevd-2.9.5
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/fabioz/PyDev.Debugger/
 INHERIT=distutils-r1 toolchain-funcs
 IUSE=test python_targets_python3_7 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
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=EPL-1.0
 RDEPEND=sys-devel/gdb python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 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_9_5.tar.gz -> pydevd-2.9.5.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4fae4882397964cd74633f46d92ba762
+_md5_=9a1391b8a0313ae0310afe376ab34213
diff --git a/metadata/md5-cache/dev-python/pyopencl-2022.2.4 b/metadata/md5-cache/dev-python/pyopencl-2022.2.4
deleted file mode 100644
index 167874d2e5be..000000000000
--- a/metadata/md5-cache/dev-python/pyopencl-2022.2.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-python/numpy[python_targets_python3_7(-)?,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_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_7(-)?,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_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,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_7 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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_7(-)?,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_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=test !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2022.2.4.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=69f38eba4e5294448e3e358c8c9bf35d
diff --git a/metadata/md5-cache/dev-python/pyopencl-2022.3.1 b/metadata/md5-cache/dev-python/pyopencl-2022.3.1
index 051a5b4375e0..84c6c8055798 100644
--- a/metadata/md5-cache/dev-python/pyopencl-2022.3.1
+++ b/metadata/md5-cache/dev-python/pyopencl-2022.3.1
@@ -4,14 +4,14 @@ 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
+INHERIT=distutils-r1 multiprocessing pypi
 IUSE=examples opengl test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~ppc64
+KEYWORDS=amd64 ~ppc64
 LICENSE=GPL-2
 RDEPEND=>=virtual/opencl-2 >=dev-python/mako-0.3.6[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_7(-)?,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_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 RESTRICT=test !test? ( test )
 SLOT=0
-SRC_URI=mirror://pypi/p/pyopencl/pyopencl-2022.3.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b454e8e3d7df8a4ed8e33774cb7269a6
+SRC_URI=https://files.pythonhosted.org/packages/source/p/pyopencl/pyopencl-2022.3.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=78768a22db4fabbdfa660b5d7f852105
diff --git a/metadata/md5-cache/dev-python/python-docs-3.10.10 b/metadata/md5-cache/dev-python/python-docs-3.10.10
index 176f3ee57a8d..08f194fb0226 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.10.10
+++ b/metadata/md5-cache/dev-python/python-docs-3.10.10
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.10
 SRC_URI=https://www.python.org/ftp/python/doc/3.10.10/python-3.10.10-docs-html.tar.bz2
-_md5_=b1da8159f2ed9a9bd142a6d306d6e98c
+_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/dev-python/python-docs-3.10.9 b/metadata/md5-cache/dev-python/python-docs-3.10.9
deleted file mode 100644
index 1abfe3947422..000000000000
--- a/metadata/md5-cache/dev-python/python-docs-3.10.9
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.10
-SRC_URI=https://www.python.org/ftp/python/doc/3.10.9/python-3.10.9-docs-html.tar.bz2
-_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/dev-python/python-docs-3.11.1 b/metadata/md5-cache/dev-python/python-docs-3.11.1
deleted file mode 100644
index 4b28e18dcbf2..000000000000
--- a/metadata/md5-cache/dev-python/python-docs-3.11.1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=HTML documentation for Python
-EAPI=7
-HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
-LICENSE=PSF-2
-SLOT=3.11
-SRC_URI=https://www.python.org/ftp/python/doc/3.11.1/python-3.11.1-docs-html.tar.bz2
-_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/dev-python/python-docs-3.11.2 b/metadata/md5-cache/dev-python/python-docs-3.11.2
index 7e88074c7580..3e57161cde00 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.11.2
+++ b/metadata/md5-cache/dev-python/python-docs-3.11.2
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.11
 SRC_URI=https://www.python.org/ftp/python/doc/3.11.2/python-3.11.2-docs-html.tar.bz2
-_md5_=b1da8159f2ed9a9bd142a6d306d6e98c
+_md5_=15a7d7da15df0ba5eba3ac072daa73bc
diff --git a/metadata/md5-cache/dev-python/python-gnupg-0.5.0 b/metadata/md5-cache/dev-python/python-gnupg-0.5.0
index 7ee7d599b40f..a1fc8ee1420a 100644
--- a/metadata/md5-cache/dev-python/python-gnupg-0.5.0
+++ b/metadata/md5-cache/dev-python/python-gnupg-0.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/vsajip/python-gnupg/releases/download/0.5.0/python-gnupg-0.5.0.tar.gz verify-sig? ( https://github.com/vsajip/python-gnupg/releases/download/0.5.0/python-gnupg-0.5.0.tar.gz.asc )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=01d2d7df294f26c023a17e29f06b2884
diff --git a/metadata/md5-cache/dev-python/python-markdown-math-0.8 b/metadata/md5-cache/dev-python/python-markdown-math-0.8
deleted file mode 100644
index 91c25c58e8e8..000000000000
--- a/metadata/md5-cache/dev-python/python-markdown-math-0.8
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/markdown-3.0.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/setuptools-65.7.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Math extension for Python-Markdown
-EAPI=7
-HOMEPAGE=https://github.com/mitya57/python-markdown-math
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~riscv x86
-LICENSE=BSD
-RDEPEND=>=dev-python/markdown-3.0.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/python-markdown-math/python-markdown-math-0.8.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7a64b028593cc6929376bd35c7bb3c94
diff --git a/metadata/md5-cache/dev-python/python-markdown-math-0.8-r1 b/metadata/md5-cache/dev-python/python-markdown-math-0.8-r1
index 42894629c2b1..33f05656f50d 100644
--- a/metadata/md5-cache/dev-python/python-markdown-math-0.8-r1
+++ b/metadata/md5-cache/dev-python/python-markdown-math-0.8-r1
@@ -3,14 +3,14 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Math extension for Python-Markdown
 EAPI=8
 HOMEPAGE=https://github.com/mitya57/python-markdown-math/ https://pypi.org/project/python-markdown-math/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~riscv ~x86
+KEYWORDS=amd64 ~riscv x86
 LICENSE=BSD
 RDEPEND=>=dev-python/markdown-3.3.7[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/python-markdown-math/python-markdown-math-0.8.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=6c43179fe86816ac5aa0092c6b0bbb29
+SRC_URI=https://files.pythonhosted.org/packages/source/p/python-markdown-math/python-markdown-math-0.8.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=bf5ef6b5c2c6a32a74b6bdc486df50ae
diff --git a/metadata/md5-cache/dev-python/python-miniupnpc-2.2.4 b/metadata/md5-cache/dev-python/python-miniupnpc-2.2.4
index 654b6eb969de..cfc97f69c0af 100644
--- a/metadata/md5-cache/dev-python/python-miniupnpc-2.2.4
+++ b/metadata/md5-cache/dev-python/python-miniupnpc-2.2.4
@@ -12,5 +12,5 @@ RDEPEND=>=net-libs/miniupnpc-2.2.4:0= python_targets_pypy3? ( >=dev-python/pypy3
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
 SLOT=0
 SRC_URI=https://miniupnp.tuxfamily.org/files/miniupnpc-2.2.4.tar.gz verify-sig? ( https://miniupnp.tuxfamily.org/files/miniupnpc-2.2.4.tar.gz.sig )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=5f5071c99d6462b4949f80d95b37a676
diff --git a/metadata/md5-cache/dev-python/redis-4.5.1 b/metadata/md5-cache/dev-python/redis-4.5.1
index 84ce4fc57a99..381307c67303 100644
--- a/metadata/md5-cache/dev-python/redis-4.5.1
+++ b/metadata/md5-cache/dev-python/redis-4.5.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/redis/redis-py/ https://pypi.org/project/redis/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
 RDEPEND=>=dev-python/async-timeout-4.0.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/redis/redis-py/archive/v4.5.1.tar.gz -> redis-py-4.5.1.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2fef2f46dad699ec9c9fc6194a0cb96f
+_md5_=bb0565c49ab6927e069b463c32fbef96
diff --git a/metadata/md5-cache/dev-python/responses-0.23.1-r1 b/metadata/md5-cache/dev-python/responses-0.23.1-r1
new file mode 100644
index 000000000000..cb10fbf3a1a9
--- /dev/null
+++ b/metadata/md5-cache/dev-python/responses-0.23.1-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-httpserver[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/requests-3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7(-)?,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/tomli-w[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utility for mocking out the Python Requests library
+EAPI=8
+HOMEPAGE=https://pypi.org/project/responses/ https://github.com/getsentry/responses/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_pypy3 python_targets_python3_7 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=Apache-2.0
+RDEPEND=dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/requests-3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7(-)?,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/tomli-w[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.10[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/r/responses/responses-0.23.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4cf0081a1320dad9938fd60dbf9a5cb4
diff --git a/metadata/md5-cache/dev-python/rst-linker-2.3.1 b/metadata/md5-cache/dev-python/rst-linker-2.3.1
deleted file mode 100644
index 7cd3e9767647..000000000000
--- a/metadata/md5-cache/dev-python/rst-linker-2.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=>=dev-python/setuptools-scm-3.4.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/path[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Sphinx plugin to add links and timestamps to the changelog
-EAPI=8
-HOMEPAGE=https://github.com/jaraco/rst.linker/ https://pypi.org/project/rst.linker/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=MIT
-RDEPEND=dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/rst.linker/rst.linker-2.3.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8a4ced485c663a5e20b3bd05f5141a6e
diff --git a/metadata/md5-cache/dev-python/rst-linker-2.4.0 b/metadata/md5-cache/dev-python/rst-linker-2.4.0
index 7b3d41c99fe8..56cb97ffe328 100644
--- a/metadata/md5-cache/dev-python/rst-linker-2.4.0
+++ b/metadata/md5-cache/dev-python/rst-linker-2.4.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jaraco/rst.linker/ https://pypi.org/project/rst.linker/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=MIT
 RDEPEND=dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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://files.pythonhosted.org/packages/source/r/rst.linker/rst.linker-2.4.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b331bf5a03fc9f1655e50e7ab9430e14
+_md5_=94672bb48153abb0cf86d5e1c2e545b8
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.14.0 b/metadata/md5-cache/dev-python/sentry-sdk-1.14.0
deleted file mode 100644
index d015a99822de..000000000000
--- a/metadata/md5-cache/dev-python/sentry-sdk-1.14.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/asttokens[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/django[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/executing[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fakeredis[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask-login[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrsistent[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-aiohttp[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-django[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-localserver[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-event[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/urllib3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,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 client for Sentry
-EAPI=8
-HOMEPAGE=https://sentry.io/ https://github.com/getsentry/sentry-python/ https://pypi.org/project/sentry-sdk/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_7 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=PSF-2
-RDEPEND=dev-python/urllib3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 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/getsentry/sentry-python/archive/1.14.0.tar.gz -> sentry-sdk-1.14.0.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c5b2d109f42bc8128746d08cb4a3fa7c
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.15.0 b/metadata/md5-cache/dev-python/sentry-sdk-1.15.0
deleted file mode 100644
index 50c7aec3cedf..000000000000
--- a/metadata/md5-cache/dev-python/sentry-sdk-1.15.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/asttokens[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/django[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/executing[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/fakeredis[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/flask-login[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jsonschema[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyrsistent[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-aiohttp[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-django[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-forked[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-localserver[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/werkzeug[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-event[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/urllib3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,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 client for Sentry
-EAPI=8
-HOMEPAGE=https://sentry.io/ https://github.com/getsentry/sentry-python/ https://pypi.org/project/sentry-sdk/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_7 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=PSF-2
-RDEPEND=dev-python/urllib3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 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/getsentry/sentry-python/archive/1.15.0.tar.gz -> sentry-sdk-1.15.0.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=756e484a3027ec8a2139722d3dae3b4b
diff --git a/metadata/md5-cache/dev-python/sentry-sdk-1.16.0 b/metadata/md5-cache/dev-python/sentry-sdk-1.16.0
index ad41798048b8..133f6ae2dbcc 100644
--- a/metadata/md5-cache/dev-python/sentry-sdk-1.16.0
+++ b/metadata/md5-cache/dev-python/sentry-sdk-1.16.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://sentry.io/ https://github.com/getsentry/sentry-python/ https://pypi.org/project/sentry-sdk/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_7 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
+KEYWORDS=amd64 arm arm64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=PSF-2
 RDEPEND=dev-python/urllib3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/certifi[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 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/getsentry/sentry-python/archive/1.16.0.tar.gz -> sentry-python-1.16.0.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=74017da80d9676a90e6db67af1232871
+_md5_=b211e94611752052395d363a382f43d0
diff --git a/metadata/md5-cache/dev-python/simplejson-3.18.3 b/metadata/md5-cache/dev-python/simplejson-3.18.3
index 5cd340f51bed..491e159135d8 100644
--- a/metadata/md5-cache/dev-python/simplejson-3.18.3
+++ b/metadata/md5-cache/dev-python/simplejson-3.18.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/simplejson/simplejson/ https://pypi.org/project/simplejson/
 INHERIT=distutils-r1
 IUSE=+native-extensions test python_targets_pypy3 python_targets_python3_7 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 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
+KEYWORDS=~alpha amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
 LICENSE=|| ( MIT AFL-2.1 )
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/simplejson/simplejson/archive/v3.18.3.tar.gz -> simplejson-3.18.3.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=011601d206373255917dc22b57207b26
+_md5_=d37b63b34cfe88e371c554f59c173b47
diff --git a/metadata/md5-cache/dev-python/sphinx-gallery-0.12.2 b/metadata/md5-cache/dev-python/sphinx-gallery-0.12.2
new file mode 100644
index 000000000000..23938ba8e11c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/sphinx-gallery-0.12.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/joblib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Sphinx extension to automatically generate an examples gallery
+EAPI=8
+HOMEPAGE=https://github.com/sphinx-gallery/sphinx-gallery/ https://sphinx-gallery.github.io/ https://pypi.org/project/sphinx-gallery/
+INHERIT=distutils-r1 pypi
+IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=dev-python/matplotlib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sphinx[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sphinx-gallery/sphinx-gallery-0.12.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=2233af6f1b306d4e2d920bd07ea6017c
diff --git a/metadata/md5-cache/dev-python/starlette-0.23.1 b/metadata/md5-cache/dev-python/starlette-0.23.1
deleted file mode 100644
index 08916eff1838..000000000000
--- a/metadata/md5-cache/dev-python/starlette-0.23.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/trio[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/anyio-5[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.22.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-multipart[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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 little ASGI framework that shines
-EAPI=8
-HOMEPAGE=https://www.starlette.io/ https://github.com/encode/starlette/ https://pypi.org/project/starlette/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm64 ~loong ppc ppc64 ~riscv x86
-LICENSE=BSD
-RDEPEND=<dev-python/anyio-5[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.22.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-multipart[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/encode/starlette/archive/0.23.1.tar.gz -> starlette-0.23.1.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=69f5904794f080bd8359dc9f8f0f9fdf
diff --git a/metadata/md5-cache/dev-python/starlette-0.24.0 b/metadata/md5-cache/dev-python/starlette-0.24.0
deleted file mode 100644
index 3e26f2e28150..000000000000
--- a/metadata/md5-cache/dev-python/starlette-0.24.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/trio[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/anyio-5[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.22.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-multipart[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.12.2[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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 little ASGI framework that shines
-EAPI=8
-HOMEPAGE=https://www.starlette.io/ https://github.com/encode/starlette/ https://pypi.org/project/starlette/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~loong ~ppc ~ppc64 ~riscv ~x86
-LICENSE=BSD
-RDEPEND=<dev-python/anyio-5[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.22.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-multipart[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/encode/starlette/archive/0.24.0.tar.gz -> starlette-0.24.0.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=79ac3bdb79c3cfde9817575a9b102aae
diff --git a/metadata/md5-cache/dev-python/starlette-0.25.0 b/metadata/md5-cache/dev-python/starlette-0.25.0
index c99acd79eb28..16543e2abe60 100644
--- a/metadata/md5-cache/dev-python/starlette-0.25.0
+++ b/metadata/md5-cache/dev-python/starlette-0.25.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://www.starlette.io/ https://github.com/encode/starlette/ https://pypi.org/project/starlette/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm arm64 ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RDEPEND=<dev-python/anyio-5[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.4.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.22.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itsdangerous[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-multipart[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/encode/starlette/archive/0.25.0.tar.gz -> starlette-0.25.0.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=3ec4c2f68cf5916f0d845e9828d5e472
+_md5_=8a94d3c1d4ba4e7cedf3c5d3630a447a
diff --git a/metadata/md5-cache/dev-python/stripe-5.0.0 b/metadata/md5-cache/dev-python/stripe-5.0.0
deleted file mode 100644
index ced88a6e47d6..000000000000
--- a/metadata/md5-cache/dev-python/stripe-5.0.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-util/stripe-mock-0.141.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/curl ) test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stripe python bindings
-EAPI=8
-HOMEPAGE=https://github.com/stripe/stripe-python/ https://pypi.org/project/stripe/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 x86
-LICENSE=MIT
-RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/s/stripe/stripe-5.0.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=803970c5506042a201e1ae77577e2068
diff --git a/metadata/md5-cache/dev-python/stripe-5.1.0 b/metadata/md5-cache/dev-python/stripe-5.1.0
deleted file mode 100644
index f14fbfe1dadf..000000000000
--- a/metadata/md5-cache/dev-python/stripe-5.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-util/stripe-mock-0.151.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/curl ) test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stripe python bindings
-EAPI=8
-HOMEPAGE=https://github.com/stripe/stripe-python/ https://pypi.org/project/stripe/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/s/stripe/stripe-5.1.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c40f5dd332b31dd57ded582a7a2b84b9
diff --git a/metadata/md5-cache/dev-python/stripe-5.1.1 b/metadata/md5-cache/dev-python/stripe-5.1.1
deleted file mode 100644
index 6072258c238d..000000000000
--- a/metadata/md5-cache/dev-python/stripe-5.1.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-util/stripe-mock-0.151.0 dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] net-misc/curl ) test? ( >=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Stripe python bindings
-EAPI=8
-HOMEPAGE=https://github.com/stripe/stripe-python/ https://pypi.org/project/stripe/
-INHERIT=distutils-r1 pypi
-IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/s/stripe/stripe-5.1.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=85350ce400a32eaf99f14e2d78967cb3
diff --git a/metadata/md5-cache/dev-python/stripe-5.2.0 b/metadata/md5-cache/dev-python/stripe-5.2.0
index ae39d546c6b6..ed02f4a20bb5 100644
--- a/metadata/md5-cache/dev-python/stripe-5.2.0
+++ b/metadata/md5-cache/dev-python/stripe-5.2.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/stripe/stripe-python/ https://pypi.org/project/stripe/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=MIT
 RDEPEND=>=dev-python/requests-2.20[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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://files.pythonhosted.org/packages/source/s/stripe/stripe-5.2.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=85350ce400a32eaf99f14e2d78967cb3
+_md5_=edc5d9fa6758919b422ba5a04bfa51f1
diff --git a/metadata/md5-cache/dev-python/sure-2.0.0-r1 b/metadata/md5-cache/dev-python/sure-2.0.0-r1
deleted file mode 100644
index 613b9449a177..000000000000
--- a/metadata/md5-cache/dev-python/sure-2.0.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=idiomatic assertion toolkit with human-friendly failure messages
-EAPI=8
-HOMEPAGE=https://github.com/gabrielfalcao/sure/ https://pypi.org/project/sure/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_7 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=GPL-3+
-RDEPEND=dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 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/s/sure/sure-2.0.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=7a2866d4419a2f24e084846e32c28d7f
diff --git a/metadata/md5-cache/dev-python/sure-2.0.1 b/metadata/md5-cache/dev-python/sure-2.0.1
index 9dc337fc1425..6dbd89dd94c8 100644
--- a/metadata/md5-cache/dev-python/sure-2.0.1
+++ b/metadata/md5-cache/dev-python/sure-2.0.1
@@ -3,14 +3,14 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=idiomatic assertion toolkit with human-friendly failure messages
 EAPI=8
 HOMEPAGE=https://github.com/gabrielfalcao/sure/ https://pypi.org/project/sure/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_7 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
+KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86
 LICENSE=GPL-3+
 RDEPEND=dev-python/mock[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 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/s/sure/sure-2.0.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a96ff85ceada5e023cb90c49e345ad7d
+SRC_URI=https://files.pythonhosted.org/packages/source/s/sure/sure-2.0.1.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=ee813ccefc41290a0f7f646fec9b5532
diff --git a/metadata/md5-cache/dev-python/tabulate-0.9.0 b/metadata/md5-cache/dev-python/tabulate-0.9.0
index ef4b15148e62..726d7a0e8ed7 100644
--- a/metadata/md5-cache/dev-python/tabulate-0.9.0
+++ b/metadata/md5-cache/dev-python/tabulate-0.9.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/astanin/python-tabulate/ https://pypi.org/project/tabulate/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=dev-python/wcwidth[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/astanin/python-tabulate/archive/v0.9.0.tar.gz -> python-tabulate-0.9.0.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c86eb04f503c49d9651d9e1dd6792581
+_md5_=a35961d065a060cfd1dcee56d909cdf3
diff --git a/metadata/md5-cache/dev-python/tenacity-8.1.0 b/metadata/md5-cache/dev-python/tenacity-8.1.0
deleted file mode 100644
index 8b8c63286293..000000000000
--- a/metadata/md5-cache/dev-python/tenacity-8.1.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/tornado[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,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_7 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_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 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	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=822a1ecd96eb9c93d7a5fda3c15caad2
diff --git a/metadata/md5-cache/dev-python/tenacity-8.2.0 b/metadata/md5-cache/dev-python/tenacity-8.2.0
deleted file mode 100644
index 875e08201da3..000000000000
--- a/metadata/md5-cache/dev-python/tenacity-8.2.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/tornado[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,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 pypi
-IUSE=test python_targets_python3_7 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_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/tenacity/tenacity-8.2.0.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=323b5afbab788c604ae0df152804a224
diff --git a/metadata/md5-cache/dev-python/tenacity-8.2.1 b/metadata/md5-cache/dev-python/tenacity-8.2.1
deleted file mode 100644
index 909a76eb2f3a..000000000000
--- a/metadata/md5-cache/dev-python/tenacity-8.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/setuptools-scm[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/tornado[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,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 pypi
-IUSE=test python_targets_python3_7 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_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://files.pythonhosted.org/packages/source/t/tenacity/tenacity-8.2.1.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=323b5afbab788c604ae0df152804a224
diff --git a/metadata/md5-cache/dev-python/tenacity-8.2.2 b/metadata/md5-cache/dev-python/tenacity-8.2.2
index 90b8b8c61b31..5aa375c8dfb0 100644
--- a/metadata/md5-cache/dev-python/tenacity-8.2.2
+++ b/metadata/md5-cache/dev-python/tenacity-8.2.2
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jd/tenacity/ https://pypi.org/project/tenacity/
 INHERIT=distutils-r1 pypi
 IUSE=test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=Apache-2.0
 RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 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://files.pythonhosted.org/packages/source/t/tenacity/tenacity-8.2.2.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=323b5afbab788c604ae0df152804a224
+_md5_=09532b30f663278162486b8c415a471e
diff --git a/metadata/md5-cache/dev-python/testfixtures-7.0.3 b/metadata/md5-cache/dev-python/testfixtures-7.0.3
deleted file mode 100644
index 53ac98cddb73..000000000000
--- a/metadata/md5-cache/dev-python/testfixtures-7.0.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) dev-python/django[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-django[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/sybil[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/twisted-18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/zope-component[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/furo[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/furo[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/furo[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] dev-python/furo[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 >=dev-python/sphinx-5.3.0[python_targets_python3_7(-)] dev-python/furo[python_targets_python3_7(-)] ) ) ) test? ( >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-python/gpep517-13[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_python3_7(-)?,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 collection of helpers and mock objects for unit tests and doc tests
-EAPI=8
-HOMEPAGE=https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures
-INHERIT=distutils-r1
-IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux
-LICENSE=MIT
-RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_7 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/testfixtures/testfixtures-7.0.3.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c1751b46305838448a914b51bae5d1f3
diff --git a/metadata/md5-cache/dev-python/testfixtures-7.1.0 b/metadata/md5-cache/dev-python/testfixtures-7.1.0
index 060a2499e0d7..25597ec3498e 100644
--- a/metadata/md5-cache/dev-python/testfixtures-7.1.0
+++ b/metadata/md5-cache/dev-python/testfixtures-7.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://pypi.org/project/testfixtures/ https://github.com/Simplistix/testfixtures/
 INHERIT=distutils-r1 pypi
 IUSE=doc test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~riscv x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 RDEPEND=python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_7 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://files.pythonhosted.org/packages/source/t/testfixtures/testfixtures-7.1.0.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=08648123aad694264c73d2ed13645d05
+_md5_=1cb48d520d627d41b6a5090cc8d2dea7
diff --git a/metadata/md5-cache/dev-python/tornado-6.2 b/metadata/md5-cache/dev-python/tornado-6.2
index 6e69448c668d..8b334552749c 100644
--- a/metadata/md5-cache/dev-python/tornado-6.2
+++ b/metadata/md5-cache/dev-python/tornado-6.2
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare test
 DESCRIPTION=Python web framework and asynchronous networking library
 EAPI=8
 HOMEPAGE=https://www.tornadoweb.org/ https://github.com/tornadoweb/tornado/ https://pypi.org/project/tornado/
-INHERIT=distutils-r1
+INHERIT=distutils-r1 pypi
 IUSE=examples test doc python_targets_python3_7 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=Apache-2.0
@@ -11,6 +11,6 @@ RDEPEND=>=dev-python/pycurl-7.19.3.1[python_targets_python3_7(-)?,python_targets
 REQUIRED_USE=|| ( python_targets_python3_7 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/tornado/tornado-6.2.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=53c32aa4eb369700b7ee9aeb6f373119
+SRC_URI=https://files.pythonhosted.org/packages/source/t/tornado/tornado-6.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=cc5f3388eb25de3c076045597b158d9c
diff --git a/metadata/md5-cache/dev-python/tornado-6.2-r1 b/metadata/md5-cache/dev-python/tornado-6.2-r1
new file mode 100644
index 000000000000..51350f8c1cf6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tornado-6.2-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/twisted-16.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_7? ( >=dev-python/pycurl-7.19.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-python/pycurl-7.19.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/pycurl-7.19.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/pycurl-7.19.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/pycurl-7.19.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_11(-)] dev-python/sphinx-rtd-theme[python_targets_python3_11(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/sphinx-rtd-theme[python_targets_python3_10(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/sphinx-rtd-theme[python_targets_python3_9(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] dev-python/sphinx-rtd-theme[python_targets_python3_8(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_python3_7(-)] dev-python/sphinx-rtd-theme[python_targets_python3_7(-)] dev-python/sphinxcontrib-asyncio[python_targets_python3_7(-)] ) ( >=dev-python/pypy3-7.3.7:0[threads(+)] >=dev-python/sphinx-5.3.0[python_targets_pypy3(-)] dev-python/sphinx-rtd-theme[python_targets_pypy3(-)] dev-python/sphinxcontrib-asyncio[python_targets_pypy3(-)] ) ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[threads(+)] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[threads(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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 web framework and asynchronous networking library
+EAPI=8
+HOMEPAGE=https://www.tornadoweb.org/ https://github.com/tornadoweb/tornado/ https://pypi.org/project/tornado/
+INHERIT=distutils-r1 pypi
+IUSE=examples test doc python_targets_pypy3 python_targets_python3_7 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=Apache-2.0
+RDEPEND=>=dev-python/twisted-16.0.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[threads(+)] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[threads(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/t/tornado/tornado-6.2.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=6f7ff9c937466c569bf26926ff9b95cd
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.8.3 b/metadata/md5-cache/dev-python/translate-toolkit-3.8.3
deleted file mode 100644
index 0ef00c24112d..000000000000
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.8.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/phply[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cheroot[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ical? ( dev-python/vobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/setuptools-65.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Toolkit to convert between many translation formats
-EAPI=8
-HOMEPAGE=https://github.com/translate/translate/ https://pypi.org/project/translate-toolkit/
-INHERIT=distutils-r1
-IUSE=+html +ical +ini +subtitles +yaml test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 arm64 x86
-LICENSE=GPL-2
-RDEPEND=app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cheroot[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ical? ( dev-python/vobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 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/translate/translate/archive/3.8.3.tar.gz -> translate-3.8.3.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1bf0dabfc2f5e02d6a22d2688d36e909
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.8.4 b/metadata/md5-cache/dev-python/translate-toolkit-3.8.4
index 53834287c2ac..58683215373a 100644
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.8.4
+++ b/metadata/md5-cache/dev-python/translate-toolkit-3.8.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/translate/translate/ https://pypi.org/project/translate-toolkit/
 INHERIT=distutils-r1
 IUSE=+html +ical +ini +subtitles +yaml test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 arm64 x86
 LICENSE=GPL-2
 RDEPEND=app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cheroot[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ical? ( dev-python/vobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
 REQUIRED_USE=|| ( python_targets_python3_7 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/translate/translate/archive/3.8.4.tar.gz -> translate-3.8.4.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bfaaa1a2701e143bb37d7a71cd0d0443
+_md5_=1bf0dabfc2f5e02d6a22d2688d36e909
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.8.5 b/metadata/md5-cache/dev-python/translate-toolkit-3.8.5
deleted file mode 100644
index 9ce2f0820ba4..000000000000
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.8.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/phply[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cheroot[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ical? ( dev-python/vobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/setuptools-65.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Toolkit to convert between many translation formats
-EAPI=8
-HOMEPAGE=https://github.com/translate/translate/ https://pypi.org/project/translate-toolkit/
-INHERIT=distutils-r1
-IUSE=+html +ical +ini +subtitles +yaml test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cheroot[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ical? ( dev-python/vobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 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/translate/translate/archive/3.8.5.tar.gz -> translate-3.8.5.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=bfaaa1a2701e143bb37d7a71cd0d0443
diff --git a/metadata/md5-cache/dev-python/translate-toolkit-3.8.6 b/metadata/md5-cache/dev-python/translate-toolkit-3.8.6
deleted file mode 100644
index 6aca76cc28ae..000000000000
--- a/metadata/md5-cache/dev-python/translate-toolkit-3.8.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/phply[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cheroot[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ical? ( dev-python/vobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/pytest-7.2.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] ) >=dev-python/setuptools-65.7.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Toolkit to convert between many translation formats
-EAPI=8
-HOMEPAGE=https://github.com/translate/translate/ https://pypi.org/project/translate-toolkit/
-INHERIT=distutils-r1
-IUSE=+html +ical +ini +subtitles +yaml test python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=app-text/iso-codes >=dev-python/chardet-3.0.4[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/cheroot[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/Levenshtein-0.12.0[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/lxml-4.3.1[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pycountry-19.8.18[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyparsing-3[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext html? ( dev-python/utidylib[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ical? ( dev-python/vobject[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ini? ( >=dev-python/iniparse-0.5[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) subtitles? ( media-video/gaupol[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) yaml? ( dev-python/pyyaml[python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[sqlite] )
-REQUIRED_USE=|| ( python_targets_python3_7 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/translate/translate/archive/3.8.6.tar.gz -> translate-3.8.6.gh.tar.gz
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8866adb620215cc427cbfe89134c320b
diff --git a/metadata/md5-cache/dev-python/urllib3-1.26.15 b/metadata/md5-cache/dev-python/urllib3-1.26.15
new file mode 100644
index 000000000000..155a77671c12
--- /dev/null
+++ b/metadata/md5-cache/dev-python/urllib3-1.26.15
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_pypy3? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-freezegun[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_7? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-freezegun[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-freezegun[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-freezegun[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-freezegun[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-freezegun[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/tornado-4.2.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/trustme-0.5.3[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[ssl(+)] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[ssl(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[ssl(+)] ) >=dev-python/gpep517-13[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] || ( >=dev-python/setuptools-67.2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/setuptools-65.7.1[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_7(-)?,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 library with thread-safe connection pooling, file post, and more
+EAPI=8
+HOMEPAGE=https://github.com/urllib3/urllib3/ https://pypi.org/project/urllib3/
+INHERIT=distutils-r1 pypi
+IUSE=brotli test python_targets_pypy3 python_targets_python3_7 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 ~x64-cygwin ~amd64-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/PySocks-1.5.8[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/PySocks-2.0[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/six[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] brotli? ( dev-python/brotlicffi[python_targets_pypy3(-)?,python_targets_python3_7(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0=[ssl(+)] ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7[ssl(+)] ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8[ssl(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9[ssl(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10[ssl(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11[ssl(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://files.pythonhosted.org/packages/source/u/urllib3/urllib3-1.26.15.tar.gz
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pypi	1bc874ed4adb7d785e7201acbbb8347a	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c0f3f0b8b39b1406b000f0753f2ffe44
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-3.0.8 b/metadata/md5-cache/dev-python/xlsxwriter-3.0.8
index 278c53621e93..3967b2afd5aa 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-3.0.8
+++ b/metadata/md5-cache/dev-python/xlsxwriter-3.0.8
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/jmcnamara/XlsxWriter/ https://pypi.org/project/XlsxWriter/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_7 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 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/jmcnamara/XlsxWriter/archive/RELEASE_3.0.8.tar.gz -> XlsxWriter-RELEASE_3.0.8.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=93b8fe6971d87d48548915e16def145e
+_md5_=c73942db37def510ac16b9e269742895
diff --git a/metadata/md5-cache/dev-python/xlsxwriter-3.0.7 b/metadata/md5-cache/dev-python/xlsxwriter-3.0.9
index 8fd2b8d08df6..c8eed75ddbef 100644
--- a/metadata/md5-cache/dev-python/xlsxwriter-3.0.7
+++ b/metadata/md5-cache/dev-python/xlsxwriter-3.0.9
@@ -5,12 +5,12 @@ EAPI=8
 HOMEPAGE=https://github.com/jmcnamara/XlsxWriter/ https://pypi.org/project/XlsxWriter/
 INHERIT=distutils-r1
 IUSE=test python_targets_pypy3 python_targets_python3_7 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 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
 LICENSE=BSD
 RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.7:0= ) python_targets_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_targets_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0:3.11 )
 REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_7 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/jmcnamara/XlsxWriter/archive/RELEASE_3.0.7.tar.gz -> XlsxWriter-RELEASE_3.0.7.gh.tar.gz
+SRC_URI=https://github.com/jmcnamara/XlsxWriter/archive/RELEASE_3.0.9.tar.gz -> XlsxWriter-RELEASE_3.0.9.gh.tar.gz
 _eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c73942db37def510ac16b9e269742895
+_md5_=93b8fe6971d87d48548915e16def145e
diff --git a/metadata/md5-cache/dev-qt/qtimageformats-5.15.8-r2 b/metadata/md5-cache/dev-qt/qtimageformats-5.15.8-r2
new file mode 100644
index 000000000000..26dc55256b52
--- /dev/null
+++ b/metadata/md5-cache/dev-qt/qtimageformats-5.15.8-r2
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND==dev-qt/qtcore-5.15.8* =dev-qt/qtgui-5.15.8* media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= ) test? ( =dev-qt/qttest-5.15.8* )
+DESCRIPTION=Additional format plugins for the Qt image I/O system
+EAPI=8
+HOMEPAGE=https://www.qt.io/ https://invent.kde.org/qt/qt/qtimageformats https://community.kde.org/Qt5PatchCollection
+INHERIT=qt5-build
+IUSE=mng debug test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc64 ~riscv ~sparc ~x86
+LICENSE=|| ( GPL-2 GPL-3 LGPL-3 ) FDL-1.3
+RDEPEND==dev-qt/qtcore-5.15.8* =dev-qt/qtgui-5.15.8* media-libs/libwebp:= media-libs/tiff:= mng? ( media-libs/libmng:= )
+RESTRICT=test
+SLOT=5
+SRC_URI=https://download.qt.io/official_releases/qt/5.15/5.15.8/submodules/qtimageformats-everywhere-opensource-src-5.15.8.tar.xz https://dev.gentoo.org/~asturm/distfiles/qtimageformats-5.15.8-gentoo-kde-2.tar.xz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qt5-build	2b5cd479b477d25eb6d67fcb61116c2b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_md5_=39fdd5ee826770aedda92fb50cc1a886
diff --git a/metadata/md5-cache/dev-ruby/chronic-0.10.2-r1 b/metadata/md5-cache/dev-ruby/chronic-0.10.2-r1
index 5e3f30742232..7016b2042e6f 100644
--- a/metadata/md5-cache/dev-ruby/chronic-0.10.2-r1
+++ b/metadata/md5-cache/dev-ruby/chronic-0.10.2-r1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/minitest-5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Chronic is a natural language date/time parser written in pure Ruby
 EAPI=8
 HOMEPAGE=https://github.com/mojombo/chronic
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
 KEYWORDS=amd64 ~hppa ppc ppc64 ~sparc x86 ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/chronic-0.10.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=c3e989dca5b8981f06de95d74c4d413d
+_md5_=de4998ff2a1ecdc27796469ebb342d1a
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1 b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
deleted file mode 100644
index 472ccb89af2f..000000000000
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.1.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/highline-1.6.19:*[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby27? ( dev-ruby/optimist[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby27? ( !!dev-ruby/hiera-eyaml:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-util/cucumber[ruby_targets_ruby27(-)] ~dev-util/aruba-0.6.2[ruby_targets_ruby27(-)] <app-admin/puppet-6[ruby_targets_ruby27(-)] dev-ruby/hiera-eyaml-plaintext[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Encrypted YAML backend for hiera
-EAPI=7
-HOMEPAGE=https://github.com/TomPoulton/hiera-eyaml
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/highline-1.6.19:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-ruby/optimist[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( !!dev-ruby/hiera-eyaml:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v3.1.1.tar.gz -> hiera-eyaml-3.1.1.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=1d1b86102a0d03737bb006149edb610c
diff --git a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2 b/metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2
deleted file mode 100644
index 2d135c844425..000000000000
--- a/metadata/md5-cache/dev-ruby/hiera-eyaml-3.2.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/highline-1.6.19:*[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby27? ( dev-ruby/optimist[ruby_targets_ruby27(-)] ) ) test? ( ruby_targets_ruby27? ( !!dev-ruby/hiera-eyaml:0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-util/cucumber[ruby_targets_ruby27(-)] ~dev-util/aruba-0.6.2[ruby_targets_ruby27(-)] <app-admin/puppet-6[ruby_targets_ruby27(-)] dev-ruby/hiera-eyaml-plaintext[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Encrypted YAML backend for hiera
-EAPI=8
-HOMEPAGE=https://github.com/TomPoulton/hiera-eyaml
-INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 test test
-KEYWORDS=~amd64 ~x86
-LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/highline-1.6.19:*[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-ruby/optimist[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( !!dev-ruby/hiera-eyaml:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=3
-SRC_URI=https://github.com/TomPoulton/hiera-eyaml/archive/v3.2.2.tar.gz -> hiera-eyaml-3.2.2.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ad3c14b280e4dfc8078b8cbf42405bb8
diff --git a/metadata/md5-cache/dev-ruby/highline-2.1.0 b/metadata/md5-cache/dev-ruby/highline-2.1.0
new file mode 100644
index 000000000000..a6d824cf3dc7
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/highline-2.1.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Highline is a high-level command-line IO library for ruby
+EAPI=8
+HOMEPAGE=https://github.com/JEG2/highline
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~hppa ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris ~x86-solaris
+LICENSE=|| ( GPL-2 Ruby-BSD )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=2
+SRC_URI=https://github.com/JEG2/highline/archive/v2.1.0.tar.gz -> highline-2.1.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=e58ebd8c3fa8195e1d4aac6fe2c1896a
diff --git a/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r2 b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r2
new file mode 100644
index 000000000000..60d2354b3de5
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/nanotest-0.9.4.1-r2
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Extremely mynymal test framework
+EAPI=8
+HOMEPAGE=https://github.com/mynyml/nanotest
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/nanotest-0.9.4.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=93bc181e98620b916100971698fa707b
diff --git a/metadata/md5-cache/dev-ruby/pkg-config-1.5.1 b/metadata/md5-cache/dev-ruby/pkg-config-1.5.1
index b564c233b2aa..0c97996d8663 100644
--- a/metadata/md5-cache/dev-ruby/pkg-config-1.5.1
+++ b/metadata/md5-cache/dev-ruby/pkg-config-1.5.1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=test? ( x11-libs/cairo ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=test? ( x11-libs/cairo ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=A pkg-config implementation by Ruby
 EAPI=8
 HOMEPAGE=https://github.com/ruby-gnome/pkg-config
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=|| ( LGPL-2 LGPL-2.1 LGPL-3 )
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/pkg-config-1.5.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=08ba1abf32e0cc01163d9dc7bd6df175
+_md5_=0187f7f5d53ddbb7b5314471eda021b6
diff --git a/metadata/md5-cache/dev-ruby/power_assert-1.1.7 b/metadata/md5-cache/dev-ruby/power_assert-1.1.7
deleted file mode 100644
index 52434b28a6e3..000000000000
--- a/metadata/md5-cache/dev-ruby/power_assert-1.1.7
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/test-unit[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-DESCRIPTION=Shows each value of variables and method calls in the expression
-EAPI=7
-HOMEPAGE=https://github.com/k-tsj/power_assert
-INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 doc test test
-KEYWORDS=~alpha amd64 arm arm64 hppa ~mips ppc ppc64 ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
-LICENSE=|| ( Ruby BSD-2 )
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/k-tsj/power_assert/archive/v1.1.7.tar.gz -> power_assert-1.1.7.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b01c7376d047a656c1f9f137fdf2b8c7
diff --git a/metadata/md5-cache/dev-ruby/puppetdb-termini-7.12.1 b/metadata/md5-cache/dev-ruby/puppetdb-termini-7.12.1
index 071a891d34bb..78649c2ff034 100644
--- a/metadata/md5-cache/dev-ruby/puppetdb-termini-7.12.1
+++ b/metadata/md5-cache/dev-ruby/puppetdb-termini-7.12.1
@@ -3,9 +3,9 @@ DESCRIPTION=Library needed to connect puppet to puppetdb
 EAPI=7
 HOMEPAGE=https://puppet.com/docs/puppetdb/latest/index.html
 INHERIT=unpacker
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86
+KEYWORDS=amd64 ~arm64 ~ppc x86
 LICENSE=Apache-2.0
 SLOT=0
 SRC_URI=http://apt.puppetlabs.com/pool/bullseye/puppet/p/puppetdb-termini/puppetdb-termini_7.12.1-1bullseye_all.deb
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
-_md5_=cf89566ea558763d889a04d9dc313d64
+_md5_=4329452ee1426448cebe3c2426eabb2f
diff --git a/metadata/md5-cache/dev-ruby/rcairo-1.17.8 b/metadata/md5-cache/dev-ruby/rcairo-1.17.8
index de3c3f2e4e79..91e85abd0bf9 100644
--- a/metadata/md5-cache/dev-ruby/rcairo-1.17.8
+++ b/metadata/md5-cache/dev-ruby/rcairo-1.17.8
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/red-colors[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/pkg-config-1.2.2[ruby_targets_ruby27(-)] dev-ruby/ruby-glib2[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby27(-)] dev-ruby/ruby-poppler[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ) virtual/pkgconfig
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/red-colors[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/red-colors[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/red-colors[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( >=dev-ruby/pkg-config-1.2.2[ruby_targets_ruby27(-)] dev-ruby/ruby-glib2[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby27(-)] dev-ruby/ruby-poppler[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( >=dev-ruby/pkg-config-1.2.2[ruby_targets_ruby30(-)] dev-ruby/ruby-glib2[ruby_targets_ruby30(-)] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby30(-)] dev-ruby/ruby-poppler[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( >=dev-ruby/pkg-config-1.2.2[ruby_targets_ruby31(-)] dev-ruby/ruby-glib2[ruby_targets_ruby31(-)] test? ( >=dev-ruby/test-unit-2.1.0-r1:2[ruby_targets_ruby31(-)] dev-ruby/ruby-poppler[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=>=x11-libs/cairo-1.2.0[svg(+)] ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=>=x11-libs/cairo-1.2.0[svg(+)] ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Ruby bindings for cairo
 EAPI=8
 HOMEPAGE=https://cairographics.org/rcairo/
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 doc test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
 KEYWORDS=~amd64 ~ppc ~riscv ~x86
 LICENSE=|| ( Ruby-BSD GPL-2 )
-RDEPEND=>=x11-libs/cairo-1.2.0[svg(+)] ruby_targets_ruby27? ( dev-ruby/red-colors[ruby_targets_ruby27(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
+RDEPEND=>=x11-libs/cairo-1.2.0[svg(+)] ruby_targets_ruby27? ( dev-ruby/red-colors[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/red-colors[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/red-colors[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/cairo-1.17.8.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=8ea3c653d30a3063a87526d72e51e0a0
+_md5_=28b8555a125bc80d52e4e0c7eac005dd
diff --git a/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
index d82e27805511..4cc18a4ff896 100644
--- a/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-atk-3.4.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-libs/atk[introspection] ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=Ruby Atk bindings
 EAPI=7
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
+HOMEPAGE=https://ruby-gnome.github.io/
 INHERIT=ruby-ng-gnome2
 IUSE=test ruby_targets_ruby27 test test
 KEYWORDS=amd64 ~ppc ~riscv ~x86
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=0d81abe5f2faeee8649fe2725faeb8f0
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
index e9426978e0d7..df6e3763db17 100644
--- a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.4.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=x11-libs/cairo ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=Ruby cairo-gobject bindings
 EAPI=7
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
+HOMEPAGE=https://ruby-gnome.github.io/
 INHERIT=ruby-ng-gnome2
 IUSE=test ruby_targets_ruby27 test test
 KEYWORDS=amd64 ~ppc ~riscv ~x86
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1c0b85558c58146026c355d505176568
diff --git a/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.5.1 b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.5.1
new file mode 100644
index 000000000000..e4fa89694e19
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-cairo-gobject-3.5.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( dev-ruby/rcairo[ruby_targets_ruby27(-)] ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rcairo[ruby_targets_ruby30(-)] ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rcairo[ruby_targets_ruby31(-)] ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/pkg-config[ruby_targets_ruby30(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/pkg-config[ruby_targets_ruby31(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=x11-libs/cairo ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Ruby cairo-gobject bindings
+EAPI=7
+HOMEPAGE=https://ruby-gnome.github.io/
+INHERIT=ruby-ng-gnome2
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=x11-libs/cairo ruby_targets_ruby27? ( dev-ruby/rcairo[ruby_targets_ruby27(-)] ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( dev-ruby/rcairo[ruby_targets_ruby30(-)] ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( dev-ruby/rcairo[ruby_targets_ruby31(-)] ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.5.1.tar.gz -> ruby-gnome2-3.5.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=44bfe2ca9a6d06f948ae7d1a7e639a84
diff --git a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
index b668bad3046b..7aef81bf9932 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gdkpixbuf2-3.4.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=test? ( x11-libs/gdk-pixbuf[jpeg] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=Ruby GdkPixbuf2 bindings
 EAPI=7
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
+HOMEPAGE=https://ruby-gnome.github.io/
 INHERIT=ruby-ng-gnome2
 IUSE=test ruby_targets_ruby27 test test
 KEYWORDS=amd64 ~ppc ~riscv ~x86
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=59b84f84f88bc8e2d6b2b2b38bf4b2ec
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
index 735463f1b93d..58f64d327bb7 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-3.4.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-libs/glib test? ( sys-apps/dbus ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=Ruby binding of gio-2
 EAPI=7
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
+HOMEPAGE=https://ruby-gnome.github.io/
 INHERIT=ruby-ng-gnome2
 IUSE=test ruby_targets_ruby27 test test
 KEYWORDS=amd64 ~ppc ~riscv ~x86
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=b897748610054b52821627dfd27a9d42
diff --git a/metadata/md5-cache/dev-ruby/ruby-gio2-3.5.1 b/metadata/md5-cache/dev-ruby/ruby-gio2-3.5.1
new file mode 100644
index 000000000000..f912dc9ba041
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gio2-3.5.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby30(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby31(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/pkg-config[ruby_targets_ruby30(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/pkg-config[ruby_targets_ruby31(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/glib test? ( sys-apps/dbus ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Ruby binding of gio-2
+EAPI=7
+HOMEPAGE=https://ruby-gnome.github.io/
+INHERIT=ruby-ng-gnome2
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/glib ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby30(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby31(-)] ~dev-ruby/ruby-gobject-introspection-3.5.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.5.1.tar.gz -> ruby-gnome2-3.5.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4150a4d95636da7739311518c6b515a1
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
index 7029128a14c6..3d98ad6ff3dc 100644
--- a/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-3.4.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=>=dev-libs/glib-2 ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
 DESCRIPTION=Ruby Glib2 bindings
 EAPI=7
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
+HOMEPAGE=https://ruby-gnome.github.io/
 INHERIT=ruby-ng-gnome2
 IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
 KEYWORDS=amd64 ~ppc ~ppc64 ~riscv x86
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=2147316dcb5638edb849ac578cf43674
diff --git a/metadata/md5-cache/dev-ruby/ruby-glib2-3.5.1 b/metadata/md5-cache/dev-ruby/ruby-glib2-3.5.1
new file mode 100644
index 000000000000..5a79211eea69
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-glib2-3.5.1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/pkg-config[ruby_targets_ruby30(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/pkg-config[ruby_targets_ruby31(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( dev-ruby/pkg-config[ruby_targets_ruby32(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=>=dev-libs/glib-2 ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Ruby Glib2 bindings
+EAPI=7
+HOMEPAGE=https://ruby-gnome.github.io/
+INHERIT=ruby-ng-gnome2
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
+KEYWORDS=~amd64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=>=dev-libs/glib-2 ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.5.1.tar.gz -> ruby-gnome2-3.5.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4129984888706cb163bc6d763a1d2815
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
index 881a100fa9ac..39658535df09 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.4.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-libs/glib dev-libs/gobject-introspection ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=Ruby GObjectIntrospection bindings
 EAPI=7
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
+HOMEPAGE=https://ruby-gnome.github.io/
 INHERIT=ruby-ng-gnome2
 IUSE=test ruby_targets_ruby27 test test
 KEYWORDS=amd64 ~ppc ~riscv ~x86
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=1d98da586b794237b0157ed1b98d55da
diff --git a/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.5.1 b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.5.1
new file mode 100644
index 000000000000..521da386fc78
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-gobject-introspection-3.5.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/pkg-config[ruby_targets_ruby30(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/pkg-config[ruby_targets_ruby31(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=dev-libs/glib dev-libs/gobject-introspection ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Ruby GObjectIntrospection bindings
+EAPI=7
+HOMEPAGE=https://ruby-gnome.github.io/
+INHERIT=ruby-ng-gnome2
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=dev-libs/glib dev-libs/gobject-introspection ruby_targets_ruby27? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/ruby-glib2-3.5.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.5.1.tar.gz -> ruby-gnome2-3.5.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8ea14958a255214722cd00cd0ecc4fcc
diff --git a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
index 39eae1429d26..b15fd3a2c60f 100644
--- a/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-gtk2-3.4.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-libs/glib x11-libs/cairo x11-libs/gdk-pixbuf[introspection] x11-libs/gtk+:2[introspection] x11-libs/libX11 x11-libs/pango[introspection] x11-themes/hicolor-icon-theme ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=Ruby Gtk2 bindings
 EAPI=7
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
+HOMEPAGE=https://ruby-gnome.github.io/
 INHERIT=ruby-ng-gnome2
 IUSE=test ruby_targets_ruby27 test test test
 KEYWORDS=amd64 ~ppc ~riscv ~x86
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	virtualx	644887c82aefdf12001489391fca4f02
 _md5_=b4ee6e052aa3d19b097b4fefe77d26a4
diff --git a/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
index 421711a97119..d8ec14cdd4f0 100644
--- a/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-pango-3.4.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=dev-libs/glib >=x11-libs/pango-1.2.1[introspection] ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=Ruby Pango bindings
 EAPI=7
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
+HOMEPAGE=https://ruby-gnome.github.io/
 INHERIT=ruby-ng-gnome2
 IUSE=test ruby_targets_ruby27 test test
 KEYWORDS=amd64 ~ppc ~riscv ~x86
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=99f4512f8465f58d9413f86d87c1a1e8
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
index 0c4b76376d92..ab146f1b00b6 100644
--- a/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.4.3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install prepare setup test unpack
 DEPEND=app-text/poppler[cairo,introspection] ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
 DESCRIPTION=Ruby poppler-glib bindings
 EAPI=7
-HOMEPAGE=https://ruby-gnome2.osdn.jp/
+HOMEPAGE=https://ruby-gnome.github.io/
 INHERIT=ruby-ng-gnome2
 IUSE=test ruby_targets_ruby27 test test
 KEYWORDS=amd64 ~ppc ~riscv ~x86
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( ruby_targets_ruby27 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.4.3.tar.gz -> ruby-gnome2-3.4.3.tar.gz
-_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1dd0c14e9f71dd1c26dfe836b0867b06	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=01cd67de36d38daf4e54548f847ee0f1
diff --git a/metadata/md5-cache/dev-ruby/ruby-poppler-3.5.1 b/metadata/md5-cache/dev-ruby/ruby-poppler-3.5.1
new file mode 100644
index 000000000000..329a4356c27b
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/ruby-poppler-3.5.1
@@ -0,0 +1,17 @@
+BDEPEND=test? ( ruby_targets_ruby27? ( ~dev-ruby/ruby-cairo-gobject-3.5.1[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gio2-3.5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/ruby-cairo-gobject-3.5.1[ruby_targets_ruby30(-)] ~dev-ruby/ruby-gio2-3.5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/ruby-cairo-gobject-3.5.1[ruby_targets_ruby31(-)] ~dev-ruby/ruby-gio2-3.5.1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig ruby_targets_ruby27? ( dev-ruby/pkg-config[ruby_targets_ruby27(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( dev-ruby/pkg-config[ruby_targets_ruby30(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( dev-ruby/pkg-config[ruby_targets_ruby31(-)] test? ( >=dev-ruby/test-unit-2[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=app-text/poppler[cairo,introspection] ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Ruby poppler-glib bindings
+EAPI=7
+HOMEPAGE=https://ruby-gnome.github.io/
+INHERIT=ruby-ng-gnome2
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
+LICENSE=LGPL-2.1+
+RDEPEND=app-text/poppler[cairo,introspection] ruby_targets_ruby27? ( ~dev-ruby/ruby-cairo-gobject-3.5.1[ruby_targets_ruby27(-)] ~dev-ruby/ruby-gio2-3.5.1[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( ~dev-ruby/ruby-cairo-gobject-3.5.1[ruby_targets_ruby30(-)] ~dev-ruby/ruby-gio2-3.5.1[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( ~dev-ruby/ruby-cairo-gobject-3.5.1[ruby_targets_ruby31(-)] ~dev-ruby/ruby-gio2-3.5.1[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/ruby-gnome/ruby-gnome/archive/3.5.1.tar.gz -> ruby-gnome2-3.5.1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-ng-gnome2	1b440eadff2fe9b263f09f347afbc5cd	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=4e4370a6a8c0c01dfcde844bfc81f0a1
diff --git a/metadata/md5-cache/dev-ruby/tdiff-0.3.4-r1 b/metadata/md5-cache/dev-ruby/tdiff-0.3.4-r1
index dd8c187c45ab..6c74300b4831 100644
--- a/metadata/md5-cache/dev-ruby/tdiff-0.3.4-r1
+++ b/metadata/md5-cache/dev-ruby/tdiff-0.3.4-r1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Calculates the differences between two tree-like structures
 EAPI=8
 HOMEPAGE=https://github.com/postmodern/tdiff
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~riscv ~s390 x86 ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/tdiff-0.3.4.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=592dff91fa0ec4e28a4d22d34ad8fb0c
+_md5_=f28dfbe7901b8e929245a4067e259c09
diff --git a/metadata/md5-cache/dev-ruby/test_declarative-0.0.6-r1 b/metadata/md5-cache/dev-ruby/test_declarative-0.0.6-r1
index 4f7428c76d44..40c53ab77d22 100644
--- a/metadata/md5-cache/dev-ruby/test_declarative-0.0.6-r1
+++ b/metadata/md5-cache/dev-ruby/test_declarative-0.0.6-r1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.10:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.10:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.10:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( test? ( dev-ruby/bundler[ruby_targets_ruby27(-)] >=dev-ruby/minitest-5.10:5[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/bundler[ruby_targets_ruby30(-)] >=dev-ruby/minitest-5.10:5[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/bundler[ruby_targets_ruby31(-)] >=dev-ruby/minitest-5.10:5[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/bundler[ruby_targets_ruby32(-)] >=dev-ruby/minitest-5.10:5[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Simply adds a declarative test method syntax to test/unit
 EAPI=8
 HOMEPAGE=https://github.com/svenfuchs/test_declarative
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/svenfuchs/test_declarative/archive/v0.0.6 -> test_declarative-0.0.6.tgz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=821855c266d37275689ef664319049ce
+_md5_=b8709d72f024aefe1dfe9e1a64498d5f
diff --git a/metadata/md5-cache/dev-ruby/text-1.3.1-r1 b/metadata/md5-cache/dev-ruby/text-1.3.1-r1
index 742c5d5300ce..6550195acb3d 100644
--- a/metadata/md5-cache/dev-ruby/text-1.3.1-r1
+++ b/metadata/md5-cache/dev-ruby/text-1.3.1-r1
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rake[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rake[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rake[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rake[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=A collection of text algorithms
 EAPI=8
 HOMEPAGE=https://github.com/threedaymonk/text
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ppc ppc64 ~riscv sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/text-1.3.1.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ea49b63bb5383062d831bd09079748c9
+_md5_=bff98c39182d8682e16ec21a1efe2a36
diff --git a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.2 b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.2
index 20489355abe2..ff914d6cae6b 100644
--- a/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.2
+++ b/metadata/md5-cache/dev-ruby/unf_ext-0.0.8.2
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( >=dev-ruby/test-unit-2.5.1-r1[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Unicode Normalization Form support library for CRuby
 EAPI=8
 HOMEPAGE=https://github.com/knu/ruby-unf_ext
 INHERIT=ruby-fakegem
-IUSE=doc test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
+IUSE=doc test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test
+KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~loong ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x86-solaris
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/unf_ext-0.0.8.2.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=af0f6bc41d438cb979db3bcfb34f0283
+_md5_=e4f0516efe26547a7c10de4d4c87385d
diff --git a/metadata/md5-cache/dev-ruby/unicode-display_width-2.4.2 b/metadata/md5-cache/dev-ruby/unicode-display_width-2.4.2
index 71415ebfd731..fc6817a5b409 100644
--- a/metadata/md5-cache/dev-ruby/unicode-display_width-2.4.2
+++ b/metadata/md5-cache/dev-ruby/unicode-display_width-2.4.2
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Adds String#display_width to get the display size using EastAsianWidth.txt
 EAPI=8
 HOMEPAGE=https://github.com/janlelis/unicode-display_width
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64 ~arm64
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=2
 SRC_URI=https://github.com/janlelis/unicode-display_width/archive/v2.4.2.tar.gz -> unicode-display_width-2.4.2.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=703e98353ae5932915ea6a81af9b00cd
+_md5_=04eab7eeddc59295bf350eef2cc363a1
diff --git a/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r2 b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r2
new file mode 100644
index 000000000000..697db4d66b16
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/websocket-extensions-0.1.5-r2
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=Generic extension manager for WebSocket connections
+EAPI=8
+HOMEPAGE=https://github.com/faye/websocket-extensions-ruby
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~amd64 ~arm ~ppc ~ppc64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://github.com/faye/websocket-extensions-ruby/archive/0.1.5.tar.gz -> websocket-extensions-0.1.5-r1.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=39b74e76fe2fc048d3865437056e9a98
diff --git a/metadata/md5-cache/dev-ruby/windows_error-0.1.5 b/metadata/md5-cache/dev-ruby/windows_error-0.1.5
index 1fbb04cb4292..1045f997bceb 100644
--- a/metadata/md5-cache/dev-ruby/windows_error-0.1.5
+++ b/metadata/md5-cache/dev-ruby/windows_error-0.1.5
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=reference for standard Windows API Error Codes
 EAPI=8
 HOMEPAGE=https://github.com/rapid7/windows_error
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64 ~arm ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0.1
 SRC_URI=https://rubygems.org/gems/windows_error-0.1.5.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=83d3533546a9754b4da35257e9749bfd
+_md5_=5b877b2eac019ef762488114e6a2808f
diff --git a/metadata/md5-cache/dev-ruby/wisper-2.0.1-r1 b/metadata/md5-cache/dev-ruby/wisper-2.0.1-r1
new file mode 100644
index 000000000000..8502f8aaf105
--- /dev/null
+++ b/metadata/md5-cache/dev-ruby/wisper-2.0.1-r1
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+DESCRIPTION=A micro library providing objects with Publish-Subscribe capabilities
+EAPI=8
+HOMEPAGE=https://github.com/krisleech/wisper
+INHERIT=ruby-fakegem
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=0
+SRC_URI=https://rubygems.org/gems/wisper-2.0.1.gem
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=51c0065c391c740a8f99e5d94ad9df41
diff --git a/metadata/md5-cache/dev-ruby/x25519-1.0.10 b/metadata/md5-cache/dev-ruby/x25519-1.0.10
index a4d9c854dddb..237d99f94344 100644
--- a/metadata/md5-cache/dev-ruby/x25519-1.0.10
+++ b/metadata/md5-cache/dev-ruby/x25519-1.0.10
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Key exchange via the X25519 (Curve25519) Elliptic Curve Diffie-Hellman function
 EAPI=8
 HOMEPAGE=https://github.com/crypto-rb/x25519
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 doc test test
 KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
 LICENSE=BSD
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://github.com/crypto-rb/x25519/archive/v1.0.10.tar.gz -> x25519-1.0.10.tar.gz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=83f1cfb495e65bde1bd0dee3981cbcd9
+_md5_=3cea5007a9f310d02bb63d0c7a9480ca
diff --git a/metadata/md5-cache/dev-ruby/xpath-3.2.0-r1 b/metadata/md5-cache/dev-ruby/xpath-3.2.0-r1
index 2d03ce35d9c9..f3583b01cec2 100644
--- a/metadata/md5-cache/dev-ruby/xpath-3.2.0-r1
+++ b/metadata/md5-cache/dev-ruby/xpath-3.2.0-r1
@@ -1,17 +1,17 @@
-BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+BDEPEND=test? ( ruby_targets_ruby27? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=XPath is a Ruby DSL around a subset of XPath 1.0
 EAPI=8
-HOMEPAGE=https://github.com/jnicklas/xpath
+HOMEPAGE=https://github.com/teamcapybara/xpath
 INHERIT=ruby-fakegem
-IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=ruby_targets_ruby27? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( >=dev-ruby/nokogiri-1.8:0[ruby_targets_ruby32(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test ) !test? ( test )
 SLOT=3
 SRC_URI=https://rubygems.org/gems/xpath-3.2.0.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=ec973fb08ac94083ea67d624bfde7553
+_md5_=58f5186f32cad210801fb1793f761cdb
diff --git a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3 b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3
index 72b08d697949..7571596759f7 100644
--- a/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3
+++ b/metadata/md5-cache/dev-ruby/yajl-ruby-1.4.3
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ) virtual/pkgconfig
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby32? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby32(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] ) ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=dev-libs/yajl ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DEPEND=dev-libs/yajl ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
 DESCRIPTION=Ruby C bindings to the Yajl JSON stream-based parser library
 EAPI=8
 HOMEPAGE=https://github.com/brianmario/yajl-ruby
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 test test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=MIT
-RDEPEND=dev-libs/yajl ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RDEPEND=dev-libs/yajl ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby32? ( dev-lang/ruby:3.2 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) ruby_targets_ruby32? ( virtual/rubygems[ruby_targets_ruby32(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 ruby_targets_ruby32 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://rubygems.org/gems/yajl-ruby-1.4.3.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=507ee67647eeef082e747c35851403d5
+_md5_=9c3a29c8a2b901cf1525823e44734cec
diff --git a/metadata/md5-cache/dev-util/bcpp-20221002 b/metadata/md5-cache/dev-util/bcpp-20221002
index 8e07904279db..2b3f7db06f24 100644
--- a/metadata/md5-cache/dev-util/bcpp-20221002
+++ b/metadata/md5-cache/dev-util/bcpp-20221002
@@ -9,5 +9,5 @@ KEYWORDS=amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/bcpp/bcpp-20221002.tgz verify-sig? ( https://invisible-island.net/archives/bcpp/bcpp-20221002.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=3ccca1657c94e7cf5bbbbf9a4c3763e0
diff --git a/metadata/md5-cache/dev-util/bcpp-20230130 b/metadata/md5-cache/dev-util/bcpp-20230130
index 8acdea25656d..f12a02d259f2 100644
--- a/metadata/md5-cache/dev-util/bcpp-20230130
+++ b/metadata/md5-cache/dev-util/bcpp-20230130
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/bcpp/bcpp-20230130.tgz verify-sig? ( https://invisible-island.net/archives/bcpp/bcpp-20230130.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=6d5860deeefe718d882ae1e2c4434a74
diff --git a/metadata/md5-cache/dev-util/breakpad-2022.06.04 b/metadata/md5-cache/dev-util/breakpad-2022.06.04
deleted file mode 100644
index d13a33dbee34..000000000000
--- a/metadata/md5-cache/dev-util/breakpad-2022.06.04
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-cpp/gtest ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure prepare
-DEPEND=net-misc/curl dev-libs/linux-syscall-support dev-embedded/libdisasm
-DESCRIPTION=implement a crash-reporting system.
-EAPI=8
-HOMEPAGE=https://chromium.googlesource.com/breakpad/breakpad/
-INHERIT=autotools
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=BSD BSD-4
-RDEPEND=net-misc/curl
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/google/breakpad/archive/41a11409d6ba04e308adc66f5a33115e2d7c9174.tar.gz -> breakpad-2022.06.04.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d9dfde007fee454b74d9f084a3abda52
diff --git a/metadata/md5-cache/dev-util/breakpad-2022.07.12 b/metadata/md5-cache/dev-util/breakpad-2022.07.12
index 1b423cad08c7..cd1b02ac59c1 100644
--- a/metadata/md5-cache/dev-util/breakpad-2022.07.12
+++ b/metadata/md5-cache/dev-util/breakpad-2022.07.12
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/google/breakpad/archive/refs/tags/v2022.07.12.tar.gz -> breakpad-2022.07.12.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=2694ac9498f8a3597f58c613ba4e2bf8
+_md5_=0d720247e8123e6335e08ee802e1ea10
diff --git a/metadata/md5-cache/dev-util/byacc-20221229 b/metadata/md5-cache/dev-util/byacc-20221229
index 456ba35a9813..7bf4c82228f4 100644
--- a/metadata/md5-cache/dev-util/byacc-20221229
+++ b/metadata/md5-cache/dev-util/byacc-20221229
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/byacc/byacc-20221229.tgz verify-sig? ( https://invisible-island.net/archives/byacc/byacc-20221229.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=12efcb0eaaf71393f02e1017a1d62da5
diff --git a/metadata/md5-cache/dev-util/byacc-20230201 b/metadata/md5-cache/dev-util/byacc-20230201
index 430507424554..af48ab30718f 100644
--- a/metadata/md5-cache/dev-util/byacc-20230201
+++ b/metadata/md5-cache/dev-util/byacc-20230201
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/byacc/byacc-20230201.tgz verify-sig? ( https://invisible-island.net/archives/byacc/byacc-20230201.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=12efcb0eaaf71393f02e1017a1d62da5
diff --git a/metadata/md5-cache/dev-util/byacc-20230219 b/metadata/md5-cache/dev-util/byacc-20230219
index e94f0faff859..f4826db7dd8a 100644
--- a/metadata/md5-cache/dev-util/byacc-20230219
+++ b/metadata/md5-cache/dev-util/byacc-20230219
@@ -9,5 +9,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~r
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/byacc/byacc-20230219.tgz verify-sig? ( https://invisible-island.net/archives/byacc/byacc-20230219.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=a54f929b718242696082e7585853761f
diff --git a/metadata/md5-cache/dev-util/ccache-4.6.3 b/metadata/md5-cache/dev-util/ccache-4.6.3
index c0a7070200f1..b799433ba53f 100644
--- a/metadata/md5-cache/dev-util/ccache-4.6.3
+++ b/metadata/md5-cache/dev-util/ccache-4.6.3
@@ -13,5 +13,5 @@ RDEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) dev-util/shadowman sys-app
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccache/ccache/releases/download/v4.6.3/ccache-4.6.3.tar.xz verify-sig? ( https://github.com/ccache/ccache/releases/download/v4.6.3/ccache-4.6.3.tar.xz.asc )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=aa2a620d2694f7044d397907a7de7dff
diff --git a/metadata/md5-cache/dev-util/ccache-4.7.4 b/metadata/md5-cache/dev-util/ccache-4.7.4
index 19f06df5a41c..e3528bcad700 100644
--- a/metadata/md5-cache/dev-util/ccache-4.7.4
+++ b/metadata/md5-cache/dev-util/ccache-4.7.4
@@ -13,5 +13,5 @@ RDEPEND=app-arch/zstd:= redis? ( dev-libs/hiredis:= ) dev-util/shadowman sys-app
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/ccache/ccache/releases/download/v4.7.4/ccache-4.7.4.tar.xz verify-sig? ( https://github.com/ccache/ccache/releases/download/v4.7.4/ccache-4.7.4.tar.xz.asc )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=14fb877f06e5300e4832d138b11efbcb
diff --git a/metadata/md5-cache/dev-util/cmake-3.24.3 b/metadata/md5-cache/dev-util/cmake-3.24.3
index 78b55f6f18fa..e479257ad2f4 100644
--- a/metadata/md5-cache/dev-util/cmake-3.24.3
+++ b/metadata/md5-cache/dev-util/cmake-3.24.3
@@ -12,5 +12,5 @@ RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.24/cmake-3.24.3.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.24.3-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.24.3/cmake-3.24.3-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.24.3/cmake-3.24.3-SHA-256.txt.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=09bae11df18ffa13d5e1de498fea931b
diff --git a/metadata/md5-cache/dev-util/cmake-3.25.2 b/metadata/md5-cache/dev-util/cmake-3.25.2
index ef80d545fcda..7455bb2bd5b0 100644
--- a/metadata/md5-cache/dev-util/cmake-3.25.2
+++ b/metadata/md5-cache/dev-util/cmake-3.25.2
@@ -12,5 +12,5 @@ RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.25/cmake-3.25.2.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.25.2-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.25.2/cmake-3.25.2-SHA-256.txt.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c4cb6ee4c402067b6b1d359b7e144d4a
diff --git a/metadata/md5-cache/dev-util/cmake-3.25.3 b/metadata/md5-cache/dev-util/cmake-3.25.3
index 0c94111571f2..6c49089eada8 100644
--- a/metadata/md5-cache/dev-util/cmake-3.25.3
+++ b/metadata/md5-cache/dev-util/cmake-3.25.3
@@ -12,5 +12,5 @@ RDEPEND=>=app-arch/libarchive-3.3.3:= app-crypt/rhash >=dev-libs/expat-2.0.1 >=d
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://cmake.org/files/v3.25/cmake-3.25.3.tar.gz !doc? ( https://dev.gentoo.org/~sam/distfiles/dev-util/cmake/cmake-3.25.3-docs.tar.xz ) verify-sig? ( https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-SHA-256.txt https://github.com/Kitware/CMake/releases/download/v3.25.3/cmake-3.25.3-SHA-256.txt.asc )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	cmake	449b4785acace35308fe747fc939bde1	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	virtualx	644887c82aefdf12001489391fca4f02	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=f8986873b8c351bc5db0f2420229bf36
diff --git a/metadata/md5-cache/dev-util/cproto-4.7t-r1 b/metadata/md5-cache/dev-util/cproto-4.7t-r1
index fe779942166c..da521fa00367 100644
--- a/metadata/md5-cache/dev-util/cproto-4.7t-r1
+++ b/metadata/md5-cache/dev-util/cproto-4.7t-r1
@@ -10,5 +10,5 @@ KEYWORDS=~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/cproto/cproto-4.7t.tgz verify-sig? ( https://invisible-island.net/archives/cproto/cproto-4.7t.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=54dd024e1449caf262d4563be32d4148
diff --git a/metadata/md5-cache/dev-util/cproto-4.7u-r1 b/metadata/md5-cache/dev-util/cproto-4.7u-r1
index 8a429abc7035..183d7b7614d2 100644
--- a/metadata/md5-cache/dev-util/cproto-4.7u-r1
+++ b/metadata/md5-cache/dev-util/cproto-4.7u-r1
@@ -10,5 +10,5 @@ KEYWORDS=~alpha amd64 ppc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/cproto/cproto-4.7u.tgz verify-sig? ( https://invisible-island.net/archives/cproto/cproto-4.7u.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=a28caa053217244c23311345a1c27d5d
diff --git a/metadata/md5-cache/dev-util/cproto-4.7v b/metadata/md5-cache/dev-util/cproto-4.7v
index 7b29db1eed71..02d383fad7ed 100644
--- a/metadata/md5-cache/dev-util/cproto-4.7v
+++ b/metadata/md5-cache/dev-util/cproto-4.7v
@@ -10,5 +10,5 @@ KEYWORDS=~alpha ~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/cproto/cproto-4.7v.tgz verify-sig? ( https://invisible-island.net/archives/cproto/cproto-4.7v.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=416973bc368ac310142d71f38794c6e8
diff --git a/metadata/md5-cache/dev-util/cucumber-core-11.1.0 b/metadata/md5-cache/dev-util/cucumber-core-11.1.0
new file mode 100644
index 000000000000..c6b1621e7e41
--- /dev/null
+++ b/metadata/md5-cache/dev-util/cucumber-core-11.1.0
@@ -0,0 +1,17 @@
+BDEPEND=ruby_targets_ruby27? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( >=dev-ruby/unindent-1.0[ruby_targets_ruby31(-)] ) ) test? ( ruby_targets_ruby27? ( >=dev-util/cucumber-gherkin-23.0.1:23[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-18.0.0:18[ruby_targets_ruby27(-)] >=dev-util/cucumber-tag-expressions-4.1.0:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-gherkin-23.0.1:23[ruby_targets_ruby30(-)] >=dev-util/cucumber-messages-18.0.0:18[ruby_targets_ruby30(-)] >=dev-util/cucumber-tag-expressions-4.1.0:4[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-util/cucumber-gherkin-23.0.1:23[ruby_targets_ruby31(-)] >=dev-util/cucumber-messages-18.0.0:18[ruby_targets_ruby31(-)] >=dev-util/cucumber-tag-expressions-4.1.0:4[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby31? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby31(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] ) )
+DEFINED_PHASES=compile configure install prepare setup test unpack
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+DESCRIPTION=Executable feature scenarios
+EAPI=8
+HOMEPAGE=https://cucumber.io/
+INHERIT=ruby-fakegem
+IUSE=test ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 doc test test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Ruby
+RDEPEND=ruby_targets_ruby27? ( >=dev-util/cucumber-gherkin-23.0.1:23[ruby_targets_ruby27(-)] >=dev-util/cucumber-messages-18.0.0:18[ruby_targets_ruby27(-)] >=dev-util/cucumber-tag-expressions-4.1.0:4[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( >=dev-util/cucumber-gherkin-23.0.1:23[ruby_targets_ruby30(-)] >=dev-util/cucumber-messages-18.0.0:18[ruby_targets_ruby30(-)] >=dev-util/cucumber-tag-expressions-4.1.0:4[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( >=dev-util/cucumber-gherkin-23.0.1:23[ruby_targets_ruby31(-)] >=dev-util/cucumber-messages-18.0.0:18[ruby_targets_ruby31(-)] >=dev-util/cucumber-tag-expressions-4.1.0:4[ruby_targets_ruby31(-)] ) ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby31? ( dev-lang/ruby:3.1 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) ruby_targets_ruby31? ( virtual/rubygems[ruby_targets_ruby31(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 ruby_targets_ruby31 )
+RESTRICT=!test? ( test ) !test? ( test )
+SLOT=11
+SRC_URI=https://github.com/cucumber/cucumber-ruby-core/archive/v11.1.0.tar.gz -> cucumber-core-11.1.0.tar.gz
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	2412b1152083f1e866ae6df229d51d30	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=05bfe99b5196ace8f0eac365a6a625d7
diff --git a/metadata/md5-cache/dev-util/cvise-2.7.0 b/metadata/md5-cache/dev-util/cvise-2.7.0
index c3fe9e33d5c6..357541007317 100644
--- a/metadata/md5-cache/dev-util/cvise-2.7.0
+++ b/metadata/md5-cache/dev-util/cvise-2.7.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/marxin/cvise/
 INHERIT=cmake llvm python-single-r1
 IUSE=test python_single_target_python3_7 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 ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~sparc ~x86
 LICENSE=UoI-NCSA
 RDEPEND=|| ( sys-devel/clang:15 sys-devel/clang:14 sys-devel/clang:13 ) <sys-devel/clang-16:= python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) python_single_target_python3_7? ( dev-python/chardet[python_targets_python3_7(-)] dev-python/pebble[python_targets_python3_7(-)] dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/chardet[python_targets_python3_8(-)] dev-python/pebble[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/pebble[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/pebble[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/pebble[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) dev-util/unifdef sys-devel/flex
 REQUIRED_USE=^^ ( python_single_target_python3_7 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://github.com/marxin/cvise/archive/v2.7.0.tar.gz -> cvise-2.7.0.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6f5484ca8bfd6614591af07dd77b0c08
+_md5_=aeb0efbb91fe4eb2508f5da3760a40d7
diff --git a/metadata/md5-cache/dev-util/debugedit-5.0-r1 b/metadata/md5-cache/dev-util/debugedit-5.0-r1
index 3dfdcd4da1ac..c0d39361ce35 100644
--- a/metadata/md5-cache/dev-util/debugedit-5.0-r1
+++ b/metadata/md5-cache/dev-util/debugedit-5.0-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2+ LGPL-2+
 RDEPEND=>=dev-libs/elfutils-0.176-r1
 SLOT=0
 SRC_URI=https://sourceware.org/ftp/debugedit/5.0/debugedit-5.0.tar.xz verify-sig? ( https://sourceware.org/ftp/debugedit/5.0/debugedit-5.0.tar.xz.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=432971a03469ed7c1a6d9c403c42c08d
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20220728 b/metadata/md5-cache/dev-util/dialog-1.3.20220728
index df9df4121bca..1eb4e9296d73 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20220728
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20220728
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?]
 SLOT=0/15
 SRC_URI=https://invisible-island.net/archives/dialog/dialog-1.3-20220728.tgz verify-sig? ( https://invisible-island.net/archives/dialog/dialog-1.3-20220728.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=cee0714e73656da58e1b719d3987bff2
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20221229 b/metadata/md5-cache/dev-util/dialog-1.3.20221229
index 34d04de0e21b..d95256e6c49a 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20221229
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20221229
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?]
 SLOT=0/15
 SRC_URI=https://invisible-island.net/archives/dialog/dialog-1.3-20221229.tgz verify-sig? ( https://invisible-island.net/archives/dialog/dialog-1.3-20221229.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=6acf1e2dfce67d3211b2341684607d0a
diff --git a/metadata/md5-cache/dev-util/dialog-1.3.20230209 b/metadata/md5-cache/dev-util/dialog-1.3.20230209
index 7bcd9421fa01..37a5bb3ff0ec 100644
--- a/metadata/md5-cache/dev-util/dialog-1.3.20230209
+++ b/metadata/md5-cache/dev-util/dialog-1.3.20230209
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=>=sys-libs/ncurses-5.2-r5:=[unicode(+)?]
 SLOT=0/15
 SRC_URI=https://invisible-island.net/archives/dialog/dialog-1.3-20230209.tgz verify-sig? ( https://invisible-island.net/archives/dialog/dialog-1.3-20230209.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=5f14076acc844646ebec141c2ad58b0e
diff --git a/metadata/md5-cache/dev-util/diffstat-1.65 b/metadata/md5-cache/dev-util/diffstat-1.65
index ba54fcc69cab..763dde88e965 100644
--- a/metadata/md5-cache/dev-util/diffstat-1.65
+++ b/metadata/md5-cache/dev-util/diffstat-1.65
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x
 LICENSE=HPND
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/diffstat/diffstat-1.65.tgz verify-sig? ( https://invisible-island.net/archives/diffstat/diffstat-1.65.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=44465e2887041e7e3d60f9c664fafc1c
diff --git a/metadata/md5-cache/dev-util/lldb-14.0.6 b/metadata/md5-cache/dev-util/lldb-14.0.6
index 33716bccca68..809b2b596072 100644
--- a/metadata/md5-cache/dev-util/lldb-14.0.6
+++ b/metadata/md5-cache/dev-util/lldb-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b30f9f93990c6fc2606b29212f4b8651
diff --git a/metadata/md5-cache/dev-util/lldb-15.0.7 b/metadata/md5-cache/dev-util/lldb-15.0.7
index 4bcfa0fdc0a9..9273959f20b8 100644
--- a/metadata/md5-cache/dev-util/lldb-15.0.7
+++ b/metadata/md5-cache/dev-util/lldb-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test !test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=32452684adf82bfa4554bd00ef3a9aa0
diff --git a/metadata/md5-cache/dev-util/lldb-16.0.0_rc3 b/metadata/md5-cache/dev-util/lldb-16.0.0_rc3
index 485810710436..c99a420cb818 100644
--- a/metadata/md5-cache/dev-util/lldb-16.0.0_rc3
+++ b/metadata/md5-cache/dev-util/lldb-16.0.0_rc3
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=test !test? ( test )
 SLOT=0/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=15afa186f55b07a9d8d0f2be73dd4b74
diff --git a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230225 b/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230225
deleted file mode 100644
index 9a1e1ce772a0..000000000000
--- a/metadata/md5-cache/dev-util/lldb-17.0.0_pre20230225
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-util/cmake-3.16 python? ( >=dev-lang/swig-3.0.11 python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) ) test? ( python_single_target_python3_7? ( ~dev-python/lit-17.0.0_pre20230225[python_targets_python3_7(-)] dev-python/psutil[python_targets_python3_7(-)] ) python_single_target_python3_8? ( ~dev-python/lit-17.0.0_pre20230225[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] ) python_single_target_python3_9? ( ~dev-python/lit-17.0.0_pre20230225[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] ) python_single_target_python3_10? ( ~dev-python/lit-17.0.0_pre20230225[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] ) python_single_target_python3_11? ( ~dev-python/lit-17.0.0_pre20230225[python_targets_python3_11(-)] dev-python/psutil[python_targets_python3_11(-)] ) sys-devel/lld ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-17.0.0_pre20230225 ~sys-devel/llvm-17.0.0_pre20230225 !!sys-devel/llvm:0
-DESCRIPTION=The LLVM debugger
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org python-single-r1
-IUSE=debug +libedit lzma ncurses +python test +xml test python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-17.0.0_pre20230225 ~sys-devel/llvm-17.0.0_pre20230225 python? ( python_single_target_python3_7? ( dev-python/six[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=test !test? ( test )
-SLOT=0/17.0.0_pre20230225
-SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=51f1a1609330592ee4e600e1e8e925a5
diff --git a/metadata/md5-cache/dev-util/valgrind-3.20.0-r2 b/metadata/md5-cache/dev-util/valgrind-3.20.0-r2
index 0ba1a32486ad..02991468e6e2 100644
--- a/metadata/md5-cache/dev-util/valgrind-3.20.0-r2
+++ b/metadata/md5-cache/dev-util/valgrind-3.20.0-r2
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=mpi? ( virtual/mpi )
 SLOT=0
 SRC_URI=https://sourceware.org/pub/valgrind/valgrind-3.20.0.tar.bz2 verify-sig? ( https://sourceware.org/pub/valgrind/valgrind-3.20.0.tar.bz2.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=9c2a26e0792e9353488adfa7b54652bc
diff --git a/metadata/md5-cache/games-action/ddnet-16.7.2-r1 b/metadata/md5-cache/games-action/ddnet-16.8
index 4e7c0bcf404b..b41ccfea4769 100644
--- a/metadata/md5-cache/games-action/ddnet-16.7.2-r1
+++ b/metadata/md5-cache/games-action/ddnet-16.8
@@ -11,6 +11,6 @@ KEYWORDS=~amd64
 LICENSE=CC-BY-SA-3.0 OFL-1.1 BSD
 RDEPEND=client? ( media-libs/freetype media-libs/glew media-libs/libogg media-libs/libsdl2 media-libs/opus media-libs/opusfile media-libs/libpng media-libs/x264 media-sound/wavpack x11-libs/libnotify videorecorder? ( media-video/ffmpeg ) ) sys-libs/zlib dev-libs/openssl dev-db/sqlite download-gtest? ( dev-cpp/gtest dev-vcs/git ) net-misc/curl upnp? ( net-libs/miniupnpc ) vulkan? ( media-libs/vulkan-loader media-libs/libsdl2[vulkan] ) websockets? ( net-libs/libwebsockets[client] )
 SLOT=0
-SRC_URI=https://github.com/ddnet/ddnet/archive/refs/tags/16.7.2.tar.gz -> ddnet-16.7.2.tar.gz https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cxx/1.0.71/download -> cxx-1.0.71.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.71/download -> cxxbridge-flags-1.0.71.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.71/download -> cxxbridge-macro-1.0.71.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.6/download -> link-cplusplus-1.0.6.crate https://crates.io/api/v1/crates/proc-macro2/1.0.40/download -> proc-macro2-1.0.40.crate https://crates.io/api/v1/crates/quote/1.0.20/download -> quote-1.0.20.crate https://crates.io/api/v1/crates/syn/1.0.98/download -> syn-1.0.98.crate https://crates.io/api/v1/crates/unicode-ident/1.0.1/download -> unicode-ident-1.0.1.crate
+SRC_URI=https://github.com/ddnet/ddnet/archive/refs/tags/16.8.tar.gz -> ddnet-16.8.tar.gz https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cxx/1.0.71/download -> cxx-1.0.71.crate https://crates.io/api/v1/crates/cxxbridge-flags/1.0.71/download -> cxxbridge-flags-1.0.71.crate https://crates.io/api/v1/crates/cxxbridge-macro/1.0.71/download -> cxxbridge-macro-1.0.71.crate https://crates.io/api/v1/crates/link-cplusplus/1.0.6/download -> link-cplusplus-1.0.6.crate https://crates.io/api/v1/crates/proc-macro2/1.0.40/download -> proc-macro2-1.0.40.crate https://crates.io/api/v1/crates/quote/1.0.20/download -> quote-1.0.20.crate https://crates.io/api/v1/crates/syn/1.0.98/download -> syn-1.0.98.crate https://crates.io/api/v1/crates/unicode-ident/1.0.1/download -> unicode-ident-1.0.1.crate
 _eclasses_=cargo	33a6fedd9e309870a65565d0b995fb41	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8eca038a83d8d454bf7216cc67c74ece
diff --git a/metadata/md5-cache/gui-apps/grim-1.4.0-r1 b/metadata/md5-cache/gui-apps/grim-1.4.0-r1
index 7dc4b95b2adc..4ab3df3bca38 100644
--- a/metadata/md5-cache/gui-apps/grim-1.4.0-r1
+++ b/metadata/md5-cache/gui-apps/grim-1.4.0-r1
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install test
 DEPEND=dev-libs/wayland >=dev-libs/wayland-protocols-1.14 media-libs/libpng x11-libs/pixman jpeg? ( media-libs/libjpeg-turbo )
 DESCRIPTION=Grab images from a Wayland compositor
 EAPI=8
-HOMEPAGE=https://github.com/emersion/grim
+HOMEPAGE=https://sr.ht/~emersion/grim
 INHERIT=bash-completion-r1 meson
 IUSE=+man jpeg
 KEYWORDS=amd64 arm64 ~loong ~ppc64 ~riscv x86
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/wayland >=dev-libs/wayland-protocols-1.14 media-libs/libpng x11
 SLOT=0
 SRC_URI=https://github.com/emersion/grim/archive/v1.4.0.tar.gz -> grim-1.4.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=b35297a72ead45d93847bb1a875a0512
+_md5_=1ca6aadb55915b6ffed03d563fe41ba0
diff --git a/metadata/md5-cache/gui-apps/grim-1.4.0-r3 b/metadata/md5-cache/gui-apps/grim-1.4.0-r3
index e022299b50ce..0a0e7b5b81b6 100644
--- a/metadata/md5-cache/gui-apps/grim-1.4.0-r3
+++ b/metadata/md5-cache/gui-apps/grim-1.4.0-r3
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install test
 DEPEND=dev-libs/wayland media-libs/libpng x11-libs/pixman jpeg? ( media-libs/libjpeg-turbo ) >=dev-libs/wayland-protocols-1.14
 DESCRIPTION=Grab images from a Wayland compositor
 EAPI=8
-HOMEPAGE=https://github.com/emersion/grim
+HOMEPAGE=https://sr.ht/~emersion/grim
 INHERIT=bash-completion-r1 meson
 IUSE=+man jpeg
 KEYWORDS=~amd64 ~arm64 ~loong ~ppc64 ~riscv ~x86
@@ -12,4 +12,4 @@ RDEPEND=dev-libs/wayland media-libs/libpng x11-libs/pixman jpeg? ( media-libs/li
 SLOT=0
 SRC_URI=https://github.com/emersion/grim/archive/v1.4.0.tar.gz -> grim-1.4.0.tar.gz
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0f0820bc4abac29544518675aa9900c8
+_md5_=624d24e26085b82e43f2c5cb79ea4ed4
diff --git a/metadata/md5-cache/gui-apps/grim-9999 b/metadata/md5-cache/gui-apps/grim-9999
index c4c954c7b99b..223c53933c84 100644
--- a/metadata/md5-cache/gui-apps/grim-9999
+++ b/metadata/md5-cache/gui-apps/grim-9999
@@ -3,7 +3,7 @@ DEFINED_PHASES=compile configure install test unpack
 DEPEND=dev-libs/wayland media-libs/libpng x11-libs/pixman jpeg? ( media-libs/libjpeg-turbo ) >=dev-libs/wayland-protocols-1.14
 DESCRIPTION=Grab images from a Wayland compositor
 EAPI=8
-HOMEPAGE=https://github.com/emersion/grim
+HOMEPAGE=https://sr.ht/~emersion/grim
 INHERIT=bash-completion-r1 meson git-r3
 IUSE=+man jpeg
 LICENSE=MIT
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=dev-libs/wayland media-libs/libpng x11-libs/pixman jpeg? ( media-libs/libjpeg-turbo )
 SLOT=0
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	git-r3	2347f8fe2d392b2a091191f94be37e6f	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=0f0820bc4abac29544518675aa9900c8
+_md5_=e6668502e3d73b2bac2dbbe64a5026bf
diff --git a/metadata/md5-cache/mail-mta/notqmail-1.08-r6 b/metadata/md5-cache/mail-mta/notqmail-1.08-r6
index 6e3acae0c97e..cb2ee10c0442 100644
--- a/metadata/md5-cache/mail-mta/notqmail-1.08-r6
+++ b/metadata/md5-cache/mail-mta/notqmail-1.08-r6
@@ -14,5 +14,5 @@ REQUIRED_USE=vanilla? ( !ssl !qmail-spp !highvolume !gencertdaily ) gencertdaily
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/notqmail/notqmail/releases/download/notqmail-1.08/notqmail-1.08.tar.xz verify-sig? ( https://github.com/notqmail/notqmail/releases/download/notqmail-1.08/notqmail-1.08.tar.xz.sig ) https://github.com/DerDakon/genqmail/releases/download/genqmail-20200817/genqmail-20200817.tar.bz2 https://www.ckdhr.com/ckd/qmail-103.patch !vanilla? ( highvolume? ( https://github.com/notqmail/notqmail/commit/3a22b45974ddd1230da0dfa21f886c3401bee020.patch -> notqmail-1.08-big-todo.patch ) qmail-spp? ( ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch https://github.com/notqmail/notqmail/commit/d950cc34491afe90432cafcaeda61d1c1a9508e9.patch -> notqmail-1.08-tls-spp.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/b36d52a0dd7315a969f2a9a7455717466e45be23.patch -> notqmail-1.08-spp.patch ) ) ssl? ( https://github.com/notqmail/notqmail/commit/0dc6a3aa9cb3440fe589ca5384ea27d683f05625.patch -> notqmail-1.08-tls-20200107.patch ) !ssl? ( https://github.com/notqmail/notqmail/commit/c467ba6880aaecfe1d3f592a7738de88cb5ac79a.patch -> notqmail-1.08-auth.patch ) )
-_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmail	8b4becd598c7db847f08a4384525cd18	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=fixheadtails	1721997ed44d035654efe12da50797ef	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	qmail	8b4becd598c7db847f08a4384525cd18	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=0e1d27a23236ef8bd00cfe6626dbcf9c
diff --git a/metadata/md5-cache/media-fonts/lxgw-wenkai-1.245.1 b/metadata/md5-cache/media-fonts/lxgw-wenkai-1.245.1
deleted file mode 100644
index a5549dc7bae8..000000000000
--- a/metadata/md5-cache/media-fonts/lxgw-wenkai-1.245.1
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=X? ( >=x11-apps/mkfontscale-1.2.0 media-fonts/encodings )
-DEFINED_PHASES=install postinst postrm setup
-DESCRIPTION=An open-source Chinese font derived from Fontworks' Klee One
-EAPI=7
-HOMEPAGE=https://github.com/lxgw/LxgwWenKai
-INHERIT=font
-IUSE=X
-KEYWORDS=amd64 ~loong
-LICENSE=OFL-1.1
-SLOT=0
-SRC_URI=https://github.com/lxgw/LxgwWenKai/releases/download/v1.245.1/lxgw-wenkai-v1.245.1.tar.gz
-_eclasses_=font	5e03cb70902daa9ff8967c61130f0f60
-_md5_=02d331ff6010808e86314b5cff80a917
diff --git a/metadata/md5-cache/media-fonts/lxgw-wenkai-1.250 b/metadata/md5-cache/media-fonts/lxgw-wenkai-1.250
index e0375a9fa4ce..19f95b93bccd 100644
--- a/metadata/md5-cache/media-fonts/lxgw-wenkai-1.250
+++ b/metadata/md5-cache/media-fonts/lxgw-wenkai-1.250
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://github.com/lxgw/LxgwWenKai
 INHERIT=font
 IUSE=X
-KEYWORDS=~amd64 ~loong
+KEYWORDS=amd64 ~loong
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/lxgw/LxgwWenKai/releases/download/v1.250/lxgw-wenkai-v1.250.tar.gz
 _eclasses_=font	5e03cb70902daa9ff8967c61130f0f60
-_md5_=29d3f9feebcff462a7277402dd3dc871
+_md5_=1e17ca254231fe42151eaf082ee2ada2
diff --git a/metadata/md5-cache/media-fonts/smiley-sans-1.1.1 b/metadata/md5-cache/media-fonts/smiley-sans-1.1.1
index 0fd2a5eb4a76..51bd902ecf20 100644
--- a/metadata/md5-cache/media-fonts/smiley-sans-1.1.1
+++ b/metadata/md5-cache/media-fonts/smiley-sans-1.1.1
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://github.com/atelier-anchor/smiley-sans
 INHERIT=font
 IUSE=X
-KEYWORDS=~amd64 ~loong
+KEYWORDS=amd64 ~loong
 LICENSE=OFL-1.1
 SLOT=0
 SRC_URI=https://github.com/atelier-anchor/smiley-sans/releases/download/v1.1.1/smiley-sans-v1.1.1.zip
 _eclasses_=font	5e03cb70902daa9ff8967c61130f0f60
-_md5_=ac4b68f21ffef69a1ce31ae542e580dd
+_md5_=1a01be67329f8ceb5afaa46215ca7881
diff --git a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.40 b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.40
index 87274062bda8..af95b9bb54a4 100644
--- a/metadata/md5-cache/media-gfx/graphicsmagick-1.3.40
+++ b/metadata/md5-cache/media-gfx/graphicsmagick-1.3.40
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=dev-libs/libltdl bzip2? ( app-arch/bzip2 ) fpx? ( media-libs/libfpx ) heif? ( media-libs/libheif:= ) imagemagick? ( !media-gfx/imagemagick ) jbig? ( media-libs/jbigkit ) jpeg? ( media-libs/libjpeg-turbo:= ) jpegxl? ( media-libs/libjxl:= ) lcms? ( media-libs/lcms:2 ) lzma? ( app-arch/xz-utils ) perl? ( dev-lang/perl:= ) png? ( media-libs/libpng:= ) postscript? ( app-text/ghostscript-gpl ) svg? ( dev-libs/libxml2 ) tcmalloc? ( dev-util/google-perftools:= ) tiff? ( media-libs/tiff:= ) truetype? ( media-fonts/urw-fonts >=media-libs/freetype-2 ) webp? ( media-libs/libwebp:= ) wmf? ( media-libs/libwmf ) X? ( x11-libs/libSM x11-libs/libX11 x11-libs/libXext ) zlib? ( sys-libs/zlib ) zstd? ( app-arch/zstd:= )
 SLOT=0/1.3
 SRC_URI=mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.40.tar.xz verify-sig? ( mirror://sourceforge/graphicsmagick/GraphicsMagick-1.3.40.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=eb51bbf0b921d2b3463f2ea475dc6a5d
diff --git a/metadata/md5-cache/media-gfx/heatshrink-0.4.1 b/metadata/md5-cache/media-gfx/heatshrink-0.4.1
index ee4059e424ad..6a1efb5b9204 100644
--- a/metadata/md5-cache/media-gfx/heatshrink-0.4.1
+++ b/metadata/md5-cache/media-gfx/heatshrink-0.4.1
@@ -9,5 +9,5 @@ KEYWORDS=~amd64 ~x86
 LICENSE=ISC
 SLOT=0
 SRC_URI=https://github.com/atomicobject/heatshrink/archive/refs/tags/v0.4.1.tar.gz -> heatshrink-0.4.1.tar.gz
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=a3720e0af2f28fa0b4b2cd5d746206da
diff --git a/metadata/md5-cache/media-libs/libass-0.16.0 b/metadata/md5-cache/media-libs/libass-0.16.0
index cf59ed3401b8..9003443e4f74 100644
--- a/metadata/md5-cache/media-libs/libass-0.16.0
+++ b/metadata/md5-cache/media-libs/libass-0.16.0
@@ -11,5 +11,5 @@ LICENSE=ISC
 RDEPEND=>=dev-libs/fribidi-0.19.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-1.2.3:=[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/9
 SRC_URI=https://github.com/libass/libass/releases/download/0.16.0/libass-0.16.0.tar.xz verify-sig? ( https://github.com/libass/libass/releases/download/0.16.0/libass-0.16.0.tar.xz.asc )
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=bb06f16b06e3c7a170ade11effa24010
diff --git a/metadata/md5-cache/media-libs/libass-0.17.1 b/metadata/md5-cache/media-libs/libass-0.17.1
index f4362e2af7f0..3b5e151803b1 100644
--- a/metadata/md5-cache/media-libs/libass-0.17.1
+++ b/metadata/md5-cache/media-libs/libass-0.17.1
@@ -12,5 +12,5 @@ RDEPEND=>=dev-libs/fribidi-0.19.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-
 RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.xz verify-sig? ( https://github.com/libass/libass/releases/download/0.17.1/libass-0.17.1.tar.xz.asc )
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=51f9ce0d2ee4add874392f5c2c49d938
diff --git a/metadata/md5-cache/media-libs/libde265-1.0.11 b/metadata/md5-cache/media-libs/libde265-1.0.11
new file mode 100644
index 000000000000..573b7742c710
--- /dev/null
+++ b/metadata/md5-cache/media-libs/libde265-1.0.11
@@ -0,0 +1,15 @@
+BDEPEND=dec265? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=dec265? ( sdl? ( media-libs/libsdl ) )
+DESCRIPTION=Open h.265 video codec implementation
+EAPI=8
+HOMEPAGE=https://github.com/strukturag/libde265
+INHERIT=autotools multilib-minimal
+IUSE=enc265 dec265 sdl tools debug cpu_flags_x86_sse4_1 cpu_flags_arm_neon cpu_flags_arm_thumb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc64 ~riscv ~x86
+LICENSE=GPL-3
+RDEPEND=dec265? ( sdl? ( media-libs/libsdl ) )
+SLOT=0
+SRC_URI=https://github.com/strukturag/libde265/releases/download/v1.0.11/libde265-1.0.11.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0db74a1ca06aef2b1d140231dc040be1
diff --git a/metadata/md5-cache/media-libs/libde265-9999 b/metadata/md5-cache/media-libs/libde265-9999
index cb5189226865..a284116e17b9 100644
--- a/metadata/md5-cache/media-libs/libde265-9999
+++ b/metadata/md5-cache/media-libs/libde265-9999
@@ -2,7 +2,7 @@ BDEPEND=dec265? ( virtual/pkgconfig ) sys-devel/gnuconfig >=app-portage/elt-patc
 DEFINED_PHASES=compile configure install prepare test unpack
 DEPEND=dec265? ( sdl? ( media-libs/libsdl ) )
 DESCRIPTION=Open h.265 video codec implementation
-EAPI=7
+EAPI=8
 HOMEPAGE=https://github.com/strukturag/libde265
 INHERIT=autotools multilib-minimal git-r3
 IUSE=enc265 dec265 sdl tools debug cpu_flags_x86_sse4_1 cpu_flags_arm_neon cpu_flags_arm_thumb abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
@@ -11,4 +11,4 @@ PROPERTIES=live
 RDEPEND=dec265? ( sdl? ( media-libs/libsdl ) )
 SLOT=0
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4fa193a4095ccf690ae4c9e696bcb96c
+_md5_=0db74a1ca06aef2b1d140231dc040be1
diff --git a/metadata/md5-cache/media-libs/libjxl-0.8.1 b/metadata/md5-cache/media-libs/libjxl-0.8.1
index d578f8ed7abd..54122ce10b94 100644
--- a/metadata/md5-cache/media-libs/libjxl-0.8.1
+++ b/metadata/md5-cache/media-libs/libjxl-0.8.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/libjxl/libjxl
 INHERIT=cmake-multilib flag-o-matic
 IUSE=openexr abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=BSD
 RDEPEND=app-arch/brotli:=[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-cpp/highway-1.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(-)?] media-libs/giflib:=[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/lcms-2.13:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libjpeg-turbo:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/libpng:=[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-misc/shared-mime-info-2.2 openexr? ( media-libs/openexr:= )
 SLOT=0
 SRC_URI=https://github.com/libjxl/libjxl/archive/refs/tags/v0.8.1.tar.gz -> libjxl-0.8.1.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=98c5fc2767a7346905aa29d8d2e13d4c
+_md5_=3169bb8135f871f62bba9de877cc84ce
diff --git a/metadata/md5-cache/media-libs/openal-1.23.0 b/metadata/md5-cache/media-libs/openal-1.23.0
index 67f2ec16019b..e2aaf8cab41b 100644
--- a/metadata/md5-cache/media-libs/openal-1.23.0
+++ b/metadata/md5-cache/media-libs/openal-1.23.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://www.openal-soft.org/
 INHERIT=cmake-multilib
 IUSE=alsa coreaudio debug jack oss pipewire 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 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~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(-)?] ) pipewire? ( media-video/pipewire[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.23.0.tar.bz2
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=6b37d45957d5cbc3341dd8f84fa27d03
+_md5_=95d58ba3acd83d1dcb812c244e14d26d
diff --git a/metadata/md5-cache/media-libs/tiff-4.5.0 b/metadata/md5-cache/media-libs/tiff-4.5.0
index cb822fbafc91..342dbfb2088a 100644
--- a/metadata/md5-cache/media-libs/tiff-4.5.0
+++ b/metadata/md5-cache/media-libs/tiff-4.5.0
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( jpeg )
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://download.osgeo.org/libtiff/tiff-4.5.0.tar.xz verify-sig? ( https://download.osgeo.org/libtiff/tiff-4.5.0.tar.xz.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=83881d5529e6c0d266b1405de3a3a23c
diff --git a/metadata/md5-cache/media-libs/tiff-4.5.0-r1 b/metadata/md5-cache/media-libs/tiff-4.5.0-r1
index 68fdc801b575..173a6082af80 100644
--- a/metadata/md5-cache/media-libs/tiff-4.5.0-r1
+++ b/metadata/md5-cache/media-libs/tiff-4.5.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( jpeg )
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://download.osgeo.org/libtiff/tiff-4.5.0.tar.xz verify-sig? ( https://download.osgeo.org/libtiff/tiff-4.5.0.tar.xz.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=62e977a7ed6445cca7edff066fa94f27
diff --git a/metadata/md5-cache/media-libs/tiff-4.5.0-r2 b/metadata/md5-cache/media-libs/tiff-4.5.0-r2
index 833f2cf9d903..98312407c4d6 100644
--- a/metadata/md5-cache/media-libs/tiff-4.5.0-r2
+++ b/metadata/md5-cache/media-libs/tiff-4.5.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( jpeg )
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://download.osgeo.org/libtiff/tiff-4.5.0.tar.xz verify-sig? ( https://download.osgeo.org/libtiff/tiff-4.5.0.tar.xz.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=f707bcc3c3cb884788e0bdcb991ac411
diff --git a/metadata/md5-cache/media-libs/tiff-compat-4.4.0-r1 b/metadata/md5-cache/media-libs/tiff-compat-4.4.0-r1
index bdd8c0e6d0db..ec98630cf949 100644
--- a/metadata/md5-cache/media-libs/tiff-compat-4.4.0-r1
+++ b/metadata/md5-cache/media-libs/tiff-compat-4.4.0-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( jpeg )
 RESTRICT=!test? ( test )
 SLOT=4
 SRC_URI=https://download.osgeo.org/libtiff/tiff-4.4.0.tar.xz verify-sig? ( https://download.osgeo.org/libtiff/tiff-4.4.0.tar.xz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=69b4ee174e81cbf5a5b341bde9acd0c3
diff --git a/metadata/md5-cache/media-libs/vidstab-1.1.1 b/metadata/md5-cache/media-libs/vidstab-1.1.1
new file mode 100644
index 000000000000..8d0bad0e2021
--- /dev/null
+++ b/metadata/md5-cache/media-libs/vidstab-1.1.1
@@ -0,0 +1,13 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare pretend setup test
+DESCRIPTION=Video stabilization library
+EAPI=7
+HOMEPAGE=http://public.hronopik.de/vid.stab/
+INHERIT=cmake-multilib toolchain-funcs
+IUSE=openmp cpu_flags_x86_sse2 abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2+
+SLOT=0
+SRC_URI=https://github.com/georgmartius/vid.stab/archive/v1.1.1.tar.gz -> vidstab-1.1.1.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=5ffd4fd7d6dbbc5523a5f2ebbb1adc41
diff --git a/metadata/md5-cache/media-video/ffmpeg-4.4.3 b/metadata/md5-cache/media-video/ffmpeg-4.4.3
index a3ff3efb5e12..88dcfbf775ce 100644
--- a/metadata/md5-cache/media-video/ffmpeg-4.4.3
+++ b/metadata/md5-cache/media-video/ffmpeg-4.4.3
@@ -13,5 +13,5 @@ REQUIRED_USE=cuda? ( nvenc ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( e
 RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/56.58.58
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-4.4.3.tar.xz verify-sig? ( https://ffmpeg.org/releases/ffmpeg-4.4.3.tar.xz.asc )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=39d7d25e1e0da92f8fe47cd7e9fc8aaa
diff --git a/metadata/md5-cache/media-video/ffmpeg-5.1.2-r1 b/metadata/md5-cache/media-video/ffmpeg-5.1.2-r1
index ec3b0de5e2ed..9139e83ad501 100644
--- a/metadata/md5-cache/media-video/ffmpeg-5.1.2-r1
+++ b/metadata/md5-cache/media-video/ffmpeg-5.1.2-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=cuda? ( nvenc ) libv4l? ( v4l ) fftools_cws2fws? ( zlib ) test? ( e
 RESTRICT=!test? ( test ) gpl? ( openssl? ( bindist ) fdk? ( bindist ) )
 SLOT=0/57.59.59
 SRC_URI=https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.xz verify-sig? ( https://ffmpeg.org/releases/ffmpeg-5.1.2.tar.xz.asc )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=5b3eae31f6cdeae542b20b655a3dc40f
diff --git a/metadata/md5-cache/mpv-plugin/autoload-0.34.1 b/metadata/md5-cache/mpv-plugin/autoload-0.34.1
deleted file mode 100644
index e73311a7c055..000000000000
--- a/metadata/md5-cache/mpv-plugin/autoload-0.34.1
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install postinst
-DESCRIPTION=Loads playlist entries before and after the the currently played file
-EAPI=8
-HOMEPAGE=https://github.com/mpv-player/mpv/tree/master/TOOLS/lua
-INHERIT=mpv-plugin
-IUSE=+autoload
-KEYWORDS=~amd64
-LICENSE=LGPL-2.1+ GPL-2+ BSD ISC
-RDEPEND=~media-video/mpv-0.34.1 media-video/mpv[lua]
-SLOT=0
-SRC_URI=https://github.com/mpv-player/mpv/archive/v0.34.1.tar.gz -> mpv-0.34.1.tar.gz
-_eclasses_=mpv-plugin	d5b74b0d4b9aa2b088badc969f11de7a
-_md5_=16ec101cc3cc1e4bec453bacec8f7111
diff --git a/metadata/md5-cache/net-analyzer/fprobe-1.1-r5 b/metadata/md5-cache/net-analyzer/fprobe-1.1-r5
deleted file mode 100644
index 31a7e7727d8b..000000000000
--- a/metadata/md5-cache/net-analyzer/fprobe-1.1-r5
+++ /dev/null
@@ -1,12 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=net-libs/libpcap
-DESCRIPTION=libpcap-based tool to collect network traffic data and emit it as NetFlow flows
-EAPI=8
-HOMEPAGE=http://fprobe.sourceforge.net
-IUSE=debug messages
-KEYWORDS=amd64 ppc x86
-LICENSE=GPL-2
-RDEPEND=net-libs/libpcap
-SLOT=0
-SRC_URI=mirror://sourceforge/fprobe/fprobe-1.1.tar.bz2
-_md5_=d9744d3c56fa2abf8069d39b3be475df
diff --git a/metadata/md5-cache/net-analyzer/fprobe-1.1-r6 b/metadata/md5-cache/net-analyzer/fprobe-1.1-r6
new file mode 100644
index 000000000000..a8d6b5e1b72f
--- /dev/null
+++ b/metadata/md5-cache/net-analyzer/fprobe-1.1-r6
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=configure install prepare
+DEPEND=net-libs/libpcap
+DESCRIPTION=libpcap-based tool to collect network traffic data and emit it as NetFlow flows
+EAPI=8
+HOMEPAGE=https://fprobe.sourceforge.net
+INHERIT=autotools
+IUSE=debug messages
+KEYWORDS=amd64 ppc x86
+LICENSE=GPL-2
+RDEPEND=net-libs/libpcap
+SLOT=0
+SRC_URI=mirror://sourceforge/fprobe/fprobe-1.1.tar.bz2
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=67dac63a7866dfb0523ca98c03f573d5
diff --git a/metadata/md5-cache/net-analyzer/suricata-6.0.10 b/metadata/md5-cache/net-analyzer/suricata-6.0.10
index 6c0b6f62c07a..452082f317c6 100644
--- a/metadata/md5-cache/net-analyzer/suricata-6.0.10
+++ b/metadata/md5-cache/net-analyzer/suricata-6.0.10
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-6.0.10.tar.gz verify-sig? ( https://www.openinfosecfoundation.org/download/suricata-6.0.10.tar.gz.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=1782d5063cfc38aef938b6a662f1e967
diff --git a/metadata/md5-cache/net-analyzer/suricata-6.0.9 b/metadata/md5-cache/net-analyzer/suricata-6.0.9
index 9a584a5b1ebb..7ab573b158a1 100644
--- a/metadata/md5-cache/net-analyzer/suricata-6.0.9
+++ b/metadata/md5-cache/net-analyzer/suricata-6.0.9
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://www.openinfosecfoundation.org/download/suricata-6.0.9.tar.gz verify-sig? ( https://www.openinfosecfoundation.org/download/suricata-6.0.9.tar.gz.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=7d0261b1065e4acd988c02e192e1c9c1
diff --git a/metadata/md5-cache/net-analyzer/tcpslice-1.5 b/metadata/md5-cache/net-analyzer/tcpslice-1.5
index 8130c4bb52c2..9070a4e68863 100644
--- a/metadata/md5-cache/net-analyzer/tcpslice-1.5
+++ b/metadata/md5-cache/net-analyzer/tcpslice-1.5
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libpcap
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/tcpslice-1.5.tar.gz verify-sig? ( https://www.tcpdump.org/release/tcpslice-1.5.tar.gz.sig )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=2f4070be9dfcdefac4b4cacf7432eff0
diff --git a/metadata/md5-cache/net-analyzer/vnstat-2.10 b/metadata/md5-cache/net-analyzer/vnstat-2.10
index 7eb5d0e03721..a937f34d8f32 100644
--- a/metadata/md5-cache/net-analyzer/vnstat-2.10
+++ b/metadata/md5-cache/net-analyzer/vnstat-2.10
@@ -12,5 +12,5 @@ RDEPEND=acct-group/vnstat acct-user/vnstat dev-db/sqlite gd? ( media-libs/gd[png
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://humdi.net/vnstat/vnstat-2.10.tar.gz https://github.com/vergoh/vnstat/releases/download/v2.10/vnstat-2.10.tar.gz verify-sig? ( https://humdi.net/vnstat/vnstat-2.10.tar.gz.asc https://github.com/vergoh/vnstat/releases/download/v2.10/vnstat-2.10.tar.gz.asc )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=3b3cc317e0c5afffbb9905628b186f87
diff --git a/metadata/md5-cache/net-client/lagrange-1.15.3 b/metadata/md5-cache/net-client/lagrange-1.15.3
index 962588e01444..869f5f846894 100644
--- a/metadata/md5-cache/net-client/lagrange-1.15.3
+++ b/metadata/md5-cache/net-client/lagrange-1.15.3
@@ -12,5 +12,5 @@ LICENSE=|| ( MIT Unlicense ) Apache-2.0 BSD-2 CC-BY-SA-4.0 OFL-1.1
 RDEPEND=>=dev-libs/tfdn-1.4.0:=[ssl] X? ( x11-libs/libX11 ) fribidi? ( dev-libs/fribidi ) ncurses? ( >=dev-libs/sealcurses-2.0.18_pre20230206:= ) !ncurses? ( harfbuzz? ( media-libs/harfbuzz:=[truetype(+)] ) media-libs/libsdl2[X?,sound(+),video(+)] ) mp3? ( media-sound/mpg123 ) webp? ( media-libs/libwebp:= )
 SLOT=0
 SRC_URI=https://git.skyjake.fi/gemini/lagrange/releases/download/v1.15.3/lagrange-1.15.3.tar.gz verify-sig? ( https://git.skyjake.fi/gemini/lagrange/releases/download/v1.15.3/lagrange-1.15.3.tar.gz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=bdc178a1faba02dbcbbf324f4c72b390
diff --git a/metadata/md5-cache/net-client/lagrange-1.15.4 b/metadata/md5-cache/net-client/lagrange-1.15.4
index c7dd972cd808..5a0273ef21e3 100644
--- a/metadata/md5-cache/net-client/lagrange-1.15.4
+++ b/metadata/md5-cache/net-client/lagrange-1.15.4
@@ -12,5 +12,5 @@ LICENSE=|| ( MIT Unlicense ) Apache-2.0 BSD-2 CC-BY-SA-4.0 OFL-1.1
 RDEPEND=>=dev-libs/tfdn-1.4.0:=[ssl] X? ( x11-libs/libX11 ) fribidi? ( dev-libs/fribidi ) ncurses? ( >=dev-libs/sealcurses-2.0.18_pre20230206:= ) !ncurses? ( harfbuzz? ( media-libs/harfbuzz:=[truetype(+)] ) media-libs/libsdl2[X?,sound(+),video(+)] ) mp3? ( media-sound/mpg123 ) webp? ( media-libs/libwebp:= )
 SLOT=0
 SRC_URI=https://git.skyjake.fi/gemini/lagrange/releases/download/v1.15.4/lagrange-1.15.4.tar.gz verify-sig? ( https://git.skyjake.fi/gemini/lagrange/releases/download/v1.15.4/lagrange-1.15.4.tar.gz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=bdc178a1faba02dbcbbf324f4c72b390
diff --git a/metadata/md5-cache/net-client/telescope-0.7.1 b/metadata/md5-cache/net-client/telescope-0.7.1
index 4d68187f2801..615b6d50356e 100644
--- a/metadata/md5-cache/net-client/telescope-0.7.1
+++ b/metadata/md5-cache/net-client/telescope-0.7.1
@@ -11,5 +11,5 @@ LICENSE=!libbsd? ( BSD MIT ) ISC unicode
 RDEPEND=dev-libs/imsg-compat dev-libs/libevent:= dev-libs/libretls:= sys-libs/ncurses:= libbsd? ( dev-libs/libbsd )
 SLOT=0
 SRC_URI=https://github.com/omar-polo/telescope/releases/download/0.7.1/telescope-0.7.1.tar.gz verify-sig? ( https://github.com/omar-polo/telescope/releases/download/0.7.1/SHA256.sig -> telescope-0.7.1.sha.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=7e26bd620ecbb053dac430a1270effb0
diff --git a/metadata/md5-cache/net-client/telescope-0.8.1 b/metadata/md5-cache/net-client/telescope-0.8.1
index f6712c6ac11c..627c1637948f 100644
--- a/metadata/md5-cache/net-client/telescope-0.8.1
+++ b/metadata/md5-cache/net-client/telescope-0.8.1
@@ -11,5 +11,5 @@ LICENSE=!libbsd? ( BSD MIT ) ISC unicode
 RDEPEND=dev-libs/imsg-compat dev-libs/libevent:= dev-libs/libretls:= sys-libs/ncurses:= libbsd? ( dev-libs/libbsd )
 SLOT=0
 SRC_URI=https://github.com/omar-polo/telescope/releases/download/0.8.1/telescope-0.8.1.tar.gz verify-sig? ( https://github.com/omar-polo/telescope/releases/download/0.8.1/SHA256.sig -> telescope-0.8.1.sha.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=7e26bd620ecbb053dac430a1270effb0
diff --git a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4 b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r5
index 9713ec4e9ec7..018ece76e3b3 100644
--- a/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r4
+++ b/metadata/md5-cache/net-dialup/lrzsz-0.12.20-r5
@@ -4,11 +4,11 @@ DEPEND=nls? ( virtual/libintl )
 DESCRIPTION=Communication package providing the X, Y, and ZMODEM file transfer protocols
 EAPI=7
 HOMEPAGE=https://www.ohse.de/uwe/software/lrzsz.html
-INHERIT=autotools flag-o-matic toolchain-funcs
+INHERIT=autotools toolchain-funcs
 IUSE=nls
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.ohse.de/uwe/releases/lrzsz-0.12.20.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=21a2c98f340f8b1ffebd57020cabeae6
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=e014b59beeb48355e208e8105e1e6972
diff --git a/metadata/md5-cache/net-dns/c-ares-1.19.0 b/metadata/md5-cache/net-dns/c-ares-1.19.0
index b0434efecc3f..c0c823bf0e0f 100644
--- a/metadata/md5-cache/net-dns/c-ares-1.19.0
+++ b/metadata/md5-cache/net-dns/c-ares-1.19.0
@@ -10,5 +10,5 @@ LICENSE=MIT
 RESTRICT=!test? ( test )
 SLOT=0/2
 SRC_URI=https://c-ares.org/download/c-ares-1.19.0.tar.gz verify-sig? ( https://c-ares.org/download/c-ares-1.19.0.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=ef1130f7bede3767c5c182cd5cdbcf13
diff --git a/metadata/md5-cache/net-dns/knot-resolver-5.6.0 b/metadata/md5-cache/net-dns/knot-resolver-5.6.0
index 29ffbbaeb917..03c93eb3e971 100644
--- a/metadata/md5-cache/net-dns/knot-resolver-5.6.0
+++ b/metadata/md5-cache/net-dns/knot-resolver-5.6.0
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://secure.nic.cz/files/knot-resolver/knot-resolver-5.6.0.tar.xz verify-sig? ( https://secure.nic.cz/files/knot-resolver/knot-resolver-5.6.0.tar.xz.asc )
-_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=66187e7ee3fe9bd0af0f9994c4893966
diff --git a/metadata/md5-cache/net-dns/libidn-1.41 b/metadata/md5-cache/net-dns/libidn-1.41
index 70c33e333fd5..c780028acfb9 100644
--- a/metadata/md5-cache/net-dns/libidn-1.41
+++ b/metadata/md5-cache/net-dns/libidn-1.41
@@ -11,5 +11,5 @@ LICENSE=GPL-2 GPL-3 LGPL-3
 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/12
 SRC_URI=mirror://gnu/libidn/libidn-1.41.tar.gz verify-sig? ( mirror://gnu/libidn/libidn-1.41.tar.gz.sig )
-_eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=dc49814329fcd6ade4721e2ddf8bcd50
diff --git a/metadata/md5-cache/net-dns/libidn2-2.3.4 b/metadata/md5-cache/net-dns/libidn2-2.3.4
index e8c6b5af40f8..d0f25c39fbf9 100644
--- a/metadata/md5-cache/net-dns/libidn2-2.3.4
+++ b/metadata/md5-cache/net-dns/libidn2-2.3.4
@@ -11,5 +11,5 @@ LICENSE=GPL-2+ LGPL-3+
 RDEPEND=dev-libs/libunistring:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
 SLOT=0/2
 SRC_URI=mirror://gnu/libidn/libidn2-2.3.4.tar.gz verify-sig? ( mirror://gnu/libidn/libidn2-2.3.4.tar.gz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=a02151f2edc4cfeff62640d449b99443
diff --git a/metadata/md5-cache/net-dns/unbound-1.17.0 b/metadata/md5-cache/net-dns/unbound-1.17.0
index 0dc0ecde2c0c..90136049f393 100644
--- a/metadata/md5-cache/net-dns/unbound-1.17.0
+++ b/metadata/md5-cache/net-dns/unbound-1.17.0
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.17.0.tar.gz verify-sig? ( https://nlnetlabs.nl/downloads/unbound/unbound-1.17.0.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=d1bc0e785a1bdd4853d03079e0e03905
diff --git a/metadata/md5-cache/net-dns/unbound-1.17.1 b/metadata/md5-cache/net-dns/unbound-1.17.1
index ee54179b4e48..1dfb1d4b47c9 100644
--- a/metadata/md5-cache/net-dns/unbound-1.17.1
+++ b/metadata/md5-cache/net-dns/unbound-1.17.1
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_
 RESTRICT=!test? ( test )
 SLOT=0/8
 SRC_URI=https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz verify-sig? ( https://nlnetlabs.nl/downloads/unbound/unbound-1.17.1.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=ad94bc46ba88e6c7a155c24d882c829d
diff --git a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.7 b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.7
index db0009e7d483..f441e911954d 100644
--- a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.7
+++ b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.7
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_conntrack-1.0.9 >=net-libs/libnetfilter_queue-1.0.2 >=net-libs/libnfnetlink-1.0.1 net-libs/libtirpc cthelper? ( >=net-libs/libnetfilter_cthelper-1.0.0 ) cttimeout? ( >=net-libs/libnetfilter_cttimeout-1.0.0 ) systemd? ( >=sys-apps/systemd-227 )
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.7.tar.bz2 verify-sig? ( https://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.7.tar.bz2.sig )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=289cc808735a2f7753b0c2e5ffa2d970
diff --git a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.7-r1 b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.7-r1
index e12df998b0fe..97304b862c83 100644
--- a/metadata/md5-cache/net-firewall/conntrack-tools-1.4.7-r1
+++ b/metadata/md5-cache/net-firewall/conntrack-tools-1.4.7-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnetfilter_conntrack-1.0.9 >=net-libs/libnetfilter_queue-1.0.2 >=net-libs/libnfnetlink-1.0.1 net-libs/libtirpc cthelper? ( >=net-libs/libnetfilter_cthelper-1.0.0 ) cttimeout? ( >=net-libs/libnetfilter_cttimeout-1.0.0 ) systemd? ( >=sys-apps/systemd-227 )
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.7.tar.bz2 verify-sig? ( https://www.netfilter.org/projects/conntrack-tools/files/conntrack-tools-1.4.7.tar.bz2.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=003afe828d012578c90b14cd1973385e
diff --git a/metadata/md5-cache/net-firewall/nftables-1.0.5 b/metadata/md5-cache/net-firewall/nftables-1.0.5
index c1fea0375cef..9808fb75f707 100644
--- a/metadata/md5-cache/net-firewall/nftables-1.0.5
+++ b/metadata/md5-cache/net-firewall/nftables-1.0.5
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://netfilter.org/projects/nftables/files/nftables-1.0.5.tar.bz2 verify-sig? ( https://netfilter.org/projects/nftables/files/nftables-1.0.5.tar.bz2.sig )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=4f3fba1329b337974f41d6a513de6e15
diff --git a/metadata/md5-cache/net-firewall/nftables-1.0.6 b/metadata/md5-cache/net-firewall/nftables-1.0.6
index 6b69f20e3a1e..aa4207c68425 100644
--- a/metadata/md5-cache/net-firewall/nftables-1.0.6
+++ b/metadata/md5-cache/net-firewall/nftables-1.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://netfilter.org/projects/nftables/files/nftables-1.0.6.tar.xz verify-sig? ( https://netfilter.org/projects/nftables/files/nftables-1.0.6.tar.xz.sig )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=5f00c291f35d023c9df6cf18b4521fe4
diff --git a/metadata/md5-cache/net-firewall/nftables-9999 b/metadata/md5-cache/net-firewall/nftables-9999
index 359f56a575c1..fe9d67955238 100644
--- a/metadata/md5-cache/net-firewall/nftables-9999
+++ b/metadata/md5-cache/net-firewall/nftables-9999
@@ -12,5 +12,5 @@ RDEPEND=>=net-libs/libmnl-1.0.4:= >=net-libs/libnftnl-1.2.4:= gmp? ( dev-libs/gm
 REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) ) libedit? ( !readline )
 RESTRICT=!test? ( test )
 SLOT=0/1
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	3929d88685167435c587b740fdb5ec46	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	distutils-r1	3929d88685167435c587b740fdb5ec46	edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=f5a754d5dc2f230cde89ebdab188910c
diff --git a/metadata/md5-cache/net-im/ejabberd-22.05-r2 b/metadata/md5-cache/net-im/ejabberd-22.05-r2
index c86803d15b83..8208611cc670 100644
--- a/metadata/md5-cache/net-im/ejabberd-22.05-r2
+++ b/metadata/md5-cache/net-im/ejabberd-22.05-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=mssql? ( odbc )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/processone/ejabberd/archive/refs/tags/22.05.tar.gz -> ejabberd-22.05.tar.gz verify-sig? ( https://github.com/processone/ejabberd/releases/download/22.05/ejabberd-22.05.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	rebar	c90ca870377295e338a9682a5b951ef6	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	rebar	c90ca870377295e338a9682a5b951ef6	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=9261a465d45693d34944ca3c1e7e87f3
diff --git a/metadata/md5-cache/net-im/mattermost-desktop-bin-5.3.0_rc4-r1 b/metadata/md5-cache/net-im/mattermost-desktop-bin-5.3.0_rc5
index 0b5799f03fc2..5094c5f2542b 100644
--- a/metadata/md5-cache/net-im/mattermost-desktop-bin-5.3.0_rc4-r1
+++ b/metadata/md5-cache/net-im/mattermost-desktop-bin-5.3.0_rc5
@@ -7,6 +7,6 @@ INHERIT=desktop xdg
 LICENSE=Apache-2.0 GPL-2+ LGPL-2.1+ MIT
 RDEPEND=>=app-accessibility/at-spi2-core-2.46.0:2[X] dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss dev-libs/wayland media-libs/alsa-lib media-libs/mesa net-print/cups sys-apps/dbus sys-libs/glibc x11-libs/cairo 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/libdrm x11-libs/libxcb x11-libs/libxkbcommon x11-libs/pango
 SLOT=0
-SRC_URI=amd64? ( https://releases.mattermost.com/desktop/5.3.0-rc.4/mattermost-desktop-5.3.0-rc.4-linux-x64.tar.gz ) arm64? ( https://releases.mattermost.com/desktop/5.3.0-rc.4/mattermost-desktop-5.3.0-rc.4-linux-arm64.tar.gz )
+SRC_URI=amd64? ( https://releases.mattermost.com/desktop/5.3.0-rc.5/mattermost-desktop-5.3.0-rc.5-linux-x64.tar.gz ) arm64? ( https://releases.mattermost.com/desktop/5.3.0-rc.5/mattermost-desktop-5.3.0-rc.5-linux-arm64.tar.gz )
 _eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c4e0d977efe38f6d49d1a8a1265bfb32
diff --git a/metadata/md5-cache/net-irc/ngircd-26.1-r2 b/metadata/md5-cache/net-irc/ngircd-26.1-r2
index b777b4bea770..96963b736018 100644
--- a/metadata/md5-cache/net-irc/ngircd-26.1-r2
+++ b/metadata/md5-cache/net-irc/ngircd-26.1-r2
@@ -12,5 +12,5 @@ RDEPEND=acct-user/ngircd acct-group/ngircd irc-plus? ( virtual/libiconv ) ident?
 RESTRICT=test
 SLOT=0
 SRC_URI=https://ngircd.barton.de/pub/ngircd/ngircd-26.1.tar.gz verify-sig? ( https://ngircd.barton.de/pub/ngircd/ngircd-26.1.tar.gz.sig )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=9b179f7d68e07248f934d89e38bd5a9d
diff --git a/metadata/md5-cache/net-irc/weechat-3.6 b/metadata/md5-cache/net-irc/weechat-3.6
index cc18ad5013cf..e2303c1ccda3 100644
--- a/metadata/md5-cache/net-irc/weechat-3.6
+++ b/metadata/md5-cache/net-irc/weechat-3.6
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_s
 RESTRICT=!test? ( test )
 SLOT=0/3.6
 SRC_URI=https://weechat.org/files/src/weechat-3.6.tar.xz verify-sig? ( https://weechat.org/files/src/weechat-3.6.tar.xz.asc )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7359a4baa84cb343d1c3d0b8a47770fb
diff --git a/metadata/md5-cache/net-irc/weechat-3.7.1 b/metadata/md5-cache/net-irc/weechat-3.7.1
index 8fb67077622b..8a2653815fdd 100644
--- a/metadata/md5-cache/net-irc/weechat-3.7.1
+++ b/metadata/md5-cache/net-irc/weechat-3.7.1
@@ -13,5 +13,5 @@ REQUIRED_USE=lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_s
 RESTRICT=!test? ( test )
 SLOT=0/3.7.1
 SRC_URI=https://weechat.org/files/src/weechat-3.7.1.tar.xz verify-sig? ( https://weechat.org/files/src/weechat-3.7.1.tar.xz.asc )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=dc55d1507b7336012a8137ed644afaf5
diff --git a/metadata/md5-cache/net-irc/weechat-3.8 b/metadata/md5-cache/net-irc/weechat-3.8
index 11c9a87e05d0..67b50723588e 100644
--- a/metadata/md5-cache/net-irc/weechat-3.8
+++ b/metadata/md5-cache/net-irc/weechat-3.8
@@ -13,5 +13,5 @@ REQUIRED_USE=enchant? ( spell ) lua? ( ^^ ( lua_single_target_luajit lua_single_
 RESTRICT=!test? ( test )
 SLOT=0/3.8
 SRC_URI=https://weechat.org/files/src/weechat-3.8.tar.xz verify-sig? ( https://weechat.org/files/src/weechat-3.8.tar.xz.asc )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=70e2ecebf62c9136b0f57f1611559c19
diff --git a/metadata/md5-cache/net-libs/gnutls-3.7.6 b/metadata/md5-cache/net-libs/gnutls-3.7.6
index 587e4b83fa59..fef2e1042930 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.7.6
+++ b/metadata/md5-cache/net-libs/gnutls-3.7.6
@@ -13,5 +13,5 @@ REQUIRED_USE=test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 sec
 RESTRICT=!test? ( test )
 SLOT=0/30.30
 SRC_URI=mirror://gnupg/gnutls/v3.7/gnutls-3.7.6.tar.xz verify-sig? ( mirror://gnupg/gnutls/v3.7/gnutls-3.7.6.tar.xz.sig )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=5b27ec31095094bfbef036832cc15d37
diff --git a/metadata/md5-cache/net-libs/gnutls-3.7.7 b/metadata/md5-cache/net-libs/gnutls-3.7.7
index 75ef40c81b9e..7f6fef716c1d 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.7.7
+++ b/metadata/md5-cache/net-libs/gnutls-3.7.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 sec
 RESTRICT=!test? ( test )
 SLOT=0/30.30
 SRC_URI=mirror://gnupg/gnutls/v3.7/gnutls-3.7.7.tar.xz verify-sig? ( mirror://gnupg/gnutls/v3.7/gnutls-3.7.7.tar.xz.sig )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=c579cd8794892239a0d98a4c5211d98b
diff --git a/metadata/md5-cache/net-libs/gnutls-3.7.8 b/metadata/md5-cache/net-libs/gnutls-3.7.8
index ff654da1357f..e94a7d844217 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.7.8
+++ b/metadata/md5-cache/net-libs/gnutls-3.7.8
@@ -13,5 +13,5 @@ REQUIRED_USE=test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 sec
 RESTRICT=!test? ( test )
 SLOT=0/30.30
 SRC_URI=mirror://gnupg/gnutls/v3.7/gnutls-3.7.8.tar.xz verify-sig? ( mirror://gnupg/gnutls/v3.7/gnutls-3.7.8.tar.xz.sig )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=4a5ebbd0a51a413aaac991759f3db59a
diff --git a/metadata/md5-cache/net-libs/gnutls-3.7.9 b/metadata/md5-cache/net-libs/gnutls-3.7.9
index 120a3a145d42..376a91dfebd6 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.7.9
+++ b/metadata/md5-cache/net-libs/gnutls-3.7.9
@@ -13,5 +13,5 @@ REQUIRED_USE=test-full? ( cxx dane doc examples guile idn nls openssl pkcs11 sec
 RESTRICT=!test? ( test )
 SLOT=0/30.30
 SRC_URI=mirror://gnupg/gnutls/v3.7/gnutls-3.7.9.tar.xz verify-sig? ( mirror://gnupg/gnutls/v3.7/gnutls-3.7.9.tar.xz.sig )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=3204e9683b45ea2f8f4f6a71671e0178
diff --git a/metadata/md5-cache/net-libs/gnutls-3.8.0 b/metadata/md5-cache/net-libs/gnutls-3.8.0
index 48205eae6ec3..1e6aabbd0f6e 100644
--- a/metadata/md5-cache/net-libs/gnutls-3.8.0
+++ b/metadata/md5-cache/net-libs/gnutls-3.8.0
@@ -13,5 +13,5 @@ REQUIRED_USE=test-full? ( cxx dane doc examples idn nls openssl pkcs11 seccomp t
 RESTRICT=!test? ( test )
 SLOT=0/30.30
 SRC_URI=mirror://gnupg/gnutls/v3.8/gnutls-3.8.0.tar.xz verify-sig? ( mirror://gnupg/gnutls/v3.8/gnutls-3.8.0.tar.xz.sig )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=d03518086625eb9b111689de78cdafcf
diff --git a/metadata/md5-cache/net-libs/gsoap-2.8.124 b/metadata/md5-cache/net-libs/gsoap-2.8.126
index 85fef3f3d03a..720f6cd1a02c 100644
--- a/metadata/md5-cache/net-libs/gsoap-2.8.124
+++ b/metadata/md5-cache/net-libs/gsoap-2.8.126
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~x86
 LICENSE=|| ( gSOAP GPL-2+-with-openssl-exception ) GPL-2+
 RDEPEND=sys-libs/zlib gnutls? ( net-libs/gnutls ) ssl? ( !gnutls? ( dev-libs/openssl:0= ) gnutls? ( net-libs/gnutls:0= ) )
 SLOT=0
-SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.124.zip
+SRC_URI=mirror://sourceforge/gsoap2/gsoap_2.8.126.zip
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=43ee2d2f47f4d866e1439b3e25ab903e
+_md5_=6a80d23359d14dd9609df5991f2353c7
diff --git a/metadata/md5-cache/net-libs/libmnl-1.0.5 b/metadata/md5-cache/net-libs/libmnl-1.0.5
index d7602d977b37..d3b8ab49451c 100644
--- a/metadata/md5-cache/net-libs/libmnl-1.0.5
+++ b/metadata/md5-cache/net-libs/libmnl-1.0.5
@@ -10,5 +10,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=LGPL-2.1
 SLOT=0/0.2.0
 SRC_URI=https://www.netfilter.org/projects/libmnl/files/libmnl-1.0.5.tar.bz2 verify-sig? ( https://www.netfilter.org/projects/libmnl/files/libmnl-1.0.5.tar.bz2.sig )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=c0d557f29d0306be6dcb14daf9ed6653
diff --git a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3 b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
index 8bfc3129264f..b90ee9ce104c 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
+++ b/metadata/md5-cache/net-libs/libnetfilter_acct-1.0.3
@@ -11,5 +11,5 @@ LICENSE=LGPL-2.1
 RDEPEND=net-libs/libmnl
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-1.0.3.tar.bz2 verify-sig? ( https://www.netfilter.org/projects/libnetfilter_acct/files/libnetfilter_acct-1.0.3.tar.bz2.sig )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=8815aa62e3845e5655e0f7ecdc89e717
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.9 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.9
index 0f9f6da46bc0..f5e7a8b16533 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.9
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.9
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9.tar.bz2 verify-sig? ( https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9.tar.bz2.sig )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=797776c4cb13aed1cf201b3803a0b879
diff --git a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.9-r1 b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.9-r1
index d9973cbf815c..502dffd1dc55 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.9-r1
+++ b/metadata/md5-cache/net-libs/libnetfilter_conntrack-1.0.9-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-1.0.0
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9.tar.bz2 verify-sig? ( https://www.netfilter.org/projects/libnetfilter_conntrack/files/libnetfilter_conntrack-1.0.9.tar.bz2.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=39051b33ccd89b605a71dca0665fae33
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.1-r1 b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.1-r1
index 53fe1b5c0df9..1cc519bfe1eb 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.1-r1
+++ b/metadata/md5-cache/net-libs/libnetfilter_cthelper-1.0.1-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl:=
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.1.tar.bz2 verify-sig? ( https://www.netfilter.org/projects/libnetfilter_cthelper/files/libnetfilter_cthelper-1.0.1.tar.bz2.sig )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=17994ebc52d9f36223f6815eb14b8dba
diff --git a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.1 b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.1
index 1ecf2b18de87..95a29c5894fc 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.1
+++ b/metadata/md5-cache/net-libs/libnetfilter_cttimeout-1.0.1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=net-libs/libmnl:=
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.1.tar.bz2 verify-sig? ( https://www.netfilter.org/projects/libnetfilter_cttimeout/files/libnetfilter_cttimeout-1.0.1.tar.bz2.sig )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=4ae209f33c9a927c10eed9098ec4bf53
diff --git a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.2 b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.2
index fd4e98d24c72..152f6f079837 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_log-1.0.2
+++ b/metadata/md5-cache/net-libs/libnetfilter_log-1.0.2
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libnfnetlink-1.0.0 >=net-libs/libmnl-1.0.3
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-1.0.2.tar.bz2 verify-sig? ( https://www.netfilter.org/projects/libnetfilter_log/files/libnetfilter_log-1.0.2.tar.bz2.sig )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=02bf3ef8bb30198023401d3c50916e36
diff --git a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5 b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
index 7c4b98baf083..086e1e058f3b 100644
--- a/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
+++ b/metadata/md5-cache/net-libs/libnetfilter_queue-1.0.5
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=>=net-libs/libmnl-1.0.3 >=net-libs/libnfnetlink-0.0.41
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.5.tar.bz2 verify-sig? ( https://www.netfilter.org/projects/libnetfilter_queue/files/libnetfilter_queue-1.0.5.tar.bz2.sig )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=545cdb3f8ef71c1bb6e2b1f119d5d16f
diff --git a/metadata/md5-cache/net-libs/libnfnetlink-1.0.2 b/metadata/md5-cache/net-libs/libnfnetlink-1.0.2
index 97cce48bb092..6441bc60b80e 100644
--- a/metadata/md5-cache/net-libs/libnfnetlink-1.0.2
+++ b/metadata/md5-cache/net-libs/libnfnetlink-1.0.2
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-1.0.2.tar.bz2 verify-sig? ( https://www.netfilter.org/projects/libnfnetlink/files/libnfnetlink-1.0.2.tar.bz2.sig )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=c1d9e74eec4848c105822cd8099e1bee
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.2.4 b/metadata/md5-cache/net-libs/libnftnl-1.2.4
index 796cf6dbb0eb..dc53587e1154 100644
--- a/metadata/md5-cache/net-libs/libnftnl-1.2.4
+++ b/metadata/md5-cache/net-libs/libnftnl-1.2.4
@@ -12,5 +12,5 @@ RDEPEND=>=net-libs/libmnl-1.0.4:=
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.2.4.tar.bz2 verify-sig? ( https://netfilter.org/projects/libnftnl/files/libnftnl-1.2.4.tar.bz2.sig )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=283c55fdb7d651d7d67f722460891aa8
diff --git a/metadata/md5-cache/net-libs/libnftnl-1.2.5 b/metadata/md5-cache/net-libs/libnftnl-1.2.5
index b11083c13b9f..41d21f45e8f2 100644
--- a/metadata/md5-cache/net-libs/libnftnl-1.2.5
+++ b/metadata/md5-cache/net-libs/libnftnl-1.2.5
@@ -12,5 +12,5 @@ RDEPEND=>=net-libs/libmnl-1.0.4:=
 RESTRICT=!test? ( test )
 SLOT=0/11
 SRC_URI=https://netfilter.org/projects/libnftnl/files/libnftnl-1.2.5.tar.xz verify-sig? ( https://netfilter.org/projects/libnftnl/files/libnftnl-1.2.5.tar.xz.sig )
-_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=87881d836d4ba5e47a21bbb0861acb4a
diff --git a/metadata/md5-cache/net-libs/libnftnl-9999 b/metadata/md5-cache/net-libs/libnftnl-9999
index bc9adeb60ec3..8af3fd7a06e2 100644
--- a/metadata/md5-cache/net-libs/libnftnl-9999
+++ b/metadata/md5-cache/net-libs/libnftnl-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=>=net-libs/libmnl-1.0.4:=
 RESTRICT=!test? ( test )
 SLOT=0/11
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=87881d836d4ba5e47a21bbb0861acb4a
diff --git a/metadata/md5-cache/net-libs/libpcap-1.10.1-r2 b/metadata/md5-cache/net-libs/libpcap-1.10.1-r2
index ee38c234aaeb..5f88b0f378df 100644
--- a/metadata/md5-cache/net-libs/libpcap-1.10.1-r2
+++ b/metadata/md5-cache/net-libs/libpcap-1.10.1-r2
@@ -12,5 +12,5 @@ RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=!test? ( test )
 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	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=6528d8d7b82d45a672c57ce6e8e0732e
diff --git a/metadata/md5-cache/net-libs/libpcap-1.10.2 b/metadata/md5-cache/net-libs/libpcap-1.10.2
index 732406435800..3cf25ba8272b 100644
--- a/metadata/md5-cache/net-libs/libpcap-1.10.2
+++ b/metadata/md5-cache/net-libs/libpcap-1.10.2
@@ -12,5 +12,5 @@ RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/libpcap-1.10.2.tar.gz verify-sig? ( https://www.tcpdump.org/release/libpcap-1.10.2.tar.gz.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=bc271f9e76ee3f2a76c5cbf2d99cb8d2
diff --git a/metadata/md5-cache/net-libs/libpcap-1.10.3 b/metadata/md5-cache/net-libs/libpcap-1.10.3
index 568820d7fb55..545901e40b4b 100644
--- a/metadata/md5-cache/net-libs/libpcap-1.10.3
+++ b/metadata/md5-cache/net-libs/libpcap-1.10.3
@@ -12,5 +12,5 @@ RDEPEND=bluetooth? ( net-wireless/bluez:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz verify-sig? ( https://www.tcpdump.org/release/libpcap-1.10.3.tar.gz.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=bfb9c0794908a4f003b88689eacd6896
diff --git a/metadata/md5-cache/net-libs/miniupnpc-2.2.4 b/metadata/md5-cache/net-libs/miniupnpc-2.2.4
index 3afe6f2f6a37..d03bbe62eee2 100644
--- a/metadata/md5-cache/net-libs/miniupnpc-2.2.4
+++ b/metadata/md5-cache/net-libs/miniupnpc-2.2.4
@@ -9,5 +9,5 @@ KEYWORDS=amd64 arm arm64 hppa ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=BSD
 SLOT=0/17
 SRC_URI=https://miniupnp.tuxfamily.org/files/miniupnpc-2.2.4.tar.gz verify-sig? ( https://miniupnp.tuxfamily.org/files/miniupnpc-2.2.4.tar.gz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=d45a945bacfaa5afb40712500e37f206
diff --git a/metadata/md5-cache/net-mail/hydroxide-0.2.23 b/metadata/md5-cache/net-mail/hydroxide-0.2.23
index 298088c536e8..866e18ffe1cb 100644
--- a/metadata/md5-cache/net-mail/hydroxide-0.2.23
+++ b/metadata/md5-cache/net-mail/hydroxide-0.2.23
@@ -10,5 +10,5 @@ LICENSE=MIT BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/emersion/hydroxide/releases/download/v0.2.23/hydroxide-0.2.23.tar.gz verify-sig? ( https://github.com/emersion/hydroxide/releases/download/v0.2.23/hydroxide-0.2.23.tar.gz.sig ) https://gitlab.com/sevz17/go-deps/-/raw/main/hydroxide-0.2.23-deps.tar.xz
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=a2909025bb40fc8dfd7d4407c20782d2
diff --git a/metadata/md5-cache/net-mail/hydroxide-0.2.24 b/metadata/md5-cache/net-mail/hydroxide-0.2.24
index 27c726ed8c1c..fdea2d5f432c 100644
--- a/metadata/md5-cache/net-mail/hydroxide-0.2.24
+++ b/metadata/md5-cache/net-mail/hydroxide-0.2.24
@@ -10,5 +10,5 @@ LICENSE=MIT BSD
 RESTRICT=strip
 SLOT=0
 SRC_URI=https://github.com/emersion/hydroxide/releases/download/v0.2.24/hydroxide-0.2.24.tar.gz verify-sig? ( https://github.com/emersion/hydroxide/releases/download/v0.2.24/hydroxide-0.2.24.tar.gz.sig ) https://gitlab.com/sevz17/go-deps/-/raw/main/hydroxide-0.2.24-deps.tar.xz
-_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=go-module	f2c9bcab49079a176b3ae061c94bb344	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=eea60eb49e4dcdbd9f822e54167345d8
diff --git a/metadata/md5-cache/net-misc/asterisk-18.15.1 b/metadata/md5-cache/net-misc/asterisk-18.17.0
index cdf04d6745ca..2bbcf903742b 100644
--- a/metadata/md5-cache/net-misc/asterisk-18.15.1
+++ b/metadata/md5-cache/net-misc/asterisk-18.17.0
@@ -11,6 +11,6 @@ LICENSE=GPL-2
 RDEPEND=acct-user/asterisk acct-group/asterisk dev-db/sqlite:3 dev-libs/popt >=dev-libs/jansson-2.11:= dev-libs/libedit dev-libs/libxml2:2 dev-libs/libxslt sys-apps/util-linux sys-libs/zlib virtual/libcrypt:= alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez:= ) calendar? ( net-libs/neon:= dev-libs/libical:= dev-libs/iksemel ) caps? ( sys-libs/libcap ) blocks? ( sys-libs/blocksruntime ) cluster? ( sys-cluster/corosync ) codec2? ( media-libs/codec2:= ) curl? ( >=net-misc/curl-7.10.1 ) dahdi? ( net-libs/libpri net-misc/dahdi-tools ) freetds? ( dev-db/freetds ) gtalk? ( dev-libs/iksemel ) http? ( dev-libs/gmime:2.6 ) iconv? ( virtual/libiconv ) ilbc? ( media-libs/libilbc ) ldap? ( net-nds/openldap ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) mysql? ( dev-db/mysql-connector-c:= ) newt? ( dev-libs/newt ) odbc? ( dev-db/unixODBC ) portaudio? ( media-libs/portaudio ) postgres? ( dev-db/postgresql:* ) radius? ( net-dialup/freeradius-client ) snmp? ( net-analyzer/net-snmp:= ) span? ( media-libs/spandsp ) speex? ( media-libs/libogg media-libs/speex media-libs/speexdsp ) srtp? ( net-libs/libsrtp ) ssl? ( !libressl? ( dev-libs/openssl:0= ) libressl? ( >=dev-libs/libressl-3.5.0:0= ) ) systemd? ( sys-apps/systemd ) !systemd? ( !sys-apps/systemd ) unbound? ( net-dns/unbound ) vorbis? ( media-libs/libogg media-libs/libvorbis ) voicemail_storage_imap? ( virtual/imap-c-client ) xmpp? ( dev-libs/iksemel ) net-misc/asterisk-core-sounds net-misc/asterisk-extra-sounds net-misc/asterisk-moh-opsound selinux? ( sec-policy/selinux-asterisk ) syslog? ( virtual/logger ) virtual/tmpfiles
 REQUIRED_USE=gtalk? ( xmpp ) lua? ( ^^ ( lua_single_target_luajit lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) voicemail_storage_odbc? ( odbc )
 SLOT=0/18
-SRC_URI=https://github.com/asterisk/asterisk/archive/refs/tags/18.15.1.tar.gz -> asterisk-18.15.1.tar.gz https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.12.1/pjproject-2.12.1.tar.bz2
+SRC_URI=https://github.com/asterisk/asterisk/archive/refs/tags/18.17.0.tar.gz -> asterisk-18.17.0.tar.gz https://raw.githubusercontent.com/asterisk/third-party/master/pjproject/2.12.1/pjproject-2.12.1.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=37265394f3d439892ad8707650a91839
+_md5_=5ce1d5151ddf95ba6b7a21e5e85a8e5b
diff --git a/metadata/md5-cache/net-misc/chrony-4.3-r2 b/metadata/md5-cache/net-misc/chrony-4.3-r2
index 7ed8b65ea23f..874fb03a0fbf 100644
--- a/metadata/md5-cache/net-misc/chrony-4.3-r2
+++ b/metadata/md5-cache/net-misc/chrony-4.3-r2
@@ -12,5 +12,5 @@ RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) nettle? ( dev-lib
 REQUIRED_USE=sechash? ( || ( nettle nss libtomcrypt ) ) nettle? ( !nss ) nss? ( !nettle ) libtomcrypt? ( !nettle !nss ) !sechash? ( !nss ) !sechash? ( !nts? ( !nettle ) )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/chrony/chrony-4.3.tar.gz verify-sig? ( https://download.tuxfamily.org/chrony/chrony-4.3-tar-gz-asc.txt -> chrony-4.3.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=e937dc57a8c0d73640f1aadbc4787e29
diff --git a/metadata/md5-cache/net-misc/chrony-4.3-r4 b/metadata/md5-cache/net-misc/chrony-4.3-r4
index 8234c91aa404..fc42d52ec7a9 100644
--- a/metadata/md5-cache/net-misc/chrony-4.3-r4
+++ b/metadata/md5-cache/net-misc/chrony-4.3-r4
@@ -12,5 +12,5 @@ RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) nettle? ( dev-lib
 REQUIRED_USE=sechash? ( || ( nettle nss libtomcrypt ) ) nettle? ( !nss ) nss? ( !nettle ) libtomcrypt? ( !nettle !nss ) !sechash? ( !nss ) !sechash? ( !nts? ( !nettle ) )
 SLOT=0
 SRC_URI=https://download.tuxfamily.org/chrony/chrony-4.3.tar.gz verify-sig? ( https://download.tuxfamily.org/chrony/chrony-4.3-tar-gz-asc.txt -> chrony-4.3.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=4c1a1c79d2689df8da73612c505a72c8
diff --git a/metadata/md5-cache/net-misc/curl-7.87.0-r2 b/metadata/md5-cache/net-misc/curl-7.87.0-r2
index 141253b01e25..8f9bc035b070 100644
--- a/metadata/md5-cache/net-misc/curl-7.87.0-r2
+++ b/metadata/md5-cache/net-misc/curl-7.87.0-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.se/download/curl-7.87.0.tar.xz verify-sig? ( https://curl.se/download/curl-7.87.0.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=29c6c62753b33c5c3084e917d379ee40
diff --git a/metadata/md5-cache/net-misc/curl-7.88.1 b/metadata/md5-cache/net-misc/curl-7.88.1
index a3854e5d3f3b..11cf9e101f50 100644
--- a/metadata/md5-cache/net-misc/curl-7.88.1
+++ b/metadata/md5-cache/net-misc/curl-7.88.1
@@ -13,5 +13,5 @@ REQUIRED_USE=ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.se/download/curl-7.88.1.tar.xz verify-sig? ( https://curl.se/download/curl-7.88.1.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=c4e33846117802f6a8cfd04b606df5dc
diff --git a/metadata/md5-cache/net-misc/curl-7.88.1-r1 b/metadata/md5-cache/net-misc/curl-7.88.1-r1
index 2ac7a86a9d48..e11452bc4014 100644
--- a/metadata/md5-cache/net-misc/curl-7.88.1-r1
+++ b/metadata/md5-cache/net-misc/curl-7.88.1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=ssl? ( ^^ ( curl_ssl_gnutls curl_ssl_mbedtls curl_ssl_nss curl_ssl_
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://curl.se/download/curl-7.88.1.tar.xz verify-sig? ( https://curl.se/download/curl-7.88.1.tar.xz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=94537221c401f33ad2e3fb83e7fac8c2
diff --git a/metadata/md5-cache/net-misc/dropbear-2022.83 b/metadata/md5-cache/net-misc/dropbear-2022.83
index 35e4f6bbc63e..8cf1711967fc 100644
--- a/metadata/md5-cache/net-misc/dropbear-2022.83
+++ b/metadata/md5-cache/net-misc/dropbear-2022.83
@@ -13,5 +13,5 @@ REQUIRED_USE=pam? ( !static )
 RESTRICT=!test? ( test ) test
 SLOT=0
 SRC_URI=https://matt.ucc.asn.au/dropbear/releases/dropbear-2022.83.tar.bz2 https://matt.ucc.asn.au/dropbear/testing/dropbear-2022.83.tar.bz2 verify-sig? ( https://matt.ucc.asn.au/dropbear/releases/dropbear-2022.83.tar.bz2.asc https://matt.ucc.asn.au/dropbear/testing/dropbear-2022.83.tar.bz2.asc )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pam	01b77091d5b6560b0aeafa7fbb1bd818	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4269d59cc1fb52aecb9d177b114090c4
diff --git a/metadata/md5-cache/net-misc/gmid-1.8.5 b/metadata/md5-cache/net-misc/gmid-1.8.5
index 6b0d3d5d6125..956bb5157f82 100644
--- a/metadata/md5-cache/net-misc/gmid-1.8.5
+++ b/metadata/md5-cache/net-misc/gmid-1.8.5
@@ -12,5 +12,5 @@ RDEPEND=acct-user/gemini dev-libs/imsg-compat dev-libs/libevent:= dev-libs/libre
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/omar-polo/gmid/releases/download/1.8.5/gmid-1.8.5.tar.gz verify-sig? ( https://github.com/omar-polo/gmid/releases/download/1.8.5/SHA256.sig -> gmid-1.8.5.sha.sig )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	f5f6841876ca76e24b95ff7b02b8381c	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	f5f6841876ca76e24b95ff7b02b8381c	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=8aa6a27bdefcb2518f8e0a5b872a86f3
diff --git a/metadata/md5-cache/net-misc/gmid-1.8.6 b/metadata/md5-cache/net-misc/gmid-1.8.6
index 0ad3a619864b..5def05fec877 100644
--- a/metadata/md5-cache/net-misc/gmid-1.8.6
+++ b/metadata/md5-cache/net-misc/gmid-1.8.6
@@ -12,5 +12,5 @@ RDEPEND=acct-user/gemini dev-libs/imsg-compat dev-libs/libevent:= dev-libs/libre
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/omar-polo/gmid/releases/download/1.8.6/gmid-1.8.6.tar.gz verify-sig? ( https://github.com/omar-polo/gmid/releases/download/1.8.6/SHA256.sig -> gmid-1.8.6.sha.sig )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	f5f6841876ca76e24b95ff7b02b8381c	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	f5f6841876ca76e24b95ff7b02b8381c	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=8aa6a27bdefcb2518f8e0a5b872a86f3
diff --git a/metadata/md5-cache/net-misc/gmid-9999 b/metadata/md5-cache/net-misc/gmid-9999
index 8101dceb8c27..acf7fdc829c6 100644
--- a/metadata/md5-cache/net-misc/gmid-9999
+++ b/metadata/md5-cache/net-misc/gmid-9999
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=acct-user/gemini dev-libs/imsg-compat dev-libs/libevent:= dev-libs/libretls:= dev-libs/openssl:= !elibc_Darwin? ( dev-libs/libbsd )
 RESTRICT=!test? ( test )
 SLOT=0
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	f5f6841876ca76e24b95ff7b02b8381c	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	f5f6841876ca76e24b95ff7b02b8381c	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=8aa6a27bdefcb2518f8e0a5b872a86f3
diff --git a/metadata/md5-cache/net-misc/gnome-ssh-askpass-9.2_p1 b/metadata/md5-cache/net-misc/gnome-ssh-askpass-9.2_p1
index 9d01cdfa88ff..c25890cd4d33 100644
--- a/metadata/md5-cache/net-misc/gnome-ssh-askpass-9.2_p1
+++ b/metadata/md5-cache/net-misc/gnome-ssh-askpass-9.2_p1
@@ -11,5 +11,5 @@ RDEPEND=dev-libs/glib:2 x11-libs/gtk+:3
 RESTRICT=test
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.2p1.tar.gz verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.2p1.tar.gz.asc )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=8cedeb9f82832360a9eb212458fe74ce
diff --git a/metadata/md5-cache/net-misc/memcached-1.6.19 b/metadata/md5-cache/net-misc/memcached-1.6.19
new file mode 100644
index 000000000000..4b5234eb653e
--- /dev/null
+++ b/metadata/md5-cache/net-misc/memcached-1.6.19
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) ssl? ( >=dev-libs/openssl-1.1.0g:= ) acct-user/memcached test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )
+DESCRIPTION=High-performance, distributed memory object caching system
+EAPI=7
+HOMEPAGE=http://memcached.org/
+INHERIT=autotools flag-o-matic systemd
+IUSE=debug sasl seccomp selinux slabs-reassign ssl test
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=>=dev-libs/libevent-1.4:= dev-lang/perl sasl? ( dev-libs/cyrus-sasl ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-memcached ) ssl? ( >=dev-libs/openssl-1.1.0g:= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://www.memcached.org/files/memcached-1.6.19.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=4ff0bbfffd5def4edce02bda5626bb9c
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.5.20211105 b/metadata/md5-cache/net-misc/minissdpd-1.5.20211105
index cefbcf1411e9..00b1cfc3e6bd 100644
--- a/metadata/md5-cache/net-misc/minissdpd-1.5.20211105
+++ b/metadata/md5-cache/net-misc/minissdpd-1.5.20211105
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libnfnetlink || ( net-misc/miniupnpd net-libs/miniupnpc )
 SLOT=0
 SRC_URI=https://miniupnp.tuxfamily.org/files/minissdpd-1.5.20211105.tar.gz verify-sig? ( https://miniupnp.tuxfamily.org/files/minissdpd-1.5.20211105.tar.gz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=2fe6a8f6478ba792232a56f5b1dcd1e7
diff --git a/metadata/md5-cache/net-misc/minissdpd-1.6.0 b/metadata/md5-cache/net-misc/minissdpd-1.6.0
index 95af6f12956e..30107f5ff6d3 100644
--- a/metadata/md5-cache/net-misc/minissdpd-1.6.0
+++ b/metadata/md5-cache/net-misc/minissdpd-1.6.0
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=net-libs/libnfnetlink || ( net-misc/miniupnpd net-libs/miniupnpc )
 SLOT=0
 SRC_URI=https://miniupnp.tuxfamily.org/files/minissdpd-1.6.0.tar.gz verify-sig? ( https://miniupnp.tuxfamily.org/files/minissdpd-1.6.0.tar.gz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=ef1fc4516db2cd6bf18bbd014609f8b2
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.3.1 b/metadata/md5-cache/net-misc/miniupnpd-2.3.1
index 290b1d170778..8426934ba8be 100644
--- a/metadata/md5-cache/net-misc/miniupnpd-2.3.1
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.3.1
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6(+)?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
 SLOT=0
 SRC_URI=https://miniupnp.tuxfamily.org/files/miniupnpd-2.3.1.tar.gz verify-sig? ( https://miniupnp.tuxfamily.org/files/miniupnpd-2.3.1.tar.gz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=9c68e3636e977d850d7c4f060fc50cf0
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.3.2 b/metadata/md5-cache/net-misc/miniupnpd-2.3.2
index 97e5fac75c77..79d03c189942 100644
--- a/metadata/md5-cache/net-misc/miniupnpd-2.3.2
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.3.2
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6(+)?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
 SLOT=0
 SRC_URI=https://miniupnp.tuxfamily.org/files/miniupnpd-2.3.2.tar.gz verify-sig? ( https://miniupnp.tuxfamily.org/files/miniupnpd-2.3.2.tar.gz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=3816f92732a15c98c97a279524cc912c
diff --git a/metadata/md5-cache/net-misc/miniupnpd-2.3.3 b/metadata/md5-cache/net-misc/miniupnpd-2.3.3
index 0cbe992abccc..a940e20057b8 100644
--- a/metadata/md5-cache/net-misc/miniupnpd-2.3.3
+++ b/metadata/md5-cache/net-misc/miniupnpd-2.3.3
@@ -11,5 +11,5 @@ LICENSE=BSD
 RDEPEND=dev-libs/gmp:0= sys-apps/util-linux:= dev-libs/openssl:0= !nftables? ( >=net-firewall/iptables-1.4.6:0=[ipv6(+)?] net-libs/libnfnetlink:= net-libs/libmnl:= ) nftables? ( net-firewall/nftables net-libs/libnftnl:= net-libs/libmnl:= )
 SLOT=0
 SRC_URI=https://miniupnp.tuxfamily.org/files/miniupnpd-2.3.3.tar.gz verify-sig? ( https://miniupnp.tuxfamily.org/files/miniupnpd-2.3.3.tar.gz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=3816f92732a15c98c97a279524cc912c
diff --git a/metadata/md5-cache/net-misc/openssh-9.1_p1-r1 b/metadata/md5-cache/net-misc/openssh-9.1_p1-r1
index 03fafc4802d9..753ffcfd3a2b 100644
--- a/metadata/md5-cache/net-misc/openssh-9.1_p1-r1
+++ b/metadata/md5-cache/net-misc/openssh-9.1_p1-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=hpn? ( ssl ) ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pa
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.1p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.1p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.1_p1-hpn-15.2-glue.patch.xz ) X509? ( https://roumenpetrov.info/openssh/x509-14.0.1/openssh-9.1p1+x509-14.0.1.diff.gz https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.1_p1-X509-glue-14.0.1.patch.xz hpn? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.1_p1-hpn-15.2-X509-14.0.1-glue.patch.xz ) ) verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.1p1.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=5c5bcb497259126f594dd9eae759d96f
diff --git a/metadata/md5-cache/net-misc/openssh-9.2_p1 b/metadata/md5-cache/net-misc/openssh-9.2_p1
index 58743779a2a4..14860c4121c9 100644
--- a/metadata/md5-cache/net-misc/openssh-9.2_p1
+++ b/metadata/md5-cache/net-misc/openssh-9.2_p1
@@ -13,5 +13,5 @@ REQUIRED_USE=hpn? ( ssl ) ldns? ( ssl ) pie? ( !static ) static? ( !kerberos !pa
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://openbsd/OpenSSH/portable/openssh-9.2p1.tar.gz sctp? ( https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.2p1-sctp-1.2.patch.xz ) hpn? ( mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-DynWinNoneSwitch-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-AES-CTR-15.2.diff mirror://sourceforge/project/hpnssh/Patches/HPN-SSH%2015v2%208.5p1/openssh-8_5_P1-hpn-PeakTput-15.2.diff https://dev.gentoo.org/~chutzpah/dist/openssh/openssh-9.2_p1-hpn-15.2-glue.patch.xz ) verify-sig? ( mirror://openbsd/OpenSSH/portable/openssh-9.2p1.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	user-info	83547b4df3e1ba5a6bf91a0837eaa664	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=28c7a894401a19ddd1296f2e8fd13e09
diff --git a/metadata/md5-cache/net-misc/sb-hosts-3.12.11 b/metadata/md5-cache/net-misc/sb-hosts-3.12.13
index 2c5563326173..30b2e9057bf2 100644
--- a/metadata/md5-cache/net-misc/sb-hosts-3.12.11
+++ b/metadata/md5-cache/net-misc/sb-hosts-3.12.13
@@ -6,5 +6,5 @@ IUSE=fakenews gambling porn social
 KEYWORDS=amd64 x86
 LICENSE=MIT
 SLOT=0
-SRC_URI=https://github.com/StevenBlack/hosts/archive/3.12.11.tar.gz -> sb-hosts-3.12.11.tar.gz
+SRC_URI=https://github.com/StevenBlack/hosts/archive/3.12.13.tar.gz -> sb-hosts-3.12.13.tar.gz
 _md5_=8d78b4c001cbecede5acc35c1c000705
diff --git a/metadata/md5-cache/net-misc/sock-1.1-r1 b/metadata/md5-cache/net-misc/sock-1.1-r1
deleted file mode 100644
index bede9c73bfbf..000000000000
--- a/metadata/md5-cache/net-misc/sock-1.1-r1
+++ /dev/null
@@ -1,9 +0,0 @@
-DEFINED_PHASES=install
-DESCRIPTION=A shell interface to network sockets
-EAPI=7
-HOMEPAGE=http://atrey.karlin.mff.cuni.cz/~mj/linux.shtml
-KEYWORDS=amd64 sparc x86
-LICENSE=GPL-2
-SLOT=0
-SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/sock-1.1.tar.gz
-_md5_=90474923b7174a8b7d09ebe0b4aadca3
diff --git a/metadata/md5-cache/net-misc/sock-1.1-r2 b/metadata/md5-cache/net-misc/sock-1.1-r2
new file mode 100644
index 000000000000..f4ccebcaa908
--- /dev/null
+++ b/metadata/md5-cache/net-misc/sock-1.1-r2
@@ -0,0 +1,12 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=install prepare
+DESCRIPTION=A shell interface to network sockets
+EAPI=8
+HOMEPAGE=http://atrey.karlin.mff.cuni.cz/~mj/linux.shtml
+INHERIT=autotools
+KEYWORDS=amd64 sparc x86
+LICENSE=GPL-2
+SLOT=0
+SRC_URI=ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/sock-1.1.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=9addafa40570b8840d3c10cb774f2d1e
diff --git a/metadata/md5-cache/net-misc/turbovnc-3.0.2 b/metadata/md5-cache/net-misc/turbovnc-3.0.2
index 06702cb64f93..c4425f7d75bd 100644
--- a/metadata/md5-cache/net-misc/turbovnc-3.0.2
+++ b/metadata/md5-cache/net-misc/turbovnc-3.0.2
@@ -12,5 +12,5 @@ RDEPEND=x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-misc/xkeyboard-confi
 REQUIRED_USE=|| ( server viewer )
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/turbovnc/files/3.0.2/turbovnc-3.0.2.tar.gz/download -> turbovnc-3.0.2.tar.gz verify-sig? ( https://sourceforge.net/projects/turbovnc/files/3.0.2/turbovnc-3.0.2.tar.gz.sig/download -> turbovnc-3.0.2.tar.gz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=11995df906d388e715f54229fc5cbaba
diff --git a/metadata/md5-cache/net-misc/turbovnc-3.0.3 b/metadata/md5-cache/net-misc/turbovnc-3.0.3
index 2bcaa777448e..1cfc2c95650a 100644
--- a/metadata/md5-cache/net-misc/turbovnc-3.0.3
+++ b/metadata/md5-cache/net-misc/turbovnc-3.0.3
@@ -12,5 +12,5 @@ RDEPEND=x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-misc/xkeyboard-confi
 REQUIRED_USE=|| ( server viewer )
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/turbovnc/files/3.0.3/turbovnc-3.0.3.tar.gz/download -> turbovnc-3.0.3.tar.gz verify-sig? ( https://sourceforge.net/projects/turbovnc/files/3.0.3/turbovnc-3.0.3.tar.gz.sig/download -> turbovnc-3.0.3.tar.gz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=11995df906d388e715f54229fc5cbaba
diff --git a/metadata/md5-cache/net-nntp/inn-2.6.5 b/metadata/md5-cache/net-nntp/inn-2.6.5
index 873265dd9c30..77f600949970 100644
--- a/metadata/md5-cache/net-nntp/inn-2.6.5
+++ b/metadata/md5-cache/net-nntp/inn-2.6.5
@@ -12,5 +12,5 @@ RDEPEND=app-crypt/gnupg sys-libs/pam virtual/libcrypt:= !berkdb? ( sys-libs/gdbm
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) ) ?? ( low-memory largefile )
 SLOT=0
 SRC_URI=https://archives.eyrie.org/software/inn/inn-2.6.5.tar.gz verify-sig? ( https://archives.eyrie.org/software/inn/inn-2.6.5.tar.gz.asc )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	perl-functions	c3fca037246e877693badea0df3b0ef8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	perl-functions	c3fca037246e877693badea0df3b0ef8	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=f208198b9b5c4e6defbb12ca22c8f982
diff --git a/metadata/md5-cache/net-p2p/ncdc-1.23.1 b/metadata/md5-cache/net-p2p/ncdc-1.23.1
index 61e4c320fd99..787da5fb0810 100644
--- a/metadata/md5-cache/net-p2p/ncdc-1.23.1
+++ b/metadata/md5-cache/net-p2p/ncdc-1.23.1
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=app-arch/bzip2 dev-db/sqlite:3 >=dev-libs/glib-2.74:2 >=net-libs/gnutls-3:= sys-libs/ncurses:=[unicode(+)] sys-libs/zlib geoip? ( dev-libs/libmaxminddb:= )
 SLOT=0
 SRC_URI=https://dev.yorhel.nl/download/ncdc-1.23.1.tar.gz verify-sig? ( https://dev.yorhel.nl/download/ncdc-1.23.1.tar.gz.asc )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=a4c46d4c27db7d308a10be8fd2a52bac
diff --git a/metadata/md5-cache/net-print/cnijfilter2-6.50 b/metadata/md5-cache/net-print/cnijfilter2-6.50
index a9fe2d3b899c..82dc77e7593d 100644
--- a/metadata/md5-cache/net-print/cnijfilter2-6.50
+++ b/metadata/md5-cache/net-print/cnijfilter2-6.50
@@ -1,5 +1,5 @@
 BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=configure install prepare
+DEFINED_PHASES=configure install prepare setup
 DEPEND=virtual/libusb:1 dev-libs/libxml2 net-print/cups
 DESCRIPTION=IJ Printer Driver
 EAPI=7
@@ -11,4 +11,4 @@ RDEPEND=virtual/libusb:1 dev-libs/libxml2 net-print/cups
 SLOT=0
 SRC_URI=https://pdisp01.c-wss.com/gdl/WWUFORedirectTarget.do?id=MDEwMDAxMTYzOTAx&amp -> cnijfilter2-source-6.50-1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=4557ef66d2861e02aae24f2fbab040aa
+_md5_=7b44b15972040c1aeeb39eaf36d4dd0c
diff --git a/metadata/md5-cache/sci-astronomy/stellarium-1.2 b/metadata/md5-cache/sci-astronomy/stellarium-1.2
index 7287dd0d6653..560c121528cd 100644
--- a/metadata/md5-cache/sci-astronomy/stellarium-1.2
+++ b/metadata/md5-cache/sci-astronomy/stellarium-1.2
@@ -14,5 +14,5 @@ REQUIRED_USE=|| ( !media !qt6 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Stellarium/stellarium/releases/download/v1.2/stellarium-1.2.tar.xz verify-sig? ( https://github.com/Stellarium/stellarium/releases/download/v1.2/stellarium-1.2.tar.xz.asc ) deep-sky? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.18/catalog-3.18.dat -> stellarium-dso-catalog-3.18.dat verify-sig? ( https://github.com/Stellarium/stellarium-data/releases/download/dso-3.18/catalog-3.18.dat.asc -> stellarium-dso-catalog-3.18.dat.asc ) ) doc? ( https://github.com/Stellarium/stellarium/releases/download/v1.2/stellarium_user_guide-1.2-1.pdf verify-sig? ( https://github.com/Stellarium/stellarium/releases/download/v1.2/stellarium_user_guide-1.2-1.pdf.asc ) ) stars? ( https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_4_1v0_2.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_5_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_6_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_7_2v0_1.cat https://github.com/Stellarium/stellarium-data/releases/download/stars-2.0/stars_8_2v0_1.cat )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c07e0d9375ad5b95e1192aa87ea91c4e
diff --git a/metadata/md5-cache/sci-libs/dealii-9.4.0-r1 b/metadata/md5-cache/sci-libs/dealii-9.4.0-r1
index ed132f9904cc..94fa8c50a418 100644
--- a/metadata/md5-cache/sci-libs/dealii-9.4.0-r1
+++ b/metadata/md5-cache/sci-libs/dealii-9.4.0-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:= app-arch/bzip2 sys-libs/zlib dev-cpp/tbb:= arborx? ( sc
 REQUIRED_USE=arborx? ( trilinos ) p4est? ( mpi ) slepc? ( petsc ) trilinos? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/dealii/dealii/releases/download/v9.4.0/dealii-9.4.0.tar.gz verify-sig? ( https://github.com/dealii/dealii/releases/download/v9.4.0/dealii-9.4.0.tar.gz.asc ) doc? ( https://github.com/dealii/dealii/releases/download/v9.4.0/dealii-9.4.0-offline_documentation.tar.gz verify-sig? ( https://github.com/dealii/dealii/releases/download/v9.4.0/dealii-9.4.0-offline_documentation.tar.gz.asc ) )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=43b658a9ef67a0548d3a18d83123a3df
diff --git a/metadata/md5-cache/sci-libs/dealii-9.4.1-r1 b/metadata/md5-cache/sci-libs/dealii-9.4.1-r1
index b624c20a526b..7eb467823090 100644
--- a/metadata/md5-cache/sci-libs/dealii-9.4.1-r1
+++ b/metadata/md5-cache/sci-libs/dealii-9.4.1-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/boost:= app-arch/bzip2 sys-libs/zlib dev-cpp/tbb:= arborx? ( sc
 REQUIRED_USE=arborx? ( trilinos ) p4est? ( mpi ) slepc? ( petsc ) trilinos? ( mpi )
 SLOT=0
 SRC_URI=https://github.com/dealii/dealii/releases/download/v9.4.1/dealii-9.4.1.tar.gz verify-sig? ( https://github.com/dealii/dealii/releases/download/v9.4.1/dealii-9.4.1.tar.gz.asc ) doc? ( https://github.com/dealii/dealii/releases/download/v9.4.1/dealii-9.4.1-offline_documentation.tar.gz verify-sig? ( https://github.com/dealii/dealii/releases/download/v9.4.1/dealii-9.4.1-offline_documentation.tar.gz.asc ) )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=43b658a9ef67a0548d3a18d83123a3df
diff --git a/metadata/md5-cache/sci-libs/proj-9.2.0 b/metadata/md5-cache/sci-libs/proj-9.2.0
index e028af046dd4..d3b615e54030 100644
--- a/metadata/md5-cache/sci-libs/proj-9.2.0
+++ b/metadata/md5-cache/sci-libs/proj-9.2.0
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0/9
 SRC_URI=https://download.osgeo.org/proj/proj-9.2.0.tar.gz https://download.osgeo.org/proj/proj-data-1.13.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=193ac1bc95b5096406ebf33dbde01310
+_md5_=e4e211947431c40b854af735554e52f3
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-vincentlefevre-20221213 b/metadata/md5-cache/sec-keys/openpgp-keys-vincentlefevre-20221213
index e86fb2613653..fc4b23cde95d 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-vincentlefevre-20221213
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-vincentlefevre-20221213
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=OpenPGP keys used by Vincent Lefèvre
 EAPI=8
 HOMEPAGE=https://www.vinc17.net/pgp.html
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://www.vinc17.net/key.asc
-_md5_=497e2e3179fa9ab5c8b38ecd47004c3b
+_md5_=52c97968c2ec7ab6db88b2a89b416a9f
diff --git a/metadata/md5-cache/sec-keys/signify-keys-signify-30 b/metadata/md5-cache/sec-keys/signify-keys-signify-30
index 757ec7148639..d3a62531d685 100644
--- a/metadata/md5-cache/sec-keys/signify-keys-signify-30
+++ b/metadata/md5-cache/sec-keys/signify-keys-signify-30
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=public-domain
 SLOT=30
 SRC_URI=https://github.com/aperezdc/signify/raw/cb113fe442f84ab7d4ac95b44c49812001e32350/keys/signifyportable.pub -> signify-30.pub verify-sig? ( https://github.com/aperezdc/signify/raw/cb113fe442f84ab7d4ac95b44c49812001e32350/keys/signifyportable.pub.asc -> signify-30.pub.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=9a95511084a76404bc83448600d51524
diff --git a/metadata/md5-cache/sys-apps/coreutils-9.1-r2 b/metadata/md5-cache/sys-apps/coreutils-9.1-r2
index 4da15ad8f5f0..1888004e8dab 100644
--- a/metadata/md5-cache/sys-apps/coreutils-9.1-r2
+++ b/metadata/md5-cache/sys-apps/coreutils-9.1-r2
@@ -12,5 +12,5 @@ RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-li
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/coreutils/coreutils-9.1.tar.xz verify-sig? ( mirror://gnu/coreutils/coreutils-9.1.tar.xz.sig ) !vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=7c1e87328d49c3adbc82ca495c98683c
diff --git a/metadata/md5-cache/sys-apps/coreutils-9999 b/metadata/md5-cache/sys-apps/coreutils-9999
index b50d23005c0d..6cff5555af6f 100644
--- a/metadata/md5-cache/sys-apps/coreutils-9999
+++ b/metadata/md5-cache/sys-apps/coreutils-9999
@@ -12,5 +12,5 @@ RDEPEND=!static? ( acl? ( sys-apps/acl ) caps? ( sys-libs/libcap ) gmp? ( dev-li
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=!vanilla? ( https://dev.gentoo.org/~sam/distfiles/sys-apps/coreutils/coreutils-9.0_p20220409-patches-01.tar.xz )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=57c1544ea64434a0f9fc4ccb23c5b9a3
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.8 b/metadata/md5-cache/sys-apps/diffutils-3.8
index ea9e5b207a7a..ddbdbd8a7e86 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.8
+++ b/metadata/md5-cache/sys-apps/diffutils-3.8
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/diffutils/diffutils-3.8.tar.xz https://alpha.gnu.org/gnu/diffutils/diffutils-3.8.tar.xz verify-sig? ( mirror://gnu/diffutils/diffutils-3.8.tar.xz.sig https://alpha.gnu.org/gnu/diffutils/diffutils-3.8.tar.xz.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5aa8b3123e8c49b9cf72cbfe1df66e6d
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.9 b/metadata/md5-cache/sys-apps/diffutils-3.9
index 24624057e05d..ed7d1b749174 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.9
+++ b/metadata/md5-cache/sys-apps/diffutils-3.9
@@ -9,5 +9,5 @@ KEYWORDS=~alpha ~amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~risc
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/diffutils/diffutils-3.9.tar.xz verify-sig? ( mirror://gnu/diffutils/diffutils-3.9.tar.xz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=e42381078d49198c87cabf5546450752
diff --git a/metadata/md5-cache/sys-apps/diffutils-3.9-r1 b/metadata/md5-cache/sys-apps/diffutils-3.9-r1
index c2686abc4328..2b82756a3142 100644
--- a/metadata/md5-cache/sys-apps/diffutils-3.9-r1
+++ b/metadata/md5-cache/sys-apps/diffutils-3.9-r1
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ~ppc64 ~riscv
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=mirror://gnu/diffutils/diffutils-3.9.tar.xz verify-sig? ( mirror://gnu/diffutils/diffutils-3.9.tar.xz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=fe1fd8c493f45cedb36eb514a55de730
diff --git a/metadata/md5-cache/sys-apps/ed-1.18 b/metadata/md5-cache/sys-apps/ed-1.18
index 53b967f4a665..c95e04f0d881 100644
--- a/metadata/md5-cache/sys-apps/ed-1.18
+++ b/metadata/md5-cache/sys-apps/ed-1.18
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/ed/ed-1.18.tar.lz verify-sig? ( mirror://gnu/ed/ed-1.18.tar.lz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=bf63ad1b4806a01a7000e3fe6ce90271
diff --git a/metadata/md5-cache/sys-apps/ed-1.19-r1 b/metadata/md5-cache/sys-apps/ed-1.19-r1
index 9ee320ddf69a..33889f2b334c 100644
--- a/metadata/md5-cache/sys-apps/ed-1.19-r1
+++ b/metadata/md5-cache/sys-apps/ed-1.19-r1
@@ -9,5 +9,5 @@ KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~
 LICENSE=GPL-2+
 SLOT=0
 SRC_URI=mirror://gnu/ed/ed-1.19.tar.lz https://download.savannah.gnu.org/releases/ed/ed-1.19.tar.lz verify-sig? ( mirror://gnu/ed/ed-1.19.tar.lz.sig https://download.savannah.gnu.org/releases/ed/ed-1.19.tar.lz.sig )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=d0ac361a5b9c0ba76081590d3ab2bf37
diff --git a/metadata/md5-cache/sys-apps/file-5.44-r3 b/metadata/md5-cache/sys-apps/file-5.44-r3
index c3143eac1535..7916573aa3af 100644
--- a/metadata/md5-cache/sys-apps/file-5.44-r3
+++ b/metadata/md5-cache/sys-apps/file-5.44-r3
@@ -12,5 +12,5 @@ RDEPEND=bzip2? ( app-arch/bzip2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 REQUIRED_USE=python? ( || ( python_targets_python3_7 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.44.tar.gz verify-sig? ( ftp://ftp.astron.com/pub/file/file-5.44.tar.gz.asc )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=05084ab13f67d0d31ae1e803af7f55fa
diff --git a/metadata/md5-cache/sys-apps/findutils-4.9.0-r2 b/metadata/md5-cache/sys-apps/findutils-4.9.0-r2
index 10b3e00fa498..c75cfbb8f179 100644
--- a/metadata/md5-cache/sys-apps/findutils-4.9.0-r2
+++ b/metadata/md5-cache/sys-apps/findutils-4.9.0-r2
@@ -12,5 +12,5 @@ RDEPEND=selinux? ( sys-libs/libselinux ) nls? ( virtual/libintl )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/findutils/findutils-4.9.0.tar.xz verify-sig? ( mirror://gnu/findutils/findutils-4.9.0.tar.xz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=64d7d804643ca356b10b2a2a6fabdc29
diff --git a/metadata/md5-cache/sys-apps/gawk-5.2.1 b/metadata/md5-cache/sys-apps/gawk-5.2.1
index a261f4b2134e..4d17b09f1e1e 100644
--- a/metadata/md5-cache/sys-apps/gawk-5.2.1
+++ b/metadata/md5-cache/sys-apps/gawk-5.2.1
@@ -11,5 +11,5 @@ LICENSE=GPL-3+
 RDEPEND=mpfr? ( dev-libs/gmp:= dev-libs/mpfr:= ) readline? ( sys-libs/readline:= )
 SLOT=0
 SRC_URI=mirror://gnu/gawk/gawk-5.2.1.tar.xz verify-sig? ( mirror://gnu/gawk/gawk-5.2.1.tar.xz.sig )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=24249c47b2415ce4cdaafb9b6813dcad
diff --git a/metadata/md5-cache/sys-apps/grep-3.7 b/metadata/md5-cache/sys-apps/grep-3.7
index 29ab8b266c45..86efdb126f91 100644
--- a/metadata/md5-cache/sys-apps/grep-3.7
+++ b/metadata/md5-cache/sys-apps/grep-3.7
@@ -12,5 +12,5 @@ RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre-7.8-r1 ) sparc? ( dev-libs/libsigs
 REQUIRED_USE=static? ( !sparc )
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.7.tar.xz verify-sig? ( mirror://gnu/grep/grep-3.7.tar.xz.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=5081ff7aedf367b6646936ad65de497a
diff --git a/metadata/md5-cache/sys-apps/grep-3.8-r1 b/metadata/md5-cache/sys-apps/grep-3.8-r1
index 84b432f59f1a..a2a0231ecd7d 100644
--- a/metadata/md5-cache/sys-apps/grep-3.8-r1
+++ b/metadata/md5-cache/sys-apps/grep-3.8-r1
@@ -12,5 +12,5 @@ RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1 ) sparc? ( dev-libs/libsig
 REQUIRED_USE=static? ( !sparc )
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.8.tar.xz verify-sig? ( mirror://gnu/grep/grep-3.8.tar.xz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=9f16efad7d19825033d0c7dc8cbf3eca
diff --git a/metadata/md5-cache/sys-apps/grep-3.9 b/metadata/md5-cache/sys-apps/grep-3.9
index 86a3aebf45f1..d55ef8d89b5c 100644
--- a/metadata/md5-cache/sys-apps/grep-3.9
+++ b/metadata/md5-cache/sys-apps/grep-3.9
@@ -12,5 +12,5 @@ RDEPEND=!static? ( pcre? ( >=dev-libs/libpcre2-7.8-r1 ) sparc? ( dev-libs/libsig
 REQUIRED_USE=static? ( !sparc )
 SLOT=0
 SRC_URI=mirror://gnu/grep/grep-3.9.tar.xz verify-sig? ( mirror://gnu/grep/grep-3.9.tar.xz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=bf4ea49176638c038d1a0ca1f2d21393
diff --git a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20230203 b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20230203
index dc64cf9f9d4d..bea4a7563101 100644
--- a/metadata/md5-cache/sys-apps/mawk-1.3.4_p20230203
+++ b/metadata/md5-cache/sys-apps/mawk-1.3.4_p20230203
@@ -9,5 +9,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~r
 LICENSE=GPL-2
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/mawk/mawk-1.3.4-20230203.tgz verify-sig? ( https://invisible-island.net/archives/mawk/mawk-1.3.4-20230203.tgz.asc )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=a16b9b51f5edfed1ae56d086d56cfee7
diff --git a/metadata/md5-cache/sys-apps/sed-4.9 b/metadata/md5-cache/sys-apps/sed-4.9
index a69ae79cdb78..2c11f4802141 100644
--- a/metadata/md5-cache/sys-apps/sed-4.9
+++ b/metadata/md5-cache/sys-apps/sed-4.9
@@ -11,5 +11,5 @@ LICENSE=GPL-3+
 RDEPEND=!static? ( acl? ( virtual/acl ) nls? ( virtual/libintl ) selinux? ( sys-libs/libselinux ) )
 SLOT=0
 SRC_URI=mirror://gnu/sed/sed-4.9.tar.xz verify-sig? ( mirror://gnu/sed/sed-4.9.tar.xz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=7b2ce731de90ed75f049852aca4aa8b5
diff --git a/metadata/md5-cache/sys-apps/tuned-2.18.0 b/metadata/md5-cache/sys-apps/tuned-2.20.0
index 06bdacadcffb..7c9ea7f529d3 100644
--- a/metadata/md5-cache/sys-apps/tuned-2.18.0
+++ b/metadata/md5-cache/sys-apps/tuned-2.20.0
@@ -11,6 +11,6 @@ RDEPEND=python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_
 REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/redhat-performance/tuned/archive/v2.18.0.tar.gz -> tuned-2.18.0.tar.gz
+SRC_URI=https://github.com/redhat-performance/tuned/archive/v2.20.0.tar.gz -> tuned-2.20.0.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=529bc3bc26454adbf40775385dd4db5e
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.38.1 b/metadata/md5-cache/sys-apps/util-linux-2.38.1
index be5b08256f03..a0fc10934ae3 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.38.1
+++ b/metadata/md5-cache/sys-apps/util-linux-2.38.1
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.1.tar.xz verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.1.tar.sign )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=84d208ed36dfe8f04b83baf1be494763
diff --git a/metadata/md5-cache/sys-apps/util-linux-2.38.1-r2 b/metadata/md5-cache/sys-apps/util-linux-2.38.1-r2
index c868f725ce37..ba31f57ed79d 100644
--- a/metadata/md5-cache/sys-apps/util-linux-2.38.1-r2
+++ b/metadata/md5-cache/sys-apps/util-linux-2.38.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( || ( python_targets_python3_7 python_targets_python3_8 py
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.1.tar.xz verify-sig? ( https://www.kernel.org/pub/linux/utils/util-linux/v2.38/util-linux-2.38.1.tar.sign )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=e3411be5c6f5fbd52c61d817f57c6d0f
diff --git a/metadata/md5-cache/sys-block/parted-3.5 b/metadata/md5-cache/sys-block/parted-3.5
index 29d997df8d5c..4c3f2cfa5e9c 100644
--- a/metadata/md5-cache/sys-block/parted-3.5
+++ b/metadata/md5-cache/sys-block/parted-3.5
@@ -11,5 +11,5 @@ LICENSE=GPL-3+
 RDEPEND=>=sys-fs/e2fsprogs-1.27 sys-apps/util-linux device-mapper? ( >=sys-fs/lvm2-2.02.45 ) readline? ( >=sys-libs/ncurses-5.7-r7:0= >=sys-libs/readline-5.2:0= )
 SLOT=0
 SRC_URI=mirror://gnu/parted/parted-3.5.tar.xz verify-sig? ( mirror://gnu/parted/parted-3.5.tar.xz.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=413d0b690076f0bc9fc2cccb082cb3c8
diff --git a/metadata/md5-cache/sys-devel/autoconf-dickey-2.52_p20221202 b/metadata/md5-cache/sys-devel/autoconf-dickey-2.52_p20221202
index 27385b1b6ce7..29ac64081b9a 100644
--- a/metadata/md5-cache/sys-devel/autoconf-dickey-2.52_p20221202
+++ b/metadata/md5-cache/sys-devel/autoconf-dickey-2.52_p20221202
@@ -10,5 +10,5 @@ LICENSE=GPL-2
 RDEPEND=>=sys-devel/m4-1.4.16 >=dev-lang/perl-5.6
 SLOT=2.52
 SRC_URI=https://invisible-island.net/archives/autoconf/autoconf-2.52-20221202.tgz verify-sig? ( https://invisible-island.net/archives/autoconf/autoconf-2.52-20221202.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=8178d8d7b4d3021ad38fcf14a22fe211
diff --git a/metadata/md5-cache/sys-devel/bison-3.8.2-r2 b/metadata/md5-cache/sys-devel/bison-3.8.2-r2
index 2bc985c72eb4..f50052069d9d 100644
--- a/metadata/md5-cache/sys-devel/bison-3.8.2-r2
+++ b/metadata/md5-cache/sys-devel/bison-3.8.2-r2
@@ -13,5 +13,5 @@ RDEPEND=>=sys-devel/m4-1.4.16 >=sys-devel/gettext-0.21
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/bison/bison-3.8.2.tar.xz verify-sig? ( mirror://gnu/bison/bison-3.8.2.tar.xz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=bc8564c5ad2b6bc5967c0e37709375d6
diff --git a/metadata/md5-cache/sys-devel/clang-14.0.6-r1 b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
index c7bfa6cde427..8db7ee5d73f0 100644
--- a/metadata/md5-cache/sys-devel/clang-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/clang-14.0.6-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e3c4b711cf94f4e3e9898d42212e520a
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.7-r1 b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
index 16c43056adfd..862b15020771 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.7-r1
+++ b/metadata/md5-cache/sys-devel/clang-15.0.7-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15g1
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b0a75c5dda15fb815fa14575b07b3460
diff --git a/metadata/md5-cache/sys-devel/clang-16.0.0_rc3 b/metadata/md5-cache/sys-devel/clang-16.0.0_rc3
index 7167963c3fb8..ae9225a2bb72 100644
--- a/metadata/md5-cache/sys-devel/clang-16.0.0_rc3
+++ b/metadata/md5-cache/sys-devel/clang-16.0.0_rc3
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a299c0f1926b3a2cf005d8a6c9a15cb4
diff --git a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230225 b/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230225
deleted file mode 100644
index af351ff258d6..000000000000
--- a/metadata/md5-cache/sys-devel/clang-17.0.0_pre20230225
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) >=dev-util/cmake-3.16 doc? ( python_single_target_python3_7? ( dev-python/recommonmark[python_targets_python3_7(-)] dev-python/sphinx[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ) xml? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test unpack
-DEPEND=~sys-devel/llvm-17.0.0_pre20230225:17=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Xtensa] ) !!sys-devel/llvm:0
-DESCRIPTION=C language family frontend for LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs flag-o-matic
-IUSE=debug doc +extra ieee-long-double +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
-PDEPEND=~sys-devel/clang-runtime-17.0.0_pre20230225 sys-devel/clang-toolchain-symlinks:17
-RDEPEND=python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ~sys-devel/llvm-17.0.0_pre20230225:17=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/clang-common-17.0.0_pre20230225 llvm_targets_AArch64? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Lanai] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_LoongArch] ) llvm_targets_Mips? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_DirectX] ) llvm_targets_M68k? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_SPIRV] ) llvm_targets_Xtensa? ( ~sys-devel/llvm-17.0.0_pre20230225[llvm_targets_Xtensa] )
-REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 ) || ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=17/17.0.0_pre20230225
-SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=41a1a2025c574781bf2d606e0e4d0197
diff --git a/metadata/md5-cache/sys-devel/clang-common-14.0.6 b/metadata/md5-cache/sys-devel/clang-common-14.0.6
index 4ceea07bd3ff..e7a838c7fe01 100644
--- a/metadata/md5-cache/sys-devel/clang-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/clang-common-14.0.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:*
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=4b96bac2e683306fd625bd17c582e0e5
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r3 b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r3
index 11a68d4851a5..142cb69c9678 100644
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.7-r3
+++ b/metadata/md5-cache/sys-devel/clang-common-15.0.7-r3
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.7 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=f49aabb29904c888f9dfd9f2165bf39b
diff --git a/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc3-r1 b/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc3-r1
index db080a2db298..0ee2eceeccb4 100644
--- a/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc3-r1
+++ b/metadata/md5-cache/sys-devel/clang-common-16.0.0_rc3-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-16.0.0_rc3 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=217209beffe304e53d1b826c40fce259
diff --git a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230225 b/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230225
deleted file mode 100644
index 28952c96c0f1..000000000000
--- a/metadata/md5-cache/sys-devel/clang-common-17.0.0_pre20230225
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=install preinst prepare pretend unpack
-DESCRIPTION=Common files shared between multiple slots of clang
-EAPI=8
-HOMEPAGE=https://llvm.org/
-IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
-INHERIT=bash-completion-r1 llvm.org
-IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind hardened stricter
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] ) !llvm-libunwind? ( sys-libs/libunwind[static-libs] ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230225 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=d75f961655c054b8c3b0dbbd6ebed902
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230225 b/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230225
deleted file mode 100644
index c8194b4c3c0b..000000000000
--- a/metadata/md5-cache/sys-devel/clang-runtime-17.0.0_pre20230225
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=pretend
-DESCRIPTION=Meta-ebuild for clang runtime libraries
-EAPI=8
-HOMEPAGE=https://clang.llvm.org/
-INHERIT=multilib-build toolchain-funcs
-IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=metapackage
-PROPERTIES=live
-RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-17.0.0_pre20230225:17[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-17.0.0_pre20230225:17[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-17.0.0_pre20230225[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-17.0.0_pre20230225[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
-REQUIRED_USE=sanitize? ( compiler-rt )
-SLOT=17
-_eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
-_md5_=a2cbb671ba47f2c77b593a6e199d20d0
diff --git a/metadata/md5-cache/sys-devel/gettext-0.21.1 b/metadata/md5-cache/sys-devel/gettext-0.21.1
index 4e464a4c899b..8c19df33996a 100644
--- a/metadata/md5-cache/sys-devel/gettext-0.21.1
+++ b/metadata/md5-cache/sys-devel/gettext-0.21.1
@@ -12,5 +12,5 @@ PDEPEND=emacs? ( app-emacs/po-mode )
 RDEPEND=>=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libintl-0-r2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-libs/libxml2-2.9.3:= dev-libs/expat acl? ( virtual/acl ) ncurses? ( sys-libs/ncurses:0= ) java? ( virtual/jdk:1.8 ) git? ( dev-vcs/git ) java? ( virtual/jre:1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
 SLOT=0
 SRC_URI=mirror://gnu/gettext/gettext-0.21.1.tar.xz verify-sig? ( mirror://gnu/gettext/gettext-0.21.1.tar.xz.sig )
-_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-pkg-opt-2	4d26f2efd4c5ec82b66d1e8816f421b2	java-utils-2	eefed04ac580a259ecda1fbd966640b7	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=c0662ecb5c3ef23b0cfe0d551563b902
diff --git a/metadata/md5-cache/sys-devel/lld-14.0.6-r1 b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
index 19537e81fbcc..020bba54b1d4 100644
--- a/metadata/md5-cache/sys-devel/lld-14.0.6-r1
+++ b/metadata/md5-cache/sys-devel/lld-14.0.6-r1
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-14.0.6 !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=14/14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=edf339d759cb6847af32166fb5aad436
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.7 b/metadata/md5-cache/sys-devel/lld-15.0.7
index 76e9ec7baab3..9bce9c3b5242 100644
--- a/metadata/md5-cache/sys-devel/lld-15.0.7
+++ b/metadata/md5-cache/sys-devel/lld-15.0.7
@@ -13,5 +13,5 @@ RDEPEND=~sys-devel/llvm-15.0.7 sys-libs/zlib:= !sys-devel/lld:0
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=459d4539c3cb5872937b7420ffd7db56
diff --git a/metadata/md5-cache/sys-devel/lld-16.0.0_rc3 b/metadata/md5-cache/sys-devel/lld-16.0.0_rc3
index a2ada8727a48..de00909d8820 100644
--- a/metadata/md5-cache/sys-devel/lld-16.0.0_rc3
+++ b/metadata/md5-cache/sys-devel/lld-16.0.0_rc3
@@ -12,5 +12,5 @@ RDEPEND=~sys-devel/llvm-16.0.0_rc3[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=d0370b337c79d369237bfe1ac6dd97e1
diff --git a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230225 b/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230225
deleted file mode 100644
index 3638aa1105df..000000000000
--- a/metadata/md5-cache/sys-devel/lld-17.0.0_pre20230225
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/llvm:17 test? ( >=dev-util/cmake-3.16 || ( ( >=dev-lang/python-3.11.0:3.11 >=dev-python/lit-17.0.0_pre20230225[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 >=dev-python/lit-17.0.0_pre20230225[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 >=dev-python/lit-17.0.0_pre20230225[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 >=dev-python/lit-17.0.0_pre20230225[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 >=dev-python/lit-17.0.0_pre20230225[python_targets_python3_7(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=~sys-devel/llvm-17.0.0_pre20230225[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !!sys-devel/llvm:0
-DESCRIPTION=The LLVM linker (link editor)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=debug test zstd test
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-PDEPEND=>=sys-devel/lld-toolchain-symlinks-16-r2:17
-RDEPEND=~sys-devel/llvm-17.0.0_pre20230225[zstd=] sys-libs/zlib:= zstd? ( app-arch/zstd:= ) !sys-devel/lld:0
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=17/17.0.0_pre20230225
-SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d0370b337c79d369237bfe1ac6dd97e1
diff --git a/metadata/md5-cache/sys-devel/llvm-14.0.6-r2 b/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
index 1c28ccd11729..4099d33e777a 100644
--- a/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
+++ b/metadata/md5-cache/sys-devel/llvm-14.0.6-r2
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 >=dev-lang/python-3.7.14:3.7 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-14.0.6.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 dev-python/recommonmark[python_targets_python3_7(-)] dev-python/sphinx[python_targets_python3_7(-)] ) ) ) libffi? ( virtual/pkgconfig ) test? ( sys-apps/which ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
 EAPI=8
 HOMEPAGE=https://llvm.org/
@@ -9,10 +9,10 @@ IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common binutils-plugin? ( >=sys-devel/llvmgold-14 )
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_M68k )
 RESTRICT=!test? ( test )
 SLOT=14
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-14.0.6-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f12f585142205eb219697f23b2e71c5a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=82ec6e4ed8e34cb8a54bcdf7acf0f092
diff --git a/metadata/md5-cache/sys-devel/llvm-15.0.7 b/metadata/md5-cache/sys-devel/llvm-15.0.7
index 0993f699bf19..cead07b7e141 100644
--- a/metadata/md5-cache/sys-devel/llvm-15.0.7
+++ b/metadata/md5-cache/sys-devel/llvm-15.0.7
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 >=dev-lang/python-3.7.14:3.7 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-15.0.7.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 dev-python/recommonmark[python_targets_python3_7(-)] dev-python/sphinx[python_targets_python3_7(-)] ) ) ) libffi? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
 EAPI=8
 HOMEPAGE=https://llvm.org/
@@ -9,10 +9,10 @@ IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3
 KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv sparc x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:15 binutils-plugin? ( >=sys-devel/llvmgold-15 )
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV )
 RESTRICT=!test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.7-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=91731983b40f5e3b8513222a111c92f3
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=4d47111695b7d744f42d966c1ee715b6
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
index abcc86500349..3cc5a9e25c1f 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.0.9999
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 >=dev-lang/python-3.7.14:3.7 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-16.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 dev-python/recommonmark[python_targets_python3_7(-)] dev-python/sphinx[python_targets_python3_7(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=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 setup test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
 EAPI=8
 HOMEPAGE=https://llvm.org/
@@ -9,9 +9,9 @@ IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:16 binutils-plugin? ( >=sys-devel/llvmgold-16 )
 PROPERTIES=live
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ca39d431770e4d4a02efb269512a4870
+_md5_=b5353580f13b3406b597b45cdeb63b11
diff --git a/metadata/md5-cache/sys-devel/llvm-16.0.0_rc3 b/metadata/md5-cache/sys-devel/llvm-16.0.0_rc3
index 69d5a6205a2a..4e2ee36b1874 100644
--- a/metadata/md5-cache/sys-devel/llvm-16.0.0_rc3
+++ b/metadata/md5-cache/sys-devel/llvm-16.0.0_rc3
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 >=dev-lang/python-3.7.14:3.7 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-16.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 dev-python/recommonmark[python_targets_python3_7(-)] dev-python/sphinx[python_targets_python3_7(-)] ) ) ) libffi? ( virtual/pkgconfig ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
 EAPI=8
 HOMEPAGE=https://llvm.org/
@@ -9,10 +9,10 @@ IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3
 KEYWORDS=~loong
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:16 binutils-plugin? ( >=sys-devel/llvmgold-16 )
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=16/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=1bbec653f50724ed2e85709c683c6f93
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=3366d515db409cf1f50c3064943e2d2c
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0.9999 b/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
index feb6ea2b644c..75a0497467c3 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.0.9999
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 >=dev-lang/python-3.7.14:3.7 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-17.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 dev-python/recommonmark[python_targets_python3_7(-)] dev-python/sphinx[python_targets_python3_7(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=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 setup test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
 EAPI=8
 HOMEPAGE=https://llvm.org/
@@ -9,9 +9,9 @@ IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:17 binutils-plugin? ( >=sys-devel/llvmgold-17 )
 PROPERTIES=live
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0.9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ca39d431770e4d4a02efb269512a4870
+_md5_=b5353580f13b3406b597b45cdeb63b11
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230225 b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230225
deleted file mode 100644
index 09177cedf7c0..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230225
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=|| ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 >=dev-lang/python-3.7.14:3.7 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-17.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 dev-python/recommonmark[python_targets_python3_7(-)] dev-python/sphinx[python_targets_python3_7(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
-DESCRIPTION=Low Level Virtual Machine
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs flag-o-matic
-IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 zstd test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
-PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:17 binutils-plugin? ( >=sys-devel/llvmgold-17 )
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
-REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=17/17.0.0_pre20230225
-SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2a0ce298bbca14348e74eae296e0dfef
diff --git a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230304 b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230304
index 292b24cf0d06..e5f3ac9353dc 100644
--- a/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230304
+++ b/metadata/md5-cache/sys-devel/llvm-17.0.0_pre20230304
@@ -1,6 +1,6 @@
 BDEPEND=|| ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 >=dev-lang/python-3.7.14:3.7 ) dev-lang/perl >=dev-util/cmake-3.16 sys-devel/gnuconfig kernel_Darwin? ( <sys-libs/libcxx-17.0.0.9999 >=sys-devel/binutils-apple-5.1 ) doc? ( || ( ( >=dev-lang/python-3.11.0:3.11 dev-python/recommonmark[python_targets_python3_11(-)] dev-python/sphinx[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 dev-python/recommonmark[python_targets_python3_10(-)] dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 dev-python/recommonmark[python_targets_python3_9(-)] dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 dev-python/recommonmark[python_targets_python3_8(-)] dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 dev-python/recommonmark[python_targets_python3_7(-)] dev-python/sphinx[python_targets_python3_7(-)] ) ) ) libffi? ( virtual/pkgconfig ) dev-python/sphinx >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst prepare setup test unpack
-DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
+DEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) binutils-plugin? ( sys-libs/binutils-libs )
 DESCRIPTION=Low Level Virtual Machine
 EAPI=8
 HOMEPAGE=https://llvm.org/
@@ -8,10 +8,10 @@ INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
 IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 zstd test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:17 binutils-plugin? ( >=sys-devel/llvmgold-17 )
-RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
+RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
 REQUIRED_USE=|| ( llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_LoongArch llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_M68k llvm_targets_SPIRV llvm_targets_Xtensa )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=17/17.0.0_pre20230304
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ca39d431770e4d4a02efb269512a4870
+_md5_=b5353580f13b3406b597b45cdeb63b11
diff --git a/metadata/md5-cache/sys-devel/llvm-common-14.0.6 b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
index 67dc08c28768..0f40a596f664 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-14.0.6
+++ b/metadata/md5-cache/sys-devel/llvm-common-14.0.6
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=94f9554c557a233570c499d2a1abe891
diff --git a/metadata/md5-cache/sys-devel/llvm-common-15.0.7 b/metadata/md5-cache/sys-devel/llvm-common-15.0.7
index 082ffa9a2e38..680ef3b48518 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-15.0.7
+++ b/metadata/md5-cache/sys-devel/llvm-common-15.0.7
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=29f96569e5107a0ca343c8accaa2d360
diff --git a/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc3 b/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc3
index 4ad2d54409f2..7da03c6f6da4 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc3
+++ b/metadata/md5-cache/sys-devel/llvm-common-16.0.0_rc3
@@ -10,5 +10,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=c9d578123645e9827b6020e0dc4dd9b3
diff --git a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230225 b/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230225
deleted file mode 100644
index d449e3a1392b..000000000000
--- a/metadata/md5-cache/sys-devel/llvm-common-17.0.0_pre20230225
+++ /dev/null
@@ -1,11 +0,0 @@
-DEFINED_PHASES=install prepare unpack
-DESCRIPTION=Common files shared between multiple slots of LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=llvm.org
-LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
-RDEPEND=!sys-devel/llvm:0
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=2a5664fc02bf8988a8b1be74ec75557c
diff --git a/metadata/md5-cache/sys-devel/m4-1.4.19 b/metadata/md5-cache/sys-devel/m4-1.4.19
index 6f82a8effd77..25b78b61e704 100644
--- a/metadata/md5-cache/sys-devel/m4-1.4.19
+++ b/metadata/md5-cache/sys-devel/m4-1.4.19
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/libiconv nls? ( sys-devel/gettext virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/m4/m4-1.4.19.tar.xz https://dev.gentoo.org/~floppym/dist/m4-1.4.19-test-198-sysval-r1.patch.gz verify-sig? ( mirror://gnu/m4/m4-1.4.19.tar.xz.sig )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=c4f898faad1b0d929704bc3b8c6fabb0
diff --git a/metadata/md5-cache/sys-devel/m4-1.4.19-r1 b/metadata/md5-cache/sys-devel/m4-1.4.19-r1
index d7cf1d6ebbe8..3a3d67456d24 100644
--- a/metadata/md5-cache/sys-devel/m4-1.4.19-r1
+++ b/metadata/md5-cache/sys-devel/m4-1.4.19-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=virtual/libiconv nls? ( sys-devel/gettext virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/m4/m4-1.4.19.tar.xz https://dev.gentoo.org/~floppym/dist/m4-1.4.19-test-198-sysval-r1.patch.gz verify-sig? ( mirror://gnu/m4/m4-1.4.19.tar.xz.sig )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=e67a4f17213b2b86f9e0e61bc1326677
diff --git a/metadata/md5-cache/sys-devel/make-4.3 b/metadata/md5-cache/sys-devel/make-4.3
index cc287f704297..60f4203a4f1d 100644
--- a/metadata/md5-cache/sys-devel/make-4.3
+++ b/metadata/md5-cache/sys-devel/make-4.3
@@ -11,5 +11,5 @@ LICENSE=GPL-3+
 RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu//make/make-4.3.tar.gz verify-sig? ( mirror://gnu//make/make-4.3.tar.gz.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=2675f6b93283ea0290a14fd59b301040
diff --git a/metadata/md5-cache/sys-devel/make-4.4.1 b/metadata/md5-cache/sys-devel/make-4.4.1
index c868f341ec48..f8c155d932d7 100644
--- a/metadata/md5-cache/sys-devel/make-4.4.1
+++ b/metadata/md5-cache/sys-devel/make-4.4.1
@@ -11,5 +11,5 @@ LICENSE=GPL-3+
 RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
 SRC_URI=mirror://gnu/make/make-4.4.1.tar.gz verify-sig? ( mirror://gnu/make/make-4.4.1.tar.gz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=8d4012292b4929532e94d97990652d1a
diff --git a/metadata/md5-cache/sys-devel/make-9999 b/metadata/md5-cache/sys-devel/make-9999
index 1b8ba28b50b0..77530d48f7a7 100644
--- a/metadata/md5-cache/sys-devel/make-9999
+++ b/metadata/md5-cache/sys-devel/make-9999
@@ -10,5 +10,5 @@ LICENSE=GPL-3+
 PROPERTIES=live
 RDEPEND=guile? ( >=dev-scheme/guile-1.8:= ) nls? ( virtual/libintl )
 SLOT=0
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=c5fc94c4f4d4a9eb1317263e26b27c48
diff --git a/metadata/md5-cache/sys-devel/patch-2.7.6-r4 b/metadata/md5-cache/sys-devel/patch-2.7.6-r4
index 00fad8b03cc2..8ffbddcedfee 100644
--- a/metadata/md5-cache/sys-devel/patch-2.7.6-r4
+++ b/metadata/md5-cache/sys-devel/patch-2.7.6-r4
@@ -12,5 +12,5 @@ RDEPEND=xattr? ( sys-apps/attr )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/patch/patch-2.7.6.tar.xz verify-sig? ( mirror://gnu/patch/patch-2.7.6.tar.xz.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=af4f1c26c646ed7b6f3e5692bb94b6c8
diff --git a/metadata/md5-cache/sys-devel/patch-2.7.6-r5 b/metadata/md5-cache/sys-devel/patch-2.7.6-r5
index 36320a171fb4..27a8ad156366 100644
--- a/metadata/md5-cache/sys-devel/patch-2.7.6-r5
+++ b/metadata/md5-cache/sys-devel/patch-2.7.6-r5
@@ -12,5 +12,5 @@ RDEPEND=xattr? ( sys-apps/attr )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://gnu/patch/patch-2.7.6.tar.xz verify-sig? ( mirror://gnu/patch/patch-2.7.6.tar.xz.sig )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=33a95acf3a89301204a014dc5c8886f2
diff --git a/metadata/md5-cache/sys-devel/reflex-20221012 b/metadata/md5-cache/sys-devel/reflex-20221012
index 969b80a33022..c392e0fbfdf2 100644
--- a/metadata/md5-cache/sys-devel/reflex-20221012
+++ b/metadata/md5-cache/sys-devel/reflex-20221012
@@ -9,5 +9,5 @@ KEYWORDS=amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x8
 LICENSE=FLEX
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/reflex/reflex-20221012.tgz verify-sig? ( https://invisible-island.net/archives/reflex/reflex-20221012.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=2123b8f17ad6e5394453d97abe5695f7
diff --git a/metadata/md5-cache/sys-devel/reflex-20230206 b/metadata/md5-cache/sys-devel/reflex-20230206
index 12c2b227329b..4a2a34de378d 100644
--- a/metadata/md5-cache/sys-devel/reflex-20230206
+++ b/metadata/md5-cache/sys-devel/reflex-20230206
@@ -5,9 +5,9 @@ EAPI=8
 HOMEPAGE=https://invisible-island.net/reflex/
 INHERIT=verify-sig
 IUSE=verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=FLEX
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/reflex/reflex-20230206.tgz verify-sig? ( https://invisible-island.net/archives/reflex/reflex-20230206.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
-_md5_=665ac1de027e6fac8fdea5d9da76aa2e
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
+_md5_=f2530fd93bbe29c4525f6b1ac9506fd5
diff --git a/metadata/md5-cache/sys-devel/slibtool-0.5.34 b/metadata/md5-cache/sys-devel/slibtool-0.5.34
index d2f10350e227..7f1306be7276 100644
--- a/metadata/md5-cache/sys-devel/slibtool-0.5.34
+++ b/metadata/md5-cache/sys-devel/slibtool-0.5.34
@@ -9,5 +9,5 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://dl.midipix.org/slibtool/slibtool-0.5.34.tar.xz verify-sig? ( https://dl.midipix.org/slibtool/slibtool-0.5.34.tar.xz.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=2d9fe4fc1b587f958ccd94f39942a5cb
diff --git a/metadata/md5-cache/sys-fs/lxcfs-5.0.3 b/metadata/md5-cache/sys-fs/lxcfs-5.0.3
index 99de62cdfb44..117071f27512 100644
--- a/metadata/md5-cache/sys-fs/lxcfs-5.0.3
+++ b/metadata/md5-cache/sys-fs/lxcfs-5.0.3
@@ -12,5 +12,5 @@ RDEPEND=sys-fs/fuse:3
 RESTRICT=test
 SLOT=0
 SRC_URI=https://linuxcontainers.org/downloads/lxcfs/lxcfs-5.0.3.tar.gz verify-sig? ( https://linuxcontainers.org/downloads/lxcfs/lxcfs-5.0.3.tar.gz.asc )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7bc819367a2959ad390060d7d1d20c15
diff --git a/metadata/md5-cache/sys-fs/ncdu-1.17 b/metadata/md5-cache/sys-fs/ncdu-1.17
index fa2dc378815a..726781e967a3 100644
--- a/metadata/md5-cache/sys-fs/ncdu-1.17
+++ b/metadata/md5-cache/sys-fs/ncdu-1.17
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/ncurses:=[unicode(+)]
 SLOT=0
 SRC_URI=https://dev.yorhel.nl/download/ncdu-1.17.tar.gz verify-sig? ( https://dev.yorhel.nl/download/ncdu-1.17.tar.gz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=946f62aea24d89b841b08f0dd1de1d34
diff --git a/metadata/md5-cache/sys-fs/ncdu-1.18 b/metadata/md5-cache/sys-fs/ncdu-1.18
index 461e37974f39..5732d9887479 100644
--- a/metadata/md5-cache/sys-fs/ncdu-1.18
+++ b/metadata/md5-cache/sys-fs/ncdu-1.18
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/ncurses:=[unicode(+)]
 SLOT=0
 SRC_URI=https://dev.yorhel.nl/download/ncdu-1.18.tar.gz verify-sig? ( https://dev.yorhel.nl/download/ncdu-1.18.tar.gz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=2591861a4e9a407f8afdf40931668dc8
diff --git a/metadata/md5-cache/sys-fs/ncdu-2.2.1 b/metadata/md5-cache/sys-fs/ncdu-2.2.1
index e87622471c93..ab3b0ad1ba63 100644
--- a/metadata/md5-cache/sys-fs/ncdu-2.2.1
+++ b/metadata/md5-cache/sys-fs/ncdu-2.2.1
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/ncurses:=[unicode(+)]
 SLOT=0
 SRC_URI=https://dev.yorhel.nl/download/ncdu-2.2.1.tar.gz verify-sig? ( https://dev.yorhel.nl/download/ncdu-2.2.1.tar.gz.asc ) https://codeberg.org/BratishkaErik/distfiles/media/branch/master/ncdu-2.2.1-upstream-zig-0.10-updates-r1.patch
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=f76e538c2ea667bd3d7ba9e681e9a12e
diff --git a/metadata/md5-cache/sys-fs/ncdu-2.2.2 b/metadata/md5-cache/sys-fs/ncdu-2.2.2
index 64f27f7d62c0..03c159f85987 100644
--- a/metadata/md5-cache/sys-fs/ncdu-2.2.2
+++ b/metadata/md5-cache/sys-fs/ncdu-2.2.2
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/ncurses:=[unicode(+)]
 SLOT=0
 SRC_URI=https://dev.yorhel.nl/download/ncdu-2.2.2.tar.gz verify-sig? ( https://dev.yorhel.nl/download/ncdu-2.2.2.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=5b7a86246c44c11c41e093447df58228
diff --git a/metadata/md5-cache/sys-fs/ncdu-2.2.2-r1 b/metadata/md5-cache/sys-fs/ncdu-2.2.2-r1
index c52034137746..d95ce615f1c8 100644
--- a/metadata/md5-cache/sys-fs/ncdu-2.2.2-r1
+++ b/metadata/md5-cache/sys-fs/ncdu-2.2.2-r1
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/ncurses:=[unicode(+)]
 SLOT=0
 SRC_URI=https://dev.yorhel.nl/download/ncdu-2.2.2.tar.gz verify-sig? ( https://dev.yorhel.nl/download/ncdu-2.2.2.tar.gz.asc )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=8aa6652a1b695e91ed87dbc558b59422
diff --git a/metadata/md5-cache/sys-fs/ncdu-bin-2.1.2 b/metadata/md5-cache/sys-fs/ncdu-bin-2.1.2
index 0e91abb816d0..b3da8ad0ac90 100644
--- a/metadata/md5-cache/sys-fs/ncdu-bin-2.1.2
+++ b/metadata/md5-cache/sys-fs/ncdu-bin-2.1.2
@@ -9,5 +9,5 @@ KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=amd64? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-x86_64.tar.gz ) arm? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-arm.tar.gz ) arm64? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-aarch64.tar.gz ) x86? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-i386.tar.gz ) verify-sig? ( amd64? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-x86_64.tar.gz.asc ) arm? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-arm.tar.gz.asc ) arm64? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-aarch64.tar.gz.asc ) x86? ( https://dev.yorhel.nl/download/ncdu-2.1.2-linux-i386.tar.gz.asc ) )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=57d5f599149d3eaf433e30eaa59a31a8
diff --git a/metadata/md5-cache/sys-fs/ncdu-bin-2.2 b/metadata/md5-cache/sys-fs/ncdu-bin-2.2
index b87ef6f59324..04127e59e17c 100644
--- a/metadata/md5-cache/sys-fs/ncdu-bin-2.2
+++ b/metadata/md5-cache/sys-fs/ncdu-bin-2.2
@@ -9,5 +9,5 @@ KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=amd64? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-x86_64.tar.gz ) arm? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-arm.tar.gz ) arm64? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-aarch64.tar.gz ) x86? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-i386.tar.gz ) verify-sig? ( amd64? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-x86_64.tar.gz.asc ) arm? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-arm.tar.gz.asc ) arm64? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-aarch64.tar.gz.asc ) x86? ( https://dev.yorhel.nl/download/ncdu-2.2-linux-i386.tar.gz.asc ) )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=57d5f599149d3eaf433e30eaa59a31a8
diff --git a/metadata/md5-cache/sys-fs/ncdu-bin-2.2.1 b/metadata/md5-cache/sys-fs/ncdu-bin-2.2.1
index 62afe851dc52..e1d6528fc357 100644
--- a/metadata/md5-cache/sys-fs/ncdu-bin-2.2.1
+++ b/metadata/md5-cache/sys-fs/ncdu-bin-2.2.1
@@ -9,5 +9,5 @@ KEYWORDS=-* ~amd64 ~arm ~arm64 ~x86
 LICENSE=MIT
 SLOT=0
 SRC_URI=amd64? ( https://dev.yorhel.nl/download/ncdu-2.2.1-linux-x86_64.tar.gz ) arm? ( https://dev.yorhel.nl/download/ncdu-2.2.1-linux-arm.tar.gz ) arm64? ( https://dev.yorhel.nl/download/ncdu-2.2.1-linux-aarch64.tar.gz ) x86? ( https://dev.yorhel.nl/download/ncdu-2.2.1-linux-i386.tar.gz ) verify-sig? ( amd64? ( https://dev.yorhel.nl/download/ncdu-2.2.1-linux-x86_64.tar.gz.asc ) arm? ( https://dev.yorhel.nl/download/ncdu-2.2.1-linux-arm.tar.gz.asc ) arm64? ( https://dev.yorhel.nl/download/ncdu-2.2.1-linux-aarch64.tar.gz.asc ) x86? ( https://dev.yorhel.nl/download/ncdu-2.2.1-linux-i386.tar.gz.asc ) )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=57d5f599149d3eaf433e30eaa59a31a8
diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.8 b/metadata/md5-cache/sys-fs/zfs-2.1.8
index 1a6fde7daea4..c1a775d50530 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.1.8
+++ b/metadata/md5-cache/sys-fs/zfs-2.1.8
@@ -14,5 +14,5 @@ REQUIRED_USE=!minimal? ( || ( python_targets_python3_7 python_targets_python3_8
 RESTRICT=test
 SLOT=0/5
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.8/zfs-2.1.8.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.8/zfs-2.1.8.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	dist-kernel-utils	557a93bd51735200952a735894f6628e	distutils-r1	3929d88685167435c587b740fdb5ec46	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	dist-kernel-utils	557a93bd51735200952a735894f6628e	distutils-r1	3929d88685167435c587b740fdb5ec46	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=3aa7961c735ebdf3c6940e1346b38f71
diff --git a/metadata/md5-cache/sys-fs/zfs-2.1.9 b/metadata/md5-cache/sys-fs/zfs-2.1.9
index f00d4d5a1cb7..cd3836f80201 100644
--- a/metadata/md5-cache/sys-fs/zfs-2.1.9
+++ b/metadata/md5-cache/sys-fs/zfs-2.1.9
@@ -14,5 +14,5 @@ REQUIRED_USE=!minimal? ( || ( python_targets_python3_7 python_targets_python3_8
 RESTRICT=test
 SLOT=0/5
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.9/zfs-2.1.9.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.9/zfs-2.1.9.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	dist-kernel-utils	557a93bd51735200952a735894f6628e	distutils-r1	3929d88685167435c587b740fdb5ec46	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	dist-kernel-utils	557a93bd51735200952a735894f6628e	distutils-r1	3929d88685167435c587b740fdb5ec46	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	pam	01b77091d5b6560b0aeafa7fbb1bd818	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=acdcd955776a23c481053106a9add59a
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.8 b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.8
index 76eb38421c49..3b22bb3e81a4 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.8
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.8
@@ -13,5 +13,5 @@ RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virt
 RESTRICT=debug? ( strip ) test
 SLOT=0/2.1.8
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.8/zfs-2.1.8.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.8/zfs-2.1.8.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	dist-kernel-utils	557a93bd51735200952a735894f6628e	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	dist-kernel-utils	557a93bd51735200952a735894f6628e	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=9f9a4e2ca0f229817c68628579c455da
diff --git a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.9 b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.9
index 62b12c54307d..54746b9b1ece 100644
--- a/metadata/md5-cache/sys-fs/zfs-kmod-2.1.9
+++ b/metadata/md5-cache/sys-fs/zfs-kmod-2.1.9
@@ -13,5 +13,5 @@ RDEPEND=!sys-kernel/spl kernel_linux? ( sys-apps/kmod[tools] dist-kernel? ( virt
 RESTRICT=debug? ( strip ) test
 SLOT=0/2.1.9
 SRC_URI=https://github.com/openzfs/zfs/releases/download/zfs-2.1.9/zfs-2.1.9.tar.gz verify-sig? ( https://github.com/openzfs/zfs/releases/download/zfs-2.1.9/zfs-2.1.9.tar.gz.asc )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	dist-kernel-utils	557a93bd51735200952a735894f6628e	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	dist-kernel-utils	557a93bd51735200952a735894f6628e	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	4b552625ebd741dfd2ac08637fd2436e	linux-mod	81807190d0c0076b69cb96b547e38681	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=940b5f9d353676b900fa206cf384c8fe
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.172 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.172
new file mode 100644
index 000000000000..a039ac273e97
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.172
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.172
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.172 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.172
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-181.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-181.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=8198b4c8c78c41a00d2bdd61de2daa13
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.99 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.99
new file mode 100644
index 000000000000..3487f7c32b7b
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.99
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.99
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.99 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.99
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-104.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-104.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=911a2bb8f6ac05e06f6b34e91cbc96a5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.16 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.16
new file mode 100644
index 000000000000..164a3627f45e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.16
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.16
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.1.16 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.16
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-20.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.7-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b107498eafe6c16385086d7fde718ad3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.2.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.2.3
new file mode 100644
index 000000000000..940fa81b3fad
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.2.3
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
+DESCRIPTION=Linux kernel built with Gentoo patches
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs
+IUSE=debug hardened savedconfig +initramfs test
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.2.3
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.2.3 virtual/libelf
+REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.2.3
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-5.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.2.0-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.2.0-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.2.0-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.2.0-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=82f4eccee938dd63aab79aba6f180bd8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.99 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.99
new file mode 100644
index 000000000000..fe5de520c1d2
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.99
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.99
+RDEPEND=!sys-kernel/gentoo-kernel:5.15.99 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.99
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-104.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-104.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.99-1.gpkg.tar -> gentoo-kernel-5.15.99-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.99-1.gpkg.tar -> gentoo-kernel-5.15.99-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.99-1.gpkg.tar -> gentoo-kernel-5.15.99-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.99-1.gpkg.tar -> gentoo-kernel-5.15.99-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
+_md5_=501d74f0109a01891a2c259f17203792
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.16 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.16
new file mode 100644
index 000000000000..cefb6691fc82
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.16
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.16
+RDEPEND=!sys-kernel/gentoo-kernel:6.1.16 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.16
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-20.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.16-1.gpkg.tar -> gentoo-kernel-6.1.16-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.16-1.gpkg.tar -> gentoo-kernel-6.1.16-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.16-1.gpkg.tar -> gentoo-kernel-6.1.16-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.16-1.gpkg.tar -> gentoo-kernel-6.1.16-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
+_md5_=94eb09196b8203bd20e442e87c3756c9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.2.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.2.3
new file mode 100644
index 000000000000..5dac42c51d77
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.2.3
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
+DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
+DESCRIPTION=Pre-built Linux kernel with Gentoo patches
+EAPI=8
+HOMEPAGE=https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-install toolchain-funcs unpacker
+IUSE=+initramfs test
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.2.3
+RDEPEND=!sys-kernel/gentoo-kernel:6.2.3 virtual/libelf
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.2.3
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-5.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.3-1.gpkg.tar -> gentoo-kernel-6.2.3-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.3-1.gpkg.tar -> gentoo-kernel-6.2.3-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.3-1.gpkg.tar -> gentoo-kernel-6.2.3-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.3-1.gpkg.tar -> gentoo-kernel-6.2.3-1.x86.gpkg.tar )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	unpacker	fdd15d854bf5e84f82d35524ab8ca6ba
+_md5_=bf277291b9a653d45c9e133d3282088a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.99-r1 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.99-r1
new file mode 100644
index 000000000000..684e06df1c8e
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.99-r1
@@ -0,0 +1,14 @@
+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.99-r1
+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-104.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-104.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-104.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-104.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-104.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-104.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=09bd925542318bb3e6a905da3ea83a0a
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.16 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.16
new file mode 100644
index 000000000000..67c0bf7ba9ac
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.16
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.1 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.1.16
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-20.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-20.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-20.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-20.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-20.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-20.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=b1ed82a1ae11879ea43d2b0d7b112b12
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.17 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.17
new file mode 100644
index 000000000000..3779246494d3
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.1.17
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.1 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.1.17
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-21.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-21.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-21.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-21.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-21.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-21.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c80e0b875fe7c62ddf93bc8901850fd5
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.3 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.3
new file mode 100644
index 000000000000..20e4c62620c6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.3
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.2 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.2.3
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-5.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-5.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-5.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-5.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-5.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=5b992f5646396df3a06427480dc016f8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.4 b/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.4
new file mode 100644
index 000000000000..9a733a22e29a
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-6.2.4
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DESCRIPTION=Full sources including the Gentoo patchset for the 6.2 kernel tree
+EAPI=8
+HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
+INHERIT=kernel-2
+IUSE=experimental symlink build
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
+RESTRICT=binchecks strip
+SLOT=6.2.4
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-6.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-6.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-6.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-6.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.2-6.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.2-6.experimental.tar.xz )
+_eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=d9e4fd80013ab752a6fbe298de3c35d0
diff --git a/metadata/md5-cache/sys-kernel/linux-firmware-20220310 b/metadata/md5-cache/sys-kernel/linux-firmware-20230310
index cf8a288ad783..33d8dbec73c6 100644
--- a/metadata/md5-cache/sys-kernel/linux-firmware-20220310
+++ b/metadata/md5-cache/sys-kernel/linux-firmware-20230310
@@ -1,16 +1,16 @@
 BDEPEND=initramfs? ( app-arch/cpio )
-DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend unpack
+DEFINED_PHASES=install postinst postrm preinst prepare prerm pretend setup unpack
 DESCRIPTION=Linux firmware files
 EAPI=7
 HOMEPAGE=https://git.kernel.org/?p=linux/kernel/git/firmware/linux-firmware.git
-INHERIT=mount-boot savedconfig
-IUSE=initramfs +redistributable savedconfig unknown-license savedconfig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+INHERIT=linux-info mount-boot savedconfig multiprocessing
+IUSE=compress initramfs +redistributable savedconfig unknown-license savedconfig
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 ) redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT ) unknown-license? ( all-rights-reserved )
 RDEPEND=!savedconfig? ( redistributable? ( !sys-firmware/alsa-firmware[alsa_cards_ca0132] !sys-block/qla-fc-firmware !sys-firmware/iwl1000-ucode !sys-firmware/iwl6005-ucode !sys-firmware/iwl6030-ucode !sys-firmware/iwl3160-ucode !sys-firmware/iwl7260-ucode !sys-firmware/iwl3160-7260-bt-ucode !sys-firmware/raspberrypi-wifi-ucode ) unknown-license? ( !sys-firmware/alsa-firmware[alsa_cards_korg1212] !sys-firmware/alsa-firmware[alsa_cards_maestro3] !sys-firmware/alsa-firmware[alsa_cards_sb16] !sys-firmware/alsa-firmware[alsa_cards_ymfpci] ) )
 REQUIRED_USE=initramfs? ( redistributable )
 RESTRICT=binchecks strip test unknown-license? ( bindist )
 SLOT=0
-SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20220310.tar.xz
-_eclasses_=mount-boot	d3a79a84edde3dbc4373d490d09be9b6	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341
-_md5_=45dfb378589cfa0fd3cf6211344aa722
+SRC_URI=https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/linux-firmware-20230310.tar.xz
+_eclasses_=linux-info	4b552625ebd741dfd2ac08637fd2436e	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=0f98d91ce36615cb298a6027ea3e4e06
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.167 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.167
index 6e6331a382d7..9009b8094b67 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.167
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.167
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.167
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.167.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.167.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=6c766fc9708d61603b3a7946bcb8c0a8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.168 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.168
index 0a2f9ebbce70..c63af97d9295 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.168
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.168
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.168
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.168.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.168.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=6c766fc9708d61603b3a7946bcb8c0a8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.169 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.169
index e79fd87d21eb..e6508ff0d623 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.169
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.169
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.169
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.169.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.169.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=6c766fc9708d61603b3a7946bcb8c0a8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.170 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.170
index 7109bff79e29..e2f44215e8c2 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.170
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.170
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.10.170
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.170.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.170.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=6c766fc9708d61603b3a7946bcb8c0a8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.172 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.172
new file mode 100644
index 000000000000..078dcb32f737
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.172
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.10.172
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.10.172
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.172.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.172.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
+_md5_=6d46e875226d6340b91d52c28b2e9147
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.94 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.94
index 533a8f1c15d1..f0b60d6ed4e5 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.94
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.94
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.15.94
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.94.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.94.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=808e8993eff1b8af7927954fc596ca98
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.95 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.95
index 2244dd6a26ea..c9173924e0d3 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.95
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.95
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.15.95
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.95.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.95.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=808e8993eff1b8af7927954fc596ca98
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.96 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.96
index a1d19f7d7dbf..62e3c2ce6598 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.96
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.96
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.15.96
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.96.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.96.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=808e8993eff1b8af7927954fc596ca98
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.99 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.99
new file mode 100644
index 000000000000..451d2c3b8ea6
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.99
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-5.15.99
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=5.15.99
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.99.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.99.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
+_md5_=2eac001ceafd53f76d270f933dce1217
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.231 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.231
index 35bcc1ab9ef6..899b29d00475 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.231
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.231
@@ -13,5 +13,5 @@ RDEPEND=virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.231
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.231.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.231.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=e1414b54fa0b8b838d7e9f24bb7eeda5
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.232 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.232
index 105ff4c1120b..019f8fc6357e 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.232
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.232
@@ -13,5 +13,5 @@ RDEPEND=virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.232
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.232.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.232.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=e1414b54fa0b8b838d7e9f24bb7eeda5
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.233 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.233
index 5ab66665632e..f0e478a33b69 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.233
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.233
@@ -13,5 +13,5 @@ RDEPEND=virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.233
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.233.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.233.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=e1414b54fa0b8b838d7e9f24bb7eeda5
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.234 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.234
index 107b93010a02..078496713880 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.234
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.234
@@ -13,5 +13,5 @@ RDEPEND=virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=5.4.234
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.234.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.234.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=e1414b54fa0b8b838d7e9f24bb7eeda5
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.12 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.12
index 53eb1bf235d0..506c28418cc4 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.12
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.12
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=6.1.12
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.12.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.12.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.7-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=be174661d4eabf19deab53ecc0cc09ca
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.13 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.13
index e2522a7095b0..41a32332fd0f 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.13
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.13
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=6.1.13
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.13.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.13.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.7-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=be174661d4eabf19deab53ecc0cc09ca
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.14 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.14
index 3f035917cb88..d8de84712953 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.14
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.14
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=6.1.14
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.14.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.14.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.7-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=be174661d4eabf19deab53ecc0cc09ca
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.15 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.15
index 27c90bfdda0c..3279a8a46060 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.15
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.15
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=6.1.15
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.15.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g6.tar.gz -> gentoo-kernel-config-g6.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.15.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.7-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=be174661d4eabf19deab53ecc0cc09ca
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.16 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.16
new file mode 100644
index 000000000000..ddae1a8ee739
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.16
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.1.16
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.1.16
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.16.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.16.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.7-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.7-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.7-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.7-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.7-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
+_md5_=6af3201a419530fc1a9351b0f433c39c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.2.1 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.2.1
index af867190c09b..b8723a1acee7 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.2.1
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.2.1
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=6.2.1
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.1.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.1.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.2.0-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.2.0-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.2.0-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.2.0-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=150341299828d75e4181a11d4b66a8eb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.2.2 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.2.2
index fbcc96a31e83..57347132e551 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.2.2
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.2.2
@@ -14,5 +14,5 @@ REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
 SLOT=6.2.2
 SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.2.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.2.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.2.0-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.2.0-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.2.0-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.2.0-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=150341299828d75e4181a11d4b66a8eb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.2.3 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.2.3
new file mode 100644
index 000000000000..119ad304a864
--- /dev/null
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.2.3
@@ -0,0 +1,18 @@
+BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
+DESCRIPTION=Linux kernel built from vanilla upstream sources
+EAPI=8
+HOMEPAGE=https://wiki.gentoo.org/wiki/Project:Distribution_Kernel https://www.kernel.org/
+IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
+INHERIT=kernel-build toolchain-funcs verify-sig
+IUSE=debug hardened savedconfig +initramfs test verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+LICENSE=GPL-2
+PDEPEND=>=virtual/dist-kernel-6.2.3
+RDEPEND=virtual/libelf
+REQUIRED_USE=arm? ( savedconfig )
+RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
+SLOT=6.2.3
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.3.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g7.tar.gz -> gentoo-kernel-config-g7.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.2.3.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.2.0-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.2.0-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.2.0-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.2.0-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.2.0-gentoo )
+_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	d3a79a84edde3dbc4373d490d09be9b6	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
+_md5_=150341299828d75e4181a11d4b66a8eb
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.98 b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.99
index 3d1b0f78891b..86244dd0a694 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.98
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-5.15.99
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sp
 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.98
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.98.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
+SLOT=5.15.99
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/patch-5.15.99.xz https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=06a11745e46e233e9ae03efa92a371cd
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.15 b/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.17
index 85a1737fae71..e89c577248d4 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.15
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-6.1.17
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=6.1.15
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.15.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
+SLOT=6.1.17
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.1.17.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=96b7bb013c09ed6364efda0f3bf7d67f
diff --git a/metadata/md5-cache/sys-kernel/vanilla-sources-6.2.2 b/metadata/md5-cache/sys-kernel/vanilla-sources-6.2.4
index e286eba9e4cc..64348a411cdf 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-sources-6.2.2
+++ b/metadata/md5-cache/sys-kernel/vanilla-sources-6.2.4
@@ -8,7 +8,7 @@ KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~s
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
-SLOT=6.2.2
-SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.2.2.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
+SLOT=6.2.4
+SRC_URI=https://www.kernel.org/pub/linux/kernel/v6.x/patch-6.2.4.xz https://www.kernel.org/pub/linux/kernel/v6.x/linux-6.2.tar.xz
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	1e55bee3f3081b16ebc1ca0cf1264f6c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
 _md5_=96b7bb013c09ed6364efda0f3bf7d67f
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1 b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
index b02cb9636518..3b65c1ceffd6 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/compiler-rt-14.0.6-r1
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=d82e063e2a6182eb6bb7d36c4af47c1f
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-15.0.7 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
index 0035e1938ef6..678900c15468 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
+++ b/metadata/md5-cache/sys-libs/compiler-rt-15.0.7
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=ae074eb3d4d536b1a71db2ddc05f0dde
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc3 b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc3
index be00ff53472d..237f7a222ab4 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/compiler-rt-16.0.0_rc3
@@ -11,5 +11,5 @@ LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=23125a80ee7ab9a87b577d36d72ec1a3
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230225 b/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230225
deleted file mode 100644
index b64704ebd433..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-17.0.0_pre20230225
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) test? ( || ( ( >=dev-lang/python-3.11.0:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 >=dev-python/lit-15[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 >=dev-python/lit-15[python_targets_python3_7(-)] ) ) =sys-devel/clang-17.0.0*:17 ) !test? ( || ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 >=dev-lang/python-3.7.14:3.7 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime library for clang (built-in part)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+abi_x86_32 abi_x86_64 +clang debug test
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RESTRICT=!test? ( test ) !clang? ( test )
-SLOT=17
-SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8372ab4cd7c181040e06c566ff2c8093
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
index b0f201915098..a930e695858a 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-14.0.6
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=14.0.6
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r3.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=cfa3113a46593953f5c8c562c1fed728
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
index 5d1c86b48780..c72d87a38cff 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.7
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=15.0.7
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7.tar.xz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=d6808a053bdb2c306eacea87526688b4
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc3 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc3
index 50bb0d2b71f3..9784f9664f97 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-16.0.0_rc3
@@ -12,5 +12,5 @@ REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo sha
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=555a4c5a712809670b8e99368ed9bff7
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230225 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230225
deleted file mode 100644
index b930f06022b7..000000000000
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-17.0.0_pre20230225
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/cmake-3.16 clang? ( sys-devel/clang ) elibc_glibc? ( net-libs/libtirpc ) test? ( || ( ( >=dev-lang/python-3.11.0:3.11 >=dev-python/lit-15[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 >=dev-python/lit-15[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 >=dev-python/lit-15[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 >=dev-python/lit-15[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 >=dev-python/lit-15[python_targets_python3_7(-)] ) ) =sys-devel/clang-17.0.0*:17 sys-libs/compiler-rt:17 ) !test? ( || ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 >=dev-lang/python-3.7.14:3.7 ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=sys-devel/llvm:17 virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?] !!sys-devel/llvm:0
-DESCRIPTION=Compiler runtime libraries for clang (sanitizers & xray)
-EAPI=8
-HOMEPAGE=https://llvm.org/
-INHERIT=check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-IUSE=+abi_x86_32 abi_x86_64 +clang debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
-RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
-SLOT=17
-SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=ca181c6f4c08ec61a5c626cb1f7fb78d
diff --git a/metadata/md5-cache/sys-libs/gdbm-1.23 b/metadata/md5-cache/sys-libs/gdbm-1.23
index 8fe244e250b0..f43c3ac8b7cd 100644
--- a/metadata/md5-cache/sys-libs/gdbm-1.23
+++ b/metadata/md5-cache/sys-libs/gdbm-1.23
@@ -12,5 +12,5 @@ RDEPEND=readline? ( sys-libs/readline:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x3
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=mirror://gnu/gdbm/gdbm-1.23.tar.gz verify-sig? ( mirror://gnu/gdbm/gdbm-1.23.tar.gz.sig )
-_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=b21ca3a523c04f76752098e0e56706bc
diff --git a/metadata/md5-cache/sys-libs/libcxx-14.0.6 b/metadata/md5-cache/sys-libs/libcxx-14.0.6
index f2d66e1a70fc..dbf0cad65c4a 100644
--- a/metadata/md5-cache/sys-libs/libcxx-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxx-14.0.6
@@ -13,5 +13,5 @@ REQUIRED_USE=libunwind? ( libcxxabi )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7bf15bc5684242c0dd7acf842ab552f8
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7 b/metadata/md5-cache/sys-libs/libcxx-15.0.7
index 4384c3cccda9..3043bf2a3099 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=23d91a3f1cf853fdbf364e14598d5156
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1 b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
index 79ee21a98da5..10962d9b3d32 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.7-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r1.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=2b94b668afee4664e8c3b0375f818cf3
diff --git a/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc3 b/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc3
index 799274eba7dd..2ab86c15bf91 100644
--- a/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/libcxx-16.0.0_rc3
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=c9723463b9c9bb2ababec0df4b4f1169
diff --git a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230225 b/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230225
deleted file mode 100644
index 1d83d521b87e..000000000000
--- a/metadata/md5-cache/sys-libs/libcxx-17.0.0_pre20230225
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 >=dev-lang/python-3.7.14:3.7 ) ) test? ( >=dev-util/cmake-3.16 sys-devel/gdb[python] || ( ( >=dev-lang/python-3.11.0:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 dev-python/lit[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 dev-python/lit[python_targets_python3_7(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0_pre20230225[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] ) sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=New implementation of the C++ standard library, targeting C++11
-EAPI=8
-HOMEPAGE=https://libcxx.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang +libcxxabi static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-17.0.0_pre20230225[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4707aaf3ab34f2d91cae8b95cb683de8
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6 b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
index 8cf150cec1a7..ba32fb7d1598 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
+++ b/metadata/md5-cache/sys-libs/libcxxabi-14.0.6
@@ -12,5 +12,5 @@ RDEPEND=libunwind? ( || ( >=sys-libs/libunwind-1.0.1-r1[static-libs?,abi_x86_32(
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=842b5b208430644626dce92300942c16
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
index 651a735813e9..c31f44936b7b 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
+++ b/metadata/md5-cache/sys-libs/libcxxabi-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=255d64d46703215e8ac359e0617e8cb1
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc3 b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc3
index 79ee93030c27..151e3c2e52b5 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/libcxxabi-16.0.0_rc3
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a43f813ad7587c52f577517faed1cd8f
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230225 b/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230225
deleted file mode 100644
index c6c1a17658b1..000000000000
--- a/metadata/md5-cache/sys-libs/libcxxabi-17.0.0_pre20230225
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 >=dev-lang/python-3.7.14:3.7 ) ) test? ( || ( ( >=dev-lang/python-3.11.0:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 dev-python/lit[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 dev-python/lit[python_targets_python3_7(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=!<sys-libs/libcxx-15 sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=Low level support for a standard C++ library
-EAPI=8
-HOMEPAGE=https://libcxxabi.llvm.org/
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!<sys-libs/libcxx-15
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f8c23232c9f79ffe7a2ca34e20497fea
diff --git a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1 b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
index f394c84b5102..2c37c5ca457d 100644
--- a/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/libomp-14.0.6-r1
@@ -13,5 +13,5 @@ REQUIRED_USE=cuda? ( llvm_targets_NVPTX ) offload? ( cuda? ( abi_x86_64 ) )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-14.0.6-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=43c6c9848171c392784ad1fd077c2cfb
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.7-r1 b/metadata/md5-cache/sys-libs/libomp-15.0.7-r2
index 0fb793214f06..b4545b6a78b2 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.7-r1
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.7-r2
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( || ( ( >=dev-lang/python-3.11.0:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 dev-python/lit[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 dev-python/lit[python_targets_python3_7(-)] ) ) sys-devel/clang ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[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/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-15.0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) ) !!sys-devel/llvm:0
+DEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[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/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-15.0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) ) !!sys-devel/llvm:0
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=8
 HOMEPAGE=https://openmp.llvm.org
@@ -8,9 +8,9 @@ INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-any-r1
 IUSE=debug hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
 KEYWORDS=amd64 arm arm64 ~ppc ppc64 ~riscv x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[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/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-15.0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) )
+RDEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[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/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-15.0.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
 RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.7-r2.tar.xz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0da68695075865bca9423a8ffbf22a0b
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f21e04cb7579c776508b827c5e15c1ae
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
index b7cf20a853f5..4881aeec20c1 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0.9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) python_single_target_python3_7? ( dev-python/lit[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lit[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) sys-devel/clang ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.0.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(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) ) !!sys-devel/llvm:0
+DEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.0.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(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) ) !!sys-devel/llvm:0
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=8
 HOMEPAGE=https://openmp.llvm.org
@@ -8,9 +8,9 @@ INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1 to
 IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
-RDEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.0.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(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) )
+RDEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.0.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(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_7 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/16
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=23a0d9cb8f9b7005be8aa2f3491d5891
+_md5_=c7572371bab7cfdf1f7a6ef0e2efebd6
diff --git a/metadata/md5-cache/sys-libs/libomp-16.0.0_rc3 b/metadata/md5-cache/sys-libs/libomp-16.0.0_rc3
index f6b858a52f6c..9cd19466d565 100644
--- a/metadata/md5-cache/sys-libs/libomp-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/libomp-16.0.0_rc3
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) python_single_target_python3_7? ( dev-python/lit[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lit[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) sys-devel/clang ) verify-sig? ( >=sec-keys/openpgp-keys-llvm-15 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.0_rc3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) ) !!sys-devel/llvm:0
+DEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.0_rc3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) ) !!sys-devel/llvm:0
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=8
 HOMEPAGE=https://openmp.llvm.org
@@ -8,10 +8,10 @@ INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1 to
 IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 KEYWORDS=~loong
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.0_rc3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) )
+RDEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-16.0.0_rc3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_7 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/16
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=736c6c38c9e91555bec06c3da7758ac6
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=f43db7b826200320d7c518c915c05f63
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0.9999 b/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
index 2ceac5ebc13e..81a85a93d442 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.0.9999
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) python_single_target_python3_7? ( dev-python/lit[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lit[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) sys-devel/clang ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0.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(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) ) !!sys-devel/llvm:0
+DEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0.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(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) ) !!sys-devel/llvm:0
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=8
 HOMEPAGE=https://openmp.llvm.org
@@ -8,9 +8,9 @@ INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1 to
 IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 PROPERTIES=live
-RDEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0.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(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) )
+RDEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0.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(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_7 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/17.0.0.9999
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=23a0d9cb8f9b7005be8aa2f3491d5891
+_md5_=c7572371bab7cfdf1f7a6ef0e2efebd6
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230225 b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230225
deleted file mode 100644
index b754e2c5646f..000000000000
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230225
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) python_single_target_python3_7? ( dev-python/lit[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lit[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) sys-devel/clang ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0_pre20230225[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) ) !!sys-devel/llvm:0
-DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
-EAPI=8
-HOMEPAGE=https://openmp.llvm.org
-INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1 toolchain-funcs
-IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0_pre20230225[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) )
-REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_7 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/17.0.0_pre20230225
-SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=23a0d9cb8f9b7005be8aa2f3491d5891
diff --git a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230304 b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230304
index fa842cbcb29e..5d9fb59d14b6 100644
--- a/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230304
+++ b/metadata/md5-cache/sys-libs/libomp-17.0.0_pre20230304
@@ -1,16 +1,16 @@
 BDEPEND=dev-lang/perl offload? ( llvm_targets_AMDGPU? ( sys-devel/clang ) llvm_targets_NVPTX? ( sys-devel/clang ) virtual/pkgconfig ) test? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) python_single_target_python3_7? ( dev-python/lit[python_targets_python3_7(-)] ) python_single_target_python3_8? ( dev-python/lit[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lit[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lit[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/lit[python_targets_python3_11(-)] ) sys-devel/clang ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0_pre20230304[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) ) !!sys-devel/llvm:0
+DEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0_pre20230304[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) ) !!sys-devel/llvm:0
 DESCRIPTION=OpenMP runtime library for LLVM/clang compiler
 EAPI=8
 HOMEPAGE=https://openmp.llvm.org
 INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-single-r1 toolchain-funcs
 IUSE=debug gdb-plugin hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_7 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0_pre20230304[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 ) )
+RDEPEND=gdb-plugin? ( python_single_target_python3_7? ( >=dev-lang/python-3.7.14:3.7 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.14:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.14:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.7:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0:3.11 ) ) hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-17.0.0_pre20230304[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= ) )
 REQUIRED_USE=gdb-plugin? ( ^^ ( python_single_target_python3_7 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/17.0.0_pre20230304
 SRC_URI=https://github.com/llvm/llvm-project/archive/2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz -> llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	4b552625ebd741dfd2ac08637fd2436e	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=23a0d9cb8f9b7005be8aa2f3491d5891
+_md5_=c7572371bab7cfdf1f7a6ef0e2efebd6
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1 b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
index 81d959bbb683..7791b0c9478d 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-14.0.6-r1
@@ -12,5 +12,5 @@ RDEPEND=!sys-libs/libunwind
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-14.0.6/llvm-project-14.0.6.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=6ba6db402e067cdcce1c2a8df22e3a8c
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
index 0ebf7e6c57bd..ea3540c80783 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.7
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.7/llvm-project-15.0.7.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0bf75d8020c89b2bc670e5c8cc644803
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc3 b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc3
index fbfc0dc60c3c..7cc16cbf7fa6 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc3
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-16.0.0_rc3
@@ -13,5 +13,5 @@ REQUIRED_USE=test? ( clang )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-16.0.0-rc3/llvm-project-16.0.0rc3.src.tar.xz.sig )
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=0c99e3f302409befa68ff2cd51824a5c
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230225 b/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230225
deleted file mode 100644
index 3d655025c2a6..000000000000
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-17.0.0_pre20230225
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=clang? ( sys-devel/clang:17 ) !test? ( || ( >=dev-lang/python-3.11.0:3.11 >=dev-lang/python-3.10.7:3.10 >=dev-lang/python-3.9.14:3.9 >=dev-lang/python-3.8.14:3.8 >=dev-lang/python-3.7.14:3.7 ) ) test? ( || ( ( >=dev-lang/python-3.11.0:3.11 dev-python/lit[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.7:3.10 dev-python/lit[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.14:3.9 dev-python/lit[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.14:3.8 dev-python/lit[python_targets_python3_8(-)] ) ( >=dev-lang/python-3.7.14:3.7 dev-python/lit[python_targets_python3_7(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=sys-devel/llvm:17 !!sys-devel/llvm:0
-DESCRIPTION=C++ runtime stack unwinder from LLVM
-EAPI=8
-HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
-INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-IUSE=+clang debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
-RDEPEND=!sys-libs/libunwind
-REQUIRED_USE=test? ( clang )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=https://github.com/llvm/llvm-project/archive/b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz -> llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz
-_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	4cc6f8e29d24a8011266413e74c728bb	llvm.org	0f02e2470e85a54bf40eda11fa1399fb	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=560acf07be6940268d0bd58fed59b7a1
diff --git a/metadata/md5-cache/sys-libs/musl-1.2.3 b/metadata/md5-cache/sys-libs/musl-1.2.3
index 70e2724fa98e..49c3fc2c33da 100644
--- a/metadata/md5-cache/sys-libs/musl-1.2.3
+++ b/metadata/md5-cache/sys-libs/musl-1.2.3
@@ -9,5 +9,5 @@ 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	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=b7f3e4c109536b5cdf764820661a9a57
diff --git a/metadata/md5-cache/sys-libs/musl-1.2.3-r7 b/metadata/md5-cache/sys-libs/musl-1.2.3-r7
index bb221cf96409..0abb47c7672e 100644
--- a/metadata/md5-cache/sys-libs/musl-1.2.3-r7
+++ b/metadata/md5-cache/sys-libs/musl-1.2.3-r7
@@ -11,5 +11,5 @@ PDEPEND=!crypt? ( sys-libs/libxcrypt[system] )
 RDEPEND=crypt? ( !sys-libs/libxcrypt[system] )
 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	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a36e2bf5d7db3a1662e0b4164895b40a
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.3_p20221203-r2 b/metadata/md5-cache/sys-libs/ncurses-6.3_p20221203-r2
index 45e6fbae9088..0b6bebd9811f 100644
--- a/metadata/md5-cache/sys-libs/ncurses-6.3_p20221203-r2
+++ b/metadata/md5-cache/sys-libs/ncurses-6.3_p20221203-r2
@@ -12,5 +12,5 @@ RDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=mirror://gnu/ncurses/ncurses-6.3.tar.gz https://invisible-island.net/archives/ncurses/ncurses-6.3.tar.gz https://invisible-mirror.net/archives/ncurses/ncurses-6.3.tar.gz verify-sig? ( mirror://gnu/ncurses/ncurses-6.3.tar.gz.sig ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211026.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211026.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211026.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211026.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211026.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211026.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211030.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211030.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211030.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211030.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211030.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211030.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211106.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211106.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211106.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211106.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211106.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211106.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211113.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211113.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211113.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211113.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211113.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211113.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211115.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211115.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211115.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211115.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211115.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211115.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211120.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211120.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211120.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211120.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211120.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211120.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211127.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211127.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211127.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211127.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211127.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211127.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211204.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211204.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211204.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211204.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211204.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211204.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211211.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211211.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211211.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211211.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211211.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211211.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211219.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211219.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211219.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211219.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211219.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211219.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211225.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211225.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211225.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211225.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211225.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20211225.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220101.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220101.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220101.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220101.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220101.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220101.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220115.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220115.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220115.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220115.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220115.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220115.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220122.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220122.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220122.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220122.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220122.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220122.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220129.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220129.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220129.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220129.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220129.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220129.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220205.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220205.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220205.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220205.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220205.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220205.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220212.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220212.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220212.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220212.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220212.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220212.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220219.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220219.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220219.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220219.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220219.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220219.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220226.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220226.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220226.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220226.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220226.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220226.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220305.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220305.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220305.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220305.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220305.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220305.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220312.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220312.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220312.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220312.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220312.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220312.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220319.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220319.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220319.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220319.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220319.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220319.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220326.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220326.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220326.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220326.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220326.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220326.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220402.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220402.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220402.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220402.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220402.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220402.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220409.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220409.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220409.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220409.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220409.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220409.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220416.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220416.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220416.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220416.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220416.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220416.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220423.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220423.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220423.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220423.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220423.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220423.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220430.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220430.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220430.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220430.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220430.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220430.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220501.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220501.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220501.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220501.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220501.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220501.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220507.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220507.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220507.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220507.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220507.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220507.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220514.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220514.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220514.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220514.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220514.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220514.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220521.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220521.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220521.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220521.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220521.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220521.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220529.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220529.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220529.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220529.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220529.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220529.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220604.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220604.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220604.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220604.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220604.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220604.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220612.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220612.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220612.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220612.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220612.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220612.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220618.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220618.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220618.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220618.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220618.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220618.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220625.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220625.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220625.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220625.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220625.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220625.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220703.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220703.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220703.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220703.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220703.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220703.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220709.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220709.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220709.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220709.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220709.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220709.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220716.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220716.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220716.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220716.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220716.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220716.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220724.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220724.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220724.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220724.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220724.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220724.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220729.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220729.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220729.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220729.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220729.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220729.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220806.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220806.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220806.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220806.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220806.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220806.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220813.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220813.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220813.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220813.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220813.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220813.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220820.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220820.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220820.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220820.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220820.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220820.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220827.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220827.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220827.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220827.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220827.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220827.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220903.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220903.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220903.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220903.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220903.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220903.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220910.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220910.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220910.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220910.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220910.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220910.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220917.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220917.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220917.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220917.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220917.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220917.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220924.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220924.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220924.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220924.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220924.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20220924.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221001.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221001.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221001.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221001.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221001.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221001.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221008.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221008.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221008.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221008.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221008.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221008.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221015.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221015.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221015.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221015.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221015.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221015.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221023.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221023.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221023.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221023.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221023.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221023.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221029.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221029.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221029.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221029.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221029.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221029.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221105.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221105.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221105.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221105.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221105.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221105.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221112.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221112.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221112.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221112.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221112.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221112.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221119.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221119.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221119.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221119.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221119.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221119.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221126.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221126.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221126.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221126.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221126.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221126.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221203.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221203.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221203.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221203.patch.gz.asc ) https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221203.patch.gz verify-sig? ( https://invisible-island.net/archives/ncurses/6.3/ncurses-6.3-20221203.patch.gz.asc ) https://dev.gentoo.org/~sam/distfiles/sys-libs/ncurses/ncurses-6.3_p20221203-patches.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d8a67c0dfdc6f7558d8edd979625219b
diff --git a/metadata/md5-cache/sys-libs/ncurses-6.4 b/metadata/md5-cache/sys-libs/ncurses-6.4
index de10db6a7bb2..571d199265c9 100644
--- a/metadata/md5-cache/sys-libs/ncurses-6.4
+++ b/metadata/md5-cache/sys-libs/ncurses-6.4
@@ -12,5 +12,5 @@ RDEPEND=gpm? ( sys-libs/gpm[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mi
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=mirror://gnu/ncurses/ncurses-6.4.tar.gz https://invisible-island.net/archives/ncurses/ncurses-6.4.tar.gz https://invisible-mirror.net/archives/ncurses/ncurses-6.4.tar.gz verify-sig? ( mirror://gnu/ncurses/ncurses-6.4.tar.gz.sig ) https://dev.gentoo.org/~sam/distfiles/sys-libs/ncurses/ncurses-6.4-patches.tar.xz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=10693c62d13655572ab0ee94c990ae3c
diff --git a/metadata/md5-cache/sys-libs/readline-8.1_p2-r1 b/metadata/md5-cache/sys-libs/readline-8.1_p2-r1
index b204562a2587..af32e0c7ac62 100644
--- a/metadata/md5-cache/sys-libs/readline-8.1_p2-r1
+++ b/metadata/md5-cache/sys-libs/readline-8.1_p2-r1
@@ -11,5 +11,5 @@ 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 verify-sig? ( mirror://gnu/readline/readline-8.1.tar.gz.sig ) mirror://gnu//readline-8.1-patches/readline81-001 verify-sig? ( mirror://gnu//readline-8.1-patches/readline81-001.sig ) ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-001 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-001.sig ) mirror://gnu//readline-8.1-patches/readline81-002 verify-sig? ( mirror://gnu//readline-8.1-patches/readline81-002.sig ) ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-002 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/readline-8.1-patches/readline81-002.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=765e8a7e1a357242c6f9bc6318d20e30
diff --git a/metadata/md5-cache/sys-libs/readline-8.2_p1 b/metadata/md5-cache/sys-libs/readline-8.2_p1
index 622c76e2cead..b4b080337b3b 100644
--- a/metadata/md5-cache/sys-libs/readline-8.2_p1
+++ b/metadata/md5-cache/sys-libs/readline-8.2_p1
@@ -11,5 +11,5 @@ 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.tar.gz verify-sig? ( mirror://gnu/readline/readline-8.2.tar.gz.sig ) mirror://gnu//readline-8.2-patches/readline82-001 verify-sig? ( mirror://gnu//readline-8.2-patches/readline82-001.sig ) ftp://ftp.cwru.edu/pub/bash/readline-8.2-patches/readline82-001 verify-sig? ( ftp://ftp.cwru.edu/pub/bash/readline-8.2-patches/readline82-001.sig )
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=28bac9bab79919d89dd67900500aa2fc
diff --git a/metadata/md5-cache/sys-libs/readline-9999 b/metadata/md5-cache/sys-libs/readline-9999
index b80a9161088a..8ca4cdbee4e2 100644
--- a/metadata/md5-cache/sys-libs/readline-9999
+++ b/metadata/md5-cache/sys-libs/readline-9999
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 PROPERTIES=live
 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
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=28bac9bab79919d89dd67900500aa2fc
diff --git a/metadata/md5-cache/sys-libs/zlib-1.2.13-r1 b/metadata/md5-cache/sys-libs/zlib-1.2.13-r1
index d135b05e0411..9429669c045f 100644
--- a/metadata/md5-cache/sys-libs/zlib-1.2.13-r1
+++ b/metadata/md5-cache/sys-libs/zlib-1.2.13-r1
@@ -11,5 +11,5 @@ LICENSE=ZLIB
 RDEPEND=!sys-libs/zlib-ng[compat]
 SLOT=0/1
 SRC_URI=https://zlib.net/zlib-1.2.13.tar.xz https://zlib.net/fossils/zlib-1.2.13.tar.xz https://zlib.net/current/beta/zlib-1.2.13.tar.xz verify-sig? ( https://zlib.net/zlib-1.2.13.tar.xz.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	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	usr-ldscript	cd36f6d91e8173d95e25b0e0cf036960	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=22ef853592df16c85582c0cf1ffb9aa1
diff --git a/metadata/md5-cache/sys-process/parallel-20221022 b/metadata/md5-cache/sys-process/parallel-20221022
index e1f2557708d9..bd3e6cb63beb 100644
--- a/metadata/md5-cache/sys-process/parallel-20221022
+++ b/metadata/md5-cache/sys-process/parallel-20221022
@@ -11,5 +11,5 @@ 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-20221022.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20221022.tar.bz2.sig )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=1914107741f25dd16a29b24c56c14ddc
diff --git a/metadata/md5-cache/sys-process/parallel-20221122 b/metadata/md5-cache/sys-process/parallel-20221122
index 55f02493d717..2b434da5db4e 100644
--- a/metadata/md5-cache/sys-process/parallel-20221122
+++ b/metadata/md5-cache/sys-process/parallel-20221122
@@ -11,5 +11,5 @@ 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-20221122.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20221122.tar.bz2.sig )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=9ac9c1b38bfa689bed61a81e0663fdf9
diff --git a/metadata/md5-cache/sys-process/parallel-20221222 b/metadata/md5-cache/sys-process/parallel-20221222
index f65044123dac..3c89b003a026 100644
--- a/metadata/md5-cache/sys-process/parallel-20221222
+++ b/metadata/md5-cache/sys-process/parallel-20221222
@@ -11,5 +11,5 @@ 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-20221222.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20221222.tar.bz2.sig )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=9ac9c1b38bfa689bed61a81e0663fdf9
diff --git a/metadata/md5-cache/sys-process/parallel-20230122 b/metadata/md5-cache/sys-process/parallel-20230122
index 9b035505d59b..c5cb99f82110 100644
--- a/metadata/md5-cache/sys-process/parallel-20230122
+++ b/metadata/md5-cache/sys-process/parallel-20230122
@@ -11,5 +11,5 @@ 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-20230122.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20230122.tar.bz2.sig )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=b398dd0c0953c3f1680245704ee9ce3c
diff --git a/metadata/md5-cache/sys-process/parallel-20230222 b/metadata/md5-cache/sys-process/parallel-20230222
index 04615a119dcc..5bc7a07e6e3c 100644
--- a/metadata/md5-cache/sys-process/parallel-20230222
+++ b/metadata/md5-cache/sys-process/parallel-20230222
@@ -11,5 +11,5 @@ LICENSE=GPL-3+
 RDEPEND=dev-lang/perl dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
 SLOT=0
 SRC_URI=mirror://gnu/parallel/parallel-20230222.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20230222.tar.bz2.sig )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=c2223950b39b3ed1450f9cd36ea3c205
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.172 b/metadata/md5-cache/virtual/dist-kernel-5.10.172
new file mode 100644
index 000000000000..814d56e83d77
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.172
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.172 ~sys-kernel/gentoo-kernel-bin-5.10.172 ~sys-kernel/vanilla-kernel-5.10.172 )
+SLOT=0/5.10.172
+_md5_=2b14c705dcd61ca0cb392a256fbcb273
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.99 b/metadata/md5-cache/virtual/dist-kernel-5.15.99
new file mode 100644
index 000000000000..fe81d791f7f7
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-5.15.99
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.99 ~sys-kernel/gentoo-kernel-bin-5.15.99 ~sys-kernel/vanilla-kernel-5.15.99 )
+SLOT=0/5.15.99
+_md5_=2b14c705dcd61ca0cb392a256fbcb273
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.1.16 b/metadata/md5-cache/virtual/dist-kernel-6.1.16
new file mode 100644
index 000000000000..145e062ab8fe
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.1.16
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.1.16 ~sys-kernel/gentoo-kernel-bin-6.1.16 ~sys-kernel/vanilla-kernel-6.1.16 )
+SLOT=0/6.1.16
+_md5_=1b77229b710f7250654decf4c40132e9
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.2.3 b/metadata/md5-cache/virtual/dist-kernel-6.2.3
new file mode 100644
index 000000000000..92b74d0ca446
--- /dev/null
+++ b/metadata/md5-cache/virtual/dist-kernel-6.2.3
@@ -0,0 +1,7 @@
+DEFINED_PHASES=-
+DESCRIPTION=Virtual to depend on any Distribution Kernel
+EAPI=7
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.2.3 ~sys-kernel/gentoo-kernel-bin-6.2.3 ~sys-kernel/vanilla-kernel-6.2.3 )
+SLOT=0/6.2.3
+_md5_=1b77229b710f7250654decf4c40132e9
diff --git a/metadata/md5-cache/www-apps/drupal-9.1.15 b/metadata/md5-cache/www-apps/drupal-10.0.2
index 86f6b6a4238f..3fa9c80d9127 100644
--- a/metadata/md5-cache/www-apps/drupal-9.1.15
+++ b/metadata/md5-cache/www-apps/drupal-10.0.2
@@ -1,15 +1,15 @@
 DEFINED_PHASES=install postinst prerm setup
 DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
 DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.drupal.org/
 INHERIT=webapp
 IUSE=+mysql postgres sqlite +uploadprogress vhosts
 KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
-RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) app-admin/webapp-config
+RDEPEND=dev-lang/php:8.1[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress[php_targets_php8-1] ) app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=9.1.15
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-9.1.15.tar.gz
+SLOT=10.0.2
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-10.0.2.tar.gz
 _eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=afb3cb967b517ce5fe35db69bc454325
+_md5_=855f281fb725cc453742abe5c01193bf
diff --git a/metadata/md5-cache/www-apps/drupal-7.89 b/metadata/md5-cache/www-apps/drupal-7.91
index 89702c3a71fb..7f54feed038b 100644
--- a/metadata/md5-cache/www-apps/drupal-7.89
+++ b/metadata/md5-cache/www-apps/drupal-7.91
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=7.89
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-7.89.tar.gz
+SLOT=7.91
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-7.91.tar.gz
 _eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=6c3d881420d2add40a5418ed2512ede7
+_md5_=7578c6dd648e77c086c2bdcfa5ce3f69
diff --git a/metadata/md5-cache/www-apps/drupal-9.2.18 b/metadata/md5-cache/www-apps/drupal-9.4.10
index 43ff2c91de92..3384415a8402 100644
--- a/metadata/md5-cache/www-apps/drupal-9.2.18
+++ b/metadata/md5-cache/www-apps/drupal-9.4.10
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install postinst prerm setup
 DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
 DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.drupal.org/
 INHERIT=webapp
 IUSE=+mysql postgres sqlite +uploadprogress vhosts
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=9.2.18
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-9.2.18.tar.gz
+SLOT=9.4.10
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-9.4.10.tar.gz
 _eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=c0c60d146ffcb6179eaf4d0ad51709d6
+_md5_=571e70e56bc5167b957e4061344af5e0
diff --git a/metadata/md5-cache/www-apps/drupal-8.9.20 b/metadata/md5-cache/www-apps/drupal-9.5.2
index ead1f5e87e60..433d3d0513a2 100644
--- a/metadata/md5-cache/www-apps/drupal-8.9.20
+++ b/metadata/md5-cache/www-apps/drupal-9.5.2
@@ -1,7 +1,7 @@
 DEFINED_PHASES=install postinst prerm setup
 DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
 DESCRIPTION=PHP-based open-source platform and content management system
-EAPI=7
+EAPI=8
 HOMEPAGE=https://www.drupal.org/
 INHERIT=webapp
 IUSE=+mysql postgres sqlite +uploadprogress vhosts
@@ -9,7 +9,7 @@ KEYWORDS=~amd64 ~x86
 LICENSE=GPL-2
 RDEPEND=dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml] virtual/httpd-php uploadprogress? ( dev-php/pecl-uploadprogress ) app-admin/webapp-config
 REQUIRED_USE=|| ( mysql postgres sqlite )
-SLOT=8.9.20
-SRC_URI=https://ftp.drupal.org/files/projects/drupal-8.9.20.tar.gz
+SLOT=9.5.2
+SRC_URI=https://ftp.drupal.org/files/projects/drupal-9.5.2.tar.gz
 _eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
-_md5_=afb3cb967b517ce5fe35db69bc454325
+_md5_=571e70e56bc5167b957e4061344af5e0
diff --git a/metadata/md5-cache/www-apps/gitea-1.18.5 b/metadata/md5-cache/www-apps/gitea-1.18.5
new file mode 100644
index 000000000000..29778133b264
--- /dev/null
+++ b/metadata/md5-cache/www-apps/gitea-1.18.5
@@ -0,0 +1,17 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare unpack
+DEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam )
+DESCRIPTION=A painless self-hosted Git service
+EAPI=8
+HOMEPAGE=https://gitea.io https://github.com/go-gitea/gitea
+IDEPEND=filecaps? ( sys-libs/libcap )
+INHERIT=fcaps go-module tmpfiles systemd flag-o-matic
+IUSE=+acct pam sqlite pie +filecaps
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0
+RDEPEND=acct? ( acct-group/git acct-user/git[gitea] ) pam? ( sys-libs/pam ) dev-vcs/git virtual/tmpfiles
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/go-gitea/gitea/releases/download/v1.18.5/gitea-src-1.18.5.tar.gz -> gitea-1.18.5.tar.gz
+_eclasses_=fcaps	da0130200e07aaecee121b85f4b9ea17	flag-o-matic	69394e25812406faa1f90edaf4969395	go-module	f2c9bcab49079a176b3ae061c94bb344	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=c36caa91ba2d300f0d65d411c1aa031c
diff --git a/metadata/md5-cache/www-apps/wordpress-6.2_rc1 b/metadata/md5-cache/www-apps/wordpress-6.2_rc1
new file mode 100644
index 000000000000..a9c9f89def57
--- /dev/null
+++ b/metadata/md5-cache/www-apps/wordpress-6.2_rc1
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst prerm setup
+DEPEND=|| ( virtual/httpd-cgi virtual/httpd-fastcgi ) app-admin/webapp-config
+DESCRIPTION=Wordpress PHP and MySQL based content management system (CMS)
+EAPI=8
+HOMEPAGE=https://wordpress.org/
+INHERIT=webapp
+IUSE=+akismet examples +themes vhosts vhosts
+LICENSE=GPL-2+
+RDEPEND=virtual/httpd-php || ( dev-lang/php[mysql] dev-lang/php[mysqli] ) app-admin/webapp-config
+SLOT=6.2_rc1
+SRC_URI=https://wordpress.org/wordpress-6.2-RC1.tar.gz
+_eclasses_=webapp	67df5bab481d0b9428f9ab7b3de690e4
+_md5_=90f723f2a3581269d6e0943371e78afc
diff --git a/metadata/md5-cache/www-client/lynx-2.9.0_pre10 b/metadata/md5-cache/www-client/lynx-2.9.0_pre10
index 67b5d76ef574..df6edd1338db 100644
--- a/metadata/md5-cache/www-client/lynx-2.9.0_pre10
+++ b/metadata/md5-cache/www-client/lynx-2.9.0_pre10
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:=[unicode(+)] sys-libs/zlib bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn:= ) nls? ( virtual/libintl ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( dev-libs/libgcrypt:= >=net-libs/gnutls-2.6.4:= ) )
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.10.tar.bz2 verify-sig? ( https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.10.tar.bz2.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=ee4e9f628c9962edd45986334098a782
diff --git a/metadata/md5-cache/www-client/lynx-2.9.0_pre11 b/metadata/md5-cache/www-client/lynx-2.9.0_pre11
index 5529c3d48220..e03a5a29b14a 100644
--- a/metadata/md5-cache/www-client/lynx-2.9.0_pre11
+++ b/metadata/md5-cache/www-client/lynx-2.9.0_pre11
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:=[unicode(+)] sys-libs/zlib brotli? ( app-arch/brotli:= ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn:= ) nls? ( virtual/libintl ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( dev-libs/libgcrypt:= >=net-libs/gnutls-2.6.4:= ) )
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.11.tar.bz2 verify-sig? ( https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.11.tar.bz2.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=0fea1ce063724324a3a0fcddc6f7f7ff
diff --git a/metadata/md5-cache/www-client/lynx-2.9.0_pre12-r1 b/metadata/md5-cache/www-client/lynx-2.9.0_pre12-r1
index a5100275ee97..c4b2f177c08c 100644
--- a/metadata/md5-cache/www-client/lynx-2.9.0_pre12-r1
+++ b/metadata/md5-cache/www-client/lynx-2.9.0_pre12-r1
@@ -11,5 +11,5 @@ LICENSE=GPL-2
 RDEPEND=sys-libs/ncurses:=[unicode(+)] sys-libs/zlib brotli? ( app-arch/brotli:= ) bzip2? ( app-arch/bzip2 ) idn? ( net-dns/libidn2:= ) nls? ( virtual/libintl ) ssl? ( !gnutls? ( dev-libs/openssl:= ) gnutls? ( dev-libs/libgcrypt:= >=net-libs/gnutls-2.6.4:= ) )
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.12.tar.bz2 verify-sig? ( https://invisible-mirror.net/archives/lynx/tarballs/lynx2.9.0dev.12.tar.bz2.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=d7006f4d1a926f093a44eb1c12008782
diff --git a/metadata/md5-cache/www-servers/apache-2.4.56 b/metadata/md5-cache/www-servers/apache-2.4.56
new file mode 100644
index 000000000000..f0944cc4e530
--- /dev/null
+++ b/metadata/md5-cache/www-servers/apache-2.4.56
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 ssl? ( || ( dev-libs/openssl:0 dev-libs/libressl:0 ) ) virtual/pkgconfig suexec? ( suexec-caps? ( sys-libs/libcap ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare setup
+DEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( libressl? ( dev-libs/apr-util[libressl] ) !libressl? ( dev-libs/apr-util[openssl] ) ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:0= ) kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) dev-libs/libpcre2
+DESCRIPTION=The Apache Web Server
+EAPI=7
+HOMEPAGE=https://httpd.apache.org/
+INHERIT=apache-2 systemd tmpfiles toolchain-funcs
+IUSE=lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ssl debug doc gdbm ldap libressl selinux ssl static suexec +suexec-caps suexec-syslog split-usr threads apache2_modules_access_compat apache2_modules_actions apache2_modules_alias apache2_modules_asis apache2_modules_auth_basic apache2_modules_auth_digest apache2_modules_auth_form apache2_modules_authn_anon apache2_modules_authn_core apache2_modules_authn_dbd apache2_modules_authn_dbm apache2_modules_authn_file apache2_modules_authn_socache apache2_modules_authz_core apache2_modules_authz_dbd apache2_modules_authz_dbm apache2_modules_authz_groupfile apache2_modules_authz_host apache2_modules_authz_owner apache2_modules_authz_user apache2_modules_autoindex apache2_modules_brotli apache2_modules_cache apache2_modules_cache_disk apache2_modules_cache_socache apache2_modules_cern_meta apache2_modules_charset_lite apache2_modules_cgi apache2_modules_cgid apache2_modules_dav apache2_modules_dav_fs apache2_modules_dav_lock apache2_modules_dbd apache2_modules_deflate apache2_modules_dir apache2_modules_dumpio apache2_modules_env apache2_modules_expires apache2_modules_ext_filter apache2_modules_file_cache apache2_modules_filter apache2_modules_headers +apache2_modules_http2 apache2_modules_ident apache2_modules_imagemap apache2_modules_include apache2_modules_info apache2_modules_lbmethod_byrequests apache2_modules_lbmethod_bytraffic apache2_modules_lbmethod_bybusyness apache2_modules_lbmethod_heartbeat apache2_modules_log_config apache2_modules_log_forensic apache2_modules_logio apache2_modules_lua apache2_modules_macro apache2_modules_md apache2_modules_mime apache2_modules_mime_magic apache2_modules_negotiation apache2_modules_proxy apache2_modules_proxy_ajp apache2_modules_proxy_balancer apache2_modules_proxy_connect apache2_modules_proxy_ftp apache2_modules_proxy_hcheck apache2_modules_proxy_html apache2_modules_proxy_http apache2_modules_proxy_scgi apache2_modules_proxy_http2 apache2_modules_proxy_fcgi apache2_modules_proxy_uwsgi apache2_modules_proxy_wstunnel apache2_modules_rewrite apache2_modules_ratelimit apache2_modules_remoteip apache2_modules_reqtimeout apache2_modules_session apache2_modules_session_cookie apache2_modules_session_crypto apache2_modules_session_dbd apache2_modules_setenvif apache2_modules_slotmem_shm apache2_modules_socache_memcache apache2_modules_socache_shmcb apache2_modules_speling apache2_modules_status apache2_modules_substitute systemd apache2_modules_unique_id apache2_modules_userdir apache2_modules_usertrack apache2_modules_unixd apache2_modules_version apache2_modules_vhost_alias apache2_modules_watchdog apache2_modules_xml2enc apache2_mpms_prefork apache2_mpms_event apache2_mpms_worker
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris
+LICENSE=Apache-2.0 Apache-1.1
+PDEPEND=~app-admin/apache-tools-2.4.56
+RDEPEND=acct-group/apache acct-user/apache dev-lang/perl >=dev-libs/apr-1.5.1:= =dev-libs/apr-util-1*:=[gdbm=,ldap?] virtual/libcrypt:= apache2_modules_brotli? ( >=app-arch/brotli-0.6.0:= ) apache2_modules_deflate? ( sys-libs/zlib ) apache2_modules_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_lua? ( lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) ) apache2_modules_md? ( >=dev-libs/jansson-2.10 ) apache2_modules_mime? ( app-misc/mime-types ) apache2_modules_proxy_http2? ( >=net-libs/nghttp2-1.2.1 kernel_linux? ( sys-apps/util-linux ) ) apache2_modules_session_crypto? ( libressl? ( dev-libs/apr-util[libressl] ) !libressl? ( dev-libs/apr-util[openssl] ) ) gdbm? ( sys-libs/gdbm:= ) ldap? ( =net-nds/openldap-2* ) selinux? ( sec-policy/selinux-apache ) ssl? ( !libressl? ( >=dev-libs/openssl-1.0.2:0= ) libressl? ( dev-libs/libressl:0= ) kernel_linux? ( sys-apps/util-linux ) ) systemd? ( sys-apps/systemd ) dev-libs/libpcre2 virtual/tmpfiles
+REQUIRED_USE=apache2_mpms_prefork? ( !apache2_mpms_event !apache2_mpms_worker !threads ) apache2_mpms_event? ( !apache2_mpms_prefork !apache2_mpms_worker threads ) apache2_mpms_worker? ( !apache2_mpms_prefork !apache2_mpms_event threads ) apache2_mpms_prefork? ( !apache2_modules_http2 ) apache2_modules_http2? ( ssl ) apache2_modules_lua? ( ^^ ( lua_single_target_lua5-1 lua_single_target_lua5-3 lua_single_target_lua5-4 ) ) apache2_modules_md? ( ssl ) apache2_modules_auth_form? ( apache2_modules_session ) apache2_modules_brotli? ( apache2_modules_filter ) apache2_modules_dav_fs? ( apache2_modules_dav ) apache2_modules_dav_lock? ( apache2_modules_dav ) apache2_modules_deflate? ( apache2_modules_filter ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_ext_filter? ( apache2_modules_filter ) apache2_modules_file_cache? ( apache2_modules_cache ) apache2_modules_lbmethod_byrequests? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_byrequests? ( apache2_modules_slotmem_shm ) apache2_modules_lbmethod_bytraffic? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_bybusyness? ( apache2_modules_proxy_balancer ) apache2_modules_lbmethod_heartbeat? ( apache2_modules_proxy_balancer ) apache2_modules_log_forensic? ( apache2_modules_log_config ) apache2_modules_logio? ( apache2_modules_log_config ) apache2_modules_cache_disk? ( apache2_modules_cache ) apache2_modules_cache_socache? ( apache2_modules_cache ) apache2_modules_md? ( apache2_modules_watchdog ) apache2_modules_mime_magic? ( apache2_modules_mime ) apache2_modules_proxy_ajp? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_proxy ) apache2_modules_proxy_balancer? ( apache2_modules_slotmem_shm ) apache2_modules_proxy_connect? ( apache2_modules_proxy ) apache2_modules_proxy_ftp? ( apache2_modules_proxy ) apache2_modules_proxy_hcheck? ( apache2_modules_proxy ) apache2_modules_proxy_hcheck? ( apache2_modules_watchdog ) apache2_modules_proxy_html? ( apache2_modules_proxy ) apache2_modules_proxy_html? ( apache2_modules_xml2enc ) apache2_modules_proxy_http? ( apache2_modules_proxy ) apache2_modules_proxy_http2? ( apache2_modules_proxy ) apache2_modules_proxy_scgi? ( apache2_modules_proxy ) apache2_modules_proxy_uwsgi? ( apache2_modules_proxy ) apache2_modules_proxy_fcgi? ( apache2_modules_proxy ) apache2_modules_proxy_wstunnel? ( apache2_modules_proxy ) apache2_modules_session_cookie? ( apache2_modules_session ) apache2_modules_session_dbd? ( apache2_modules_dbd ) apache2_modules_session_dbd? ( apache2_modules_session ) apache2_modules_socache_memcache? ( apache2_modules_cache ) apache2_modules_substitute? ( apache2_modules_filter )
+SLOT=2
+SRC_URI=mirror://apache/httpd/httpd-2.4.56.tar.bz2 https://dev.gentoo.org/~polynomial-c/dist/apache/gentoo-apache-2.4.46-r6-20210212.tar.bz2
+_eclasses_=apache-2	359f642e62a700cbf2dc9bd631957a25	autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	ssl-cert	f5f6841876ca76e24b95ff7b02b8381c	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=ba68624da292ea77b76d384a1f1e1cd8
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.5 b/metadata/md5-cache/www-servers/tomcat-10.1.5
index 3642e8fee2b1..49c7373ecfb9 100644
--- a/metadata/md5-cache/www-servers/tomcat-10.1.5
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.5
@@ -12,5 +12,5 @@ RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/glassfish-xmlrpc-api:0 >=dev-java/jak
 RESTRICT=test !test? ( test )
 SLOT=10.1
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.3.1/biz.aQute.bnd-6.3.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.3.1/biz.aQute.bndlib-6.3.1.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz.asc )
-_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=ebd449baaee72676e9a1b95c9d6ecae2
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.7 b/metadata/md5-cache/www-servers/tomcat-10.1.7
index a1daad5ed903..df1eebae6e59 100644
--- a/metadata/md5-cache/www-servers/tomcat-10.1.7
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.7
@@ -12,5 +12,5 @@ RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/jax-rpc-api:0 >=dev-java/jakartaee-mi
 RESTRICT=test !test? ( test )
 SLOT=10.1
 SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.7/src/apache-tomcat-10.1.7-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0/biz.aQute.bndlib-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.7/src/apache-tomcat-10.1.7-src.tar.gz.asc )
-_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=4715795a1d8c909468fb9b1a1abcce2b
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.85 b/metadata/md5-cache/www-servers/tomcat-8.5.85
index 25a03d71c710..cb915eaea909 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.85
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.85
@@ -12,5 +12,5 @@ RDEPEND=dev-java/eclipse-ecj:4.15 >=dev-java/tomcat-el-api-8.5.85:3.0 >=dev-java
 RESTRICT=test !test? ( test )
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.85/src/apache-tomcat-8.5.85-src.tar.gz.asc )
-_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=fea883419965a1bd9df29f3e9436c1d3
diff --git a/metadata/md5-cache/www-servers/tomcat-8.5.87 b/metadata/md5-cache/www-servers/tomcat-8.5.87
index 19b763e3e033..0747f378909f 100644
--- a/metadata/md5-cache/www-servers/tomcat-8.5.87
+++ b/metadata/md5-cache/www-servers/tomcat-8.5.87
@@ -12,5 +12,5 @@ RDEPEND=dev-java/eclipse-ecj:4.15 acct-group/tomcat acct-user/tomcat >=virtual/j
 RESTRICT=test !test? ( test )
 SLOT=8.5
 SRC_URI=mirror://apache/tomcat/tomcat-8/v8.5.87/src/apache-tomcat-8.5.87-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-8/v8.5.87/src/apache-tomcat-8.5.87-src.tar.gz.asc )
-_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=a0bf378037d796d2ac9e271322d4c57b
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.71-r1 b/metadata/md5-cache/www-servers/tomcat-9.0.71-r1
index 242444ee1e25..6999a55425f9 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.71-r1
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.71-r1
@@ -12,5 +12,5 @@ RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomc
 RESTRICT=test !test? ( test )
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.3.1/biz.aQute.bnd-6.3.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.3.1/biz.aQute.bndlib-6.3.1.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz.asc )
-_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=a4a3bd585289aa5efbf7577def6057c5
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.73 b/metadata/md5-cache/www-servers/tomcat-9.0.73
index 484df39f8efa..6117292e097c 100644
--- a/metadata/md5-cache/www-servers/tomcat-9.0.73
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.73
@@ -12,5 +12,5 @@ RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/jax-rpc-api:0 dev-java/wsdl4j:0 acct-
 RESTRICT=test !test? ( test )
 SLOT=9
 SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.73/src/apache-tomcat-9.0.73-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.4.0/biz.aQute.bnd-6.4.0.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.4.0/biz.aQute.bndlib-6.4.0.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.73/src/apache-tomcat-9.0.73-src.tar.gz.asc )
-_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=java-ant-2	3745cb8c0fe6525dafe8e2422a8fd501	java-pkg-2	a6b42ffd8b6827abbd8cf09329c2c8fb	java-utils-2	eefed04ac580a259ecda1fbd966640b7	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=6405cb34f29b28defc3e52fbefac6c60
diff --git a/metadata/md5-cache/x11-apps/luit-20221028 b/metadata/md5-cache/x11-apps/luit-20221028
index 6764ca868ee8..90178842b063 100644
--- a/metadata/md5-cache/x11-apps/luit-20221028
+++ b/metadata/md5-cache/x11-apps/luit-20221028
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib virtual/libiconv
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/luit/luit-20221028.tgz verify-sig? ( https://invisible-island.net/archives/luit/luit-20221028.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=71f99d7725cfeb198079e8537f4e5d35
diff --git a/metadata/md5-cache/x11-apps/luit-20230201 b/metadata/md5-cache/x11-apps/luit-20230201
index 0a017cefa6a1..4143e416d5a0 100644
--- a/metadata/md5-cache/x11-apps/luit-20230201
+++ b/metadata/md5-cache/x11-apps/luit-20230201
@@ -11,5 +11,5 @@ LICENSE=MIT
 RDEPEND=sys-libs/zlib virtual/libiconv
 SLOT=0
 SRC_URI=https://invisible-mirror.net/archives/luit/luit-20230201.tgz verify-sig? ( https://invisible-island.net/archives/luit/luit-20230201.tgz.asc )
-_eclasses_=verify-sig	85e14d0a93afa75c621382409ada8732
+_eclasses_=verify-sig	167258b573910fd3f5b71c5c52d66ab3
 _md5_=3251e49a70a76ee0ae07a2bf4a113776
diff --git a/metadata/md5-cache/x11-libs/motif-2.3.8-r5 b/metadata/md5-cache/x11-libs/motif-2.3.8-r5
new file mode 100644
index 000000000000..04ed1f508127
--- /dev/null
+++ b/metadata/md5-cache/x11-libs/motif-2.3.8-r5
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/flex dev-util/byacc sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=media-libs/libjpeg-turbo-1.5.3-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) x11-base/xorg-proto x11-misc/xbitmaps
+DESCRIPTION=The Motif user interface component toolkit
+EAPI=8
+HOMEPAGE=https://sourceforge.net/projects/motif/ https://motif.ics.com/
+INHERIT=autotools flag-o-matic toolchain-funcs multilib-minimal
+IUSE=examples jpeg +motif22-compatibility png static-libs unicode xft abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris
+LICENSE=LGPL-2.1+ MIT
+RDEPEND=>=x11-libs/libX11-1.6.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXext-1.3.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXmu-1.1.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXt-1.1.4[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] jpeg? ( >=media-libs/libjpeg-turbo-1.5.3-r2:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) png? ( >=media-libs/libpng-1.6.10:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) unicode? ( >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xft? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=x11-libs/libXft-2.3.1-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+SLOT=0
+SRC_URI=mirror://sourceforge/project/motif/Motif%202.3.8%20Source%20Code/motif-2.3.8.tar.gz https://dev.gentoo.org/~ulm/distfiles/motif-2.3.8-patches-5.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b
+_md5_=41f4e38cd6e638b195f2ebfe8550bd93
diff --git a/metadata/md5-cache/x11-terms/kitty-0.26.5-r1 b/metadata/md5-cache/x11-terms/kitty-0.26.5-r1
index 1a1e335ea29c..26a7b965ca8d 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.26.5-r1
+++ b/metadata/md5-cache/x11-terms/kitty-0.26.5-r1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.5/kitty-0.26.5.tar.xz verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v0.26.5/kitty-0.26.5.tar.xz.sig )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=f09972b2a96b34f6015a3c200935eb1f
diff --git a/metadata/md5-cache/x11-terms/kitty-0.27.1 b/metadata/md5-cache/x11-terms/kitty-0.27.1
index 37aed1dc06f2..3e51bed67cc4 100644
--- a/metadata/md5-cache/x11-terms/kitty-0.27.1
+++ b/metadata/md5-cache/x11-terms/kitty-0.27.1
@@ -14,5 +14,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_7 python_single_target_python3_8
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.27.1/kitty-0.27.1.tar.xz https://dev.gentoo.org/~ionen/distfiles/kitty-0.27.1-vendor.tar.xz verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v0.27.1/kitty-0.27.1.tar.xz.sig )
-_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=350a6338d46aea4ae81f6595cf318ea2
diff --git a/metadata/md5-cache/x11-terms/terminator-2.1.2 b/metadata/md5-cache/x11-terms/terminator-2.1.2
index 72528d233352..1db09e0fecd2 100644
--- a/metadata/md5-cache/x11-terms/terminator-2.1.2
+++ b/metadata/md5-cache/x11-terms/terminator-2.1.2
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( python_targets_python3_7 python_targets_python3_8 python_targe
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/gnome-terminator/terminator/releases/download/v2.1.2/terminator-2.1.2.tar.gz verify-sig? ( https://github.com/gnome-terminator/terminator/releases/download/v2.1.2/terminator-2.1.2.tar.gz.asc )
-_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=distutils-r1	3929d88685167435c587b740fdb5ec46	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	b4b50487424a81004f591f6c7e54bf4e	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=eb06ad9d4b2999ef47003eb035ea7bc7
diff --git a/metadata/md5-cache/x11-terms/xterm-377-r1 b/metadata/md5-cache/x11-terms/xterm-377-r1
index 9084f52fb349..ba57d399511d 100644
--- a/metadata/md5-cache/x11-terms/xterm-377-r1
+++ b/metadata/md5-cache/x11-terms/xterm-377-r1
@@ -12,5 +12,5 @@ LICENSE=MIT
 RDEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/xterm/xterm-377.tgz verify-sig? ( https://invisible-island.net/archives/xterm/xterm-377.tgz.asc )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fe337112134265cba5f929889b9aab88
diff --git a/metadata/md5-cache/x11-terms/xterm-378 b/metadata/md5-cache/x11-terms/xterm-378
index cb18b0d77f74..fe487c20189b 100644
--- a/metadata/md5-cache/x11-terms/xterm-378
+++ b/metadata/md5-cache/x11-terms/xterm-378
@@ -12,5 +12,5 @@ LICENSE=MIT
 RDEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/xterm/xterm-378.tgz verify-sig? ( https://invisible-island.net/archives/xterm/xterm-378.tgz.asc )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=fe337112134265cba5f929889b9aab88
diff --git a/metadata/md5-cache/x11-terms/xterm-379 b/metadata/md5-cache/x11-terms/xterm-379
index 86043ce96366..580b30794b62 100644
--- a/metadata/md5-cache/x11-terms/xterm-379
+++ b/metadata/md5-cache/x11-terms/xterm-379
@@ -12,5 +12,5 @@ LICENSE=MIT
 RDEPEND=kernel_linux? ( sys-libs/libutempter ) media-libs/fontconfig:1.0 >=sys-libs/ncurses-5.7-r7:= x11-apps/xmessage x11-libs/libICE x11-libs/libX11 x11-libs/libXaw x11-libs/libXft x11-libs/libxkbfile x11-libs/libXmu x11-libs/libXrender x11-libs/libXt unicode? ( x11-apps/luit ) Xaw3d? ( x11-libs/libXaw3d ) xinerama? ( x11-libs/libXinerama ) media-fonts/font-misc-misc x11-apps/rgb
 SLOT=0
 SRC_URI=https://invisible-island.net/archives/xterm/xterm-379.tgz verify-sig? ( https://invisible-island.net/archives/xterm/xterm-379.tgz.asc )
-_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	85e14d0a93afa75c621382409ada8732	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=desktop	021728fdc1b03b36357dbc89489e0f0d	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	6001248ef162a5fa2a21ce132a212f6b	verify-sig	167258b573910fd3f5b71c5c52d66ab3	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=7968b0dd66ef86658861a21b03c29d61
diff --git a/mpv-plugin/autoload/Manifest b/mpv-plugin/autoload/Manifest
index de69fca51e94..b935d2d6787d 100644
--- a/mpv-plugin/autoload/Manifest
+++ b/mpv-plugin/autoload/Manifest
@@ -1,3 +1,2 @@
-DIST mpv-0.34.1.tar.gz 3288356 BLAKE2B c0e5dc3cd23307449a526bd2cf0df5d870322aa1914a139784fd50d77274d42648a769ee4da3ba74e34a7a080700a5740dae13ed0827df1b3cfef36846f983ab SHA512 77ea349d6999f8cce9b5cce4cebd3506a224fc18ab08d22dd16bd34c34d012bb170879b268ddd62db40d116b4cc0b2d9d651b8097f387ed9115c426834cac77e
 DIST mpv-0.35.0.tar.gz 3365752 BLAKE2B 9b8dca943fc60a68f8474549d75c021dd9157195253c5ec09721969e500b2756c033e86975499f5632f0c943ac7bb54699f47340f0dee73d7284668d4419b17f SHA512 d5c1f734057f6b6c27e7f59de43cf7c0e7f813d842b8c7fd2ae1073dbe649c8187b7686df4efe928db2952e9f1efc171245e6f8780c1d9f174f4d7abff1e073a
 DIST mpv-0.35.1.tar.gz 3367913 BLAKE2B 706a2031a2ca973eb3a092ec7f62ba40ca4dfd78e3ffe5d6e432486b0018852b034152a21805be594054178ccb17856dafe2b860cddcc22d27df895d163871de SHA512 42f3564a9ed4d972d14b2c697b0163f06a8bb68a0606a86c34935181247c783e3cb62286b445799998def0919fb13fce8b8f6453f82652d5bfaea5929119127a
diff --git a/mpv-plugin/autoload/autoload-0.34.1.ebuild b/mpv-plugin/autoload/autoload-0.34.1.ebuild
deleted file mode 100644
index f82929a015e3..000000000000
--- a/mpv-plugin/autoload/autoload-0.34.1.ebuild
+++ /dev/null
@@ -1,25 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-USE_MPV="rdepend"
-MPV_REQ_USE="lua"
-inherit mpv-plugin
-
-DESCRIPTION="Loads playlist entries before and after the the currently played file"
-HOMEPAGE="https://github.com/mpv-player/mpv/tree/master/TOOLS/lua"
-
-# use the already available mpv tarball
-SRC_URI="https://github.com/mpv-player/mpv/archive/v${PV}.tar.gz -> mpv-${PV}.tar.gz"
-
-# since this comes from mpv, use its licenses
-LICENSE="LGPL-2.1+ GPL-2+ BSD ISC"
-KEYWORDS="~amd64"
-
-# lock mpv version
-RDEPEND="~media-video/mpv-${PV}"
-
-S="${WORKDIR}/mpv-${PV}/TOOLS/lua"
-
-MPV_PLUGIN_FILES=( ${PN}.lua )
diff --git a/net-analyzer/fprobe/fprobe-1.1-r5.ebuild b/net-analyzer/fprobe/fprobe-1.1-r6.ebuild
index 1aee1c4aa4f3..b873e1f9619b 100644
--- a/net-analyzer/fprobe/fprobe-1.1-r5.ebuild
+++ b/net-analyzer/fprobe/fprobe-1.1-r6.ebuild
@@ -1,10 +1,12 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+inherit autotools
+
 DESCRIPTION="libpcap-based tool to collect network traffic data and emit it as NetFlow flows"
-HOMEPAGE="http://fprobe.sourceforge.net"
+HOMEPAGE="https://fprobe.sourceforge.net"
 SRC_URI="mirror://sourceforge/fprobe/${P}.tar.bz2"
 
 LICENSE="GPL-2"
@@ -20,6 +22,13 @@ PATCHES=(
 	"${FILESDIR}"/fprobe-1.1-setgroups.patch
 )
 
+src_prepare() {
+	default
+
+	# Clang 16, bug #899924
+	eautoreconf
+}
+
 src_configure() {
 	econf \
 		$(use_enable debug) \
diff --git a/net-dialup/lrzsz/files/lrzsz-0.12.20-configure-clang16.patch b/net-dialup/lrzsz/files/lrzsz-0.12.20-configure-clang16.patch
new file mode 100644
index 000000000000..bda489d11dd4
--- /dev/null
+++ b/net-dialup/lrzsz/files/lrzsz-0.12.20-configure-clang16.patch
@@ -0,0 +1,13 @@
+https://bugs.gentoo.org/898970
+--- a/configure.in
++++ b/configure.in
+@@ -186,7 +186,8 @@ AC_CACHE_VAL(lrzsz_cv_sys_ftime_ok,
+ #include <sys/types.h>
+ #include <sys/timeb.h>
+ #include <stdio.h>
+-main ()
++#include <stdlib.h>
++int main (void)
+ {
+   struct timeb s, slast;
+   int c = 0;
diff --git a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild b/net-dialup/lrzsz/lrzsz-0.12.20-r5.ebuild
index 9134cf53053f..ba988723b913 100644
--- a/net-dialup/lrzsz/lrzsz-0.12.20-r4.ebuild
+++ b/net-dialup/lrzsz/lrzsz-0.12.20-r5.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
 
-inherit autotools flag-o-matic toolchain-funcs
+inherit autotools toolchain-funcs
 
 DESCRIPTION="Communication package providing the X, Y, and ZMODEM file transfer protocols"
 HOMEPAGE="https://www.ohse.de/uwe/software/lrzsz.html"
@@ -23,6 +23,7 @@ PATCHES=(
 	"${FILESDIR}"/${P}-automake-1.13.patch
 	"${FILESDIR}"/${P}-gettext-0.20.patch
 	"${FILESDIR}"/${P}-AR.patch
+	"${FILESDIR}"/${P}-configure-clang16.patch
 )
 
 DOCS=( AUTHORS COMPATABILITY ChangeLog NEWS \
@@ -43,7 +44,6 @@ src_prepare() {
 
 src_configure() {
 	tc-export CC
-	append-flags -Wstrict-prototypes
 
 	econf $(use_enable nls)
 }
diff --git a/net-im/mattermost-desktop-bin/Manifest b/net-im/mattermost-desktop-bin/Manifest
index 1037658ca78e..64cc6e78a0b0 100644
--- a/net-im/mattermost-desktop-bin/Manifest
+++ b/net-im/mattermost-desktop-bin/Manifest
@@ -1,4 +1,4 @@
 DIST mattermost-desktop-5.2.2-linux-arm64.tar.gz 116257022 BLAKE2B 42019e849b415870e0f3cda7fd9c0e559945456ac4d06319edf074aecc9ca9bb330aa8547104d4d132f00e237324b6c9bc94dd8e1cd1bc83f50ab50f094a7fc3 SHA512 67f32eff87eae54c4cbfe2ffbec3aca1f6be39836d4e912870809a628888bbe12c2c30a16c7abc1caab0bba77c1f1b97baa01ee10d3f91615b89a57041a4c64a
 DIST mattermost-desktop-5.2.2-linux-x64.tar.gz 115646636 BLAKE2B f3d01c913205dcf2c14cfcfcfc8eba06909c36446a8d6f450270f50328adaf585c5eefa68de212fcc61d012d74b69053790ba9494ee291a90c2b382b530e2e23 SHA512 5ef578c2af8afcd55b75f93904eead8257c0f1e9614de34a13705da2c8ce8f0da2ea57cc62b1fffb12b8effa2a2a98bb200c43a7f43635dc910fa91f7e629f35
-DIST mattermost-desktop-5.3.0-rc.4-linux-arm64.tar.gz 99854828 BLAKE2B c9a0f25160a1cdee2420b8c3d726c28ed41ce5a94c2ccc5521d40fb1c3c66c996d25829accf0221d71b860e0d1a82ed4dc3d827ff0936649c6d7b2460a0e5ab9 SHA512 7248efc865f7965d2e31fbea32f1dd21b87ce25dc144dcdbe543a396b90710452ed4daf2a00e04725207c046d84c24ef7ac93e6927c4f1e817bc7ffe6b9df935
-DIST mattermost-desktop-5.3.0-rc.4-linux-x64.tar.gz 99648394 BLAKE2B f834ceba66134e1ef8cbaa93b3a516f932329439a20025cc5ecd95761148c05246b819a0b833b43284143dbb40e02df8763c0f0be114678ea645c0edc71cb142 SHA512 112c829e92c14859c3e98adba2e0f479f5f2adeb9e93a4e27c1c1ff038122b5d3fa7d09190dd24463b5de914a9675b7325055468c28774917bc8cf9ac59ec4b9
+DIST mattermost-desktop-5.3.0-rc.5-linux-arm64.tar.gz 99875981 BLAKE2B 8d8da6b5e3ebc35ae8edadd9f9eaa995471b8bd048f3fae3956914ef299bb21fb28be2457b6b9cdc1db4da108a63195f2049602904362520435e0dcfe5fa84f3 SHA512 d5646c56923268e296b0b676a709244ef3dd6742144bae024cbcea79bb87909d1c4f3977d2e626379b5114f873c8975851bb768c19324fdf44fadfc6c5a8feef
+DIST mattermost-desktop-5.3.0-rc.5-linux-x64.tar.gz 99666416 BLAKE2B 224c4b91561f3dd994f688a6dc8c5d24f7feca4c6dd333f6c2600e12e666a96771a8b631e3150fb96461dfefa6bcbde9d1a1350f695f0d0b36bdbe94590facfe SHA512 c1ee6b96accbc1c19d810bf7a76b9d777e7d75516d96be0fa501ebe18cc92974ac3d07bb01970fc2ab009062ecf637818f49367e6ab500d690aca95da2bd9a13
diff --git a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.3.0_rc4-r1.ebuild b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.3.0_rc5.ebuild
index 6239ac543889..6239ac543889 100644
--- a/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.3.0_rc4-r1.ebuild
+++ b/net-im/mattermost-desktop-bin/mattermost-desktop-bin-5.3.0_rc5.ebuild
diff --git a/net-libs/gsoap/Manifest b/net-libs/gsoap/Manifest
index 79aeb1b7c7c3..40a2e2fad010 100644
--- a/net-libs/gsoap/Manifest
+++ b/net-libs/gsoap/Manifest
@@ -1,2 +1,2 @@
-DIST gsoap_2.8.124.zip 35216183 BLAKE2B 7e2c2776bc7210d249e426e8f4bd0ba0c1e06bb337460f9bbfaf8a9a62c12ac7134e619cda16344a833ba71787e3c55c911b3c93363d40a60ef75cee58126cca SHA512 a91ff0317e87ba2f899c18bc54c4219cf9d99e31a373aaa5d1d91217df6edd95473c7b4400989aa55baf84ede2b9a65e8a2e3419823e3ddeebe44f0b26a7a8ba
 DIST gsoap_2.8.125.zip 35269376 BLAKE2B f548a228a676d52dabf831f61079a38394be3b003c4cbf998ea45317d561cc5a5c9880cedbb1b9548f520cf18c0dac658c48f4736faa38434c84f4a8f561f3b9 SHA512 76e483228424276687a6ca77ae0e93a71b184f202866948d35de179db40f5af2ee63e31c2ab304b2f26318fc5e970ac0296bb8bbd988363ee5e8da70458c6e31
+DIST gsoap_2.8.126.zip 35259864 BLAKE2B 4ae0804c9c01bf620536b93a5743baafd9b2c79a1d20da4591b6fa3fad5936166a511168f246541cfde5a79bd4af3ad6eafb06d4ead9723ea73800b4a5edaaf9 SHA512 736e8f6b16ae62f89b717578731332612f542fe5e60c64144c943d80658179dce480f50d4b5c7cc6a088364e01beeb9f0123761a0404d2f349fe0d4149a285f8
diff --git a/net-libs/gsoap/files/gsoap-2.8.91-shared_libs.patch b/net-libs/gsoap/files/gsoap-2.8.91-shared_libs.patch
deleted file mode 100644
index 1fcdeeb69844..000000000000
--- a/net-libs/gsoap/files/gsoap-2.8.91-shared_libs.patch
+++ /dev/null
@@ -1,142 +0,0 @@
---- gsoap-2.8/configure.ac
-+++ gsoap-2.8/configure.ac
-@@ -17,7 +17,7 @@
- AC_PROG_YACC
- AC_PROG_CPP
- AC_PROG_RANLIB
--#AM_PROG_LIBTOOL
-+AM_PROG_LIBTOOL
- AC_PROG_LN_S
- AC_PROG_AWK
- AC_PROG_INSTALL
-@@ -307,15 +307,17 @@
-     WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lgnutls -lgcrypt -lgpg-error -lz"
-     SAMPLE_INCLUDES=
-     SAMPLE_SSL_LIBS="-lgnutls -lgcrypt -lgpg-error -lz"
--    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
-   else
-     AC_MSG_RESULT(no)
-     WSDL2H_EXTRA_FLAGS="-DWITH_OPENSSL -DWITH_GZIP"
-     # compile with wsdl2h when OPENSSL is available
--    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lssl -lcrypto -lz"
-+    WSDL2H_EXTRA_LIBS="${WSDL2H_EXTRA_LIBS} -lcrypto"
-     SAMPLE_INCLUDES=
-     SAMPLE_SSL_LIBS="-lssl -lcrypto -lz"
--    WSDL2H_SOAP_CPP_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_STATIC_LIB="libgsoapssl++.a"
-+    WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
-   fi
-   if test -n "$ZLIB"; then
-     WSDL2H_EXTRA_FLAGS="-I${ZLIB}/include ${WSDL2H_EXTRA_FLAGS}"
-@@ -334,7 +336,8 @@
-   WSDL2H_EXTRA_FLAGS=
-   SAMPLE_SSL_LIBS=
-   SAMPLE_INCLUDES=
--  WSDL2H_SOAP_CPP_LIB="libgsoap++.a"
-+  WSDL2H_SOAP_CPP_STATIC_LIB="libgsoap++.a"
-+  WSDL2H_SOAP_CPP_SHARED_LIB="libgsoapssl++.la"
- fi
- AM_CONDITIONAL(WITH_OPENSSL, test "x$with_openssl" = "xyes" -a "x$with_gnutls" != "xyes")
- AC_SUBST(WITH_OPENSSL)
-@@ -342,7 +345,8 @@
- AC_SUBST(WSDL2H_EXTRA_LIBS)
- AC_SUBST(SAMPLE_INCLUDES)
- AC_SUBST(SAMPLE_SSL_LIBS)
--AC_SUBST(WSDL2H_SOAP_CPP_LIB)
-+AC_SUBST(WSDL2H_SOAP_CPP_SHARED_LIB)
-+AC_SUBST(WSDL2H_SOAP_CPP_STATIC_LIB)
- 
- # enable the compile of the samples
- AC_ARG_ENABLE(samples,
---- gsoap-2.8/gsoap/Makefile.am
-+++ gsoap-2.8/gsoap/Makefile.am
-@@ -49,6 +49,29 @@
- libgsoapssl___a_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
- libgsoapssl___a_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_NO_C_LOCALE) $(SOAPCPP2_IPV6) $(SOAPCPP2_IPV6_V6ONLY) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
- 
-+lib_LTLIBRARIES = libgsoap.la libgsoap++.la libgsoapck.la libgsoapck++.la libgsoapssl.la libgsoapssl++.la
-+SOVERSION = 0
-+libgsoap_la_SOURCES = stdsoap2.c dom.c
-+libgsoap_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
-+libgsoap_la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoap___la_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp
-+libgsoap___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform)
-+libgsoap___la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapck_la_SOURCES = stdsoap2_ck.c dom.c
-+libgsoapck_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-+libgsoapck_la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapck___la_SOURCES = stdsoap2_ck_cpp.cpp dom_cpp.cpp
-+libgsoapck___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) -DWITH_COOKIES
-+libgsoapck___la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapssl_la_SOURCES = stdsoap2_ssl.c dom.c
-+libgsoapssl_la_CFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
-+libgsoapssl_la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapssl_la_LIBADD = -lssl -lcrypto -lz
-+libgsoapssl___la_SOURCES = stdsoap2_ssl_cpp.cpp dom_cpp.cpp
-+libgsoapssl___la_CXXFLAGS = $(SOAPCPP2_DEBUG) $(SOAPCPP2_NONAMESPACES) $(SOAPCPP2_IPV6) -D$(platform) $(WSDL2H_EXTRA_FLAGS) -DWITH_DOM -DWITH_COOKIES
-+libgsoapssl___la_LDFLAGS = -version-info $(SOVERSION)
-+libgsoapssl___la_LIBADD = -lssl -lcrypto -lz
-+
- BUILT_SOURCES = stdsoap2_cpp.cpp dom_cpp.cpp stdsoap2_ck.c stdsoap2_ck_cpp.cpp stdsoap2_ssl.c stdsoap2_ssl_cpp.cpp
- 
- include_HEADERS = stdsoap2.h
---- gsoap-2.8/gsoap/samples/autotest/Makefile.am
-+++ gsoap-2.8/gsoap/samples/autotest/Makefile.am
-@@ -14,7 +14,7 @@
- WSDLINPUT=$(top_srcdir)/gsoap/samples/autotest/examples.wsdl
- SOAPHEADER=$(top_srcdir)/gsoap/samples/autotest/examples.h
- SOAP_CPP_SRC=soapC.cpp soapServer.cpp
--SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
- 
- $(SOAP_CPP_SRC) : $(WSDLINPUT)
- 	$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
-@@ -40,6 +40,6 @@
- autotest_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
- autotest_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
- autotest_SOURCES=$(SOAP_CPP_SRC) soapTester.cpp duration.cpp long_time.cpp struct_tm.cpp struct_tm_date.cpp
--autotest_LDADD=$(SOAP_CPP_LIB) $(SAMPLE_EXTRA_LIBS)
-+autotest_LDADD=$(SOAP_CPP_SHARED_LIB) $(SAMPLE_EXTRA_LIBS)
- 
- CLEANFILES= *~ *.h *.cpp *.xml *.log *.nsmap
---- gsoap-2.8/gsoap/samples/databinding/Makefile.am
-+++ gsoap-2.8/gsoap/samples/databinding/Makefile.am
-@@ -14,7 +14,7 @@
- WSDLINPUT=$(top_srcdir)/gsoap/samples/databinding/address.xsd
- SOAPHEADER=$(top_srcdir)/gsoap/samples/databinding/address.h
- SOAP_CPP_SRC=addressC.cpp
--SOAP_CPP_LIB=$(top_builddir)/gsoap/libgsoap++.a
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/libgsoap++.a
- 
- $(SOAP_CPP_SRC) : $(WSDLINPUT)
- 	$(WSDL) $(WSDL_FLAGS) $(WSDLINPUT)
-@@ -28,6 +28,6 @@
- address_CPPFLAGS=$(C_DEBUG_FLAGS) -D$(platform)
- address_CXXFLAGS=$(WSDL2H_EXTRA_FLAGS)
- address_SOURCES=$(SOAP_CPP_SRC) address.cpp
--address_LDADD=$(SOAP_CPP_LIB)
-+address_LDADD=$(SOAP_CPP_SHARED_LIB)
- 
- CLEANFILES= *~ address.h *C.cpp *H.h *Stub.h *.nsmap
---- gsoap-2.8/gsoap/wsdl/Makefile.am
-+++ gsoap-2.8/gsoap/wsdl/Makefile.am
-@@ -10,7 +10,7 @@
- AM_LDFLAGS=-L$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
- AM_CPPFLAGS=-I$(top_srcdir)/gsoap -I$(top_srcdir)/gsoap/plugin
- SOAP=$(top_builddir)/gsoap/src/soapcpp2$(EXEEXT)
--SOAP_CPP_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_LIB)
-+SOAP_CPP_SHARED_LIB=$(top_builddir)/gsoap/$(WSDL2H_SOAP_CPP_SHARED_LIB)
- SOAP_CPP_SRC=wsdlC.cpp
- SOAPHEADER=$(top_srcdir)/gsoap/wsdl/wsdl.h
- SOAP_FLAGS=-SC -pwsdl -I$(top_srcdir)/gsoap/wsdl -I$(top_srcdir)/gsoap/import
-@@ -29,7 +29,7 @@
- wsdl2h_CXXFLAGS=$(C_DEBUG_FLAGS) $(SOAPCPP2_INCLUDE_XLOCALE) $(SOAPCPP2_NO_C_LOCALE) $(WSDL2H_EXTRA_FLAGS) $(WSDL2H_IMPORTPATH)
- wsdl2h_CPPFLAGS=$(AM_CPPFLAGS) $(SOAPCPP2_NONAMESPACES) -D$(platform)
- wsdl2h_SOURCES=wsdl2h.cpp wsdl.cpp wadl.cpp schema.cpp types.cpp service.cpp soap.cpp mime.cpp wsp.cpp bpel.cpp $(SOAP_CPP_SRC)
--wsdl2h_LDADD=$(SOAP_CPP_LIB) $(WSDL2H_EXTRA_LIBS)
-+wsdl2h_LDADD=$(SOAP_CPP_SHARED_LIB) $(WSDL2H_EXTRA_LIBS)
- if WITH_OPENSSL
- wsdl2h_SOURCES+=$(top_srcdir)/gsoap/plugin/httpda.c $(top_srcdir)/gsoap/plugin/smdevp.c
- wsdl2h_LDADD+=-lpthread
diff --git a/net-libs/gsoap/gsoap-2.8.124.ebuild b/net-libs/gsoap/gsoap-2.8.126.ebuild
index 2ecb4ead9bf4..babd6cfd75f2 100644
--- a/net-libs/gsoap/gsoap-2.8.124.ebuild
+++ b/net-libs/gsoap/gsoap-2.8.126.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Liguros Authors
+# Copyright 2022-2023 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
@@ -32,9 +32,6 @@ DEPEND="${RDEPEND}
 PATCHES=(
 	# Fix Pre-ISO headers
 	"${FILESDIR}/${PN}-2.7.10-fedora-install_soapcpp2_wsdl2h_aux.patch"
-
-	# enable shared libs https://bugs.gentoo.org/583398
-	"${FILESDIR}/${PN}-2.8.91-shared_libs.patch"
 )
 
 S="${WORKDIR}/${MY_P}"
diff --git a/net-misc/asterisk/Manifest b/net-misc/asterisk/Manifest
index fc6b107aac4b..a6c0e1a51bea 100644
--- a/net-misc/asterisk/Manifest
+++ b/net-misc/asterisk/Manifest
@@ -1,5 +1,5 @@
-DIST asterisk-18.15.1.tar.gz 10496416 BLAKE2B 670400b517e0447c4e8bd08359d60793600283bebdd9d69253ac181b47e564cb54fe2cf76c3c8f755004e3d3a46bad0804e73ec3842079c62ccdb34789370539 SHA512 2b0818e7863a9173d68e05fd946e378dc4f8a843ba1d3eb91d1590387e2919d50887e7724e9ebbe521315560a1b13af03bfc6683d28c8443da0d2ccb2608923e
 DIST asterisk-18.16.0.tar.gz 10557705 BLAKE2B b7a72de0d11f6375ab13c46ccb818f4376a3ac944d120110b6c89a169bb322a6e5d9fcc704b9fe6c4339a7acf2e724998635acf6ef75475d3e0163aafd41ddc7 SHA512 5530390e5cc6d6aa8e669a691a159f1c30edd799bdd50c808cf6782cbd17e170dec2994b45ea9e37333bef966490b288027733c1c1ef40933a4b779dbff31fbe
+DIST asterisk-18.17.0.tar.gz 10573937 BLAKE2B 253d9de2c35679242a48611c32eecda03f0090cde0724f4dd92998164ba843df68c4b7d92a3e2bf015bc98c2fa145eb7f6d0b7a36138a352315cec28bc360675 SHA512 c7c2ebf15ae02e12727725a93fa1a4f29b2f3df44c2ac646edb0e2fdab0be6159474f1b2e81d9d393dfcae805d389b53f68b7769d8d3f88b96a8107fd5c259ce
 DIST asterisk-19.7.1.tar.gz 10252834 BLAKE2B 8423ce32c854c1902be46f75928f61b9727c7191e0fdc9e92524903b503aca20e889326dff22a1ed145a0516ca7275db0146265c7220e21a1196a22d86bb7ff6 SHA512 2504b428b399158a46195787780c2c3e086763ebddc9f95aceca0814ebffbf582e55f80c7ff829db16e9336102e76b34504c6cbabbc8c1e228204163669a57a9
 DIST asterisk-19.8.0.tar.gz 10285965 BLAKE2B b88a7884ad98feec2d10d4b63bae2e412d06ec0a5564b36cdd9142e112b873134d11b0d825deccc0a8369f193f05e129ce6cdb52cfcae92d009f697c13350d94 SHA512 6ea90eb0465e5f71b21008288a3f544d912104c4b935e8a8f6e86272e36ffa50f1da23102503800e7a7798990accf982f3151c5f4623caa7bffc73b72a6dcc6f
 DIST asterisk-20.0.1.tar.gz 10264465 BLAKE2B ee41b8cb816c1d8b6d0bd40942a0672190440b161cf5f55c5ad84689a200d27c81e934e98420bd8ab8d82823bde74aec00985fed00096d25b0c232df0ef1f19d SHA512 f6386071595188a71aa2b6c1ff7483081fc3c1ffa1e759270de58d5af13fcb7d7b5791474655c606baddc520bdf3bb990d1805777da1ce643a8cf55aeda1130f
diff --git a/net-misc/asterisk/asterisk-18.15.1.ebuild b/net-misc/asterisk/asterisk-18.17.0.ebuild
index 0e7836358ed8..02774d09bb2a 100644
--- a/net-misc/asterisk/asterisk-18.15.1.ebuild
+++ b/net-misc/asterisk/asterisk-18.17.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Liguros Authors
+# Copyright 2021-2023 Liguros Authors
 # Distributed under the terms of the GNU General Public License v2
 EAPI=8
 
diff --git a/net-misc/memcached/Manifest b/net-misc/memcached/Manifest
index 1936b5562924..29fdcbe469bf 100644
--- a/net-misc/memcached/Manifest
+++ b/net-misc/memcached/Manifest
@@ -1,3 +1,4 @@
 DIST memcached-1.6.16.tar.gz 1054877 BLAKE2B 6052153a0442df1e7fcd8a959184c6ef1ca5ca26ef8c145144f8d26d4ded971e19bfd7a310f80e7b1cded840ebe95626a8714b583e156111ba68ae4721bda0c2 SHA512 cacd71d11aaa575361b83b5c565b6d665cac7a6dc6768af209d5108620d6883a7b3159351b7eab6da034a15162fa71fefe8024e41a1f46911acd1ca3aa23b209
 DIST memcached-1.6.17.tar.gz 1713186 BLAKE2B 0dfb473448912b5ce87485ee813f7f026a5bbdc6570b0616a69551e3adeacb04461359d492d975283182e2b338fa32e416b25b5c874b8088a0836766728c05ae SHA512 90ddd1e0dac3eb27273c1ee0bf6a7f75248f0267bca37b88455ff48727ab4f9db07382484d1e0c9b4a0126198b147f53aea4c993259ac608e8de393e11dad673
 DIST memcached-1.6.18.tar.gz 1081928 BLAKE2B edfaf02cdd3b13930d473fbc4475484602b70bca323f28636b1770780be34fdb325c70d0b0ba7f8d92233aab4dac8a5537be84276489be6a803e1d93d1dc34ab SHA512 85e5a5e7c901b02158ea20cc58f2e7e6ba4806c40a0105185140b31fa40f3ce0fc704f6f17ea4a425a9ff543f9d30092aadbb202ea4ca46476c151e65eac97e6
+DIST memcached-1.6.19.tar.gz 2599941 BLAKE2B a66eef916b1d540558cf6487363b95a4228784d921bc0987da803c8d3897ad2ef22ef9949d95251b92b98390d900d4ca26a88862cbf33b8e5d624f3f32cb00d2 SHA512 60d93065e0ef2b17e9da5370a497a4fbfc64c0af70e14fdfdab60c0c94c0b19e30da31d615e19565474c278141a4cb401c65fd79bd70947dd96a9fee81824a74
diff --git a/net-misc/memcached/memcached-1.6.19.ebuild b/net-misc/memcached/memcached-1.6.19.ebuild
new file mode 100644
index 000000000000..6cee9574b9a2
--- /dev/null
+++ b/net-misc/memcached/memcached-1.6.19.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+inherit autotools flag-o-matic systemd
+
+MY_PV="${PV/_rc/-rc}"
+MY_P="${PN}-${MY_PV}"
+
+DESCRIPTION="High-performance, distributed memory object caching system"
+HOMEPAGE="http://memcached.org/"
+SRC_URI="https://www.memcached.org/files/${MY_P}.tar.gz
+	"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
+IUSE="debug sasl seccomp selinux slabs-reassign ssl test" # hugetlbfs later
+
+RDEPEND=">=dev-libs/libevent-1.4:=
+	dev-lang/perl
+	sasl? ( dev-libs/cyrus-sasl )
+	seccomp? ( sys-libs/libseccomp )
+	selinux? ( sec-policy/selinux-memcached )
+	ssl? ( >=dev-libs/openssl-1.1.0g:= )"
+DEPEND="${RDEPEND}
+	acct-user/memcached
+	test? ( virtual/perl-Test-Harness >=dev-perl/Cache-Memcached-1.24 ssl? ( dev-perl/IO-Socket-SSL ) )"
+
+S="${WORKDIR}/${MY_P}"
+
+RESTRICT="!test? ( test )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-1.2.2-fbsd.patch"
+	"${FILESDIR}/${PN}-1.4.0-fix-as-needed-linking.patch"
+	"${FILESDIR}/${PN}-1.4.4-as-needed.patch"
+	"${FILESDIR}/${PN}-1.4.17-EWOULDBLOCK.patch"
+)
+
+src_prepare() {
+	default
+
+	sed -i -e 's,-Werror,,g' configure.ac || die
+	sed -i -e 's,AM_CONFIG_HEADER,AC_CONFIG_HEADERS,' configure.ac || die
+
+	eautoreconf
+
+	use slabs-reassign && append-flags -DALLOW_SLABS_REASSIGN
+
+	# Tweak upstream systemd unit to use Gentoo variables/envfile.
+	# As noted by bug #587440
+	sed -i -e '/^ExecStart/{
+			s,{USER},{MEMCACHED_RUNAS},g;
+			s,{CACHESIZE},{MEMUSAGE},g;
+			s,OPTIONS,MISC_OPTS,g;
+		};
+		/Environment=/{s,OPTIONS,MISC_OPTS,g;};
+		/EnvironmentFile=/{s,/sysconfig/,/conf.d/,g;};
+		' \
+		"${S}"/scripts/memcached.service
+}
+
+src_configure() {
+	econf \
+		--disable-docs \
+		$(use_enable sasl) \
+		$(use_enable ssl tls)
+	# The xml2rfc tool to build the additional docs requires TCL :-(
+	# `use_enable doc docs`
+}
+
+src_compile() {
+	# There is a heavy degree of per-object compile flags
+	# Users do NOT know better than upstream. Trying to compile the testapp and
+	# the -debug version with -DNDEBUG _WILL_ fail.
+	append-flags -UNDEBUG -pthread
+	emake testapp memcached-debug CFLAGS="${CFLAGS}"
+
+	filter-flags -UNDEBUG
+	emake
+}
+
+src_test() {
+	emake -j1 test
+}
+
+src_install() {
+	emake DESTDIR="${D}" install
+	dobin scripts/memcached-tool
+	use debug && dobin memcached-debug
+
+	dodoc AUTHORS ChangeLog NEWS README.md doc/{CONTRIBUTORS,*.txt}
+
+	newconfd "${FILESDIR}/memcached.confd" memcached
+	newinitd "${FILESDIR}/memcached.init2" memcached
+	systemd_dounit "${S}/scripts/memcached.service"
+}
+
+pkg_postinst() {
+	elog "With this version of Memcached Gentoo now supports multiple instances."
+	elog "To enable this you should create a symlink in /etc/init.d/ for each instance"
+	elog "to /etc/init.d/memcached and create the matching conf files in /etc/conf.d/"
+	elog "Please see Gentoo bug #122246 for more info"
+}
diff --git a/net-misc/sb-hosts/Manifest b/net-misc/sb-hosts/Manifest
index 5dcf195f4da3..0421f3457bbb 100644
--- a/net-misc/sb-hosts/Manifest
+++ b/net-misc/sb-hosts/Manifest
@@ -1,2 +1,2 @@
-DIST sb-hosts-3.12.11.tar.gz 28515854 BLAKE2B 46201b5f88ca150ae82ea129f1fec5057aaab96176a1f0bc6e8dcd91d1fe50d5d3bb98b18f50c075023d5230834aa4fdbd71d44b0b51865c410379f01f657c55 SHA512 18ec99d852e669bcd5ea0b54ff92b65b084c2d4ca1f3880f07a572b88489c788cb121a3571fc991c477d21c655f426f4584e84cebd548e9a7b87c28ea485b977
 DIST sb-hosts-3.12.12.tar.gz 28567083 BLAKE2B 0b40e0f634653f63551c7ef6c0199d6a8e87495fce229f90e6d6c9c79b5ba12f310b81b79655808cee3613274e41b2c1e268cdf92449a896dfa29a5deddfced4 SHA512 092308295d35b38047bbad03c76056efa53475c4d5a0d70a85e648a178eb276239d0833d01177c5db86bba3ebbcc8282273822ec3cd87668f0f278e1f24298bb
+DIST sb-hosts-3.12.13.tar.gz 28805534 BLAKE2B b2e65e6c78ab52fbd5456d2cb9218d9a26df294b4cf74c915435e70b7cb0d12d65ddfd316d2cdbaf707e30336638a2e60de976f3b98b580f887395c347497fdd SHA512 9b1fee896ac93e6ca7cec2eb0a775da0b7d40e6a2369cf06088829f06617091a2d0a36519f171e68e64ab2a892f84fe9b771e08e003c6001a1e8e4567abb765a
diff --git a/net-misc/sb-hosts/sb-hosts-3.12.11.ebuild b/net-misc/sb-hosts/sb-hosts-3.12.13.ebuild
index 941876ea977f..941876ea977f 100644
--- a/net-misc/sb-hosts/sb-hosts-3.12.11.ebuild
+++ b/net-misc/sb-hosts/sb-hosts-3.12.13.ebuild
diff --git a/net-misc/sock/sock-1.1-r1.ebuild b/net-misc/sock/sock-1.1-r2.ebuild
index 3071b86d3da2..dae97e0a2c19 100644
--- a/net-misc/sock/sock-1.1-r1.ebuild
+++ b/net-misc/sock/sock-1.1-r2.ebuild
@@ -1,17 +1,27 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
+
+inherit autotools
 
 DESCRIPTION="A shell interface to network sockets"
-SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/${P}.tar.gz"
 HOMEPAGE="http://atrey.karlin.mff.cuni.cz/~mj/linux.shtml"
-KEYWORDS="amd64 sparc x86"
+SRC_URI="ftp://atrey.karlin.mff.cuni.cz/pub/local/mj/net/${P}.tar.gz"
+
 LICENSE="GPL-2"
 SLOT="0"
+KEYWORDS="amd64 sparc x86"
+
+src_prepare() {
+	default
+
+	# Clang 16, bug #900256
+	eautoreconf
+}
 
 src_install() {
-	dobin "${PN}"
-	doman "${PN}.1"
+	dobin ${PN}
+	doman ${PN}.1
 	einstalldocs
 }
diff --git a/net-print/cnijfilter2/cnijfilter2-6.50.ebuild b/net-print/cnijfilter2/cnijfilter2-6.50.ebuild
index aad729f7bce4..f117a5cccf37 100644
--- a/net-print/cnijfilter2/cnijfilter2-6.50.ebuild
+++ b/net-print/cnijfilter2/cnijfilter2-6.50.ebuild
@@ -21,14 +21,6 @@ DEPEND="virtual/libusb:1
 	net-print/cups"
 RDEPEND="${DEPEND}"
 
-QA_FLAGS_IGNORED=(
-	/usr/lib64/libcnbpnet30.so.1.0.0
-	/usr/lib64/libcnbpcnclapicom2.so.5.0.0
-	/usr/lib64/libcnnet2.so.1.2.5
-	/usr/lib64/libcnbpnet20.so.1.0.0
-	/usr/bin/cnijlgmon3
-)
-
 S="${WORKDIR}"/${MY_P}
 
 PATCHES=(
@@ -37,6 +29,16 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-5.80-fno-common.patch
 )
 
+pkg_setup()  {
+	QA_PREBUILT="
+		/usr/$(get_libdir)/libcnbpnet30.so.1.0.0
+		/usr/$(get_libdir)/libcnbpcnclapicom2.so.5.0.0
+		/usr/$(get_libdir)/libcnnet2.so.1.2.5
+		/usr/$(get_libdir)/libcnbpnet20.so.1.0.0
+		/usr/bin/cnijlgmon3
+	"
+}
+
 src_prepare() {
 	default
 	DIRS="cmdtocanonij2 cmdtocanonij3 cnijbe2 lgmon3 rastertocanonij tocanonij tocnpwg"
diff --git a/profiles/package.mask/00-gentoo b/profiles/package.mask/00-gentoo
index 6271bf171be4..187ff0d55b22 100644
--- a/profiles/package.mask/00-gentoo
+++ b/profiles/package.mask/00-gentoo
@@ -33,6 +33,17 @@
 
 #--- END OF EXAMPLES ---
 
+# Hans de Graaff <graaff@gentoo.org> (2023-03-11)
+# Mask ruby27-only dev-ruby/sass-rails:5.0 for removal. Use a newer
+# sass-rails slot or consider migrating to sassc-rails.  Masked for
+# removal on 2023-04-11.
+dev-ruby/sass-rails:5.0
+
+# Mike Pagano <mpagano@gentoo.org> (2023-03-10)
+# Mask =sys-kernel/gentoo-sources-5.15.99 since it does
+# not include 5.15.99 and is misleading
+=sys-kernel/gentoo-sources-5.15.99
+
 # Matthew Smith <matthew@gentoo.org> (2023-03-08)
 # No longer works after Google shut down the Hangouts API.
 # Bug #900412, removal on 2023-04-08.
diff --git a/sci-libs/proj/proj-9.2.0.ebuild b/sci-libs/proj/proj-9.2.0.ebuild
index 41034b43cc17..35f102a7e1a0 100644
--- a/sci-libs/proj/proj-9.2.0.ebuild
+++ b/sci-libs/proj/proj-9.2.0.ebuild
@@ -44,12 +44,16 @@ src_configure() {
 	local mycmakeargs=(
 		-DBUILD_TESTING=$(usex test)
 		-DBUILD_PROJSYNC=$(usex curl)
-		-DBUILD_BENCHMARKS=OFF
 		-DENABLE_CURL=$(usex curl)
 		-DENABLE_TIFF=$(usex tiff)
 	)
 
-	use test && mycmakeargs+=( -DUSE_EXTERNAL_GTEST=ON )
+	if use test ; then
+		mycmakeargs+=(
+			-DUSE_EXTERNAL_GTEST=ON
+			-DBUILD_BENCHMARKS=OFF
+		)
+	fi
 
 	cmake_src_configure
 }
diff --git a/sec-keys/openpgp-keys-vincentlefevre/openpgp-keys-vincentlefevre-20221213.ebuild b/sec-keys/openpgp-keys-vincentlefevre/openpgp-keys-vincentlefevre-20221213.ebuild
index 1b623a8dba0d..dc05f8b19b1f 100644
--- a/sec-keys/openpgp-keys-vincentlefevre/openpgp-keys-vincentlefevre-20221213.ebuild
+++ b/sec-keys/openpgp-keys-vincentlefevre/openpgp-keys-vincentlefevre-20221213.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 sparc x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sys-apps/tuned/Manifest b/sys-apps/tuned/Manifest
index 240dd15019d0..3cb4b265b98b 100644
--- a/sys-apps/tuned/Manifest
+++ b/sys-apps/tuned/Manifest
@@ -1,2 +1,2 @@
-DIST tuned-2.18.0.tar.gz 218252 BLAKE2B 25bf078ea4e616830fa8b125251e24afbe2a566fcdd1050b2e1ac95125e22e8276b61f23a0236380bf1aec5ce892e1832230a800356460b5af21346c8825269d SHA512 9508bfad6502b7b9a72fb84d29308cbc10b3cb663b367c821e79ad4d57c2349086c199bf884440c46d230d08d0ad3df17d4f31ebdc03b68c7ba2695b6e18bcc9
 DIST tuned-2.19.0.tar.gz 233481 BLAKE2B 9bbd759af69938c8a31b0bb7d746b54f035dc11e3fad2bf8e77d4b318e01f59f51af1d8a5bb8105bdbd9a1393932a27fa2664f529121c956081e92a5f96e2e45 SHA512 64ed338398f7ae73cdf4de04ce24dec6869abf3f399459f13de792edfd965da4efdab0fb1337749556f2868d1769dcb55df9e13983d1e0bc2769fb5fc791cfb8
+DIST tuned-2.20.0.tar.gz 241286 BLAKE2B 0057f41221dcf076c30cf1366cb94ffcc000d08b23f88c2af2488fee4cb43b2f06d0fdcd15d21c1984e08d0d8b31a1ee64029cf36cd3f398d3541f6ff327dc8c SHA512 c8b9fc5bdc684b3c518267875b3757fce5d607bec0df7946fe3a7d345683ea0baa2f8b9bbfb741083b82fd9ca7c825506ca86ea530551837b42c11b45f24ccea
diff --git a/sys-apps/tuned/tuned-2.18.0.ebuild b/sys-apps/tuned/tuned-2.20.0.ebuild
index 476a31881a2e..476a31881a2e 100644
--- a/sys-apps/tuned/tuned-2.18.0.ebuild
+++ b/sys-apps/tuned/tuned-2.20.0.ebuild
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 1edea9832f73..b055e2dfd698 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -5,4 +5,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-devel/clang-common/clang-common-17.0.0_pre20230225.ebuild b/sys-devel/clang-common/clang-common-17.0.0_pre20230225.ebuild
deleted file mode 100644
index 3165f42a329f..000000000000
--- a/sys-devel/clang-common/clang-common-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,168 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit bash-completion-r1 llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of clang"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-IUSE="
-	default-compiler-rt default-libcxx default-lld llvm-libunwind
-	hardened stricter
-"
-
-PDEPEND="
-	sys-devel/clang:*
-	default-compiler-rt? (
-		sys-devel/clang-runtime[compiler-rt]
-		llvm-libunwind? ( sys-libs/llvm-libunwind[static-libs] )
-		!llvm-libunwind? ( sys-libs/libunwind[static-libs] )
-	)
-	!default-compiler-rt? ( sys-devel/gcc )
-	default-libcxx? ( >=sys-libs/libcxx-${PV} )
-	!default-libcxx? ( sys-devel/gcc )
-	default-lld? ( sys-devel/lld )
-	!default-lld? ( sys-devel/binutils )
-"
-IDEPEND="
-	!default-compiler-rt? ( sys-devel/gcc-config )
-	!default-libcxx? ( sys-devel/gcc-config )
-"
-
-LLVM_COMPONENTS=( clang/utils )
-llvm.org_set_globals
-
-pkg_pretend() {
-	[[ ${CLANG_IGNORE_DEFAULT_RUNTIMES} ]] && return
-
-	local flag missing_flags=()
-	for flag in default-{compiler-rt,libcxx,lld}; do
-		if ! use "${flag}" && has_version "sys-devel/clang[${flag}]"; then
-			missing_flags+=( "${flag}" )
-		fi
-	done
-
-	if [[ ${missing_flags[@]} ]]; then
-		eerror "It seems that you have the following flags set on sys-devel/clang:"
-		eerror
-		eerror "  ${missing_flags[*]}"
-		eerror
-		eerror "The default runtimes are now set via flags on sys-devel/clang-common."
-		eerror "The build is being aborted to prevent breakage.  Please either set"
-		eerror "the respective flags on this ebuild, e.g.:"
-		eerror
-		eerror "  sys-devel/clang-common ${missing_flags[*]}"
-		eerror
-		eerror "or build with CLANG_IGNORE_DEFAULT_RUNTIMES=1."
-		die "Mismatched defaults detected between sys-devel/clang and sys-devel/clang-common"
-	fi
-}
-
-src_install() {
-	newbashcomp bash-autocomplete.sh clang
-
-	insinto /etc/clang
-	newins - gentoo-runtimes.cfg <<-EOF
-		# This file is initially generated by sys-devel/clang-runtime.
-		# It is used to control the default runtimes using by clang.
-
-		--rtlib=$(usex default-compiler-rt compiler-rt libgcc)
-		--unwindlib=$(usex default-compiler-rt libunwind libgcc)
-		--stdlib=$(usex default-libcxx libc++ libstdc++)
-		-fuse-ld=$(usex default-lld lld bfd)
-	EOF
-
-	newins - gentoo-gcc-install.cfg <<-EOF
-		# This file is maintained by gcc-config.
-		# It is used to specify the selected GCC installation.
-	EOF
-
-	newins - gentoo-common.cfg <<-EOF
-		# This file contains flags common to clang, clang++ and clang-cpp.
-		@gentoo-runtimes.cfg
-		@gentoo-gcc-install.cfg
-		@gentoo-hardened.cfg
-	EOF
-
-	# Baseline hardening (bug #851111)
-	newins - gentoo-hardened.cfg <<-EOF
-		# Some of these options are added unconditionally, regardless of
-		# USE=hardened, for parity with sys-devel/gcc.
-		-fstack-clash-protection
-		-fstack-protector-strong
-		-fPIE
-		-include "${EPREFIX}/usr/include/gentoo/fortify.h"
-	EOF
-
-	dodir /usr/include/gentoo
-
-	local fortify_level=$(usex hardened 3 2)
-	# We have to do this because glibc's headers warn if F_S is set
-	# without optimization and that would at the very least be very noisy
-	# during builds and at worst trigger many -Werror builds.
-	cat >> "${ED}/usr/include/gentoo/fortify.h" <<- EOF || die
-		#ifndef _FORTIFY_SOURCE
-			#if defined(__OPTIMIZE__) && __OPTIMIZE__ > 0
-				#define _FORTIFY_SOURCE ${fortify_level}
-			#endif
-		#endif
-	EOF
-
-	if use hardened ; then
-		cat >> "${ED}/etc/clang/gentoo-hardened.cfg" <<-EOF || die
-			# Options below are conditional on USE=hardened.
-			-D_GLIBCXX_ASSERTIONS
-
-			# Analogue to GLIBCXX_ASSERTIONS
-			# https://libcxx.llvm.org/UsingLibcxx.html#assertions-mode
-			-D_LIBCPP_ENABLE_ASSERTIONS=1
-		EOF
-	fi
-
-	if use stricter; then
-		newins - gentoo-stricter.cfg <<-EOF
-			# This file increases the strictness of older clang versions
-			# to match the newest upstream version.
-
-			# clang-16 defaults
-			-Werror=implicit-function-declaration
-			-Werror=implicit-int
-			-Werror=incompatible-function-pointer-types
-
-			# constructs banned by C2x
-			-Werror=deprecated-non-prototype
-
-			# deprecated but large blast radius
-			#-Werror=strict-prototypes
-		EOF
-
-		cat >> "${ED}/etc/clang/gentoo-common.cfg" <<-EOF || die
-			@gentoo-stricter.cfg
-		EOF
-	fi
-
-	local tool
-	for tool in clang{,++,-cpp}; do
-		newins - "${tool}.cfg" <<-EOF
-			# This configuration file is used by ${tool} driver.
-			@gentoo-common.cfg
-		EOF
-	done
-}
-
-pkg_preinst() {
-	if has_version -b sys-devel/gcc-config && has_version sys-devel/gcc
-	then
-		local gcc_path=$(gcc-config --get-lib-path 2>/dev/null)
-		if [[ -n ${gcc_path} ]]; then
-			cat >> "${ED}/etc/clang/gentoo-gcc-install.cfg" <<-EOF
-				--gcc-install-dir="${gcc_path%%:*}"
-			EOF
-		fi
-	fi
-}
diff --git a/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230225.ebuild b/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230225.ebuild
deleted file mode 100644
index 67b42357665e..000000000000
--- a/sys-devel/clang-runtime/clang-runtime-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit multilib-build toolchain-funcs
-
-DESCRIPTION="Meta-ebuild for clang runtime libraries"
-HOMEPAGE="https://clang.llvm.org/"
-
-LICENSE="metapackage"
-SLOT="${PV%%.*}"
-KEYWORDS=""
-IUSE="+compiler-rt libcxx openmp +sanitize"
-REQUIRED_USE="sanitize? ( compiler-rt )"
-PROPERTIES="live"
-
-RDEPEND="
-	compiler-rt? (
-		~sys-libs/compiler-rt-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		sanitize? (
-			~sys-libs/compiler-rt-sanitizers-${PV}:${SLOT}[abi_x86_32(+)?,abi_x86_64(+)?]
-		)
-	)
-	libcxx? ( >=sys-libs/libcxx-${PV}[${MULTILIB_USEDEP}] )
-	openmp? ( >=sys-libs/libomp-${PV}[${MULTILIB_USEDEP}] )
-"
-
-pkg_pretend() {
-	if tc-is-clang; then
-		ewarn "You seem to be using clang as a system compiler.  As of clang-16,"
-		ewarn "upstream has turned a few warnings that commonly occur during"
-		ewarn "configure script runs into errors by default.  This causes some"
-		ewarn "configure tests to start failing, sometimes resulting in silent"
-		ewarn "breakage, missing functionality or runtime misbehavior.  It is"
-		ewarn "not yet clear whether the change will remain or be reverted."
-		ewarn
-		ewarn "For more information, please see:"
-		ewarn "https://discourse.llvm.org/t/configure-script-breakage-with-the-new-werror-implicit-function-declaration/65213"
-	fi
-}
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index c70f2d89ef6c..89732cf9ec07 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -9,4 +9,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-devel/clang/clang-17.0.0_pre20230225.ebuild b/sys-devel/clang/clang-17.0.0_pre20230225.ebuild
deleted file mode 100644
index a6c885c70491..000000000000
--- a/sys-devel/clang/clang-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,477 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit cmake llvm llvm.org multilib multilib-minimal \
-	prefix python-single-r1 toolchain-funcs flag-o-matic
-
-DESCRIPTION="C language family frontend for LLVM"
-HOMEPAGE="https://llvm.org/"
-
-# MSVCSetupApi.h: MIT
-# sorttable.js: MIT
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="debug doc +extra ieee-long-double +pie +static-analyzer test xml"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}:${LLVM_MAJOR}=[debug=,${MULTILIB_USEDEP}]
-	static-analyzer? ( dev-lang/perl:* )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	${DEPEND}
-	>=sys-devel/clang-common-${PV}
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	>=dev-util/cmake-3.16
-	doc? ( $(python_gen_cond_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	xml? ( virtual/pkgconfig )
-"
-PDEPEND="
-	~sys-devel/clang-runtime-${PV}
-	sys-devel/clang-toolchain-symlinks:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=(
-	clang clang-tools-extra cmake
-	llvm/lib/Transforms/Hello
-)
-LLVM_MANPAGES=1
-LLVM_TEST_COMPONENTS=(
-	llvm/lib/Testing
-	llvm/utils
-	third-party
-)
-LLVM_USE_TARGETS=llvm
-llvm.org_set_globals
-
-# Multilib notes:
-# 1. ABI_* flags control ABIs libclang* is built for only.
-# 2. clang is always capable of compiling code for all ABIs for enabled
-#    target. However, you will need appropriate crt* files (installed
-#    e.g. by sys-devel/gcc and sys-libs/glibc).
-# 3. ${CHOST}-clang wrappers are always installed for all ABIs included
-#    in the current profile (i.e. alike supported by sys-devel/gcc).
-#
-# Therefore: use sys-devel/clang[${MULTILIB_USEDEP}] only if you need
-# multilib clang* libraries (not runtime, not wrappers).
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	# create extra parent dir for relative CLANG_RESOURCE_DIR access
-	mkdir -p x/y || die
-	BUILD_DIR=${WORKDIR}/x/y/clang
-
-	llvm.org_src_prepare
-
-	# add Gentoo Portage Prefix for Darwin (see prefix-dirs.patch)
-	eprefixify \
-		lib/Lex/InitHeaderSearch.cpp \
-		lib/Driver/ToolChains/Darwin.cpp || die
-
-	if ! use prefix-guest && [[ -n ${EPREFIX} ]]; then
-		sed -i "/LibDir.*Loader/s@return \"\/\"@return \"${EPREFIX}/\"@" lib/Driver/ToolChains/Linux.cpp || die
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# meta-targets
-					clang-libraries|distribution)
-						continue
-						;;
-					# tools
-					clang|clangd|clang-*)
-						;;
-					# static libraries
-					clang*|findAllSymbols)
-						continue
-						;;
-					# conditional to USE=doc
-					docs-clang-html|docs-clang-tools-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# common stuff
-		clang-cmake-exports
-		clang-headers
-		clang-resource-headers
-		libclang-headers
-
-		aarch64-resource-headers
-		arm-common-resource-headers
-		arm-resource-headers
-		core-resource-headers
-		cuda-resource-headers
-		hexagon-resource-headers
-		hip-resource-headers
-		hlsl-resource-headers
-		mips-resource-headers
-		opencl-resource-headers
-		openmp-resource-headers
-		ppc-htm-resource-headers
-		ppc-resource-headers
-		riscv-resource-headers
-		systemz-resource-headers
-		utility-resource-headers
-		ve-resource-headers
-		webassembly-resource-headers
-		windows-resource-headers
-		x86-resource-headers
-
-		# libs
-		clang-cpp
-		libclang
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# common stuff
-			bash-autocomplete
-			libclang-python-bindings
-
-			# tools
-			amdgpu-arch
-			c-index-test
-			clang
-			clang-format
-			clang-offload-bundler
-			clang-offload-packager
-			clang-refactor
-			clang-repl
-			clang-rename
-			clang-scan-deps
-			diagtool
-			hmaptool
-			nvptx-arch
-
-			# needed for cross-compiling Clang
-			clang-tblgen
-		)
-
-		if use extra; then
-			out+=(
-				# extra tools
-				clang-apply-replacements
-				clang-change-namespace
-				clang-doc
-				clang-include-cleaner
-				clang-include-fixer
-				clang-move
-				clang-pseudo
-				clang-query
-				clang-reorder-fields
-				clang-tidy
-				clang-tidy-headers
-				clangd
-				find-all-symbols
-				modularize
-				pp-trace
-			)
-		fi
-
-		if llvm_are_manpages_built; then
-			out+=( docs-clang-man )
-			use extra && out+=( docs-clang-tools-man )
-		fi
-
-		if use doc; then
-			out+=( docs-clang-html )
-			use extra && out+=( docs-clang-tools-html )
-		fi
-
-		use static-analyzer && out+=(
-			clang-check
-			clang-extdef-mapping
-			scan-build
-			scan-build-py
-			scan-view
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
-
-	local mycmakeargs=(
-		-DDEFAULT_SYSROOT=$(usex prefix-guest "" "${EPREFIX}")
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		-DCLANG_CONFIG_FILE_SYSTEM_DIR="${EPREFIX}/etc/clang"
-		# relative to bindir
-		-DCLANG_RESOURCE_DIR="../../../../lib/clang/${LLVM_MAJOR}"
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DCLANG_LINK_CLANG_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-		-DCLANG_INCLUDE_TESTS=$(usex test)
-
-		-DLLVM_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-
-		-DCMAKE_DISABLE_FIND_PACKAGE_LibXml2=$(usex !xml)
-		# libgomp support fails to find headers without explicit -I
-		# furthermore, it provides only syntax checking
-		-DCLANG_DEFAULT_OPENMP_RUNTIME=libomp
-
-		# disable using CUDA to autodetect GPU, just build for all
-		-DCMAKE_DISABLE_FIND_PACKAGE_CUDA=ON
-		# disable linking to HSA to avoid automagic dep,
-		# load it dynamically instead
-		-DCMAKE_DISABLE_FIND_PACKAGE_hsa-runtime64=ON
-
-		-DCLANG_DEFAULT_PIE_ON_LINUX=$(usex pie)
-
-		-DCLANG_ENABLE_ARCMT=$(usex static-analyzer)
-		-DCLANG_ENABLE_STATIC_ANALYZER=$(usex static-analyzer)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if ! use elibc_musl; then
-		mycmakeargs+=(
-			-DPPC_LINUX_DEFAULT_IEEELONGDOUBLE=$(usex ieee-long-double)
-		)
-	fi
-
-	use test && mycmakeargs+=(
-		-DLLVM_BUILD_TESTS=ON
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DLLVM_BUILD_DOCS=ON
-				-DLLVM_ENABLE_SPHINX=ON
-				-DCLANG_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-			if use extra; then
-				mycmakeargs+=(
-					-DCLANG-TOOLS_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/tools-extra"
-				)
-			fi
-		fi
-		mycmakeargs+=(
-			-DCLANG_INCLUDE_DOCS=${build_docs}
-		)
-	fi
-	if multilib_native_use extra; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_CLANG_TOOLS_EXTRA_SOURCE_DIR="${WORKDIR}"/clang-tools-extra
-			-DCLANG_TOOLS_EXTRA_INCLUDE_DOCS=${build_docs}
-		)
-	else
-		mycmakeargs+=(
-			-DLLVM_TOOL_CLANG_TOOLS_EXTRA_BUILD=OFF
-		)
-	fi
-
-	if [[ -n ${EPREFIX} ]]; then
-		mycmakeargs+=(
-			-DGCC_INSTALL_PREFIX="${EPREFIX}/usr"
-		)
-	fi
-
-	if tc-is-cross-compiler; then
-		has_version -b sys-devel/clang:${LLVM_MAJOR} ||
-			die "sys-devel/clang:${LLVM_MAJOR} is required on the build host."
-		local tools_bin=${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin
-		mycmakeargs+=(
-			-DLLVM_TOOLS_BINARY_DIR="${tools_bin}"
-			-DCLANG_TABLEGEN="${tools_bin}"/clang-tblgen
-		)
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	cmake_build distribution
-
-	# provide a symlink for tests
-	if [[ ! -L ${WORKDIR}/lib/clang ]]; then
-		mkdir -p "${WORKDIR}"/lib || die
-		ln -s "${BUILD_DIR}/$(get_libdir)/clang" "${WORKDIR}"/lib/clang || die
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	local test_targets=( check-clang )
-	if multilib_native_use extra; then
-		test_targets+=(
-			check-clang-tools
-			check-clangd
-		)
-	fi
-	cmake_build "${test_targets[@]}"
-}
-
-src_install() {
-	MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/clang/Config/config.h
-	)
-
-	multilib-minimal_src_install
-
-	# Move runtime headers to /usr/lib/clang, where they belong
-	mv "${ED}"/usr/include/clangrt "${ED}"/usr/lib/clang || die
-	# move (remaining) wrapped headers back
-	if use extra; then
-		mv "${T}"/clang-tidy "${ED}"/usr/include/ || die
-	fi
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-
-	# Apply CHOST and version suffix to clang tools
-	local clang_tools=( clang clang++ clang-cl clang-cpp )
-	local abi i
-
-	# cmake gives us:
-	# - clang-X
-	# - clang -> clang-X
-	# - clang++, clang-cl, clang-cpp -> clang
-	# we want to have:
-	# - clang-X
-	# - clang++-X, clang-cl-X, clang-cpp-X -> clang-X
-	# - clang, clang++, clang-cl, clang-cpp -> clang*-X
-	# also in CHOST variant
-	for i in "${clang_tools[@]:1}"; do
-		rm "${ED}/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}" || die
-		dosym "clang-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}-${LLVM_MAJOR}"
-		dosym "${i}-${LLVM_MAJOR}" "/usr/lib/llvm/${LLVM_MAJOR}/bin/${i}"
-	done
-
-	# now create target symlinks for all supported ABIs
-	for abi in $(get_all_abis); do
-		local abi_chost=$(get_abi_CHOST "${abi}")
-		for i in "${clang_tools[@]}"; do
-			dosym "${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}-${LLVM_MAJOR}"
-			dosym "${abi_chost}-${i}-${LLVM_MAJOR}" \
-				"/usr/lib/llvm/${LLVM_MAJOR}/bin/${abi_chost}-${i}"
-		done
-	done
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping & ABI mismatch checks
-	# (also drop the version suffix from runtime headers)
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/clang "${ED}"/usr/include/clangrt || die
-	if multilib_native_use extra; then
-		# don't wrap clang-tidy headers, the list is too long
-		# (they're fine for non-native ABI but enabling the targets is problematic)
-		mv "${ED}"/usr/include/clang-tidy "${T}/" || die
-	fi
-}
-
-multilib_src_install_all() {
-	python_fix_shebang "${ED}"
-	if use static-analyzer; then
-		python_optimize "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/share/scan-view
-	fi
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-	# match 'html' non-compression
-	use doc && docompress -x "/usr/share/doc/${PF}/tools-extra"
-	# +x for some reason; TODO: investigate
-	use static-analyzer && fperms a-x "/usr/lib/llvm/${LLVM_MAJOR}/share/man/man1/scan-build.1"
-}
-
-pkg_postinst() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow update all
-	fi
-
-	elog "You can find additional utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/clang"
-	if use extra; then
-		elog "Some of them are vim integration scripts (with instructions inside)."
-		elog "The run-clang-tidy.py script requires the following additional package:"
-		elog "  dev-python/pyyaml"
-	fi
-}
-
-pkg_postrm() {
-	if [[ -z ${ROOT} && -f ${EPREFIX}/usr/share/eselect/modules/compiler-shadow.eselect ]] ; then
-		eselect compiler-shadow clean all
-	fi
-}
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 1edea9832f73..b055e2dfd698 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -5,4 +5,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-devel/lld/lld-17.0.0_pre20230225.ebuild b/sys-devel/lld/lld-17.0.0_pre20230225.ebuild
deleted file mode 100644
index 3e8e6f789bd1..000000000000
--- a/sys-devel/lld/lld-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,90 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="The LLVM linker (link editor)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="debug test zstd"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	~sys-devel/llvm-${PV}[zstd=]
-	sys-libs/zlib:=
-	zstd? ( app-arch/zstd:= )
-"
-RDEPEND="
-	${DEPEND}
-	!sys-devel/lld:0
-"
-BDEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	test? (
-		>=dev-util/cmake-3.16
-		$(python_gen_any_dep ">=dev-python/lit-${PV}[\${PYTHON_USEDEP}]")
-	)
-"
-PDEPEND="
-	>=sys-devel/lld-toolchain-symlinks-16-r2:${LLVM_MAJOR}
-"
-
-LLVM_COMPONENTS=( lld cmake libunwind/include/mach-o )
-LLVM_TEST_COMPONENTS=( llvm/utils third-party )
-llvm.org_set_globals
-
-python_check_deps() {
-	python_has_version ">=dev-python/lit-${PV}[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	use test && python-any-r1_pkg_setup
-}
-
-src_unpack() {
-	llvm.org_src_unpack
-
-	# Directory ${WORKDIR}/llvm does not exist with USE="-test",
-	# but LLVM_MAIN_SRC_DIR="${WORKDIR}/llvm" is set below,
-	# and ${LLVM_MAIN_SRC_DIR}/../libunwind/include is used by build system
-	# (lld/MachO/CMakeLists.txt) and is expected to be resolvable
-	# to existent directory ${WORKDIR}/libunwind/include.
-	mkdir -p "${WORKDIR}/llvm" || die
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	use elibc_musl && append-ldflags -Wl,-z,stack-size=2097152
-
-	local mycmakeargs=(
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DBUILD_SHARED_LIBS=ON
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	tc-is-cross-compiler &&	mycmakeargs+=(
-		-DLLVM_TABLEGEN_EXE="${BROOT}/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-tblgen"
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-lld
-}
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index 1edea9832f73..b055e2dfd698 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -5,4 +5,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-devel/llvm-common/llvm-common-17.0.0_pre20230225.ebuild b/sys-devel/llvm-common/llvm-common-17.0.0_pre20230225.ebuild
deleted file mode 100644
index ce5f03ca34a5..000000000000
--- a/sys-devel/llvm-common/llvm-common-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit llvm.org
-
-DESCRIPTION="Common files shared between multiple slots of LLVM"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
-SLOT="0"
-KEYWORDS=""
-
-RDEPEND="
-	!sys-devel/llvm:0
-"
-
-LLVM_COMPONENTS=( llvm/utils/vim )
-llvm.org_set_globals
-
-src_install() {
-	insinto /usr/share/vim/vimfiles
-	doins -r */
-	# some users may find it useful
-	newdoc README README.vim
-	dodoc vimrc
-}
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index c70f2d89ef6c..89732cf9ec07 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -9,4 +9,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-devel/llvm/llvm-14.0.6-r2.ebuild b/sys-devel/llvm/llvm-14.0.6-r2.ebuild
index 0c340c8a578b..a886dde51af7 100644
--- a/sys-devel/llvm/llvm-14.0.6-r2.ebuild
+++ b/sys-devel/llvm/llvm-14.0.6-r2.ebuild
@@ -24,7 +24,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
 	exegesis? ( dev-libs/libpfm:= )
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
 	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
diff --git a/sys-devel/llvm/llvm-15.0.7.ebuild b/sys-devel/llvm/llvm-15.0.7.ebuild
index 2efaee0e828d..5df8ec7358dd 100644
--- a/sys-devel/llvm/llvm-15.0.7.ebuild
+++ b/sys-devel/llvm/llvm-15.0.7.ebuild
@@ -27,7 +27,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
 	exegesis? ( dev-libs/libpfm:= )
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
 	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
diff --git a/sys-devel/llvm/llvm-16.0.0.9999.ebuild b/sys-devel/llvm/llvm-16.0.0.9999.ebuild
index 78347d094e83..d6f0130324ee 100644
--- a/sys-devel/llvm/llvm-16.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-16.0.0.9999.ebuild
@@ -27,7 +27,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
 	exegesis? ( dev-libs/libpfm:= )
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
 	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
diff --git a/sys-devel/llvm/llvm-16.0.0_rc3.ebuild b/sys-devel/llvm/llvm-16.0.0_rc3.ebuild
index ffb13c5d52f8..c4c95302093c 100644
--- a/sys-devel/llvm/llvm-16.0.0_rc3.ebuild
+++ b/sys-devel/llvm/llvm-16.0.0_rc3.ebuild
@@ -27,7 +27,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
 	exegesis? ( dev-libs/libpfm:= )
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
 	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
diff --git a/sys-devel/llvm/llvm-17.0.0.9999.ebuild b/sys-devel/llvm/llvm-17.0.0.9999.ebuild
index 78347d094e83..d6f0130324ee 100644
--- a/sys-devel/llvm/llvm-17.0.0.9999.ebuild
+++ b/sys-devel/llvm/llvm-17.0.0.9999.ebuild
@@ -27,7 +27,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
 	exegesis? ( dev-libs/libpfm:= )
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
 	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
diff --git a/sys-devel/llvm/llvm-17.0.0_pre20230225.ebuild b/sys-devel/llvm/llvm-17.0.0_pre20230225.ebuild
deleted file mode 100644
index ab6e2be57f2e..000000000000
--- a/sys-devel/llvm/llvm-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,516 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit cmake llvm.org multilib-minimal pax-utils python-any-r1 \
-	toolchain-funcs flag-o-matic
-
-DESCRIPTION="Low Level Virtual Machine"
-HOMEPAGE="https://llvm.org/"
-
-# Additional licenses:
-# 1. OpenBSD regex: Henry Spencer's license ('rc' in Gentoo) + BSD.
-# 2. xxhash: BSD.
-# 3. MD5 code: public-domain.
-# 4. ConvertUTF.h: TODO.
-
-LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
-SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="
-	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
-	xml z3 zstd
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
-	exegesis? ( dev-libs/libpfm:= )
-	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
-	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
-	ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[${MULTILIB_USEDEP}] )
-	xar? ( app-arch/xar )
-	xml? ( dev-libs/libxml2:2=[${MULTILIB_USEDEP}] )
-	z3? ( >=sci-mathematics/z3-4.7.1:0=[${MULTILIB_USEDEP}] )
-	zstd? ( app-arch/zstd:=[${MULTILIB_USEDEP}] )
-"
-DEPEND="
-	${RDEPEND}
-	binutils-plugin? ( sys-libs/binutils-libs )
-"
-BDEPEND="
-	${PYTHON_DEPS}
-	dev-lang/perl
-	>=dev-util/cmake-3.16
-	sys-devel/gnuconfig
-	kernel_Darwin? (
-		<sys-libs/libcxx-${LLVM_VERSION}.9999
-		>=sys-devel/binutils-apple-5.1
-	)
-	doc? ( $(python_gen_any_dep '
-		dev-python/recommonmark[${PYTHON_USEDEP}]
-		dev-python/sphinx[${PYTHON_USEDEP}]
-	') )
-	libffi? ( virtual/pkgconfig )
-"
-# There are no file collisions between these versions but having :0
-# installed means llvm-config there will take precedence.
-RDEPEND="
-	${RDEPEND}
-	!sys-devel/llvm:0
-"
-PDEPEND="
-	sys-devel/llvm-common
-	sys-devel/llvm-toolchain-symlinks:${LLVM_MAJOR}
-	binutils-plugin? ( >=sys-devel/llvmgold-${LLVM_MAJOR} )
-"
-
-LLVM_COMPONENTS=( llvm cmake )
-LLVM_TEST_COMPONENTS=( third-party )
-LLVM_MANPAGES=1
-LLVM_USE_TARGETS=provide
-llvm.org_set_globals
-
-python_check_deps() {
-	use doc || return 0
-
-	python_has_version -b "dev-python/recommonmark[${PYTHON_USEDEP}]" &&
-	python_has_version -b "dev-python/sphinx[${PYTHON_USEDEP}]"
-}
-
-check_uptodate() {
-	local prod_targets=(
-		$(sed -n -e '/set(LLVM_ALL_TARGETS/,/)/p' CMakeLists.txt \
-			| tail -n +2 | head -n -1)
-	)
-	local all_targets=(
-		lib/Target/*/
-	)
-	all_targets=( "${all_targets[@]#lib/Target/}" )
-	all_targets=( "${all_targets[@]%/}" )
-
-	local exp_targets=() i
-	for i in "${all_targets[@]}"; do
-		has "${i}" "${prod_targets[@]}" || exp_targets+=( "${i}" )
-	done
-
-	if [[ ${exp_targets[*]} != ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_EXPERIMENTAL_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_EXPERIMENTAL_TARGETS[*]}"
-		eqawarn "Expected: ${exp_targets[*]}"
-		eqawarn
-	fi
-
-	if [[ ${prod_targets[*]} != ${ALL_LLVM_PRODUCTION_TARGETS[*]} ]]; then
-		eqawarn "ALL_LLVM_PRODUCTION_TARGETS is outdated!"
-		eqawarn "    Have: ${ALL_LLVM_PRODUCTION_TARGETS[*]}"
-		eqawarn "Expected: ${prod_targets[*]}"
-	fi
-}
-
-check_distribution_components() {
-	if [[ ${CMAKE_MAKEFILE_GENERATOR} == ninja ]]; then
-		local all_targets=() my_targets=() l
-		cd "${BUILD_DIR}" || die
-
-		while read -r l; do
-			if [[ ${l} == install-*-stripped:* ]]; then
-				l=${l#install-}
-				l=${l%%-stripped*}
-
-				case ${l} in
-					# shared libs
-					LLVM|LLVMgold)
-						;;
-					# TableGen lib + deps
-					LLVMDemangle|LLVMSupport|LLVMTableGen)
-						;;
-					# static libs
-					LLVM*)
-						continue
-						;;
-					# meta-targets
-					distribution|llvm-libraries)
-						continue
-						;;
-					# used only w/ USE=doc
-					docs-llvm-html)
-						use doc || continue
-						;;
-				esac
-
-				all_targets+=( "${l}" )
-			fi
-		done < <(${NINJA} -t targets all)
-
-		while read -r l; do
-			my_targets+=( "${l}" )
-		done < <(get_distribution_components $"\n")
-
-		local add=() remove=()
-		for l in "${all_targets[@]}"; do
-			if ! has "${l}" "${my_targets[@]}"; then
-				add+=( "${l}" )
-			fi
-		done
-		for l in "${my_targets[@]}"; do
-			if ! has "${l}" "${all_targets[@]}"; then
-				remove+=( "${l}" )
-			fi
-		done
-
-		if [[ ${#add[@]} -gt 0 || ${#remove[@]} -gt 0 ]]; then
-			eqawarn "get_distribution_components() is outdated!"
-			eqawarn "   Add: ${add[*]}"
-			eqawarn "Remove: ${remove[*]}"
-		fi
-		cd - >/dev/null || die
-	fi
-}
-
-src_prepare() {
-	# disable use of SDK on OSX, bug #568758
-	sed -i -e 's/xcrun/false/' utils/lit/lit/util.py || die
-
-	# Update config.guess to support more systems
-	cp "${BROOT}/usr/share/gnuconfig/config.guess" cmake/ || die
-
-	# Verify that the ebuild is up-to-date
-	check_uptodate
-
-	llvm.org_src_prepare
-}
-
-get_distribution_components() {
-	local sep=${1-;}
-
-	local out=(
-		# shared libs
-		LLVM
-		LTO
-		Remarks
-
-		# tools
-		llvm-config
-
-		# common stuff
-		cmake-exports
-		llvm-headers
-
-		# libraries needed for clang-tblgen
-		LLVMDemangle
-		LLVMSupport
-		LLVMTableGen
-	)
-
-	if multilib_is_native_abi; then
-		out+=(
-			# utilities
-			llvm-tblgen
-			FileCheck
-			llvm-PerfectShuffle
-			count
-			not
-			yaml-bench
-			UnicodeNameMappingGenerator
-
-			# tools
-			bugpoint
-			dsymutil
-			llc
-			lli
-			lli-child-target
-			llvm-addr2line
-			llvm-ar
-			llvm-as
-			llvm-bcanalyzer
-			llvm-bitcode-strip
-			llvm-c-test
-			llvm-cat
-			llvm-cfi-verify
-			llvm-config
-			llvm-cov
-			llvm-cvtres
-			llvm-cxxdump
-			llvm-cxxfilt
-			llvm-cxxmap
-			llvm-debuginfo-analyzer
-			llvm-debuginfod
-			llvm-debuginfod-find
-			llvm-diff
-			llvm-dis
-			llvm-dlltool
-			llvm-dwarfdump
-			llvm-dwarfutil
-			llvm-dwp
-			llvm-exegesis
-			llvm-extract
-			llvm-gsymutil
-			llvm-ifs
-			llvm-install-name-tool
-			llvm-jitlink
-			llvm-jitlink-executor
-			llvm-lib
-			llvm-libtool-darwin
-			llvm-link
-			llvm-lipo
-			llvm-lto
-			llvm-lto2
-			llvm-mc
-			llvm-mca
-			llvm-ml
-			llvm-modextract
-			llvm-mt
-			llvm-nm
-			llvm-objcopy
-			llvm-objdump
-			llvm-opt-report
-			llvm-otool
-			llvm-pdbutil
-			llvm-profdata
-			llvm-profgen
-			llvm-ranlib
-			llvm-rc
-			llvm-readelf
-			llvm-readobj
-			llvm-reduce
-			llvm-remark-size-diff
-			llvm-remarkutil
-			llvm-rtdyld
-			llvm-sim
-			llvm-size
-			llvm-split
-			llvm-stress
-			llvm-strings
-			llvm-strip
-			llvm-symbolizer
-			llvm-tapi-diff
-			llvm-tli-checker
-			llvm-undname
-			llvm-windres
-			llvm-xray
-			obj2yaml
-			opt
-			sancov
-			sanstats
-			split-file
-			verify-uselistorder
-			yaml2obj
-
-			# python modules
-			opt-viewer
-		)
-
-		if llvm_are_manpages_built; then
-			out+=(
-				# manpages
-				docs-dsymutil-man
-				docs-llvm-dwarfdump-man
-				docs-llvm-man
-			)
-		fi
-		use doc && out+=(
-			docs-llvm-html
-		)
-
-		use binutils-plugin && out+=(
-			LLVMgold
-		)
-	fi
-
-	printf "%s${sep}" "${out[@]}"
-}
-
-multilib_src_configure() {
-	tc-is-gcc && filter-lto # GCC miscompiles LLVM, bug #873670
-
-	local ffi_cflags ffi_ldflags
-	if use libffi; then
-		ffi_cflags=$($(tc-getPKG_CONFIG) --cflags-only-I libffi)
-		ffi_ldflags=$($(tc-getPKG_CONFIG) --libs-only-L libffi)
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		# disable appending VCS revision to the version to improve
-		# direct cache hit ratio
-		-DLLVM_APPEND_VC_REV=OFF
-		-DCMAKE_INSTALL_PREFIX="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DBUILD_SHARED_LIBS=OFF
-		-DLLVM_BUILD_LLVM_DYLIB=ON
-		-DLLVM_LINK_LLVM_DYLIB=ON
-		-DLLVM_DISTRIBUTION_COMPONENTS=$(get_distribution_components)
-
-		# cheap hack: LLVM combines both anyway, and the only difference
-		# is that the former list is explicitly verified at cmake time
-		-DLLVM_TARGETS_TO_BUILD=""
-		-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD="${LLVM_TARGETS// /;}"
-		-DLLVM_INCLUDE_BENCHMARKS=OFF
-		-DLLVM_INCLUDE_TESTS=$(usex test)
-		-DLLVM_BUILD_TESTS=$(usex test)
-
-		-DLLVM_ENABLE_FFI=$(usex libffi)
-		-DLLVM_ENABLE_LIBEDIT=$(usex libedit)
-		-DLLVM_ENABLE_TERMINFO=$(usex ncurses)
-		-DLLVM_ENABLE_LIBXML2=$(usex xml)
-		-DLLVM_ENABLE_ASSERTIONS=$(usex debug)
-		-DLLVM_ENABLE_LIBPFM=$(usex exegesis)
-		-DLLVM_ENABLE_Z3_SOLVER=$(usex z3)
-		-DLLVM_ENABLE_ZSTD=$(usex zstd)
-
-		-DLLVM_HOST_TRIPLE="${CHOST}"
-
-		-DFFI_INCLUDE_DIR="${ffi_cflags#-I}"
-		-DFFI_LIBRARY_DIR="${ffi_ldflags#-L}"
-		# used only for llvm-objdump tool
-		-DLLVM_HAVE_LIBXAR=$(multilib_native_usex xar 1 0)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-
-		# disable OCaml bindings (now in dev-ml/llvm-ocaml)
-		-DOCAMLFIND=NO
-	)
-
-	local suffix=
-	if [[ -n ${EGIT_VERSION} && ${EGIT_BRANCH} != release/* ]]; then
-		# the ABI of the main branch is not stable, so let's include
-		# the commit id in the SOVERSION to contain the breakage
-		suffix+="git${EGIT_VERSION::8}"
-	fi
-	if [[ $(tc-get-cxx-stdlib) == libc++ ]]; then
-		# Smart hack: alter version suffix -> SOVERSION when linking
-		# against libc++. This way we won't end up mixing LLVM libc++
-		# libraries with libstdc++ clang, and the other way around.
-		suffix+="+libcxx"
-		mycmakeargs+=(
-			-DLLVM_ENABLE_LIBCXX=ON
-		)
-	fi
-	mycmakeargs+=(
-		-DLLVM_VERSION_SUFFIX="${suffix}"
-	)
-
-	use test && mycmakeargs+=(
-		-DLLVM_LIT_ARGS="$(get_lit_flags)"
-	)
-
-	if multilib_is_native_abi; then
-		local build_docs=OFF
-		if llvm_are_manpages_built; then
-			build_docs=ON
-			mycmakeargs+=(
-				-DCMAKE_INSTALL_MANDIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-				-DLLVM_INSTALL_SPHINX_HTML_DIR="${EPREFIX}/usr/share/doc/${PF}/html"
-				-DSPHINX_WARNINGS_AS_ERRORS=OFF
-			)
-		fi
-
-		mycmakeargs+=(
-			-DLLVM_BUILD_DOCS=${build_docs}
-			-DLLVM_ENABLE_OCAMLDOC=OFF
-			-DLLVM_ENABLE_SPHINX=${build_docs}
-			-DLLVM_ENABLE_DOXYGEN=OFF
-			-DLLVM_INSTALL_UTILS=ON
-		)
-		use binutils-plugin && mycmakeargs+=(
-			-DLLVM_BINUTILS_INCDIR="${EPREFIX}"/usr/include
-		)
-	fi
-
-	# workaround BMI bug in gcc-7 (fixed in 7.4)
-	# https://bugs.gentoo.org/649880
-	# apply only to x86, https://bugs.gentoo.org/650506
-	if tc-is-gcc && [[ ${MULTILIB_ABI_FLAG} == abi_x86* ]] &&
-			[[ $(gcc-major-version) -eq 7 && $(gcc-minor-version) -lt 4 ]]
-	then
-		local CFLAGS="${CFLAGS} -mno-bmi"
-		local CXXFLAGS="${CXXFLAGS} -mno-bmi"
-	fi
-
-	# LLVM can have very high memory consumption while linking,
-	# exhausting the limit on 32-bit linker executable
-	use x86 && local -x LDFLAGS="${LDFLAGS} -Wl,--no-keep-memory"
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-	cmake_src_configure
-
-	grep -q -E "^CMAKE_PROJECT_VERSION_MAJOR(:.*)?=${LLVM_MAJOR}$" \
-			CMakeCache.txt ||
-		die "Incorrect version, did you update _LLVM_MASTER_MAJOR?"
-	multilib_is_native_abi && check_distribution_components
-}
-
-multilib_src_compile() {
-	tc-env_build cmake_build distribution
-
-	pax-mark m "${BUILD_DIR}"/bin/llvm-rtdyld
-	pax-mark m "${BUILD_DIR}"/bin/lli
-	pax-mark m "${BUILD_DIR}"/bin/lli-child-target
-
-	if use test; then
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/Orc/OrcJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/ExecutionEngine/MCJIT/MCJITTests
-		pax-mark m "${BUILD_DIR}"/unittests/Support/SupportTests
-	fi
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check
-}
-
-src_install() {
-	local MULTILIB_CHOST_TOOLS=(
-		/usr/lib/llvm/${LLVM_MAJOR}/bin/llvm-config
-	)
-
-	local MULTILIB_WRAPPED_HEADERS=(
-		/usr/include/llvm/Config/llvm-config.h
-	)
-
-	local LLVM_LDPATHS=()
-	multilib-minimal_src_install
-
-	# move wrapped headers back
-	mv "${ED}"/usr/include "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include || die
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-distribution
-
-	# move headers to /usr/include for wrapping
-	rm -rf "${ED}"/usr/include || die
-	mv "${ED}"/usr/lib/llvm/${LLVM_MAJOR}/include "${ED}"/usr/include || die
-
-	LLVM_LDPATHS+=( "${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)" )
-}
-
-multilib_src_install_all() {
-	local revord=$(( 9999 - ${LLVM_MAJOR} ))
-	newenvd - "60llvm-${revord}" <<-_EOF_
-		PATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		# we need to duplicate it in ROOTPATH for Portage to respect...
-		ROOTPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin"
-		MANPATH="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-		LDPATH="$( IFS=:; echo "${LLVM_LDPATHS[*]}" )"
-	_EOF_
-
-	docompress "/usr/lib/llvm/${LLVM_MAJOR}/share/man"
-	llvm_install_manpages
-}
-
-pkg_postinst() {
-	elog "You can find additional opt-viewer utility scripts in:"
-	elog "  ${EROOT}/usr/lib/llvm/${LLVM_MAJOR}/share/opt-viewer"
-	elog "To use these scripts, you will need Python along with the following"
-	elog "packages:"
-	elog "  dev-python/pygments (for opt-viewer)"
-	elog "  dev-python/pyyaml (for all of them)"
-}
diff --git a/sys-devel/llvm/llvm-17.0.0_pre20230304.ebuild b/sys-devel/llvm/llvm-17.0.0_pre20230304.ebuild
index 78347d094e83..d6f0130324ee 100644
--- a/sys-devel/llvm/llvm-17.0.0_pre20230304.ebuild
+++ b/sys-devel/llvm/llvm-17.0.0_pre20230304.ebuild
@@ -27,7 +27,6 @@ RESTRICT="!test? ( test )"
 
 RDEPEND="
 	sys-libs/zlib:0=[${MULTILIB_USEDEP}]
-	binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] )
 	exegesis? ( dev-libs/libpfm:= )
 	libedit? ( dev-libs/libedit:0=[${MULTILIB_USEDEP}] )
 	libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[${MULTILIB_USEDEP}] )
diff --git a/sys-devel/reflex/reflex-20230206.ebuild b/sys-devel/reflex/reflex-20230206.ebuild
index 4dc4dafe83ae..90e5689c06c3 100644
--- a/sys-devel/reflex/reflex-20230206.ebuild
+++ b/sys-devel/reflex/reflex-20230206.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://invisible-island.net/archives/${PN}/${P}.tgz.as
 
 LICENSE="FLEX"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ~ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ppc ppc64 ~riscv ~s390 sparc x86"
 
 BDEPEND="verify-sig? ( sec-keys/openpgp-keys-thomasdickey )"
 
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index d9ed3b0befc0..2340b58e87df 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -12,6 +12,8 @@ DIST genpatches-5.15-100.base.tar.xz 4036256 BLAKE2B da0f271d54f248597d038a09f3c
 DIST genpatches-5.15-100.extras.tar.xz 3932 BLAKE2B 55665c7edd0316db7e6a8391ccfc97a3f2c51e9e445bb81e0663ad69405ce577133f2def0e58711b1f8dab0b7bfb4314e05a41183138585eb24c909b7cc8c2fb SHA512 dd32b33616a64fe0f4b319e3424360a29d81ed1c6d94457da0458d7141013efab4933c685468019dc7c023346697d31c902e67d17120208ae408939b2fe1c5a6
 DIST genpatches-5.15-102.base.tar.xz 4041416 BLAKE2B ab6ac9c8d03d41594f1f3c0b59cdeb3d045fdc0bc89926026a7b3f34eef38a869da1c9adfa1ccf465486f885dc4abb6c8d09a8c36f2732bb961b365a749e8985 SHA512 2df353c92659d8f41a45bd3caaf33e21542cb01ab210495a632e65fe71e8bee7c31ae7283827bc7e0683737f3a451b617db95b5a8b559cedc8296496e2fa3302
 DIST genpatches-5.15-102.extras.tar.xz 3936 BLAKE2B 4069a121383a58eedd557cfe3c421ca8c033e4b7a976845c557b3faf66b33d9efc6c7b3d4dad20cdeafb7d62588a4c49bb7102abfbd7acb1c98b1afb86e8f87a SHA512 b12c07aa5c9974856482f44ecc39ae03f7ec8879d07bff562d56b0c18752d748455b519f7bd53cde5f22df1787c15d52037ee236c1150edcc20416b9c6c1e272
+DIST genpatches-5.15-104.base.tar.xz 4172432 BLAKE2B 3056125f31757d4daf4d5a5df4f9e0c02257786d5dbfb44a134abffd2c8615d170f64f4d5154b04e7a5e6e825ee175430c842a7490ff6a3414954059a72a88f4 SHA512 324899dda69e2388adcc7241a5905110cfcd6a400d011c5948a983ccf5693be820b56115b5448f96fd819457574bf6ab3e7cabbf8169bc471df4b9a73b024975
+DIST genpatches-5.15-104.extras.tar.xz 3932 BLAKE2B 749f1d9446c12992266e4b24771cd4273fdb6a72793f3591956c33f210a2671d587f0cc04d0e9751511bce1e03b76df53e65231393e9d2eb1169ac825bd046e1 SHA512 66de4f74decfdb0f76050968d98a6cc378c04d5d19b9c16e35fa9746e9dce235c602ebe12fd19fc2b6bf8fc9d9eab3d9461e6aad3edc00cc465ae18a776b0e4c
 DIST genpatches-5.15-98.base.tar.xz 4003192 BLAKE2B 79d4fb60a5192137571109ffaefdfba23ac589102539cdde89046f627f39e65a52a44a83607232b499509b8bb4c341e2fd26ae971587c9574d4ac87d8b220893 SHA512 946a7638d19d5fd610075520e529a6c5a47aaa433b7986493f62571a7dc541278013a5006bf1e745496e4eb98de44af56f61d23679c139a719a8d5bc20c9e734
 DIST genpatches-5.15-98.extras.tar.xz 3932 BLAKE2B 4e5dd4f8ba6d14764a6546cf7e64dffb3ddcc77678b7d96d2498917f30561792c904c635b0fce7191b7c0c65549fa769e89befffbea5e53a3cef64c673937c20 SHA512 337d95159432cba3b85511cf80c350a8a2f67c65b72a90b26ddc98c01d2d8de70d9b6067e0573c5c339a5bf64973d10c06b42001ee19a7add3d672e4577d0622
 DIST genpatches-5.15-99.base.tar.xz 4024008 BLAKE2B 82205380a55439dbe6f8605d09078d7a349ec60180204ced6c9902f340077c800cf515f3f513c69110eab37a8daa386a82ec4ba9e84dd02299ccc45379cdc659 SHA512 72033d94d3d509ecefb5a54e82906408802118cd985f617ccf7465e23d19363668159998dadb950bef58af11bab448110e6c753eb6eb7dd107feacbda4d67f3d
@@ -32,10 +34,14 @@ DIST genpatches-6.1-16.base.tar.xz 820936 BLAKE2B 91554b3c532c7ba9549291a2a6c3ae
 DIST genpatches-6.1-16.extras.tar.xz 3804 BLAKE2B 72e1824ad6d561359eb287c8f67d94b961c6054a4bbc66af9571caced021d6d3cf64d5d06be4977c22b4c1061b37b5f174db4713040faac069dd9e7b29fa2a6f SHA512 ac2c48ed858be0a2c844646d343de6994f1f8179b0369a6be554f1587369679b651304f967346aa1bf2f462ae62b1c8c0fcb5bca32ec12e2f6100a694aafc6b2
 DIST genpatches-6.1-18.base.tar.xz 833216 BLAKE2B f1b86487c82d4354347171df635192a6276a4d0a9561a415270a85caa46401e4b9089f847346cbf441f8c6a4d4012234d83b31fca5797cc6296010f225392990 SHA512 155207127c1c58b2497788d5b7541ba1872fefea3d2c7804356e5bb6d28dae2f0400dbab44cf39b847f89e7a058710b8528059d75f0e92b63d3d37fd0a515ca8
 DIST genpatches-6.1-18.extras.tar.xz 3804 BLAKE2B f31c07ec6318b91e6e7eabeb62bc28af362fc097297b31521d464e298effbdf52cdb94b43a1811fc10ea3dc9387fa47501c4987d6709d73603ed15ac7949dd92 SHA512 8611f8cd72f54b7c4360d314eabcccfaa99722f568da32710a39f47ffd1770b14502130be5ce3d3a14a0bd93fc9fbb73f65a9c9636a8d0e9051892d1e5221ef7
+DIST genpatches-6.1-20.base.tar.xz 1052484 BLAKE2B 9599ee78ab289960d7d0c81db8d509a43f8dcb524163216af9c2bcd37eb1fe60b9c7e607faecd19974676c5cf863a4edbdc668b39ebb1f37fec98b1eceab42a5 SHA512 9e99a69ed5adc7fa8a33cab86ea187c42e888c6d768cd3d39d5491c8d96dec2fc5f4c11c02075b01de1530ac629e63876152ffa7643d3a3b899fd1655d67d1f0
+DIST genpatches-6.1-20.extras.tar.xz 3808 BLAKE2B 4d121cdba86a63a5564f44f2b33841ec07d456da813070f73cdc2b983b5fe466e92b845a6c4d0959aedfa3ee9a8c57fde08a84aa6a31926d43a5ac68d4c168df SHA512 8b17882ee84adda037433b2ab13aaa378812f6d6f3e87246c1befe54c0254d1261b3fbdd89410f133ea35e798bbca597e392222ba1bfc93bf87e645600609dc2
 DIST genpatches-6.2-2.base.tar.xz 9540 BLAKE2B dce2bb1156f0e9a7ca19b618d13729908001939d6ec6361ca6619808a120e61900b5f4de97b2bef0e63aef81a83c7e2a0d736f3c344d9a610eb5c6a21baeb111 SHA512 50aabf4c24dbf13595556314b2ba8f1d0219355bc79c0fddf05ef7a6d244fe3c54f95c733e02fbc032a582495c59688f415af5b62b3401b436cbb5f0ef3aa9ac
 DIST genpatches-6.2-2.extras.tar.xz 3804 BLAKE2B cdbf51c28ff1c3b974665f558ec774eb70874a3941b97f966ee90642f3a1c8732333348e891156a40455c8b80c2a2002fdf1515403eca7b8d075c28b09a2ed78 SHA512 cba0fe9b3d13f3b1f6ee413a44698694ef6b009918dfda76e4d8402e66f1e857bf889fd4eb7ae093e864f7015eb3fe14aa704a5a3b68b0b92ca494bfc4b43a71
 DIST genpatches-6.2-4.base.tar.xz 15256 BLAKE2B 4a6bc8f4b75be2afe87d3d29ebdd45cc6a6266717b793a611edcefad3b39c3f70f14533b538eb175f0c16e901006d52e09994072cf9375dc0606db0478472d18 SHA512 0351b19b50bff5922d916b215c8b5b04a31994973dbde9553b2f197009447c9d5dc992f0b9ee25bacdd1569477a0beed4e0359dec390ca4914ceeed3e73592f5
 DIST genpatches-6.2-4.extras.tar.xz 3804 BLAKE2B 909c69169a518c690e62cb3417a35fdcbc1f3102d388ea0f6eb5329753f50596bae769ef033d43bc9d9fc5cbddecc3ca8541f771c4e02c76fad6253594cf5e5b SHA512 c22a12ea1d3467891286d9898582d038026230181537ae40927182b9549e7a768e4ae62ddf9b402e67cd31e18cb64e9f9567c5037eebc98500d4aa21ea62b44d
+DIST genpatches-6.2-5.base.tar.xz 297244 BLAKE2B d76f6189b57b3c81ea8d8cde4a4464539ecfd27f38790eb797758d2ca9f3c4f1e4906b8187faf515035ee220107e698d60d6687cf9d05e7805ba2e8a5a47ff7a SHA512 e0ab47321da0c7588b102d0c9af435bb23c0ea01915d1e9080216bb885f2dbd97ea0d885d2f72297dcfda18fee524dd2629533a4ee65ae72cde0651be38b962c
+DIST genpatches-6.2-5.extras.tar.xz 3804 BLAKE2B 23df3f3d54c5c9d0db420803bf45861111addf7bd23efd65a928345103e5fcaa34639c18c4c72911ff9d17cfacf50063802af75674d9c2839b0448185ca0eeb1 SHA512 5727b99aca295c425c5ab67e8e25b3e7ce0101542d60374d3f54abcf66f336d303ea529b683ec0d82da5ad471b5399eadad2fc8cc1dba3c3b13eff1735d1c12f
 DIST gentoo-kernel-5.10.167-1.amd64.gpkg.tar 66293760 BLAKE2B 86933f7a1da3888fcc8ce67602b49afcb22e442bf125eac3acd0e15169832cc16221603cdc95f7d343b0885329dea59613f551f77dbd64be92e991ce07d8e26a SHA512 c267a31e2800863fbd2fe3b1ed5570cf36263764df53845bc25762ebee49e268e9175b4f5d61d4ee67a4132f9af3e5d360b0426f4c350140d301506c0341215a
 DIST gentoo-kernel-5.10.167-1.arm64.gpkg.tar 59351040 BLAKE2B f8e0ba24eb686e38704fce1c296c978105f953b801ada73eb83f03f9dcee542d223e23e103281035e1e7f78be2bceba52616f84dbc998fc391e6ed136b6ea9ec SHA512 5d373fe35cee7142af63fac61282d2e71e5b9c80bac7c03ac3987a058aee7ac4915bebfab02cc995ff1344070d158a83d042dbb6573fe0bf5d13b9656e60f07d
 DIST gentoo-kernel-5.10.167-1.ppc64le.gpkg.tar 54906880 BLAKE2B 85f324ca7221ba94b2fddf364b3e3b2f2e95549453f9b5d938ab6f711a4bc719559ef8f4e9b6adf259e7864877b888ddf09f5c22054164f098abfc0d2c71556b SHA512 b4cacbdeb21ba0d1f72afbbd321f696aab71c150fd936e0e365c45df2d4fb7bc35e397fb32c788dbed8f45275225560e0bc894c724afcf23ae5dcf9bd507f897
@@ -72,6 +78,10 @@ DIST gentoo-kernel-5.15.98-1.amd64.gpkg.tar 69632000 BLAKE2B 559df6dda38c4945b6c
 DIST gentoo-kernel-5.15.98-1.arm64.gpkg.tar 62566400 BLAKE2B 1345fcb22ab95f56cd8671f0775493b8f20a7be825b2a05abbebf1014f26d7144d016f7b58312bb72bcdbf29cdae36fb8f52e4603a83b260e3165fa1980d3510 SHA512 dbd00061e90c43ee701e75ba66075c3c63fbef63dcd562460ee6a661c2b7b48c78f349e19f9c04d633892034c276e6361a6cf6f7e3802bda6156af0d78e1310f
 DIST gentoo-kernel-5.15.98-1.ppc64le.gpkg.tar 57098240 BLAKE2B d9773016f82e87064775640755d6436a0d86b43377756bd9e5a00de39ec6d6d507b6a6e270c252b851d58d7949e083ee18ca2074a0f3811e16b33f2f6806697e SHA512 de759acf2e94f6565ee7f945930cb2b33ba69b7e3916e47c90e13ac280e20a668b95fc1c5f61369c4e6251c91505911b18979ba9efa2595223da8e22cfd71ff9
 DIST gentoo-kernel-5.15.98-1.x86.gpkg.tar 59166720 BLAKE2B 8773ee4bc2a8989761117142e4c0ed3c665d3c060932f30c40210082e9744c5f4b5bec0e08289c1ab83a8690e1d48b40757c54bdebaa25e5a8a0cb12642db74a SHA512 876b3b1e006b81b08abd8a29ce0aaed6e53d8f62761642bcc118f90f97c9182980c716257ec2705fc8802344f1f02432d70de192e5aad346336c1c4354cef99d
+DIST gentoo-kernel-5.15.99-1.amd64.gpkg.tar 69652480 BLAKE2B bce6e5b04bb2131d9d1fc0a7391f3ed6b751f338696c41337468a1e5ecd167b50cc9075154f4df2da36d5dbbd70ce07cbb7e45fbf8029197f9ec31292366b27e SHA512 dccac12cbcc1267d50453d4065ba1ca21fba34cc66332dbd13b68efaa259e50702920dc8e3e36e8c6fcc382d15fcbc4577faea557d0a02a774e95b7de6ed25d8
+DIST gentoo-kernel-5.15.99-1.arm64.gpkg.tar 62597120 BLAKE2B 6c75923499eec31295d047a08b92520ce82c24bf50a03c4995d8875d6f043e1d40d5fae5b656ad486edb4bf137ad2786a04c3d3a375c1101d35ce48fdd266408 SHA512 c1f2e01cc6389c082598fe09ce7348807dfa9e84f226c510aaaea3785401241c879d2cf188579937e1ba1b0825f5ddbcc78752834bdc262bc0565881ba4e3917
+DIST gentoo-kernel-5.15.99-1.ppc64le.gpkg.tar 57098240 BLAKE2B bd7e0b5882277fbd7352e3490e967e115de3550f7db38757ea86bf8614981302759d418b25472147fb2c165b2a1d40b7fe0760f78b3ae907f8e4a6bf453ea60d SHA512 cf41d683b601e3e41cc3397f1d80275ee4f939177963d7e651abc1ab0bed3e5a5f28cdb56aa914739dc6cc6e0a9bf1dbb5fbd4adb633a2e0215eefafb473404f
+DIST gentoo-kernel-5.15.99-1.x86.gpkg.tar 59176960 BLAKE2B 5d12baabdf45b4bee704eb49f24daf3c891965a858016d53a90601fa49f6eded739a72f681391a96d16806378d10a01a1650c3c9bd3b63272037ad3c90ffbbac SHA512 2a6c19b5fb0a0c84a1eb19a720522acb490f5b0dcd234a3cf5ccfe2ca643ff83dfb88e2be91532894c66d7b7e470ebf671aaf9eb71820401f1e403def300e100
 DIST gentoo-kernel-5.4.231-1.amd64.gpkg.tar 60497920 BLAKE2B f04ff277248f94e20395d885af5487633dec1217d806110a7476ffec71bb8650d4c7911671ef71b48abac9cbe45efbd4ccba2fa023631ffcf500b03f2b584d3e SHA512 d442f59916f41cbe4a59f20db9ed183887566f4d060fd374660fdf2703d0ae1772942721a78407f3363b3017721041be449ce20cd1849b99a5f3258b37b65abd
 DIST gentoo-kernel-5.4.231-1.arm64.gpkg.tar 56514560 BLAKE2B dfdb0f036162843b839f37e28d2276fa073c8ce1c56a8016ff816410933217f46118da0c94c73ff2d917b696034a8d3f6b3188ff597425fa0c0af0b152abb5b5 SHA512 7b8efae1e45028332ecd0e3229492a4a577e352bee3b91a1ba6d356183d12e7c98c4293ec432d48fd23a24a3d558f0d543406143d9c9e4eafba0065a446fbca7
 DIST gentoo-kernel-5.4.231-1.ppc64le.gpkg.tar 54200320 BLAKE2B f987fcfb24e2b75de94f831673c6128b7c943b5be328fff880de5d2a862445dc6f36fce8e6fbfdd8f9be98acd97d3c9640b5979114f49069b0333a19e0950af8 SHA512 7b1b9cd22583802c0c9531d1e36a34634e8a0b17b2b23394e54e7c1b38d3019934bddd281e9bda8f5c97320e46dc2893c002b1259c47f7f6b1e67852ea43ccd0
@@ -104,6 +114,10 @@ DIST gentoo-kernel-6.1.15-1.amd64.gpkg.tar 76595200 BLAKE2B 5c41755d5494327de678
 DIST gentoo-kernel-6.1.15-1.arm64.gpkg.tar 69314560 BLAKE2B 9dafb2799aff6bc7363d79795dcf31498c658fcdcb68082a6c60a7dcdf72491a34b8040365fc70076d1ff68369365661f7e0a1ae915bff69f6638fb671d646c5 SHA512 a6b48ae321e4a79bfb334c8310a8dc638c564fd05e00e7bc9a4c324e7a5bb026f30908183660078bcaa6c945d848cc1f67a5590bbe0c55bd12dbfe9a478ced12
 DIST gentoo-kernel-6.1.15-1.ppc64le.gpkg.tar 62679040 BLAKE2B 3eac67cfdab5aeccc3b6cf7362f202c7651b3869bdc765d9acd377439076d275407bc9cc15b449a13d74f0c256c6919d88d6c006012fcd74ce753249892619df SHA512 2e9d0879ed7c311dd5fa88a344047c7e2b2b1fd9b81f04d31d5ef049fdfde7243bd57d5f0fd73f1effb9d58632a6b4e41307085f195ad41e47a612d2a79cd174
 DIST gentoo-kernel-6.1.15-1.x86.gpkg.tar 65832960 BLAKE2B c4dbcb24073061c38b29ed709b3873042627bb34c9efb05a268d07934d02df41e52b987f935172dadb50f87ee97e353efb1706f37ddb54ea8663d0c4a69cfb9a SHA512 b18b3eebb97ef4a82ef8147ed41da663c6d19a0191548d74aa272b7650404cfed972df2146c251acd93965436232d55b72658b0992292054338629aa82e5bca1
+DIST gentoo-kernel-6.1.16-1.amd64.gpkg.tar 76636160 BLAKE2B 4cc4f4fbfdf54c6548175da5b17cb4141efcefbf57d375b280e79e20b60c0eb392cd5863c12a736f9a68662f2c95e6184dd7595929839b96a25dc2e6a41cff71 SHA512 c8ae01328457967ff7695b52d12418fcdfd49aab1684159be48f463a8631fd67cd62c9666bddffddcd9ff7dce0cd5182e2e0c7f9ff3426241a9066542d688360
+DIST gentoo-kernel-6.1.16-1.arm64.gpkg.tar 69263360 BLAKE2B 8a9f7be86bae5ea33e463f703a2ae4b1741997ccae4c7682054d3dbc56c7eeb2af07c28d654d35e82ac3e26de2900cc128e3fe6faee9920746209f37ab5aec5f SHA512 c6f1e740bfdc8732eca6a4c2134833f2d00e24ef34286d0ec5643729a941d0d6b061cc3159335694b6b2f1e7ed8f1c30f172ed2cd32b23af59cec1cde81bb47f
+DIST gentoo-kernel-6.1.16-1.ppc64le.gpkg.tar 62679040 BLAKE2B dd90a336694afad709ad5e4e31746bc32f02250ee13434f80ac11549a4a1827f8cb6918905f4643c991b768e0f0c21dc07b990f8df432b9118381e897d52a111 SHA512 e2bb7ab00ef5f1f6588a55ae0b9f85965c5780b4f076989eb55dfff930019503a7553908bed28d87107d429d66c9286548f365975fc38767d119c5f21f45e8cc
+DIST gentoo-kernel-6.1.16-1.x86.gpkg.tar 65853440 BLAKE2B f58304e1117347899f3b48bd672ac5c96af0941af1fa80d82c5fb0ac12f74151480df40ff5a0dd5a240ce51fad43f78cc8e31e044a0c66b3795a070d8268fbf0 SHA512 b13f58514c136f9d0795266c15968c10bb16913e38f7be5a209b5aba0df7aaca1b71da9d6e9408f804bf472486867f71a377d3ee05c8dad36049343089e78093
 DIST gentoo-kernel-6.2.1-1.amd64.gpkg.tar 83271680 BLAKE2B 84f16715dd8119c529e56ec433f21e5b8500e56ea6adbe249c2a00aa4293df284b4b4d349adfcd22399fa72b11316ea1fbe63dceb5ec7d47d55e2b34c3006b97 SHA512 5cb1816ac483496aa814700758ddb132f9c6de2de1c1772367afab9bb50abe0a2575f788a2f904688eaf7fdf81119a79b546a5b3b8520834a9abce1e9a630b57
 DIST gentoo-kernel-6.2.1-1.arm64.gpkg.tar 71649280 BLAKE2B d7acf954906471cf63a581604fc522c109ee884ec7b4d8cde182c7589810bce536b72f22d5306196d066b1996e937b400c2d88cb8ed586c112e4126918d8d3df SHA512 02033ccf80ddc88c174ad299b2ec42e370fb9736f26f71e5131aa4ab582824a01385613258fee5d1453189c7bcc32511e38b5b8c766f1fffb1a760dbe6d7ba94
 DIST gentoo-kernel-6.2.1-1.ppc64le.gpkg.tar 63713280 BLAKE2B b0d8a048fb3a8bc8dc8cda7174e2906ca73d462b395fd601b2dea3476f6491fe19b95af7477328c1f3a065b06f0a9e9bcda369a4752cdfb3d036fbdaa219febf SHA512 793f5b5459176323d43995955c722973afaf96e7457c53cef61eb79f52373ea646cc3e7143c296b1904e062fcd871ded092d376d4a4b2c61bd5ff2a42297ccbf
@@ -112,6 +126,10 @@ DIST gentoo-kernel-6.2.2-1.amd64.gpkg.tar 83261440 BLAKE2B 083864d6c45593c9ee849
 DIST gentoo-kernel-6.2.2-1.arm64.gpkg.tar 71649280 BLAKE2B 81232783c3f42b1701817d475d50b31c990308d9e9018dcc93b3ae85e174d7e98fa4309eedcfd13bb3d9808d26a74c42f2d307e0db2793ee0a0f483b64792e6d SHA512 c1c49d7bdd567deae47dd5340a4f6ce03b9c19a27cdf331993947acc45fae67de3a61cc42a122ff0f55e51137cd21ec1b27f0611b8983d3008abe7310d2827e5
 DIST gentoo-kernel-6.2.2-1.ppc64le.gpkg.tar 63723520 BLAKE2B ef5de59f98854d9398125320345457f479edf2b72012c2be39ff1f547187134fd648b06cb4a026045aa093ae6602e76d7eb36987c5f4908f6796799299013d26 SHA512 1881756c7ee4f705d4e5400bc3a54b16ff2133439914f34ee55e86a148715924c79d8232846bd4b16db2165ed9d5ba66ad7ebab7ebb6360a044eddb088fc73a7
 DIST gentoo-kernel-6.2.2-1.x86.gpkg.tar 66703360 BLAKE2B 0cee6dce4e265fbb81dfa2845127b1d13ce5a817a901e19b10331b84d325107fd6611d4a0e2281e997ed29f115dfbcbfe4fea374ced78abd4e14dd7f1bececc3 SHA512 720b08b4106882973296614e2344ac025191c144a46bf9347d80338e4b518fd2ddb2dbb344f9876e92d3296e4ccecf68fe72dc56747d43c4f70ef2d1eacacab1
+DIST gentoo-kernel-6.2.3-1.amd64.gpkg.tar 82411520 BLAKE2B 1df52b8b76d75aba5d74decb1d13d2126b2682cf9745a0dfa083df198988991d234e4c55a8126d404cbe4213db59feae8a21037161fe931db69f2556eb4e62b7 SHA512 88665f1f9aa2c81cdbd65720a9de87fbb9d3f85c18f8112e60232dedf5b6a365b9c6a6c05c5c648d9216032dd5dba0935c359ae4a2e689f1d96721d53bc50e9e
+DIST gentoo-kernel-6.2.3-1.arm64.gpkg.tar 71628800 BLAKE2B 8eabe50f34ab8f2dcf10429c592868001e78234c5379d8b7cebba0f055a780f998aae52b95a6de495e52c5cf911f5ef2c46ceb4de2c7eb9db8368e02d0690afc SHA512 0945743cc5039341c9aa3d6524f8ff50550d83fb9180cff15899def156b52731f0e2564b1fd771239cdca7241302251e80fa3e6cf53a367ccd504644ec28ea0b
+DIST gentoo-kernel-6.2.3-1.ppc64le.gpkg.tar 63744000 BLAKE2B f9edd03b602530e0244fb147b4d9422dcc2c7e44ecbbefde0e060539ed220961d1ec8c27dffd6862bf9ca4f2106758335bff5976f1d4936d6ac60688a7f1a48a SHA512 7e6e8dfc9b271b028d6ebbff36a591381aa07e89f63eefe0384c8368760283df5357038abccc314ad181cde976d9afb972bfc06fd0bd102c40800985ba257ff3
+DIST gentoo-kernel-6.2.3-1.x86.gpkg.tar 66150400 BLAKE2B cec38a2d31fc36e2015992fdadc41f8587ed0784d1339518a845a4cd3c5c536df43f122fa6bd024ed0f6cfb2268a576d79bc19f55faf98ba414e0200f049e796 SHA512 425ae13ac45b0380bed95951d74bf305c0146094d3e72482af33ba058360fafce0b228e8c4a26d785fb23e4afbfd855b48b8d04b5d601f0fe31c89ec5ff79119
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.99.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.99.ebuild
new file mode 100644
index 000000000000..64a82c2b8323
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.99.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.16.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.16.ebuild
new file mode 100644
index 000000000000..27016e1b991a
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.16.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.2.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.2.3.ebuild
new file mode 100644
index 000000000000..ed76d510db0b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.2.3.ebuild
@@ -0,0 +1,127 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-install toolchain-funcs unpacker
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+BINPKG=${P/-bin}-1
+
+DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
+HOMEPAGE="https://www.kernel.org/"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	amd64? (
+		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.amd64.gpkg.tar
+	)
+	arm64? (
+		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.arm64.gpkg.tar
+	)
+	ppc64? (
+		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.ppc64le.gpkg.tar
+	)
+	x86? (
+		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
+			-> ${BINPKG}.x86.gpkg.tar
+	)
+"
+S=${WORKDIR}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel:${SLOT}
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+BDEPEND="
+	sys-devel/bc
+	sys-devel/flex
+	virtual/libelf
+	app-alternatives/yacc
+"
+
+QA_PREBUILT='*'
+
+KV_LOCALVERSION='-gentoo-dist'
+KPV=${PV}${KV_LOCALVERSION}
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	cd "${MY_P}" || die
+	default
+}
+
+src_configure() {
+	# force ld.bfd if we can find it easily
+	local LD="$(tc-getLD)"
+	if type -P "${LD}.bfd" &>/dev/null; then
+		LD+=.bfd
+	fi
+
+	tc-export_build_env
+	local makeargs=(
+		V=1
+
+		HOSTCC="$(tc-getBUILD_CC)"
+		HOSTCXX="$(tc-getBUILD_CXX)"
+		HOSTCFLAGS="${BUILD_CFLAGS}"
+		HOSTLDFLAGS="${BUILD_LDFLAGS}"
+
+		CROSS_COMPILE=${CHOST}-
+		AS="$(tc-getAS)"
+		CC="$(tc-getCC)"
+		LD="${LD}"
+		AR="$(tc-getAR)"
+		NM="$(tc-getNM)"
+		STRIP=":"
+		OBJCOPY="$(tc-getOBJCOPY)"
+		OBJDUMP="$(tc-getOBJDUMP)"
+
+		# we need to pass it to override colliding Gentoo envvar
+		ARCH="$(tc-arch-kernel)"
+
+		O="${WORKDIR}"/modprep
+	)
+
+	mkdir modprep || die
+	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
+	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
+}
+
+src_test() {
+	kernel-install_test "${KPV}" \
+		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
+		"${BINPKG}/image/lib/modules/${KPV}"
+}
+
+src_install() {
+	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
+
+	# FIXME: requires proper mount-boot
+	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
+		mv "${BINPKG}"/image/boot "${ED}"/ || die
+	fi
+
+	# strip out-of-source build stuffs from modprep
+	# and then copy built files
+	find modprep -type f '(' \
+			-name Makefile -o \
+			-name '*.[ao]' -o \
+			'(' -name '.*' -a -not -name '.config' ')' \
+		')' -delete || die
+	rm modprep/source || die
+	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
+}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 7cfdfcb79206..a83f6617c027 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -6,8 +6,12 @@ DIST genpatches-5.10-178.base.tar.xz 4951584 BLAKE2B 179abbcf89b3ddf39dd4df86568
 DIST genpatches-5.10-178.extras.tar.xz 3868 BLAKE2B cb6e6ac11355b5a8ae19a464494a7e418edf5d475b793114a0f23f3e4b173dd906f13df77474a9223a0cd3359c2647a736939fd2f98744a1edc42c870ee14b59 SHA512 24665f3effa01f08f4cff8e84ada35a019b09d4173e29f1413674635b14b25d78cf2177fe3f99ad6bfb657c56970b010a3cb21e3defc3b03aecb9efe3218eb96
 DIST genpatches-5.10-179.base.tar.xz 4960220 BLAKE2B ea5daad3714354614f82977b59e4d2ebb6c31371175883195c7e6cb317a73ecd29ee4d7bcb326ad06e2cec855c74833baf13d3c7108a77205a4cd71b647ecac2 SHA512 ebc6d36654dab8862bd1b569564fbd64ec43397148748d9b7d953abfe3da33b75af0d536d09e44cd10cf19719e82fc5d8a403640dceb3fef75995b6c3ea3bf6b
 DIST genpatches-5.10-179.extras.tar.xz 3872 BLAKE2B e493d4df16cfacef4115e3d673820a8674d66bf4e965e6cf807e39580c4efb4dfed0ce16d415028a3e2edb46e03f3ba4e9063b5e44e6b89e6a9ac0536f5a56d0 SHA512 9bf3a036990f34d236809c5d88b8981a9a374d390b8b10ae640b7ab825a7929b6169d1e75cd7186e22b7a3aa4c417ce7ab222ff6e5f9429f33a1eb31c127ae0e
+DIST genpatches-5.10-181.base.tar.xz 4964488 BLAKE2B 2b05c676da465b1627c92400f1290c7755c5c443db0f566fde2a2d35422f84a93875fd0cdd7af5ef331872a9ecb89e802ec48c76914a25d2b6d401edb2022d7c SHA512 2524417fe412b83e380ca55b89403abde41af034e5900daee53b82d7e4183a0345ce3e86e03ac9e211380437f4857163a4e81737d1117d7e02847ad36553c0fc
+DIST genpatches-5.10-181.extras.tar.xz 3872 BLAKE2B dd1d27a04cd2215fdf9ae7301d6c90dd0a1e9e4ffe7e295dfe2d6b637de69303d9cd2a00a5adeb33d2c4cc7d984e57e69bd9f998df1da188ae006511fe70302e SHA512 b91ec330f3f87bf7ec5cdc10e6352070161d38d09fea82142b2dc475a0a25d176a262cc0bf24d4a4902e84abea84f6263c3e859f1ebf8f44155e42c5f565dcce
 DIST genpatches-5.15-100.base.tar.xz 4036256 BLAKE2B da0f271d54f248597d038a09f3cae6a2293ffbcaf9f06ad500060e0b28c57c0120c64f30cbb97b4b4585cc1a8f12b013258962a6599a166f5716e268b0587030 SHA512 865ece0271c674aff6df31d7b0ef8dd8d9643e9e7ab49730bb2892f82e1468f4f086710c62f6f647cb2a4e822a5a5fa2e2415fec8d900f82976bdca23384bebe
 DIST genpatches-5.15-100.extras.tar.xz 3932 BLAKE2B 55665c7edd0316db7e6a8391ccfc97a3f2c51e9e445bb81e0663ad69405ce577133f2def0e58711b1f8dab0b7bfb4314e05a41183138585eb24c909b7cc8c2fb SHA512 dd32b33616a64fe0f4b319e3424360a29d81ed1c6d94457da0458d7141013efab4933c685468019dc7c023346697d31c902e67d17120208ae408939b2fe1c5a6
+DIST genpatches-5.15-104.base.tar.xz 4172432 BLAKE2B 3056125f31757d4daf4d5a5df4f9e0c02257786d5dbfb44a134abffd2c8615d170f64f4d5154b04e7a5e6e825ee175430c842a7490ff6a3414954059a72a88f4 SHA512 324899dda69e2388adcc7241a5905110cfcd6a400d011c5948a983ccf5693be820b56115b5448f96fd819457574bf6ab3e7cabbf8169bc471df4b9a73b024975
+DIST genpatches-5.15-104.extras.tar.xz 3932 BLAKE2B 749f1d9446c12992266e4b24771cd4273fdb6a72793f3591956c33f210a2671d587f0cc04d0e9751511bce1e03b76df53e65231393e9d2eb1169ac825bd046e1 SHA512 66de4f74decfdb0f76050968d98a6cc378c04d5d19b9c16e35fa9746e9dce235c602ebe12fd19fc2b6bf8fc9d9eab3d9461e6aad3edc00cc465ae18a776b0e4c
 DIST genpatches-5.15-98.base.tar.xz 4003192 BLAKE2B 79d4fb60a5192137571109ffaefdfba23ac589102539cdde89046f627f39e65a52a44a83607232b499509b8bb4c341e2fd26ae971587c9574d4ac87d8b220893 SHA512 946a7638d19d5fd610075520e529a6c5a47aaa433b7986493f62571a7dc541278013a5006bf1e745496e4eb98de44af56f61d23679c139a719a8d5bc20c9e734
 DIST genpatches-5.15-98.extras.tar.xz 3932 BLAKE2B 4e5dd4f8ba6d14764a6546cf7e64dffb3ddcc77678b7d96d2498917f30561792c904c635b0fce7191b7c0c65549fa769e89befffbea5e53a3cef64c673937c20 SHA512 337d95159432cba3b85511cf80c350a8a2f67c65b72a90b26ddc98c01d2d8de70d9b6067e0573c5c339a5bf64973d10c06b42001ee19a7add3d672e4577d0622
 DIST genpatches-5.15-99.base.tar.xz 4024008 BLAKE2B 82205380a55439dbe6f8605d09078d7a349ec60180204ced6c9902f340077c800cf515f3f513c69110eab37a8daa386a82ec4ba9e84dd02299ccc45379cdc659 SHA512 72033d94d3d509ecefb5a54e82906408802118cd985f617ccf7465e23d19363668159998dadb950bef58af11bab448110e6c753eb6eb7dd107feacbda4d67f3d
@@ -28,10 +32,14 @@ DIST genpatches-6.1-16.base.tar.xz 820936 BLAKE2B 91554b3c532c7ba9549291a2a6c3ae
 DIST genpatches-6.1-16.extras.tar.xz 3804 BLAKE2B 72e1824ad6d561359eb287c8f67d94b961c6054a4bbc66af9571caced021d6d3cf64d5d06be4977c22b4c1061b37b5f174db4713040faac069dd9e7b29fa2a6f SHA512 ac2c48ed858be0a2c844646d343de6994f1f8179b0369a6be554f1587369679b651304f967346aa1bf2f462ae62b1c8c0fcb5bca32ec12e2f6100a694aafc6b2
 DIST genpatches-6.1-18.base.tar.xz 833216 BLAKE2B f1b86487c82d4354347171df635192a6276a4d0a9561a415270a85caa46401e4b9089f847346cbf441f8c6a4d4012234d83b31fca5797cc6296010f225392990 SHA512 155207127c1c58b2497788d5b7541ba1872fefea3d2c7804356e5bb6d28dae2f0400dbab44cf39b847f89e7a058710b8528059d75f0e92b63d3d37fd0a515ca8
 DIST genpatches-6.1-18.extras.tar.xz 3804 BLAKE2B f31c07ec6318b91e6e7eabeb62bc28af362fc097297b31521d464e298effbdf52cdb94b43a1811fc10ea3dc9387fa47501c4987d6709d73603ed15ac7949dd92 SHA512 8611f8cd72f54b7c4360d314eabcccfaa99722f568da32710a39f47ffd1770b14502130be5ce3d3a14a0bd93fc9fbb73f65a9c9636a8d0e9051892d1e5221ef7
+DIST genpatches-6.1-20.base.tar.xz 1052484 BLAKE2B 9599ee78ab289960d7d0c81db8d509a43f8dcb524163216af9c2bcd37eb1fe60b9c7e607faecd19974676c5cf863a4edbdc668b39ebb1f37fec98b1eceab42a5 SHA512 9e99a69ed5adc7fa8a33cab86ea187c42e888c6d768cd3d39d5491c8d96dec2fc5f4c11c02075b01de1530ac629e63876152ffa7643d3a3b899fd1655d67d1f0
+DIST genpatches-6.1-20.extras.tar.xz 3808 BLAKE2B 4d121cdba86a63a5564f44f2b33841ec07d456da813070f73cdc2b983b5fe466e92b845a6c4d0959aedfa3ee9a8c57fde08a84aa6a31926d43a5ac68d4c168df SHA512 8b17882ee84adda037433b2ab13aaa378812f6d6f3e87246c1befe54c0254d1261b3fbdd89410f133ea35e798bbca597e392222ba1bfc93bf87e645600609dc2
 DIST genpatches-6.2-2.base.tar.xz 9540 BLAKE2B dce2bb1156f0e9a7ca19b618d13729908001939d6ec6361ca6619808a120e61900b5f4de97b2bef0e63aef81a83c7e2a0d736f3c344d9a610eb5c6a21baeb111 SHA512 50aabf4c24dbf13595556314b2ba8f1d0219355bc79c0fddf05ef7a6d244fe3c54f95c733e02fbc032a582495c59688f415af5b62b3401b436cbb5f0ef3aa9ac
 DIST genpatches-6.2-2.extras.tar.xz 3804 BLAKE2B cdbf51c28ff1c3b974665f558ec774eb70874a3941b97f966ee90642f3a1c8732333348e891156a40455c8b80c2a2002fdf1515403eca7b8d075c28b09a2ed78 SHA512 cba0fe9b3d13f3b1f6ee413a44698694ef6b009918dfda76e4d8402e66f1e857bf889fd4eb7ae093e864f7015eb3fe14aa704a5a3b68b0b92ca494bfc4b43a71
 DIST genpatches-6.2-4.base.tar.xz 15256 BLAKE2B 4a6bc8f4b75be2afe87d3d29ebdd45cc6a6266717b793a611edcefad3b39c3f70f14533b538eb175f0c16e901006d52e09994072cf9375dc0606db0478472d18 SHA512 0351b19b50bff5922d916b215c8b5b04a31994973dbde9553b2f197009447c9d5dc992f0b9ee25bacdd1569477a0beed4e0359dec390ca4914ceeed3e73592f5
 DIST genpatches-6.2-4.extras.tar.xz 3804 BLAKE2B 909c69169a518c690e62cb3417a35fdcbc1f3102d388ea0f6eb5329753f50596bae769ef033d43bc9d9fc5cbddecc3ca8541f771c4e02c76fad6253594cf5e5b SHA512 c22a12ea1d3467891286d9898582d038026230181537ae40927182b9549e7a768e4ae62ddf9b402e67cd31e18cb64e9f9567c5037eebc98500d4aa21ea62b44d
+DIST genpatches-6.2-5.base.tar.xz 297244 BLAKE2B d76f6189b57b3c81ea8d8cde4a4464539ecfd27f38790eb797758d2ca9f3c4f1e4906b8187faf515035ee220107e698d60d6687cf9d05e7805ba2e8a5a47ff7a SHA512 e0ab47321da0c7588b102d0c9af435bb23c0ea01915d1e9080216bb885f2dbd97ea0d885d2f72297dcfda18fee524dd2629533a4ee65ae72cde0651be38b962c
+DIST genpatches-6.2-5.extras.tar.xz 3804 BLAKE2B 23df3f3d54c5c9d0db420803bf45861111addf7bd23efd65a928345103e5fcaa34639c18c4c72911ff9d17cfacf50063802af75674d9c2839b0448185ca0eeb1 SHA512 5727b99aca295c425c5ab67e8e25b3e7ce0101542d60374d3f54abcf66f336d303ea529b683ec0d82da5ad471b5399eadad2fc8cc1dba3c3b13eff1735d1c12f
 DIST gentoo-kernel-config-g6.tar.gz 4562 BLAKE2B ad9e1b28f84916f12cd8b21feb2f4396d3d63f4cfae3e6b6fe93f919c98b0b4523b205711ab7acafa7121360f696eecb63b9f162dd12950e56dab1429cc13633 SHA512 d180122eb00d40126ea7d79224559904eb0ea574314f9a8d6be6b10f0f6a49f526eba1366ae8cd0a4fe23cd8ff5e292c8cab7e856a2c915d4162b75a03f8076b
 DIST gentoo-kernel-config-g7.tar.gz 4625 BLAKE2B 72ba0d038ee34ca5eb26d43bd373735aef3a50d02b414993ea05485e49d83d46df98a6cb0f6f3170a8ec0c99b557432fd9a11cbb92ff7c2837625a7f4469831e SHA512 2d74a8ca9f5402b4290ed93cd3ddba04a7f2ff42c8d8d3f2cbbe22fc20daa0fca119368daa8af39b7a26b1b99e4e3187c3c5d95886a651675ad94ff98d686628
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.172.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.172.ebuild
new file mode 100644
index 000000000000..5bbe99781a9f
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.172.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.99.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.99.ebuild
new file mode 100644
index 000000000000..2749381783b5
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.99.ebuild
@@ -0,0 +1,134 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.16.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.16.ebuild
new file mode 100644
index 000000000000..dd5577ddd24b
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.16.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.3.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.3.ebuild
new file mode 100644
index 000000000000..6406ff1f6bc8
--- /dev/null
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.2.3.ebuild
@@ -0,0 +1,140 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs
+
+MY_P=linux-${PV%.*}
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.2.0-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built with Gentoo patches"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
+	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )
+	hppa? ( savedconfig )
+	riscv? ( savedconfig )"
+
+RDEPEND="
+	!sys-kernel/gentoo-kernel-bin:${SLOT}
+"
+BDEPEND="
+	debug? ( dev-util/pahole )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+QA_FLAGS_IGNORED="
+	usr/src/linux-.*/scripts/gcc-plugins/.*.so
+	usr/src/linux-.*/vmlinux
+	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
+"
+
+src_prepare() {
+	local PATCHES=(
+		# meh, genpatches have no directory
+		"${WORKDIR}"/*.patch
+	)
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		riscv)
+			return
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-gentoo-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index c48c6cc7120e..4c9cf2cdb6ab 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -55,6 +55,9 @@ DIST genpatches-5.15-101.extras.tar.xz 3936 BLAKE2B 2c8cbd804e73236996cd997700a2
 DIST genpatches-5.15-102.base.tar.xz 4041416 BLAKE2B ab6ac9c8d03d41594f1f3c0b59cdeb3d045fdc0bc89926026a7b3f34eef38a869da1c9adfa1ccf465486f885dc4abb6c8d09a8c36f2732bb961b365a749e8985 SHA512 2df353c92659d8f41a45bd3caaf33e21542cb01ab210495a632e65fe71e8bee7c31ae7283827bc7e0683737f3a451b617db95b5a8b559cedc8296496e2fa3302
 DIST genpatches-5.15-102.experimental.tar.xz 5420 BLAKE2B 8674cc001e573762f46dfbcbf95bf8468d80ab10a4ba83fae20f546a3682e7dce64cde4e2169d9c6c9a7fbbb0c868f66ff69416c162797f33e96a81022dd5c46 SHA512 198a4c836fe08155ff8564f2c2b121de7f27fffc8bb8b6d3dfea16bf5c9050d01a96e71dd5bb095596610ef91ae04a29d2f9aa5fa3cf43313b1ead1ea7ecd090
 DIST genpatches-5.15-102.extras.tar.xz 3936 BLAKE2B 4069a121383a58eedd557cfe3c421ca8c033e4b7a976845c557b3faf66b33d9efc6c7b3d4dad20cdeafb7d62588a4c49bb7102abfbd7acb1c98b1afb86e8f87a SHA512 b12c07aa5c9974856482f44ecc39ae03f7ec8879d07bff562d56b0c18752d748455b519f7bd53cde5f22df1787c15d52037ee236c1150edcc20416b9c6c1e272
+DIST genpatches-5.15-104.base.tar.xz 4172432 BLAKE2B 3056125f31757d4daf4d5a5df4f9e0c02257786d5dbfb44a134abffd2c8615d170f64f4d5154b04e7a5e6e825ee175430c842a7490ff6a3414954059a72a88f4 SHA512 324899dda69e2388adcc7241a5905110cfcd6a400d011c5948a983ccf5693be820b56115b5448f96fd819457574bf6ab3e7cabbf8169bc471df4b9a73b024975
+DIST genpatches-5.15-104.experimental.tar.xz 5420 BLAKE2B 09bb927bce81af1a8cb31ec4eff87808e8b66e82928bdbccabfebd6c1753ee53924ae8f62b9c2b11e26a42606dd164fa4e0a6daea5056e18631037f5f777d153 SHA512 9f3b9a37d19e3611236990185e407dbf2b59052da723fd1ea63b98fc68f98db10083b84158a4937ab1de23ae3799ad35a8d128b29abb81d4b33ae57d99bfdba5
+DIST genpatches-5.15-104.extras.tar.xz 3932 BLAKE2B 749f1d9446c12992266e4b24771cd4273fdb6a72793f3591956c33f210a2671d587f0cc04d0e9751511bce1e03b76df53e65231393e9d2eb1169ac825bd046e1 SHA512 66de4f74decfdb0f76050968d98a6cc378c04d5d19b9c16e35fa9746e9dce235c602ebe12fd19fc2b6bf8fc9d9eab3d9461e6aad3edc00cc465ae18a776b0e4c
 DIST genpatches-5.15-92.base.tar.xz 3843196 BLAKE2B 1a70c672f4ceda221611ba1bad20fc4e791a51e27f412995308cb7f39962c6e237efc1bb7912c67b8e3dabaffce3bb6ceb55d62f4f12b79671910b70c1e7a8dd SHA512 33390b3e24783405971f2eacb24e715faf841a66e477a03d4055d61694fa72694d7563d799b95d47037ad0d7e7c234e56c894ddd7cd1dba59077efb901bbba26
 DIST genpatches-5.15-92.experimental.tar.xz 5420 BLAKE2B 9f091fe8429c6479c27819dfe6cd0ac04cc7f35d2af28cd69c6a8f9498664162343ce63de56c77aa3a14e70f638e741e3ffbe08c26a2cbfceca2b9bd6fd852cf SHA512 513f465509cb644e1420161bc909b7a1adc155ae6d7d7af4f0362d4fea4e7dcf5912cadb6737c1d33ed5b5b8dc5ab1b0de15c81bddd4d380b069307d1dc0d4b0
 DIST genpatches-5.15-92.extras.tar.xz 3932 BLAKE2B 12936d0ac139d69f2e5947436ffd34add80625aa383aa23e51b4419a5e2ad3c38ace4d69c9e7066bfeae32ab727013e602c3a1c3424e128562597c517c7e5903 SHA512 6595eca7525db97672a15275228dbb9b14e7e234514b549e0fc17daeda4b48d298f6dbcde46e5862fe02bac9f50ffd7b05d82a174541469456289bdc6eb7f4b1
@@ -91,6 +94,12 @@ DIST genpatches-6.1-16.extras.tar.xz 3804 BLAKE2B 72e1824ad6d561359eb287c8f67d94
 DIST genpatches-6.1-18.base.tar.xz 833216 BLAKE2B f1b86487c82d4354347171df635192a6276a4d0a9561a415270a85caa46401e4b9089f847346cbf441f8c6a4d4012234d83b31fca5797cc6296010f225392990 SHA512 155207127c1c58b2497788d5b7541ba1872fefea3d2c7804356e5bb6d28dae2f0400dbab44cf39b847f89e7a058710b8528059d75f0e92b63d3d37fd0a515ca8
 DIST genpatches-6.1-18.experimental.tar.xz 71768 BLAKE2B e4aca308b873e63712da39995c7e1a4571c1a20a12254a760b0bcc26ec6bb8cb934a608c265e707581766ed1745d7921846165d1a81515978638b709c906093b SHA512 2644ae68588c00c242951ec9f59afd2ab2d9fb660691bb05a53b9eb0d0f84040cd66bf49bbd63297c762002e5f01bdc41b205b400eb22c43f909ad7ca760edbf
 DIST genpatches-6.1-18.extras.tar.xz 3804 BLAKE2B f31c07ec6318b91e6e7eabeb62bc28af362fc097297b31521d464e298effbdf52cdb94b43a1811fc10ea3dc9387fa47501c4987d6709d73603ed15ac7949dd92 SHA512 8611f8cd72f54b7c4360d314eabcccfaa99722f568da32710a39f47ffd1770b14502130be5ce3d3a14a0bd93fc9fbb73f65a9c9636a8d0e9051892d1e5221ef7
+DIST genpatches-6.1-20.base.tar.xz 1052484 BLAKE2B 9599ee78ab289960d7d0c81db8d509a43f8dcb524163216af9c2bcd37eb1fe60b9c7e607faecd19974676c5cf863a4edbdc668b39ebb1f37fec98b1eceab42a5 SHA512 9e99a69ed5adc7fa8a33cab86ea187c42e888c6d768cd3d39d5491c8d96dec2fc5f4c11c02075b01de1530ac629e63876152ffa7643d3a3b899fd1655d67d1f0
+DIST genpatches-6.1-20.experimental.tar.xz 82776 BLAKE2B 9be7b0da2e118aeff23e6566e75006b8c594bb77956ef1fe7d3bff14dec09405f22dc7228769354508302af8a863e9f4c93546f3b6c9b1ddd4b1d658400f5e61 SHA512 066f957355accd92200a4aafe43776aed1e5c4d000b5801c1860d1fb74d3c09e50e4b5d0540cea15202c7071bf836fef64a04e70fe0d37c2a2d54743b8f73bde
+DIST genpatches-6.1-20.extras.tar.xz 3808 BLAKE2B 4d121cdba86a63a5564f44f2b33841ec07d456da813070f73cdc2b983b5fe466e92b845a6c4d0959aedfa3ee9a8c57fde08a84aa6a31926d43a5ac68d4c168df SHA512 8b17882ee84adda037433b2ab13aaa378812f6d6f3e87246c1befe54c0254d1261b3fbdd89410f133ea35e798bbca597e392222ba1bfc93bf87e645600609dc2
+DIST genpatches-6.1-21.base.tar.xz 1052684 BLAKE2B 8ceb101f650a74dee8401a4a08cb052e821daa4f04b2a9c82e1cb40f0589aef8e6974fd5355922b19868558b373d1751bce7c5db5923c49433955dcd1863b1c5 SHA512 9db8c2413e56f7684bf4414ecdce3fc21984c69851125971e9dde372a6f8fd04c9f5159273d67815d96565062a221d8325664dd8762d353bd24f9afc02eeed11
+DIST genpatches-6.1-21.experimental.tar.xz 82732 BLAKE2B 77c0bdf1c2911cfcc2e12c689eb81a7716ee9f480cdba43420c6c66b1e7f4312631a73c78c4052afc26c3101a2acf033e918cef2c3037307230b1dfbdd77ee2c SHA512 2b85d92251bf715e36e155a422130822b36dcf96e00359ee73f055b2d05bdcfe3d5d9b3add81f779d8487011690e6b19d81b2ca98400449ef9e3b492522b9a3c
+DIST genpatches-6.1-21.extras.tar.xz 3808 BLAKE2B 9d1bf513bea67b8ca4df1124b4c81857292b44f8e8c339b7295fee60cb04d323eef5de4f8a92714f641a68c3229a8b60b673760f7373ce54112f6f7231b18f4c SHA512 4439ead755188488e6f7c18210386121a78a30abcd8d56ca87d0069b7244ae87cf1ba312f033db49acf017ef6c581b58e0228baecf42df50e0d1d978fb4c5461
 DIST genpatches-6.2-1.base.tar.xz 4308 BLAKE2B 0b28cf39d9977e5a5c6fe446c0bc318b33f37995897ec379e6ee6d5420a73cd4d3ccf78111df1a2bbe9ee568c6fde6d7c52ba4f01a8b9534c71b597de65aa850 SHA512 da9ab52792c8b6881cf7718128889ccb536723ad7362ccc89be734a479ab6a03f6c844bd97197f3a4574d3bf4278ad10f453a57d076d297586be1db3ac2380c8
 DIST genpatches-6.2-1.experimental.tar.xz 5704 BLAKE2B 9e31d37973220fc04601212561c3f9551a63c11373d4a25f8577d39b609c83678dbc4d711e3039b2afb091a7c378cd1dfac0458273d4b13a7eb9df88575d9fdd SHA512 4794247a926b591036d4d1f799fff5129eecf1cb65fac046da7884a05bea6b406dee7a9af92676573f06a21a6fc04543ecab4c9e1d80209f119ed67e03ba3a50
 DIST genpatches-6.2-1.extras.tar.xz 3808 BLAKE2B e2e6b77fde25dda7c048376fa1435b7ae77eb6889e69bc7f516435a29335d30bc60ccadf196f37408430f5f9899f5502e05404b4bb5ffc8a9e48a6918103780b SHA512 b44df841c08ef03d0638b3b1ebea014979d4e1f70f70c9db21d2a531d7856f0a2eab74d9ad411e0c7387caade6a5cf1afe9e0153d83e51924c881af079c18c83
@@ -100,6 +109,12 @@ DIST genpatches-6.2-2.extras.tar.xz 3804 BLAKE2B cdbf51c28ff1c3b974665f558ec774e
 DIST genpatches-6.2-4.base.tar.xz 15256 BLAKE2B 4a6bc8f4b75be2afe87d3d29ebdd45cc6a6266717b793a611edcefad3b39c3f70f14533b538eb175f0c16e901006d52e09994072cf9375dc0606db0478472d18 SHA512 0351b19b50bff5922d916b215c8b5b04a31994973dbde9553b2f197009447c9d5dc992f0b9ee25bacdd1569477a0beed4e0359dec390ca4914ceeed3e73592f5
 DIST genpatches-6.2-4.experimental.tar.xz 72504 BLAKE2B b949e34a4f2f1b11d194c83f3d67dbca8c65b3077b48d90b42c6032724b2c2e245c2955d136f95f303df41db0a739a1bca35580972a7b62d8ace8c09c27075ad SHA512 d793b26473cf12500be0a3d5e6f34088374f505726ffadc8a385753f62e1be1cddc2dd41413fea41c581884c6439883ef9aa2945a56e47d88633d963ffdfca55
 DIST genpatches-6.2-4.extras.tar.xz 3804 BLAKE2B 909c69169a518c690e62cb3417a35fdcbc1f3102d388ea0f6eb5329753f50596bae769ef033d43bc9d9fc5cbddecc3ca8541f771c4e02c76fad6253594cf5e5b SHA512 c22a12ea1d3467891286d9898582d038026230181537ae40927182b9549e7a768e4ae62ddf9b402e67cd31e18cb64e9f9567c5037eebc98500d4aa21ea62b44d
+DIST genpatches-6.2-5.base.tar.xz 297244 BLAKE2B d76f6189b57b3c81ea8d8cde4a4464539ecfd27f38790eb797758d2ca9f3c4f1e4906b8187faf515035ee220107e698d60d6687cf9d05e7805ba2e8a5a47ff7a SHA512 e0ab47321da0c7588b102d0c9af435bb23c0ea01915d1e9080216bb885f2dbd97ea0d885d2f72297dcfda18fee524dd2629533a4ee65ae72cde0651be38b962c
+DIST genpatches-6.2-5.experimental.tar.xz 72500 BLAKE2B 2ef79b3fc41dc0642fa8e86adeaf7a76ac8c2144a83fd977cdab1dbb281e0468ab7c354321788a98be3b8ae2571ccf5e8ee39f03ea64d583345b3ac1ab0ad0d5 SHA512 159c0933c23f32eb6ddb66951d1c4994dd92c2d1beee74c23f5f10b16c45e6946acb0c1dc48e804e4ca2bd229f145c5e6b2ca6c43c0effec059fc33bda665f5a
+DIST genpatches-6.2-5.extras.tar.xz 3804 BLAKE2B 23df3f3d54c5c9d0db420803bf45861111addf7bd23efd65a928345103e5fcaa34639c18c4c72911ff9d17cfacf50063802af75674d9c2839b0448185ca0eeb1 SHA512 5727b99aca295c425c5ab67e8e25b3e7ce0101542d60374d3f54abcf66f336d303ea529b683ec0d82da5ad471b5399eadad2fc8cc1dba3c3b13eff1735d1c12f
+DIST genpatches-6.2-6.base.tar.xz 297444 BLAKE2B d6f2608f77fbd57a5774da7a945be357ed1e4296082c991726d081a3527bb5d547985d8d3743718375612af2983ab65ccca7198e1f94d40dd012770782316bc7 SHA512 f749689811cb851f778b87f08f5d51777c4e359266a486741f277649b5124ee804629e331df5235792ed2677421fbecfa78c6db5dcbf972e918d4788f6aa0e2d
+DIST genpatches-6.2-6.experimental.tar.xz 72480 BLAKE2B 8029209cbe33cadb6c12e72905a5f16379191e28bb131a7d664faee7427b17cc6742a19aca12608806d68760642fd92b97ae3643aa37a841872f592c128f66ac SHA512 dff1cca057b0004f6b7f7b45eea33ec0c6db375da751729efda10a287db0455d84b627372d56f34f63a4f31dfc35ab3b035fd7bf0661173244d12baa00200dfb
+DIST genpatches-6.2-6.extras.tar.xz 3808 BLAKE2B c9ca7fc71cca9df793bb801335d1d47f1f1bab043d3abb674a9af58bed02136926a491821d73983e1a831ae8ad5ff16b93afb7d54c008543b159d9d36665b6c6 SHA512 94a5a32799a08b77134475d3f1e4cf7af514db89e915df10686904677d0309b8e5b5cc7849b666aa5c9cc88075b1841f14fed9f08e624fe8255aab6379e12615
 DIST linux-4.14.tar.xz 100770500 BLAKE2B 85dc4aa953fe65e273a24473d8de98e4f204f97c43be9fc87cf5be01f796f94cfde5c8f9c84619751f1cac51f83ce0b4681fb19c5f2965a72d4a94fe5577846a SHA512 77e43a02d766c3d73b7e25c4aafb2e931d6b16e870510c22cef0cdb05c3acb7952b8908ebad12b10ef982c6efbe286364b1544586e715cf38390e483927904d8
 DIST linux-4.19.tar.xz 103117552 BLAKE2B 1dbf16cf410867412d17568fe42bc1e90c034183b654d270b650621ff7664a321950943d0639205bc1ee7ef6210be170c1f2c785a042ed8a4ec5e3a486d890e0 SHA512 ab67cc746b375a8b135e8b23e35e1d6787930d19b3c26b2679787d62951cbdbc3bb66f8ededeb9b890e5008b2459397f9018f1a6772fdef67780b06a4cb9f6f4
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.99-r1.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.99-r1.ebuild
new file mode 100644
index 000000000000..b5c9aee2aade
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.99-r1.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="104"
+
+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-6.1.16.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.16.ebuild
new file mode 100644
index 000000000000..bb6ff18c4e7a
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.16.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="20"
+
+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-6.1.17.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.1.17.ebuild
new file mode 100644
index 000000000000..5dcf6b8f8a9a
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.1.17.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="21"
+
+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-6.2.3.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.2.3.ebuild
new file mode 100644
index 000000000000..fd292c2d0781
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.2.3.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="5"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+DESCRIPTION="Full sources including the Gentoo patchset for the ${KV_MAJOR}.${KV_MINOR} kernel tree"
+SRC_URI="${KERNEL_URI} ${GENPATCHES_URI} ${ARCH_URI}"
+
+pkg_postinst() {
+	kernel-2_pkg_postinst
+	einfo "For more info on this patchset, and how to report problems, see:"
+	einfo "${HOMEPAGE}"
+}
+
+pkg_postrm() {
+	kernel-2_pkg_postrm
+}
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-6.2.4.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-6.2.4.ebuild
new file mode 100644
index 000000000000..233376a4e907
--- /dev/null
+++ b/sys-kernel/gentoo-sources/gentoo-sources-6.2.4.ebuild
@@ -0,0 +1,28 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+ETYPE="sources"
+K_WANT_GENPATCHES="base extras experimental"
+K_GENPATCHES_VER="6"
+
+inherit kernel-2
+detect_version
+detect_arch
+
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
+IUSE="experimental"
+
+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/linux-firmware/Manifest b/sys-kernel/linux-firmware/Manifest
index fa04f2edbf9f..17b9adf92584 100644
--- a/sys-kernel/linux-firmware/Manifest
+++ b/sys-kernel/linux-firmware/Manifest
@@ -1,4 +1,3 @@
-DIST linux-firmware-20220310.tar.xz 237571732 BLAKE2B 9246d4fcdca0a9514606eb7b4ea7e18ea072b8d4302f62fd7aea4d85014c9f7da3eadc650e7c678bfe867c6f5ae9278b68b9a27c6074472ec9574ac922df23a5 SHA512 bafd5795d27c871c199e37f1e39f316e3577186283880da3b86cbc690749313342f8297342bf3ddfc6b3da7903ab2d5d24465240dfff1b0be51aa47f90872758
 DIST linux-firmware-20220411.tar.xz 237957584 BLAKE2B 441699abac0a7554c96324e40676218401febe9ea2a11ff9ab9f9ea4945b4c590c10c9a353aa8c5c66325b408ab9ebcb57fa77b520066f1d9995cb5989bc5b75 SHA512 5470701872ed4670962d3ccb4fd046c1f00145d69e942d76b21ccce08077ca4db867bbb31b87668e6298e130f28fc522a6ff4d66927fbfcee44042e1d908f71d
 DIST linux-firmware-20220509.tar.xz 253717320 BLAKE2B 0181e209a05c3acbdcdc175868dca0ae2993effac0b265335f502a03d3a38cc4849366bb229ade87621426e99112f520f4d50444e438572c61cfc2c6d01ed6a6 SHA512 17d48222a0029d0540a7071b541653a42d66676c4dde88b7c148249450cfcb09087318cb4558ca7a0a7583f3bf0b00948d9383073e038c4f76bc4e807c757c2a
 DIST linux-firmware-20220610.tar.xz 252543088 BLAKE2B b3f627fe150f76c9a1c7b70bf691587554808275debd56e9d36fd0eff63b7ab2351ba03dd298066b03db7f2e590d7f130677e158ade587fbfb59a9efd8f83c0c SHA512 76176af2bf1e83d91c88289623364bc5d3e45d96c8586bd5c064535ee245d133283d2176d142492139cfbd41ca6ad195522c662d923b6cc76556c8509638ad0d
@@ -10,3 +9,4 @@ DIST linux-firmware-20221109.tar.xz 296376440 BLAKE2B af06fdee5b3a7ded60ee233e82
 DIST linux-firmware-20221214.tar.xz 297402416 BLAKE2B 6fec70e2aeb2a53fa72e883d8f0bd7168b35024aeb36c989dfa03f904cccffed4aa9927bbdfdaf4074e78117600a8f3b31d90a4f2325de0fc3d01d3c2592c0ac SHA512 99a2e3abef90b0165b753ef2710253e4e97547eb7af5cdd1ad3fbd1a56ecb50ff2dcb9a9c45569fbef92e2bb10d2dc1970376167f99e934adcfc230c8ca2b098
 DIST linux-firmware-20230117.tar.xz 301424540 BLAKE2B 84a1d1f9d745434f6497cb4e8209b377ff26d815de183e068836a6fca560868a933f0af4d3e7089dc2aeb78427d8374eaf626001d5cbedd39dcb2ec6e05f2c9d SHA512 2ec8bacc1596f3049c8e019868f8496b8bb93080da05105787985f42a0423e2b3c2b51577769f44433e85585f1369c84f3c4742524de21eeaac221a06cd607ee
 DIST linux-firmware-20230210.tar.xz 287648576 BLAKE2B d6ccbaa060df7c7752e93014baead7158d99bff05476581c954f6e97d9d97741d3b1a48fcba556c5befa6857ea9151beffbd1e0df6fc5e2cec850d11d411a5e6 SHA512 6356e1b6ee79e2108c994c91b922eb07b8eb69024b2d9fcea0ee6fe4094849465e292147d2e168930eb90f2f054727ab1f343cb76d5b604739262fd1f57e9ee6
+DIST linux-firmware-20230310.tar.xz 271812128 BLAKE2B 5e2b9db035e48a3da6e07401e0b7687b79b8206a3c54ab35aed39de83eea0ccc7b7a94c3b3b0d9cd418a9bffbc30decb7e6cd68984ecda9483ff82ca326c6865 SHA512 817e99cc4a5fab36314b3f7449796721d524bc1c0f95cf8e78ce65dbb548a75d7ff9d5bee5370be315da73c26c9e6f93dd421b3cda4b2938ff4f2b4a2a629f3e
diff --git a/sys-kernel/linux-firmware/linux-firmware-20220310.ebuild b/sys-kernel/linux-firmware/linux-firmware-20230310.ebuild
index 88fd355c6055..6eb5ade58607 100644
--- a/sys-kernel/linux-firmware/linux-firmware-20220310.ebuild
+++ b/sys-kernel/linux-firmware/linux-firmware-20230310.ebuild
@@ -2,7 +2,7 @@
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-inherit mount-boot savedconfig
+inherit linux-info mount-boot savedconfig multiprocessing
 
 # In case this is a real snapshot, fill in commit below.
 # For normal, tagged releases, leave blank
@@ -19,7 +19,7 @@ else
 		SRC_URI="https://mirrors.edge.kernel.org/pub/linux/kernel/firmware/${P}.tar.xz"
 	fi
 
-	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="Linux firmware files"
@@ -29,7 +29,7 @@ LICENSE="GPL-2 GPL-2+ GPL-3 BSD MIT || ( MPL-1.1 GPL-2 )
 	redistributable? ( linux-fw-redistributable BSD-2 BSD BSD-4 ISC MIT )
 	unknown-license? ( all-rights-reserved )"
 SLOT="0"
-IUSE="initramfs +redistributable savedconfig unknown-license"
+IUSE="compress initramfs +redistributable savedconfig unknown-license"
 REQUIRED_USE="initramfs? ( redistributable )"
 
 RESTRICT="binchecks strip test
@@ -60,6 +60,15 @@ RDEPEND="!savedconfig? (
 
 QA_PREBUILT="*"
 
+pkg_setup() {
+	if ! use compress ; then
+		return
+	fi
+
+	local CONFIG_CHECK="~FW_LOADER_COMPRESS"
+	linux-info_pkg_setup
+}
+
 pkg_pretend() {
 	use initramfs && mount-boot_pkg_pretend
 }
@@ -186,14 +195,12 @@ src_prepare() {
 
 	# blacklist of images with unknown license
 	local unknown_license=(
-		atmsar11.fw
 		korg/k1212.dsp
 		ess/maestro3_assp_kernel.fw
 		ess/maestro3_assp_minisrc.fw
 		yamaha/ds1_ctrl.fw
 		yamaha/ds1_dsp.fw
 		yamaha/ds1e_ctrl.fw
-		tr_smctr.bin
 		ttusb-budget/dspbootcode.bin
 		emi62/bitstream.fw
 		emi62/loader.fw
@@ -205,7 +212,6 @@ src_prepare() {
 		mts_mt9234zba.fw
 		whiteheat.fw
 		whiteheat_loader.fw
-		intelliport2.bin
 		cpia2/stv0672_vp4.bin
 		vicam/firmware.fw
 		edgeport/boot.fw
@@ -225,7 +231,6 @@ src_prepare() {
 		adaptec/starfire_tx.bin
 		yam/1200.bin
 		yam/9600.bin
-		3com/3C359.bin
 		ositech/Xilinx7OD.bin
 		qlogic/isp1000.bin
 		myricom/lanai.bin
@@ -305,6 +310,17 @@ src_install() {
 	find * ! -type d >> "${S}"/${PN}.conf || die
 	save_config "${S}"/${PN}.conf
 
+	if use compress ; then
+		while IFS= read -r -d '' f; do
+			target=$(readlink "${f}")
+			ln -sf "${target}".xz "${f}" || die
+			mv "${f}" "${f}".xz || die
+		done < <(find . -type l -print0) || die
+
+		find . -type f ! -path "./amd-ucode/*" -print0 | \
+			xargs -0 -P $(makeopts_jobs) -I'{}' xz -T1 -C crc32 '{}' || die
+	fi
+
 	popd &>/dev/null || die
 
 	if use initramfs ; then
@@ -318,6 +334,11 @@ pkg_preinst() {
 		ewarn "USE=savedconfig is active. You must handle file collisions manually."
 	fi
 
+	# Fix 'symlink is blocked by a directory' Bug #871315
+	if has_version "<${CATEGORY}/${PN}-20220913-r2" ; then
+		rm -rf "${EROOT}"/lib/firmware/qcom/LENOVO/21BX
+	fi
+
 	# Make sure /boot is available if needed.
 	use initramfs && mount-boot_pkg_preinst
 }
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 211ba0caa437..42ed6e8746ed 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -34,12 +34,16 @@ DIST linux-5.10.169.tar.sign 993 BLAKE2B 762760ccc972f30f7c1eb78646e9eb171401d97
 DIST linux-5.10.169.tar.xz 120574788 BLAKE2B d700ee838f169a76d6adcf61b062435bc176d379645d2ebc7de654d5e01c9483af9218bdb36fdbf20ee631d9269d2f816cb27afedf36005d4d138a8a2e50e169 SHA512 9ff03313061ac90b44110351aec51c7626b8f83f53efd8c14af374778d909e9e5e8c43857306318a5cffe950ee81f92c6006ef9a26f81a491f608776b741b1e0
 DIST linux-5.10.170.tar.sign 993 BLAKE2B 8f47f3beeb361d6a658cfd282548d38ada55bc7a641ecb1602362399227b4932a7b349a64f1f4565f297e89e8fd1f3d4779d5d3e3edef828f63539cd5c56acb6 SHA512 5e706ecdfd979363ab3eeb3db56f22063ba10e725d2b7393e07acc8574a334a709c66813a27c5c349bead76ef33d0856ff5555e012107b9add94a3bb1482cd6a
 DIST linux-5.10.170.tar.xz 120567560 BLAKE2B 2cc5de731c61dcfb8c006aa805ab840ed9743f02330c206c2cea127ff840ada1de630ee2f844b41b6302f10239fe001dcb3a9fd763817767cc8f751759f7fd96 SHA512 89dc8bdf843eced09acfd9abb1ec819c29da4305549e9ce9133c47a5f023ce1398f488fe7928e07b44bbb9141cb2f48aff1c13fe3839b20e2153e24d78dd3786
+DIST linux-5.10.172.tar.sign 993 BLAKE2B 29f39419ee257ab5fee025797255df6c994fc37fc4708510c25ecbd87032f51cb96a7e1f96dc5c2bcd5faedac3ffa1fd1b62ac60ed8edb5281557e651ca0637a SHA512 deca74f8e344bf405b2e84477a07f0137fbb9b9d507311984e6dbba0686e9bff98c4583ee18b5fe4f0edea5e46cc9b42481e8015ec2deea423460caf30d28043
+DIST linux-5.10.172.tar.xz 120591456 BLAKE2B 002260913f33be97ed30ae5838cac0502b2966283f2c3a6682957f3595c3c707cb449ecf84a41b4af72dc4ebcfe46da34e9ecc7ea3855ee40231ee7115643b11 SHA512 23d4397436073e57867dc9f51ee5be3a532c6fc05a8645670c2244ee1bbca6d6a7c9e06f5b73e11b6a886773261de348e72c1fce8ff70316ff98e3d7ed88e9ea
 DIST linux-5.15.94.tar.sign 991 BLAKE2B 648f4c183bf955ee25efdb575551ef1e9c20e0b3e3fbe0ae5cf5d1c08cf5b4bc5b5a6cce603f3f17d9ddfce976fa42b480f93ac8ce2ee6f64d5ca11f56e899f5 SHA512 ab6eaf5a44df0ce2dd7ccfa4c72788ac212ef42eb1c4d8464f59b73638a08cf5361792e6be5fced152343f4c278e45379e76659a96bf623e7da33f13c3b16133
 DIST linux-5.15.94.tar.xz 126497028 BLAKE2B e300a52339b587f58315fbe49ee3a856945b2ee34d9f367c67ba42234875de318dad8bb5f2ec35c7309c91a7b3d4c43d36fc8fbbadaa3b68e6c8e10014dffdd1 SHA512 7ced15a23345dbf17f51a8ccaca78559acfd907b9fe811bb44a9930ae2f64c528db61cc1276fc0e44ba1c76b4f5223145d3ba7fc01924f38b629eb868492b6a9
 DIST linux-5.15.95.tar.sign 991 BLAKE2B cd8eb48dfa59cad29dd618573bf628d4e1555e7b29c38c405fc78ad0fa1cc9a5740d493b9e03c38626d5b96853f16930285901300e47aad82af14a61100b7343 SHA512 69624979b835765c74aafd8b7487a99d69bf3f67dba6624498346eb33c9dfa8698231b007c709feba5256d519a2566a0fe1f6d112d5cc4685a3fed36165ad7f4
 DIST linux-5.15.95.tar.xz 126488596 BLAKE2B 1a8f7f8f9e75db4f6aa55bf3278c65a3e4705adcfe471868b1757349a40d73e5bb484271bc865925437fdae8f9848b976ab5c8a8ecf5992989bcf766ff25dc8f SHA512 7e983cee8c804e6cd90a812aa61777efbc4a8c102b9d2e8ffb07f22aa9d7f291dff409c359a9be0ad69959cd883633534e7a5a5af34e2f260807b13f98f1c613
 DIST linux-5.15.96.tar.sign 991 BLAKE2B 77b4d5dfc5550559f528297e5a1bda0831141e0ddece7df7ce456eba0951468ab1f70ebc663032a6348e337ef5538ab18edd4a30b704b60f3742bdb3a231cc4a SHA512 79381342cf374a5afb59e5ba54af96dc083cfc1ca64926da232352d565ac58171ea8fbd5cb06182f445fb0e703c57e8a7d9af933dd8520ad90ef3284c102d207
 DIST linux-5.15.96.tar.xz 126499164 BLAKE2B 8305857503e00f7b3db7247dc2cc268eb58ad99989fc868b145e603d6ab80ea1365a292c246a01a84e9d192d162b3aca0e01307b4976c06b625565b74ae8f214 SHA512 ea5a98ade0877cb61d4439e54ac04c1f044890b99343a6b7c1bd9bf7b6ef1b0e0032937f25ab85313319e2f6f7807e84b5e1a9216e385867a1e7678d01b1726f
+DIST linux-5.15.99.tar.sign 991 BLAKE2B 00833f4f466b48fb61f53b1de2a0b157b841722d46b1604a9be207c9c74b24ae27117b686a50b7a79e992334f7d813b6a3c058d61c7846a9f8eee1c8988f4e5b SHA512 549e73e4d6b62a27d579deb62ccbd1bb7f9870b2094d8dbcebd0885259902f2dcd0fe8bd929651de671ed59164db51f2c36d44b2d6ba92ac745cc898ee8c0059
+DIST linux-5.15.99.tar.xz 126530160 BLAKE2B 8e5854628b9af47f14b6060d9bf72ad2f50eaa54dd6bc20c493d32108a2b20ba3d312418b73e0c37ac3fca1b2f74bc0b397879c5b261815874eae54c36d44ecd SHA512 985dfbb94f74f8b0ccffd1cf1e530554db5f60feff913ff6c2b6c505649af421c93c69682832a4ca5a6a22872e18704ac33a031c08f2ccd9e20a85401affb83e
 DIST linux-5.4.231.tar.sign 991 BLAKE2B ee6a28ae72164377649440f241ed431d6a49c50d26976e1bd85cf353651545afd80532ae27e270ef79bce55971d8bd19acabb0f43ccd6a84c4a7f2fa68f6a62d SHA512 31d4dc8b2f56e5344b3185ea0340c73d95257b6712cc2ce3b8c5dc851cc92763e417ee9a51ce3b2e637d58e3e8c7035b696413df3facac5c78991646a4048bd0
 DIST linux-5.4.231.tar.xz 112992720 BLAKE2B 228c7135bbf38fa0a84d41607a922e269162bdb385e65ab8fcc8f66ae30d5d1ff65075494de24e280dd9bc03fa8324696ab61a556abc0cce58b31d506af413b9 SHA512 22558009d6502928bca5eb93f086b7eb37ff2e742382ba27b97e4dfc77b3b7064b0f85e78d4cba4308ddb2ed7169e25bc62a82647ebedeac1b3df6977c096c52
 DIST linux-5.4.232.tar.sign 991 BLAKE2B 0b5a5c61858195a6a51169a48a0ddf533c28e8ce32039753905e3c7d6968edf30880c8cbe12b45a3a415f9a12913da8e12573ea7a73af4f7982bfec658e38e93 SHA512 c8907a21b8f75b9a2df6e328bbdcd3140750f3aaaf60d27e9186a399100a732669987ca61435f2344c331d9b26e13e505115469581506abce8cd9da345a4b0e0
@@ -56,7 +60,11 @@ DIST linux-6.1.14.tar.sign 989 BLAKE2B f42ab20b9e6f0c2bf0168af954d3a6a935b81964f
 DIST linux-6.1.14.tar.xz 134814408 BLAKE2B 9ad53bc025283b6ba1d426d7f24deff809c041ace336ce696266c81c832370da3590d99d8669c54aed509ae3fbdc8ffe97a8b4f2ab5fcc3dcaf44f0d32d33827 SHA512 55f57edf9cbb1076f887f061898639b6a977c1a5f80e0bee1d4d2aed22a7831609eb13cab3f5653802f1a97333976e409db18d0757b98979e3df632b576f991e
 DIST linux-6.1.15.tar.sign 989 BLAKE2B b7232f040bc4be3d24223aff245306571b8e63243e11acb99ea95644d490598bccc02e6abe84be7007f074178b9c10fbcc87f2238f25b07ae7e091b502fe18e4 SHA512 a3212cc8b1fae98508caf16b783e6408d0abeb7b903157285fc65f49297d5f68cd0555376cee85fc50afa5ffe03330cf86055280fa948903a047f7416448182a
 DIST linux-6.1.15.tar.xz 134854068 BLAKE2B 3481d756a4daee96f732388a93d7423a784ddd573a0ee973e2e6d44ddc0ba5bb6ab84279c117c3ef6b2b086ccb6128bcd025286180848e89411d03e2e9797bc7 SHA512 0f98aee21ba902254881317148a78dcc3bc2dc3b6a8651bc0c35e8d63850ed1a9ac4271d5f74ed0ec110c219c80674d26abf9ffdd2631278cf1c7c85d6cc209e
+DIST linux-6.1.16.tar.sign 989 BLAKE2B 7b6cd99f171b948c15031cecc78eb88c6c9b39301c43b7fd00b5b4a8df7d2a4753cc7748b2841f69bb37386a48ac9eaafada4ee2e811f3a41813559c6219a888 SHA512 28b52272c2c0560bc4680a86664e1376e6c2e1e96d97f27355d86ff64d2a759624f88cd33bda769bcb2774ceab7d59f618c0ea008d6889341a6804bf9b6f48d2
+DIST linux-6.1.16.tar.xz 134833708 BLAKE2B 6e61a45093f8a91668495cb0c0e9e9350a80581f772c3e1c42536bf66ab9e6952697b695faa3a53cb326644296dda0e70d671477536364e7b3d98476efaaea13 SHA512 ceb37f0e7e8b29648a0880f0d375224f8dfb19e612f9e5966a8a6d07755cced62b5a69ba88ae79f12b4e7a482e746fea4ebe9f2323e9b4967f0195f72f205642
 DIST linux-6.2.1.tar.sign 987 BLAKE2B 37c7a969bbdf12b86b72c245e632e0990154e4ae57ab35da8c3efa5e092d42ba758a88739b5628775635eb0f9e8e7b007111bf63426adc0ee0ade2d1a2f984bf SHA512 70c4ee9c0a39127e0893fa639e65488d11f8f9f342de76259f28ab709842860165a200d8ba986de627628f4689bd10b1e0c95a17db9e2c909e4d4ad2aa99297c
 DIST linux-6.2.1.tar.xz 136445896 BLAKE2B 72c221e68c6bfb19b49c15c491c2ec35db045c730487e409186819620b65b605046a03df8e0c173141d1893ecf7408576b266fe1b33baa72cd44aa26458da562 SHA512 79d3465955dd557dc599fa1c18c7a68699f4febdd7264fe4e223c694e879ef5bb65fff9fad1ec5599f894ad6519bad292efbd5b9990dac3223d843f5c22c65f2
 DIST linux-6.2.2.tar.sign 987 BLAKE2B ee5dae47aab443841f6073b2da066ec7cb625059ed1f300c623a1d38df995055ca84a0ae4d4215826de467a3355bccc3ab9a26bc228aec4f7f0a4b2d9cc92171 SHA512 42b166f3e5a5a3d6507a1bf7c7a8801cc8f3d7f663e3580847014cb404b7043cbe395f29528a482d70514ebc55db69105303b369ca12dfd7add2fd3125ecd6e1
 DIST linux-6.2.2.tar.xz 136431916 BLAKE2B 7f0ace4eb3f3dbba6104adf1b64682ce3d76e96a33cd0500f9943c150b5aa17c9e25690615f9ab0bdabe33c3e13548d9cd9f1f3faecd0369554f2cb5982c44aa SHA512 749df066dee0c3e003db47f66be692f12fe57bfa06b90d68394685961764a98a299a08f20587a24cb254fe4881f4849415e47b391d824b35ded2fb67c14ed3e6
+DIST linux-6.2.3.tar.sign 987 BLAKE2B 311b97575b921cd902adb714f8e362013d8b44f765740902b88527e5f5ca0d6f3bd42dc6c837b56632010d34d1a893fc17dd0f2eca70a9d0947062a2618af4ac SHA512 847469b5968cb2def5befce5ee0aab6ac3bdaa8dd32a6518d35518f483c16de380cc141f47de0a55e8f7125bcb35b92e9fb8d30f810aa0d025143d57743642a3
+DIST linux-6.2.3.tar.xz 136437004 BLAKE2B a6c740faf8349ae2f92ffe133afb40a763aaf178c1f3a4457572956d2fda7e09e3354dae48d594aca9cbab42d4d8d7be41036adef630275520d732902b7da812 SHA512 4df6a17d1f1234e3c98352c4a6b9071507988de454c21c8fd2310b4e0c2894b4bff7d3453c3271281ff798536562cfb85880be16c997df5e26c38575eb6ba96e
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.172.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.172.ebuild
new file mode 100644
index 000000000000..3d406f474e2f
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.172.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.10.12
+CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.99.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.99.ebuild
new file mode 100644
index 000000000000..f68caf0fd433
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.99.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+CONFIG_VER=5.15.19
+CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.16.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.16.ebuild
new file mode 100644
index 000000000000..e3a0c5f7f691
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.16.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.1.7-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.3.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.3.ebuild
new file mode 100644
index 000000000000..750a7d7f1f80
--- /dev/null
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.2.3.ebuild
@@ -0,0 +1,137 @@
+# Copyright 2020-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit kernel-build toolchain-funcs verify-sig
+
+MY_P=linux-${PV}
+# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
+# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
+CONFIG_VER=6.2.0-gentoo
+GENTOO_CONFIG_VER=g7
+
+DESCRIPTION="Linux kernel built from vanilla upstream sources"
+HOMEPAGE="
+	https://wiki.gentoo.org/wiki/Project:Distribution_Kernel
+	https://www.kernel.org/
+"
+SRC_URI+="
+	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
+	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
+		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
+	verify-sig? (
+		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
+	)
+	amd64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
+			-> kernel-x86_64-fedora.config.${CONFIG_VER}
+	)
+	arm64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
+			-> kernel-aarch64-fedora.config.${CONFIG_VER}
+	)
+	ppc64? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
+			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
+	)
+	x86? (
+		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
+			-> kernel-i686-fedora.config.${CONFIG_VER}
+	)
+"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="GPL-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+IUSE="debug hardened"
+REQUIRED_USE="arm? ( savedconfig )"
+
+BDEPEND="
+	debug? ( dev-util/pahole )
+	verify-sig? ( sec-keys/openpgp-keys-kernel )
+"
+PDEPEND="
+	>=virtual/dist-kernel-${PV}
+"
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
+
+src_unpack() {
+	if use verify-sig; then
+		einfo "Unpacking linux-${PV}.tar.xz ..."
+		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
+			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
+		assert "Unpack failed"
+		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	default
+
+	local biendian=false
+
+	# prepare the default config
+	case ${ARCH} in
+		amd64)
+			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		arm)
+			return
+			;;
+		arm64)
+			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		hppa)
+			return
+			;;
+		ppc)
+			# assume powermac/powerbook defconfig
+			# we still package.use.force savedconfig
+			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
+			;;
+		ppc64)
+			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
+			biendian=true
+			;;
+		x86)
+			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
+			;;
+		*)
+			die "Unsupported arch ${ARCH}"
+			;;
+	esac
+
+	local myversion="-dist"
+	use hardened && myversion+="-hardened"
+	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
+	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
+
+	local merge_configs=(
+		"${T}"/version.config
+		"${dist_conf_path}"/base.config
+	)
+	use debug || merge_configs+=(
+		"${dist_conf_path}"/no-debug.config
+	)
+	if use hardened; then
+		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
+
+		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
+
+		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
+			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
+		fi
+	fi
+
+	# this covers ppc64 and aarch64_be only for now
+	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
+		merge_configs+=( "${dist_conf_path}/big-endian.config" )
+	fi
+
+	kernel-build_merge_configs "${merge_configs[@]}"
+}
diff --git a/sys-kernel/vanilla-sources/Manifest b/sys-kernel/vanilla-sources/Manifest
index 86fc560d2259..a7865ab77970 100644
--- a/sys-kernel/vanilla-sources/Manifest
+++ b/sys-kernel/vanilla-sources/Manifest
@@ -8,7 +8,7 @@ DIST linux-6.2.tar.xz 136430892 BLAKE2B 05b63254734ea685db437cb1c00a6da63eee74d7
 DIST patch-4.14.307.xz 5028556 BLAKE2B eb14ce9c9ccf9234a0a0708bba43c7672b63ea038b05684320934ab2f842bc91bf6168e0947ad375a3188fb5d9e46ce5035f8b1b110fbf06a57cb2bd7a928dbc SHA512 51007dddec99e93853b23ef726bc9d28a369a22ff55ddd8f577d8391a7a944dab5cc63b24af5715b6309ce54c2574688888c604417cb5f630d57888a25ac5ef2
 DIST patch-4.19.275.xz 5127768 BLAKE2B 672a6eedb1681a2dde14a10703b26860b4b0be481f00142b025efff1f934edfef4452761b5ea8a67063021b7c455019e9f266b19785c3ec4c43087455dfb6ca1 SHA512 606beb21b3da2972e538e5c03bb6a138013167f0364356ac8af4e6e7300a4eeeba5102d4e6fb898e3b23701fff104ec6539bbecfd057c6959f9c2b0409e1dd1a
 DIST patch-5.10.172.xz 4348940 BLAKE2B f1999c6ac6588b3ceda6ba316bad5e3fc363de9ae5cd3e5968c285fe3d54eeab0cfba5cfb992309eab8c911074566bff5eba7f833f8542beab2b2d068d16c727 SHA512 1d4c6fb038b4c13b1b9cffc3a2258b9202eb5939d61f2c4bd1c200e4b2f7bf3325219a13dae60b243e680bd9ecf3c79c3a69e4c920a23cf82452c3a24de5367b
-DIST patch-5.15.98.xz 3598264 BLAKE2B 8b339379928baea2bcca8980c089d2300339daac2a14b32c74acf02e6a700361d6bc8db4bf725ec0858f78da2a72e6d1e17cdcc3f48fb09880661201b4f2ee31 SHA512 88d5a8846622bef00b9baebacd1f0908cb30ab9d9cf00dbee004b32d45b778515dbdb362700d42c09dc7bc35194d21dd8ecb324150477ba577f952a8097a7d0d
+DIST patch-5.15.99.xz 3706332 BLAKE2B 23c6df626a9cdee692bca295529dc2021985247eaea62c037db495ec1665d08d3b2206f583645120b67f4e940d5c146317eda83e1c5120b256bc0f802f36e24a SHA512 531a23aaea187976542d4bf07beccf99dbdd0f4098c98974ef9ab7a211ce2817081e91c5ce284abc5ca2bebca00b652594ea3d02ac7e69195be272f340a91488
 DIST patch-5.4.234.xz 4579292 BLAKE2B 08d0a365963fba215e099e717e605d8c8a4cd542bafd76e76fd20454ca5c0c238d04a0e743a34f143b16abb6b3d2a927be017ce7d44c744781255bfcbf90f9d5 SHA512 4b88ec154a273589018fb525e9360cf9f03e47fc2f741c00fedf404a16320d927dd9a918e48520ca440fd19564927ef55155e8730226d81875372f5b93876dbe
-DIST patch-6.1.15.xz 804784 BLAKE2B 7aad5f8e1f99e6482fa70e2ce15d8bc8ac77100956dd647475b5a939df7fa39b4b3a05daffaabf0cb903fb4b6f3eb4749038be144cc858f30e0ad79e431f7b8d SHA512 0a40272732654dea8f77a55d37b156f54bf1c47fc1fe29997d7dc1e82d9112f432d351f3649d93bbcc3d747105ddcccbb63bbec4e03900bfce018af040f0b299
-DIST patch-6.2.2.xz 11220 BLAKE2B 5ad8b39b357d2e82fb2d53742102b7f54c97dbcba8c87c9f5e1a9a2f4ca8934f23759a38d4f20f8afa0457f1f3ad8d6a6bb29aa2ab276cd17388593ba4e784c9 SHA512 0b6c6786bf7867d521f26e72f2b5cf9f968e88df84cb4cbf3786ee0f975e97681764a58fe8acfc9090fea68e80799389de66c8251f10cf4edb2c36559cd991dd
+DIST patch-6.1.17.xz 1014460 BLAKE2B d7839f0cf90b267285d68efa0f7d314001400859b4ff414b92c53c7230b76051324423b0484957c9da5fff2f4b0952638637daa6afe5d219d240e6560f6d4db5 SHA512 2c1844935e4301f140b217c1346ffd1b1a26724158cebdb7ff5c0dc6d458d788b06e1e3c85b6449108199dab31319385cb9a9254dcebf1138284325fb80ee4e2
+DIST patch-6.2.4.xz 292572 BLAKE2B 3004619347e8e4214e4fa5e2b162a93d7b1f47eaafeba34f8fa47804af9001f1275c8d7c8c04231f96a3498c9600050bcee08a8854d1a7092d837d1acafce7a4 SHA512 7157e39cfea2c332d0b73b673b230e86a740797582f705894b072a5bcd925aec7afc24f940437ae69e799405890c45d5a589cec9b98c56b545c89f14df337c74
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-5.15.98.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-5.15.99.ebuild
index c04a9a5d6ea8..c04a9a5d6ea8 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-5.15.98.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-5.15.99.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.1.15.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.1.17.ebuild
index 424a2f9b0f9d..424a2f9b0f9d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.1.15.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.1.17.ebuild
diff --git a/sys-kernel/vanilla-sources/vanilla-sources-6.2.2.ebuild b/sys-kernel/vanilla-sources/vanilla-sources-6.2.4.ebuild
index 424a2f9b0f9d..424a2f9b0f9d 100644
--- a/sys-kernel/vanilla-sources/vanilla-sources-6.2.2.ebuild
+++ b/sys-kernel/vanilla-sources/vanilla-sources-6.2.4.ebuild
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index a5251923bec8..ff6baaa1dffe 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -7,4 +7,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230225.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230225.ebuild
deleted file mode 100644
index dfbdb41973ec..000000000000
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,216 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
-
-DESCRIPTION="Compiler runtime libraries for clang (sanitizers & xray)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS=""
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-# base targets
-IUSE+=" +libfuzzer +memprof +orc +profile +xray"
-# sanitizer targets, keep in sync with config-ix.cmake
-# NB: ubsan, scudo deliberately match two entries
-SANITIZER_FLAGS=(
-	asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo
-	shadowcallstack gwp-asan
-)
-IUSE+=" ${SANITIZER_FLAGS[@]/#/+}"
-REQUIRED_USE="
-	|| ( ${SANITIZER_FLAGS[*]} libfuzzer orc profile xray )
-	test? (
-		cfi? ( ubsan )
-		gwp-asan? ( scudo )
-	)
-"
-RESTRICT="
-	!clang? ( test )
-	!test? ( test )
-"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-	virtual/libcrypt[abi_x86_32(-)?,abi_x86_64(-)?]
-"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	elibc_glibc? ( net-libs/libtirpc )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-		sys-libs/compiler-rt:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-LLVM_TEST_COMPONENTS=( llvm/lib/Testing/Support third-party )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-check_space() {
-	if use test; then
-		local CHECKREQS_DISK_BUILD=11G
-		check-reqs_pkg_pretend
-	fi
-}
-
-pkg_pretend() {
-	check_space
-}
-
-pkg_setup() {
-	check_space
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_prepare() {
-	sed -i -e 's:-Werror::' lib/tsan/go/buildgo.sh || die
-
-	local flag
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if ! use "${flag}"; then
-			local cmake_flag=${flag/-/_}
-			sed -i -e "/COMPILER_RT_HAS_${cmake_flag^^}/s:TRUE:FALSE:" \
-				cmake/config-ix.cmake || die
-		fi
-	done
-
-	# TODO: fix these tests to be skipped upstream
-	if use asan && ! use profile; then
-		rm test/asan/TestCases/asan_and_llvm_coverage_test.cpp || die
-	fi
-	if use ubsan && ! use cfi; then
-		> test/cfi/CMakeLists.txt || die
-	fi
-
-	llvm.org_src_prepare
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/compiler-rt_build
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	local flag want_sanitizer=OFF
-	for flag in "${SANITIZER_FLAGS[@]}"; do
-		if use "${flag}"; then
-			want_sanitizer=ON
-			break
-		fi
-	done
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-		# use a build dir structure consistent with install
-		# this makes it possible to easily deploy test-friendly clang
-		-DCOMPILER_RT_OUTPUT_DIR="${BUILD_DIR}/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		# builtins & crt installed by sys-libs/compiler-rt
-		-DCOMPILER_RT_BUILD_BUILTINS=OFF
-		-DCOMPILER_RT_BUILD_CRT=OFF
-		-DCOMPILER_RT_BUILD_LIBFUZZER=$(usex libfuzzer)
-		-DCOMPILER_RT_BUILD_MEMPROF=$(usex memprof)
-		-DCOMPILER_RT_BUILD_ORC=$(usex orc)
-		-DCOMPILER_RT_BUILD_PROFILE=$(usex profile)
-		-DCOMPILER_RT_BUILD_SANITIZERS="${want_sanitizer}"
-		-DCOMPILER_RT_BUILD_XRAY=$(usex xray)
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			# they are created during src_test()
-			-DCOMPILER_RT_TEST_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${BUILD_DIR}/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-
-		# same flags are passed for build & tests, so we need to strip
-		# them down to a subset supported by clang
-		CC=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang \
-		CXX=${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++ \
-		strip-unsupported-flags
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX
-			# This disables i386 for SDK >= 10.15
-			# Will error if has_use tsan and SDK < 10.12
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	cmake_src_configure
-
-	if use test; then
-		local sys_dir=( "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/lib/* )
-		[[ -e ${sys_dir} ]] || die "Unable to find ${sys_dir}"
-		[[ ${#sys_dir[@]} -eq 1 ]] || die "Non-deterministic compiler-rt install: ${sys_dir[*]}"
-
-		# copy clang over since resource_dir is located relatively to binary
-		# therefore, we can put our new libraries in it
-		mkdir -p "${BUILD_DIR}"/lib/{llvm/${LLVM_MAJOR}/{bin,$(get_libdir)},clang/${LLVM_MAJOR}/include} || die
-		cp "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/bin/clang{,++} \
-			"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/bin/ || die
-		cp "${EPREFIX}"/usr/lib/clang/${LLVM_MAJOR}/include/*.h \
-			"${BUILD_DIR}"/lib/clang/${LLVM_MAJOR}/include/ || die
-		cp "${sys_dir}"/*builtins*.a \
-			"${BUILD_DIR}/lib/clang/${LLVM_MAJOR}/lib/${sys_dir##*/}/" || die
-		# we also need LLVMgold.so for gold-based tests
-		if [[ -f ${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so ]]; then
-			ln -s "${EPREFIX}"/usr/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/LLVMgold.so \
-				"${BUILD_DIR}"/lib/llvm/${LLVM_MAJOR}/$(get_libdir)/ || die
-		fi
-	fi
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-	# disable sandbox to have it stop clobbering LD_PRELOAD
-	local -x SANDBOX_ON=0
-	# wipe LD_PRELOAD to make ASAN happy
-	local -x LD_PRELOAD=
-
-	cmake_build check-all
-}
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index a2bacff81331..dbba4dba17ad 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -7,4 +7,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230225.ebuild b/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230225.ebuild
deleted file mode 100644
index 3658972b66f1..000000000000
--- a/sys-libs/compiler-rt/compiler-rt-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
-
-DESCRIPTION="Compiler runtime library for clang (built-in part)"
-HOMEPAGE="https://llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="${LLVM_MAJOR}"
-KEYWORDS=""
-IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
-RESTRICT="!test? ( test ) !clang? ( test )"
-
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	>=dev-util/cmake-3.16
-	clang? ( sys-devel/clang )
-	test? (
-		$(python_gen_any_dep ">=dev-python/lit-15[\${PYTHON_USEDEP}]")
-		=sys-devel/clang-${LLVM_VERSION}*:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-"
-
-LLVM_COMPONENTS=( compiler-rt cmake llvm/cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version ">=dev-python/lit-15[${PYTHON_USEDEP}]"
-}
-
-pkg_pretend() {
-	if ! use clang && ! tc-is-clang; then
-		ewarn "Building using a compiler other than clang may result in broken atomics"
-		ewarn "library. Enable USE=clang unless you have a very good reason not to."
-	fi
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-test_compiler() {
-	$(tc-getCC) ${CFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	# pre-set since we need to pass it to cmake
-	BUILD_DIR=${WORKDIR}/${P}_build
-
-	if use clang; then
-		# Only do this conditionally to allow overriding with
-		# e.g. CC=clang-13 in case of breakage
-		if ! tc-is-clang ; then
-			local -x CC=${CHOST}-clang
-			local -x CXX=${CHOST}-clang++
-		fi
-
-		strip-unsupported-flags
-	fi
-
-	if ! test_compiler; then
-		local nolib_flags=( -nodefaultlibs -lc )
-
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		elif test_compiler "${nolib_flags[@]}" -nostartfiles; then
-			# Avoiding -nostartfiles earlier on for bug #862540,
-			# and set available entry symbol for bug #862798.
-			nolib_flags+=( -nostartfiles -emain )
-
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CC} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local mycmakeargs=(
-		-DCOMPILER_RT_INSTALL_PATH="${EPREFIX}/usr/lib/clang/${LLVM_MAJOR}"
-
-		-DCOMPILER_RT_INCLUDE_TESTS=$(usex test)
-		-DCOMPILER_RT_BUILD_LIBFUZZER=OFF
-		-DCOMPILER_RT_BUILD_MEMPROF=OFF
-		-DCOMPILER_RT_BUILD_ORC=OFF
-		-DCOMPILER_RT_BUILD_PROFILE=OFF
-		-DCOMPILER_RT_BUILD_SANITIZERS=OFF
-		-DCOMPILER_RT_BUILD_XRAY=OFF
-
-		-DPython3_EXECUTABLE="${PYTHON}"
-	)
-
-	if use amd64; then
-		mycmakeargs+=(
-			-DCAN_TARGET_i386=$(usex abi_x86_32)
-			-DCAN_TARGET_x86_64=$(usex abi_x86_64)
-		)
-	fi
-
-	if use prefix && [[ "${CHOST}" == *-darwin* ]] ; then
-		mycmakeargs+=(
-			# setting -isysroot is disabled with compiler-rt-prefix-paths.patch
-			# this allows adding arm64 support using SDK in EPREFIX
-			-DDARWIN_macosx_CACHED_SYSROOT="${EPREFIX}/MacOSX.sdk"
-			# Set version based on the SDK in EPREFIX.
-			# This disables i386 for SDK >= 10.15
-			-DDARWIN_macosx_OVERRIDE_SDK_VERSION="$(realpath ${EPREFIX}/MacOSX.sdk | sed -e 's/.*MacOSX\(.*\)\.sdk/\1/')"
-			# Use our libtool instead of looking it up with xcrun
-			-DCMAKE_LIBTOOL="${EPREFIX}/usr/bin/${CHOST}-libtool"
-		)
-	fi
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-
-			-DCOMPILER_RT_TEST_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang"
-			-DCOMPILER_RT_TEST_CXX_COMPILER="${EPREFIX}/usr/lib/llvm/${LLVM_MAJOR}/bin/clang++"
-		)
-	fi
-
-	cmake_src_configure
-}
-
-src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-builtins
-}
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 58266724eb65..54119b0cd2f2 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -7,4 +7,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/libcxx/libcxx-17.0.0_pre20230225.ebuild b/sys-libs/libcxx/libcxx-17.0.0_pre20230225.ebuild
deleted file mode 100644
index 23dce38606c4..000000000000
--- a/sys-libs/libcxx/libcxx-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,204 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="New implementation of the C++ standard library, targeting C++11"
-HOMEPAGE="https://libcxx.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clang +libcxxabi static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	libcxxabi? (
-		~sys-libs/libcxxabi-${PV}[static-libs?,${MULTILIB_USEDEP}]
-	)
-	!libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		>=dev-util/cmake-3.16
-		sys-devel/gdb[python]
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{,abi} llvm/{cmake,utils/llvm-lit} cmake )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# Darwin Prefix builds do not have llvm installed yet, so rely on
-	# bootstrap-prefix to set the appropriate path vars to LLVM instead
-	# of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-
-	if ! use libcxxabi && ! tc-is-gcc ; then
-		eerror "To build ${PN} against libsupc++, you have to use gcc. Other"
-		eerror "compilers are not supported. Please set CC=gcc and CXX=g++"
-		eerror "and try again."
-		die
-	fi
-}
-
-test_compiler() {
-	$(tc-getCXX) ${CXXFLAGS} ${LDFLAGS} "${@}" -o /dev/null -x c++ - \
-		<<<'int main() { return 0; }' &>/dev/null
-}
-
-src_configure() {
-	# note: we need to do this before multilib kicks in since it will
-	# alter the CHOST
-	local cxxabi cxxabi_incs
-	if use libcxxabi; then
-		cxxabi=system-libcxxabi
-		cxxabi_incs="${EPREFIX}/usr/include/c++/v1"
-	else
-		local gcc_inc="${EPREFIX}/usr/lib/gcc/${CHOST}/$(gcc-fullversion)/include/g++-v$(gcc-major-version)"
-		cxxabi=libsupc++
-		cxxabi_incs="${gcc_inc};${gcc_inc}/${CHOST}"
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	# bootstrap: cmake is unhappy if compiler can't link to stdlib
-	local nolib_flags=( -nodefaultlibs -lc )
-	if ! test_compiler; then
-		if test_compiler "${nolib_flags[@]}"; then
-			local -x LDFLAGS="${LDFLAGS} ${nolib_flags[*]}"
-			ewarn "${CXX} seems to lack runtime, trying with ${nolib_flags[*]}"
-		fi
-	fi
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES=libcxx
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXX_CXX_ABI=${cxxabi}
-		-DLIBCXX_CXX_ABI_INCLUDE_PATHS=${cxxabi_incs}
-		# we're using our own mechanism for generating linker scripts
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=$(usex test)
-		-DLIBCXX_USE_COMPILER_RT=${use_compiler_rt}
-	)
-
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_src_compile
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		gen_shared_ldscript
-		use static-libs && gen_static_ldscript
-	fi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxx
-}
-
-multilib_src_install() {
-	cmake_src_install
-	# since we've replaced libc++.{a,so} with ldscripts, now we have to
-	# install the extra symlinks
-	if [[ ${CHOST} != *-darwin* ]] ; then
-		dolib.so lib/libc++_shared.so
-		use static-libs && dolib.a lib/libc++_static.a
-	fi
-}
-
-# Usage: deps
-gen_ldscript() {
-	local output_format
-	output_format=$($(tc-getCC) ${CFLAGS} ${LDFLAGS} -Wl,--verbose 2>&1 | sed -n 's/^OUTPUT_FORMAT("\([^"]*\)",.*/\1/p')
-	[[ -n ${output_format} ]] && output_format="OUTPUT_FORMAT ( ${output_format} )"
-
-	cat <<-END_LDSCRIPT
-/* GNU ld script
-   Include missing dependencies
-*/
-${output_format}
-GROUP ( $@ )
-END_LDSCRIPT
-}
-
-gen_static_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_static}.a || die
-	# Generate libc++.a ldscript for inclusion of its dependencies so that
-	# clang++ -stdlib=libc++ -static works out of the box.
-	local deps=(
-		libc++_static.a
-		$(usex libcxxabi libc++abi.a libsupc++.a)
-	)
-	# On Linux/glibc it does not link without libpthread or libdl. It is
-	# fine on FreeBSD.
-	use elibc_glibc && deps+=( libpthread.a libdl.a )
-
-	gen_ldscript "${deps[*]}" > lib/libc++.a || die
-}
-
-gen_shared_ldscript() {
-	# Move it first.
-	mv lib/libc++{,_shared}.so || die
-	local deps=(
-		libc++_shared.so
-		# libsupc++ doesn't have a shared version
-		$(usex libcxxabi libc++abi.so libsupc++.a)
-	)
-
-	gen_ldscript "${deps[*]}" > lib/libc++.so || die
-}
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 1edea9832f73..b055e2dfd698 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -5,4 +5,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230225.ebuild b/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230225.ebuild
deleted file mode 100644
index 1650e44d934a..000000000000
--- a/sys-libs/libcxxabi/libcxxabi-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,116 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="Low level support for a standard C++ library"
-HOMEPAGE="https://libcxxabi.llvm.org/"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clang static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-# in 15.x, cxxabi.h is moving from libcxx to libcxxabi
-RDEPEND+="
-	!<sys-libs/libcxx-15
-"
-DEPEND="
-	${RDEPEND}
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libcxx{abi,} llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	# darwin prefix builds do not have llvm installed yet, so rely on bootstrap-prefix
-	# to set the appropriate path vars to LLVM instead of using llvm_pkg_setup.
-	if [[ ${CHOST} != *-darwin* ]] || has_version dev-lang/llvm; then
-		LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	fi
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local libdir=$(get_libdir)
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libcxxabi;libcxx"
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLIBCXXABI_ENABLE_SHARED=ON
-		-DLIBCXXABI_ENABLE_STATIC=$(usex static-libs)
-		-DLIBCXXABI_INCLUDE_TESTS=$(usex test)
-		-DLIBCXXABI_USE_COMPILER_RT=${use_compiler_rt}
-
-		# upstream is omitting standard search path for this
-		# probably because gcc & clang are bundling their own unwind.h
-		-DLIBCXXABI_LIBUNWIND_INCLUDES="${EPREFIX}"/usr/include
-
-		-DLIBCXX_LIBDIR_SUFFIX=
-		-DLIBCXX_ENABLE_SHARED=ON
-		-DLIBCXX_ENABLE_STATIC=OFF
-		-DLIBCXX_CXX_ABI=libcxxabi
-		-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-		-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-		-DLIBCXX_HAS_GCC_S_LIB=OFF
-		-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		-DLIBCXX_INCLUDE_TESTS=OFF
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DPython3_EXECUTABLE="${PYTHON}"
-		)
-	fi
-	cmake_src_configure
-}
-
-multilib_src_compile() {
-	cmake_build cxxabi
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-cxxabi
-}
-
-multilib_src_install() {
-	DESTDIR="${D}" cmake_build install-cxxabi
-}
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index 324b4f970fa3..1cedd41bcc86 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -7,4 +7,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/libomp/libomp-15.0.7-r1.ebuild b/sys-libs/libomp/libomp-15.0.7-r2.ebuild
index c8a7d101f6d6..063960570da5 100644
--- a/sys-libs/libomp/libomp-15.0.7-r1.ebuild
+++ b/sys-libs/libomp/libomp-15.0.7-r2.ebuild
@@ -24,7 +24,7 @@ RDEPEND="
 		virtual/libelf:=[${MULTILIB_USEDEP}]
 		dev-libs/libffi:=[${MULTILIB_USEDEP}]
 		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 )
+		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
 	)
 "
 # tests:
diff --git a/sys-libs/libomp/libomp-16.0.0.9999.ebuild b/sys-libs/libomp/libomp-16.0.0.9999.ebuild
index 59bb21cd6ac5..9ff6d5fd0285 100644
--- a/sys-libs/libomp/libomp-16.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-16.0.0.9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	offload? (
 		dev-libs/libffi:=[${MULTILIB_USEDEP}]
 		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 )
+		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
 	)
 "
 # tests:
diff --git a/sys-libs/libomp/libomp-16.0.0_rc3.ebuild b/sys-libs/libomp/libomp-16.0.0_rc3.ebuild
index 1d6dc9eebd47..d6336920852e 100644
--- a/sys-libs/libomp/libomp-16.0.0_rc3.ebuild
+++ b/sys-libs/libomp/libomp-16.0.0_rc3.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	offload? (
 		dev-libs/libffi:=[${MULTILIB_USEDEP}]
 		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 )
+		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
 	)
 "
 # tests:
diff --git a/sys-libs/libomp/libomp-17.0.0.9999.ebuild b/sys-libs/libomp/libomp-17.0.0.9999.ebuild
index 59bb21cd6ac5..9ff6d5fd0285 100644
--- a/sys-libs/libomp/libomp-17.0.0.9999.ebuild
+++ b/sys-libs/libomp/libomp-17.0.0.9999.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	offload? (
 		dev-libs/libffi:=[${MULTILIB_USEDEP}]
 		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 )
+		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
 	)
 "
 # tests:
diff --git a/sys-libs/libomp/libomp-17.0.0_pre20230225.ebuild b/sys-libs/libomp/libomp-17.0.0_pre20230225.ebuild
deleted file mode 100644
index 59bb21cd6ac5..000000000000
--- a/sys-libs/libomp/libomp-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,149 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit flag-o-matic cmake-multilib linux-info llvm llvm.org
-inherit python-single-r1 toolchain-funcs
-
-DESCRIPTION="OpenMP runtime library for LLVM/clang compiler"
-HOMEPAGE="https://openmp.llvm.org"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0/${LLVM_SOABI}"
-KEYWORDS=""
-IUSE="
-	debug gdb-plugin hwloc offload ompt test
-	llvm_targets_AMDGPU llvm_targets_NVPTX
-"
-REQUIRED_USE="
-	gdb-plugin? ( ${PYTHON_REQUIRED_USE} )
-"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	gdb-plugin? ( ${PYTHON_DEPS} )
-	hwloc? ( >=sys-apps/hwloc-2.5:0=[${MULTILIB_USEDEP}] )
-	offload? (
-		dev-libs/libffi:=[${MULTILIB_USEDEP}]
-		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 )
-	)
-"
-# tests:
-# - dev-python/lit provides the test runner
-# - sys-devel/llvm provide test utils (e.g. FileCheck)
-# - sys-devel/clang provides the compiler to run tests
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	offload? (
-		llvm_targets_AMDGPU? ( sys-devel/clang )
-		llvm_targets_NVPTX? ( sys-devel/clang )
-		virtual/pkgconfig
-	)
-	test? (
-		${PYTHON_DEPS}
-		$(python_gen_cond_dep '
-			dev-python/lit[${PYTHON_USEDEP}]
-		')
-		sys-devel/clang
-	)
-"
-
-LLVM_COMPONENTS=( openmp cmake llvm/include )
-llvm.org_set_globals
-
-kernel_pds_check() {
-	if use kernel_linux && kernel_is -lt 4 15 && kernel_is -ge 4 13; then
-		local CONFIG_CHECK="~!SCHED_PDS"
-		local ERROR_SCHED_PDS="\
-PDS scheduler versions >= 0.98c < 0.98i (e.g. used in kernels >= 4.13-pf11
-< 4.14-pf9) do not implement sched_yield() call which may result in horrible
-performance problems with libomp. If you are using one of the specified
-kernel versions, you may want to disable the PDS scheduler."
-
-		check_extra_config
-	fi
-}
-
-pkg_pretend() {
-	kernel_pds_check
-}
-
-pkg_setup() {
-	use offload && LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	if use gdb-plugin || use test; then
-		python-single-r1_pkg_setup
-	fi
-}
-
-multilib_src_configure() {
-	# LTO causes issues in other packages building, #870127
-	filter-lto
-
-	# LLVM_ENABLE_ASSERTIONS=NO does not guarantee this for us, #614844
-	use debug || local -x CPPFLAGS="${CPPFLAGS} -DNDEBUG"
-
-	local build_omptarget=OFF
-	# upstream disallows building libomptarget when sizeof(void*) != 8
-	if use offload &&
-		"$(tc-getCC)" ${CFLAGS} ${CPPFLAGS} -c -x c - -o /dev/null \
-		<<-EOF &>/dev/null
-			int test[sizeof(void *) == 8 ? 1 : -1];
-		EOF
-	then
-		build_omptarget=ON
-	fi
-
-	local libdir="$(get_libdir)"
-	local mycmakeargs=(
-		-DOPENMP_LIBDIR_SUFFIX="${libdir#lib}"
-
-		-DLIBOMP_USE_HWLOC=$(usex hwloc)
-		-DLIBOMP_OMPD_GDB_SUPPORT=$(multilib_native_usex gdb-plugin)
-		-DLIBOMP_OMPT_SUPPORT=$(usex ompt)
-
-		-DOPENMP_ENABLE_LIBOMPTARGET=${build_omptarget}
-
-		# do not install libgomp.so & libiomp5.so aliases
-		-DLIBOMP_INSTALL_ALIASES=OFF
-		# disable unnecessary hack copying stuff back to srcdir
-		-DLIBOMP_COPY_EXPORTS=OFF
-	)
-
-	if [[ ${build_omptarget} == ON ]]; then
-		if has "${CHOST%%-*}" aarch64 powerpc64le x86_64; then
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=$(usex llvm_targets_AMDGPU)
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=$(usex llvm_targets_NVPTX)
-			)
-		else
-			mycmakeargs+=(
-				-DLIBOMPTARGET_BUILD_AMDGPU_PLUGIN=OFF
-				-DLIBOMPTARGET_BUILD_CUDA_PLUGIN=OFF
-			)
-		fi
-	fi
-
-	use test && mycmakeargs+=(
-		# this project does not use standard LLVM cmake macros
-		-DOPENMP_LLVM_LIT_EXECUTABLE="${EPREFIX}/usr/bin/lit"
-		-DOPENMP_LIT_ARGS="$(get_lit_flags)"
-
-		-DOPENMP_TEST_C_COMPILER="$(type -P "${CHOST}-clang")"
-		-DOPENMP_TEST_CXX_COMPILER="$(type -P "${CHOST}-clang++")"
-	)
-	addpredict /dev/nvidiactl
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	# respect TMPDIR!
-	local -x LIT_PRESERVES_TMP=1
-
-	cmake_build check-libomp
-}
diff --git a/sys-libs/libomp/libomp-17.0.0_pre20230304.ebuild b/sys-libs/libomp/libomp-17.0.0_pre20230304.ebuild
index 59bb21cd6ac5..9ff6d5fd0285 100644
--- a/sys-libs/libomp/libomp-17.0.0_pre20230304.ebuild
+++ b/sys-libs/libomp/libomp-17.0.0_pre20230304.ebuild
@@ -28,7 +28,7 @@ RDEPEND="
 	offload? (
 		dev-libs/libffi:=[${MULTILIB_USEDEP}]
 		~sys-devel/llvm-${PV}[${MULTILIB_USEDEP}]
-		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:0/5.3 )
+		llvm_targets_AMDGPU? ( dev-libs/rocr-runtime:= )
 	)
 "
 # tests:
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 1edea9832f73..b055e2dfd698 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -5,4 +5,3 @@ DIST llvm-project-15.0.7.src.tar.xz.sig 566 BLAKE2B 47dc8c82d86237b80c6d85f83a6c
 DIST llvm-project-16.0.0rc3.src.tar.xz 117914548 BLAKE2B 18ffa35eb73c7cc4626d7b6b7b30aade7171ee2e17fb8d72e79a67185e809f611fefa4cfef17e5cd16822a5a70de2222534dc9f146fc53987eb49ff6a9d98c18 SHA512 d14e5e5ec984a0dc0292a2d27440398b3e32f120c1579517054dcb1a05dbc4ac5f1c6d078a3d6ef8597a71af6f22863868680a972a571839dcd573418b4a4697
 DIST llvm-project-16.0.0rc3.src.tar.xz.sig 566 BLAKE2B 43683d2d7b266a847516f71412bf6236a355462430330fc0da1d624fb8dfbc98bfc982d367baee74d5b4964a9e82e7a4a6ea84bdcff3996d246932f516cced1a SHA512 61adc4dc3eb5a4c11a7f96f9267ff37895e5845a08d48a609a03a2696c1b6bca5af5861a6f28de936c48e6d621bf282170589187f2cb593a912b9078300cf47c
 DIST llvm-project-2708869801ae00f4681f6b2d9d69b25b3fce26b6.tar.gz 180523586 BLAKE2B cf918d1e23f922d201a44531c9765b7d8ec2b3b8499ea7954845abcd5fa2687e85b3a34819a583c4f4a6d6e1baa49dbac0b4450cd6b9b322b0f13c88cd7da93c SHA512 18cb00e93d819993a925ae0467d382bc952d82c1eb92dbbb5bb3cdf87043269948670713734ddc3ea4ec50544e54dd11b6747496f7eaa02479374ab9ad075aa5
-DIST llvm-project-b0676fb0fb0a44a4a1c4ec1f0270fef1f1842817.tar.gz 180277698 BLAKE2B d2c1e6a1942e51f5844c18605f38b005e9bb4123850a173e4c4b3d7b6a14f4986c7b276b40df4d0594ae04e869e92ba1a4269c5055c0229cfd28aa1bd709da4f SHA512 d1281b942dcc254641865f11b0c4fbd1d562d016681b6b7268549bed1cdb7d4536f743a8ed089095eaab9f4bfb9de624153f448bf13d0e22f8ea24a4d264df7b
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230225.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230225.ebuild
deleted file mode 100644
index 6d8def4337fa..000000000000
--- a/sys-libs/llvm-libunwind/llvm-libunwind-17.0.0_pre20230225.ebuild
+++ /dev/null
@@ -1,123 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{7,8,9,10,11} )
-inherit cmake-multilib flag-o-matic llvm llvm.org python-any-r1 \
-	toolchain-funcs
-
-DESCRIPTION="C++ runtime stack unwinder from LLVM"
-HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
-
-LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
-SLOT="0"
-KEYWORDS=""
-IUSE="+clang debug static-libs test"
-REQUIRED_USE="test? ( clang )"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	!sys-libs/libunwind
-"
-DEPEND="
-	sys-devel/llvm:${LLVM_MAJOR}
-"
-BDEPEND="
-	clang? (
-		sys-devel/clang:${LLVM_MAJOR}
-	)
-	!test? (
-		${PYTHON_DEPS}
-	)
-	test? (
-		$(python_gen_any_dep 'dev-python/lit[${PYTHON_USEDEP}]')
-	)
-"
-
-LLVM_COMPONENTS=( runtimes libunwind libcxx llvm/cmake cmake )
-LLVM_TEST_COMPONENTS=( libcxxabi llvm/utils/llvm-lit )
-llvm.org_set_globals
-
-python_check_deps() {
-	use test || return 0
-	python_has_version "dev-python/lit[${PYTHON_USEDEP}]"
-}
-
-pkg_setup() {
-	LLVM_MAX_SLOT=${LLVM_MAJOR} llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-multilib_src_configure() {
-	local libdir=$(get_libdir)
-
-	# https://github.com/llvm/llvm-project/issues/56825
-	# also separately bug #863917
-	filter-lto
-
-	if use clang; then
-		local -x CC=${CHOST}-clang
-		local -x CXX=${CHOST}-clang++
-		strip-unsupported-flags
-	fi
-
-	# link to compiler-rt
-	# https://github.com/gentoo/gentoo/pull/21516
-	local use_compiler_rt=OFF
-	[[ $(tc-get-c-rtlib) == compiler-rt ]] && use_compiler_rt=ON
-
-	local mycmakeargs=(
-		-DCMAKE_CXX_COMPILER_TARGET="${CHOST}"
-		-DPython3_EXECUTABLE="${PYTHON}"
-		-DLLVM_ENABLE_RUNTIMES="libunwind"
-		-DLLVM_LIBDIR_SUFFIX=${libdir#lib}
-		-DLLVM_INCLUDE_TESTS=OFF
-		-DLIBUNWIND_ENABLE_ASSERTIONS=$(usex debug)
-		-DLIBUNWIND_ENABLE_STATIC=$(usex static-libs)
-		-DLIBUNWIND_INCLUDE_TESTS=$(usex test)
-		-DLIBUNWIND_INSTALL_HEADERS=ON
-
-		# support non-native unwinding; given it's small enough,
-		# enable it unconditionally
-		-DLIBUNWIND_ENABLE_CROSS_UNWINDING=ON
-
-		# avoid dependency on libgcc_s if compiler-rt is used
-		-DLIBUNWIND_USE_COMPILER_RT=${use_compiler_rt}
-	)
-	if use test; then
-		mycmakeargs+=(
-			-DLLVM_ENABLE_RUNTIMES="libunwind;libcxxabi;libcxx"
-			-DLLVM_EXTERNAL_LIT="${EPREFIX}/usr/bin/lit"
-			-DLLVM_LIT_ARGS="$(get_lit_flags)"
-			-DLIBUNWIND_LIBCXX_PATH="${WORKDIR}/libcxx"
-
-			-DLIBCXXABI_LIBDIR_SUFFIX=
-			-DLIBCXXABI_ENABLE_SHARED=OFF
-			-DLIBCXXABI_ENABLE_STATIC=ON
-			-DLIBCXXABI_USE_LLVM_UNWINDER=ON
-			-DLIBCXXABI_INCLUDE_TESTS=OFF
-
-			-DLIBCXX_LIBDIR_SUFFIX=
-			-DLIBCXX_ENABLE_SHARED=OFF
-			-DLIBCXX_ENABLE_STATIC=ON
-			-DLIBCXX_CXX_ABI=libcxxabi
-			-DLIBCXX_ENABLE_ABI_LINKER_SCRIPT=OFF
-			-DLIBCXX_HAS_MUSL_LIBC=$(usex elibc_musl)
-			-DLIBCXX_HAS_GCC_S_LIB=OFF
-			-DLIBCXX_INCLUDE_TESTS=OFF
-			-DLIBCXX_INCLUDE_BENCHMARKS=OFF
-		)
-	fi
-
-	cmake_src_configure
-}
-
-multilib_src_test() {
-	local -x LIT_PRESERVES_TMP=1
-	cmake_build check-unwind
-}
-
-multilib_src_install() {
-	DESTDIR=${D} cmake_build install-unwind
-}
diff --git a/virtual/dist-kernel/dist-kernel-5.10.172.ebuild b/virtual/dist-kernel/dist-kernel-5.10.172.ebuild
new file mode 100644
index 000000000000..407f5d349eb1
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.10.172.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.15.99.ebuild b/virtual/dist-kernel/dist-kernel-5.15.99.ebuild
new file mode 100644
index 000000000000..407f5d349eb1
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-5.15.99.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.1.16.ebuild b/virtual/dist-kernel/dist-kernel-6.1.16.ebuild
new file mode 100644
index 000000000000..d3f0fa8764cf
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.1.16.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.2.3.ebuild b/virtual/dist-kernel/dist-kernel-6.2.3.ebuild
new file mode 100644
index 000000000000..d3f0fa8764cf
--- /dev/null
+++ b/virtual/dist-kernel/dist-kernel-6.2.3.ebuild
@@ -0,0 +1,19 @@
+# Copyright 2021-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+DESCRIPTION="Virtual to depend on any Distribution Kernel"
+HOMEPAGE=""
+SRC_URI=""
+
+LICENSE=""
+SLOT="0/${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
+
+RDEPEND="
+	|| (
+		~sys-kernel/gentoo-kernel-${PV}
+		~sys-kernel/gentoo-kernel-bin-${PV}
+		~sys-kernel/vanilla-kernel-${PV}
+	)"
diff --git a/www-apps/drupal/Manifest b/www-apps/drupal/Manifest
index da25d78a1b40..c0257cc9add7 100644
--- a/www-apps/drupal/Manifest
+++ b/www-apps/drupal/Manifest
@@ -1,4 +1,4 @@
-DIST drupal-7.89.tar.gz 3361853 BLAKE2B 5388c6c9ded2ce31caee1bea23976e2c2d53116f6e564fd47f4035e9815e28759bf4e56964754d01c165ae7c384527c3c1845ef6b9c3b1b029b9eca3c56e7442 SHA512 3f1f50b09bfd77afaad368c21a00d2fb52a4a3853bf288525a805fab992083ffb241c2b3bfef8db3b4351310b0a0d5d27470fa7adc191c687809f48464f18f0b
-DIST drupal-8.9.20.tar.gz 19837562 BLAKE2B 8246a96628eeb936c87d1c0ff58b507e432922ede550308b105066b4334e8e04e8f2dc9a7475fe9d4c5556b11e0e938191f453e74cac9ade11ce9369da696af6 SHA512 824ec2820a1071765fdb9f5d6195d906517d2d1a97f5cb0458e7417495f9c7c88717b931870bf46c0681787b54904a746770b8811c9deff3b05624415db032cf
-DIST drupal-9.1.15.tar.gz 18580086 BLAKE2B 500602e498de55d2163c53d2cb04effbdab24d343a2f04262275c6500d9329b12760dee846513efbddc37916973dc9ad4bf0f6f882b1b57b0ca97b40afb369be SHA512 1fd8cbdbf0de00ed6d85a004f61fb3897cfcbc1f71d1d72373c8acf108f21774f3a91138901d9a3d0043f6b65b29ae7f953dfce1428a96a4fe529aac907141c0
-DIST drupal-9.2.18.tar.gz 18882937 BLAKE2B 9e62b041c0d3cd634984fa29c72b35af9a1d9777d1b3c204fb55fd125d7270242177b30876a03e36aa3757b1445fd7763db82a2f038e7931d84df7f908150abb SHA512 ed91530280a6150070d4086a388084b6336526363fb56585c85e090f9e3fd1b3e90a82eb83b07a6c725eae3ba994228b5cf280d3c296650d9e2be9e97996aa31
+DIST drupal-10.0.2.tar.gz 17411661 BLAKE2B c7a9a98f1e8c120486c1a6bd17986b3e99c1e51113969413eb557f657fa3415f65b819a70d08be7c543b6609cba2881b18fa69ce77fe8b3764d9a4a12f569e04 SHA512 19f3f2459c8d2d54647f43db614cd493cb6f068d107678bb6c36823407fe815db71b7919fe755f40fb10c3697afb07e20c93fe47098de88f9248f18cf901da80
+DIST drupal-7.91.tar.gz 3369203 BLAKE2B 202b3cbcbb25bb92f056c15cb8f697038caacdd62497de02b7e0036dc5dd5ac6e9b12c67620b753a5fbe8440e5883aec3061a626d753d9cca4f48b6d6358b3fc SHA512 da38735563cf5a76f432907b61943339b9d7f218e5abe5b5187138a470b545db14e23bb708fa53adc0853f9b46b34242e7eae3222e53b62fdafef29b2b476169
+DIST drupal-9.4.10.tar.gz 21631038 BLAKE2B 635bca79c8ac0230205eb4eb11b4e790d49a3359c0fc1f535b936535b8541de71f0319806da221a9179b0b13c8f3d28ccf0f4d7c9088e459d9ff8274b3965b58 SHA512 befefe68ef0b6818ba9637fea2b007119483b431950cf0d81090d27b1e1672ab8c84be46ea1b083acf7dc4898bd4cfb294cd74a21cd5105cccef3d285c357739
+DIST drupal-9.5.2.tar.gz 22552415 BLAKE2B f364faefa537e43a908ad7a4aab689643ef1ddf036881a4167b0681eeb0e8d0fa657037f059475b854f5e1965e670834bdc49cbd7bc8b5e4123ae9fa00423351 SHA512 a78637076db8034abb26e8c271db363ce3f20aa095f44b411ed2c3556bf102278a002ede68a386761d22004c65b9524ed473ac1a6c4e41ac6969b360179afde6
diff --git a/www-apps/drupal/drupal-9.1.15.ebuild b/www-apps/drupal/drupal-10.0.2.ebuild
index 65376470ca05..6a27404d4a84 100644
--- a/www-apps/drupal/drupal-9.1.15.ebuild
+++ b/www-apps/drupal/drupal-10.0.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit webapp
 
@@ -17,10 +17,12 @@ LICENSE="GPL-2"
 KEYWORDS="~amd64 ~x86"
 IUSE="+mysql postgres sqlite +uploadprogress"
 
+# upstream supports php 8.1+, but dev-php/pecl-uploadprogress does not have 8.2
+# limit php to 8.1 for now
 RDEPEND="
-	dev-lang/php[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
+	dev-lang/php:8.1[gd,hash(+),mysql?,pdo,postgres?,simplexml,sqlite?,xml]
 	virtual/httpd-php
-	uploadprogress? ( dev-php/pecl-uploadprogress )
+	uploadprogress? ( dev-php/pecl-uploadprogress[php_targets_php8-1] )
 "
 
 need_httpd_cgi
@@ -30,11 +32,12 @@ REQUIRED_USE="|| ( mysql postgres sqlite )"
 src_install() {
 	webapp_src_preinst
 
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
-		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
+	local docs="LICENSE.txt README.md core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt \
+		core/USAGE.txt "
 
 	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+	rm ${docs} core/COPYRIGHT.txt core/LICENSE.txt || die
 
 	cp sites/default/{default.settings.php,settings.php} || die
 	insinto "${MY_HTDOCSDIR}"
@@ -60,7 +63,7 @@ pkg_postinst() {
 	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
 	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
 	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "If you're doing a new drupal-10 install, you'll have to copy /sites/default/default.services.yml"
 	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
 	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
 	ewarn "reported by the setup."
diff --git a/www-apps/drupal/drupal-7.89.ebuild b/www-apps/drupal/drupal-7.91.ebuild
index f5302a46a2ad..83823c1abd94 100644
--- a/www-apps/drupal/drupal-7.89.ebuild
+++ b/www-apps/drupal/drupal-7.91.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/www-apps/drupal/drupal-9.2.18.ebuild b/www-apps/drupal/drupal-9.4.10.ebuild
index fd1b09540bcc..cfe37862af18 100644
--- a/www-apps/drupal/drupal-9.2.18.ebuild
+++ b/www-apps/drupal/drupal-9.4.10.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit webapp
 
@@ -34,7 +34,7 @@ src_install() {
 		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
 
 	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+	rm ${docs} core/COPYRIGHT.txt core/LICENSE.txt || die
 
 	cp sites/default/{default.settings.php,settings.php} || die
 	insinto "${MY_HTDOCSDIR}"
@@ -60,7 +60,7 @@ pkg_postinst() {
 	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
 	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
 	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "If you're doing a new drupal-9 install, you'll have to copy /sites/default/default.services.yml"
 	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
 	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
 	ewarn "reported by the setup."
diff --git a/www-apps/drupal/drupal-8.9.20.ebuild b/www-apps/drupal/drupal-9.5.2.ebuild
index 65376470ca05..cfe37862af18 100644
--- a/www-apps/drupal/drupal-8.9.20.ebuild
+++ b/www-apps/drupal/drupal-9.5.2.ebuild
@@ -1,7 +1,7 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 inherit webapp
 
@@ -30,11 +30,11 @@ REQUIRED_USE="|| ( mysql postgres sqlite )"
 src_install() {
 	webapp_src_preinst
 
-	local docs="LICENSE.txt README.txt core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
+	local docs="LICENSE.txt README.md core/MAINTAINERS.txt core/INSTALL.txt core/CHANGELOG.txt \
 		core/INSTALL.mysql.txt core/INSTALL.pgsql.txt core/INSTALL.sqlite.txt core/UPDATE.txt "
 
 	dodoc ${docs}
-	rm -f ${docs} core/INSTALL core/COPYRIGHT.txt core/LICENSE.txt || die
+	rm ${docs} core/COPYRIGHT.txt core/LICENSE.txt || die
 
 	cp sites/default/{default.settings.php,settings.php} || die
 	insinto "${MY_HTDOCSDIR}"
@@ -60,7 +60,7 @@ pkg_postinst() {
 	ewarn "If this is a new install, unless you want anyone with network access to your server to be"
 	ewarn "able to run the setup, you'll have to configure your web server to limit access to it."
 	echo
-	ewarn "If you're doing a new drupal-8 install, you'll have to copy /sites/default/default.services.yml"
+	ewarn "If you're doing a new drupal-9 install, you'll have to copy /sites/default/default.services.yml"
 	ewarn "to /sites/default/services.yml and grant it write permissions to your web server."
 	ewarn "Just follow the instructions of the drupal setup and be sure to resolve any permissions issue"
 	ewarn "reported by the setup."
diff --git a/www-apps/gitea/Manifest b/www-apps/gitea/Manifest
index 8f27ddfe0429..af08bd90cad0 100644
--- a/www-apps/gitea/Manifest
+++ b/www-apps/gitea/Manifest
@@ -1 +1,2 @@
 DIST gitea-1.18.3.tar.gz 55493166 BLAKE2B 6a0bb385244c212f577b99b54cd621bf4b9b4f7bdd77bf199e2667fcb5b77638136b2c26b0a46d755d5aea359f0eea251762f759b461377d459092c0017ed972 SHA512 4dabcafad5f4f9804f369cf248b351db68e80f193a4b2a5901f8c13b7cb6051b6b5ef1f283037376e545c3b76aabe703e947d1780ed4a4e630ec68adffa8afff
+DIST gitea-1.18.5.tar.gz 55521804 BLAKE2B fe413fce8bdba68a9ea1a75f66a69c899ca7fca367e9f3e2bbad7f506d3dd2019f634e708ff7079f31c98ccdab5605187dff20118e91675f33e2f28cee547aab SHA512 20b502a11969691e5f331844453aedc5bd1708ff13e0615b7186b00f8fa6fe8de2b2c6ec1af052bfd6f87a07c92e1118e58aacf35f59bde32d587ba400adda8a
diff --git a/www-apps/gitea/gitea-1.18.5.ebuild b/www-apps/gitea/gitea-1.18.5.ebuild
new file mode 100644
index 000000000000..14e3dc8458e3
--- /dev/null
+++ b/www-apps/gitea/gitea-1.18.5.ebuild
@@ -0,0 +1,125 @@
+# Copyright 2016-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit fcaps go-module tmpfiles systemd flag-o-matic
+
+DESCRIPTION="A painless self-hosted Git service"
+HOMEPAGE="https://gitea.io https://github.com/go-gitea/gitea"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/go-gitea/gitea.git"
+else
+	SRC_URI="https://github.com/go-gitea/gitea/releases/download/v${PV}/gitea-src-${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
+fi
+
+S="${WORKDIR}/${PN}-src-${PV}"
+
+LICENSE="Apache-2.0 BSD BSD-2 ISC MIT MPL-2.0"
+SLOT="0"
+IUSE="+acct pam sqlite pie"
+
+DEPEND="
+	acct? (
+		acct-group/git
+		acct-user/git[gitea] )
+	pam? ( sys-libs/pam )"
+RDEPEND="${DEPEND}
+	dev-vcs/git"
+
+DOCS=(
+	custom/conf/app.example.ini CONTRIBUTING.md README.md
+)
+FILECAPS=(
+	-m 711 cap_net_bind_service+ep usr/bin/gitea
+)
+
+RESTRICT="test"
+
+src_prepare() {
+	default
+
+	local sedcmds=(
+		-e "s#^ROOT =#ROOT = ${EPREFIX}/var/lib/gitea/gitea-repositories#"
+		-e "s#^ROOT_PATH =#ROOT_PATH = ${EPREFIX}/var/log/gitea#"
+		-e "s#^APP_DATA_PATH = data#APP_DATA_PATH = ${EPREFIX}/var/lib/gitea/data#"
+		-e "s#^HTTP_ADDR = 0.0.0.0#HTTP_ADDR = 127.0.0.1#"
+		-e "s#^MODE = console#MODE = file#"
+		-e "s#^LEVEL = Trace#LEVEL = Info#"
+		-e "s#^LOG_SQL = true#LOG_SQL = false#"
+		-e "s#^DISABLE_ROUTER_LOG = false#DISABLE_ROUTER_LOG = true#"
+	)
+
+	sed -i "${sedcmds[@]}" custom/conf/app.example.ini || die
+	if use sqlite ; then
+		sed -i -e "s#^DB_TYPE = .*#DB_TYPE = sqlite3#" custom/conf/app.example.ini || die
+	fi
+}
+
+src_configure() {
+	# bug 832756 - PIE build issues
+	filter-flags -fPIE
+	filter-ldflags -fPIE -pie
+}
+
+src_compile() {
+	local gitea_tags=(
+		bindata
+		$(usev pam)
+		$(usex sqlite 'sqlite sqlite_unlock_notify' '')
+	)
+	local gitea_settings=(
+		"-X code.gitea.io/gitea/modules/setting.CustomConf=${EPREFIX}/etc/gitea/app.ini"
+		"-X code.gitea.io/gitea/modules/setting.CustomPath=${EPREFIX}/var/lib/gitea/custom"
+		"-X code.gitea.io/gitea/modules/setting.AppWorkPath=${EPREFIX}/var/lib/gitea"
+	)
+	local makeenv=(
+		DRONE_TAG="${PV}"
+		LDFLAGS="-extldflags \"${LDFLAGS}\" ${gitea_settings[*]}"
+		TAGS="${gitea_tags[*]}"
+	)
+
+	GOFLAGS=""
+	if use pie ; then
+		GOFLAGS+="-buildmode=pie"
+	fi
+
+	env "${makeenv[@]}" emake EXTRA_GOFLAGS="${GOFLAGS}" backend
+}
+
+src_install() {
+	dobin gitea
+
+	einstalldocs
+
+	newconfd "${FILESDIR}/gitea.confd-r1" gitea
+	newinitd "${FILESDIR}/gitea.initd-r3" gitea
+	newtmpfiles - gitea.conf <<-EOF
+		d /run/gitea 0755 git git
+	EOF
+	systemd_newunit "${FILESDIR}"/gitea.service-r3 gitea.service
+
+	insinto /etc/gitea
+	newins custom/conf/app.example.ini app.ini
+	if use acct; then
+		fowners root:git /etc/gitea/{,app.ini}
+		fperms g+w,o-rwx /etc/gitea/{,app.ini}
+
+		diropts -m0750 -o git -g git
+		keepdir /var/lib/gitea /var/lib/gitea/custom /var/lib/gitea/data
+		keepdir /var/log/gitea
+	fi
+}
+
+pkg_postinst() {
+	fcaps_pkg_postinst
+	tmpfiles_process gitea.conf
+
+	ewarn "The default JWT signing algorithm changed in 1.15.0 from HS256 (symmetric) to"
+	ewarn "RS256 (asymmetric). Gitea OAuth2 tokens (and potentially client secrets) will"
+	ewarn "need to be regenerated unless you change your JWT_SIGNING_ALGORITHM back to HS256."
+	ewarn "For other breaking changes, see <https://github.com/go-gitea/gitea/releases/tag/v1.15.0>."
+}
diff --git a/www-apps/wordpress/Manifest b/www-apps/wordpress/Manifest
index 20663f2eed3a..6b157027faa2 100644
--- a/www-apps/wordpress/Manifest
+++ b/www-apps/wordpress/Manifest
@@ -1 +1,2 @@
 DIST wordpress-6.1.1.tar.gz 22751086 BLAKE2B fbbee51219e4237236c39255deb9e31e566c630cfc66f0c4744fec249ae1d07473a6222b7ec5d84079e616d8d2e790521e57809d357ab56582b4a292dbad82f1 SHA512 b50dd9b5e1628a0285d3f0121d6b4cb3617fb696907ef06c935b40d0a46c9853ce12200e011a58675830602aa6d5b6470a98e8cefeec0f7464145bdc344780bb
+DIST wordpress-6.2-RC1.tar.gz 23020112 BLAKE2B fc831b535614d1c9c725a40685a16e0acfc2c86938daecae3cace752f51184216415038d5a755686e087abb177f50fca881345ff120ed4113edc41c503e3d0de SHA512 a821fe458f99fc451c7150bc08b5f7800242a43a2757a3f9d7eccaddec3ffd5edfb8772b1dcb3d27e092c682f0d73c2712a1b366997881baae0d5e3d034597c5
diff --git a/www-apps/wordpress/wordpress-6.2_rc1.ebuild b/www-apps/wordpress/wordpress-6.2_rc1.ebuild
new file mode 100644
index 000000000000..b6c209d75a8c
--- /dev/null
+++ b/www-apps/wordpress/wordpress-6.2_rc1.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit webapp
+
+DESCRIPTION="Wordpress PHP and MySQL based content management system (CMS)"
+HOMEPAGE="https://wordpress.org/"
+SRC_URI="https://wordpress.org/${P/_rc/-RC}.tar.gz"
+S=${WORKDIR}/${PN}
+
+LICENSE="GPL-2+"
+if [[ ${PV} != *_rc* ]]; then
+	KEYWORDS="~amd64 ~arm ~hppa ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+RDEPEND="virtual/httpd-php
+	|| ( dev-lang/php[mysql] dev-lang/php[mysqli] )"
+
+need_httpd_cgi
+
+IUSE="+akismet examples +themes vhosts"
+
+src_install() {
+	webapp_src_preinst
+
+	dodoc readme.html
+	rm readme.html license.txt || die
+
+	if use !akismet ; then
+		rm -R wp-content/plugins/akismet/ || die
+	fi
+	if use !examples ; then
+		rm wp-content/plugins/hello.php || die
+	fi
+	if use !themes ; then
+		rm -R wp-content/themes/*/ || die
+	fi
+
+	[[ -f wp-config.php ]] || cp wp-config-sample.php wp-config.php
+
+	insinto "${MY_HTDOCSDIR}"
+	doins -r .
+
+	webapp_serverowned "${MY_HTDOCSDIR}"/index.php
+	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/menu.php
+	webapp_serverowned "${MY_HTDOCSDIR}"
+	# allows plugins update if allowed within WP
+	webapp_serverowned "${MY_HTDOCSDIR}"/wp-admin/includes/file.php
+
+	webapp_configfile  "${MY_HTDOCSDIR}"/wp-config.php
+
+	webapp_postinst_txt en "${FILESDIR}"/postinstall-en.txt
+	webapp_postupgrade_txt en "${FILESDIR}"/postupgrade-en.txt
+
+	webapp_src_install
+}
diff --git a/www-servers/apache/Manifest b/www-servers/apache/Manifest
index 1b2f1fc5bf18..f72edaf050f2 100644
--- a/www-servers/apache/Manifest
+++ b/www-servers/apache/Manifest
@@ -1,3 +1,4 @@
 DIST gentoo-apache-2.4.46-r6-20210212.tar.bz2 25854 BLAKE2B 001f16c1beac8c90fd407bb2f77417f886296baf02acf0f6d81dc0f10c209270db7005f58d845d309dec8332773556da88db41a57c6ecc86f24b8a5141ba07d0 SHA512 976dde952277542efca70831b67da32b8bf636a346adeeb6e0bc5a65b3543a7ca4fb182bc01204f747b583dd753607d184d91ef46a93d5e2f3ab55ed787860a2
 DIST httpd-2.4.54.tar.bz2 7434530 BLAKE2B be2ba2d33368f9dd619e36e63dd3635fbcf55773a539ac2840251bda04311f3eb535c08a37ab58d8b184c71e75b90b92e2bdc4e59c722cfb146de516f6e1ed04 SHA512 228493b2ff32c4142c6e484d304f2ea12e467498605fe12adce2b61388d8efe7b2e96ae2fd0abd1dc88a5f12d625e007d8da0ae5628cff2a5272806754f41e18
 DIST httpd-2.4.55.tar.bz2 7456187 BLAKE2B 98e9ec41aa3ccbbe533672ba6de8421e1f0cb5a4b4a06d0cf26c676945bcd5ebe66a1fd21d941ad8ff2c9183565ce542a5643730bbee5972934008652924945b SHA512 94982f7a1fedac8961fc17b5a22cf763ac28cb27ee6facab2e6a15b249b927773667493fd3f7354fb13fcb34a6f1afc1bdd5cf4b7be030cba1dfb523e40d43fb
+DIST httpd-2.4.56.tar.bz2 7456418 BLAKE2B f9aaf5038543aeec79d5b8615b1b2120fe321966280574c685070f2356f8f1dba1d55a9a25f46cb5ecdd6e3f03785fe7a4e1b965506896cb889720728aa18101 SHA512 5f12cd9878d822384b1bb163fea4d8edee5e7a0dd8b2389264387971268145cccc6a5a27ddf0436c5f1f631acc5fdc4874da2a47911483e421ca40bf783e0e12
diff --git a/www-servers/apache/apache-2.4.56.ebuild b/www-servers/apache/apache-2.4.56.ebuild
new file mode 100644
index 000000000000..632d6506f31f
--- /dev/null
+++ b/www-servers/apache/apache-2.4.56.ebuild
@@ -0,0 +1,259 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# latest gentoo apache files
+GENTOO_PATCHSTAMP="20210212"
+GENTOO_DEVELOPER="polynomial-c"
+GENTOO_PATCHNAME="gentoo-apache-2.4.46-r6"
+
+# IUSE/USE_EXPAND magic
+IUSE_MPMS_FORK="prefork"
+IUSE_MPMS_THREAD="event worker"
+
+# << obsolete modules:
+# authn_default authz_default mem_cache
+# mem_cache is replaced by cache_disk
+# ?? buggy modules
+# proxy_scgi: startup error: undefined symbol "ap_proxy_release_connection", no fix found
+# >> added modules for reason:
+# compat: compatibility with 2.2 access control
+# authz_host: new module for access control
+# authn_core: functionality provided by authn_alias in previous versions
+# authz_core: new module, provides core authorization capabilities
+# cache_disk: replacement for mem_cache
+# lbmethod_byrequests: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bytraffic: Split off from mod_proxy_balancer in 2.3
+# lbmethod_bybusyness: Split off from mod_proxy_balancer in 2.3
+# lbmethod_heartbeat: Split off from mod_proxy_balancer in 2.3
+# slotmem_shm: Slot-based shared memory provider (for lbmethod_byrequests).
+# socache_shmcb: shared object cache provider. Default config with ssl needs it
+# unixd: fixes startup error: Invalid command 'User'
+IUSE_MODULES="access_compat actions alias asis auth_basic auth_digest auth_form
+authn_anon authn_core authn_dbd authn_dbm authn_file authn_socache authz_core
+authz_dbd authz_dbm authz_groupfile authz_host authz_owner authz_user autoindex
+brotli cache cache_disk cache_socache cern_meta charset_lite cgi cgid dav dav_fs dav_lock
+dbd deflate dir dumpio env expires ext_filter file_cache filter headers http2
+ident imagemap include info lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness
+lbmethod_heartbeat log_config log_forensic logio lua macro md mime mime_magic negotiation
+proxy proxy_ajp proxy_balancer proxy_connect proxy_ftp proxy_hcheck proxy_html proxy_http proxy_scgi
+proxy_http2 proxy_fcgi proxy_uwsgi proxy_wstunnel rewrite ratelimit remoteip reqtimeout
+session session_cookie session_crypto session_dbd setenvif slotmem_shm socache_memcache
+socache_shmcb speling status substitute systemd unique_id userdir usertrack
+unixd version vhost_alias watchdog xml2enc"
+# The following are also in the source as of this version, but are not available
+# for user selection:
+# bucketeer case_filter case_filter_in echo http isapi optional_fn_export
+# optional_fn_import optional_hook_export optional_hook_import
+
+# inter-module dependencies
+# TODO: this may still be incomplete
+MODULE_DEPENDS="
+	auth_form:session
+	brotli:filter
+	dav_fs:dav
+	dav_lock:dav
+	deflate:filter
+	cache_disk:cache
+	ext_filter:filter
+	file_cache:cache
+	lbmethod_byrequests:proxy_balancer
+	lbmethod_byrequests:slotmem_shm
+	lbmethod_bytraffic:proxy_balancer
+	lbmethod_bybusyness:proxy_balancer
+	lbmethod_heartbeat:proxy_balancer
+	log_forensic:log_config
+	logio:log_config
+	cache_disk:cache
+	cache_socache:cache
+	md:watchdog
+	mime_magic:mime
+	proxy_ajp:proxy
+	proxy_balancer:proxy
+	proxy_balancer:slotmem_shm
+	proxy_connect:proxy
+	proxy_ftp:proxy
+	proxy_hcheck:proxy
+	proxy_hcheck:watchdog
+	proxy_html:proxy
+	proxy_html:xml2enc
+	proxy_http:proxy
+	proxy_http2:proxy
+	proxy_scgi:proxy
+	proxy_uwsgi:proxy
+	proxy_fcgi:proxy
+	proxy_wstunnel:proxy
+	session_cookie:session
+	session_dbd:dbd
+	session_dbd:session
+	socache_memcache:cache
+	substitute:filter
+"
+
+# module<->define mappings
+MODULE_DEFINES="
+	auth_digest:AUTH_DIGEST
+	authnz_ldap:AUTHNZ_LDAP
+	cache:CACHE
+	cache_disk:CACHE
+	cache_socache:CACHE
+	dav:DAV
+	dav_fs:DAV
+	dav_lock:DAV
+	file_cache:CACHE
+	http2:HTTP2
+	info:INFO
+	ldap:LDAP
+	lua:LUA
+	md:SSL
+	proxy:PROXY
+	proxy_ajp:PROXY
+	proxy_balancer:PROXY
+	proxy_connect:PROXY
+	proxy_ftp:PROXY
+	proxy_html:PROXY
+	proxy_http:PROXY
+	proxy_hcheck:PROXY
+	proxy_fcgi:PROXY
+	proxy_scgi:PROXY
+	proxy_wstunnel:PROXY
+	socache_shmcb:SSL
+	socache_memcache:CACHE
+	ssl:SSL
+	status:STATUS
+	suexec:SUEXEC
+	systemd:SYSTEMD
+	userdir:USERDIR
+"
+
+# critical modules for the default config
+MODULE_CRITICAL="
+	authn_core
+	authz_core
+	authz_host
+	dir
+	mime
+	unixd
+"
+inherit apache-2 systemd tmpfiles toolchain-funcs
+
+DESCRIPTION="The Apache Web Server"
+HOMEPAGE="https://httpd.apache.org/"
+
+# some helper scripts are Apache-1.1, thus both are here
+LICENSE="Apache-2.0 Apache-1.1"
+SLOT="2"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x64-macos ~sparc64-solaris ~x64-solaris"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-2.4.54-no-which.patch # bug #844868
+	"${FILESDIR}"/${PN}-2.4.54-libtool.patch # bug #858836
+)
+
+pkg_setup() {
+	# dependend critical modules which are not allowed in global scope due
+	# to USE flag conditionals (bug #499260)
+	use ssl && MODULE_CRITICAL+=" socache_shmcb"
+	use doc && MODULE_CRITICAL+=" alias negotiation setenvif"
+	apache-2_pkg_setup
+}
+
+src_configure() {
+	# Brain dead check.
+	tc-is-cross-compiler && export ap_cv_void_ptr_lt_long="no"
+
+	apache-2_src_configure
+}
+
+src_compile() {
+	if tc-is-cross-compiler ; then
+		# This header is the same across targets, so use the build compiler.
+		pushd server >/dev/null
+		emake gen_test_char
+		tc-export_build_env BUILD_CC
+		${BUILD_CC} ${BUILD_CFLAGS} ${BUILD_CPPFLAGS} ${BUILD_LDFLAGS} \
+			gen_test_char.c -o gen_test_char $(apr-1-config --includes) || die
+		popd >/dev/null
+	fi
+
+	default
+}
+
+src_install() {
+	apache-2_src_install
+	local i
+	local apache_tools_prune_list=(
+		/usr/bin/{htdigest,logresolve,htpasswd,htdbm,ab,httxt2dbm}
+		/usr/sbin/{checkgid,fcgistarter,htcacheclean,rotatelogs}
+		/usr/share/man/man1/{logresolve.1,htdbm.1,htdigest.1,htpasswd.1,dbmmanage.1,ab.1}
+		/usr/share/man/man8/{rotatelogs.8,htcacheclean.8}
+	)
+	for i in ${apache_tools_prune_list[@]} ; do
+		rm "${ED}"/${i} || die "Failed to prune apache-tools bits"
+	done
+
+	# install apxs in /usr/bin (bug #502384) and put a symlink into the
+	# old location until all ebuilds and eclasses have been modified to
+	# use the new location.
+	dobin support/apxs
+	use split-usr && dosym ../bin/apxs /usr/sbin/apxs
+
+	# Note: wait for mod_systemd to be included in some forthcoming release,
+	# Then apache2.4.service can be used and systemd support controlled
+	# through --enable-systemd
+	systemd_newunit "${FILESDIR}/apache2.4-hardened.service" "apache2.service"
+	dotmpfiles "${FILESDIR}/apache.conf"
+	#insinto /etc/apache2/modules.d
+	#doins "${FILESDIR}/00_systemd.conf"
+
+	# Install http2 module config
+	insinto /etc/apache2/modules.d
+	doins "${FILESDIR}"/41_mod_http2.conf
+
+	# Fix path to apache libdir
+	sed "s|@LIBDIR@|$(get_libdir)|" -i "${ED}"/usr/sbin/apache2ctl || die
+}
+
+pkg_postinst() {
+	apache-2_pkg_postinst || die "apache-2_pkg_postinst failed"
+
+	tmpfiles_process apache.conf #662544
+
+	# warnings that default config might not work out of the box
+	local mod cmod
+	for mod in ${MODULE_CRITICAL} ; do
+		if ! use "apache2_modules_${mod}"; then
+			echo
+			ewarn "Warning: Critical module not installed!"
+			ewarn "Modules 'authn_core', 'authz_core' and 'unixd'"
+			ewarn "are highly recomended but might not be in the base profile yet."
+			ewarn "Default config for ssl needs module 'socache_shmcb'."
+			ewarn "Enabling the following flags is highly recommended:"
+			for cmod in ${MODULE_CRITICAL} ; do
+				use "apache2_modules_${cmod}" || \
+					ewarn "+ apache2_modules_${cmod}"
+			done
+			echo
+			break
+		fi
+	done
+	# warning for proxy_balancer and missing load balancing scheduler
+	if use apache2_modules_proxy_balancer; then
+		local lbset=
+		for mod in lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat; do
+			if use "apache2_modules_${mod}"; then
+				lbset=1 && break
+			fi
+		done
+		if [[ ! ${lbset} ]] ; then
+			echo
+			ewarn "Info: Missing load balancing scheduler algorithm module"
+			ewarn "(They were split off from proxy_balancer in 2.3)"
+			ewarn "In order to get the ability of load balancing, at least"
+			ewarn "one of these modules has to be present:"
+			ewarn "lbmethod_byrequests lbmethod_bytraffic lbmethod_bybusyness lbmethod_heartbeat"
+			echo
+		fi
+	fi
+}
diff --git a/x11-libs/motif/Manifest b/x11-libs/motif/Manifest
index e466a708bc71..38f1a07f52c3 100644
--- a/x11-libs/motif/Manifest
+++ b/x11-libs/motif/Manifest
@@ -1,3 +1,4 @@
 DIST motif-2.3.8-patches-2.tar.xz 4068 BLAKE2B 5466f824d71edd1d787eebe5b1fa09de5b52ffa20cdf733301722c4f1d7509af8084f226d68dcba14c2e8d15d5b1ea7d49e408eea8f710af3c0b27c86aba444c SHA512 27e10c2a5b3dec8597acb04940bb8e000fc43c325e5b6f578246ab4187ef34264940369bff1e9c999ba967e85e093434e16a447f1d4da805d0a5ab1576e5ef80
 DIST motif-2.3.8-patches-4.tar.xz 4664 BLAKE2B 3f5b6f1f2196f0043586e6f58adb729cfa43756fb54afff3ddb68a6187dddb97def12a6b5bd7596b466783a502a134fea81ac18de9754ad73c5b70eb23e3ef26 SHA512 74310f26bb8c83740b8b5c20029b40d6d095ce58b61a053b751641b763ac7bf544f69be83b5b3c20caee1f247748905d6b781f53b129e24fa6a4d31cabda1b13
+DIST motif-2.3.8-patches-5.tar.xz 6156 BLAKE2B b8d1ac1f2bea3521c97b506ecb480ea92c64708376c1bd9c00b853109568527f82eb8f87bd50d78afe9e15a4c84aab51f32598a12b040f7d67ae0dee422c0366 SHA512 594b39ded4e932789baf906e5e7e3cc402f1940cba147b35ae43aba52f65522ba48a05f3193ed9f8ff5c03fed1b517bfde35b38c189e1e7169745c8b97a5d924
 DIST motif-2.3.8.tar.gz 5704328 BLAKE2B 3755b7f46e50240e1e9e7046aa439fa89872e54ae5d03860383f509b6d0f09edf85bd7d92ea4d37925efd2e44401028aa2752d940c42d9cccb652b2bd1d85459 SHA512 1ab8e8eece25ef97e948592b5fa3e19d98e932695290a18b7a8e90f1aa2766bc4f082bdbc3999dff5660e684821178a149040f76bb477163e53ca06474d02b55
diff --git a/x11-libs/motif/motif-2.3.8-r5.ebuild b/x11-libs/motif/motif-2.3.8-r5.ebuild
new file mode 100644
index 000000000000..3641a9cca437
--- /dev/null
+++ b/x11-libs/motif/motif-2.3.8-r5.ebuild
@@ -0,0 +1,112 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools flag-o-matic toolchain-funcs multilib-minimal
+
+DESCRIPTION="The Motif user interface component toolkit"
+HOMEPAGE="https://sourceforge.net/projects/motif/
+	https://motif.ics.com/"
+SRC_URI="mirror://sourceforge/project/motif/Motif%20${PV}%20Source%20Code/${P}.tar.gz
+	https://dev.gentoo.org/~ulm/distfiles/${P}-patches-5.tar.xz"
+
+LICENSE="LGPL-2.1+ MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~x64-solaris ~x86-solaris"
+IUSE="examples jpeg +motif22-compatibility png static-libs unicode xft"
+
+RDEPEND=">=x11-libs/libX11-1.6.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXext-1.3.2[${MULTILIB_USEDEP}]
+	>=x11-libs/libXmu-1.1.1-r1[${MULTILIB_USEDEP}]
+	>=x11-libs/libXt-1.1.4[${MULTILIB_USEDEP}]
+	jpeg? ( >=media-libs/libjpeg-turbo-1.5.3-r2:0=[${MULTILIB_USEDEP}] )
+	png? ( >=media-libs/libpng-1.6.10:0=[${MULTILIB_USEDEP}] )
+	unicode? ( >=virtual/libiconv-0-r1[${MULTILIB_USEDEP}] )
+	xft? (
+		>=media-libs/fontconfig-2.10.92[${MULTILIB_USEDEP}]
+		>=x11-libs/libXft-2.3.1-r1[${MULTILIB_USEDEP}]
+	)"
+
+DEPEND="${RDEPEND}
+	x11-base/xorg-proto
+	x11-misc/xbitmaps"
+
+BDEPEND="sys-devel/flex
+	dev-util/byacc"
+
+src_prepare() {
+	eapply ../patch
+	eapply_user
+
+	# remove files generated by flex #864533
+	rm tools/wml/{wmllex,wmluiltok}.c || die
+
+	AT_M4DIR=. eautoreconf
+
+	# get around some LANG problems in make (#15119)
+	LANG=C
+
+	# bug #80421
+	filter-flags -ftracer
+
+	# feel free to fix properly if you care
+	append-flags -fno-strict-aliasing
+
+	# for Solaris Xos_r.h :(
+	[[ ${CHOST} == *-solaris2.11 ]] \
+		&& append-cppflags -DNEED_XOS_R_H -DHAVE_READDIR_R_3
+
+	if use !elibc_glibc && use !elibc_musl && use unicode; then
+		# libiconv detection in configure script doesn't always work
+		# http://bugs.motifzone.net/show_bug.cgi?id=1423
+		export LIBS="${LIBS} -liconv"
+	fi
+
+	# "bison -y" causes runtime crashes #355795
+	export YACC=byacc
+
+	# remember the name of the C compiler for the native ABI
+	MY_NATIVE_CC=$(tc-getCC)
+}
+
+multilib_src_configure() {
+	ECONF_SOURCE="${S}" econf \
+		--with-x \
+		--disable-printing \
+		$(use_enable static-libs static) \
+		$(use_enable motif22-compatibility) \
+		$(use_enable unicode utf8) \
+		$(use_enable xft) \
+		$(use_enable jpeg) \
+		$(use_enable png)
+}
+
+multilib_src_compile() {
+	# The wmluiltok build tool is linked with libfl.a, so always
+	# compile it for the native ABI
+	emake -C tools/wml CC="${MY_NATIVE_CC}" LIBS="-lfl" wmluiltok
+	emake
+}
+
+multilib_src_install() {
+	emake DESTDIR="${D}" install
+
+	if multilib_is_native_abi && use examples; then
+		emake -C demos DESTDIR="${D}" install-data
+		dodir /usr/share/doc/${PF}/demos
+		mv "${ED}"/usr/share/Xm/* "${ED}"/usr/share/doc/${PF}/demos || die
+	fi
+}
+
+multilib_src_install_all() {
+	# mwm default configs
+	insinto /usr/share/X11/app-defaults
+	newins "${FILESDIR}"/Mwm.defaults Mwm
+
+	# cleanup
+	rm -rf "${ED}"/usr/share/Xm || die
+	find "${D}" -type f -name "*.la" -delete || die
+
+	dodoc BUGREPORT ChangeLog README RELEASE RELNOTES TODO
+}