gentoo auto-resync : 10:12:2022 - 09:20:14

author: V3n3RiX <venerix@koprulu.sector> 2022-12-10 09:20:14 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-12-10 09:20:14 +0000
commit: c15acf374d4b25ba5afcb52435da6090f2d98a20 (patch)
tree: f3be21d2a949edee4af8b18e1d9ae7501ae5f186
parent: caf79cb4f7c4d5f7cce488d8f50dfb98ddbd09ab (diff)
276 files changed, 2463 insertions, 6477 deletions
diff --git a/Manifest b/Manifest
index d7fa681d761a..c2e65d84f385 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29746 BLAKE2B b33b85c6fa920e5e2ad3abc9c46946d3784090db6acfd993aa474c982bb5906db8ebe13c19be1a5e85c0e8e81e0a3a45c92dd5b35b0b8aa892b80d6462677c2e SHA512 e75540a1a0e8d67463a76409355066c408934a6301d8831185636a992d2009e4c50a03787bc6b0b6ca2d32244c5b24003767ab57dc1d5359839e5ca5b4655673
-TIMESTAMP 2022-12-10T02:40:01Z
+MANIFEST Manifest.files.gz 29757 BLAKE2B 6b54d5880350a179897933a797b2e6a9fe410445bf1450cc466e2b7266af12b1a73e65b78f7955c193d8d6d0389596b7d5656d7626b22154ce043f6ad1d33c27 SHA512 b3e52ec7da2776e4745653a5b10bac9326344cef8785a18622d9a891a46f00757af5a781d68458407767594b9dc617a8f332d33da838a54703b7b2d3426df354
+TIMESTAMP 2022-12-10T08:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOT8YFfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOURdlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAUrg/9GNonhIii2gGcKcbBE7Ym0m7NdqzvAQ04Ql2qdjwPA6mi1M6z1BQxI8jr
-BNft54/+c66TalCorqXKuEwWqMuJrsvzvsoDhpqqOyndHG+x5TUM5prq4sNGQm7U
-CdXeDciHUE6nUYIo8oqfRKPRwbyS/v5GInUqnxNp7fojbY1yBzIfLx4Zl7Aqy6Cj
-18MrgPD02D7cxvJ0j1O6y5YswUZqlMPdrTr4EZeHjwgS8HmOQ7tv/ZqiTyAQIdqn
-jD/C9BI3HGkEhhrVqZI2ER9RQizdc0KByMiRZUJra6lwK+5kGL1QuL2QsjlqQFi6
-N/1+qzlr0dz81s7U6y35aYytgR4MHxO/H9fa6F68++tXzH5X6uJOT4zkK/ztk48K
-2wyzYLFspfdpS8KCJCR5WKaw8uJseUpy22+NKIl67Vn+qa2vT7eSstmTBgiPSa9/
-chQldp75gBGjEwyhvkkD7pVlc6pPFknZE2lM1hvf+2DbWrWkpy7jThlW/ExBWuER
-tficQds0Z2xc759J+rPzk0ikE2Wt3fpwlphLxNUpLgbBUMVqFdEqE6MHY3YhSIGY
-o1OZFEbEksGI059SI2BfU2OKBP6GqPAQ84q4r2jxVFibS4Up1NTTMsk2xWnRZaiA
-fYYxk7kxT5Mmsx9ge2i6IiT9sGzBP2ZxQFiUr7wnhMlkrMmFvh8=
-=Cd76
+klBrww//V8mkBik7l0WU9WrJ9paPDU28ll8Zo17uWfnCl8Gr08hZ7imiKOXfKckN
+7mYiQbRsUtMtlWw0TETK/Fds/ky7pqviibSenv4Gz48EIB/N+e6M9AAcWtIuSOAB
+dbHMKXeRksV6ePjQJy3xKA6UVl5QTkYUYNWf38iLf0pBq3O4lvW+ZvnCPX35dkWf
+rXPBjV93jsop4lyRw5OQl9G0OQsosRv9X6wCLrjIDAybPZE9RlKJrXyDWtuiPH5j
+zmv+8Do/CmAeZGYDDNa6SU0YXPtJkLxOV5xfXoJkVw2VreoPosT4pPJHgRa1/gjY
+r+SzJYQb+OmOBPIsP3p2YVUmREUxmcXZT4BCPKJ6idEQKEF+zTy6LXtTVtx33IQb
+JG0AMPgR/JV1sUnK2buUhOENT47cgbSsgsdGzBj2QoWUUfQhw0zpxCYdNyfmxoMB
+Uxrz6ZrBAs6IyNplO3qoBdhxpsV9VrcpddKqwyKdIDgicM1LLKGryz6KvJSCeOJK
+6pIMEj/RoyTFa64DJmw0+2pfn8ekpuyUtcxpPKgQKns0WeKRECI3SDoN/IeZ+lsZ
+A2cjWXHLRpOI96N2dTRI5oA9LdndYwcuklkIEHdQfZRddzsHub3yGOomFqQ8ZCos
+rarMqtOSIFlF21WCAWXNCrsDx0DFF++SVpKZl+qDXCup3Y2uV8k=
+=G0xq
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index e17eee1ef6c4..f05694c3f5c1 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-accessibility/Manifest.gz b/app-accessibility/Manifest.gz
index 34415290fd12..54ba8ab27bf4 100644
--- a/app-accessibility/Manifest.gz
+++ b/app-accessibility/Manifest.gz
diff --git a/app-accessibility/speech-dispatcher/Manifest b/app-accessibility/speech-dispatcher/Manifest
index 31e34185017a..542e93c33f13 100644
--- a/app-accessibility/speech-dispatcher/Manifest
+++ b/app-accessibility/speech-dispatcher/Manifest
@@ -1,11 +1,8 @@
 AUX speech-dispatcher-0.11.1-include-pthread_h.patch 367 BLAKE2B 54e4cb3556f066c7291c6c601a0a9cf13c75dc14bfc2ef493d5fd6e38226d10b119612ed57ea4a44d65819653e76a2e74e54e286214f3fd353b8149c00de1ed2 SHA512 d7afc36cd26052576e0fb3af44ba438b5184d32b1d80c98409e227cc86858dfcfcb9287cf44f986042e2733004f30d30a9431e00653779e312543cf43e108537
 AUX speech-dispatcher-0.11.3-fix-dlopen.patch 2518 BLAKE2B 99490232eb3ea43451caf942ff605ca4f94a3917c525a4a67fd21183a0e7c8a99a2bc883c5a22c47ad3c3712a5560278105a5f35439c8d18215b8d5cf8d4e6af SHA512 2b6970624c3f7f88e80266760bc801c0b895c0e5730767ac66adf0cbc147fdd2ad2eaae7662e4939938555e30e0de57a6caa0e783dafaeeee1d04d10126fe2cc
 AUX speech-dispatcher-0.11.4-GNU_SOURCE.patch 3680 BLAKE2B 671b55d0418b92d299427fd2d457e3279f1ae9d97548dd1ff89b52a2487cd700c134e7bb042ae6b621883933d1b3c96765f6fc2ed040c0de4c7d97f017ad965f SHA512 d07edc73370fdb8d9c71f8cc9c9db15da8fe3b7d83ca42bd05a09fc4795899786e54436d7dbc8407ab08eb0384997126322352ed9d4c4250d41a11d0d68dd4b4
-DIST speech-dispatcher-0.11.2.tar.gz 7147526 BLAKE2B 6b11949736275d900e5e1d3909fab51fc04fbb45baf470a4c98aed19f61b7adb8cedf6b11f1a1aa69d9625383627beab4122c74ec78d9c07a5d0ddf4646669d6 SHA512 038ecaa5b9d56e3f915ec49fe7768cb4eebe1c8be79b95635f09fb3f6067e4c0ade13d2dd355e0b326579dcdf509dd180889b27282410b6bb252a2f642f028d4
 DIST speech-dispatcher-0.11.3.tar.gz 7150632 BLAKE2B 92bad589e453a243362a9e0142d2897b9651fa648012f2bd7ef00bc1ded389fd2c01b6f38f19002289357f7aa6361a6e7fa3ee35ec2ad7c044f34d87e7f2c409 SHA512 e9f5b862066c0292230fda32f16782f9a2d66e8d0c0e3aa0ccdb4628c1182661d2f40894f480ae5206af7fbbc49338189312afe02092f5d472095b053afd75c7
 DIST speech-dispatcher-0.11.4.tar.gz 7127323 BLAKE2B 651a20ec403c6158756ab6ff7fbedb38ce1cec413be49367128274c8d20ccc7080a2dccd68cb7ebbec6bab05599f06a4aafc561e4e5e53cf52d19fa1b94fa286 SHA512 d0ebe832e2586abdb1284be36f8427cfbbd94f1a2dead1b74526b151e9529f9e61679339274b73afab5f829d184337372ba0aad93d880c42d2a6a1bcb2b7afef
-EBUILD speech-dispatcher-0.11.2.ebuild 2868 BLAKE2B 343ddf0cbd7f970e93175e60385aa3869ab173ac51db10ee3f12b38dce0c68724e36b3da03682fe6b850b07a996e2f10d3921eba73c10d8b50bf3954869f7c23 SHA512 42539976ba09a7dfc6853201a23ca60bc6abb0e957bf1e69bd10b14f674c8724aa092ec487fbe5eb5551fa4336adf113a5b62b8445f55f3ad138ffb23867a162
 EBUILD speech-dispatcher-0.11.3-r1.ebuild 2905 BLAKE2B f122ead63396f070a9cdbbf8d9fb7eaa225c09a0317ea06352261cdffa276551634bfc0310fe2561b71b4c5cb5584160785747ae372ecda4c5556bb28c091e0d SHA512 5e126acdd39699e1630759fd9e191798bd9c5b4e734db8e0cd01fc1f8aac39cc037010b6f639939cf7b0753223ab1c41d937da1c49b7bc86a63ee19677a62509
-EBUILD speech-dispatcher-0.11.3.ebuild 2875 BLAKE2B 7e43633fa593175d1bf889e1f11004c5d95973a0eaa25b9005dc7abc116e9cf393d2a708b92849a2d1581c3d5adf5da4cad711d2cefc7e53e91129a3095dab06 SHA512 e0180013b2599505b0bbcae9dc4dfaf1621af0b699bae5c88f81f7b550791371139113cef98ffcbc3de4a7bd689bf068c5e1e300ddc96cbd00b4dd28ca99a91c
-EBUILD speech-dispatcher-0.11.4.ebuild 2970 BLAKE2B 053b7a75196d8142e79d2271628d68b3b06cad231cc563cbd90c74fa7ff18dc73eb6dbc9de95640ebbffbd0bee55c631ab9c9c17d5ab4ef5b353d5405f6d9c3f SHA512 0ef225e30c1b231e84eee07b64fe7ca02fc7735dfd7687c46dd8ff6d2f467a1654242172b5cd03b23c25701ed92b60241bf7f6553a25056dc7103899e029bbb6
+EBUILD speech-dispatcher-0.11.4.ebuild 2965 BLAKE2B 4bd6da1676799ebf7f665f71e0a73160a466556b750cef8623c8a9802bba577a8052b07b0f11b0a9e98ec2236fdefffc99ab8e83dbc95b642fcb909315a2252b SHA512 bb08b4c8118a3da234fcbf8b4846da43a4910be8fbaa51d76b7309d0bd8ede53361e09e7d60714ee73145b1e17d61beb17ae522dfa6b6fa82bc4f3fb50064e4c
 MISC metadata.xml 793 BLAKE2B bbb768aefee6e8685fc109b1c03a1b33436cbda492ac2d0657983cd5dbcefdeb7f70ea1022047a44548d9db380e499ea572f9a005d5ff7312bff3cdb377d5e77 SHA512 2f122e8cad49728e27539d6e39114cba61a178ec1944d386d63a34e9c203f0d4360257226251ce21b5acad626d802af597cef5db726017f8b4600c484a13c401
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.2.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.2.ebuild
deleted file mode 100644
index e2948724ba0f..000000000000
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.2.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit python-r1 systemd
-
-DESCRIPTION="Speech synthesis interface"
-HOMEPAGE="https://freebsoft.org/speechd"
-SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86"
-IUSE="alsa ao espeak +espeak-ng flite nas pulseaudio python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="python? ( ${PYTHON_DEPS} )
-	>=dev-libs/dotconf-1.3
-	>=dev-libs/glib-2.36:2
-	>=media-libs/libsndfile-1.0.2
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	espeak? ( app-accessibility/espeak )
-	espeak-ng? ( app-accessibility/espeak-ng )
-	flite? ( app-accessibility/flite )
-	nas? ( media-libs/nas )
-	pulseaudio? ( media-sound/pulseaudio )"
-RDEPEND="${DEPEND}
-	python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )"
-BDEPEND="
-	sys-apps/help2man
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.11.1-include-pthread_h.patch
-)
-
-src_configure() {
-	# bug 573732
-	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-
-	local myeconfargs=(
-		--disable-ltdl
-		--disable-python
-		--disable-static
-		--with-baratinoo=no
-		--with-ibmtts=no
-		--with-kali=no
-		--with-pico=no
-		--with-voxin=no
-		$(use_with alsa)
-		$(use_with ao libao)
-		$(use_with espeak)
-		$(use_with espeak-ng)
-		$(use_with flite)
-		$(use_with nas)
-		$(use_with pulseaudio pulse)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	use python && python_copy_sources
-
-	emake
-
-	if use python; then
-		building() {
-			cd src/api/python || die
-			emake \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)"
-		}
-		python_foreach_impl run_in_build_dir building
-	fi
-}
-
-src_install() {
-	default
-
-	if use python; then
-		installation() {
-			cd src/api/python || die
-			emake \
-				DESTDIR="${D}" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)" \
-				install
-		}
-		python_foreach_impl run_in_build_dir installation
-		python_replicate_script "${ED}"/usr/bin/spd-conf
-		python_foreach_impl python_optimize
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	local editconfig="n"
-	if ! use espeak-ng; then
-		ewarn "You have disabled espeak-ng, which is speech-dispatcher's"
-		ewarn "default speech synthesizer."
-		ewarn
-		editconfig="y"
-	fi
-	if ! use pulseaudio; then
-		ewarn "You have disabled pulseaudio support."
-		ewarn "pulseaudio is speech-dispatcher's default audio subsystem."
-		ewarn
-		editconfig="y"
-	fi
-	if [[ "${editconfig}" == "y" ]]; then
-		ewarn "You must edit ${EROOT}/etc/speech-dispatcher/speechd.conf"
-		ewarn "and make sure the settings there match your system."
-		ewarn
-	fi
-}
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3.ebuild
deleted file mode 100644
index c55d7ced1ded..000000000000
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.3.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-inherit python-r1 systemd
-
-DESCRIPTION="Speech synthesis interface"
-HOMEPAGE="https://freebsoft.org/speechd"
-SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
-IUSE="alsa ao espeak +espeak-ng flite nas pulseaudio python"
-
-REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
-
-DEPEND="python? ( ${PYTHON_DEPS} )
-	>=dev-libs/dotconf-1.3
-	>=dev-libs/glib-2.36:2
-	>=media-libs/libsndfile-1.0.2
-	alsa? ( media-libs/alsa-lib )
-	ao? ( media-libs/libao )
-	espeak? ( app-accessibility/espeak )
-	espeak-ng? ( app-accessibility/espeak-ng )
-	flite? ( app-accessibility/flite )
-	nas? ( media-libs/nas )
-	pulseaudio? ( media-sound/pulseaudio )"
-RDEPEND="${DEPEND}
-	python? ( dev-python/pyxdg[${PYTHON_USEDEP}] )"
-BDEPEND="
-	sys-apps/help2man
-	>=sys-devel/gettext-0.19.8
-	virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.11.1-include-pthread_h.patch
-)
-
-src_configure() {
-	# bug 573732
-	export GIT_CEILING_DIRECTORIES="${WORKDIR}"
-
-	local myeconfargs=(
-		--disable-ltdl
-		--disable-python
-		--disable-static
-		--with-baratinoo=no
-		--with-ibmtts=no
-		--with-kali=no
-		--with-pico=no
-		--with-voxin=no
-		$(use_with alsa)
-		$(use_with ao libao)
-		$(use_with espeak)
-		$(use_with espeak-ng)
-		$(use_with flite)
-		$(use_with nas)
-		$(use_with pulseaudio pulse)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-	)
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	use python && python_copy_sources
-
-	emake
-
-	if use python; then
-		building() {
-			cd src/api/python || die
-			emake \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)"
-		}
-		python_foreach_impl run_in_build_dir building
-	fi
-}
-
-src_install() {
-	default
-
-	if use python; then
-		installation() {
-			cd src/api/python || die
-			emake \
-				DESTDIR="${D}" \
-				pyexecdir="$(python_get_sitedir)" \
-				pythondir="$(python_get_sitedir)" \
-				install
-		}
-		python_foreach_impl run_in_build_dir installation
-		python_replicate_script "${ED}"/usr/bin/spd-conf
-		python_foreach_impl python_optimize
-	fi
-
-	find "${D}" -name '*.la' -type f -delete || die
-}
-
-pkg_postinst() {
-	local editconfig="n"
-	if ! use espeak-ng; then
-		ewarn "You have disabled espeak-ng, which is speech-dispatcher's"
-		ewarn "default speech synthesizer."
-		ewarn
-		editconfig="y"
-	fi
-	if ! use pulseaudio; then
-		ewarn "You have disabled pulseaudio support."
-		ewarn "pulseaudio is speech-dispatcher's default audio subsystem."
-		ewarn
-		editconfig="y"
-	fi
-	if [[ "${editconfig}" == "y" ]]; then
-		ewarn "You must edit ${EROOT}/etc/speech-dispatcher/speechd.conf"
-		ewarn "and make sure the settings there match your system."
-		ewarn
-	fi
-}
diff --git a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild
index aa87c946a7c6..357e08fe06bd 100644
--- a/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild
+++ b/app-accessibility/speech-dispatcher/speech-dispatcher-0.11.4.ebuild
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/brailcom/speechd/releases/download/${PV}/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86"
 IUSE="alsa ao espeak +espeak-ng flite nas pulseaudio python"
 
 REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index 7243dca80551..ca596c415336 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/awscli/Manifest b/app-admin/awscli/Manifest
index c33dafb63ddb..54666b7a7247 100644
--- a/app-admin/awscli/Manifest
+++ b/app-admin/awscli/Manifest
@@ -8,6 +8,7 @@ DIST aws-cli-1.27.23.gh.tar.gz 2318518 BLAKE2B eb04dd0f7b1ea803246c00c4dede6662a
 DIST aws-cli-1.27.24.gh.tar.gz 2319169 BLAKE2B 6677fc6d09298fc37d5aae5e9b4addc87ec873f765b59b55759c0e1dd0c65ab49234c8a8f8f979be4f4cd1361033e8e142568136e5024408dc5c839f34480274 SHA512 29d8956b665531ee3d5451fbb063f7393978f223e379fed0a61304cb6798241325191bd5ea9f76531c7009b8b0e32c849a0c4a445508751518ce33631ce6a9cd
 DIST aws-cli-1.27.25.gh.tar.gz 2319262 BLAKE2B 1207b7879a82c538be9d1ee3dc8a69f20c6334afdd8d35c63ca3d44f264316680aa4d7d01b19a216ca2693748977b83851a2b75f1fd55b85989f2749ab05e827 SHA512 e46f684b219d0bce61ffae0737b2c485a4fb359b7e3ad3ef6180d5378daa49bb049033073594c63f44150266041b4a78634aced1a34fc98f08f0ca8e371558e2
 DIST aws-cli-1.27.26.gh.tar.gz 2319897 BLAKE2B 65307b3c63656b751ad3d96ca6ffdb2e9778cdb11cb35c730dc22dad83ee4b0e1cb37afc4d1de7b2c1cbbabd4622610fc2385e7dbc21cfa2c9833a36d693b1ff SHA512 508f8ae1abe037786c3ee35204f4c84fb06bb7bb8471d75217bf914cf7c9aea897cbecb364554f8b39c75001769c894ede7a1b06dd761187aff468f19001708f
+DIST aws-cli-1.27.27.gh.tar.gz 2320454 BLAKE2B 5ac7c2b872d23173dd3c1d0c586389b558c43de4bd0c1e0e5e45fee574d3d952aafb5591165fdd9eb2d14435df1342b27526dbd7ec1b7d63c1291e2d4d14bf80 SHA512 f5b9cf61b5045775142ae9868b3fd3193d82b09c4b0d52f05dadd173cc8dbc97699a2df458b17a97a5bc4743e14252fd9e7b6583fc9e49d8f26b96eb2c5d5d08
 DIST aws-cli-1.27.8.gh.tar.gz 2301766 BLAKE2B 1873d92b8d2f6d3f29a65b4177927a1a14034da71dbc95ff6abf3f49df6cf3ee192412eeea15be14c8cf9fca0a5603f2c76b80b280f4feb95e661055abcd8b60 SHA512 e53828cac1b3e10e2ddd45312d71cdb748216dbc37c3e9833e7a1320b236c3bef6a13204a38b946d9182430f169fca1ddc77d3d06c1c2c6e05978dc61f675168
 EBUILD awscli-1.27.11.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 EBUILD awscli-1.27.16.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
@@ -19,5 +20,6 @@ EBUILD awscli-1.27.23.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3
 EBUILD awscli-1.27.24.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 EBUILD awscli-1.27.25.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 EBUILD awscli-1.27.26.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
+EBUILD awscli-1.27.27.ebuild 2261 BLAKE2B 8db2f30612572dabd673c4b33fb8fcf3005bc3aa7762c3abbbf12ffe50bb51f9b46a043d4b849682bfb585e0638b9f8a0849b241807516b442e013085bf2f1ad SHA512 03816a71b8cf31f9bd659cace763b9143a8700290f3cee354ead69fa3333f6faa47a9769db433bbf17f5cd7a76f27bfd1a4df8bdfbdb5bd393eb4e69e7ee882a
 EBUILD awscli-1.27.8.ebuild 2259 BLAKE2B 64d00480a8171f321e7feb58458293b942f7eb6d97b2bdc63f0ed7327d04e56ae15a274df4ce5a49199db2451f336e2ae2e49d20d5b9f57c26a347bc42ba9639 SHA512 cc067d10df0d454b0f7f184d336d98f39ee65dfc847289984f1158c679869852e4820736afc856cbbba1ffa128627778b3c1248897bdde9b799631b5cd24a6d8
 MISC metadata.xml 385 BLAKE2B 5accfb180a91179cc6df539d42d1de06be3ebfec73f3edb719f5d59576103b9a8cb0c7c524c1042630e0cf99f068939a19f04c7b1b4a2acf9e072369df80d913 SHA512 ccb3d516326c5dbdf53068372ce25baecc137d21a04516374362212b969cc928dacbf743b4953da33f28482905798f069d09d19c88d9913f2b32648db25115ab
diff --git a/app-admin/awscli/awscli-1.27.27.ebuild b/app-admin/awscli/awscli-1.27.27.ebuild
new file mode 100644
index 000000000000..9bcb01ac11e2
--- /dev/null
+++ b/app-admin/awscli/awscli-1.27.27.ebuild
@@ -0,0 +1,80 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{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 ~arm64 ~riscv ~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-arch/Manifest.gz b/app-arch/Manifest.gz
index f690082d2fd3..b9d8c90ebf94 100644
--- a/app-arch/Manifest.gz
+++ b/app-arch/Manifest.gz
diff --git a/app-arch/pxz/Manifest b/app-arch/pxz/Manifest
index 1e25e8a84ba6..a6107855f9e7 100644
--- a/app-arch/pxz/Manifest
+++ b/app-arch/pxz/Manifest
@@ -1,6 +1,6 @@
 DIST pxz-5.0_pre20151029.tar.gz 12271 BLAKE2B 6ba2cb7629b0475761b59620375a2d0de7c6a3a61f7af20140e214383f737e046c45f0c602830c0331794fe1d38332d8d309ed0b8451e3a780ef1a2835de85e6 SHA512 d26bfdf9b70baf91c575e21824920cb42d0a9bd171254b99147a6e5e322ed3d1f7351a570358213431bdacdcbe6e7b22646a2dd2d7a127e167c8237bc4f3038a
 DIST pxz-5.0_pre20220509.tar.gz 12375 BLAKE2B 5d954d4cd1b139dc94a9ecc5aa99c19a1484812eb62fce089b8f33bfc0ce3ed3ad8053cdc58843c429a365439cd13b3a4b14ebc34de7f2a99deae7cd995cd4e6 SHA512 b1de877d2b8ee9ea5190af4c1a0dc97f7777c35a084137db6d86e23de99b332ea361a82ed995ac2ea12b7bf0670ae92a822235be3b19a1145b6cf5604074f960
 EBUILD pxz-5.0_pre20151029-r1.ebuild 954 BLAKE2B f830dab90a2ce0a18b3fc7b1af707b0d944505bd11da195b2f6114dc804c7687942647ad285f63484c223ebb89a2ea2e26646c3c7d7c8ed6ef68ea83b66773e5 SHA512 41b4fd0e84164bc59b654cbe090d2166ac38ec885cf0b8f8e07ede110d23520f907ece6bc98a1a9deba6b40d17815f66b2837210392b3a7c56c1734f3893d7a6
-EBUILD pxz-5.0_pre20220509.ebuild 983 BLAKE2B 6fe668306af9fd67e552b19f4d822342802095f949213a337d19d1a8060036afb16218a75439c05d52862ee18e9181e2ec4fb9f902dc0e40b71de5d2390628a1 SHA512 89b141c3648962243be2ae3a0d22b7eedc165d388d946f0a8866de50b13002c86e394e9b97539caa1bc38b822689233fd590cb3dfa3d951954319247d038753c
+EBUILD pxz-5.0_pre20220509.ebuild 981 BLAKE2B c26364f09afd4d6dfe9a9e2394353a127804cb75a2230819c5eda46690ac1790ff26bd042e1e0ce8ccb530cc8bbfac945fb364dc708d275d2b5b2b6e464c3015 SHA512 8e64fab91e2d8769347de0c7c3e8d6d7476086898be7e910d332f7a42c7ff57f791185da8839ce3659b5d6f3cb493ebe347a574e19b04d69c2e49a14b0cf62e4
 EBUILD pxz-9999.ebuild 1121 BLAKE2B bcfbf07cee491d39415249a3bbc71a2f6b6916bdfd770f35e6f6b97ae5615f11972590322873a51d94990b7d7c4f7a3f1f2f20b0a77b92989189fc5a481e9800 SHA512 c56047b53c3ff5dfc60ed6145e7094feaedb9ec2b33922a034b3282216c9d9cb80b4ae4b5339a88324c87e76143f2dfbab7d8497bc3eb26f030d9e473bc74b7c
 MISC metadata.xml 677 BLAKE2B 970357f7a9fbc5bbfefe6d2a8d8c72a27d3d62f37987a578811f056df9452efb7417c8a3cdd446f54ea0ffd1f12c4217a6ea8c8df9e699e88975c2e2b1afa183 SHA512 35091887bb484b965b915e280a4233f20fca36b19e893a1cc8eeae983f92a7afaf6ad67df87cf337083611e7805db6f80dcf184cab79ce4f0c2d877f28b01d6d
diff --git a/app-arch/pxz/pxz-5.0_pre20220509.ebuild b/app-arch/pxz/pxz-5.0_pre20220509.ebuild
index 72381a102246..0c834cf15ee1 100644
--- a/app-arch/pxz/pxz-5.0_pre20220509.ebuild
+++ b/app-arch/pxz/pxz-5.0_pre20220509.ebuild
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/jnovy/pxz/archive/${PXZ_COMMIT}.tar.gz -> ${P}.tar.g
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux"
+KEYWORDS="amd64 ~arm64 ~ppc64 x86 ~amd64-linux"
 
 # needs the library from xz-utils
 RDEPEND="app-arch/xz-utils"
diff --git a/app-arch/xz-utils/Manifest b/app-arch/xz-utils/Manifest
index 0da662a08540..5ac8d8de97dd 100644
--- a/app-arch/xz-utils/Manifest
+++ b/app-arch/xz-utils/Manifest
@@ -5,7 +5,7 @@ DIST xz-5.2.9.tar.gz.sig 566 BLAKE2B 0f5807e2c963aaba2a65495cbe49c80047f022c0ac0
 DIST xz-5.3.5beta.tar.gz 2244769 BLAKE2B e8037838e26f75f03070a27806b8ae3e25ae1d65f199e323148c02864fcd5d820a3a89b18b264cab6e4a03885211adddaa5221ab42150554cff262dbd2bde2c8 SHA512 fb3890100b8390162a87f2b415bd78e8e434e5417853fa76c71f40eee98c1f7a27eaa8486ecff19751abbe3761cb7ee5e9333b63eafe1c66d6265143a8404efb
 DIST xz-5.3.5beta.tar.gz.sig 566 BLAKE2B 151067af9bb21ab763c5ab8e299b623b9f18267280cb8fa653703691b98c19cec457b68a9987d5df931bf5fbc190c021d0bbd30840422e0c2b2d5876a5bb1812 SHA512 723457b736f6cb27c9a15234dd17dd290b4734007eed63afe6befe412219dd7cf304601ef2a328087f77a51212ab9560202fc04cf880e4c1ce84884210c78dc6
 EBUILD xz-utils-5.2.8.ebuild 2894 BLAKE2B 3516bd558ae5bd8bb752854c96264c70764e47b6bcaf185826edb5c18199e67589c0ab3b8c866f5858a6aff902375a69fcfefc198305555a482730db5cacc256 SHA512 e3a8d3305f17d3a183ebf8c111b3631cbdb4fedca6e19d7a47c09371c66cf329b5d390722709d840134b2343e83b427d79baceffd8d97c6ad05a990d337165e2
-EBUILD xz-utils-5.2.9.ebuild 2902 BLAKE2B fc55880ac3c615c40892836a6cba4acc06d49a93b01601e767a16da2adac05c999c0f45ebd9bd1fdaf99e9fe69d3d80ade1517d162b2ef1c0aa2a37610b8b799 SHA512 417a0c5c210bd81bdaad27b7cde0af687e72d83237c33361e5a407d91bb0a2efad950b79b1a00ec0552d052ea675db39159099b286665ec77dace598639b2bd9
+EBUILD xz-utils-5.2.9.ebuild 2895 BLAKE2B fbd23a67481b5e1dcaaf37573b6f30a96f2eda38b7be6eacb7a11e2c47f45b50e639cb4333d070a36430474406a18e16647fdd926f88827f6438f04695befe6f SHA512 0b5e727ce4e0c677db94d3b171afe74189d5a11455d504292c66c3177b3a3f08c271a776f139d9797822960c29a516ed65b17d6c65fedbd03ea4659bd235659f
 EBUILD xz-utils-5.3.5_beta.ebuild 2808 BLAKE2B 8eda4404458536807ee3f60f4c3d6147ef95ec5e8fb8ed2db89ef923df1988c1402ebb928ed2190bbf9a4622b632e46707abffb6cfcff4fff16b4e0cfc53afa4 SHA512 d95c98d55fcc06ab7f9de9dbbe6d80f7ffac41596d0820e442784ef11c964f62d8ed6feea81d3af2fd5d917605384f4a8befdeff3dfe0d249d83fad0fb1f2c10
 EBUILD xz-utils-9999.ebuild 2808 BLAKE2B 8eda4404458536807ee3f60f4c3d6147ef95ec5e8fb8ed2db89ef923df1988c1402ebb928ed2190bbf9a4622b632e46707abffb6cfcff4fff16b4e0cfc53afa4 SHA512 d95c98d55fcc06ab7f9de9dbbe6d80f7ffac41596d0820e442784ef11c964f62d8ed6feea81d3af2fd5d917605384f4a8befdeff3dfe0d249d83fad0fb1f2c10
 MISC metadata.xml 605 BLAKE2B 8e98c2e0b5fbf084de29042ebc760572443480fc259719f4f841c8138b976dfd9c7a0157d085a91868275ebcb689064ed91742dc041ef56d7122d9fdcea98329 SHA512 3a3bdc89d0228ff462312bbe9db8666c4936e64aad7f36e71daff9f24e727a3f71b9f045c7dd5a9073ac5f6fa5a21046d0f6283e24d42fee705297f7a795196e
diff --git a/app-arch/xz-utils/xz-utils-5.2.9.ebuild b/app-arch/xz-utils/xz-utils-5.2.9.ebuild
index 92b43d373c4c..047765ed1ee5 100644
--- a/app-arch/xz-utils/xz-utils-5.2.9.ebuild
+++ b/app-arch/xz-utils/xz-utils-5.2.9.ebuild
@@ -28,7 +28,7 @@ else
 	"
 
 	if [[ ${PV} != *_alpha* && ${PV} != *_beta* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+		KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 	fi
 
 	S="${WORKDIR}/${MY_P}"
diff --git a/app-emacs/Manifest.gz b/app-emacs/Manifest.gz
index eb5878878259..2432880ef1a1 100644
--- a/app-emacs/Manifest.gz
+++ b/app-emacs/Manifest.gz
diff --git a/app-emacs/org-modern/Manifest b/app-emacs/org-modern/Manifest
new file mode 100644
index 000000000000..930e3d7645be
--- /dev/null
+++ b/app-emacs/org-modern/Manifest
@@ -0,0 +1,4 @@
+AUX 50org-modern-gentoo.el 268 BLAKE2B 1c60242a6d203e31583ee774e87f200637b1ca71540b65cae68ea0f9255f5eaa4655345bbf21a3e992a087c7dc5abff49a039dc6d36cec59d1a7d8d973da518c SHA512 0b0fac73188c85d3447e34730fab7431eeeeba56f623e38858aae7a73aeae3160b1c272ee9565899375319194b7817578351ad578bc9123b903c8f169ebcec9b
+DIST org-modern-0.6.tar.gz 23023 BLAKE2B caddb13de8bb5de6d042535ea092d4f681e444cc99095baa2394545d7e78c55860b8aa0581e49c1f95321e4bf42cfa3e898e57f85db0726361173aded80ff162 SHA512 46fd0b37b199916383ec831cb98bcf0c0ab8f3cd2cbb2f93884cbf1919c774d666fc1e83213a51849fa5ddfa5b15917c6f4541af94768cee8bfc787dd30bf5fc
+EBUILD org-modern-0.6.ebuild 424 BLAKE2B 62c9e784e15e65b65b300aae0ba719b167e1b59579df30eca6fc4c0b9eaefc4b4ed339806240e459c308c1ffb5da8bc9439374e1426b3042c5407d417cad8cbc SHA512 3c7909b75cc544928f1ac019d88362bf00c154c410bbdab887f57aebc5780c3ade8cd2dfe545a2852ca4a614801efca62cdf06650bbba458928188abc515b400
+MISC metadata.xml 803 BLAKE2B 76b689a9bee8d6d86128fb80844c575294e9e91812161e735c47eb4fc7c9192539f2109ebbcbdc143abee07426faf6b7cf0bc86c48d411738a8329b14c7b56a1 SHA512 cc417a871bdf3534187e566c197007c848f0974b2b4b58eff473087ef09702a929a9df5f4f1df019a4ca632884e7657db055d0ab58ed2ec328506ff0a4a7fcb6
diff --git a/app-emacs/org-modern/files/50org-modern-gentoo.el b/app-emacs/org-modern/files/50org-modern-gentoo.el
new file mode 100644
index 000000000000..a10b355780f8
--- /dev/null
+++ b/app-emacs/org-modern/files/50org-modern-gentoo.el
@@ -0,0 +1,7 @@
+(add-to-list 'load-path "@SITELISP@")
+(autoload 'global-org-modern-mode "org-modern"
+  "Global org-modern-mode." t)
+(autoload 'org-modern-agenda "org-modern"
+  "Finalize Org agenda highlighting." t)
+(autoload 'org-modern-mode "org-modern"
+  "Modern looks for Org." t)
diff --git a/app-emacs/org-modern/metadata.xml b/app-emacs/org-modern/metadata.xml
new file mode 100644
index 000000000000..68e44f1c601a
--- /dev/null
+++ b/app-emacs/org-modern/metadata.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+
+<pkgmetadata>
+  <maintainer type="project">
+    <email>gnu-emacs@gentoo.org</email>
+    <name>Gentoo GNU Emacs project</name>
+  </maintainer>
+  <longdescription>
+    This package implements a “modern” style for your Org buffers using font
+    locking and text properties. The package styles headlines, keywords, tables
+    and source blocks. The styling is configurable, you can enable, disable or
+    modify the style of each syntax element individually via the org-modern
+    customization group.
+  </longdescription>
+  <upstream>
+    <bugs-to>https://github.com/minad/org-modern/issues/</bugs-to>
+    <remote-id type="github">minad/org-modern</remote-id>
+  </upstream>
+</pkgmetadata>
diff --git a/app-emacs/org-modern/org-modern-0.6.ebuild b/app-emacs/org-modern/org-modern-0.6.ebuild
new file mode 100644
index 000000000000..0b55aefd8d63
--- /dev/null
+++ b/app-emacs/org-modern/org-modern-0.6.ebuild
@@ -0,0 +1,18 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit elisp
+
+DESCRIPTION="Modern style for your GNU Emacs Org buffers"
+HOMEPAGE="https://github.com/minad/org-modern/"
+SRC_URI="https://github.com/minad/${PN}/archive/${PV}.tar.gz
+	-> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+DOCS=( README.org example.org )
+SITEFILE="50${PN}-gentoo.el"
diff --git a/app-forensics/Manifest.gz b/app-forensics/Manifest.gz
index bbb0e3f43a62..18b72efc3c2b 100644
--- a/app-forensics/Manifest.gz
+++ b/app-forensics/Manifest.gz
diff --git a/app-forensics/aflplusplus/Manifest b/app-forensics/aflplusplus/Manifest
index 3c8d2c09e94e..b0d65e4c6c1a 100644
--- a/app-forensics/aflplusplus/Manifest
+++ b/app-forensics/aflplusplus/Manifest
@@ -4,10 +4,11 @@ AUX aflplusplus-4.01c-respect-flags.patch 11669 BLAKE2B 1aa396a2283fd8b8efb40086
 AUX aflplusplus-4.02c-no-ignore-errors-makefile.patch 5291 BLAKE2B 10bdf9571f60e775c8f9d72c14d4532cc2bf60fe614a893f99daf9790b7e35228573d55eead981e6428b2d981407375995b181021801d82850b72652d0df08c1 SHA512 667d815266c00ed217087aef0b3a22acb89ed4501f1c649bfe4257e1bcfcf23492525c2bb678c352e58fd6bbf10d08d140bd3f8c1b163f340976a785c84fb147
 AUX aflplusplus-4.02c-respect-flags.patch 11731 BLAKE2B 7f6d7f24abc1889b9738d418766e8f001e439d69c1916d2c3d1ac35f874bf58520cf7e8f94ef0a70e8d3d76d55cd647454a2217143c7fa98cc4a562af36282ca SHA512 ff758c186343cc9967e16b3ab40c32261a28fe1a6c4ddca2180ccf5e1acf95bb9ab18ef6d685bff969d69e31f5a3b818cb251b4cb6b48b5fbb9b5c21b8f9f1e7
 DIST aflplusplus-4.01c.tar.gz 2818445 BLAKE2B f3699c4b2fabec0ab238277c3b2c7b19b35af7a0b82b14a57c34b8579121cfa0644ef432132cf4a3382547db3faf799d2ab601512ddfb469e4a2246cdb61aa7f SHA512 d2b03ab4ff9538fe0b52aa3ed4778a6e5657d64d6f0e5f75a99305bad69c5179d6b1c882650f19a884a740577acb73dab7cee3d5c9c7b06ff2326ffeba37d1fe
-DIST aflplusplus-4.02c.tar.gz 2828429 BLAKE2B 0c4d7937626a699bb6768e2f67f369508f7ec131d1170cd48f8650d8081135b466733de34e52f2ac2213c4bd13ab8936b17d3b0f8debf28e8a32ad87d9dcb55d SHA512 f5159a84e0ecd2c260d2d8ce7df33fe4704c664bdf06f193a7fef377d48646e4d921ee90d0b66c7dac02d16e6b1607c6569351aaeea9b2ee3968d22b3f583763
 DIST aflplusplus-4.03c-patches.tar.xz 4444 BLAKE2B 4eed2ee97e4f7aef987e5c931469b7bb1d85310cb101878e5e71431ac36329a07b0e05812ed1e743c6ed3ce76e10c4392f2bf7ccc98ec1537b75196c5629acfe SHA512 bcaa196640f47923be6daa65e3c5f8461eadaec3b939f2cfe0223eacc64be385c80166ec7dc0df25d0c38053a38c3efcfbc25d8387bed5c54c95a8781ed64b00
 DIST aflplusplus-4.03c.tar.gz 2830718 BLAKE2B 1b55daf3c3a0a0b11c1ef0a7dd1005cfa1ec61fb54691b96519f57788233b1385b52948468f2d5beada3c58129bc0524f07aebfb25ee8cef1e5d5afd06b1233d SHA512 4bab00d964eb9d0664d97062f5da8090dfef599480f25b04d08b84e7f47676a9790fb23573f7e885b5da6ab813694f9ab26a0b5c9d341834892530558e3b83ef
+DIST aflplusplus-4.04c-patches.tar.xz 4236 BLAKE2B 86bb5d1e0da271833fc548633e08897bd681f1b575b3131d72222eeb7135f3cbdbd5580d0afc56a23639eb4621f878fd4ffdc4e0ba11b34388a99768f2529c76 SHA512 5c607b255e2d74033d5258218a907a8edcd44eab006377edee9618d3755815fbda9f5d565444e090ab0b27220675736a1eed285f92cb74122d0b9b3bcbcc0a2c
+DIST aflplusplus-4.04c.tar.gz 2832011 BLAKE2B 80a5652b0d64b4824c3b4f91bf993a8499a0c86cf878ca83c7b7afe217cc1603700d4cf7408ae40f1435251153f88e0663cabe470a06387e6664249b3a015172 SHA512 1c2e2e6677e87de2f069e1acdc2319580e488670c3d4975a0f0807da33965c4a14087a7c734195d0a47260acc91f7211b10bd905aac99bdab81145b282edb44e
 EBUILD aflplusplus-4.01c-r1.ebuild 2167 BLAKE2B cdf3a3e1bd5222426d0841693c262ea8406f21fcbd16f1518b5c15d04b72c31957e57b519b47be1002c1966b8ad64ab41a6cfde91f7dc1c168a5563b041fa5a7 SHA512 8f9d43230632d9d6df1ea420f79fed527da24f6660e189324b2ac99250c5f6a64488c23601f24721225515977e943117025bb0fa91b1e907d267e56b1f7b357f
-EBUILD aflplusplus-4.02c-r1.ebuild 1989 BLAKE2B 437c96ebfb251487d018b77e52cae0dab90d442da03d937944f9386155cf408ea14bd7be6240ffa02e6e7ae36d53718e9a53b29d7294de7855e2446b1bcd7f29 SHA512 2f3a12413699167b150405c96fd48aede1b4ad93752de40cf778c495a3683d146b96cc4d95fabad02320641b252d60f8af8cb498175f9275e718417fbc4247dd
-EBUILD aflplusplus-4.03c.ebuild 2060 BLAKE2B adea6efb5a28cd40102a86bcea10402e9ff6f03626e33523edf26026c21380fb1fa31e9e351fa9fe60dcb052e3eba6edd65071371e155ded9589eb06bd7ef1e3 SHA512 c12bb492be6a002cb437f710e3c7224d3dec9fab424f90632c71cd2e9ef5e8ec1b72bff6717d3be79f41a59be2c606dfcbbcece0150294b735e12f74a057f109
+EBUILD aflplusplus-4.03c.ebuild 2058 BLAKE2B 627a29e84353cd26b266e7f5a0f413a1b0ad8ce9c884c94f289dcec78e1e2e8a8829b746ea271fb0fa6c0369bea9aa7d9b5cde63b158956bcc772783ee6e2e8a SHA512 329f60a78dcc297009b0b2f68ad664822b37b4bac4b8f7ec42dbd84744c33a7556ed04a4e4a04366f3890e671faf18eb9c9ff1db2c853cf0f9e0b00a55354911
+EBUILD aflplusplus-4.04c-r1.ebuild 2081 BLAKE2B db6987f54b96263faf6fc8089e656e3bde8c9d1c21b67e182e106e52bccb8878238916a3c5bcd98882757ac12d1183898ac303ed503265f21bfffe313c326977 SHA512 ffffa6cced5350167689f06e817dc9f331445bde1bfa159473f481bfb4502d1718503552ad8cab72fd55a06366a2f4776f4530548879f726ad60dc0b83548d87
 MISC metadata.xml 328 BLAKE2B c9ad582740e9c2ad03a30fe0eaafb8ee19f0d9bc2e98cc7bcd14385a3407f84301479d324b92d3aecafdc1e5cfef1d2cfc8a15c2ecb5d8f2fa348d82de920128 SHA512 e56ce158f6764926c2ed4dc486f017ce75fa272ac8e6ad16e4a816f8c734d7313e3dc9cb007bab07efe73e59cab185312a02d6178296bfe25002719ce4975d14
diff --git a/app-forensics/aflplusplus/aflplusplus-4.03c.ebuild b/app-forensics/aflplusplus/aflplusplus-4.03c.ebuild
index 3c1388fc37fd..24d7d0165394 100644
--- a/app-forensics/aflplusplus/aflplusplus-4.03c.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.03c.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}"/AFLplusplus-${PV}
 
 LICENSE="Apache-2.0"
 SLOT="0"
-KEYWORDS="~amd64 ~arm64"
+KEYWORDS="amd64 arm64"
 IUSE="test"
 
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/app-forensics/aflplusplus/aflplusplus-4.02c-r1.ebuild b/app-forensics/aflplusplus/aflplusplus-4.04c-r1.ebuild
index 1e726329302b..4f564af1db6d 100644
--- a/app-forensics/aflplusplus/aflplusplus-4.02c-r1.ebuild
+++ b/app-forensics/aflplusplus/aflplusplus-4.04c-r1.ebuild
@@ -4,12 +4,14 @@
 EAPI=8
 
 PYTHON_COMPAT=( python3_{8..10} )
-LLVM_MAX_SLOT=14
+LLVM_MAX_SLOT=15
 inherit toolchain-funcs llvm optfeature python-single-r1
 
+AFL_PATCHSET="${PN}-4.04c-patches"
 DESCRIPTION="A fork of AFL, the popular compile-time instrumentation fuzzer"
 HOMEPAGE="https://github.com/AFLplusplus/AFLplusplus"
 SRC_URI="https://github.com/AFLplusplus/AFLplusplus/archive/${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~sam/distfiles/${CATEGORY}/${PN}/${AFL_PATCHSET}.tar.xz"
 S="${WORKDIR}"/AFLplusplus-${PV}
 
 LICENSE="Apache-2.0"
@@ -28,18 +30,18 @@ RDEPEND="${PYTHON_DEPS}
 	>=sys-devel/llvm-13:=
 	|| (
 		sys-devel/clang:13
+		sys-devel/clang:14
 		sys-devel/clang:${LLVM_MAX_SLOT}
 	)
 	!app-forensics/afl"
 DEPEND="${RDEPEND}
 	test? ( dev-util/cmocka )"
 
+QA_FLAGS_IGNORED="afl-gcc-cmplog-pass.so afl-gcc-cmptrs-pass.so"
 QA_PREBUILT="usr/share/afl/testcases/others/elf/small_exec.elf"
 
 PATCHES=(
-	"${FILESDIR}"/${PN}-4.02c-respect-flags.patch
-	"${FILESDIR}"/${PN}-4.02c-no-ignore-errors-makefile.patch
-	"${FILESDIR}"/${PN}-4.01c-lld-detect.patch
+	"${WORKDIR}"/${AFL_PATCHSET}
 )
 
 llvm_check_deps() {
diff --git a/app-misc/Manifest.gz b/app-misc/Manifest.gz
index 27f5e35323a2..519ccf7b5e59 100644
--- a/app-misc/Manifest.gz
+++ b/app-misc/Manifest.gz
diff --git a/app-misc/ca-certificates/Manifest b/app-misc/ca-certificates/Manifest
index b7de00f280f8..84aa012b4972 100644
--- a/app-misc/ca-certificates/Manifest
+++ b/app-misc/ca-certificates/Manifest
@@ -4,8 +4,10 @@ DIST ca-certificates_20211016.tar.xz 239608 BLAKE2B 9b4730b54fd9f472fe4e5427bf91
 DIST nss-3.80.tar.gz 84841312 BLAKE2B 6244193849a9277bc68c5225b4f836309bdf07bc415b23793d14c5343f5236b27bb7552fa7fb9975f410ea4732e9fc37185fee7bb950bf5d15b478f8bdec3ba7 SHA512 db05df17fea12bf3ec83882bf761663f8f10f3a8ce9a33519c7985d6003945068adb658250cf05d8b598c34ecb4ba7ea5cdc468d9cc7bc786aedb72d7be65923
 DIST nss-3.83.tar.gz 84844191 BLAKE2B f2e26f69450cbd2c94c5efdd959cb19e874bcb63d09098406ef49f4997bd04bc0ee4bc285c1c4f0ec461194171342c7d31965ac7bc7eefc284783542dfe853b1 SHA512 550cf1116e39e58041feaa67913f570d791e8153cc0522ba7ae02e27a61e0a4e6a25224be0f25d51a842dc11c70d600263450ebff0a9fdaa2840bafa3fc9ddd5
 DIST nss-3.85.tar.gz 84717969 BLAKE2B 644a51cd747078688233850bee6884b7ee30076411d783a4fb2982ffc35883f51784440d8c1c727251f664c4e5b5071be9881abc8315e0294d7da0cb8727e897 SHA512 97cfffa2beed1dba5d31e0c6e450553e5a8c78b427521640adb00c05d9d63cd64dc08388f0dbf96c93efb79f5daf4ba8db8d026b0b43d2e5c865a9b833fc77a1
+DIST nss-3.86.tar.gz 71423531 BLAKE2B 36703d99d9616020a165085469be650c2f4ce3e11c2f4f6bd974b1b89f1b9fcfdaa4ffd4d6ee98dabce82e616c170548efa1e51722b524dda8815faccfcf5181 SHA512 c09aeb52d7898617b65a1090cbdd29f6457eff2ebdc61aadb2dbf7b5044eae010ee5eeea729825f1258902936a61a1bff552ee9b26b2f01e5d448bbd8791d1cb
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD ca-certificates-20211016.3.80.ebuild 6060 BLAKE2B 65055ba9783e74caf0d12dd5f8c5a3af47c13f9b65aa0b3f1b502545487d22b772edae7a766888e669c15855dcd265c1f873258c49c6e0935a30d6488b989ef3 SHA512 8f9562825f04768b7c23cdc41f9c2ea4166f419e05adfccd1f6b16e9245f859679d39a0064b9129d6ee16435dff2b191c2c85493a782fff3afdbf77ecc479225
 EBUILD ca-certificates-20211016.3.83.ebuild 6060 BLAKE2B 65055ba9783e74caf0d12dd5f8c5a3af47c13f9b65aa0b3f1b502545487d22b772edae7a766888e669c15855dcd265c1f873258c49c6e0935a30d6488b989ef3 SHA512 8f9562825f04768b7c23cdc41f9c2ea4166f419e05adfccd1f6b16e9245f859679d39a0064b9129d6ee16435dff2b191c2c85493a782fff3afdbf77ecc479225
 EBUILD ca-certificates-20211016.3.85.ebuild 6068 BLAKE2B 42e0ed7648b050dc4beea8265c81d8cbe261bb778d1c566bad797777cbc606d1004f444614469c0d8cca960a12851ff34f657e179a85834388678880bd5fe91a SHA512 e44128aee9d68765af5470cdf5c7497552f0c51b3bd58fa0677480d303dd092a31416accc8285723130ae5cee6cd73319e4285deeb2457962fe84094e959dc74
+EBUILD ca-certificates-20211016.3.86.ebuild 6068 BLAKE2B 42e0ed7648b050dc4beea8265c81d8cbe261bb778d1c566bad797777cbc606d1004f444614469c0d8cca960a12851ff34f657e179a85834388678880bd5fe91a SHA512 e44128aee9d68765af5470cdf5c7497552f0c51b3bd58fa0677480d303dd092a31416accc8285723130ae5cee6cd73319e4285deeb2457962fe84094e959dc74
 MISC metadata.xml 373 BLAKE2B 578ac9cb9ac73fc04e06667e896227927d5438e5c1ef3eae1966e8d01a8dd915669b8c81418f6558b4b5d561473111e50f9d94d4b50f1f03355130c9d9be61f0 SHA512 56216f969a510a4c054109ca6fab651cfb0aaf4768d43f70a21aeea6778ced6793957d9bd39bede89e9fc8577aa6c27bf1ca0402aa1e9aa49ec5981a3230b954
diff --git a/app-misc/ca-certificates/ca-certificates-20211016.3.86.ebuild b/app-misc/ca-certificates/ca-certificates-20211016.3.86.ebuild
new file mode 100644
index 000000000000..24e049209a49
--- /dev/null
+++ b/app-misc/ca-certificates/ca-certificates-20211016.3.86.ebuild
@@ -0,0 +1,203 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# The Debian ca-certificates package merely takes the CA database as it exists
+# in the nss package and repackages it for use by openssl.
+#
+# The issue with using the compiled debs directly is two fold:
+# - they do not update frequently enough for us to rely on them
+# - they pull the CA database from nss tip of tree rather than the release
+#
+# So we take the Debian source tools and combine them with the latest nss
+# release to produce (largely) the same end result.  The difference is that
+# now we know our cert database is kept in sync with nss and, if need be,
+# can be sync with nss tip of tree more frequently to respond to bugs.
+
+# Where possible, bump to stable/LTS releases of NSS for the last part
+# of the version (when not using a pure Debian release).
+
+# When triaging user reports, refer to our wiki for tips:
+# https://wiki.gentoo.org/wiki/Certificates#Debugging_certificate_issues
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit python-any-r1
+
+if [[ ${PV} == *.* ]] ; then
+	# Compile from source ourselves.
+	PRECOMPILED=false
+
+	DEB_VER=$(ver_cut 1)
+	NSS_VER=$(ver_cut 2-)
+	RTM_NAME="NSS_${NSS_VER//./_}_RTM"
+else
+	# Debian precompiled version.
+	PRECOMPILED=true
+	inherit unpacker
+fi
+
+DESCRIPTION="Common CA Certificates PEM files"
+HOMEPAGE="https://packages.debian.org/sid/ca-certificates"
+NMU_PR=""
+if ${PRECOMPILED} ; then
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${PV}${NMU_PR:++nmu}${NMU_PR}_all.deb"
+else
+	SRC_URI="mirror://debian/pool/main/c/${PN}/${PN}_${DEB_VER}${NMU_PR:++nmu}${NMU_PR}.tar.xz
+		https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/nss-${NSS_VER}.tar.gz
+		cacert? (
+			https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch
+		)"
+fi
+
+LICENSE="MPL-1.1"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+IUSE=""
+${PRECOMPILED} || IUSE+=" cacert"
+
+# c_rehash: we run `c_rehash`
+# debianutils: we run `run-parts`
+CDEPEND="app-misc/c_rehash
+	sys-apps/debianutils"
+
+BDEPEND="${CDEPEND}"
+if ! ${PRECOMPILED} ; then
+	BDEPEND+=" ${PYTHON_DEPS}"
+fi
+
+DEPEND=""
+if ${PRECOMPILED} ; then
+	DEPEND+=" !<sys-apps/portage-2.1.10.41"
+fi
+
+RDEPEND="${CDEPEND}
+	${DEPEND}"
+
+S="${WORKDIR}"
+
+pkg_setup() {
+	# For the conversion to having it in CONFIG_PROTECT_MASK,
+	# we need to tell users about it once manually first.
+	[[ -f "${EPREFIX}"/etc/env.d/98ca-certificates ]] \
+		|| ewarn "You should run update-ca-certificates manually after etc-update"
+
+	if ! ${PRECOMPILED} ; then
+		python-any-r1_pkg_setup
+	fi
+}
+
+src_unpack() {
+	if ! ${PRECOMPILED} ; then
+		default
+		# Initial 20200601 deb release had bad naming inside the debian source tarball.
+		DEB_S="${WORKDIR}/${PN}-${DEB_VER}"
+		DEB_BAD_S="${WORKDIR}/work"
+		if [[ -d "${DEB_BAD_S}" ]] && [[ ! -d "${DEB_S}" ]] ; then
+			mv "${DEB_BAD_S}" "${DEB_S}"
+		fi
+	fi
+
+	# Do all the work in the image subdir to avoid conflicting with source
+	# dirs in ${WORKDIR}.  Need to perform everything in the offset #381937
+	mkdir -p "image/${EPREFIX}" || die
+	cd "image/${EPREFIX}" || die
+
+	${PRECOMPILED} && unpacker_src_unpack
+}
+
+src_prepare() {
+	cd "image/${EPREFIX}" || die
+
+	if ! ${PRECOMPILED} ; then
+		mkdir -p usr/sbin || die
+		cp -p "${S}"/${PN}-${DEB_VER}/sbin/update-ca-certificates \
+			usr/sbin/ || die
+
+		if use cacert ; then
+			pushd "${S}"/nss-${NSS_VER} >/dev/null || die
+			eapply "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+			popd >/dev/null || die
+		fi
+	fi
+
+	default
+	eapply -p2 "${FILESDIR}"/${PN}-20150426-root.patch
+
+	pushd "${S}/${PN}-${DEB_VER}" >/dev/null || die
+	eapply "${FILESDIR}"/${PN}-20211016.3.72-no-cryptography.patch
+	popd >/dev/null || die
+
+	local relp=$(echo "${EPREFIX}" | sed -e 's:[^/]\+:..:g')
+	sed -i \
+		-e '/="$ROOT/s:ROOT:ROOT'"${EPREFIX}"':' \
+		-e '/RELPATH="\.\./s:"$:'"${relp}"'":' \
+		-e 's/openssl rehash/c_rehash/' \
+		usr/sbin/update-ca-certificates || die
+}
+
+src_compile() {
+	cd "image/${EPREFIX}" || die
+
+	if ! ${PRECOMPILED} ; then
+		local d="${S}/${PN}-${DEB_VER}/mozilla" c="usr/share/${PN}"
+
+		# Grab the database from the nss sources.
+		cp "${S}"/nss-${NSS_VER}/nss/lib/ckfw/builtins/{certdata.txt,nssckbi.h} "${d}" || die
+		emake -C "${d}"
+
+		# Now move the files to the same places that the precompiled would.
+		mkdir -p etc/ssl/certs \
+			etc/ca-certificates/update.d \
+			"${c}"/mozilla \
+			|| die
+		if use cacert ; then
+			mkdir -p "${c}"/cacert.org || die
+			mv "${d}"/CA_Cert_Signing_Authority.crt \
+				"${c}"/cacert.org/cacert.org_class1.crt || die
+			mv "${d}"/CAcert_Class_3_Root.crt \
+				"${c}"/cacert.org/cacert.org_class3.crt || die
+		fi
+		mv "${d}"/*.crt "${c}"/mozilla/ || die
+	else
+		mv usr/share/doc/{ca-certificates,${PF}} || die
+	fi
+
+	(
+		echo "# Automatically generated by ${CATEGORY}/${PF}"
+		echo "# $(date -u)"
+		echo "# Do not edit."
+		cd "${c}" || die
+		find * -name '*.crt' | LC_ALL=C sort
+	) > etc/ca-certificates.conf
+
+	sh usr/sbin/update-ca-certificates --root "${S}/image" || die
+}
+
+src_install() {
+	cp -pPR image/* "${D}"/ || die
+	if ! ${PRECOMPILED} ; then
+		cd ${PN}-${DEB_VER} || die
+		doman sbin/*.8
+		dodoc debian/README.* examples/ca-certificates-local/README
+	fi
+
+	echo 'CONFIG_PROTECT_MASK="/etc/ca-certificates.conf"' > 98ca-certificates || die
+	doenvd 98ca-certificates
+}
+
+pkg_postinst() {
+	if [[ -d "${EROOT}/usr/local/share/ca-certificates" ]] ; then
+		# If the user has local certs, we need to rebuild again
+		# to include their stuff in the db.
+		# However it's too overzealous when the user has custom certs in place.
+		# --fresh is to clean up dangling symlinks
+		"${EROOT}"/usr/sbin/update-ca-certificates --root "${ROOT}"
+	fi
+
+	if [[ -n "$(find -L "${EROOT}"/etc/ssl/certs/ -type l)" ]] ; then
+		ewarn "Removing the following broken symlinks:"
+		ewarn "$(find -L "${EROOT}"/etc/ssl/certs/ -type l -printf '%p -> %l\n' -delete)"
+	fi
+}
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index fd4f18ae3198..b5c3741c8e87 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/elt-patches/Manifest b/app-portage/elt-patches/Manifest
index 78310943e2c7..c7cdd12c0d57 100644
--- a/app-portage/elt-patches/Manifest
+++ b/app-portage/elt-patches/Manifest
@@ -1,5 +1,5 @@
-DIST elt-patches-20211104.tar.xz 41608 BLAKE2B 971ec0f6753267d49a64ab65645ac547322fa4cfe64b3102bbaa4419c0ed0973c0ee44e40c15b2d34e94979cbe9c64b027f4bb7c5adf3d3acee07f3f98bd7704 SHA512 c583bfa45eb16835f83a881eb587c81f0fb2cfd3eff5239e794efb83c046f5cecceeee3f5387585b9d7f68efe5f439344d2cdfc83c9fad5b207e82dff3d8cc67
 DIST elt-patches-20220831.tar.xz 41696 BLAKE2B c328faac2bc837fff5b9ec7dd2a891d3ab08ee30fb38d838fa6aeebbb832eb30db1f3d3b05e64c14f9cef27a21516cb6d960d7afe2314f37e25a0f77ef5d2862 SHA512 3cced1f515533ce65cef42a3c697ad0686a6c41a1b734c4558690cbdee4ebe60214b3d7f8dbb81974fc100a6882d83599f2dc77c206d9beea2449b2614319d1c
-EBUILD elt-patches-20211104.ebuild 902 BLAKE2B 28456c3949d47fe6ff34d1e7bee519ef99116455b1c65ec07c2b8d08effc1fa6f76b1afdec5da52a00c8d19778da6ae01c2b241553c36c4f3aeb0ba973eca270 SHA512 2bf0e90c142ecaa196db4574c9797a6ed4bc56b7abf3fc09d33a734dac959e20f3b81aca3814276b4f9ccc907760a62b21f6148505e5c9a9693b692ec5ca9a14
+DIST elt-patches-20221210.tar.xz 42080 BLAKE2B abcdae6dedac89bd913d6809d335c13cd59b675c4b68198925bf758013e988a9bf82e9f6ccc3a70ac1c49775bb7579addda6c0bb7ea4ceea3c4b8e4acf0d65ea SHA512 3dad3c0be8d69de731bb10d5a6007539c2966f8a370a3dee27faf9655a38e39f272a9059cd98c8b6f32c2495143667f8b28a6a3425f22c0c5421f3969b417cf7
 EBUILD elt-patches-20220831.ebuild 900 BLAKE2B 72345d2885b75c3a266d417592c4f5250ef9fc58bafd833c2833039e624d7d91bf8ff33110e97c8037b95583fef51016b8ec2ec3215263256201d9178e474021 SHA512 d39b8ce4733254b01c8a00814e4bd802710b145bd2d72bf48ec28fbd5f7c490fee6109b40c7eba13329452ee56b56b21c9e5345a36b98e152814fbc59ad7e9bd
+EBUILD elt-patches-20221210.ebuild 908 BLAKE2B 97ee412c2c918029b588f1a29bc9e50f7a81123fe9c9fa8375f715a5efaa812a6e3bf494467af0a746b3a5f23b0b383c0033261b186e3ca14a705fd0e1804cdd SHA512 83966a41d5c859051e8fc13d85697ae470aa243596bd22d1857e8b96a445ba4fb0ec8509be2ab5237f4e1e4805943e3bdcc082547db05d27d8357aa8b89ab932
 MISC metadata.xml 224 BLAKE2B c45ace8978f3aa10354a0e478d1a80fd14c3087658eadaf6416466352c86edf88364681414e4da48f1ec1ee43c260133e682d1658f780e3b9d5ad216d18c5354 SHA512 60d0518e98897d48c04d19ec8ce9b0612560d4899f94ee1b5ee8a48de297f9a7c8fc3cc58112a1a495cd6f4d74580a8c76cf23eeb1312490d247a6aea3be8aa5
diff --git a/app-portage/elt-patches/elt-patches-20211104.ebuild b/app-portage/elt-patches/elt-patches-20221210.ebuild
index d08e6c4a6427..e9ea9fdac84e 100644
--- a/app-portage/elt-patches/elt-patches-20211104.ebuild
+++ b/app-portage/elt-patches/elt-patches-20221210.ebuild
@@ -1,7 +1,7 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI=8
 
 DESCRIPTION="Collection of patches for libtool.eclass"
 HOMEPAGE="https://gitweb.gentoo.org/proj/elt-patches.git/"
@@ -11,7 +11,7 @@ SRC_URI="https://dev.gentoo.org/~grobian/distfiles/${P}.tar.xz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 
 RDEPEND="sys-apps/gentoo-functions"
 BDEPEND="app-arch/xz-utils"
diff --git a/dev-cpp/Manifest.gz b/dev-cpp/Manifest.gz
index 665283f063e3..2ff1266c72d9 100644
--- a/dev-cpp/Manifest.gz
+++ b/dev-cpp/Manifest.gz
diff --git a/dev-cpp/elfio/Manifest b/dev-cpp/elfio/Manifest
index 50398474c7db..563460afd139 100644
--- a/dev-cpp/elfio/Manifest
+++ b/dev-cpp/elfio/Manifest
@@ -1,6 +1,4 @@
 AUX elfio-3.11-system-gtest.patch 1024 BLAKE2B 96aa3b8c38cf5159c69e4ff74388faf27f2192466e609ae6ccd04209abf7811387b5648922daf9660bc948bfde5c8681b605ac187e7b9757b742729a91e3def5 SHA512 9d75db5c673c375e64a9335e03b0fd3e2f301050388419d4032e6985ac2af8db46dcd9e7e61490e48c3fe90b2a09035a88305027577f9f0f8b1bd99cd9977e22
-DIST elfio-3.10.tar.gz 4243841 BLAKE2B a4cd5e7cb8b2f13cd7341adacb623b996e07e8ac761cd0f1e8eb20a87770fa936bf97ad79a0ff8d700ac41278bae7c5dd00d277f4c2d47e73340aaf607b7ee49 SHA512 f609fe5162d1609d1d65f441dbf01011ca5ae36195d8b3a74dec2b72891e9f8f90d3fdbc9bf893f7186494071606e898e5519fda18665fc88ae9781c504cd4a9
 DIST elfio-3.11.tar.gz 4150700 BLAKE2B 2e0270384f1fdbc8f8374c1a42b5bd0c6ba6faa8c8a7125063b682cd9808fbb3f330e2a0fa4646c8828f6d276ad8f92e36b69ab7916c3bd2b1b2ecad6708fcc1 SHA512 3a254aad62e707f2809e2997998aab6a9794d70791dc535a6de90bad3e9de3cbcc4f8e7787067ca7cd47ce2dc71cf52809747267bc36cfb08369b49a6b92cf5e
-EBUILD elfio-3.10.ebuild 570 BLAKE2B 211ec77a13d0d94845564a2a9124300aaaf707c8e42d7d7cf3fb22c2d7147e4f9275acc53d54e24e32fc9bff35fe6aa026770ddb7ddd021b66d10bad7464e3d2 SHA512 05ac2316053f66abd5f2bafbd45ef74a4a2efab094c59b99636b94f2d2f9f4981ae2139c75231a2907e2dde70a4e23b7d83cf29d893c6f0fadbc4ab018af8ce4
 EBUILD elfio-3.11.ebuild 666 BLAKE2B d0869322ea72892a19556fdee149bd0fe22624242e51d3447b6771da1b34e295a81ba0e337bc8ee63b5a5254330829de928d54b1a8347f2a322bfc4ed20dfee9 SHA512 c492ef4e16e45b506cb7e0295c6fb74c49aebcea6a3714784986279d9e9c18debb3a6162967c024e5b636cc8a9400e609e1f2f13440902857d4037ed1594482c
 MISC metadata.xml 317 BLAKE2B 4b62079a213f05ca0fce72e62582010a9c82e11e714347c6753a1919bb8586896cef8afa5c378ffb00a5427aea6219fe7d78cc3572e214c3b2e8b09507ca685d SHA512 d550d765b42e68da41164297145ed8534b6bfb8f7976e6df57f76fb0fc8558262f010d988b66ea368d45e7c4bbbc879f6b91abba21c3f14871605e39589e5047
diff --git a/dev-cpp/elfio/elfio-3.10.ebuild b/dev-cpp/elfio/elfio-3.10.ebuild
deleted file mode 100644
index 18f8232d6cfc..000000000000
--- a/dev-cpp/elfio/elfio-3.10.ebuild
+++ /dev/null
@@ -1,27 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit cmake
-
-DESCRIPTION="ELF reader/producer header-only C++ library"
-HOMEPAGE="https://github.com/serge1/ELFIO"
-SRC_URI="https://github.com/serge1/${PN}/archive/Release_${PV}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${PN^^}-Release_${PV}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="test? ( dev-libs/boost )"
-
-src_configure() {
-	local mycmakeargs=(
-		-DELFIO_BUILD_TESTS=$(usex test)
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index ec5f40b68ff9..a047f9d4b81e 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/asm/Manifest b/dev-java/asm/Manifest
index 164c831899f9..e5f608c048d0 100644
--- a/dev-java/asm/Manifest
+++ b/dev-java/asm/Manifest
@@ -2,7 +2,7 @@ DIST asm-ASM_4_0.tar.bz2 14706135 BLAKE2B 20bed2b10b6107e9af74dafd8f7c9db93be1c2
 DIST asm-ASM_5_1.tar.bz2 16191369 BLAKE2B 30e0f97fe200f09c78b3ba743ad70f25715b411d5e0be330234d97dec98b997db78736b5e005fdac8ed5339c553783a4e12386c34cb2c5a45bd8d8b42d7e8465 SHA512 6e73fe0787cfa974c598be44b5d735bbd6cba88f64db24169ec481281aea2169bce65fb08a677aa99f0d71f876a204c86432d2a4a79e85cc5286eb2ccf7617d7
 DIST asm-ASM_9_3.tar.gz 1666740 BLAKE2B 6905233f666159f861dda68a855e8f5632817b0627c2006d3a8e61340cd4afca9310860dd1eff46173ca7356583e6c44027e674f7e17eacaaf0dbcc24b92198e SHA512 401a4dd7c2638bbad940ca92c42b7ec6f44e1d19c407bba3cd6a081e0b51969cf62a0fbcc407ef4889d3c7d6c7b9893e77642c058f812e9d10b9d67c5215be42
 DIST asm-ASM_9_4.tar.bz2 1380417 BLAKE2B 612fc6669294f2926ec77522f642f2878a96a9c977579ceda9feb955041ff53fa698c75b26c27bae478a41dca59357d9cf824263df39d60ea5c6722e5f0efc75 SHA512 a59268808ac54a238bd6e117eb0164d28c5c3572c12d7ad42c2f3dbd32714c03056f330255756511db4f1ede8d66bf32c7347128b8ec179beba11cca27927687
-EBUILD asm-5.1-r1.ebuild 1282 BLAKE2B 03b95a3511830bdec2398707ef44c385a5dd7a08e44d39a75284475511a114208ceb4fc086aff740f2e606d786cb259e435b04266c762a7923f2138b6817afe3 SHA512 c53e72c7891c68ac732dc5c6c925f35f172d64fdb64667c7c028e323f9ff9e512c1f020db16dd9344a13026c397f6e7b851ef9c0561eeb73672341b5d74da42c
-EBUILD asm-9.3.ebuild 1580 BLAKE2B 13b2f9d3b02654e705ada53d6b25e0d8696f744adbe43cd3e75d0cd6e60f312538d79b381071920fb6707d2a84c7fc737728966076504d0b052950df628fa5e7 SHA512 87abca9f037edb1a196610ddb88f603d652919662f55baf3bbb84438b8511fce9690175ef493c4afce2227bcb3af928e6dca50ab53ba6752d77715db85cf270b
-EBUILD asm-9.4.ebuild 2351 BLAKE2B 33f0589b6bc493f234b00e775e83bf8b9d8a0614413c8ad1cfffff510087a7b17a2bb1627ac5d668c3f1fad655eae1d922d78b2562fe72f4f1406eabc9d46a0f SHA512 e55c2ec2c463c75d413b14513b42e2a8b8c5f608b3468ee2c317e13fb85abb4119ff1b9b825e7b11063737fc0d2b0a41f69affddf2516623d23a46048d57a057
+EBUILD asm-5.1-r1.ebuild 1291 BLAKE2B 725d3131119c130036a1d9ba211731c75700c62dfca02b9fca40125dabb8b6cc8233d3df6f29edaa4341d5412d695e8ebd7c70f3e0bd84a0b2091f3d7375fb51 SHA512 ccceba8cf7a50559aa3a505cf8450d695da2a927e0044fcead1878c156c17eae7ff25cbe25d84b4ed780f930b4b669b30d0ab65289bd141272eaf4febd4ee002
+EBUILD asm-9.3.ebuild 1596 BLAKE2B c14991f2292a3c005e176f714c5f75798824284aac7563902c876ae38bf738d548b999d30b6ac21be9c3512de1e56736dcb3d0a30155cdcedcef6750d9bd9372 SHA512 787f4c1949ace552c29dd4a739c51d02814e8500c42c8108f6bcc5b88c48f67b21afd091928806e69713600bb56ab627e6b3accc793300c5cffcedb9369fdd22
+EBUILD asm-9.4.ebuild 2367 BLAKE2B 1703a204f3acda73637408d224886f71458abba801cbc04809cd9cf24e35837cdc268fb6307e5aef0ea497664deb025dbf304691b0c5c0ac329ec36f5c5334f5 SHA512 31f2468a2958eb4760f29242be8fb2c5dda12621908be79028951cae5e7a9319177b0cecc57b8c2616b2838eeb79cb6f0e5be9ccea34b3786e6b56d6361bcc98
 MISC metadata.xml 1233 BLAKE2B 13faf251d3d40ed558c83262972ea106892cc3be0f7a1b95a0b484123d93473bd867b2f7b53c3e5ccc2f1fe249ebe66cb9e757e19ad36c8d3e3eac6a7a981d98 SHA512 59a292291ac757818e41d009e2cdbb73b6d914c1f552c34e9360635cb468f1ebfdf9c58d6642710d5218689d08797320102c8ccb6d5f4bc9478883feb9b9b397
diff --git a/dev-java/asm/asm-5.1-r1.ebuild b/dev-java/asm/asm-5.1-r1.ebuild
index c4beac9c0ac2..1caebff74cf0 100644
--- a/dev-java/asm/asm-5.1-r1.ebuild
+++ b/dev-java/asm/asm-5.1-r1.ebuild
@@ -39,6 +39,7 @@ src_prepare() {
 }
 
 src_install() {
+	local x
 	for x in output/dist/lib/*.jar ; do
 		java-pkg_newjar "${x}" $(basename "${x%-*}.jar")
 	done
diff --git a/dev-java/asm/asm-9.3.ebuild b/dev-java/asm/asm-9.3.ebuild
index 08fac0e70b42..6777ac94ec5f 100644
--- a/dev-java/asm/asm-9.3.ebuild
+++ b/dev-java/asm/asm-9.3.ebuild
@@ -29,14 +29,14 @@ src_compile() {
 		einfo "Compiling ${module}"
 		JAVA_RESOURCE_DIRS=()
 		JAVA_MAIN_CLASS=""
-		JAVA_SRC_DIR="$module/src/main/java"
-		JAVA_JAR_FILENAME="$module.jar"
+		JAVA_SRC_DIR="${module}/src/main/java"
+		JAVA_JAR_FILENAME="${module}.jar"
 		# Not all of the modules have resources.
-		if [[ -d $module/src/main/resources ]]; then \
-			JAVA_RESOURCE_DIRS="$module/src/main/resources"
+		if [[ -d ${module}/src/main/resources ]]; then \
+			JAVA_RESOURCE_DIRS="${module}/src/main/resources"
 		fi
 		java-pkg-simple_src_compile
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar"
 		rm -r target || die
 	done
 
@@ -44,7 +44,7 @@ src_compile() {
 		JAVA_SRC_DIR=()
 		JAVA_JAR_FILENAME="ignoreme.jar"
 		for module in "${ASM_MODULES[@]}"; do
-			JAVA_SRC_DIR+=( "$module/src/main/java" )
+			JAVA_SRC_DIR+=( "${module}/src/main/java" )
 		done
 		java-pkg-simple_src_compile
 	fi
@@ -54,9 +54,9 @@ src_install() {
 	einstalldocs # https://bugs.gentoo.org/789582
 	local module
 	for module in "${ASM_MODULES[@]}"; do
-		java-pkg_dojar $module.jar
+		java-pkg_dojar ${module}.jar
 		if use source; then
-			java-pkg_dosrc "$module/src/main/java/*"
+			java-pkg_dosrc "${module}/src/main/java/*"
 		fi
 	done
 	if use doc; then
diff --git a/dev-java/asm/asm-9.4.ebuild b/dev-java/asm/asm-9.4.ebuild
index 872b14d0208c..a53653b4d749 100644
--- a/dev-java/asm/asm-9.4.ebuild
+++ b/dev-java/asm/asm-9.4.ebuild
@@ -55,11 +55,11 @@ src_prepare() {
 src_compile() {
 	local module
 	for module in "${ASM_MODULES[@]}"; do
-		einfo "Compiling $module"
-		JAVA_JAR_FILENAME="$module.jar"
-		JAVA_SRC_DIR="$module/src/main/java"
+		einfo "Compiling ${module}"
+		JAVA_JAR_FILENAME="${module}.jar"
+		JAVA_SRC_DIR="${module}/src/main/java"
 		java-pkg-simple_src_compile
-		JAVA_GENTOO_CLASSPATH_EXTRA+=":$module.jar"
+		JAVA_GENTOO_CLASSPATH_EXTRA+=":${module}.jar"
 		rm -r target || die
 	done
 
@@ -68,8 +68,8 @@ src_compile() {
 		JAVA_JAR_FILENAME="ignoreme.jar"
 		JAVA_SRC_DIR=()
 		for module in "${ASM_MODULES[@]}"; do
-			rm "$module/src/main/java/module-info.java" || die
-			JAVA_SRC_DIR+=("$module/src/main/java")
+			rm "${module}/src/main/java/module-info.java" || die
+			JAVA_SRC_DIR+=("${module}/src/main/java")
 		done
 		java-pkg-simple_src_compile
 	fi
@@ -78,9 +78,9 @@ src_compile() {
 src_install() {
 	local module
 	for module in "${ASM_MODULES[@]}"; do
-		java-pkg_dojar $module.jar
+		java-pkg_dojar ${module}.jar
 		if use source; then
-			java-pkg_dosrc "$module/src/main/java/*"
+			java-pkg_dosrc "${module}/src/main/java/*"
 		fi
 	done
 	if use doc; then
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 6d9ccda62d51..58cfab49d089 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/libpcre2/Manifest b/dev-libs/libpcre2/Manifest
index 3446fff309e0..b38a186cfa67 100644
--- a/dev-libs/libpcre2/Manifest
+++ b/dev-libs/libpcre2/Manifest
@@ -5,7 +5,7 @@ DIST pcre2-10.40.tar.bz2 1765440 BLAKE2B 627a204585b92238eda81b4befc88757a81d75b
 DIST pcre2-10.40.tar.bz2.sig 310 BLAKE2B 9609111a64b66893b12e36d1cbc77b64d6a0cc30b9288e52753785ddcab37cc3e169d0f117d94e4ad7d7ff897a6ba0a574c9a2e529c3c7e171f5a1bc6f64fe23 SHA512 faa4b47fdac1543cd323651f251b8abb94b31b5966b42d445b8cbb38c441df4742e3c3517c2bc6c0a4464e9fb5feab5d5beda1250a03d56bec2d8383be2f63ab
 DIST pcre2-10.41.tar.bz2 1799126 BLAKE2B 4335eae8e8a327c32092a1a9f8214fa86a2d016deb7450938c4ddc38214b72dfa8c6f9c85a03bb36b3686390d378d74fdd991563f92611c42a54915310604559 SHA512 328f331a56f152424f6021b37f8dcf660842c55d43ff39f1b49115f0d05ed651d0bbb66b43c0ed61d65022030615768b92ce5e6218a54e4e17152ec473cca68d
 DIST pcre2-10.41.tar.bz2.sig 310 BLAKE2B 4ee3f9327bf568e38d1c072a4be93cdab4209e7b0cc0d183b978553cd7413ba9f292318ddf815cf44bc24872f685ee4ff9bceddd7d0e915b7be67c43fd8bf8f7 SHA512 4127258f17011be7c82d9412728863a9121c5b780514ec836769ab64ccd4cd5349a84fc85b8fdc4abb2e6fe08f4610b2a3e926116e7f1451d90d9afaa888661c
-EBUILD libpcre2-10.40-r1.ebuild 3018 BLAKE2B a665bd650956f6fc81932f9cda52796832db7fead4fd1ff1c0be900898af573a1eaa7b8305600e2aa27d019c4c13b34b6c306e47d63136f55d53b9ed206bcf89 SHA512 43c58d18ab5e4762ca0124acf45a70a8d04b2ad9d57259043950915cdef04e21568c5b32c167c63cf6a808d4b1b15ff72263e5d89c80d3e5fef7b704a1915789
+EBUILD libpcre2-10.40-r1.ebuild 3012 BLAKE2B cedcec02bc2d394fa14c63eb6bf3b68b2d17c89e531e13b82906231b49bc73c535481a63c89fb21be8354a907ebf6659c262d989599d40ffa8b47abddf86d675 SHA512 27a27635e531543a8e532c7d4a609eb449c86aa886af8dea7693ec7c9ad09511e608f9a7781867d707c3861eebe8b69ed72a7a16b8147ad0ce9148c003b8aff0
 EBUILD libpcre2-10.40.ebuild 2978 BLAKE2B 689d60aabd0b0278816571add95ddfe47b914d1bf7d55736ae8d0db8a46d7db788c3c61df5eae827f1eaec54389cb5d6dd0ff6e0bd2941f4a2405cb76b422cc4 SHA512 375fca4b0b11d8aba628e0ce86d87c3f7bb3b99faf63b63364eb9efc6a04910db2f11b216368456aaeb0143f0fbd64ea1e59f8061e12dfd53260172f9f6b169d
 EBUILD libpcre2-10.41-r1.ebuild 2563 BLAKE2B b1722855587ab47629c620afd00ebd6b694193326885f8c26000a563080976957bc4e4f201ac3cebb60025bf54333b52128afe4ab4fee4fe7d197c971d51d777 SHA512 5d150ef1a6d8b6ea74c936d89972456e191df80c5d6645548c2a11ff7ff64a0ec3a5e46ce73565249ffa611754bd64d77cd3f2287f8b5811474f59bd491a486e
 MISC metadata.xml 1087 BLAKE2B 693e7f9a4d9cac7b2aa5f24804826f79135a0475770b8ef5058b09542c3b19d30ddef438029dc0358b997ebc032ab103432b1274723c81882f1b5359455c765a SHA512 74dcb822827b8cc3e86c525ab3e2ee302d39ee00d5b4515f9fd6f4a157ae1522a2edbd08b97c2950d9370878f41eb59e414a145d6beae430dab57ea10df68460
diff --git a/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild b/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild
index 552ef634d931..6fab7a039079 100644
--- a/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild
+++ b/dev-libs/libpcre2/libpcre2-10.40-r1.ebuild
@@ -29,7 +29,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="BSD"
 SLOT="0/3" # libpcre2-posix.so version
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
 IUSE="bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode zlib"
 REQUIRED_USE="?? ( libedit readline )"
 
diff --git a/dev-libs/mpc/Manifest b/dev-libs/mpc/Manifest
index 59a6bdf4ec9b..feb840256345 100644
--- a/dev-libs/mpc/Manifest
+++ b/dev-libs/mpc/Manifest
@@ -1,5 +1,5 @@
 DIST mpc-1.2.1.tar.gz 838731 BLAKE2B 9cd03c6a71839e4cdb3c1f18d718cc4d3097c3f8ec307a5c756bd5df27c68aa013755156b3b156efee1acabfee2269602c6a3a358092ef0d522271c9c56c133d SHA512 3279f813ab37f47fdcc800e4ac5f306417d07f539593ca715876e43e04896e1d5bceccfb288ef2908a3f24b760747d0dbd0392a24b9b341bc3e12082e5c836ee
 DIST mpc-1.3.0.tar.gz 773441 BLAKE2B b9e2f4cda2457b1e885e4099daaf55a4c226291ec60097e40835f6e311c297947fe5cfd6ce61f80eecfbc8d374923422c4050a10399b26b23c12ab0f3f53a0f5 SHA512 9c18b24f7542dc1dc5e10cf58fd242e73d79a9dc3619c3f08d52aed75ad0e7d9e2ba2c46857717c8b921b084af2efc8c0d2d7173081af764b81c24a8971ddd9a
-EBUILD mpc-1.2.1.ebuild 907 BLAKE2B b56827cc6a774e09e4ce46ba7e04be151f563c733eae3952f474d7ed6ab3cbdc80e5ce6fcdcb4d7873dc19aa1750c342619a198734707e0185a6c26b605826c4 SHA512 b853fbbed5a89c823e66a65dd84f550e0f9c054eafcc4027f5bc8fd4f2c6584f0a2e9b1b03d93f87bef52dd264751666ab11ca3325ac833129004466670d2dbd
-EBUILD mpc-1.3.0.ebuild 1051 BLAKE2B df9b0084406c9c17e6c952a2cc3ffed5e3e8fc1ccb4d3ea53011c6f026bd972c747e3c679a2d3fc6b31be1d2ac1b4cab48c7a87ce685deefe8d9c75a62defd4f SHA512 fbb40a58fac8074a9713ae88738ad26528c03067dbeb1820755cf10c535ae2fdd4e5503360618f568100639990052821b0f7206cb6afb828715133f7c5867bf2
+EBUILD mpc-1.2.1.ebuild 939 BLAKE2B 7af59b1cc4ede3496d708bf774dba385dd88ae88d1935f51b342f93f7cd02686687176f6a5723c73fbcbbc945b8ec07bf38b43ab94082c9fca41a62b01e9901c SHA512 59e817cb235cce2ada39eb88c9856e329325833e898ca6e5a779c7cebb4b1b9ba0d9ad374e39667b9056ee665768651c493db4c3c2e902ec176a59384828f211
+EBUILD mpc-1.3.0.ebuild 1083 BLAKE2B a00bf2001c3a52e9bdbe05acd38bfdb53ba83454d76757d9356e2cf1a196e424c01873dad8a5e5334cfccfebf83d6325c64acbd32cee88f2d09c6b59923c82c2 SHA512 d38cd71469e45a15608cba00d9268770da61b373f573f6b2c9b9f58d163984f3cdec82eb5f7ba9d25f29eda9855c8fa8fc47c1b726a59122093fdb25d65c2863
 MISC metadata.xml 262 BLAKE2B fe330d67755784d14f5c5d664d7127d3cdb9edfab55b907ae3632f434d86323604f5095e1c1a9fbd169ae7a4cbb38f359e55f75047531786247c0674a4a53715 SHA512 3bcaca4e730edeed06fed73e79a5ce0a3358174672735ea4b27240c6c421ac9c33bc2b63a31e596fe1bbb6b1816c16cbc7ef4f258ca906ba04ea7db4aedc86b9
diff --git a/dev-libs/mpc/mpc-1.2.1.ebuild b/dev-libs/mpc/mpc-1.2.1.ebuild
index 4198499ae66c..01a56d4d819a 100644
--- a/dev-libs/mpc/mpc-1.2.1.ebuild
+++ b/dev-libs/mpc/mpc-1.2.1.ebuild
@@ -6,7 +6,7 @@ EAPI=7
 inherit multilib-minimal
 
 DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
-HOMEPAGE="https://www.multiprecision.org/mpc/"
+HOMEPAGE="https://www.multiprecision.org/mpc/ https://gitlab.inria.fr/mpc/mpc"
 SRC_URI="mirror://gnu/${PN}/${P}.tar.gz"
 
 LICENSE="LGPL-2.1"
diff --git a/dev-libs/mpc/mpc-1.3.0.ebuild b/dev-libs/mpc/mpc-1.3.0.ebuild
index deb382f0c2ab..aa330fda2d8a 100644
--- a/dev-libs/mpc/mpc-1.3.0.ebuild
+++ b/dev-libs/mpc/mpc-1.3.0.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit multilib-minimal
 
 DESCRIPTION="A library for multiprecision complex arithmetic with exact rounding"
-HOMEPAGE="https://www.multiprecision.org/mpc/"
+HOMEPAGE="https://www.multiprecision.org/mpc/ https://gitlab.inria.fr/mpc/mpc"
 
 if [[ ${PV} == *_rc* ]] ; then
 	SRC_URI="https://www.multiprecision.org/downloads/${P/_}.tar.gz"
diff --git a/dev-libs/nss/Manifest b/dev-libs/nss/Manifest
index c595fde312ea..e8033c090419 100644
--- a/dev-libs/nss/Manifest
+++ b/dev-libs/nss/Manifest
@@ -3,9 +3,12 @@ AUX nss-3.23-hppa-byte_order.patch 460 BLAKE2B 97358cc8fbea0b0d3beee0697833e48ef
 AUX nss-3.53-gentoo-fixups.patch 6886 BLAKE2B 1c605d8db02ebe0492c41955207368197a79990e43e219a71962cb28ac0cecd9e0acc2b76e16f5b116fdb8bf8790d96046cb4f376df9b8634ac48e54924589f8 SHA512 51031f92519f57d4b57a547cf549f2d5da1c5a7212d4b304fb0d71d6a85a5aefd64724ec9075c14c9b49c1e99c3ffe91cbec501c3504985aa9b16eacf2aa15ed
 AUX nss-3.79-fix-client-cert-crash.patch 912 BLAKE2B e05e061c7a0d82af6f00bf9ff68190510ea81ac3db5320bc27e673b1b3aad6da3b6a05791c4d1e725fdb292668667ba4aa4209315e31fd590c9d49214e672088 SHA512 dacf289225f6cfde8ff2756f2d16d809c3c73ceab15cda45e7afc58f2c69385232e9b0953519adca5cfeb7f50595b083f9a1f127af29adec4445b7b58c4ee072
 AUX nss-3.79-gcc-13.patch 1058 BLAKE2B d0249304f09fdea7e391732e7da63344c3e29c1856cb5ddb9e55a27305ab050077d138d9a8fdfbd6573bd7e7a345ed39f506e534464c3caaae925d1717b75edb SHA512 24dd41401b44ce86498a9b42f96068dbf58c6814ab18453db0615d49bdf327610a1ee2b0e32a2905a1c34364abd8d4c162a179f6b57cac19068babebbed229b4
+AUX nss-3.87-fix-client-cert-crash.patch 1506 BLAKE2B 09d37926a38ff4945acd6b1e03212dd2b25386ee9db4b05e95fc314782af03c875217921686a9ae8a34c9909b208feb1949d5188f7ca78ce8d1a0d47a2cce38f SHA512 f7b864960276954ca4df684327f51c2111f006ff1e77536945c1601a4fabddf3acd6134d78694c565d484739585c943b47c1405523997c684fdcae3ec50a9763
 DIST nss-3.79.2.tar.gz 84825187 BLAKE2B 9589095a0f3af5201662fe96ba4dac73c661db3abde534941ea61d597dce1016dc06f8559e26fafc940f2b123987381e1faa22ff6a995ef3cc0a9dc4ebe7a4ad SHA512 52ca7574d2bb6e2fd874ac40f3e75d58135b103d8bd4b964a9262b5c302b4668ff7c8f5dabbef46e413fd72faeddc44057bc7b489946813331cc9a481d078181
 DIST nss-3.85.tar.gz 84717969 BLAKE2B 644a51cd747078688233850bee6884b7ee30076411d783a4fb2982ffc35883f51784440d8c1c727251f664c4e5b5071be9881abc8315e0294d7da0cb8727e897 SHA512 97cfffa2beed1dba5d31e0c6e450553e5a8c78b427521640adb00c05d9d63cd64dc08388f0dbf96c93efb79f5daf4ba8db8d026b0b43d2e5c865a9b833fc77a1
+DIST nss-3.86.tar.gz 71423531 BLAKE2B 36703d99d9616020a165085469be650c2f4ce3e11c2f4f6bd974b1b89f1b9fcfdaa4ffd4d6ee98dabce82e616c170548efa1e51722b524dda8815faccfcf5181 SHA512 c09aeb52d7898617b65a1090cbdd29f6457eff2ebdc61aadb2dbf7b5044eae010ee5eeea729825f1258902936a61a1bff552ee9b26b2f01e5d448bbd8791d1cb
 DIST nss-cacert-class1-class3-r2.patch 21925 BLAKE2B 7627ff9a09f084c19d72d0490676865e3cab3ca7c920ae1ce4bea2db664f37fd0aa84fcda919809a516891ab2a62e2e7a43a9d6ada4c231adfe4c216525fac7d SHA512 1ce6ff9ab310aaca9005eafb461338b291df8523cc7044e096cd75774ce746c26eed19ec6bb2643c6c67f94650f2f309463492d80a90568f38ce2557f8ada2f4
 EBUILD nss-3.79.2.ebuild 10529 BLAKE2B f6396c9e295c46ffc0f9f811251f459b42515212c4ed8c5c21db1b6df1a1aa84b8da4385749d8067ce1f0d95633dd9de6eba146e599c3da4a4190b4906e9f878 SHA512 1b4c4b0471816d4ab89745bd3e34b232adafc93537ff631413e7e4cee460167504d1b972a1c48b0b3c6bb324a8b2e564b162b1bb63f73ac5413599239b15ec30
 EBUILD nss-3.85.ebuild 10683 BLAKE2B 7c6f326fedd043055aeb0ab5fc59955ee9c3eca7a789302f8004501db9272da60146e8d71cba630acab8a443a180ff914d47fa714c4e381c42660470cdf79a51 SHA512 1d5083890f6d381a1a22c7478a6b0bb15ae435262c14bd68d228b7b706de8aed63fe66c16970d44620180b362babbe8f29e5342510f1fc9804520afb9674b873
+EBUILD nss-3.86.ebuild 10683 BLAKE2B 1d3961ac99b3ca5f63d668c4fe00e0d1b3606fd6fafbae764fae5c4d82da15a7bed94c0d3d4b21b041c7d8e4a943b783864d90188dd7f6cb0273f343cb58a514 SHA512 e40ae69225ca409e1dec6946699051ae054d755fd45060e6f51bf1e5b9b4a360ebecb808f4c6608e97e9501a103fb9c67b9c14b42df587dc5489d28190366bd9
 MISC metadata.xml 517 BLAKE2B 85fba14d0b8a3539c57b8dca15a0f7789bb78a92891ff39271f804fa07b1620f5f3ece89269e3305b578064a53aeae7ab298bb97cdc019f41793888d42159727 SHA512 7b1fba5488498d5499134f1b58ecaa01cb8c51af3da666d55fba3884703d34efb57b449e76461fb6e13c37687bf5125c5dbab1934a950d4d13c0cff5a3b3318e
diff --git a/dev-libs/nss/files/nss-3.87-fix-client-cert-crash.patch b/dev-libs/nss/files/nss-3.87-fix-client-cert-crash.patch
new file mode 100644
index 000000000000..2f8c3b37219b
--- /dev/null
+++ b/dev-libs/nss/files/nss-3.87-fix-client-cert-crash.patch
@@ -0,0 +1,38 @@
+diff --git a/lib/ssl/authcert.c b/lib/ssl/authcert.c
+--- a/lib/ssl/authcert.c
++++ b/lib/ssl/authcert.c
+@@ -204,10 +204,13 @@
+     if (certList == NULL) {
+         certList = CERT_FindUserCertsByUsage(CERT_GetDefaultCertDB(),
+                                              certUsageSSLClient,
+                                              PR_FALSE, chosenNickName == NULL,
+                                              pw_arg);
++        if (certList == NULL) {
++            return SECFailure;
++        }
+         /* filter only the certs that meet the nickname requirements */
+         if (chosenNickName) {
+             rv = CERT_FilterCertListByNickname(certList, chosenNickName,
+                                                pw_arg);
+         } else {
+@@ -217,17 +220,14 @@
+                                               certUsageSSLClient);
+             ssl_FreeDistNamesStrings(names, nnames);
+         }
+         if ((rv != SECSuccess) || CERT_LIST_EMPTY(certList)) {
+             CERT_DestroyCertList(certList);
+-            certList = NULL;
++            return SECFailure;
+         }
+     }
+-    if (certList == NULL) {
+-        /* no user certs meeting the nickname/usage requirements found */
+-        return SECFailure;
+-    }
++
+     /* now remove any certs that can't meet the connection requirements */
+     rv = ssl_FilterClientCertListBySSLSocket(ss, certList);
+     if ((rv != SECSuccess) || CERT_LIST_EMPTY(certList)) {
+         // no certs left.
+         CERT_DestroyCertList(certList);
+
diff --git a/dev-libs/nss/nss-3.86.ebuild b/dev-libs/nss/nss-3.86.ebuild
new file mode 100644
index 000000000000..c817a9a7e558
--- /dev/null
+++ b/dev-libs/nss/nss-3.86.ebuild
@@ -0,0 +1,395 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic multilib toolchain-funcs multilib-minimal
+
+NSPR_VER="4.35"
+RTM_NAME="NSS_${PV//./_}_RTM"
+
+DESCRIPTION="Mozilla's Network Security Services library that implements PKI support"
+HOMEPAGE="https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS"
+SRC_URI="https://archive.mozilla.org/pub/security/nss/releases/${RTM_NAME}/src/${P}.tar.gz
+	cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )"
+
+LICENSE="|| ( MPL-2.0 GPL-2 LGPL-2.1 )"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+IUSE="cacert test +utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx"
+RESTRICT="!test? ( test )"
+# pkg-config called by nss-config -> virtual/pkgconfig in RDEPEND
+RDEPEND="
+	>=dev-libs/nspr-${NSPR_VER}[${MULTILIB_USEDEP}]
+	>=dev-db/sqlite-3.8.2[${MULTILIB_USEDEP}]
+	>=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}]
+	virtual/pkgconfig
+"
+DEPEND="${RDEPEND}"
+BDEPEND="dev-lang/perl"
+
+S="${WORKDIR}/${P}/${PN}"
+
+MULTILIB_CHOST_TOOLS=(
+	/usr/bin/nss-config
+)
+
+PATCHES=(
+	# Custom changes for gentoo
+	"${FILESDIR}/${PN}-3.53-gentoo-fixups.patch"
+	"${FILESDIR}/${PN}-3.21-gentoo-fixup-warnings.patch"
+	"${FILESDIR}/${PN}-3.23-hppa-byte_order.patch"
+	"${FILESDIR}/${PN}-3.87-fix-client-cert-crash.patch"
+)
+
+QA_PKGCONFIG_VERSION="${PV}.0"
+
+src_prepare() {
+	default
+
+	if use cacert ; then
+		eapply -p2 "${DISTDIR}"/nss-cacert-class1-class3-r2.patch
+	fi
+
+	pushd coreconf >/dev/null || die
+	# hack nspr paths
+	echo 'INCLUDES += -I$(DIST)/include/dbm' \
+		>> headers.mk || die "failed to append include"
+
+	# modify install path
+	sed -e '/CORE_DEPTH/s:SOURCE_PREFIX.*$:SOURCE_PREFIX = $(CORE_DEPTH)/dist:' \
+		-i source.mk || die
+
+	# Respect LDFLAGS
+	sed -i -e 's/\$(MKSHLIB) -o/\$(MKSHLIB) \$(LDFLAGS) -o/g' rules.mk
+
+	# Workaround make-4.4's change to sub-make, bmo#1800237, bgo#882069
+	sed -i -e "s/^CPU_TAG = _.*/CPU_TAG = _$(nssarch)/" Linux.mk || die
+
+	popd >/dev/null || die
+
+	# Fix pkgconfig file for Prefix
+	sed -i -e "/^PREFIX =/s:= /usr:= ${EPREFIX}/usr:" \
+		config/Makefile || die
+
+	# use host shlibsign if need be #436216
+	if tc-is-cross-compiler ; then
+		sed -i \
+			-e 's:"${2}"/shlibsign:shlibsign:' \
+			cmd/shlibsign/sign.sh || die
+	fi
+
+	# dirty hack
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../freebl/\$(OBJDIR):" \
+		lib/ssl/config.mk || die
+	sed -i -e "/CRYPTOLIB/s:\$(SOFTOKEN_LIB_DIR):../../lib/freebl/\$(OBJDIR):" \
+		cmd/platlibs.mk || die
+
+	multilib_copy_sources
+
+	strip-flags
+}
+
+multilib_src_configure() {
+	# Ensure we stay multilib aware
+	sed -i -e "/@libdir@/ s:lib64:$(get_libdir):" config/Makefile || die
+}
+
+nssarch() {
+	# Most of the arches are the same as $ARCH
+	local t=${1:-${CHOST}}
+	case ${t} in
+		*86*-pc-solaris2*) echo "i86pc"   ;;
+		aarch64*)          echo "aarch64" ;;
+		hppa*)             echo "parisc"  ;;
+		i?86*)             echo "i686"    ;;
+		x86_64*)           echo "x86_64"  ;;
+		*)                 tc-arch ${t}   ;;
+	esac
+}
+
+nssbits() {
+	local cc cppflags="${1}CPPFLAGS" cflags="${1}CFLAGS"
+	if [[ ${1} == BUILD_ ]]; then
+		cc=$(tc-getBUILD_CC)
+	else
+		cc=$(tc-getCC)
+	fi
+	echo > "${T}"/test.c || die
+	${cc} ${!cppflags} ${!cflags} -c "${T}"/test.c -o "${T}/${1}test.o" || die
+	case $(file "${T}/${1}test.o") in
+		*32-bit*x86-64*) echo USE_X32=1;;
+		*64-bit*|*ppc64*|*x86_64*) echo USE_64=1;;
+		*32-bit*|*ppc*|*i386*) ;;
+		*) die "Failed to detect whether ${cc} builds 64bits or 32bits, disable distcc if you're using it, please";;
+	esac
+}
+
+multilib_src_compile() {
+	# use ABI to determine bit'ness, or fallback if unset
+	local buildbits mybits
+	case "${ABI}" in
+		n32) mybits="USE_N32=1";;
+		x32) mybits="USE_X32=1";;
+		s390x|*64) mybits="USE_64=1";;
+		${DEFAULT_ABI})
+			einfo "Running compilation test to determine bit'ness"
+			mybits=$(nssbits)
+			;;
+	esac
+	# bitness of host may differ from target
+	if tc-is-cross-compiler; then
+		buildbits=$(nssbits BUILD_)
+	fi
+
+	local makeargs=(
+		CC="$(tc-getCC)"
+		CCC="$(tc-getCXX)"
+		AR="$(tc-getAR) rc \$@"
+		RANLIB="$(tc-getRANLIB)"
+		OPTIMIZER=
+		${mybits}
+		disable_ckbi=0
+	)
+
+	# Take care of nspr settings #436216
+	local myCPPFLAGS="${CPPFLAGS} $($(tc-getPKG_CONFIG) nspr --cflags)"
+	unset NSPR_INCLUDE_DIR
+
+	export NSS_ALLOW_SSLKEYLOGFILE=1
+	export NSS_ENABLE_WERROR=0 #567158
+	export BUILD_OPT=1
+	export NSS_USE_SYSTEM_SQLITE=1
+	export NSDISTMODE=copy
+	export FREEBL_NO_DEPEND=1
+	export FREEBL_LOWHASH=1
+	export NSS_SEED_ONLY_DEV_URANDOM=1
+	export USE_SYSTEM_ZLIB=1
+	export ZLIB_LIBS=-lz
+	export ASFLAGS=""
+	# Fix build failure on arm64
+	export NS_USE_GCC=1
+	# Detect compiler type and set proper environment value
+	if tc-is-gcc; then
+		export CC_IS_GCC=1
+	elif tc-is-clang; then
+		export CC_IS_CLANG=1
+	fi
+
+	export NSS_DISABLE_GTESTS=$(usex !test 1 0)
+
+	# explicitly disable altivec/vsx if not requested
+	# https://bugs.gentoo.org/789114
+	case ${ARCH} in
+		ppc*)
+			use cpu_flags_ppc_altivec || export NSS_DISABLE_ALTIVEC=1
+			use cpu_flags_ppc_vsx || export NSS_DISABLE_CRYPTO_VSX=1
+			;;
+	esac
+
+	local d
+
+	# Build the host tools first.
+	LDFLAGS="${BUILD_LDFLAGS}" \
+	XCFLAGS="${BUILD_CFLAGS}" \
+	NSPR_LIB_DIR="${T}/fakedir" \
+	emake -C coreconf \
+		CC="$(tc-getBUILD_CC)" \
+		${buildbits-${mybits}}
+	makeargs+=( NSINSTALL="${PWD}/$(find -type f -name nsinstall)" )
+
+	# Then build the target tools.
+	for d in . lib/dbm ; do
+		CPPFLAGS="${myCPPFLAGS}" \
+		XCFLAGS="${CFLAGS} ${CPPFLAGS}" \
+		NSPR_LIB_DIR="${T}/fakedir" \
+		emake "${makeargs[@]}" -C ${d} OS_TEST="$(nssarch)"
+	done
+}
+
+multilib_src_test() {
+	einfo "Tests can take a *long* time, especially on a multilib system."
+	einfo "30-45+ minutes per lib configuration. Bug #852755"
+
+	# https://www.linuxfromscratch.org/blfs/view/svn/postlfs/nss.html
+	# https://firefox-source-docs.mozilla.org/security/nss/legacy/nss_sources_building_testing/index.html#running_the_nss_test_suite
+	# https://www-archive.mozilla.org/projects/security/pki/nss/testnss_32.html (older)
+	export BUILD_OPT=1
+	export HOST="localhost"
+	export DOMSUF="localdomain"
+	export USE_IP=TRUE
+	export IP_ADDRESS="127.0.0.1"
+
+	NSINSTALL="${PWD}/$(find -type f -name nsinstall)"
+
+	cd "${BUILD_DIR}"/tests || die
+	# Hack to get current objdir (prefixed dir where built binaries are)
+	# Without this, at least multilib tests go wrong when building the amd64 variant
+	# after x86.
+	local objdir=$(find "${BUILD_DIR}"/dist -maxdepth 1 -iname Linux* | rev | cut -d/ -f1 | rev)
+
+	# Can tweak to a subset of tests in future if we need to, but would prefer not
+	OBJDIR="${objdir}" DIST="${BUILD_DIR}/dist" MOZILLA_ROOT="${BUILD_DIR}" ./all.sh || die
+}
+
+# Altering these 3 libraries breaks the CHK verification.
+# All of the following cause it to break:
+# - stripping
+# - prelink
+# - ELF signing
+# http://www.mozilla.org/projects/security/pki/nss/tech-notes/tn6.html
+# Either we have to NOT strip them, or we have to forcibly resign after
+# stripping.
+#local_libdir="$(get_libdir)"
+#export STRIP_MASK="
+#	*/${local_libdir}/libfreebl3.so*
+#	*/${local_libdir}/libnssdbm3.so*
+#	*/${local_libdir}/libsoftokn3.so*"
+
+export NSS_CHK_SIGN_LIBS="freebl3 nssdbm3 softokn3"
+
+generate_chk() {
+	local shlibsign="$1"
+	local libdir="$2"
+	einfo "Resigning core NSS libraries for FIPS validation"
+	shift 2
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libname=lib${i}.so
+		local chkname=lib${i}.chk
+		"${shlibsign}" \
+			-i "${libdir}"/${libname} \
+			-o "${libdir}"/${chkname}.tmp \
+		&& mv -f \
+			"${libdir}"/${chkname}.tmp \
+			"${libdir}"/${chkname} \
+		|| die "Failed to sign ${libname}"
+	done
+}
+
+cleanup_chk() {
+	local libdir="$1"
+	shift 1
+	local i
+	for i in ${NSS_CHK_SIGN_LIBS} ; do
+		local libfname="${libdir}/lib${i}.so"
+		# If the major version has changed, then we have old chk files.
+		[ ! -f "${libfname}" -a -f "${libfname}.chk" ] \
+			&& rm -f "${libfname}.chk"
+	done
+}
+
+multilib_src_install() {
+	pushd dist >/dev/null || die
+
+	dodir /usr/$(get_libdir)
+	cp -L */lib/*$(get_libname) "${ED}"/usr/$(get_libdir) || die "copying shared libs failed"
+	local i
+	for i in crmf freebl nssb nssckfw ; do
+		cp -L */lib/lib${i}.a "${ED}"/usr/$(get_libdir) || die "copying libs failed"
+	done
+
+	# Install nss-config and pkgconfig file
+	dodir /usr/bin
+	cp -L */bin/nss-config "${ED}"/usr/bin || die
+	dodir /usr/$(get_libdir)/pkgconfig
+	cp -L */lib/pkgconfig/nss.pc "${ED}"/usr/$(get_libdir)/pkgconfig || die
+
+	# create an nss-softokn.pc from nss.pc for libfreebl and some private headers
+	# bug 517266
+	sed 	-e 's#Libs:#Libs: -lfreebl#' \
+		-e 's#Cflags:#Cflags: -I${includedir}/private#' \
+		*/lib/pkgconfig/nss.pc >"${ED}"/usr/$(get_libdir)/pkgconfig/nss-softokn.pc \
+		|| die "could not create nss-softokn.pc"
+
+	# all the include files
+	insinto /usr/include/nss
+	doins public/nss/*.{h,api}
+	insinto /usr/include/nss/private
+	doins private/nss/{blapi,alghmac,cmac}.h
+
+	popd >/dev/null || die
+
+	local f nssutils
+	# Always enabled because we need it for chk generation.
+	nssutils=( shlibsign )
+
+	if multilib_is_native_abi ; then
+		if use utils; then
+			# The tests we do not need to install.
+			#nssutils_test="bltest crmftest dbtest dertimetest
+			#fipstest remtest sdrtest"
+			# checkcert utils has been removed in nss-3.22:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1187545
+			# https://hg.mozilla.org/projects/nss/rev/df1729d37870
+			# certcgi has been removed in nss-3.36:
+			# https://bugzilla.mozilla.org/show_bug.cgi?id=1426602
+			nssutils+=(
+				addbuiltin
+				atob
+				baddbdir
+				btoa
+				certutil
+				cmsutil
+				conflict
+				crlutil
+				derdump
+				digest
+				makepqg
+				mangle
+				modutil
+				multinit
+				nonspr10
+				ocspclnt
+				oidcalc
+				p7content
+				p7env
+				p7sign
+				p7verify
+				pk11mode
+				pk12util
+				pp
+				rsaperf
+				selfserv
+				signtool
+				signver
+				ssltap
+				strsclnt
+				symkeyutil
+				tstclnt
+				vfychain
+				vfyserv
+			)
+			# install man-pages for utils (bug #516810)
+			doman doc/nroff/*.1
+		fi
+		pushd dist/*/bin >/dev/null || die
+		for f in ${nssutils[@]}; do
+			dobin ${f}
+		done
+		popd >/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	multilib_pkg_postinst() {
+		# We must re-sign the libraries AFTER they are stripped.
+		local shlibsign="${EROOT}/usr/bin/shlibsign"
+		# See if we can execute it (cross-compiling & such). #436216
+		"${shlibsign}" -h >&/dev/null
+		if [[ $? -gt 1 ]] ; then
+			shlibsign="shlibsign"
+		fi
+		generate_chk "${shlibsign}" "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postinst
+}
+
+pkg_postrm() {
+	multilib_pkg_postrm() {
+		cleanup_chk "${EROOT}"/usr/$(get_libdir)
+	}
+
+	multilib_foreach_abi multilib_pkg_postrm
+}
diff --git a/dev-libs/openssl/Manifest b/dev-libs/openssl/Manifest
index 18ebc5152e70..429561dfa5ad 100644
--- a/dev-libs/openssl/Manifest
+++ b/dev-libs/openssl/Manifest
@@ -13,6 +13,6 @@ DIST openssl-3.0.7.tar.gz 15107575 BLAKE2B 141881071fa62f056c514e7c653a61c59cc45
 DIST openssl-3.0.7.tar.gz.asc 858 BLAKE2B bd07a6f656cce817038743caf1131ef8d7a21bf587e706e32771ad9e09cb4821d21b71171a7fe7bb6bece95e9b06cea6d723aae9de8b62049b5a8316578500be SHA512 9093a8a5a990f5f37bd95e7ca55f2371e59242be408ea7d9403bcfc9c8873c022237e13c0ec81881a20607ea46927887a895a82b6f50c6f423b4c54f9ef0cde1
 EBUILD openssl-1.0.2u-r1.ebuild 9980 BLAKE2B 0017b72acb2eb86f2927845903c93aacfc9c2812ecc5dd5daa23ffc6dd961a4258181ac2c085798b228df5aa23fff2faf476f880406a7c0eeecde3a8391d6a11 SHA512 7aadb788732ee4dbf32ba34567c8ffc897354ac4028f26ec60fab8f099a445c494825bcaad7a5bc053a1ca3f70bfc0f9e944cce5a4051708555cae24c6c5b9a9
 EBUILD openssl-1.1.1q.ebuild 10190 BLAKE2B d43cbde3d6b34a33f7937b59d0a2770290cc342ff664796bca1c546d2a70ba609d0d8f035c1cf2d8f339bcd82ab651e970a5d9ee55a2a6734a2e17b7187aff59 SHA512 47e480e4344753939cd8f64c1e7dd36eed12b8568cc18dd9691bb4d231088d2f77d1ba5fb79f2f9f3ec18b3bb8fb9c118bbb716af91d0023fe920fc968f081ee
-EBUILD openssl-1.1.1s.ebuild 10164 BLAKE2B 39774f590af57643ae411bdec71db1ae0372cf1860e577af01231dbe42f4b55fde162e7eb06baef279ee9b07a27139fdadc12e68c90ce07ba5feb7bf8549d8ab SHA512 dde3cec005675b17e80424d6ccfe3f49b8e8b88786925d5b9cbe682c4a1683542ae9a1f90425d12170df9d0c7dc8f59fd16417e977d05de91fb8c61470beb4f5
+EBUILD openssl-1.1.1s.ebuild 10160 BLAKE2B c489bd00d3b4f4adae8047ff73efa21cb64259ffc4934be7f815c50f9694415c311fc2781cc37dbef925bb56dc0c9aa3d56787d52be6d41d17d7ad2f6c626444 SHA512 e54558cc369590e5c5ac7c0bb34efd76ff5821180bbfa14ada88cca11865c694f50776d89204662a2c6aefe393497b1c3de7d9ff0f4fcb250eeecab70ec2bc22
 EBUILD openssl-3.0.7.ebuild 9822 BLAKE2B 3e02ff1e501324bef649599d0a72a3e98a7964008ec58843ec50c50a4a55f31f390cc9a788a75ce5667b5526247d827c9a84a7aea4cdf76f84e6a18d7bfb419a SHA512 c50987dca5505ccc416c4c88bb41f05e5578a694a1a9cacbde337e36de27a0003badedeb096614965f646ba4e79e387a3b8dbb9c0ff34e26a4466c309a013c22
 MISC metadata.xml 1664 BLAKE2B cf9d4613e5387e7ec0787b1a6c137baa71effb8458fa63b5dea0be4d5cf7c8607257262dbf89dcc0c3db7b17b10232d32902b7569827bd4f2717b3ef7dffaaa9 SHA512 01deef1de981201c14101630d2a4ae270abcac9a4b27b068359d76f63aeb6075aceb33db60175c105294cb7045aae389168f4cf1edf0f6e3656ccc2fe92e9c92
diff --git a/dev-libs/openssl/openssl-1.1.1s.ebuild b/dev-libs/openssl/openssl-1.1.1s.ebuild
index 1314b4d0326b..6585b0d00025 100644
--- a/dev-libs/openssl/openssl-1.1.1s.ebuild
+++ b/dev-libs/openssl/openssl-1.1.1s.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 LICENSE="openssl"
 SLOT="0/1.1" # .so version of libssl/libcrypto
 if [[ ${PV} != *_pre* ]] ; then
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 IUSE="+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers"
 RESTRICT="!test? ( test )"
diff --git a/dev-libs/pocl/Manifest b/dev-libs/pocl/Manifest
index f9b8cac79d06..6fd7a30771f1 100644
--- a/dev-libs/pocl/Manifest
+++ b/dev-libs/pocl/Manifest
@@ -2,5 +2,7 @@ AUX pocl-3.0-cuda.patch 1611 BLAKE2B 6baaac79d0182ac91210c0be40239f7d955b57cb2ae
 AUX pocl-3.0-fix-version.patch 354 BLAKE2B 8e2b4570c204dc37bb70f20b01838f0c21a6aec57c258a206eb5e82bed69fe01d65f704cfd184c102102fd3a06eb75fb092a2ccfa4d8729192451fa894afc7e9 SHA512 bfe023132ab8080c8539a783586f9c556e7ae4cb8113c3c96b33ac02bd7d4044b36bf13e1556e181af9c12acb4b0e0778af25fd66df1fe6e7ab533c2b68108c4
 AUX pocl-3.0-icd.patch 5679 BLAKE2B 4f9edba1e71afb8c059da8f1adcb59f0ccca1bb33ad0c05eb2d3b27c1e7ea6bfa3a2d60f6e6c83136146275aed35a6501713883dad72011379e0ed4ae64eba74 SHA512 436b7f6e53372f00a8c70bb00229d22d05f24687ba2822f4b26590cbdffe64e8c2909d2f1ab6e0650fe18db7507c6bba9f5bcee1a09ec1fe5b42955ddcb99db7
 DIST pocl-3.0.tar.gz 1722809 BLAKE2B 095d3d1dca3fa7ebdf61e6e34bf444755dd6842c4f16e0f80895337e96508056465d332309d38ee4db6d6b0031e1dfce350485750e59bfe0dea5951eba5fd3e4 SHA512 dc02bdf259792edb5cb3c80cde5c5261e1e21219b4b31420a3b537abbca1bc478ce0ca0dfc622727088b67d580217d47566309de7c6114a24553de4496a209ea
+DIST pocl-3.1.tar.gz 1928607 BLAKE2B 7044a96e361426408fabd973987a0d6956693e3c9095769ee94d7dac47a8841d7489933e94acd22451a1c8a2ca83cb8e6948aebe899b23a8a6080ef1b7b37e9c SHA512 40d17e81d715f6897aa1d97fd02834d45227d9d0bd4c70e76d727f9ad4df675c25b7158a862e20e63810182fdad82a3cb1e454668c3a6422a977e59c8325fa0c
 EBUILD pocl-3.0.ebuild 3696 BLAKE2B 352e60e2beb92a82af44eaf517afd6595b2e2049ba45b23fdcd2fe3ccd0945339a51c5c120ed699b20ac46120fff625bba7ac22e44f1039688278cf971be9eae SHA512 d6b6bc402ae1c5f87062b2aa36fb933ace430d6f87d0a33458cd2b7d444460b6ba0f9c601c047934ce1cb6163c4be9bd33a76e3011a018c9e0a2c67b5a92b149
+EBUILD pocl-3.1.ebuild 3556 BLAKE2B 7e905180cf23ea7f97183338656204cc3a3eb90072e5dfb03a7001e73a9752c38f13fe143fecdd91ea33e040dc97c8786c8133ceb65015a62d48020a1689eb82 SHA512 4b71408754a00c444942d279161ae45d4f04b3c23764dbe063c6cc8cf5a24bfaf8b750fe7b8a75939e170868640b56cf91be4000bf461476cd24bbfc48f7b851
 MISC metadata.xml 1191 BLAKE2B 62b985abe8c99532cc20302846fe9e05c77bbc993ef38863d44bd754df2bc388e5d094917ad11d1b117e9dfda355e35f5592fc2ede5a3bc8e91939c9e6aef9e3 SHA512 a9cdbff5f2b2e2141c6299137baed08d1e8482f3b976ef494b595f58092761aab66f33e539d236d8b7f1c564d5fa2aac4855447b54bc189f1dd81faf25fc32ec
diff --git a/dev-libs/pocl/pocl-3.1.ebuild b/dev-libs/pocl/pocl-3.1.ebuild
new file mode 100644
index 000000000000..b850953e2668
--- /dev/null
+++ b/dev-libs/pocl/pocl-3.1.ebuild
@@ -0,0 +1,136 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DOCS_AUTODOC=0
+DOCS_BUILDER="sphinx"
+DOCS_DIR="doc/sphinx/source"
+PYTHON_COMPAT=( python3_{8..10} pypy3 )
+LLVM_MAX_SLOT=15
+
+inherit cmake llvm python-any-r1 docs
+
+DESCRIPTION="Portable Computing Language (an implementation of OpenCL)"
+HOMEPAGE="http://portablecl.org https://github.com/pocl/pocl"
+SRC_URI="https://github.com/pocl/pocl/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+# TODO: hsa tce
+IUSE="accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager lto test"
+# Tests not yet passing, fragile in Portage environment(?)
+RESTRICT="!test? ( test ) test"
+
+# TODO: add dependencies for cuda
+# Note: No := on LLVM because it pulls in Clang
+# see llvm.eclass for why
+CLANG_DEPS="!cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):= )
+	cuda? ( <sys-devel/clang-$((${LLVM_MAX_SLOT} + 1)):=[llvm_targets_NVPTX] )"
+RDEPEND="
+	dev-libs/libltdl
+	<sys-devel/llvm-$((${LLVM_MAX_SLOT} + 1)):*
+	virtual/opencl
+
+	${CLANG_DEPS}
+	debug? ( dev-util/lttng-ust:= )
+	hwloc? ( sys-apps/hwloc:=[cuda?] )
+"
+DEPEND="${RDEPEND}"
+BDEPEND="${CLANG_DEPS}
+	virtual/pkgconfig
+	doc? (
+		$(python_gen_any_dep '<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]')
+	)"
+
+python_check_deps() {
+	python_has_version "<dev-python/markupsafe-2.0[${PYTHON_USEDEP}]"
+}
+
+llvm_check_deps() {
+	local usedep=$(usex cuda "[llvm_targets_NVPTX]" '')
+
+	# Clang is used at both build time (executed) and runtime
+	has_version -r "sys-devel/llvm:${LLVM_SLOT}${usedep}" && \
+		has_version -r "sys-devel/clang:${LLVM_SLOT}${usedep}" && \
+		has_version -b "sys-devel/clang:${LLVM_SLOT}${usedep}"
+}
+
+pkg_setup() {
+	use doc && python-any-r1_pkg_setup
+
+	llvm_pkg_setup
+}
+
+src_configure() {
+	local host_cpu_variants="generic"
+
+	if use amd64 ; then
+		# Use pocl's curated list of CPU variants which should contain a good match for any given amd64 CPU
+		host_cpu_variants="distro"
+	elif use ppc64 ; then
+		# A selection of architectures in which new Altivec / VSX features were added
+		# This attempts to recreate the amd64 "distro" option for ppc64
+		# See discussion in bug #831859
+		host_cpu_variants="pwr10;pwr9;pwr8;pwr7;pwr6;g5;a2;generic"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_HSA=OFF
+
+		-DENABLE_ICD=ON
+		-DPOCL_ICD_ABSOLUTE_PATH=ON
+		-DPOCL_INSTALL_PUBLIC_LIBDIR="${EPREFIX}/usr/$(get_libdir)/OpenCL/vendors/pocl"
+
+		-DENABLE_IPO=$(usex lto)
+
+		-DENABLE_POCL_BUILDING=ON
+		-DKERNELLIB_HOST_CPU_VARIANTS="${host_cpu_variants}"
+
+		-DSTATIC_LLVM=OFF
+		-DWITH_LLVM_CONFIG=$(get_llvm_prefix -d "${LLVM_MAX_SLOT}")/bin/llvm-config
+
+		-DENABLE_ALMAIF_DEVICE=$(usex accel)
+		-DENABLE_CONFORMANCE=$(usex conformance)
+		-DENABLE_CUDA=$(usex cuda)
+		-DENABLE_HWLOC=$(usex hwloc)
+		-DENABLE_POCL_FLOAT_CONVERSION=$(usex float-conversion)
+		-DHARDENING_ENABLE=$(usex hardening)
+		-DPOCL_DEBUG_MESSAGES=$(usex debug)
+		-DUSE_POCL_MEMMANAGER=$(usex memmanager)
+		-DENABLE_TESTS=$(usex test)
+	)
+
+	cmake_src_configure
+}
+
+src_compile() {
+	cmake_src_compile
+	docs_compile
+}
+
+src_test() {
+	export POCL_BUILDING=1
+	export POCL_DEVICES=basic
+	export CTEST_OUTPUT_ON_FAILURE=1
+	export TEST_VERBOSE=1
+
+	# Referenced https://github.com/pocl/pocl/blob/master/.drone.yml
+	# But couldn't seem to get tests working yet
+	cmake_src_test
+}
+
+src_install() {
+	cmake_src_install
+
+	if use doc; then
+		dodoc -r _build/html
+		docompress -x /usr/share/doc/${P}/html
+	fi
+
+	if use examples; then
+		dodoc -r examples
+		docompress -x /usr/share/doc/${P}/examples
+	fi
+}
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 5a2518a5e41c..8410e34f0703 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/ansible-compat/Manifest b/dev-python/ansible-compat/Manifest
index 77a59eb0fc7c..9c70f5cc7a8c 100644
--- a/dev-python/ansible-compat/Manifest
+++ b/dev-python/ansible-compat/Manifest
@@ -3,9 +3,11 @@ DIST ansible-compat-2.2.3.tar.gz 39603 BLAKE2B 16b88a1c669a74d858e4d47539811b33d
 DIST ansible-compat-2.2.4.tar.gz 39772 BLAKE2B a4874675086956e11de4df4068e3b17b65b4f9f7610bb88bfba308d880fe478e39a4450a362bb06a555a36a41731f336c51756893ebe65715fc022421c51a293 SHA512 ec30329b2aa07ea7685a8cd91438f0d0e9003644fb3d15a842277abc7f5f1eeed61bb606ca594d6496e1980be0109dd5e4021bc4aeb66d909a312bf02649a1b9
 DIST ansible-compat-2.2.5.tar.gz 39794 BLAKE2B 25a5c858eb3e120b7f51b8800b01eff2482a03d0e5f5c049d4ff2bc96ab2c01e856284f3328d5c9e3621b2d769df4450c9427997b48a7ddd337b01aa777e0c28 SHA512 8029d6dbd093414fb5eccba1789c881601a3a1f45bf7779f9e2af886d457e9c57a4e6432eed73a1d387b4d82617e1677a857cf0d2dfdcebcefa0dc790b2ec2d4
 DIST ansible-compat-2.2.6.tar.gz 38890 BLAKE2B 5022676dca1c2cb24e8f3e3387de8ef214979124b6d4a819f6328b2ffa0b19bddc5ef60131eb0133d809a214ecdf39fb5c01b197a44111e05a23740d4955c00c SHA512 b02faeb0202839c01a777277cd077264b44fbadbef679e93cb4ac0be3b81df921bc8f000e27372446326976acd1b42f1f1f42896ff0af9ba0677e7a93d06b195
+DIST ansible-compat-2.2.7.tar.gz 47378 BLAKE2B 58f3b19400fb7646d37c585df07435e65a60f3e57d445c98e8089c6a2ed853cb5dbab682d85cee1a604e1b4de6dd137faa12bf78fe7913752839f95bd651435f SHA512 9a3863be3d755eb5a1a61ba0c526786ea3df14bc6fcabd9196559eb625ab6dfc8de7a17fdb2cdd8ad71d7d61b5e2f0543b8b5908f39d5e7d9ea45e387aa625b1
 EBUILD ansible-compat-2.2.1.ebuild 1840 BLAKE2B f937d79b50bd20504a4d89ab09b669b011b685be6dc1a032f00998a4eeec2db837366e41e8b2f10175f39d2c1e1543ff4cb7e59831c881a148939a3ea4e911be SHA512 dbcadfd90dc993542d29333e23ed03d30ef2fa690f6739f1467e88c387017b61d89d12b40847e0cc7d855a2acc526907ebc8a918423a70145a0ad5a761b9c021
 EBUILD ansible-compat-2.2.3.ebuild 1841 BLAKE2B 904c48ad161c04d567bcbcda9595c9a477645fc2e142611227719e11a8df77aa5a2715bb8fdc1a01013941759baad984f923e49a66a0c831b046a9abab9c0cbe SHA512 7d77e77637814d7df743ca402e38a2815526dfc629e46653283d9f804cf688f699e13a06df2cf4c10b345ec9b5631aafbed9673d402315caa90f6a007ce69803
 EBUILD ansible-compat-2.2.4.ebuild 1739 BLAKE2B 0f604539a52e2a55a6bf17c2ddf8fb2216e0c0e56a2587a6aa230615cf93ef04ef4627f5f26ae20284ee964a87452cffa77f1a32acc3f666a97cf4defb983a45 SHA512 b3da667a719439973776c6fbe89dad891b018c435af21dd5463f7d78a94449853c977235811235aa8f4d6ecac327974f9db4203eefed2df456288b1f506a33ef
 EBUILD ansible-compat-2.2.5.ebuild 1676 BLAKE2B 55686af94a4a36e0d402b9f06f3a59a0f5e56995fd366dc3d8d8bfa490560a96ff36458ac1a101c46ee1c559ba8260a44de4e724308a64fb9a6b3923b6bb928f SHA512 2af563dd6ec88b37d4d2e41a8ba9f2236b67b3e32b79cbb53d4048329c7f554d8be926a9a7fe5fb628618ea6cf53ce71c54ee6ec2285229316cd4defbb23fc81
 EBUILD ansible-compat-2.2.6.ebuild 1676 BLAKE2B 55686af94a4a36e0d402b9f06f3a59a0f5e56995fd366dc3d8d8bfa490560a96ff36458ac1a101c46ee1c559ba8260a44de4e724308a64fb9a6b3923b6bb928f SHA512 2af563dd6ec88b37d4d2e41a8ba9f2236b67b3e32b79cbb53d4048329c7f554d8be926a9a7fe5fb628618ea6cf53ce71c54ee6ec2285229316cd4defbb23fc81
+EBUILD ansible-compat-2.2.7.ebuild 1676 BLAKE2B 55686af94a4a36e0d402b9f06f3a59a0f5e56995fd366dc3d8d8bfa490560a96ff36458ac1a101c46ee1c559ba8260a44de4e724308a64fb9a6b3923b6bb928f SHA512 2af563dd6ec88b37d4d2e41a8ba9f2236b67b3e32b79cbb53d4048329c7f554d8be926a9a7fe5fb628618ea6cf53ce71c54ee6ec2285229316cd4defbb23fc81
 MISC metadata.xml 510 BLAKE2B 3f47270866cb9acc5944b71547640b69003891268ffc07b5cd10e6ba8842b6f644ab4dea3b3da2d20b17f34d90e565b6f03a4dbb8ea38fa282fed283ac22fac1 SHA512 65d8604e46581bf9ecb3d8e358f3a211b18c51beea22c92a1cd3668ba86140e3bd8d91a38c221e73fe13a3e0da1cbfc2030b3f7733ee55e045530b49cd77d46d
diff --git a/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild b/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
new file mode 100644
index 000000000000..ea13f54d55c0
--- /dev/null
+++ b/dev-python/ansible-compat/ansible-compat-2.2.7.ebuild
@@ -0,0 +1,56 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..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/black/Manifest b/dev-python/black/Manifest
index 60cdaeb6c8ed..2a23c6023f2e 100644
--- a/dev-python/black/Manifest
+++ b/dev-python/black/Manifest
@@ -1,3 +1,5 @@
 DIST black-22.10.0.gh.tar.gz 1177403 BLAKE2B c8185f1cd16bf890ad0c75a50ccf211eb8e0d50a62654abc30ff6404818c323a08551d9a79194d05df6f4f92c4c7bca43b1d317243d84542f8eda3dcc0b2895c SHA512 ec03dd7b29becaabac1393d636ba394182c4fdacc57112980c76485f05e8fdf41e23cf8dc72dfdf530a5f060e709a0bc9d60d797e897020ae036e0a5410fc4b2
+DIST black-22.12.0.gh.tar.gz 1182329 BLAKE2B fa7461b296e278a9d0945816fe88b933794e1302bc6e5fc2d2d48c94dcf50826471962351d1acc12da804ff7fa434efd8a8dca874dac91c8e36092ac50752669 SHA512 a89acd3c0f0d446e21695e9d7059a6417f8101bca32b22018d974cb08d6f3c9e4dbc3aab0a12091618ca860fbf9b0a53d4f2729311f65ca72f50a71629b60ac8
 EBUILD black-22.10.0.ebuild 1458 BLAKE2B 732e396bcd769aaabe77a98e379bed54cb1a3f8546ae59df723e673d69e5ce48f8587433451ded9cd21d735c2fbe2164cc27a055e3a4e49e05b820de8932c5e2 SHA512 65fb488109e2e9418b8eda50d6301f54245ef725f17482b41eb5a5ff342a4618af5246f89ef1599b492ffd91ef8712c9509f374110f0b88dfbcbecf42508478f
+EBUILD black-22.12.0.ebuild 1466 BLAKE2B 072a2582f272391ea621754053f24db0a5fd7a7c2d2dfd5500f392111987987f29933da5cca4be26a7c33039698363f2a7328e93eb6a2c3b675167746fa373bd SHA512 fd34188e6961a7e31705995d12005fdc09765003d87910de17782d7a689556ab3a33586927f30c2595c2e3df14c4f20e9f5173183ac4bd3699ca04fdb1d39fd5
 MISC metadata.xml 397 BLAKE2B 505ed4127741ef8d2fd77c36e6ad2d6168dca8ae5570cf7606a557fad29393c0dd78fe2eb1fe990d9d69abec19fb65d563481160b0bf0a914997b114e73f7c66 SHA512 357189214d3cc2a026b8c29ee5c695a62d73db229ca1f71372bfc5a1120317a4c4ffac942f5a196f20e84ae8988a4e707d4194ebde12ef7c96eb713b398f587c
diff --git a/dev-python/black/black-22.12.0.ebuild b/dev-python/black/black-22.12.0.ebuild
new file mode 100644
index 000000000000..8c498833dffd
--- /dev/null
+++ b/dev-python/black/black-22.12.0.ebuild
@@ -0,0 +1,54 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="The uncompromising Python code formatter"
+HOMEPAGE="
+	https://black.readthedocs.io/en/stable/
+	https://github.com/psf/black/
+	https://pypi.org/project/black/
+"
+SRC_URI="
+	https://github.com/psf/black/archive/${PV}.tar.gz -> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/click-8.0.0[${PYTHON_USEDEP}]
+	>=dev-python/mypy_extensions-0.4.3[${PYTHON_USEDEP}]
+	>=dev-python/pathspec-0.9.0[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/tomli-1.1.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	$(python_gen_cond_dep '
+		>=dev-python/typing-extensions-3.10.0.0[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/hatch-fancy-pypi-readme[${PYTHON_USEDEP}]
+	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	test? (
+		>=dev-python/aiohttp-3.7.4[${PYTHON_USEDEP}]
+		dev-python/aiohttp-cors[${PYTHON_USEDEP}]
+		dev-python/colorama[${PYTHON_USEDEP}]
+		dev-python/parameterized[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+pkg_postinst() {
+	optfeature "blackd - HTTP API for black" "dev-python/aiohttp dev-python/aiohttp-cors"
+}
diff --git a/dev-python/boto3/Manifest b/dev-python/boto3/Manifest
index 52c119285748..7c32d35788d3 100644
--- a/dev-python/boto3/Manifest
+++ b/dev-python/boto3/Manifest
@@ -8,6 +8,7 @@ DIST boto3-1.26.23.gh.tar.gz 575113 BLAKE2B a39f1546f5733de801f00df97a383f45a6f9
 DIST boto3-1.26.24.gh.tar.gz 575745 BLAKE2B 2dd132d9daf9dafd81549664b23bb457211adfde1da5279de9519b1a30e0f5921f763f4770f7061011de97d7a52a05cdff57ddede2c3b95f8d048398bd160e9c SHA512 ab1943be54a5979a7e73f9fafc2937528c9a010f3c8244e2951fe802a7a20e57414b2565d6b6628890f913c76386aeaa0583c01901798bcc5080e48aa7da74e4
 DIST boto3-1.26.25.gh.tar.gz 576015 BLAKE2B 55d94441c1fa2668efa31390dbe972b354a4ab69d7825b2ecdcee47d03d44cb2533b428595dfdecc374a1164429166bb1740550334e2da1ff4a20ae31a53bb83 SHA512 c85b3b591926881a08e5143413848fd14b9cbe11c376970e71fe5fc6851a43448941583b73dc40cc0335c6749e7ea31eb8b4ef4d38dcf630d68693b94757bb07
 DIST boto3-1.26.26.gh.tar.gz 576812 BLAKE2B f88759a49f15102e02a73fedd42cf6f8332db83a1a543af180d6b2843d187ecc66449760bdc7e2500e5ff9410ed602688774f512e0a686a8a95190a2dca5b662 SHA512 60c02d960ba781117314595c9d26cd8fd947ee9c178175188140b58fa5ddf9687fc5f7c6f10dd0980f93490571a8de0e54a8dca3a0bf89b1111ccaa80017b2d0
+DIST boto3-1.26.27.gh.tar.gz 577292 BLAKE2B 31837d205570d0ee89b13bc68c6270f0e4cf932b51a6ca041c826bd0d9364be4542e6baff55dfb1ff6029fe7441c5e43820ac4946219a61bd4d5745bba3a0d64 SHA512 9ada5b840122e04d1bfa4bea20d223a84ffc6636643a0725b19dadc7136a25482863fb4d798132a1965fc553866898efd272416699d478170fd5f2f534ac1598
 DIST boto3-1.26.8.gh.tar.gz 557012 BLAKE2B 211bb7441acc8b1f901ebf5251288dc7c9073fa6e34f5a34426424ef064efb0fb3031deaf48ef336ec43bb015f95f618598da43d12ec83cbf814e1b4097b28a0 SHA512 738190cedfb0b85d3a1e9558b03e7f2fb14e43b152bc9627fd95c8ecc4a0ddc17f4c87ccb6129c1fbf5f47db9eea4dbc5c2cfbb69b903bc6f3ff417ef86b6f6b
 EBUILD boto3-1.26.11.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.16.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
@@ -19,6 +20,7 @@ EBUILD boto3-1.26.23.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd536
 EBUILD boto3-1.26.24.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.25.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.26.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
+EBUILD boto3-1.26.27.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 EBUILD boto3-1.26.8.ebuild 1579 BLAKE2B 394d8a1bb7a1036ab4821bc789c9eea285f8a6a7c21e751d60c94a53d5fdd37119eab54bfd19bfe0856b7557df04340f50c7cebbe631234e8f582e7d62af13ec SHA512 beee3b634e3b1d66365beb2e97b9d09188fa795e00d9d05f2101de423128741ee1f8ad8ae4b0c35f1e6c6473ce73cc3acf47d9141029b4435d39a9803a5fe1b2
 EBUILD boto3-9999.ebuild 1586 BLAKE2B e44044186aacf633782448f7e2b0f36918fd53655fba2d87578c4e639647a45672a6fd6d7835b5df6086394e5f77aa4e4e84397391ee6b3e73b12ac30a1e345e SHA512 67c33b742f620365e096327a32c0d491104bda656d5e4beb1390a8a65e360cf4e7338d5c99e04f0792560604dd0cb5d8bf3c94e6abf0be4f5b40adb0d71288a0
 MISC metadata.xml 493 BLAKE2B 7d6324fc877ffe1d20c5369c2af0b09a7028f94d28f1841188913d0d8be7ea699c9d3f92c624992c4c96bd69615d3a1211a2483c76c56b7d3082492e43512523 SHA512 44420d8c03d5986f990b76369edfa8dfd7659b4952db3ad946fd05392ec594628a28745ad888d055d4f074d5214f61fcffafe6c04c4ab54109d45ac0371582bd
diff --git a/dev-python/boto3/boto3-1.26.27.ebuild b/dev-python/boto3/boto3-1.26.27.ebuild
new file mode 100644
index 000000000000..6edcc751d54b
--- /dev/null
+++ b/dev-python/boto3/boto3-1.26.27.ebuild
@@ -0,0 +1,68 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="The AWS SDK for Python"
+HOMEPAGE="
+	https://github.com/boto/boto3/
+	https://pypi.org/project/boto3/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/boto3"
+	inherit git-r3
+	BOTOCORE_PV=${PV}
+else
+	SRC_URI="
+		https://github.com/boto/boto3/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+	# botocore is x.(y+3).z
+	BOTOCORE_PV="$(ver_cut 1).$(( $(ver_cut 2) + 3)).$(ver_cut 3-)"
+fi
+
+RDEPEND="
+	>=dev-python/botocore-${BOTOCORE_PV}[${PYTHON_USEDEP}]
+	>=dev-python/jmespath-0.7.1[${PYTHON_USEDEP}]
+	>=dev-python/s3transfer-0.6.0[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# don't lock versions to narrow ranges
+	sed -e '/botocore/ d' \
+		-e '/jmespath/ d' \
+		-e '/s3transfer/ d' \
+		-i setup.py || die
+
+	# do not rely on bundled deps in botocore (sic!)
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_python_prepare_all
+}
+
+python_test() {
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/botocore/Manifest b/dev-python/botocore/Manifest
index 416cb7f0cd65..dfb0a6750aec 100644
--- a/dev-python/botocore/Manifest
+++ b/dev-python/botocore/Manifest
@@ -8,6 +8,7 @@ DIST botocore-1.29.23.gh.tar.gz 11001723 BLAKE2B d1cfefb3bc25094948a1450ee7159e8
 DIST botocore-1.29.24.gh.tar.gz 11006663 BLAKE2B 195933b78bd0c5c5881cd697c1c61c6f40557d51edb7510e40ecdd31aae80a72fe3c33946e718a98b19a1f8af6d8cc687e047e5cd0b662de9f2d0ca3b53583e3 SHA512 e6dd5a88bf6539f02d27054d5825688b80a2a582e5ebd04d31d887e6baa31a4ba54aa0ba0c0e03156b4ad22815f6aa8f8f8986c3767180a04b284341223f4c60
 DIST botocore-1.29.25.gh.tar.gz 11008437 BLAKE2B 5a569d52065c2f448adb8c765e51e8338ce0bc2ae4b13e0f39a98af319aa1a31ef3a1eb4014aae8c497ab68a234dc2d16798a0d8b7c626e0ea81da4d2489ed7a SHA512 274a713d26cc723914824cdaf729d7537b5104957751b6d4b0c974e9f45a54ee09bd1853d1ab89dec2fb3b5a5b74102fa658c1f9478a4b4301b950e44f0f1fd5
 DIST botocore-1.29.26.gh.tar.gz 11015382 BLAKE2B b9777a7db931b15bfae0e62a5095b86f8cfbf2f7d37b1111ec46d0add8d46ae5c57d1e74e8c58bd931e0a9b3faf986746d6c48149453f5921d9c084455cb3a3b SHA512 457e858e9648ff78bd1972e0772938dd608511aeeebd1f83e8bfda50bef43374f574d0a0943f6e29d0401be880e2db4e8a47d36a2e95317da58fba4920deae3f
+DIST botocore-1.29.27.gh.tar.gz 11015321 BLAKE2B 81bd2269ca5dd5feedb7bd8a45a63e755575e9fb70b15d125beb57c1969259b16838e63660ff5a2f5ab24a52c1bdc21bca6a92e79f9023fa1c57f03250c096a5 SHA512 7fd577773f3fabbf38db8e5d353a27a73869d4249a55428a4d4e6056b9c459268887c264b1386f5170abe793709e4d9f2eb0e3e6daefea56f123fccea9d13cbf
 DIST botocore-1.29.8.gh.tar.gz 10636661 BLAKE2B 3ebd9e5cb6cc1a9d4ddb877e806e0a845e6a19a4604b4489dbdb9a0f35251201de5d7062f3b0193db3e28f5170d8c3315fdc0b2bec7668a61880ff3e9305d3bc SHA512 c4a1a3993576bd0340de4eeb25e10650219e9d74c21f7e51e5298120bc92a8359143c38d5a991b940316fc5eac483e4e838298881a5c068fa91dc3ebf92a7f5a
 EBUILD botocore-1.29.11.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
 EBUILD botocore-1.29.16.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
@@ -19,6 +20,7 @@ EBUILD botocore-1.29.23.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa7
 EBUILD botocore-1.29.24.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
 EBUILD botocore-1.29.25.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
 EBUILD botocore-1.29.26.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
+EBUILD botocore-1.29.27.ebuild 1905 BLAKE2B 27d2867aaea19612f4561f65e9c018f7caa73a78b627988165703230bd47488a99b1b38bfbdf1dae735806a0de9ca9a17db8afb526121f8c5402e97ca659a6b9 SHA512 9aa2a546360c0bc286bfabb5adb2c95af40d4d405d89fc4186856814b9b88d158fa952d82fd42126876270615e88a24820ac61132e8fba8414db4ac01da2f72b
 EBUILD botocore-1.29.8.ebuild 1801 BLAKE2B 224b9b1ebd6786f36115c25699b06ef4ace30f13c8c97fbac20f37ec3dec7219e89fae3fdc70ef2b808342e7dab564755b758952cd565f06ef68b1e387c1ee7e SHA512 f26fd77fbbc424dc20e7844807bb7650e73e989e15fa5c20c9733e3bc322f4a2fffda47fcd29f82490be7262648582b162f86b4951c8d338d9ebbb1312df8294
 EBUILD botocore-9999.ebuild 1808 BLAKE2B 720965dfc40c51389a8ca4ac210039f79bbe3047f583cb1bd4d52bdb9720cb2283a13a9f4337a62aca6869cd75d78dac6cc07436524e9720386177c733d686f3 SHA512 d3a3fbc0f957b58e8161ae3fffedb44462000077aa368dd2fb183bf6a084771bff4db46344a4d0b451833ea05d326b452155af92d190c313e1d982da7d72fc10
 MISC metadata.xml 499 BLAKE2B e5aaa7da26f200c09adfdf38b68f656bbccbec627cb5d966b280ac2165334e7eec659c89075bcace748f58e2ec3e7d2998e54a688d56ecea2d30653c67dfd35a SHA512 103c554d5dbd967bf9b6e418b3913d9235e7e910d012160909ce0715134ed2e37b06e6a345395f9d16ce08d1cf51f3ce458bce93c6a978fd3dca6610f2acdbd0
diff --git a/dev-python/botocore/botocore-1.29.27.ebuild b/dev-python/botocore/botocore-1.29.27.ebuild
new file mode 100644
index 000000000000..eed342eb3cfa
--- /dev/null
+++ b/dev-python/botocore/botocore-1.29.27.ebuild
@@ -0,0 +1,74 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Low-level, data-driven core of boto 3"
+HOMEPAGE="
+	https://github.com/boto/botocore/
+	https://pypi.org/project/botocore/
+"
+LICENSE="Apache-2.0"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/boto/botocore"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/boto/botocore/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux"
+fi
+
+RDEPEND="
+	dev-python/six[${PYTHON_USEDEP}]
+	<dev-python/jmespath-2[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	>=dev-python/urllib3-1.25.4[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/jsonschema[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_sphinx docs/source \
+	'dev-python/guzzle_sphinx_theme'
+distutils_enable_tests pytest
+
+src_prepare() {
+	# unpin deps
+	sed -i -e "s:>=.*':':" setup.py || die
+
+	# unbundle deps
+	rm -r botocore/vendored || die
+	find -name '*.py' -exec sed -i \
+		-e 's:from botocore[.]vendored import:import:' \
+		-e 's:from botocore[.]vendored[.]:from :' \
+		{} + || die
+
+	distutils-r1_src_prepare
+}
+
+python_test() {
+	local EPYTEST_DESELECT=(
+		# rely on bundled six
+		tests/functional/test_six_imports.py::test_no_bare_six_imports
+		tests/functional/test_six_threading.py::test_six_thread_safety
+		# fails on unrelated warnings
+		tests/unit/test_client.py::TestAutoGeneratedClient::test_BOTO_DISABLE_COMMONNAME
+		tests/unit/test_client.py::TestClientErrors::test_BOTO_DISABLE_COMMONNAME
+		# TODO
+		tests/functional/test_credentials.py::SSOSessionTest::test_token_chosen_from_provider
+	)
+
+	epytest tests/{functional,unit} -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/line_profiler/Manifest b/dev-python/line_profiler/Manifest
index 4226ee33d32e..876c6f3cfeef 100644
--- a/dev-python/line_profiler/Manifest
+++ b/dev-python/line_profiler/Manifest
@@ -1,5 +1,7 @@
 DIST line_profiler-4.0.0.gh.tar.gz 62856 BLAKE2B 7beb4b63c016d180d1e7e39b0461759593d3ba3ad1c5150b3623890ece3a69ebb65d48f59e8dc3865a19565ab46f2dc8a2a86698abe890d9bd857e1080cbb557 SHA512 d10b9470c686da863c340da7d4af8b6c6b6cb715486a00af1e1d79686c26909b289b8400a4d526520ade6fbbcd58e868a97603345682d5060a9b3ae2fd3495be
 DIST line_profiler-4.0.1.gh.tar.gz 63735 BLAKE2B 980298c2f0e2cffac12c1bb8dc87ca7876ac74969aafa77500aeb4ab1ab12e98ca56a2974d1311d560fdd7ff707fe6bb44d010f315a1070dc68accdede9041e9 SHA512 1943b359bc442fff8c35674c6e0ea108cbfb06706ed95dfe961daea5de8797ec01e70a712663fff0dcc727c954ddb8a4da4b45774817b14b903901f9cfe108c6
+DIST line_profiler-4.0.2.gh.tar.gz 63855 BLAKE2B e2f077214fb1387504446882396b3b48f5dc309b9de9ff7d7f39dfb96361e0b4ce5461510c878caabbfa4c2723fe65f2eeca5eb4fb261f1a735ebe32beb3b0fe SHA512 ef07d51a33cc71de0409f8dbdae47c738a8088ece577b077e9b7ff6e4f296da30f7843ef01f3bdcedadc1ad778fe625c0880e6a27844f49cda780f2fd6960acf
 EBUILD line_profiler-4.0.0.ebuild 743 BLAKE2B 201c439092ccecacebd3e4b8488dc062c1f63f09f7ac86e36948a9f5e9bbc0aac7be8fe2a0eb46751823524da074829942898a97e027b5264fb9b984bb7e1b3a SHA512 b142f02fc8bf01fb33cc74e482ef2629d3b4fa6a864d11e579a0e79bf74eabdf68b7318a994ea9e009cd98d91b0c3c3ae2f37763d58c32d52939878b40709100
 EBUILD line_profiler-4.0.1.ebuild 743 BLAKE2B 201c439092ccecacebd3e4b8488dc062c1f63f09f7ac86e36948a9f5e9bbc0aac7be8fe2a0eb46751823524da074829942898a97e027b5264fb9b984bb7e1b3a SHA512 b142f02fc8bf01fb33cc74e482ef2629d3b4fa6a864d11e579a0e79bf74eabdf68b7318a994ea9e009cd98d91b0c3c3ae2f37763d58c32d52939878b40709100
+EBUILD line_profiler-4.0.2.ebuild 743 BLAKE2B 201c439092ccecacebd3e4b8488dc062c1f63f09f7ac86e36948a9f5e9bbc0aac7be8fe2a0eb46751823524da074829942898a97e027b5264fb9b984bb7e1b3a SHA512 b142f02fc8bf01fb33cc74e482ef2629d3b4fa6a864d11e579a0e79bf74eabdf68b7318a994ea9e009cd98d91b0c3c3ae2f37763d58c32d52939878b40709100
 MISC metadata.xml 775 BLAKE2B de65859e8267b3385a49550fa47ee33d0f428e5833a59d8224aa4eb2b0251841c58acc1ca446ef1b13d258c5b861045f042f7ca13e8a27db7253f4202753c607 SHA512 22a65b06d81651455ecd9690bc5c6d4c87858bf912eb491dde16650a3692408ca95a1d42d82204e67509f4e685651b5b2b2537b5db0891b7ca6933bddd616d16
diff --git a/dev-python/line_profiler/line_profiler-4.0.2.ebuild b/dev-python/line_profiler/line_profiler-4.0.2.ebuild
new file mode 100644
index 000000000000..878292de2d8d
--- /dev/null
+++ b/dev-python/line_profiler/line_profiler-4.0.2.ebuild
@@ -0,0 +1,41 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Line-by-line profiler"
+HOMEPAGE="
+	https://github.com/pyutils/line_profiler/
+	https://pypi.org/project/line-profiler/
+"
+SRC_URI="
+	https://github.com/pyutils/line_profiler/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="BSD"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/ipython[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	dev-python/cython[${PYTHON_USEDEP}]
+	test? (
+		dev-python/coverage[${PYTHON_USEDEP}]
+		dev-python/ubelt[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	cd tests || die
+	epytest
+}
diff --git a/dev-python/pathspec/Manifest b/dev-python/pathspec/Manifest
index 87af5581dbec..6bd7f69b9d5e 100644
--- a/dev-python/pathspec/Manifest
+++ b/dev-python/pathspec/Manifest
@@ -1,5 +1,7 @@
 DIST pathspec-0.10.1.tar.gz 43155 BLAKE2B 5a690b6ec5215932074e54bf7c9dac2097261ca421421e86f9a90733fc2fbbbbf6ae8735c685de682919349bbe4bca6b1abce2d572871ba4111cc143b9637491 SHA512 886c16ba9a221720a9fbac6a2aead5a16de62988afbf0ed976f28c312fe524f41ccfb139e0b9699942ca32aa90f183e20656986ed631cf2435818c082d58115d
 DIST pathspec-0.10.2.tar.gz 44432 BLAKE2B 10087659e7c5bc72b9de9b073282f7fadb081cc2bbe028abe802de8d06e287a77b55f621356b1f8873dfbf7dd0ee0c47ee217f00d6c40c2f20680615dfb6bda9 SHA512 10525bda15f844556a08c8b7c13f454ccaece81e74d0e0a10dcfe6f8b260e3c3a571ae1dd1530e361a934e967a2d45d6994d0a5e6bb10026f6768cb08cf24575
+DIST pathspec-0.10.3.tar.gz 45821 BLAKE2B ae7c29bbb58d896de555b142ac18879f8a82437a2a701abfb259d40e3a5f992989c274a24c8c70ee6cbe6dbbe6a5030c67c1164e7f3eaa5563ab54cdad403581 SHA512 d0876374ab20d3624f1ba522de30472e401220ef3b269df9ea2e20526d5abddb8fd19866b0e3405a4746beb3a4b4b6f21ada4da5b7292a46febd6d418829e0f3
 EBUILD pathspec-0.10.1.ebuild 598 BLAKE2B 835162e02c94c59b9db1d3e0dc2897564f9f39de7ead3a9bfe6857f613cec9435fc73032e412b30c120a3cc1a0431482f10f909516662ab1c53e98389fed7a1f SHA512 376ba2510dc5db53e2b5eb0390c6492caff9b1443ca221f3d4eef3c69683af906422b7c6117849c0f0a6e2ad27e1739ca916a28aa8a5d56d36e7cb808b5e00fc
 EBUILD pathspec-0.10.2.ebuild 606 BLAKE2B 4d55a1279cfbe7f2587387495db87f2363b0a78c0d505e4fe7fd61b4dd768370820550c34a17d2046c34260d258d9b2a635717bf0af0531ae116cda932aee4ee SHA512 779fa20394d80260954dc61b97df7b86f013459fe23858f3148ff59182ce59e7e617ee79ef3f0e93a08c37d10eab1dfb1f4c3b0fa164edfe2279b2c7b7bb2a4f
+EBUILD pathspec-0.10.3.ebuild 606 BLAKE2B 4d55a1279cfbe7f2587387495db87f2363b0a78c0d505e4fe7fd61b4dd768370820550c34a17d2046c34260d258d9b2a635717bf0af0531ae116cda932aee4ee SHA512 779fa20394d80260954dc61b97df7b86f013459fe23858f3148ff59182ce59e7e617ee79ef3f0e93a08c37d10eab1dfb1f4c3b0fa164edfe2279b2c7b7bb2a4f
 MISC metadata.xml 412 BLAKE2B 145cc9a575db3e6097a04e456acad82441f9f0e4d73b4184aeb1eb94d67b998c47a41f6015b646c6275322a30e187c8f3082f3d2fd749250f15a0f79e9cee9aa SHA512 f3ac82f97d8506ecf7fd2bd5eb7105a12588b6694bb2fc0a797cefaa1d9844d2982a80d11202b275e160db27a342e84670abacb3322c82eb76fb3a70fc8e9c23
diff --git a/dev-python/pathspec/pathspec-0.10.3.ebuild b/dev-python/pathspec/pathspec-0.10.3.ebuild
new file mode 100644
index 000000000000..a69ad1fd06dd
--- /dev/null
+++ b/dev-python/pathspec/pathspec-0.10.3.ebuild
@@ -0,0 +1,22 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Utility library for gitignore style pattern matching of file paths"
+HOMEPAGE="
+	https://github.com/cpburnz/python-pathspec/
+	https://pypi.org/project/pathspec/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+distutils_enable_tests unittest
diff --git a/dev-python/patiencediff/Manifest b/dev-python/patiencediff/Manifest
index ae3c04adcd2f..46e8b1e89371 100644
--- a/dev-python/patiencediff/Manifest
+++ b/dev-python/patiencediff/Manifest
@@ -1,8 +1,10 @@
 DIST patiencediff-0.2.10.tar.gz 26829 BLAKE2B 3f32bcafef98199a56497a5c9c96fb88ac4f95aef92718273ddc2cc45574577f589ebbf73c4c6b2315c6936596cbc0822f21f647e7f8ead2ae24d20cec75d9ee SHA512 e28e765af5c48ab94e50b015a4a8a20ffccf50d6acc17ca468229a4738f9a20950f00c6a3f06ea27f9e079adacbc43fe90adcf8110a461f9295656b4b6265100
+DIST patiencediff-0.2.11.tar.gz 26812 BLAKE2B fb6f74dfe0450556d5fcd73b328e830492ab5524dedeb52b8cb85c0348d22481a78863b6b6a033628f575ba499978afabf6fcfc569c58520fa58680c110ca4de SHA512 4934adf7178221a5eb5fcab756293143970ebb7405ce15f31c19b302f6823c19535153dfbd0768a122dc9395d8146e54d8a1a9837c77be1a92bcfe5d6c1cd855
 DIST patiencediff-0.2.7.tar.gz 26831 BLAKE2B 297af6a465ef3fc060a00df9882f85fbf9f807c6d6e8fbfa1d531ed16a60d86f3081d9c0c9698bf3b6d02ba45fbb1d58fead6430f73c04b4439076d0a05a8864 SHA512 8711d28ddc67cdebab5677c1120b1c7270b7509083b797371abcecd61ba71555a1c79c580a5615fe30e1e3bd088b2f4c28a68aa761a61ce55b93690ceb38d8c3
 DIST patiencediff-0.2.8.tar.gz 28976 BLAKE2B 6e525875b7b1adac76101888c4ddb5022373bd4a9784e17e23acec6c9fe38ddd23f8be7baeac36b8b6cb79f048b97a74851207238c2c5e72fc0b686d86525e19 SHA512 e867bee63af1dc6326b9069ef89e6c3613e379b33cd10948cbc37647f279f7d951951baa23324ddcfaf65869500b8f7a345b10982fa5d2af0a5e6e8006a4f1fd
 DIST patiencediff-0.2.9.tar.gz 26869 BLAKE2B dc3afe857f2729fecd332e9c8553c118e32478d7ceaa874017b01a541c2934dab7087ef41935b0d213900cde199999cc2999c7d132a118a4b2bfad6ce684ece7 SHA512 87c495b54b464cabe1bb6366edfec981115cf86d451f272a0c609250d5a6295a67b083e19abd09e42d27e6124eb96c2e5922f68b91990f3ce97eff9b3cf50b27
 EBUILD patiencediff-0.2.10.ebuild 593 BLAKE2B 535c5b56248ad9f04450690786345efb97e45f65a9bfd62b64f13b1baf0210a7144f3483a940a27a13c5d61882f69807b0586879e57f26a72e503551ef3c64ee SHA512 2399fdfd05bce1ebd9d6bb2741c88a456f4bfbfdc43fd98d4d54de1d6e76ae60b63df67d385d37270e434870d5f6a51b9a3973329b60029c97d30760ed8ef0f5
+EBUILD patiencediff-0.2.11.ebuild 593 BLAKE2B 535c5b56248ad9f04450690786345efb97e45f65a9bfd62b64f13b1baf0210a7144f3483a940a27a13c5d61882f69807b0586879e57f26a72e503551ef3c64ee SHA512 2399fdfd05bce1ebd9d6bb2741c88a456f4bfbfdc43fd98d4d54de1d6e76ae60b63df67d385d37270e434870d5f6a51b9a3973329b60029c97d30760ed8ef0f5
 EBUILD patiencediff-0.2.7.ebuild 593 BLAKE2B 535c5b56248ad9f04450690786345efb97e45f65a9bfd62b64f13b1baf0210a7144f3483a940a27a13c5d61882f69807b0586879e57f26a72e503551ef3c64ee SHA512 2399fdfd05bce1ebd9d6bb2741c88a456f4bfbfdc43fd98d4d54de1d6e76ae60b63df67d385d37270e434870d5f6a51b9a3973329b60029c97d30760ed8ef0f5
 EBUILD patiencediff-0.2.8.ebuild 593 BLAKE2B 535c5b56248ad9f04450690786345efb97e45f65a9bfd62b64f13b1baf0210a7144f3483a940a27a13c5d61882f69807b0586879e57f26a72e503551ef3c64ee SHA512 2399fdfd05bce1ebd9d6bb2741c88a456f4bfbfdc43fd98d4d54de1d6e76ae60b63df67d385d37270e434870d5f6a51b9a3973329b60029c97d30760ed8ef0f5
 EBUILD patiencediff-0.2.9.ebuild 593 BLAKE2B 535c5b56248ad9f04450690786345efb97e45f65a9bfd62b64f13b1baf0210a7144f3483a940a27a13c5d61882f69807b0586879e57f26a72e503551ef3c64ee SHA512 2399fdfd05bce1ebd9d6bb2741c88a456f4bfbfdc43fd98d4d54de1d6e76ae60b63df67d385d37270e434870d5f6a51b9a3973329b60029c97d30760ed8ef0f5
diff --git a/dev-python/patiencediff/patiencediff-0.2.11.ebuild b/dev-python/patiencediff/patiencediff-0.2.11.ebuild
new file mode 100644
index 000000000000..0fed7fa1f361
--- /dev/null
+++ b/dev-python/patiencediff/patiencediff-0.2.11.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the patiencediff algorithm"
+HOMEPAGE="
+	https://github.com/breezy-team/patiencediff/
+	https://pypi.org/project/patiencediff/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	eunittest
+}
diff --git a/dev-python/pip-run/Manifest b/dev-python/pip-run/Manifest
index baf0e27e9713..dfdc89b62e1c 100644
--- a/dev-python/pip-run/Manifest
+++ b/dev-python/pip-run/Manifest
@@ -1,5 +1,7 @@
 DIST pip-run-8.8.1.gh.tar.gz 22443 BLAKE2B 4f87e3ec9867971916a0d5c463cdae63c7bb95ba457ff6e04101c1c37ea8728e2db2bad805b10bb6843b5ded1cb095d0f493b02c8a6e73aa4b782b849aa5ffb4 SHA512 ae964ca96f0be33fdb33974061e75486c443fda5edf0cf43247e8bd293d9a6a87d2cd421100578ed5179f13c9f46ff10ec730e0b403982da7e8aac22651268ea
 DIST pip-run-8.8.2.gh.tar.gz 22900 BLAKE2B 2dbcd18b46abe12c1020a045578a6548468bba0a098c85b0345dce634c61510d6e02feba356831f8531671eabcbcb5b520f15b23864c69bd708e3e2f0ebd125f SHA512 0250f55b49bb3eec10c78b217285df522bc00475dd9bdc710c107a8569e66b2ae643137da59a07c0f6b5e1254a9a920de3212f6befff245cd797947d3fdf95dc
+DIST pip-run-9.0.0.gh.tar.gz 23171 BLAKE2B ca1bee27f4d1826029aa2520dbad9807d22ce66326fd917f0b7687284ce3daf9abcd45e593d735633fb86186ea88ffa0b71780f9b56e27458798763db309bd9d SHA512 117b2260fe628dcc5aae47335ab645c2db47ca9b4d5cd0446ef11bb399c0e91df3a32b61aa7a228aca4d7b837228ddb41fe010896f7debf5fbca6111398cce73
 EBUILD pip-run-8.8.1.ebuild 963 BLAKE2B e176a68ad10beab276e7150bd917d9d3dd5507e8000932e6afae6bc662838af36d5f377b9515208b12e4464eb5fbc2c137c1f1531e3891eb616d7f96c4b9c56a SHA512 7f72c4b7def3b9b29fa49dffe2accb678a696f9742846e2a812908f1bba2039867a003f45f005d2f61a1c7604c1f100ff447601a05e5718b8651454737f87191
 EBUILD pip-run-8.8.2.ebuild 971 BLAKE2B dff0d2ebcaf36c770b18ef542ee8a66c2190801742bf23da0551495330a1861c71001c235744e0b1edd7e7c0a4b19147c621443c552f8eca3b6dde890b2e3bbb SHA512 b0bac62e0e1176bc626a15ee64183923a2061c8a43f312e53d6ea52e9307a5525bb2d4720a682156154f4c28367e743ec3f8fe81f8ff181dfc08084ce1e8a31c
+EBUILD pip-run-9.0.0.ebuild 971 BLAKE2B dff0d2ebcaf36c770b18ef542ee8a66c2190801742bf23da0551495330a1861c71001c235744e0b1edd7e7c0a4b19147c621443c552f8eca3b6dde890b2e3bbb SHA512 b0bac62e0e1176bc626a15ee64183923a2061c8a43f312e53d6ea52e9307a5525bb2d4720a682156154f4c28367e743ec3f8fe81f8ff181dfc08084ce1e8a31c
 MISC metadata.xml 389 BLAKE2B bc573b4f57b4f8371ecef97266b8441d47e66d551f7088a7f312ca049f7debd90e989d24d59d7aff182795ae27e553d131f3875c789dc793532ff9c812bcaf20 SHA512 00b81cba684e7118a3ce79ec5cb6a27d6ad67064a2745ffead8dec51c7786c9441139b800868cad8854ff39d7e38163ab2c8fa5c7d3f328390b628f8342fb0ca
diff --git a/dev-python/pip-run/pip-run-9.0.0.ebuild b/dev-python/pip-run/pip-run-9.0.0.ebuild
new file mode 100644
index 000000000000..120e2a6d2bb7
--- /dev/null
+++ b/dev-python/pip-run/pip-run-9.0.0.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Install packages and run Python with them"
+HOMEPAGE="
+	https://github.com/jaraco/pip-run/
+	https://pypi.org/project/pip-run/
+"
+SRC_URI="
+	https://github.com/jaraco/pip-run/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"
+
+RDEPEND="
+	dev-python/autocommand[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	dev-python/path[${PYTHON_USEDEP}]
+	dev-python/pip[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pygments[${PYTHON_USEDEP}]
+	)
+"
+
+EPYTEST_IGNORE=(
+	# Needs network access, and another test dep nbformat
+	pip_run/tests/test_scripts.py
+)
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index e90129852530..2890af731c88 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,8 +1,10 @@
 DIST snakeoil-0.10.1.tar.gz 176054 BLAKE2B bd056911c993d274d6c0c79ee4660629d8a6b8c276835a1b29bea16f977907b76a5edebe142b168b282fce3baa9c97b465233d91f5a279fba26a2c04aec0c784 SHA512 9e16652663dab1bd88f620a4fb80ca6602a181d4738a34bef89116f962a2035988cf9fb036b6a12de39b05a5251ade0e933b1df63c020b900338a89169619397
 DIST snakeoil-0.10.2.tar.gz 178557 BLAKE2B 2bdbb99cb6c9aab3f491895d4f4f51b47484a36cb97b3e41240b7b72b9918c0a85b9ad0f8cf977e5f9a2b618f1ca50535d5c7290626807dd78d1ab2fa0b9c24e SHA512 9b0e124faef00840e0a21ff8b1632bdfb15b5c03c7305e65cc7b709e57a55060c65094d6c978ec1b3f6677e6bf0f22aba6036eb7d1c434a32f64242c1a008f33
 DIST snakeoil-0.10.3.tar.gz 179090 BLAKE2B 5b819da874b93531ebe615e15fda08bcafcf077c6f1926ea6eab68aa7df64c12de1ebf592b4c299802c92e1941f3fbb99ad812f659d2b691532e4206451cfe94 SHA512 e82427960d98c1856215ee1a48836f9835483d468cccec97f3e892277cada67359ea62f00538ee573e4a6d14991a8dcce2a42e4689ff6f96abf56b29ca8f9fc6
+DIST snakeoil-0.10.4.tar.gz 181814 BLAKE2B 953432469bc588623f154103ba8e698073a39222e5a6d6496759067ee269e587bec86ae96ba7665e75c83936f2f78e9bec1fa51c4e9f98a3ff1b1e72d75f1fcb SHA512 815707f13fbf0ae17b5e2188a9357df66d2564e5f8c5dc0ed7e8d07e2eea21cd15d79b8fc44b4072ef4524446d27d6742f6f95a650c327103e656c4b6b78e72f
 EBUILD snakeoil-0.10.1.ebuild 742 BLAKE2B 23db231ebf45f375349d27597b38b9e7efdb74852d4a5b45bf0257110645783174b23b5246bd0120dcd4eec8aa559c42132f05db459195e9de1e7e8014470602 SHA512 a745ee474c394c0dc010e2c8190b1c7b61cca96c6b2489a490a98ed461742c6b7526d84533c5188262a6182354b7ffaa73023a541ae571f5762d7274883ce2f1
 EBUILD snakeoil-0.10.2.ebuild 808 BLAKE2B df7d8f73632d9da3320f2339a10fbe7f13c34264c3a14ac2bd53eaf2e92bfb1774738c79ffcaba2ec22030542a7476a0d6afdaded4b0410f5f7692c026be2a65 SHA512 185dbef5c07c609f0f666e89bf5886917551f1ba860ab253277573aa539664cabbd333402e44a83bd03135893586aa2e464111dabba75ac1dfe85e28e5d3e4cc
 EBUILD snakeoil-0.10.3.ebuild 800 BLAKE2B 10a7e24ba2d5925717c86da82a5cbdb745958d677345b337a62051f5d854d9d3b2fb3f812b084bbb7e2dd32a8c8394f8872e96e14ee3e305dc5810462254606f SHA512 eac7a603d6192a3ba9f6d3b601bd93ec42cef21f3fdcaef60f13960b1a15d5f15403206da44afc1eaba190de294a6d5a9f276219fedf2e7e74a45b26816ba0b8
+EBUILD snakeoil-0.10.4.ebuild 808 BLAKE2B df7d8f73632d9da3320f2339a10fbe7f13c34264c3a14ac2bd53eaf2e92bfb1774738c79ffcaba2ec22030542a7476a0d6afdaded4b0410f5f7692c026be2a65 SHA512 185dbef5c07c609f0f666e89bf5886917551f1ba860ab253277573aa539664cabbd333402e44a83bd03135893586aa2e464111dabba75ac1dfe85e28e5d3e4cc
 EBUILD snakeoil-9999.ebuild 808 BLAKE2B df7d8f73632d9da3320f2339a10fbe7f13c34264c3a14ac2bd53eaf2e92bfb1774738c79ffcaba2ec22030542a7476a0d6afdaded4b0410f5f7692c026be2a65 SHA512 185dbef5c07c609f0f666e89bf5886917551f1ba860ab253277573aa539664cabbd333402e44a83bd03135893586aa2e464111dabba75ac1dfe85e28e5d3e4cc
 MISC metadata.xml 394 BLAKE2B 1f11a6a69a1ed5736bdddaf949b97760d2986eaf848bbceafa706dae01dd8e84f2977d130179324856e35353702e8f84e2cf7b2e30587b5f21a7113237825c3e SHA512 71abd7d9037eb4412a992bcf6933999f0dfec0c39465fe5bcb63e6a8437ff901764c03ad65e363f4ce5d8789f364b7f732542c7f298f1d04a2a68343acbc2129
diff --git a/dev-python/snakeoil/snakeoil-0.10.4.ebuild b/dev-python/snakeoil/snakeoil-0.10.4.ebuild
new file mode 100644
index 000000000000..50e5f7ee3893
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.10.4.ebuild
@@ -0,0 +1,32 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=flit
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+inherit distutils-r1
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/pkgcore/snakeoil.git"
+	inherit git-r3
+else
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+fi
+
+DESCRIPTION="misc common functionality and useful optimizations"
+HOMEPAGE="https://github.com/pkgcore/snakeoil"
+
+LICENSE="BSD BSD-2 MIT"
+SLOT="0"
+
+RDEPEND="
+	dev-python/lazy-object-proxy[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	>=dev-python/flit_core-3.8[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/starlette/Manifest b/dev-python/starlette/Manifest
index 1ad926f20b00..19029b38f878 100644
--- a/dev-python/starlette/Manifest
+++ b/dev-python/starlette/Manifest
@@ -1,6 +1,8 @@
 DIST starlette-0.21.0.gh.tar.gz 2830353 BLAKE2B 7ff818d4687757ec8699dcd0e2582af78211787b7a0f2110da045eb4f7a8760262cf144b0af7dc9f72140b5dae1e65f7a4207ee3b165db4091c5139ce0bfcc85 SHA512 c246862604ba807141313857321d898d996eaa771ccb197546d0928a75cbb69f0e485fe90d2c817e70323146077c487436516384e1401d815c59c0ac75845e2b
 DIST starlette-0.23.0.gh.tar.gz 2830816 BLAKE2B 38886ef2e586965650a84b091928169b6164bb6931b5ce3289a5f3e38897de9be088ff02432d86176de7006783bf328a3b56659c45a42766e578adfb8c2ddb15 SHA512 fe13ab9a3efafac9a5a44b3471b0e0a02b6012d5336d411d169fb9521ceb23e181a39bda91ed31cd4084628029f7264f277c86a47108ae249bb22b9d9a3c68a5
+DIST starlette-0.23.1.gh.tar.gz 2830865 BLAKE2B b1eaf59421d413179ad294b240babb9b1beabbf10d8364187eb406a3b87a1412b3959b90f44ac1bbada7858c3ffc90560208bc433ca5aaf835dda1766282fe65 SHA512 9af4ab2b2e3af4e7acd2e93a9a4b4f4c8c3b56ba971f7a8faf65308d76a4f30b8ab0ab263535480af614a5082420cafb3d939c7477472710cce9241bd947139b
 EBUILD starlette-0.21.0-r1.ebuild 1076 BLAKE2B 07737c708f018e5939835a4b79c0d1d0c9cf0d4c767fb4822d79f3e13431b14d51306482fff8cf93ca68fc26bbf459113e0deea96f2b9fd714e816235b4752f5 SHA512 812b6b1b721bbf7e042539e0cf5e84843b96747eda02bb8c1d391b324dd1fcf6ac9cfa6d1bbbd7c22388c2e3d3baf2aeaf88484ee0b45f51c5de005cd267e09f
 EBUILD starlette-0.21.0.ebuild 1240 BLAKE2B 73a618cfc352aa36f8286914ad4eaf0f086f236e621685ad17fcf3db4510d9732100f113f8fc7739afe21c0d02f1feb33ed0c30297cc184f5f57cbce4863eb3a SHA512 716075254c375f33b18e0c66c4d6de84c0a5c278c1616ed971f3a9aa33731e6a42599cb0019a97afcfb3375577af89a308191dacf2ac48d95e71c043d65cedc8
 EBUILD starlette-0.23.0.ebuild 1076 BLAKE2B 07737c708f018e5939835a4b79c0d1d0c9cf0d4c767fb4822d79f3e13431b14d51306482fff8cf93ca68fc26bbf459113e0deea96f2b9fd714e816235b4752f5 SHA512 812b6b1b721bbf7e042539e0cf5e84843b96747eda02bb8c1d391b324dd1fcf6ac9cfa6d1bbbd7c22388c2e3d3baf2aeaf88484ee0b45f51c5de005cd267e09f
+EBUILD starlette-0.23.1.ebuild 1076 BLAKE2B 07737c708f018e5939835a4b79c0d1d0c9cf0d4c767fb4822d79f3e13431b14d51306482fff8cf93ca68fc26bbf459113e0deea96f2b9fd714e816235b4752f5 SHA512 812b6b1b721bbf7e042539e0cf5e84843b96747eda02bb8c1d391b324dd1fcf6ac9cfa6d1bbbd7c22388c2e3d3baf2aeaf88484ee0b45f51c5de005cd267e09f
 MISC metadata.xml 324 BLAKE2B cbdb5983f2620f296eed8d81541e6ffbb084fdbcb698e52a6d86a64122834184e71ac423c21fa81d395be5505cb497be9172cd28d8fc633b6d31b844c480f741 SHA512 02c4d176ccc9c1b12e94f25c0de9792b6dc087a5d897bff8a46b2053951afad28b5c40f181ece8209acb3a8db1ec9e21a29af06b55f66efbc0d8f325d6958123
diff --git a/dev-python/starlette/starlette-0.23.1.ebuild b/dev-python/starlette/starlette-0.23.1.ebuild
new file mode 100644
index 000000000000..ca1a5dd0fabe
--- /dev/null
+++ b/dev-python/starlette/starlette-0.23.1.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="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 ~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/tox/Manifest b/dev-python/tox/Manifest
index b5fa027bd322..af7ec78efc31 100644
--- a/dev-python/tox/Manifest
+++ b/dev-python/tox/Manifest
@@ -1,9 +1,5 @@
 DIST tox-3.27.1.gh.tar.gz 309006 BLAKE2B fa8aaa9cd5b03e54c166bb6b748290420b91498b26d2d124d9f88a64806b9ac0578c1886845b25aa024907f6a782c45609fa6c7657d9e1f538b59c2d9f0f4e14 SHA512 5f568bc6c53f871aae91928681dd6f2419b876a8e6ca925e65abae845b548ee3d00513741882875bbbacb78bf64935228d98213f940d3da8c3f788b73f177b79
-DIST tox-4.0.0rc1.gh.tar.gz 273212 BLAKE2B c9123aa23185655c32ebac36adf24ba8cfc57e8a94c011657acff6a5ce5bede8b14218a21a8cae099fdc2af938343336bea7fed802f8f73bc7769cd17b52d918 SHA512 6619fad1a080a095b827968972dd0d854ca5b48b81ef6548d8c39accc30c0279f9e0cc4208b148920e51fe304328dbdf4f4a8c4554b32398baf243484bba338d
-DIST tox-4.0.0rc3.gh.tar.gz 274520 BLAKE2B 374db4d553f2fa5188fa911058f5bca8230a88f88607d0d633801e504e4a55db29942cc359bc825d94cf2004c357cc32ec1550a83bdd03df23b2e068d787de70 SHA512 0f8ba364d0bcf25eff241361a567863f70bd9443724ebdef04b94d91ecc8b1e7b34804a0d47b7d78fd391962fda0409ce1ab95b45dc6ba2d4738a474a814c0af
-DIST tox-4.0.0rc4.gh.tar.gz 274617 BLAKE2B 7b9c6cf3c556f90952963a124678c634b11802b0a79f1a576589a0ccc388bcb2b7af9f1dccb65a215645fab426a6e648ebc856b7648a257ae362b720eaa7c6da SHA512 28de8d308a90b42c3ee20f2e6627396c1baea698aad38ec366912f8a617821f48f9a8b2246f112cc637b77f451277ccc70546bdf44d240da1d534186daa33c41
+DIST tox-4.0.5.gh.tar.gz 277741 BLAKE2B 19250ec4365a38a149c59de99ebd3b819cc4aba7721c076cc6700a17eb56b7c4b61d5c3b11046dc6857d082f1c04e98c6a78b8c768551468bca5a6810c4b7749 SHA512 7bc6f5479df577b66a7e43b61520995d1d31d056baf5b6297d9dc6acb19da58ed1f7d0db13930ab114417f0ad752799ac512765af18041ec800022b18676db20
 EBUILD tox-3.27.1.ebuild 1916 BLAKE2B ab2496317d588c05936d57132d1c759c9a14f18c10fb50d6188b7bee5bd20de9f06b5d8945a908cbf021f4b7036ba6d23dcf19aad63af9d6cd6bf6baa598ad32 SHA512 b038f9976de8af46ac663faa169a06fad1bd28ef61738679fd70faa5e655c0c85ed3a8e4efddee2dd2aff8cc3fe9f5ec133311d122c6bab15c487a5a074a6c11
-EBUILD tox-4.0.0_rc1.ebuild 1725 BLAKE2B 2a0926b4988e0c068003101b06504980e01880ffdea57dd25752a06c8d64f07839545d33babee4b3429dd1ee015fe22bf8b2f1f6a99c342b8acb02246a977501 SHA512 2d446a6460d317f3292c2dee9c1d4cdf87c4c680e78e11868fd5e1b4e4645053a910d6dc77a813a0056ad908fab0584b64f4d0bfa6a51aa34b96880222a7bc07
-EBUILD tox-4.0.0_rc3.ebuild 2025 BLAKE2B 512c198d235fe049723d2521fb771631c0259eadb2c1dc60812beb3d4c8a5547eecd67a1e812461dc1d22f45bb0dec750a9f6e3f5dcc52a7455f1b338d44fdcb SHA512 466018bd2256f048c43391b40a0ea1d9f8fbae482ad58c6bb22053a614ad8d090a6bec10606503aebba0aebb9d8d27ef590c865e5803869c8032119132e6f9d4
-EBUILD tox-4.0.0_rc4.ebuild 2199 BLAKE2B 0bfffc8b780aabffb19ecdb1a912d06d6ee78358f4efc409938fff286efe40fb0f193baa1214815f2037930bd3ae9bcfc7fcc9291d5c10a52696a15ac5b3757b SHA512 6565ebfd7acd77224a2eb08b75bed0b8052a0b1c71a04bc24b549dc81b2c0a0ca4e714c1ef05cb12d595a585a5a30a7ea286e20f82494214a2fe4a3c70ad3a81
+EBUILD tox-4.0.5.ebuild 2398 BLAKE2B a8a4d53f19e306c32fe542fb0ebb132bcbfe29c54a96f6f090b1beec6c85763ea04d77ab592a7fe20214724295e1a5d4c0740d99644d513dc9f7a311f4c3c5dc SHA512 be8ec59aad967e10ae4c3b03313c6f3ea2bf4491084517875130e737836e3a66c9e7acf29de522cb3ae7b4d445910334d64e070a53db15b8f761e7b3b886aa06
 MISC metadata.xml 382 BLAKE2B 7c0704c5c187ce4a7972fe0372b23c5537a81a8d62fd83436d9558a61761f10764adb5a4d5f6795f0dd1fe905afa604c0be77fe1d48d291847f6ae65dc1b032c SHA512 9d0ced4df9352a81034a50d5766a01534ae8fa889985d99cc9e2a8d0889e31c6c11550677d9a5a74e2aab57c320192ce3a42708a6d23b0419ee34a6054398344
diff --git a/dev-python/tox/tox-4.0.0_rc1.ebuild b/dev-python/tox/tox-4.0.0_rc1.ebuild
deleted file mode 100644
index 80a5a3f20af3..000000000000
--- a/dev-python/tox/tox-4.0.0_rc1.ebuild
+++ /dev/null
@@ -1,67 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-SRC_URI="
-	https://github.com/tox-dev/tox/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/cachetools-5.2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.5.4[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.1.2[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.16.7[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/filelock-3.8[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		dev-python/pytest-xdist[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		>=dev-python/time-machine-2.8.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.0.0_rc3.ebuild b/dev-python/tox/tox-4.0.0_rc3.ebuild
deleted file mode 100644
index 2f7f84091c61..000000000000
--- a/dev-python/tox/tox-4.0.0_rc3.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=hatchling
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit distutils-r1
-
-MY_P=${P/_}
-DESCRIPTION="virtualenv-based automation of test activities"
-HOMEPAGE="
-	https://tox.readthedocs.io/
-	https://github.com/tox-dev/tox/
-	https://pypi.org/project/tox/
-"
-SRC_URI="
-	https://github.com/tox-dev/tox/archive/${PV/_}.tar.gz
-		-> ${MY_P}.gh.tar.gz
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	>=dev-python/cachetools-5.2[${PYTHON_USEDEP}]
-	>=dev-python/chardet-5.1[${PYTHON_USEDEP}]
-	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
-	>=dev-python/filelock-3.8.2[${PYTHON_USEDEP}]
-	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.5.4[${PYTHON_USEDEP}]
-	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
-	>=dev-python/pyproject-api-1.2.1[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		>=dev-python/tomli-2.0.1[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-	>=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
-	test? (
-		dev-python/build[${PYTHON_USEDEP}]
-		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
-		>=dev-python/flaky-3.7[${PYTHON_USEDEP}]
-		>=dev-python/psutil-5.9.4[${PYTHON_USEDEP}]
-		dev-python/pytest-mock[${PYTHON_USEDEP}]
-		>=dev-python/pytest-xdist-3.1[${PYTHON_USEDEP}]
-		>=dev-python/re-assert-1.1[${PYTHON_USEDEP}]
-		>=dev-python/time-machine-2.8.2[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
-
-export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
-
-python_test() {
-	# devpi_process is not packaged, and has lots of dependencies
-	cat > "${T}"/devpi_process.py <<-EOF || die
-		def IndexServer(*args, **kwargs): raise NotImplementedError()
-	EOF
-
-	local -x PYTHONPATH=${T}:${PYTHONPATH}
-	local EPYTEST_DESELECT=(
-		# Internet
-		tests/tox_env/python/virtual_env/package/test_package_cmd_builder.py::test_build_wheel_external
-	)
-	local EPYTEST_IGNORE=(
-		# requires devpi*
-		tests/test_provision.py
-	)
-
-	epytest
-}
diff --git a/dev-python/tox/tox-4.0.0_rc4.ebuild b/dev-python/tox/tox-4.0.5.ebuild
index 70d37dba6579..ed83ca51ba13 100644
--- a/dev-python/tox/tox-4.0.0_rc4.ebuild
+++ b/dev-python/tox/tox-4.0.5.ebuild
@@ -31,7 +31,7 @@ RDEPEND="
 	>=dev-python/colorama-0.4.6[${PYTHON_USEDEP}]
 	>=dev-python/filelock-3.8.2[${PYTHON_USEDEP}]
 	>=dev-python/packaging-21.3[${PYTHON_USEDEP}]
-	>=dev-python/platformdirs-2.5.4[${PYTHON_USEDEP}]
+	>=dev-python/platformdirs-2.6[${PYTHON_USEDEP}]
 	>=dev-python/pluggy-1[${PYTHON_USEDEP}]
 	>=dev-python/pyproject-api-1.2.1[${PYTHON_USEDEP}]
 	$(python_gen_cond_dep '
@@ -40,7 +40,7 @@ RDEPEND="
 	>=dev-python/virtualenv-20.17.1[${PYTHON_USEDEP}]
 "
 BDEPEND="
-	dev-python/hatch-vcs[${PYTHON_USEDEP}]
+	>=dev-python/hatch-vcs-0.2.1[${PYTHON_USEDEP}]
 	test? (
 		dev-python/build[${PYTHON_USEDEP}]
 		>=dev-python/distlib-0.3.6[${PYTHON_USEDEP}]
@@ -59,6 +59,13 @@ distutils_enable_tests pytest
 
 export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
 
+src_prepare() {
+	# the minimal bounds in tox are entirely meaningless and new packaging
+	# breaks setuptools
+	sed -i -e '/packaging/s:>=22::' pyproject.toml || die
+	distutils-r1_src_prepare
+}
+
 python_test() {
 	# devpi_process is not packaged, and has lots of dependencies
 	cat > "${T}"/devpi_process.py <<-EOF || die
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index e1d4fa374828..7e42e1de54e9 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/diffoscope/Manifest b/dev-util/diffoscope/Manifest
index 455be55b90ae..503d17cea71b 100644
--- a/dev-util/diffoscope/Manifest
+++ b/dev-util/diffoscope/Manifest
@@ -1,7 +1,3 @@
-DIST diffoscope-223.tar.gz 3145330 BLAKE2B 47ebe733c6330c2c8a7a78dfaad4c364ac3570d5a691b889f3154dcc5f7bec7b97744f04433cf56544ca208233271bbbca8bb767ed43844786fca4e77505d95b SHA512 5f83177133fd4689a77fb08038222998f9597cd63b0f328d3ae55c2ef6f5136f55ab1f5841b70ce1f64a62d216e2332bb4cecb82a3edcc90a6a5841e95955d4c
-DIST diffoscope-227.tar.gz 3163754 BLAKE2B 8a93b168e8ac404b6cfb08ebf9de5adf0288ae6e741653f8194a2d3d45e30b5826ca3d21a37b5db3867c73816e862f1d4593fe7a77487736f8a6e5f2b15057f2 SHA512 1e8a143006c4e734cf30d4110241ed164c3ee893801efa2a7b81a917146a0643dd8b38af0cac937847506a4338d59f4bb03211179742bb076fc4d4dd5f7cb585
 DIST diffoscope-228.tar.gz 3164190 BLAKE2B 21e75cb8e297540b149f22c52949d33a2e6ddd8c0fa8641e5d8b0c20045f1a7f6638b6b844631c2a5353cd23dc4d8447fadd9b8b3f5cd87fa33eb4b85abe3e2b SHA512 5ea3f0dfa17d2e17167241f9388a6fba919deec4c26a39e238fc282b0011f30e77b4daf27c0b076eadcc13ca51eb408eba983ea427adbaee3233db222b60948a
-EBUILD diffoscope-223.ebuild 3444 BLAKE2B ace11e44d106488caa6e2e2014236e1d5889667c48348ef29b6b34b719f5b95392cc0f2aaf73ecf0a01085263e4dea21c3ba4280802abca4fe95ac2c2c018c17 SHA512 e9cb6a0ec3fe55146081dd3336409c49112b55dda2e7edb97c9c0b6269ca29f9706dbf9b1cc5061d4d0869f980824ea8ebe447e191d015510af58a50014f659b
-EBUILD diffoscope-227.ebuild 3558 BLAKE2B 0b9aeb382a8bb6821e7b0e6a582fbc85564ef64e9d4931322e339c104d92a08d054958b0c604fc5688cb2ec6e5a1639aaf7700f97a203f12f17951f48cd661b0 SHA512 3ebd890410be2c423fc465f3cb149f98a4690ecaa5683b6c1dcf91a5c3c8423d5515ab516652d2c6e8a7ba2b8407d7830550244ded1fc5fc4d2cd91efb7a683e
 EBUILD diffoscope-228.ebuild 3556 BLAKE2B 058abedfd71123ed6edce1f5a94508fbcb0b89ed6e453f449ea43d92672217116b9bb51cadaa9a6e8b680cb989d740e5700015c2565bfc742bbc476b0c348ba1 SHA512 30a60cd042024b72f0a38523103dd19065e6545928482c192f1b6f18e39947c9bba14de738dcb361b03f5da6c8bbf29ada9a24743296b50205afb1cd07860a8a
 MISC metadata.xml 2078 BLAKE2B 3bb126836e45e8d4e5b6170a12219ec9cceb1a12dca4658211b1971cb16fa5593622642ade363904cf24df16de0749b957d0fc03838d2a9a004484d0b551c886 SHA512 382cefe0478282000b74e404cdd9d636a0323fceb55b97fd8545190628c319e0c5e213c7d082198e4b8b1fc693a52ce85c52b3ad831778e6fadbe6ba401782f5
diff --git a/dev-util/diffoscope/diffoscope-223.ebuild b/dev-util/diffoscope/diffoscope-223.ebuild
deleted file mode 100644
index fb46babb5816..000000000000
--- a/dev-util/diffoscope/diffoscope-223.ebuild
+++ /dev/null
@@ -1,113 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~ppc64 x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-
-RESTRICT="!test? ( test )"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="test? (
-		app-text/docx2txt
-		media-libs/libcaca
-		virtual/imagemagick-tools[jpeg]
-	)"
-RDEPEND="dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/tlsh[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence if filemagic's magic.py breaks imports
-# of dev-python/python-magic: https://bugs.gentoo.org/716482
-RDEPEND+=" !dev-python/filemagic"
-
-EPYTEST_DESELECT=(
-	# Test seems to use different tarball
-	tests/test_presenters.py::test_text_proper_indentation
-
-	# Needs triage
-	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-	tests/comparators/test_gif.py::test_has_visuals
-
-	# img2txt based failures, bug #797688
-	tests/comparators/test_ico_image.py::test_diff
-	tests/comparators/test_ico_image.py::test_diff_meta
-	tests/comparators/test_ico_image.py::test_diff_meta2
-	tests/comparators/test_ico_image.py::test_has_visuals
-	tests/comparators/test_jpeg_image.py::test_diff
-	tests/comparators/test_jpeg_image.py::test_compare_non_existing
-	tests/comparators/test_jpeg_image.py::test_diff_meta
-	tests/comparators/test_jpeg_image.py::test_has_visuals
-
-	# docx2txt based falures, bug #797688
-	tests/comparators/test_docx.py::test_diff
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-
-	# Fails on ZFS
-	tests/test_main.py::test_non_unicode_filename
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/diffoscope/diffoscope-227.ebuild b/dev-util/diffoscope/diffoscope-227.ebuild
deleted file mode 100644
index e7f6e7cb72c0..000000000000
--- a/dev-util/diffoscope/diffoscope-227.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE="ncurses"
-inherit distutils-r1
-
-DESCRIPTION="Will try to get to the bottom of what makes files or directories different"
-HOMEPAGE="https://diffoscope.org/ https://pypi.org/project/diffoscope/"
-SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
-IUSE="acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file
-find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma
-mono opendocument pascal pdf postscript R rpm sqlite squashfs
-ssh tar test tcpdump zip zlib zstd"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	dev-python/python-magic[${PYTHON_USEDEP}]
-	dev-python/libarchive-c[${PYTHON_USEDEP}]
-	dev-python/distro[${PYTHON_USEDEP}]
-	dev-python/tlsh[${PYTHON_USEDEP}]
-	acl? ( sys-apps/acl )
-	binutils? ( sys-devel/binutils )
-	bzip2? ( app-arch/bzip2 )
-	libcaca? ( media-libs/libcaca )
-	colord? ( x11-misc/colord )
-	cpio? ( app-arch/cpio )
-	diff? ( sys-apps/diffutils )
-	docx? ( app-text/docx2txt )
-	dtc? ( sys-apps/dtc )
-	e2fsprogs? ( sys-fs/e2fsprogs )
-	file? ( sys-apps/file )
-	find? ( sys-apps/findutils )
-	gettext? ( sys-devel/gettext )
-	gif? ( media-libs/giflib )
-	gpg? ( app-crypt/gnupg )
-	haskell? ( dev-lang/ghc )
-	hdf5? ( sci-libs/hdf5 )
-	hex? ( app-editors/vim-core )
-	imagemagick? ( media-gfx/imagemagick )
-	iso? ( app-cdr/cdrtools )
-	java? ( virtual/jdk )
-	llvm? ( sys-devel/llvm )
-	lzma? ( app-arch/xz-utils )
-	mono? ( dev-lang/mono )
-	opendocument? ( app-text/odt2txt )
-	pascal? ( dev-lang/fpc )
-	pdf? (
-		app-text/pdftk
-		app-text/poppler
-		dev-python/PyPDF2[${PYTHON_USEDEP}]
-	)
-	postscript? ( app-text/ghostscript-gpl )
-	R? ( dev-lang/R )
-	rpm? ( app-arch/rpm )
-	sqlite? ( dev-db/sqlite:3 )
-	squashfs? ( sys-fs/squashfs-tools )
-	ssh? ( net-misc/openssh )
-	tar? ( app-arch/tar )
-	tcpdump? ( net-analyzer/tcpdump )
-	zip? ( app-arch/unzip )
-	zlib? ( app-arch/gzip )
-	zstd? ( app-arch/zstd )
-"
-# Presence of filemagic's magic.py breaks imports
-# of dev-python/python-magic: bug #716482
-RDEPEND+=" !dev-python/filemagic"
-
-# pull in optional tools for tests:
-# img2txt: bug #797688
-# docx2txt: bug #797688
-BDEPEND="
-	test? (
-		app-text/docx2txt
-		app-text/html2text
-		media-libs/libcaca
-		virtual/imagemagick-tools[jpeg]
-	)
-"
-
-EPYTEST_DESELECT=(
-	# Test seems to use different tarball
-	tests/test_presenters.py::test_text_proper_indentation
-
-	# Needs triage
-	tests/comparators/test_binary.py::test_with_compare_details_and_tool_not_found
-	tests/comparators/test_rlib.py::test_item3_deflate_llvm_bitcode
-	tests/comparators/test_gif.py::test_has_visuals
-
-	# img2txt based failures, bug #797688
-	tests/comparators/test_ico_image.py::test_diff
-	tests/comparators/test_ico_image.py::test_diff_meta
-	tests/comparators/test_ico_image.py::test_diff_meta2
-	tests/comparators/test_ico_image.py::test_has_visuals
-	tests/comparators/test_jpeg_image.py::test_diff
-	tests/comparators/test_jpeg_image.py::test_compare_non_existing
-	tests/comparators/test_jpeg_image.py::test_diff_meta
-	tests/comparators/test_jpeg_image.py::test_has_visuals
-
-	# docx2txt based falures, bug #797688
-	tests/comparators/test_docx.py::test_diff
-
-	# Formatting
-	tests/test_source.py::test_code_is_black_clean
-
-	# Fails on ZFS
-	tests/test_main.py::test_non_unicode_filename
-
-	# Fails on (unreleased) LLVM 16 with minor difference
-	tests/comparators/test_macho.py::test_llvm_diff
-)
-
-distutils_enable_tests pytest
diff --git a/dev-util/meson/Manifest b/dev-util/meson/Manifest
index 6896afda5550..050b504da01b 100644
--- a/dev-util/meson/Manifest
+++ b/dev-util/meson/Manifest
@@ -1,11 +1,7 @@
 AUX meson-0.63-xtools-support.patch 1136 BLAKE2B 7600b29f1c4accbf33ca587b848566d4f9d30e26695b125aa895ec8a48ee0f7355c7692845c0d9bbb59eb452fc0cd8b634bd2a90d8918efa0b65ef4759b56d8e SHA512 725b193afe229690b6ef0d7a2a832695b7c09ca3376512097baec597a84df6e8e18791e9f29221e8a4a3537ad2371672e74041aa05ec6a218ed9b6218ea2ab61
-DIST meson-0.63.2.tar.gz 2063397 BLAKE2B 765ef8994168bb149cce4dbbbdab4a5531b1c1119db5dace1a66c2728241830c7de075d586187d3f987fcc99e4181176a5910da56552ba735dda110a641d2541 SHA512 770d8d82502c5cd419123e09f6a445d2cbaea4463c5fa79f1497c868bf5defc5e5779a6e550ef5fcf75d57322d2b25b61574f4df0cbf001c4325c6abdbbc30b4
 DIST meson-0.63.3.tar.gz 2067612 BLAKE2B aa6052330f15aa6b1f64598a60075ea3b245ba4b53d65e760670fd526e3e462c110f95e710a83f91ab32f316fdb66dff1783c79ea832ed11d263fe0a3304eaa8 SHA512 6855b2bfe05d592419bfeaf4346c3d1079319f14de995109c09a7e5e9770cef829f66d659553337b3e54ca0dd6c497bccd4abef720f299173077b664d905864b
-DIST meson-0.64.0.tar.gz 2090162 BLAKE2B 85fe35cba3b2b966a8ba818b305e6e75437af4315f8ce9b6bdc26324dc4a51e5ef3cbb16e23552db1d6191b8d08b1086640eb87e03a1dcfee794de492a0fa237 SHA512 0656515e983d98350081dc7cd726bff4a83ed1e24d414c022ea804317f2ff86052b53bbbc36e00847541f2cbe19ebe4c87bb35a174bf6321864363512a4cf6b0
 DIST meson-0.64.1.tar.gz 2089752 BLAKE2B e444df936738ddbbc8af1cc203417ee8f6063bf36a953158295da0c0a40aeb05e6c9a8677a17440c3a4153e0e479fb7215e18b5f0ce7c896fd928f841637ce07 SHA512 4896f5a09f89cadce028080f70e5ca005fd3bb2141a730a0ad71ded63d1bde6d1254957fe079f5e4c6e3b9420a9fcc4525b01e689979f0bab6d09d6483ca42ec
-EBUILD meson-0.63.2-r1.ebuild 2978 BLAKE2B 7e3c27064fc4bbf116a7fc5efaf9d56bf942567b0c674c70c832826a557edd458a29ce0dbb445ab5b4e04cad03236798ebc499aab4c5edcefd7049d84f1e862e SHA512 176d0bd3a9f7b4aab8614ee10f5b7b18c5d8889c7a07dd7f49b283b01e72ae7c878108de8e135bcdd60d5563a51d6c62c44093f6eb115676087c9fd073ed762c
 EBUILD meson-0.63.3.ebuild 2978 BLAKE2B 7e3c27064fc4bbf116a7fc5efaf9d56bf942567b0c674c70c832826a557edd458a29ce0dbb445ab5b4e04cad03236798ebc499aab4c5edcefd7049d84f1e862e SHA512 176d0bd3a9f7b4aab8614ee10f5b7b18c5d8889c7a07dd7f49b283b01e72ae7c878108de8e135bcdd60d5563a51d6c62c44093f6eb115676087c9fd073ed762c
-EBUILD meson-0.64.0.ebuild 3024 BLAKE2B d1364c97302f4507adc94fa970cd9083b4833787433a789296596b372198f6c0a22063ca0e8c3eb9d9c3e0076c43b0884c6f7355090549aeb9c4d48308aaf4a0 SHA512 456477d6bcd781841a935163c64e15cd62a227fea9ac84f5257df607371ee4c09013b3d5927ea15e9c0986dd9cfc24106c300299f5ba4b86706c4b71288c3cc9
 EBUILD meson-0.64.1.ebuild 3024 BLAKE2B d1364c97302f4507adc94fa970cd9083b4833787433a789296596b372198f6c0a22063ca0e8c3eb9d9c3e0076c43b0884c6f7355090549aeb9c4d48308aaf4a0 SHA512 456477d6bcd781841a935163c64e15cd62a227fea9ac84f5257df607371ee4c09013b3d5927ea15e9c0986dd9cfc24106c300299f5ba4b86706c4b71288c3cc9
 EBUILD meson-9999.ebuild 3024 BLAKE2B d1364c97302f4507adc94fa970cd9083b4833787433a789296596b372198f6c0a22063ca0e8c3eb9d9c3e0076c43b0884c6f7355090549aeb9c4d48308aaf4a0 SHA512 456477d6bcd781841a935163c64e15cd62a227fea9ac84f5257df607371ee4c09013b3d5927ea15e9c0986dd9cfc24106c300299f5ba4b86706c4b71288c3cc9
 MISC metadata.xml 480 BLAKE2B 5d3a0af4d84e497dcc2ccd5eb680e898beda896d5c37dc71fcaad2fe63f436f758d356990a5bca06baee9d265389b6e7084daec90d13c004f5523df4d0badbff SHA512 748f91fc17a18302ad0892d458e8e59650ab23dd3db5e83da85cfbca03d7932633c37b16f039faa12d87f6e4ec75a7a7fe4cc22f17328e61d57d99b073b6df3f
diff --git a/dev-util/meson/meson-0.63.2-r1.ebuild b/dev-util/meson/meson-0.63.2-r1.ebuild
deleted file mode 100644
index 8c8f381c9545..000000000000
--- a/dev-util/meson/meson-0.63.2-r1.ebuild
+++ /dev/null
@@ -1,117 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	MY_P=${P/_/}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
-fi
-
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-RDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.63-xtools-support.patch
-)
-
-python_prepare_all() {
-	local disable_unittests=(
-		# ASAN and sandbox both want control over LD_PRELOAD
-		# https://bugs.gentoo.org/673016
-		-e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-		# ASAN is unsupported on some targets
-		# https://bugs.gentoo.org/692822
-		-e 's/test_pch_with_address_sanitizer/_&/'
-
-		# https://github.com/mesonbuild/meson/issues/7203
-		-e 's/test_templates/_&/'
-
-		# Broken due to python2 wrapper
-		-e 's/test_python_module/_&/'
-	)
-
-	sed -i "${disable_unittests[@]}" unittests/*.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		# 'test cases/unit/73 summary' expects 80 columns
-		export COLUMNS=80
-
-		# If JAVA_HOME is not set, meson looks for javac in PATH.
-		# If javac is in /usr/bin, meson assumes /usr/include is a valid
-		# JDK include path. Setting JAVA_HOME works around this broken
-		# autodetection. If no JDK is installed, we should end up with an empty
-		# value in JAVA_HOME, and the tests should get skipped.
-		export JAVA_HOME=$(java-config -O 2>/dev/null)
-
-		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
-		python3 run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-
-	dobashcomp data/shell-completions/bash/meson
-}
diff --git a/dev-util/meson/meson-0.64.0.ebuild b/dev-util/meson/meson-0.64.0.ebuild
deleted file mode 100644
index 7eaa764dfcab..000000000000
--- a/dev-util/meson/meson-0.64.0.ebuild
+++ /dev/null
@@ -1,120 +0,0 @@
-# Copyright 2016-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-DISTUTILS_USE_PEP517=setuptools
-
-if [[ ${PV} = *9999* ]]; then
-	EGIT_REPO_URI="https://github.com/mesonbuild/meson"
-	inherit git-r3
-else
-	MY_P=${P/_/}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${MY_P}.tar.gz"
-
-	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"
-	fi
-fi
-
-inherit bash-completion-r1 distutils-r1 toolchain-funcs
-
-DESCRIPTION="Open source build system"
-HOMEPAGE="https://mesonbuild.com/"
-
-LICENSE="Apache-2.0"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-DEPEND="
-	test? (
-		dev-libs/glib:2
-		dev-libs/gobject-introspection
-		dev-util/ninja
-		dev-vcs/git
-		sys-libs/zlib[static-libs(+)]
-		virtual/pkgconfig
-	)
-"
-RDEPEND="
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.63-xtools-support.patch
-)
-
-python_prepare_all() {
-	local disable_unittests=(
-		# ASAN and sandbox both want control over LD_PRELOAD
-		# https://bugs.gentoo.org/673016
-		-e 's/test_generate_gir_with_address_sanitizer/_&/'
-
-		# ASAN is unsupported on some targets
-		# https://bugs.gentoo.org/692822
-		-e 's/test_pch_with_address_sanitizer/_&/'
-
-		# https://github.com/mesonbuild/meson/issues/7203
-		-e 's/test_templates/_&/'
-
-		# Broken due to python2 wrapper
-		-e 's/test_python_module/_&/'
-	)
-
-	sed -i "${disable_unittests[@]}" unittests/*.py || die
-
-	# Broken due to python2 script created by python_wrapper_setup
-	rm -r "test cases/frameworks/1 boost" || die
-
-	distutils-r1_python_prepare_all
-}
-
-src_test() {
-	tc-export PKG_CONFIG
-	if ${PKG_CONFIG} --exists Qt5Core && ! ${PKG_CONFIG} --exists Qt5Gui; then
-		ewarn "Found Qt5Core but not Qt5Gui; skipping tests"
-	else
-		distutils-r1_src_test
-	fi
-}
-
-python_test() {
-	(
-		# test_meson_installed
-		unset PYTHONDONTWRITEBYTECODE
-
-		# https://bugs.gentoo.org/687792
-		unset PKG_CONFIG
-
-		# test_cross_file_system_paths
-		unset XDG_DATA_HOME
-
-		# 'test cases/unit/73 summary' expects 80 columns
-		export COLUMNS=80
-
-		# If JAVA_HOME is not set, meson looks for javac in PATH.
-		# If javac is in /usr/bin, meson assumes /usr/include is a valid
-		# JDK include path. Setting JAVA_HOME works around this broken
-		# autodetection. If no JDK is installed, we should end up with an empty
-		# value in JAVA_HOME, and the tests should get skipped.
-		export JAVA_HOME=$(java-config -O 2>/dev/null)
-
-		# Call python3 instead of EPYTHON to satisfy test_meson_uninstalled.
-		python3 run_tests.py
-	) || die "Testing failed with ${EPYTHON}"
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	insinto /usr/share/vim/vimfiles
-	doins -r data/syntax-highlighting/vim/{ftdetect,indent,syntax}
-
-	insinto /usr/share/zsh/site-functions
-	doins data/shell-completions/zsh/_meson
-
-	dobashcomp data/shell-completions/bash/meson
-}
diff --git a/dev-util/pwndbg/Manifest b/dev-util/pwndbg/Manifest
index 142634512e81..233f61a958f4 100644
--- a/dev-util/pwndbg/Manifest
+++ b/dev-util/pwndbg/Manifest
@@ -1,7 +1,5 @@
 DIST gdb-pt-dump-f25898adc61d60e5f30c6452b15700bbf1bd630c.tar.gz 385826 BLAKE2B 0cfca93c620f0292d5e0b99f57f6a4090af512d0c12e4cafd3db09960f70cba7efbd7b664235b4c6147d74d368e12fc8ab5d8884db0fc514a135cd6b2ea5db47 SHA512 ef8956a191ba0627ac9070b590e32da9fff452dcd1cef1bebcf2a45266a1f218229b694e617de25da412109a3c4115049519b7f9855ffd7b2e8d7d61bad3f4ed
-DIST pwndbg-20220105.tar.gz 8272634 BLAKE2B a221fa3af2145a819bc780f3395a168a91371ce1218dc4acfee2ac3420a78c8550c98921dbb03f4bc928cdac07fdc6bed8be7c642a5be42064492192b3443ea6 SHA512 ebb61b402bb6cbaa516c2b1d885f231f6f591c2226d02d69cdd163f674ed41aba5505e3390b47e431f93a6e5de3867feb93c2be6da03a32c5f4c7a0ff074fa08
 DIST pwndbg-20220830.tar.gz 8302318 BLAKE2B fd6821d0846646927a3a7f0f352067360984f90156702bb8d2001b40651e20b11c8a33b07fa522f568f39ce6337f2503d930f745ab424d5ce6948a270e331c1f SHA512 be59544eb959ba05e6a662dbc629eb33a014c39d5ad5fceb44e9c6a9ccfa3ac6c133c082adfda1602002aff9eab3326d5b97aff7b6ce1357116a2d1fe6aa28fb
-EBUILD pwndbg-20220105.ebuild 2084 BLAKE2B d8cd8328788431c6ce918ab969f4cf8da33582dd8ff206adbec84eca40897a9e849d95933a5081d25e03ed3b34bf1e36fc8806b4aeccc86840f508da884e3958 SHA512 ddb0e7cb79774cf4625f718ff4cb23433546e16126d76ee9d8239ed59e33d4250e199e05d6570db8595c41df8f23a4c0e69523b25e5be48f6da098f4c2b35190
 EBUILD pwndbg-20220830.ebuild 2437 BLAKE2B 3fe7d16aeeae24d78d437006980bc31f3a4fed5c49a2fb560002710d21e9d8ef113e62369b33320f7a363c25a891f1100d5ed965c69a296d5d6a7077e5535b9a SHA512 f75cc09ec1b3ab84ed1fc0cafca1f97d4a0b6e14958408110341a91d7c539aca68c3da9a7568c4ba0e5db72446ea6371ae6408d9db6cc26358ada9a59d341d64
 EBUILD pwndbg-99999999.ebuild 2439 BLAKE2B c479c8b1156861eb8cc0800d574f6e1baf1a6d568d0154385d286e4069f8d3a5aaf0783ce9e49c05e9ac09bf5883782d096e97e58a85c8d482e7269c52f87e70 SHA512 28b371189db96f745fc1cb58c2b2f972473f2c41b7b5f96b9fc335b8a61289e88d4e3924247d0b23ef6fe71a5bb29e3bd55889dab91a33f95a5cbc3cd8661da4
 MISC metadata.xml 692 BLAKE2B bb74dda183fe35e5873e7cbaa5886dec5beaf082968b16352bcda55f2e14dbdb78ee48d2e0195baa735b0f615b0469f8fd48429c47f4a81d2fc0391cafaade76 SHA512 8a6a9ec3aa03e597d8302a5b1001fbfd569e6efb08157445bedb58ec82b4d7812aad7a852ae3eb0d0f245cbf89c85a357e532855c19e6dbc9d438c16e0bd549d
diff --git a/dev-util/pwndbg/pwndbg-20220105.ebuild b/dev-util/pwndbg/pwndbg-20220105.ebuild
deleted file mode 100644
index 05781901d5d5..000000000000
--- a/dev-util/pwndbg/pwndbg-20220105.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{9..10} )
-
-inherit python-single-r1 wrapper
-
-DESCRIPTION="A GDB plug-in that makes debugging with GDB suck less"
-HOMEPAGE="https://github.com/pwndbg/pwndbg"
-
-if [[ ${PV} == "99999999" ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/pwndbg/pwndbg"
-else
-	MY_PV="${PV:0:4}.${PV:4:2}.${PV:6:2}"
-	SRC_URI="https://github.com/pwndbg/pwndbg/archive/${MY_PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="amd64 ~x86"
-	S="${WORKDIR}/${PN}-${MY_PV}"
-fi
-
-LICENSE="MIT"
-SLOT="0"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	sys-devel/gdb[python,${PYTHON_SINGLE_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-libs/capstone[python,${PYTHON_USEDEP}]
-		dev-python/future[${PYTHON_USEDEP}]
-		dev-python/isort[${PYTHON_USEDEP}]
-		dev-python/psutil[${PYTHON_USEDEP}]
-		dev-python/pycparser[${PYTHON_USEDEP}]
-		dev-python/pyelftools[${PYTHON_USEDEP}]
-		dev-python/python-ptrace[${PYTHON_USEDEP}]
-		dev-python/six[${PYTHON_USEDEP}]
-		dev-python/pygments[${PYTHON_USEDEP}]
-		dev-util/ROPgadget[${PYTHON_USEDEP}]
-		dev-util/unicorn[python,${PYTHON_USEDEP}]
-	')"
-
-src_prepare() {
-	if [[ ${PV} != *9999 ]]; then
-		sed -e "s/__version__ = '\(.*\)'/__version__ = '${PV}'/" \
-			-i pwndbg/version.py || die
-	fi
-
-	python_fix_shebang "${S}"
-	default
-}
-
-src_install() {
-	insinto /usr/share/${PN}
-	doins -r pwndbg/ gdbinit.py # ida_script.py
-
-	python_optimize "${ED}"/usr/share/${PN}
-
-	make_wrapper "pwndbg" \
-		"gdb -x \"${EPREFIX}/usr/share/${PN}/gdbinit.py\"" || die
-
-	dodoc {README,DEVELOPING,FEATURES}.md
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		einfo "\nUsage:"
-		einfo "    ~$ pwndbg <program>"
-		ewarn "\nWARNING!!!"
-		ewarn "Some pwndbg commands only works with libc debug symbols.\n"
-		ewarn "See also:"
-		ewarn " * https://github.com/pentoo/pentoo-overlay/issues/521#issuecomment-548975884"
-		ewarn " * https://sourceware.org/gdb/onlinedocs/gdb/Separate-Debug-Files.html"
-		ewarn " * https://wiki.gentoo.org/wiki/Debugging"
-	fi
-}
diff --git a/dev-util/seer/Manifest b/dev-util/seer/Manifest
index 79acf11f862d..62dde6e45915 100644
--- a/dev-util/seer/Manifest
+++ b/dev-util/seer/Manifest
@@ -1,7 +1,7 @@
 AUX seer-1.12-build-fixes.patch 683 BLAKE2B 70fe3b851fc94edf47c70f29ad91c77621dc0037b97232548aa0eaf69057be8c5743a1d341bfcea8ec58953471c67155c5479bd85e05642272b8126df4c70131 SHA512 e2f4680038b5491925fcb642865762bbe52d2f70f156133881a23bfd713c54a49c0bbc48a80c79e0830c08b16fd0e51fefcae9c03475ae22c5f5568646088956
-DIST seer-1.11.tar.gz 380123 BLAKE2B 786061d12127cac2b64012461a8cab4f082c2f028db42c8856187cefae940ed084b70db68f6deb4735e5d6237f2d936be5d28d417f676a18324e37fc14342aec SHA512 be58f4c24f34b7d55689c82c7bf0584780e36d47f2e153555fca51b35763732ff639cd2f8281bf7eba8270d706c5560efea72d2c8b19cca5d4e2480d72f9f440
 DIST seer-1.12.tar.gz 387336 BLAKE2B 2db88904c230f5e5d1aa7112a77a88f709879aed8a6c6867ef05d53cfbba5baa56b477345be8e00a8a5881b2156da9730b71285dc68945d78cb959fccbb988be SHA512 94ce329fa0aebea34d838c1742cd3ab34d76123d3a99e102314b2e4a300944be2fb4cd3116d023efbc3a48aec562493ca241a8478a995bd99df58bf0fecc3d50
-EBUILD seer-1.11.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
+DIST seer-1.13.tar.gz 396675 BLAKE2B 9dd844688a84645c5c105f5296c86c71335ccced3880a3636c8e6904be85253b1dd4da51035e5d93f6f6415584763cdf40dd27cfb5d617ee6a2fd2b64685752a SHA512 1c54c4c304ca3a378aaf1f2e2e8de49cf41886de76257cb9f746ff85a15ec2bf9abe0d4311ca6a2e585d2c13740ec815e63f3a8dc4df7478c71bc0e2261b5d4e
 EBUILD seer-1.12.ebuild 990 BLAKE2B b10a27d1aacdfe1cc46acb806f9cc94136548796d9c25d8fb607c8b00d2b8084c41257bedc1c231932422457126f6df2804f17b03057a8789ff775cfc9ef5998 SHA512 3767b1f3dbc76f8881ee4d20f254c0e2645d1746cd410e4060794c2e27ce9ffdbd5be7319b594a07daeaca54e1455610b7e9bc13203528428192502fd24bc981
+EBUILD seer-1.13.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
 EBUILD seer-9999.ebuild 939 BLAKE2B c2e94cfe86db4f938afa2a1262364f71e8299e9a7df6b0b2250713211acee662072b94d2c3b83ec899b9eb26fb4818cca4d93cce6733bce0784c1a3410c5d857 SHA512 6165033e812c43ed711ca73d9fceb650ee8f5561e88221b3374cbb68715a975cf13664d2cdb0032f1a21bebc5830965bde6f8ee1c84e83a693c278841f0b6741
 MISC metadata.xml 318 BLAKE2B a34dc163a2b5e0fc9db7808eaa083a7b978a5578db14c5f33e870a2b73ec21f056c3b287997e8db4c1951e8d56852df746fccc30cf47ad24fdbae13896329014 SHA512 4c3706be2572cfb702b357753b35deb33199ed701d95b37f005919e374712ee5412a8b9214ea4c3c82e8371457b5571ed9a055b1df963196650a64e8c0d67fbd
diff --git a/dev-util/seer/seer-1.11.ebuild b/dev-util/seer/seer-1.13.ebuild
index ecf4ab10dc4a..ecf4ab10dc4a 100644
--- a/dev-util/seer/seer-1.11.ebuild
+++ b/dev-util/seer/seer-1.13.ebuild
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 4530422979f9..2088648de739 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/fdk-aac/Manifest b/media-libs/fdk-aac/Manifest
index 2f0a802c993f..d509e4191b07 100644
--- a/media-libs/fdk-aac/Manifest
+++ b/media-libs/fdk-aac/Manifest
@@ -1,4 +1,4 @@
 AUX fdk-aac-2.0.2-always_inline.patch 2581 BLAKE2B 46f18480fe138f4b6fd98bf3474673234e1fc3e88020be07bc63284634b971a902cbe3b1996c676e12c30e502e877d7a0b4e328b97a469dd2ed7d6bd759d5161 SHA512 030bfb1ad2dc53618a0387852910687e89bacb4cefd8d7a9a230bcda5a0c0e5493e464771691491d5da4c9bc8c83ff48a99dec5e384d2c50ebcd672a051a7ce3
 DIST fdk-aac-2.0.2.tar.gz 2886434 BLAKE2B f9917cf8ded3e4165048b27211c5985b4fe174d1ac815a7bc4afad88e059f3a89a24f88ad20633becdba9cb91717b9d4bf44781368c436e35002061b1644eb64 SHA512 8e5a7992869a7e649bee6d41bf7c6e408cec7ba1931a6cd7a9ad8a01e6ac49bd299ddd147b18823e8ee379ce7c6373d7f5a94f0f859ed973a30c61eccd53fa7e
-EBUILD fdk-aac-2.0.2.ebuild 1364 BLAKE2B 35e76c6a8c4b1aa4cc93f78b34b5865c893949a9ed48b9bf1ed30c562e5290eb9f4f4f9053e3e447fadccfe9a686d434b26ccac8b1d62891312c2d33d8207d48 SHA512 6f6dd789bfc9edfda1753c57e813e2864ce779a1ef8f2163a43c6ac88fbeb448a4fe4db0e2b77da74398c55aa13eb8f6af39fe67dde8e194fcfcf84406fc2878
+EBUILD fdk-aac-2.0.2.ebuild 1415 BLAKE2B dc59d52806be802f00b3defbafb4c45236238689b220ebc145e823280fa7a9cb164bcf5427ed16243c33ba292a64d5a8d90d3e96965d96ecc62e40c7b21bd4ea SHA512 8d9f4176a12097ea0e7bcdbfb7c3d4f2662dbf825272a4653eddbfcc8552b490d7957e1e0e4bcd3ce6d2345abd0a8877685de769c3ff322c38f7d94ba57658c2
 MISC metadata.xml 336 BLAKE2B 5f1981713cbc6db97ecdea2af10393759e29be9cca9f0bc39baf5178b70d77b2553e5a29cece1a2a1b7c1a57337859866b05da3c83a52657baf3f87cec98d794 SHA512 3effbf30ad5c4566466f5e8f473f045294a687845416b3d8a67350392c01b22009db45d129bd312d44f2dfd0302ed1e3f0ab57ab01031cab9549980242779c13
diff --git a/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild b/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
index 4c39024a57df..375b82c75a5f 100644
--- a/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
+++ b/media-libs/fdk-aac/fdk-aac-2.0.2.ebuild
@@ -10,6 +10,7 @@ if [[ ${PV} == *9999* ]]; then
 	[[ ${PV%9999} != "" ]] && EGIT_BRANCH="release/${PV%.9999}"
 	inherit autotools git-r3
 else
+	inherit libtool
 	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~x64-macos"
 	if [[ ${PV%_p*} != ${PV} ]]; then # Gentoo snapshot
 		SRC_URI="mirror://gentoo/${P}.tar.xz"
@@ -30,7 +31,12 @@ PATCHES=( "${FILESDIR}"/${P}-always_inline.patch )
 
 src_prepare() {
 	default
-	[[ ${PV} == *9999* ]] && eautoreconf
+
+	if [[ ${PV} == *9999* ]] ; then
+		eautoreconf
+	else
+		elibtoolize
+	fi
 }
 
 multilib_src_configure() {
diff --git a/media-libs/tiff/Manifest b/media-libs/tiff/Manifest
index ffbe7fdff49e..df1a439a1111 100644
--- a/media-libs/tiff/Manifest
+++ b/media-libs/tiff/Manifest
@@ -1,7 +1,11 @@
 AUX tiff-4.4.0-hylafaxplus-regression.patch 1100 BLAKE2B 7d45e1b8c9ff6e2956b7190618dea150fa7868585bfe68259e637e5a98655b51b985fe3ee3b08b5ada3335ee2f887d683524a105653c16d48d90b2a23d850d69 SHA512 4232c057d472651d2532814c288399a8bdcb1c0397d860ecb994489d863c2ddf05ce8a2b014ce750b0619f50cc439979607baa2dcb2b9aa97f02c8352ec60170
 AUX tiff-4.4.0_rc1-skip-thumbnail-test.patch 1176 BLAKE2B aec14df94825b3709941b065bfa6eccfef5727ab237feb4022e614749964541b5528f9724763bd86ead8aa1584590cb7900f17123c58d3e4b45a470f240a4d68 SHA512 e58fc43a081205107175122dc6f05281e2c11ef961645e3f0ac4ee6b54c22d3898c978c8ea8984394fc74a92bd81c4fb4a37915d32689314fb97c7f3aeb5b6c1
+AUX tiff-4.5.0_rc1-skip-tools-tests-multilib.patch 1477 BLAKE2B d6daf36a65fcd2afbec2fd5e5f3b75fa4547f32079c0709e98a48b0ba28d993346dfc597ef46b37db5242f2e28c7dd87a1616fe9324ca2d9659a97040bcd23db SHA512 0c7b69ddd772d73fde800e610ed533804392d0ea4ddefa409f52abcf174cc77cd1f4160a03076043d654533e98812d642d5166030d97b273ec80f5288bf3eda3
 DIST tiff-4.4.0.tar.xz 1929292 BLAKE2B d05a2fb293557d1e7cdec116c65c8338d7714af7b6abd8dd3bb2b476d62e044adc7d6c298843649d63c6bc09f6ce4660ee23638f9beb716937ccf236c2829dcf SHA512 c9611faadc9b1199f3aba9a43bfa160c77c11558d1fa358b42115ed78db73c8387531c0668cc9021842c58f1c02f8d84264d3600e1039dfe6f866822ad91cff9
 DIST tiff-4.4.0.tar.xz.sig 310 BLAKE2B 00dc8ff9c232ec4cca8b294659e6379b9bb512b58cd3d2f9231e7c10111510ac56aff3c6fc133a47f9fafc27595e099297c25940414495d8ea7f5a75aa43e9d2 SHA512 4ffdcbf5a8ce4a3be543d0ad43101ddcdb6ef22c3da5768c86660a40cc0cab48032a65c5e7bb0667f43d55dad5aa09dc0df302e2f9dbc9f24b8ccac643a0408c
+DIST tiff-4.5.0rc1.tar.xz 2314664 BLAKE2B da6bdd79348a9626d8523903b43388cc963a86d8527ffb58fd8fcc09b1aae5d7317ccfcc8cf6b2515267b3b559d327db256303e70039b12552ae87c120ee7beb SHA512 244a98142f0d18eb5b531dceb265d2444021c628e886912dbfb33e1d23e5444e350b5487bd8f94e3fbafd993dcb5e490c6f78c1426601e903ad2bbe4bc41953c
+DIST tiff-4.5.0rc1.tar.xz.sig 310 BLAKE2B b1b7ecb1f04e446cf7622df0ecff1482ca6175f4206350e9698488e2aaca64112ff41adcd8c5b817efbea947ffaec54258f87c9e932badc3c7493391960dc715 SHA512 8b2cc1d0c01d4f40f1c4c0827dbb12508d533f6c98e59cb9876a33b89fd4bbbfc8ccced3f27536d3bc00b5ae286e6b919b1468462396da38112dfc34c4ade3e0
 EBUILD tiff-4.4.0-r1.ebuild 2828 BLAKE2B 7e519df6e4d72869c2bef577881b911feaf9f74d0e574a5697f4c937cc05d2d980309b13dfe9ade1cc286e4a692c83bdd53c7f2d1ff542440791fbef6233b3b2 SHA512 c446d72065674828b2f6c18ec8749ea184a20b4fd64d0cbb46b581742e59c36b7f4f7613003e99a238cd85a89488b35c404b8d589e6511d7a54ff35df8f11911
 EBUILD tiff-4.4.0-r2.ebuild 2974 BLAKE2B 25dd9fd95309abeb2a5e5217cf1faf2f98b9a47f3bad8b1dd21114823e0bce44f07b9a0b4304a3ae9f5a4fcb2af735e0cbb000add98f19a0275508784b467d96 SHA512 0f36897a0736c590cdebb4a33152f7b0a75e57e1a2788e034cd43d819601cb7c92f4953f0163067664e0b3fe1b4b93db589f585dd95c050ca4b51e8fd25908b5
+EBUILD tiff-4.5.0_rc1.ebuild 2660 BLAKE2B 42e8a2e92aac4e979bd6f68934f2c9e5bcb5c8c4b2b943fab044798407dc1c5f8797c4963f230f58c9935dd8726445b78146460a314f0ed06d188e042248048c SHA512 1bedd4ed365d524205982e11404cf8578422f4599768e8e1837ed1d78313eaa13e0a85d024733b8fc504eb0691ffa21986961f89267f90b7b5cf5cbfd1a72b22
 MISC metadata.xml 615 BLAKE2B b76f8c2714111fe539c2d15b56361bc3b2bc7469b3cd74cf933a9dad4ac8577b7bb1a2bc010ceb3623640778d1dbc912433988e938db7df8f8fca67c51003c2c SHA512 81b22e0e2763fbcd573d2c1fee362785c15c7c33cc00d0f7ce89eb9f95f55e64aee78eefc51de6d7270aa966102b744f070620828becbbb03012cc22e3e99469
diff --git a/media-libs/tiff/files/tiff-4.5.0_rc1-skip-tools-tests-multilib.patch b/media-libs/tiff/files/tiff-4.5.0_rc1-skip-tools-tests-multilib.patch
new file mode 100644
index 000000000000..831afd287226
--- /dev/null
+++ b/media-libs/tiff/files/tiff-4.5.0_rc1-skip-tools-tests-multilib.patch
@@ -0,0 +1,52 @@
+https://gitlab.com/libtiff/libtiff/-/merge_requests/334
+
+From e7605b93b12c2bf3c864910c23ac976045b5a05a Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 21 May 2022 01:01:35 +0100
+Subject: [PATCH 1/2] test (autotools): skip script tests if tools aren't built
+
+In Gentoo, we avoid building the tools for multilib (32-bit, x86) builds on
+amd64/x86_64 because we only need the library to keep binary applications working.
+
+This causes a test failure in e.g. tiffcp-thumbnail.sh as the 'thumbnail'
+binary isn't built. Skip it if unavailable.
+
+Fixes: https://gitlab.com/libtiff/libtiff/-/issues/421
+--- a/test/Makefile.am
++++ b/test/Makefile.am
+@@ -55,13 +55,14 @@ XFAIL_TESTS =
+ CLEANFILES = test_packbits.tif o-*
+ 
+ if HAVE_JPEG
++if TIFF_TOOLS
+ JPEG_DEPENDENT_CHECK_PROG=raw_decode
+ JPEG_DEPENDENT_TESTSCRIPTS=\
+ 	tiff2rgba-quad-tile.jpg.sh \
+ 	tiff2rgba-ojpeg_zackthecat_subsamp22_single_strip.sh \
+ 	tiff2rgba-ojpeg_chewey_subsamp21_multi_strip.sh \
+ 	tiff2rgba-ojpeg_single_strip_no_rowsperstrip.sh
+-
++endif
+ else
+ JPEG_DEPENDENT_CHECK_PROG=
+ JPEG_DEPENDENT_TESTSCRIPTS=
+@@ -76,6 +77,7 @@ check_PROGRAMS = \
+ endif
+ 
+ # Test scripts to execute
++if TIFF_TOOLS
+ TESTSCRIPTS = \
+ 	ppm2tiff_pbm.sh \
+ 	ppm2tiff_pgm.sh \
+@@ -156,6 +158,9 @@ TESTSCRIPTS = \
+ 	testfax4.sh \
+ 	testdeflatelaststripextradata.sh \
+ 	$(JPEG_DEPENDENT_TESTSCRIPTS)
++else
++TESTSCRIPTS=
++endif
+ 
+ # This list should contain the references files
+ # from the 'refs' subdirectory
+-- 
+GitLab
diff --git a/media-libs/tiff/tiff-4.5.0_rc1.ebuild b/media-libs/tiff/tiff-4.5.0_rc1.ebuild
new file mode 100644
index 000000000000..16dc6945dd04
--- /dev/null
+++ b/media-libs/tiff/tiff-4.5.0_rc1.ebuild
@@ -0,0 +1,89 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+QA_PKGCONFIG_VERSION="$(ver_cut 1-3)"
+
+# Release signer can vary per version but not clear if others will be doing
+# them in future, so gone with Even Rouault for now as he does other geosci
+# stuff too like PROJ, GDAL. Previous release manager of TIFF was
+# GraphicsMagick maintainer Bob Friesenhahn. Please be careful when verifying
+# who made releases.
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/rouault.asc
+inherit autotools multilib-minimal verify-sig flag-o-matic
+
+MY_P="${P/_rc/rc}"
+DESCRIPTION="Tag Image File Format (TIFF) library"
+HOMEPAGE="http://libtiff.maptools.org"
+SRC_URI="https://download.osgeo.org/libtiff/${MY_P}.tar.xz"
+SRC_URI+=" verify-sig? ( https://download.osgeo.org/libtiff/${MY_P}.tar.xz.sig )"
+S="${WORKDIR}/${PN}-$(ver_cut 1-3)"
+
+LICENSE="libtiff"
+SLOT="0/6"
+if [[ ${PV} != *_rc* ]] ; then
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+fi
+IUSE="+cxx jbig jpeg lzma static-libs test webp zlib zstd"
+RESTRICT="!test? ( test )"
+
+# bug #483132
+REQUIRED_USE="test? ( jpeg )"
+
+RDEPEND="jbig? ( >=media-libs/jbigkit-2.1:=[${MULTILIB_USEDEP}] )
+	jpeg? ( media-libs/libjpeg-turbo:=[${MULTILIB_USEDEP}] )
+	lzma? ( >=app-arch/xz-utils-5.0.5-r1[${MULTILIB_USEDEP}] )
+	webp? ( media-libs/libwebp:=[${MULTILIB_USEDEP}] )
+	zlib? ( >=sys-libs/zlib-1.2.8-r1[${MULTILIB_USEDEP}] )
+	zstd? ( >=app-arch/zstd-1.3.7-r1:=[${MULTILIB_USEDEP}] )"
+DEPEND="${RDEPEND}"
+BDEPEND="verify-sig? ( sec-keys/openpgp-keys-evenrouault )"
+
+MULTILIB_WRAPPED_HEADERS=(
+	/usr/include/tiffconf.h
+)
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.5.0_rc1-skip-tools-tests-multilib.patch
+)
+
+src_prepare() {
+	default
+
+	# Added to fix cross-compilation
+	#elibtoolize
+
+	# For skip-tools-tests-multilib.patch
+	eautoreconf
+}
+
+multilib_src_configure() {
+	append-lfs-flags
+
+	local myeconfargs=(
+		--disable-sphinx
+		--without-x
+		--with-docdir="${EPREFIX}"/usr/share/doc/${PF}
+		$(use_enable cxx)
+		$(use_enable jbig)
+		$(use_enable jpeg)
+		$(use_enable lzma)
+		$(use_enable static-libs static)
+		$(use_enable test tests)
+		$(use_enable webp)
+		$(use_enable zlib)
+		$(use_enable zstd)
+
+		$(multilib_native_enable docs)
+		$(multilib_native_enable contrib)
+		$(multilib_native_enable tools)
+	)
+
+	ECONF_SOURCE="${S}" econf "${myeconfargs[@]}"
+}
+
+multilib_src_install_all() {
+	find "${ED}" -type f -name '*.la' -delete || die
+	rm "${ED}"/usr/share/doc/${PF}/{README*,RELEASE-DATE,TODO,VERSION} || die
+}
diff --git a/media-video/Manifest.gz b/media-video/Manifest.gz
index e783dd02df35..bff4eabd8a1a 100644
--- a/media-video/Manifest.gz
+++ b/media-video/Manifest.gz
diff --git a/media-video/pipewire/Manifest b/media-video/pipewire/Manifest
index bbd3248cae18..2a2212d4b7b0 100644
--- a/media-video/pipewire/Manifest
+++ b/media-video/pipewire/Manifest
@@ -1,22 +1,19 @@
 AUX 99-pipewire-default-hook.conf 540 BLAKE2B cec76e78db9db290054bf766774c284d7a7a1374c453802eb1bdc19db9289856ec7b8643acbab916a39ca859d543deca111e3b0f110d1904343221c1573ffc17 SHA512 ef891e38c6f40fce2904e240307147a58c48d780e8470dac8e28044cfb86ddeb163885a2362687791779379ad814f58ad5649b75ac4e82931c5bdd3f37a6ed01
 AUX gentoo-pipewire-launcher.in 1227 BLAKE2B 4316a991978fac653a00d076e9236d0ab6c01a6e4b800c82851e2bd6f9476369605c741aa7ffd47b10853653ef1d4222c449f0b912a0f7694fffd2b1611d7a47 SHA512 edbc03cec765d2307bcf33a14521c6f8beeae52d9fd6a4e181ba66b9f5dd0d64995fdef847453d1a4c682d701814b3afbe70931f55a0e4198fc5c9d87d7a95c5
 AUX pipewire-0.3.25-enable-failed-mlock-warning.patch 704 BLAKE2B dc0732b89b57a258ea6dc54941899134259469675f92ae93aebda09a796c73ace8bc4ed0ab2aef4ea1bcaa30c1bea8c3304288168421ce8f9939ec993c8aa438 SHA512 7456a24276b7b766ff5799acf5b80ef5f85ee7a78fc5b52adff3206c0b0aa1985a0bf72634aacf7818c90136c09bcc11cb0fecec291d961c8b3585c897869f65
-AUX pipewire-0.3.56-big-endian.patch 1632 BLAKE2B b47b5ca888de71c9ee71ba35d5a490074e39219777345f4bf55252c0e9de65b97cc995c894b27c43945c8b32d70304e46610b3b641732170dc8f1ad97ea6549b SHA512 84bda8d747b91f04a40da6e55f186991b679b124e2571d64cd18368d5d4e1e2273565e3eee0a7b4b1a20a731429c240f168b970b02f88534375131b24c358cc1
 AUX pipewire-0.3.59-filter-chain-alloc-port-data-handle.patch 2771 BLAKE2B a6248de6ca263fa275938f61e504b442e06e41ef5cb650fe03c0c8a91d28567fc3e20b02626f2293a3ca1c0014c8f6692498178be38017445e167efcdf2d6e7e SHA512 46534f3fc267170090c0abdc076a1486fe4c3b964790bba19156349814b26b14b0dd637ff4aeaa0b5a3775ddebcf021e93cc4e1f85f7aa7cfda3bb4a66af6fc7
 AUX pipewire-0.3.60-profile-switch-crash.patch 1137 BLAKE2B 7788032fbb6f4ff1641c607700c73932c743ab2d1a0187bbeff845a1877cc152e26c7568a53ea34647a09a5f0f2b176b58459e733abab931837306ffac759523 SHA512 2e841b76be0eb0b481913aabee41d62dcc0fbb190adae1624f6a20719e62b292324f0687cde659685403ae9ce29ff3ee2831d826ff5cd447c5e729bc74dea619
 AUX pipewire-0.3.60-pulse-server-also-advance-read-pointer-in-underrun.patch 994 BLAKE2B e33d9d2c1b77264f3e14e6d0c6b04e2674758567b2604b37c25d6d08507742446478a22b84a2ae4316d2128f363b59f96493ce1a470c2cbce8f974afe9da7161 SHA512 c20e3d46b0f89077e39998617dace62147c0f3e6c6da8bf800cfeb817545ef68b8f1d9bd78c16204d1d47c0c5ac097dbf986a728262c7f4ef0a6090774d615eb
 AUX pipewire-0.3.60-qemu.patch 697 BLAKE2B debafa8889db0f9724c7e6ffdfdfd1c71e4722b042fca1dba1bc2ef1378d32950689ce8e85ea7fc179867d9f937d8f69eb795132fc8d14278268ca521dcecd80 SHA512 c32edc0164c61d758efc525307c65e8cb823645b32f8eb8fff8dda8be3517b254e7a578ab2b4cb42e6e0b4d66ae2f4ff985ddcabf1cc30efe13a380ebed51466
 AUX pipewire.desktop 322 BLAKE2B 0299b9054cf881a5cbbdb128a5e8a51308cf0b5a98260dca756e704504ef057e403b2fb4aa2d58f52dde4be59e416c95d8fce21bc3ca6b6447ecab58263a3f21 SHA512 c13ea531cfdd3798f8d6cd20f5fa8c0a5040c27a6ef3850fdd41102a3bf0bcb73176e3300845af77804a98842fb736841223bc9ac1c92eb2034e9d46e41fc344
 AUX pipewire.desktop-r1 325 BLAKE2B 7d823a264e5147bf8669127df22f468518fd54375ed57910f0143821894b33cfee8925b1cf8b9c5b1d219453a5c62fffa50d111b78bc5e151e23aed84d0a577e SHA512 e51ba049484daba3e4cdc5890748267f0c23ea6e57f31f3bb8a49c011e1a61b47b68eea742e5e7bcd58bfeddb96dd4064079fd9787cb66c78bd5eff10799a7bf
-DIST pipewire-0.3.56.tar.gz 1856321 BLAKE2B 62fb5d5a83b3cfc0555f09da42c8d4fbe69f34432add57f91a9c001535340a84f54572af4a5ba138251888cba9be0c038317dfe929d2e2ef36ff62f4679c6ea0 SHA512 a1ba598c56130a30e573d3ce3ac5879d800d3005a47075c45353d968c97c12f74d85802cd171b61558c06c474a03bbe4885396ca430a0af6c5672ed00f43d108
 DIST pipewire-0.3.59.tar.bz2 1443372 BLAKE2B 5e2d82c0bfdb7c030d8be525152c38115438caeb990afd7757424efcf2a7391a6a4891b0f58347ab0b7446707e8ad88baffa0c11c5acc42e086f23c9de3cb354 SHA512 f42bfab6e1bb227431119b44887af818a25eb0cdbcca917433162af87c942eb105a2b6e100de877d188941a24f1c8e2e9ae79f499fc20f0a32e2f7cc5de54162
 DIST pipewire-0.3.60.tar.bz2 1478952 BLAKE2B a7cda37a35ea58079b5297949239fd05b895b59d397f36a68c75c9392c65ad060926caf2e61c5511ab27f02da6c1c2044e4e86009f9c5f18d2744cad63585900 SHA512 8a1c022a283f3cbe7488658563440ff6b426f0b894f519ccd5c7d73bdb5437902fbd4d7d572d5840d48bd7a2f037f0f14dd244fe36b8be891a2d2843f4a99b5c
 DIST pipewire-0.3.61.tar.bz2 1480364 BLAKE2B df940896189b986e1d63ce6d5ec6cb554ae030ef2ed217a5310f06d959b8c28bff12bc48d847ce5bc6ff007b3652f9ae6e35fd15ef39283348c010cd341bcea6 SHA512 8fe5b6ce0fd1ef2a20b1253436fb97aab9da168ce243400b0291051e97809d75793d9446fd4aafc835f82fd257009ec6df9e181d375b492ee72d7f90275ab917
 DIST pipewire-0.3.62.tar.bz2 1482986 BLAKE2B 008f57e0e01971aa27af7a7c1e4ddcc72326845534fd8c9257b14078acdde1abf44629b93532ba340c5d446ef47b402bfa22ffbfc28cd44a75131b05e06ce3c8 SHA512 3132b18fc3d1269587216301a9e5a87ee74c1583f17da466a82e9446b57a8a9b77e7dfdea84f04320940c637ea6ce5c1c9caca6a449fb1e55e946259820b2084
-EBUILD pipewire-0.3.56.ebuild 15643 BLAKE2B 15b146a8ca79173ffa4b93315681fda18d1290711ec8b41715c96dcdfff325ea8ffd1fd9418671cfe966542ba7c81bef6ef08f14c7f17b569bb82abc66c6fa63 SHA512 832ba476d2e4f2bbcb78118152b407f426ed40bf514096a19fcf3f8a00afcbfaf3f17e2d914279055c8afdf526969598d9aaa3acddbc905d62509c43fd6b6917
 EBUILD pipewire-0.3.59-r2.ebuild 15852 BLAKE2B 21cf0a628f02e323ee25220ac73659813009ec786962a579ed882297315415096ebcbd2db9a0463d892a592d22142cd2eaf39c8abd767a18124bbaf523b057ed SHA512 3294fc701cd4953e40920e9679b57531e29512cdb65f82a9b2f611212497572e388b3a3ced87898a0f262279588ac82d861d7de46f4048976f1508c16663f364
 EBUILD pipewire-0.3.60-r1.ebuild 16248 BLAKE2B 98004ada5eec4a5010b32718e68d388d092e8ecfc7fb8c205eb414ce37f77c7f0b274de9ffaae1d8092985407f0b71ec995a058911ba71f60ea538d4a0e800bb SHA512 cf4ebd534796c61a9cdb1bcf891c524558758956e0d34645f3486c68eda6c4026f9d90e560b64ba5cda8ea5153e17199fe7594c62dacd9b7f49fbe2a9dc692ad
-EBUILD pipewire-0.3.61.ebuild 16093 BLAKE2B 50fc7a6f22231edf7219ebf8a1d96365254d74ce21632645a99ac76b494f2484aef428e3a45970abbc322fb3e4c4374c63f41f98ddfcd0a2c0c3d3e872e3badf SHA512 ba9a277a141fadcbd51cdefa22e353417adcc52ff6a561d16090c010dae189ea387dc665cb0ff792e48d48fbaf1ed19e8632fae30584b6432bcfcb0d33c183fd
+EBUILD pipewire-0.3.61.ebuild 16091 BLAKE2B 62907c752d1bb9f1ed1822842462177cd17e30b02b322422e2330303fc33b7e6d5b8967cf5fc9aa384a1bc155dc70b26d4f7c8135ef302516d699147609d69c8 SHA512 42cbf609364f4fce73515e0b5c7aa3ccd473cff069663d4f0a140ca32709b2ba85a7bf004cfac311ec3744ff721f87ba7db54d2a4665c4d072604ce3f84664d0
 EBUILD pipewire-0.3.62.ebuild 16187 BLAKE2B 2a8a2dd8f18b777ce2d9428aecb74495cdca09e68002ef60fe30595b19fdabf410d6adc1ccf339ceeb0f37347607d546f4091241d20bd410f29c7daac5f66cad SHA512 3b9ef7155317e966dc2c4f7b77b6a7d483d4661c9c4c81e92f87328a814be80d0d05f540b9c7d936628f329284b979d02fe79c9d65a69ee3897e71e699771792
 EBUILD pipewire-9999.ebuild 16187 BLAKE2B 2a8a2dd8f18b777ce2d9428aecb74495cdca09e68002ef60fe30595b19fdabf410d6adc1ccf339ceeb0f37347607d546f4091241d20bd410f29c7daac5f66cad SHA512 3b9ef7155317e966dc2c4f7b77b6a7d483d4661c9c4c81e92f87328a814be80d0d05f540b9c7d936628f329284b979d02fe79c9d65a69ee3897e71e699771792
 MISC metadata.xml 1860 BLAKE2B 8f537f36217aa1c5869e48a1af71cae96b56e60f5cd9b811739be159dd3aeeabe3c31dccc3d7f695f7361f7d262f8c68230fb410e389465b9264d8e6af232aa5 SHA512 d2ae3129e67b7527bbd3481ac77e27de4e26f6ff77601a7538d5e888c7737b7b39d981be4dcf245ea8d676823f1b1fbf8d854feefa62b74962710af17248d731
diff --git a/media-video/pipewire/files/pipewire-0.3.56-big-endian.patch b/media-video/pipewire/files/pipewire-0.3.56-big-endian.patch
deleted file mode 100644
index d7742d26cead..000000000000
--- a/media-video/pipewire/files/pipewire-0.3.56-big-endian.patch
+++ /dev/null
@@ -1,55 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/aaa015d0c0c66b64c7198a34ad3c4b43445667d2
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/1a5ec4452fa21592eaeeb823ad95a1db6eb60376
-https://gitlab.freedesktop.org/pipewire/pipewire/-/commit/f857fd46262b1a90ad94f86e34216a1a886d9463
-
-From aaa015d0c0c66b64c7198a34ad3c4b43445667d2 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Tue, 19 Jul 2022 13:06:52 +0200
-Subject: [PATCH] avb: fix compilation on big endian
-
---- a/spa/plugins/avb/avbtp/packets.h
-+++ b/spa/plugins/avb/avbtp/packets.h
-@@ -116,7 +116,7 @@ struct spa_avbtp_packet_aaf {
- 	unsigned gv:1;
- 	unsigned tv:1;
- 
--	uint8_t seq_number;
-+	uint8_t seq_num;
- 
- 	unsigned _r2:7;
- 	unsigned tu:1;
-GitLab
-From 1a5ec4452fa21592eaeeb823ad95a1db6eb60376 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Tue, 19 Jul 2022 13:49:42 +0200
-Subject: [PATCH] avb: fix compilation on big endian
-
---- a/src/modules/module-avb/aaf.h
-+++ b/src/modules/module-avb/aaf.h
-@@ -35,7 +35,7 @@ struct avb_packet_aaf {
- 	unsigned gv:1;
- 	unsigned tv:1;
- 
--	uint8_t seq_number;
-+	uint8_t seq_num;
- 
- 	unsigned _r2:7;
- 	unsigned tu:1;
-GitLab
-From f857fd46262b1a90ad94f86e34216a1a886d9463 Mon Sep 17 00:00:00 2001
-From: Wim Taymans <wtaymans@redhat.com>
-Date: Tue, 19 Jul 2022 14:07:16 +0200
-Subject: [PATCH] avb: fix compilation on big endian
-
---- a/src/modules/module-avb/iec61883.h
-+++ b/src/modules/module-avb/iec61883.h
-@@ -37,7 +37,7 @@ struct avb_packet_iec61883 {
- 	unsigned gv:1;
- 	unsigned tv:1;
- 
--	uint8_t seq_number;
-+	uint8_t seq_num;
- 
- 	unsigned _r2:7;
- 	unsigned tu:1;
-GitLab
diff --git a/media-video/pipewire/pipewire-0.3.56.ebuild b/media-video/pipewire/pipewire-0.3.56.ebuild
deleted file mode 100644
index d60731301153..000000000000
--- a/media-video/pipewire/pipewire-0.3.56.ebuild
+++ /dev/null
@@ -1,424 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 1. Please regularly check (even at the point of bumping) Fedora's packaging
-# for needed backports at https://src.fedoraproject.org/rpms/pipewire/tree/rawhide.
-#
-# 2. Upstream also sometimes amend release notes for the previous release to mention
-# needed patches, e.g. https://gitlab.freedesktop.org/pipewire/pipewire/-/tags/0.3.55#distros
-#
-# 3. Keep an eye on git master (for both PipeWire and WirePlumber) as things
-# continue to move quickly. It's not uncommon for fixes to be made shortly
-# after releases.
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/${PN}/${PN}.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *_p* ]] ; then
-		MY_COMMIT=""
-		SRC_URI="https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/${MY_COMMIT}/pipewire-${MY_COMMIT}.tar.bz2 -> ${P}.tar.bz2"
-		S="${WORKDIR}"/${PN}-${MY_COMMIT}
-	else
-		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.gz"
-	fi
-
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="Multimedia processing graphs"
-HOMEPAGE="https://pipewire.org/"
-
-LICENSE="MIT LGPL-2.1+ GPL-2"
-# ABI was broken in 0.3.42 for https://gitlab.freedesktop.org/pipewire/wireplumber/-/issues/49
-SLOT="0/0.4"
-IUSE="bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2
-pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf"
-
-# Once replacing system JACK libraries is possible, it's likely that
-# jack-client IUSE will need blocking to avoid users accidentally
-# configuring their systems to send PW sink output to the emulated
-# JACK's sink - doing so is likely to yield no audio, cause a CPU
-# cycles consuming loop (and may even cause GUI crashes)!
-
-# TODO: There should be "sound-server? ( || ( alsa bluetooth ) )" here, but ALSA is always enabled
-# TODO: Pulseaudio alsa plugin performs runtime check that pulseaudio server connection will work
-# which provides adequate guarantee that alsa-lib will be able to provide audio services.
-# If that works, pulseaudio defaults are loaded into alsa-lib runtime replacing default PCM and CTL.
-# When pipewire-alsa will be able to perform similar check, pipewire-alsa can be enabled unconditionally.
-REQUIRED_USE="
-	jack-sdk? ( !jack-client )
-	system-service? ( systemd )
-	!sound-server? ( !pipewire-alsa )
-	jack-client? ( dbus )
-"
-
-RESTRICT="!test? ( test )"
-
-BDEPEND="
-	>=dev-util/meson-0.59
-	virtual/pkgconfig
-	${PYTHON_DEPS}
-	$(python_gen_any_dep 'dev-python/docutils[${PYTHON_USEDEP}]')
-	doc? (
-		app-doc/doxygen
-		media-gfx/graphviz
-	)
-"
-RDEPEND="
-	acct-group/audio
-	media-libs/alsa-lib
-	sys-libs/readline:=
-	sys-libs/ncurses:=[unicode(+)]
-	virtual/libintl[${MULTILIB_USEDEP}]
-	bluetooth? (
-		media-libs/fdk-aac
-		media-libs/libldac
-		media-libs/libfreeaptx
-		media-libs/sbc
-		>=net-wireless/bluez-4.101:=
-		virtual/libusb:1
-	)
-	dbus? ( sys-apps/dbus[${MULTILIB_USEDEP}] )
-	echo-cancel? ( media-libs/webrtc-audio-processing:0 )
-	extra? (
-		>=media-libs/libsndfile-1.0.20
-	)
-	gstreamer? (
-		>=dev-libs/glib-2.32.0:2
-		>=media-libs/gstreamer-1.10.0:1.0
-		media-libs/gst-plugins-base:1.0
-	)
-	jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] )
-	jack-sdk? (
-		!media-sound/jack-audio-connection-kit
-		!media-sound/jack2
-	)
-	lv2? ( media-libs/lilv )
-	pipewire-alsa? (
-		>=media-libs/alsa-lib-1.1.7[${MULTILIB_USEDEP}]
-	)
-	sound-server? (
-		!media-sound/pulseaudio[daemon(+)]
-		!media-sound/pulseaudio-daemon
-	)
-	ssl? ( dev-libs/openssl:= )
-	systemd? ( sys-apps/systemd )
-	system-service? (
-		acct-user/pipewire
-		acct-group/pipewire
-	)
-	udev? ( virtual/libudev[${MULTILIB_USEDEP}] )
-	v4l? ( media-libs/libv4l )
-	X? (
-		media-libs/libcanberra
-		x11-libs/libX11
-		x11-libs/libXfixes
-	)
-	zeroconf? ( net-dns/avahi )
-"
-
-DEPEND="${RDEPEND}"
-
-# TODO: Consider use cases where pipewire is not used for driving audio
-# Doing so with WirePlumber currently involves editing Lua scripts
-PDEPEND=">=media-video/wireplumber-0.4.8-r3"
-
-# Present RDEPEND that are currently always disabled due to the PW
-# code using them being required to be disabled by Gentoo guidelines
-# (i.e. developer binaries not meant for users) and unready code
-#	media-video/ffmpeg:=
-#	media-libs/libsdl2
-#	>=media-libs/vulkan-loader-1.1.69
-#
-# Ditto for DEPEND
-#	>=dev-util/vulkan-headers-1.1.69
-
-DOCS=( {README,INSTALL}.md NEWS )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.3.25-enable-failed-mlock-warning.patch
-	"${FILESDIR}"/${P}-big-endian.patch
-)
-
-# limitsdfile related code taken from =sys-auth/realtime-base-0.1
-# with changes as necessary.
-limitsdfile=40-${PN}.conf
-
-python_check_deps() {
-	python_has_version "dev-python/docutils[${PYTHON_USEDEP}]"
-}
-
-src_prepare() {
-	default
-
-	einfo "Generating ${limitsdfile}"
-	cat > ${limitsdfile} <<- EOF || die
-		# Start of ${limitsdfile} from ${P}
-
-		@audio	-	memlock 256
-
-		$(use system-service && {
-			echo @pipewire - rtprio 95
-			echo @pipewire - nice -19
-			echo @pipewire - memlock 4194304
-		})
-
-		# End of ${limitsdfile} from ${P}
-	EOF
-}
-
-multilib_src_configure() {
-	# https://bugs.gentoo.org/838301
-	filter-flags -fno-semantic-interposition
-
-	local emesonargs=(
-		-Ddocdir="${EPREFIX}"/usr/share/doc/${PF}
-
-		$(meson_feature dbus)
-		$(meson_native_use_feature zeroconf avahi)
-		$(meson_native_use_feature doc docs)
-		$(meson_native_enabled examples) # TODO: Figure out if this is still important now that media-session gone
-		$(meson_native_enabled man)
-		$(meson_feature test tests)
-		-Dinstalled_tests=disabled # Matches upstream; Gentoo never installs tests
-		$(meson_native_use_feature gstreamer)
-		$(meson_native_use_feature gstreamer gstreamer-device-provider)
-		$(meson_native_use_feature systemd)
-
-		$(meson_native_use_feature system-service systemd-system-service)
-		-Dsystemd-system-unit-dir="$(systemd_get_systemunitdir)"
-		-Dsystemd-user-unit-dir="$(systemd_get_userunitdir)"
-
-		$(meson_native_use_feature systemd systemd-user-service)
-		$(meson_feature pipewire-alsa) # Allows integrating ALSA apps into PW graph
-		-Dspa-plugins=enabled
-		-Dalsa=enabled # Allows using kernel ALSA for sound I/O (NOTE: media-session is gone so IUSE=alsa/spa_alsa/alsa-backend might be possible)
-		-Daudiomixer=enabled # Matches upstream
-		-Daudioconvert=enabled # Matches upstream
-		$(meson_native_use_feature bluetooth bluez5)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-hfp-native)
-		$(meson_native_use_feature bluetooth bluez5-backend-ofono)
-		$(meson_native_use_feature bluetooth bluez5-backend-hsphfpd)
-		$(meson_native_use_feature bluetooth bluez5-codec-aac)
-		$(meson_native_use_feature bluetooth bluez5-codec-aptx)
-		$(meson_native_use_feature bluetooth bluez5-codec-ldac)
-		$(meson_native_use_feature bluetooth libusb) # At least for now only used by bluez5 native (quirk detection of adapters)
-		$(meson_native_use_feature echo-cancel echo-cancel-webrtc) #807889
-		# Not yet packaged.
-		-Dbluez5-codec-lc3plus=disabled
-		-Dcontrol=enabled # Matches upstream
-		-Daudiotestsrc=enabled # Matches upstream
-		-Dffmpeg=disabled # Disabled by upstream and no major developments to spa/plugins/ffmpeg/ since May 2020
-		-Dpipewire-jack=enabled # Allows integrating JACK apps into PW graph
-		$(meson_native_use_feature jack-client jack) # Allows PW to act as a JACK client
-		$(meson_use jack-sdk jack-devel)
-		$(usex jack-sdk "-Dlibjack-path=${EPREFIX}/usr/$(get_libdir)" '')
-		-Dsupport=enabled # Miscellaneous/common plugins, such as null sink
-		-Devl=disabled # Matches upstream
-		-Dtest=disabled # fakesink and fakesource plugins
-		$(meson_native_use_feature lv2)
-		$(meson_native_use_feature v4l v4l2)
-		-Dlibcamera=disabled # libcamera is not in Portage tree
-		$(meson_native_use_feature ssl raop)
-		-Dvideoconvert=enabled # Matches upstream
-		-Dvideotestsrc=enabled # Matches upstream
-		-Dvolume=enabled # Matches upstream
-		-Dvulkan=disabled # Uses pre-compiled Vulkan compute shader to provide a CGI video source (dev thing; disabled by upstream)
-		$(meson_native_use_feature extra pw-cat)
-		$(meson_feature udev)
-		-Dudevrulesdir="${EPREFIX}$(get_udevdir)/rules.d"
-		-Dsdl2=disabled # Controls SDL2 dependent code (currently only examples when -Dinstalled_tests=enabled which we never install)
-		$(meson_native_use_feature extra sndfile) # Enables libsndfile dependent code (currently only pw-cat)
-		-Dsession-managers="[]" # All available session managers are now their own projects, so there's nothing to build
-
-		# Just for bell sounds in X11 right now.
-		$(meson_native_use_feature X x11)
-		$(meson_native_use_feature X x11-xfixes)
-		$(meson_native_use_feature X libcanberra)
-	)
-
-	meson_src_configure
-}
-
-multilib_src_install() {
-	# Our custom DOCS do not exist in multilib source directory
-	DOCS= meson_src_install
-}
-
-multilib_src_install_all() {
-	einstalldocs
-
-	insinto /etc/security/limits.d
-	doins ${limitsdfile}
-
-	if use pipewire-alsa; then
-		dodir /etc/alsa/conf.d
-
-		# Install pipewire conf loader hook
-		insinto /usr/share/alsa/alsa.conf.d
-		doins "${FILESDIR}"/99-pipewire-default-hook.conf
-		eprefixify "${ED}"/usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf
-
-		# These will break if someone has /etc that is a symbolic link to a subfolder! See #724222
-		# And the current dosym8 -r implementation is likely affected by the same issue, too.
-		dosym ../../../usr/share/alsa/alsa.conf.d/50-pipewire.conf /etc/alsa/conf.d/50-pipewire.conf
-		dosym ../../../usr/share/alsa/alsa.conf.d/99-pipewire-default-hook.conf /etc/alsa/conf.d/99-pipewire-default-hook.conf
-	fi
-
-	# Enable required wireplumber alsa and bluez monitors
-	if use sound-server; then
-		dodir /etc/wireplumber/main.lua.d
-		echo "alsa_monitor.enabled = true" > "${ED}"/etc/wireplumber/main.lua.d/89-gentoo-sound-server-enable-alsa-monitor.lua || die
-
-		dodir /etc/wireplumber/bluetooth.lua.d
-		echo "bluez_monitor.enabled = true" > "${ED}"/etc/wireplumber/bluetooth.lua.d/89-gentoo-sound-server-enable-bluez-monitor.lua || die
-	fi
-
-	if ! use systemd; then
-		insinto /etc/xdg/autostart
-		newins "${FILESDIR}"/pipewire.desktop-r1 pipewire.desktop
-
-		exeinto /usr/bin
-		newexe "${FILESDIR}"/gentoo-pipewire-launcher.in gentoo-pipewire-launcher
-
-		# Disable pipewire-pulse if sound-server is disabled.
-		if ! use sound-server ; then
-			sed -i -s '/pipewire -c pipewire-pulse.conf/s/^/#/' "${ED}"/usr/bin/gentoo-pipewire-launcher || die
-		fi
-
-		eprefixify "${ED}"/usr/bin/gentoo-pipewire-launcher
-	fi
-}
-
-pkg_postrm() {
-	use udev && udev_reload
-}
-
-pkg_postinst() {
-	use udev && udev_reload
-
-	elog "It is recommended to raise RLIMIT_MEMLOCK to 256 for users"
-	elog "using PipeWire. Do it either manually or add yourself"
-	elog "to the 'audio' group:"
-	elog
-	elog "  usermod -aG audio <youruser>"
-	elog
-
-	local ver
-	for ver in ${REPLACING_VERSIONS} ; do
-		if ver_test ${ver} -le 0.3.53-r1 && ! use sound-server ; then
-			ewarn "USE=sound-server is disabled! If you want PipeWire to provide"
-			ewarn "your sound, please enable it. See the wiki at"
-			ewarn "https://wiki.gentoo.org/wiki/PipeWire#Replacing_PulseAudio"
-			ewarn "for more details."
-
-			break
-		fi
-	done
-
-	if ! use jack-sdk; then
-		elog "JACK emulation is incomplete and not all programs will work. PipeWire's"
-		elog "alternative libraries have been installed to a non-default location."
-		elog "To use them, put pw-jack <application> before every JACK application."
-		elog "When using pw-jack, do not run jackd/jackdbus. However, a virtual/jack"
-		elog "provider is still needed to compile the JACK applications themselves."
-		elog
-	fi
-
-	if use systemd; then
-		elog "When switching from PulseAudio, you may need to disable PulseAudio:"
-		elog
-		elog "  systemctl --user disable pulseaudio.service pulseaudio.socket"
-		elog
-		elog "To use PipeWire, the user units must be manually enabled"
-		elog "by running this command as each user you use for desktop activities:"
-		elog
-		elog "  systemctl --user enable pipewire.socket pipewire-pulse.socket"
-		elog
-		elog "A reboot is recommended to avoid interferences from still running"
-		elog "PulseAudio daemon."
-		elog
-		elog "Both new users and those upgrading need to enable WirePlumber"
-		elog "for relevant users:"
-		elog
-		elog "  systemctl --user disable pipewire-media-session.service"
-		elog "  systemctl --user --force enable wireplumber.service"
-		elog
-		elog "Root user may replace --user with --global to change system default"
-		elog "configuration for all of the above commands."
-	else
-		ewarn "PipeWire daemon startup has been moved to a launcher script!"
-		ewarn "Make sure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist or no"
-		ewarn "longer is set to start a session manager or PulseAudio compatibility daemon (all"
-		ewarn "lines similar to '{ path = /usr/bin/pipewire*' should be commented out)"
-		ewarn
-		ewarn "Those manually starting /usr/bin/pipewire via .xinitrc or similar _must_ from"
-		ewarn "now on start ${EROOT}/usr/bin/gentoo-pipewire-launcher instead! It is highly"
-		ewarn "advised that a D-Bus user session is set up before starting the script."
-		ewarn
-
-		if use sound-server && ( has_version 'media-sound/pulseaudio[daemon]' || has_version 'media-sound/pulseaudio-daemon' ) ; then
-			elog "This ebuild auto-enables PulseAudio replacement. Because of that, users"
-			elog "are recommended to edit pulseaudio client configuration files:"
-			elog "${EROOT}/etc/pulse/client.conf and ${EROOT}/etc/pulse/client.conf.d/enable-autospawn.conf"
-			elog "if it exists, and disable autospawning of the original daemon by setting:"
-			elog
-			elog "  autospawn = no"
-			elog
-			elog "Please note that the semicolon (;) must _NOT_ be at the beginning of the line!"
-			elog
-			elog "Alternatively, if replacing PulseAudio daemon is not desired, edit"
-			elog "${EROOT}/usr/bin/gentoo-pipewire-launcher by commenting out the relevant"
-			elog "command:"
-			elog
-			elog "#${EROOT}/usr/bin/pipewire -c pipewire-pulse.conf &"
-			elog
-		fi
-		elog "NOTE:"
-		elog "Starting with PipeWire-0.3.30, this package is no longer installing its config"
-		elog "into ${EROOT}/etc/pipewire by default. In case you need to change"
-		elog "its config, please start by copying default config from ${EROOT}/usr/share/pipewire"
-		elog "and just override the sections you want to change."
-	fi
-	elog
-
-	elog "For latest tips and tricks, troubleshooting information and documentation"
-	elog "in general, please refer to https://wiki.gentoo.org/wiki/PipeWire"
-	elog
-
-	optfeature_header "The following can be installed for optional runtime features:"
-	optfeature "restricted realtime capabilities via D-Bus" sys-auth/rtkit
-
-	if use sound-server && ! use pipewire-alsa; then
-		optfeature "ALSA plugin to use PulseAudio interface for output" "media-plugins/alsa-plugins[pulseaudio]"
-	fi
-
-	if has_version 'net-misc/ofono' ; then
-		ewarn "Native backend has become default. Please disable oFono via:"
-		if systemd_is_booted ; then
-			ewarn "systemctl disable ofono"
-		else
-			ewarn "rc-update delete ofono"
-		fi
-		ewarn
-	fi
-
-	if use system-service; then
-		ewarn
-		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
-		ewarn "the system-wide systemd units that enable PipeWire to run as a system"
-		ewarn "service. This is more than likely NOT what you want. You are strongly"
-		ewarn "advised not to enable this mode and instead stick with systemd user"
-		ewarn "units. The default configuration files will likely not work out of"
-		ewarn "box, and you are on your own with configuration."
-		ewarn
-	fi
-}
diff --git a/media-video/pipewire/pipewire-0.3.61.ebuild b/media-video/pipewire/pipewire-0.3.61.ebuild
index e8726d26413b..beb5003b7028 100644
--- a/media-video/pipewire/pipewire-0.3.61.ebuild
+++ b/media-video/pipewire/pipewire-0.3.61.ebuild
@@ -29,7 +29,7 @@ else
 		SRC_URI="https://gitlab.freedesktop.org/${PN}/${PN}/-/archive/${PV}/${P}.tar.bz2"
 	fi
 
-	KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+	KEYWORDS="~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
 fi
 
 DESCRIPTION="Multimedia processing graphs"
diff --git a/media-video/wireplumber/Manifest b/media-video/wireplumber/Manifest
index 77a3de1f26bd..844dedfebc0c 100644
--- a/media-video/wireplumber/Manifest
+++ b/media-video/wireplumber/Manifest
@@ -1,10 +1,5 @@
 AUX wireplumber-0.4.10-config-disable-sound-server-parts.patch 1017 BLAKE2B 09ea7233aaeff88bc7fc0bd0d8345ee15c9377c1a5dca4a1937f00c808def449202186be1ed61cebc05e9d241ad1f8e374b1743f93b2766d7adcf26dc1cf4837 SHA512 d3bc1248bf2ea39ebe7346754f386ec2ab7815beded415c58273372c3e9b2c3b3185e591057aba4233b1320605e08b00702db4de4b78eb4cb833176bb0f16ba5
-AUX wireplumber-0.4.11-alsa-lua-crash.patch 1256 BLAKE2B ae5787294e405e37f01d0d4ef3f6031e5df9f60b04f02a682ceeaf2311cd2d525cdbb913d4997d63d18513225bd35d5e6375e33f34931e412ef681df134fa514 SHA512 536e39e4863ca2e002b20f8fca6164a60e280f56d7c5c2c96f9684e75b6e8f7138884fca88a214b4830e2a9fb252ead3ba75dc7f6ad491716f3e2fc595ddefed
-AUX wireplumber-0.4.11-dbus-reconnect-crash.patch 1553 BLAKE2B 1792743e726f22ff26f751196f620905122545bb8921dcb2398e627ef6756d786497e84cb899dcadac5417207cba7f1d5bc7f0a018156c89393712eafba5b54b SHA512 1603f928867f8ccf83132fb3b09b4d43995bd97a62689917274b01eb75526237ab86b1e58292e7f3b5b296e094995d284be31dfdd13d1c26ca5a41f2d121c71d
-AUX wireplumber-0.4.11-loop.patch 5638 BLAKE2B ebebd5a0c668f9ceb44cedecb9a7c364ed135e78802c619d3c1b328932480b11e2392b7263fb8df472ef1134a451537c82e25e0122bd61f80f33cbb36d538c43 SHA512 4486bb29a0f238b5d3df07bce065be30604fd3ef2d62925b3e3869060c0015d3bcdb45375bf5735e39d48e39e115c8f2029526d1044add8992fe2bc22f45faee
-DIST wireplumber-0.4.11.tar.gz 403931 BLAKE2B 77ef2540081420d4255dcb54165d0aceb08d97c60d19b9eb7606e90cf95e305e690794a1f46234b53b13765452fea0d23ae6acae9deea672db67e21c31d2307d SHA512 73a5120cd0c55b5fe5248cc22497efd23e40bb91961553639d9cf1bbf138d273db65153fa3c1bb0d2794f869e077e011156d323832534f62651d66f8cc87dca4
 DIST wireplumber-0.4.12.tar.bz2 317524 BLAKE2B 5f020759fab459fb3311f8a5cddddef2bf7dc62304b6e95f5d983b86b0e6ddef7bc16c4f2ef6a36264d7ed94e48dbb4c66ff3389bfd7ca58841b4fd6cdfb21bc SHA512 79827ea9f61bacf8df80f9cd0ca4c80192cf85a1b181a51256b3c845d1d04a690ea5c1270d6d5d05d56f799f16980a593e61d003ef78ad7dc8d5e9ea332aa5d4
-EBUILD wireplumber-0.4.11-r3.ebuild 4143 BLAKE2B 2198a5fae459a27ba6c03c873d123c6744929ec370a5ad1498bdd2bb5fcbc3bf68e79788536171cbafb79f08e0f543e38807945bc46c99dc89172801034eb924 SHA512 c3821991d447e63015c80b6ec3f127508b9e5575b030c14bcb2c08490e6f9ebe6e680938062b69285592c869629d51be028a840de3f37789fc7c30c827a32589
 EBUILD wireplumber-0.4.12-r1.ebuild 4025 BLAKE2B b821c7630b483a2b0747af76cf1fa1a7b21375e5127e31b845ca120f44b46026dd350cd01c6c390dda4267af219c501ff71c2d59ccfc9655bbc180575e58df8a SHA512 e36700710e6966f4b58bcbf51b661a6ba6fe6ea1ee6d03ec03dbab6b5040c32337e066fb026648c700cdbc8acfdd427ed313d789f9718205d04b3bb90cb34015
 EBUILD wireplumber-9999.ebuild 3890 BLAKE2B 9c7338d6ecbd671285cc294d00eff12480729ed921bd621b722a050d175c4b4d45eb57e73866a71a4c7bbe40c38b2a258a5b00ff39e5416026915e00794fa993 SHA512 a5431c85044ddd96f8e1735206d1cb3d7c516fe27c92b0c249936240fef68f3728ea79b6518eedc236429aca320e4698511059c4db1ff3fb0b9ad667653c02c4
 MISC metadata.xml 719 BLAKE2B 7ad70a19cbc55cb0c399cbc1c8c56a3bab16d2dd477a285a3c142793af3704a8dd6648f6cfa0b9aa6fd8338c9cddd93cc565356a8a2e5031a6874b46ac66c2ee SHA512 a4617e6176a4dab7491103858ed5f663b8dda2a6cd97c348cc274ac959df813a811f70963487ccb670999fd51d107726762d872ce42290d02ea6ed24ea021e55
diff --git a/media-video/wireplumber/files/wireplumber-0.4.11-alsa-lua-crash.patch b/media-video/wireplumber/files/wireplumber-0.4.11-alsa-lua-crash.patch
deleted file mode 100644
index 3bc8bbd08bb6..000000000000
--- a/media-video/wireplumber/files/wireplumber-0.4.11-alsa-lua-crash.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/c16e637c329bc9dda8544b18f5bd47a8d63ee253
-
-From c16e637c329bc9dda8544b18f5bd47a8d63ee253 Mon Sep 17 00:00:00 2001
-From: George Kiagiadakis <george.kiagiadakis@collabora.com>
-Date: Thu, 7 Jul 2022 20:58:36 +0300
-Subject: [PATCH] alsa: use "obj_type" as a variable name to avoid shadowing
- lua's "type" function
-
-This causes a crash when running in a VM because the code tries to
-execute lua's "type()" and ends up executing the local string variable...
-
-Fixes: #303
---- a/src/scripts/monitors/alsa.lua
-+++ b/src/scripts/monitors/alsa.lua
-@@ -49,7 +49,7 @@ function nonempty(str)
-   return str ~= "" and str or nil
- end
- 
--function createNode(parent, id, type, factory, properties)
-+function createNode(parent, id, obj_type, factory, properties)
-   local dev_props = parent.properties
- 
-   -- set the device id and spa factory name; REQUIRED, do not change
-@@ -199,7 +199,7 @@ function createDevice(parent, id, factory, properties)
-   end
- end
- 
--function prepareDevice(parent, id, type, factory, properties)
-+function prepareDevice(parent, id, obj_type, factory, properties)
-   -- ensure the device has an appropriate name
-   local name = "alsa_card." ..
-     (properties["device.name"] or
-GitLab
diff --git a/media-video/wireplumber/files/wireplumber-0.4.11-dbus-reconnect-crash.patch b/media-video/wireplumber/files/wireplumber-0.4.11-dbus-reconnect-crash.patch
deleted file mode 100644
index 6098ed11c302..000000000000
--- a/media-video/wireplumber/files/wireplumber-0.4.11-dbus-reconnect-crash.patch
+++ /dev/null
@@ -1,45 +0,0 @@
-https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/eb406bdb2cbbcd49c55c71285f8f2eddb624d24b
-
-From eb406bdb2cbbcd49c55c71285f8f2eddb624d24b Mon Sep 17 00:00:00 2001
-From: George Kiagiadakis <george.kiagiadakis@collabora.com>
-Date: Wed, 13 Jul 2022 13:38:14 +0300
-Subject: [PATCH] dbus: fix crash when trying to reconnect
-
-When coming from on_sync_reconnect, data points to the WpDBus object
-instead of the activation transition.
-
-Fixes: #305
---- a/lib/wp/dbus.c
-+++ b/lib/wp/dbus.c
-@@ -58,14 +58,26 @@ wp_dbus_set_state (WpDbus *self, WpDBusState new_state)
- static void
- on_got_bus (GObject * obj, GAsyncResult * res, gpointer data)
- {
--  WpTransition *transition = WP_TRANSITION (data);
--  WpDbus *self = wp_transition_get_source_object (transition);
-+  WpTransition *transition;
-+  WpDbus *self;
-   g_autoptr (GError) error = NULL;
- 
-+  if (WP_IS_TRANSITION (data)) {
-+    // coming from wp_dbus_enable
-+    transition = WP_TRANSITION (data);
-+    self = wp_transition_get_source_object (transition);
-+  } else {
-+    // coming from on_sync_reconnect
-+    transition = NULL;
-+    self = WP_DBUS (data);
-+  }
-+
-   self->connection = g_dbus_connection_new_for_address_finish (res, &error);
-   if (!self->connection) {
--    g_prefix_error (&error, "Failed to connect to bus: ");
--    wp_transition_return_error (transition, g_steal_pointer (&error));
-+    if (transition) {
-+      g_prefix_error (&error, "Failed to connect to bus: ");
-+      wp_transition_return_error (transition, g_steal_pointer (&error));
-+    }
-     return;
-   }
- 
-GitLab
diff --git a/media-video/wireplumber/files/wireplumber-0.4.11-loop.patch b/media-video/wireplumber/files/wireplumber-0.4.11-loop.patch
deleted file mode 100644
index 75e2bafcaddc..000000000000
--- a/media-video/wireplumber/files/wireplumber-0.4.11-loop.patch
+++ /dev/null
@@ -1,147 +0,0 @@
-https://bugs.gentoo.org/866551
-https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/37c839b9308cd3d6580bf01077db8cb29ec2aa2f
-https://gitlab.freedesktop.org/pipewire/wireplumber/-/commit/370b692933634675213110048fcda6dff52eb52b
-
-From: Pauli Virtanen <pav@iki.fi>
-Date: Tue, 19 Jul 2022 20:39:06 +0300
-Subject: [PATCH] policy-node: fix potential rescan loop
-
-SiLink activation might be delayed indefinitely under some error
-conditions. Currently, policy-node schedules a rescan when it sees a
-non-activated link on a stream to be moved, which produces busy loop if
-the si-link doesn't activate.
-
-Instead of rescheduling on non-active si-links, just remove and emit a
-warning. The si-link then gets removed once it gets activated.
-
-Reproducer:
-
-1. Play audio from Rhythmbox and pause.
-2. Switch default output with pactl between two different outputs
-3. Links from the paused stream stay at "init"
---- a/src/scripts/policy-node.lua
-+++ b/src/scripts/policy-node.lua
-@@ -694,16 +694,15 @@ function handleLinkable (si)
-     local link = lookupLink (si_id, si_flags[si_id].peer_id)
-     if reconnect then
-       if link ~= nil then
--        -- remove old link if active, otherwise schedule rescan
--        if ((link:get_active_features() & Feature.SessionItem.ACTIVE) ~= 0) then
--          si_flags[si_id].peer_id = nil
--          link:remove ()
--          Log.info (si, "... moving to new target")
--        else
--          scheduleRescan()
--          Log.info (si, "... scheduled rescan")
--          return
-+        -- remove old link
-+        if ((link:get_active_features() & Feature.SessionItem.ACTIVE) == 0) then
-+          -- remove also not yet activated links: they might never become active,
-+          -- and we should not loop waiting for them
-+          Log.warning (link, "Link was not activated before removing")
-         end
-+        si_flags[si_id].peer_id = nil
-+        link:remove ()
-+        Log.info (si, "... moving to new target")
-       end
-     else
-       if link ~= nil then
-GitLab
-
-From: Pauli Virtanen <pav@iki.fi>
-Date: Tue, 19 Jul 2022 20:01:10 +0300
-Subject: [PATCH] m-si-link: don't wait for establish before activation +
- cleanup links
-
-SiLink should not wait for WpLinks becoming ESTABLISHED, before
-activation. That flag shows whether a link has moved away from the
-"init" state, however, links to e.g. Pulseaudio corked streams can stay
-in "init" state until uncorking.  This causes trouble for policies,
-which needlessly wait for such links to establish.
-
-The WpLink objects may also be kept alive by other referents, and
-just unrefing them does not necessarily destroy the PW objects.
-
-Activate SiLink even if the WpLink is still in "init" state. It's enough
-that the link otherwise successfully establishes.
-
-At dispose time, explicitly request destroying the WpLinks that were
-created by the SiLink, to ensure they are removed even if there's
-something else referring to them.
---- a/modules/module-si-standard-link.c
-+++ b/modules/module-si-standard-link.c
-@@ -132,6 +132,27 @@ si_standard_link_get_associated_proxy (WpSessionItem * item, GType proxy_type)
-   return NULL;
- }
- 
-+static void
-+request_destroy_link (gpointer data, gpointer user_data)
-+{
-+  WpLink *link = WP_LINK (data);
-+
-+  wp_global_proxy_request_destroy (WP_GLOBAL_PROXY (link));
-+}
-+
-+static void
-+clear_node_links (GPtrArray **node_links_p)
-+{
-+  /*
-+   * Something else (eg. object managers) may be keeping the WpLink
-+   * objects alive. Deactive the links now, to destroy the PW objects.
-+   */
-+  if (*node_links_p)
-+    g_ptr_array_foreach (*node_links_p, request_destroy_link, NULL);
-+
-+  g_clear_pointer (node_links_p, g_ptr_array_unref);
-+}
-+
- static void
- si_standard_link_disable_active (WpSessionItem *si)
- {
-@@ -154,7 +175,8 @@ si_standard_link_disable_active (WpSessionItem *si)
-           WP_SI_LINKABLE (si_in));
-   }
- 
--  g_clear_pointer (&self->node_links, g_ptr_array_unref);
-+  clear_node_links (&self->node_links);
-+
-   self->n_active_links = 0;
-   self->n_failed_links = 0;
-   self->n_async_ops_wait = 0;
-@@ -168,7 +190,7 @@ on_link_activated (WpObject * proxy, GAsyncResult * res,
-     WpTransition * transition)
- {
-   WpSiStandardLink *self = wp_transition_get_source_object (transition);
--  guint len = self->node_links->len;
-+  guint len = self->node_links ? self->node_links->len : 0;
- 
-   /* Count the number of failed and active links */
-   if (wp_object_activate_finish (proxy, res, NULL))
-@@ -182,7 +204,7 @@ on_link_activated (WpObject * proxy, GAsyncResult * res,
- 
-   /* We only active feature if all links activated successfully */
-   if (self->n_failed_links > 0) {
--    g_clear_pointer (&self->node_links, g_ptr_array_unref);
-+    clear_node_links (&self->node_links);
-     wp_transition_return_error (transition, g_error_new (
-         WP_DOMAIN_LIBRARY, WP_LIBRARY_ERROR_OPERATION_FAILED,
-         "%d of %d PipeWire links failed to activate",
-@@ -251,7 +273,7 @@ create_links (WpSiStandardLink * self, WpTransition * transition,
-   /* Clear old links if any */
-   self->n_active_links = 0;
-   self->n_failed_links = 0;
--  g_clear_pointer (&self->node_links, g_ptr_array_unref);
-+  clear_node_links (&self->node_links);
- 
-   /* tuple format:
-       uint32 node_id;
-@@ -327,7 +349,7 @@ create_links (WpSiStandardLink * self, WpTransition * transition,
- 
-     /* activate to ensure it is created without errors */
-     wp_object_activate_closure (WP_OBJECT (link),
--        WP_OBJECT_FEATURES_ALL, NULL,
-+        WP_OBJECT_FEATURES_ALL & ~WP_LINK_FEATURE_ESTABLISHED, NULL,
-         g_cclosure_new_object (
-             (GCallback) on_link_activated, G_OBJECT (transition)));
-   }
-GitLab
diff --git a/media-video/wireplumber/wireplumber-0.4.11-r3.ebuild b/media-video/wireplumber/wireplumber-0.4.11-r3.ebuild
deleted file mode 100644
index 4904287cdb8b..000000000000
--- a/media-video/wireplumber/wireplumber-0.4.11-r3.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-# 1. Please regularly check (even at the point of bumping) Fedora's packaging
-# for needed backports at https://src.fedoraproject.org/rpms/wireplumber/tree/rawhide
-#
-# 2. Keep an eye on git master (for both PipeWire and WirePlumber) as things
-# continue to move quickly. It's not uncommon for fixes to be made shortly
-# after releases.
-
-LUA_COMPAT=( lua5-{3,4} )
-
-inherit lua-single meson systemd
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://gitlab.freedesktop.org/pipewire/${PN}.git"
-	EGIT_BRANCH="master"
-	inherit git-r3
-else
-	SRC_URI="https://gitlab.freedesktop.org/pipewire/${PN}/-/archive/${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86"
-fi
-
-DESCRIPTION="Replacement for pipewire-media-session"
-HOMEPAGE="https://gitlab.freedesktop.org/pipewire/wireplumber"
-
-LICENSE="MIT"
-SLOT="0/0.4"
-IUSE="elogind system-service systemd test"
-
-REQUIRED_USE="
-	${LUA_REQUIRED_USE}
-	?? ( elogind systemd )
-	system-service? ( systemd )
-"
-
-RESTRICT="!test? ( test )"
-
-# introspection? ( dev-libs/gobject-introspection ) is valid but likely only used for doc building
-BDEPEND="
-	dev-libs/glib
-	dev-util/gdbus-codegen
-	dev-util/glib-utils
-	sys-devel/gettext
-"
-
-DEPEND="
-	${LUA_DEPS}
-	>=dev-libs/glib-2.62
-	>=media-video/pipewire-0.3.53-r1:=
-	virtual/libintl
-	elogind? ( sys-auth/elogind )
-	systemd? ( sys-apps/systemd )
-"
-
-# Any dev-lua/* deps get declared like this inside RDEPEND:
-#	$(lua_gen_cond_dep '
-#		dev-lua/<NAME>[${LUA_USEDEP}]
-#	')
-RDEPEND="${DEPEND}
-	system-service? (
-		acct-user/pipewire
-		acct-group/pipewire
-	)
-"
-
-DOCS=( {NEWS,README}.rst )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.4.10-config-disable-sound-server-parts.patch # defer enabling sound server parts to media-video/pipewire
-	"${FILESDIR}"/${P}-alsa-lua-crash.patch
-	"${FILESDIR}"/${P}-dbus-reconnect-crash.patch
-	"${FILESDIR}"/${P}-loop.patch
-)
-
-src_configure() {
-	local emesonargs=(
-		-Ddoc=disabled # Ebuild not wired up yet (Sphinx, Doxygen?)
-		-Dintrospection=disabled # Only used for Sphinx doc generation
-		-Dsystem-lua=true # We always unbundle everything we can
-		-Dsystem-lua-version=$(ver_cut 1-2 $(lua_get_version))
-		$(meson_feature elogind)
-		$(meson_feature systemd)
-		$(meson_use system-service systemd-system-service)
-		$(meson_use systemd systemd-user-service)
-		-Dsystemd-system-unit-dir=$(systemd_get_systemunitdir)
-		-Dsystemd-user-unit-dir=$(systemd_get_userunitdir)
-		$(meson_use test tests)
-	)
-
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# We copy the default config, so that Gentoo tools can pick up on any
-	# updates and /etc does not end up with stale overrides.
-	# If a reflinking CoW filesystem is used (e.g. Btrfs), then the files
-	# will not actually get stored twice until modified.
-	insinto /etc
-	doins -r "${ED}"/usr/share/wireplumber
-}
-
-pkg_postinst() {
-	if systemd_is_booted ; then
-		ewarn "pipewire-media-session.service is no longer installed. You must switch"
-		ewarn "to wireplumber.service user unit before your next logout/reboot:"
-		ewarn "systemctl --user disable pipewire-media-session.service"
-		ewarn "systemctl --user --force enable wireplumber.service"
-	else
-		ewarn "Switch to WirePlumber will happen the next time gentoo-pipewire-launcher"
-		ewarn "is started (a replacement for directly calling pipewire binary)."
-		ewarn
-		ewarn "Please ensure that ${EROOT}/etc/pipewire/pipewire.conf either does not exist"
-		ewarn "or, if it does exist, that any reference to"
-		ewarn "${EROOT}/usr/bin/pipewire-media-session is commented out (begins with a #)."
-	fi
-	if use system-service; then
-		ewarn
-		ewarn "WARNING: you have enabled the system-service USE flag, which installs"
-		ewarn "the system-wide systemd units that enable WirePlumber to run as a system"
-		ewarn "service. This is more than likely NOT what you want. You are strongly"
-		ewarn "advised not to enable this mode and instead stick with systemd user"
-		ewarn "units. The default configuration files will likely not work out of"
-		ewarn "box, and you are on your own with configuration."
-		ewarn
-	fi
-}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index e920bf0add2c..a19d63464a72 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index f77705afb9ce..b3d71998efa0 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sat, 10 Dec 2022 02:39:56 +0000
+Sat, 10 Dec 2022 08:39:49 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 9523c4effca1..c1a406a9ee88 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 537682 BLAKE2B 5ea36706e9f3100f98a8bfc48465fc9c9965ad20b834454f02d0d345f47d095e5a9ed35b5f6e37007ee947d09446b720eafc19bfcbc8f9bac4db48a6a80580dd SHA512 0f5654de23f73899b445d3d10fa87c3ab643f77308df25999549e1b63748b5f101eb3f130afac8fb3e03eab64646d0e2016efd11a0f4eccc7a3b6117155d8d63
-TIMESTAMP 2022-12-10T02:40:00Z
+TIMESTAMP 2022-12-10T08:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOT8YBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOURdlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCukw//QtFx2MrnXKx7rffP+j2q7J8y7YQTtige1v0+h2pjnFDOPZfSunxqWKGP
-yiRWlleizcXnFhjI+dNe/k1ik/UBhK58uvlxnAbaLdwtnaia/0+ppwcp5ha9z4LD
-xsKQLj6IslwFjkaA5gHf336OmDAmohLaK6oTwboi1hlOiXD8GUth310jy4O9PzRI
-NuogOtqaVNbtvV37Dln4lP72LoDyElmM5UvNUBOGBv40dsfcZFP8JKzjvZyF2qZg
-jC5NgY76fVFijz1atwOsbAtFDaCqIrFC7ZuZxmPmf/vaJGTcTydbQR39wgRcZ9fP
-5QaLWc6SmOCi8OLW1ZSIsk74V0GVKS6vQjryr3RJnbdRj4y7kInMnfnS7g49Xd74
-31G3jOOn9upvFJWz/0hwhCu7ixIEwIY6VZhD3y1SsPg7K07sYGQxXxLPUHNzNvf0
-QgRUH+gyxCQgC0Bk6340uCk2nwvP8wItYHTouTMVPgID/jTwHtaVuu+K02G69HGE
-kMacS5w9xxAqxyRqBBKdesn3JquYiRsGmvZVuy0FW5HG2w0+Xc/x+BxjZrcFnazJ
-Jtj9aGYLjsLYQiCusszJcO1tXStVWXhhbZa0SWKQVmqZX+mgEW0ZSv6xuB4KmYyG
-2AS8vF8I2JBN3Opg+R3aeF91wUMRAWxeDum/9+L90eJmg9USimE=
-=27pG
+klAwnBAApoWYig4KbkG7WAIOG3tFiVHafHyT4Pe7RKHdQHCX8v90ZmBDveceIcPR
+SYuMm8yIV2bQi8wYWk4GSH2isK5p4EeOx0fsgADky2sjgEH4RVw1PgnkQaPQiBIZ
+v/ASX9rmU9AUEiQ/NCq5tBMofGbH66hn46D8qJv9UvSCKKaC2PcG92mXd80x4gTQ
+9qycDo3FPfsch93BA2AjAh/V1iW8aqMa/5JRbsJx0Lv/xS0qQ4XhNvytuPdvwCaV
+/eHo0uKv/ISJrOCKUvhEiT/PxHyuhB6aeFvNVX3gJ7dgQjM1wtTd4ZQxtJsZj/tq
+6fdTFayZqMg+GWU/alU0PZhbRUZwVoIZ3ay7VOD6jAegEwE0dGknD7HVKaogWjO9
+EpGD+YzboADAmFlazj8LasZClKSVvywcyWDkryE8t83+I35snCZNg6gmiXIvVBlt
+h+v22b90FDJNelDnILHlKGP8K3xNUTKt5q4LpwtYfK6M+9rLIak1a6I7DvTffZnc
+6W5orM5YIausrU2qkyGt7u5+Aljeh8JccIz3uSS0Af+6Fh3QRf0sl77zj/aKJswj
+o924QxJ30pPx0hf6oSiQMAZ9z3ApOMpc9hG7TPhy3SA29TNQxsb8aFROI8wZU63X
+XkXbLVde5Zf6TcnKrQyd2UiadcExyiK6+SVhh7sJ3Ad1/dH4l/s=
+=0235
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index f77705afb9ce..739543fa782d 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sat, 10 Dec 2022 02:39:56 +0000
+Sat, 10 Dec 2022 08:39:50 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index e35f206a1677..9d21d0e09a0b 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/Manifest.gz b/metadata/md5-cache/app-accessibility/Manifest.gz
index 966b9962dfdc..1ff4394c3067 100644
--- a/metadata/md5-cache/app-accessibility/Manifest.gz
+++ b/metadata/md5-cache/app-accessibility/Manifest.gz
diff --git a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.2 b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.2
deleted file mode 100644
index 35526a8fb6f0..000000000000
--- a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-apps/help2man >=sys-devel/gettext-0.19.8 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst
-DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) >=dev-libs/dotconf-1.3 >=dev-libs/glib-2.36:2 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) espeak-ng? ( app-accessibility/espeak-ng ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio )
-DESCRIPTION=Speech synthesis interface
-EAPI=8
-HOMEPAGE=https://freebsoft.org/speechd
-INHERIT=python-r1 systemd
-IUSE=alsa ao espeak +espeak-ng flite nas pulseaudio python python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-2
-RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) ) >=dev-libs/dotconf-1.3 >=dev-libs/glib-2.36:2 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) espeak-ng? ( app-accessibility/espeak-ng ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) python? ( dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) )
-SLOT=0
-SRC_URI=https://github.com/brailcom/speechd/releases/download/0.11.2/speech-dispatcher-0.11.2.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=b830fcb2ab84680ac84fcafd7dcd80c7
diff --git a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.3 b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.3
deleted file mode 100644
index f069a200c41d..000000000000
--- a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-apps/help2man >=sys-devel/gettext-0.19.8 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst
-DEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) ) >=dev-libs/dotconf-1.3 >=dev-libs/glib-2.36:2 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) espeak-ng? ( app-accessibility/espeak-ng ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio )
-DESCRIPTION=Speech synthesis interface
-EAPI=8
-HOMEPAGE=https://freebsoft.org/speechd
-INHERIT=python-r1 systemd
-IUSE=alsa ao espeak +espeak-ng flite nas pulseaudio python 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 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) ) >=dev-libs/dotconf-1.3 >=dev-libs/glib-2.36:2 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) espeak-ng? ( app-accessibility/espeak-ng ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) python? ( dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
-REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
-SLOT=0
-SRC_URI=https://github.com/brailcom/speechd/releases/download/0.11.3/speech-dispatcher-0.11.3.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a23c20e02efe6787231d1614ff59e049
diff --git a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.4 b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.4
index fdede8cfb2c6..22b314d5c86d 100644
--- a/metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.4
+++ b/metadata/md5-cache/app-accessibility/speech-dispatcher-0.11.4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://freebsoft.org/speechd
 INHERIT=autotools python-r1 systemd
 IUSE=alsa ao espeak +espeak-ng flite nas pulseaudio python 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 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=python? ( python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) ) >=dev-libs/dotconf-1.3 >=dev-libs/glib-2.36:2 >=media-libs/libsndfile-1.0.2 alsa? ( media-libs/alsa-lib ) ao? ( media-libs/libao ) espeak? ( app-accessibility/espeak ) espeak-ng? ( app-accessibility/espeak-ng ) flite? ( app-accessibility/flite ) nas? ( media-libs/nas ) pulseaudio? ( media-sound/pulseaudio ) python? ( dev-python/pyxdg[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] )
 REQUIRED_USE=python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 ) )
 SLOT=0
 SRC_URI=https://github.com/brailcom/speechd/releases/download/0.11.4/speech-dispatcher-0.11.4.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=6728bf6a8f949c529feeae64213bd9cf
+_md5_=b949140cd320d27920c3b2c4b6190218
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index e15cf25a9f8d..230c561f898c 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/awscli-1.27.27 b/metadata/md5-cache/app-admin/awscli-1.27.27
new file mode 100644
index 000000000000..b0b314e58efa
--- /dev/null
+++ b/metadata/md5-cache/app-admin/awscli-1.27.27
@@ -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.27[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.1.3[python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.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 ~arm64 ~riscv ~x86
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.27[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.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2: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.27.tar.gz -> aws-cli-1.27.27.gh.tar.gz
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=066408fc86005265f1da2d31d73a7996
diff --git a/metadata/md5-cache/app-arch/Manifest.gz b/metadata/md5-cache/app-arch/Manifest.gz
index e8d5534a7878..63b42310e80f 100644
--- a/metadata/md5-cache/app-arch/Manifest.gz
+++ b/metadata/md5-cache/app-arch/Manifest.gz
diff --git a/metadata/md5-cache/app-arch/pxz-5.0_pre20220509 b/metadata/md5-cache/app-arch/pxz-5.0_pre20220509
index 621dea86bf1c..67a923e924f1 100644
--- a/metadata/md5-cache/app-arch/pxz-5.0_pre20220509
+++ b/metadata/md5-cache/app-arch/pxz-5.0_pre20220509
@@ -4,10 +4,10 @@ DESCRIPTION=Parallel implementation of the XZ compression utility
 EAPI=8
 HOMEPAGE=http://jnovy.fedorapeople.org/pxz/
 INHERIT=toolchain-funcs vcs-snapshot
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86 ~amd64-linux
+KEYWORDS=amd64 ~arm64 ~ppc64 x86 ~amd64-linux
 LICENSE=GPL-2
 RDEPEND=app-arch/xz-utils
 SLOT=0
 SRC_URI=https://github.com/jnovy/pxz/archive/136e5c25daf545753329d7cee1b06ae482fb9c44.tar.gz -> pxz-5.0_pre20220509.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=fca888919cae33e17ad28e334ee94225
+_md5_=a7d38d794fb6f69c0885a89a7562a993
diff --git a/metadata/md5-cache/app-arch/xz-utils-5.2.9 b/metadata/md5-cache/app-arch/xz-utils-5.2.9
index b6be2f551544..f699b81baaad 100644
--- a/metadata/md5-cache/app-arch/xz-utils-5.2.9
+++ b/metadata/md5-cache/app-arch/xz-utils-5.2.9
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://tukaani.org/xz/
 INHERIT=libtool multilib multilib-minimal preserve-libs usr-ldscript verify-sig
 IUSE=+extra-filters nls static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr 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=public-domain LGPL-2.1+ GPL-2+
 RESTRICT=!extra-filters? ( test )
 SLOT=0
 SRC_URI=mirror://sourceforge/lzmautils/xz-5.2.9.tar.gz https://tukaani.org/xz/xz-5.2.9.tar.gz verify-sig? ( https://tukaani.org/xz/xz-5.2.9.tar.gz.sig )
 _eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	usr-ldscript	7cda204db1974f6e912eb98dd34261ad	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=e3ec0769eb449e2a826923a96d7e07e9
+_md5_=2002f4fa0e9760f8149aea50f5ffcbde
diff --git a/metadata/md5-cache/app-emacs/Manifest.gz b/metadata/md5-cache/app-emacs/Manifest.gz
index e257305adfd8..e62ce0f5c988 100644
--- a/metadata/md5-cache/app-emacs/Manifest.gz
+++ b/metadata/md5-cache/app-emacs/Manifest.gz
diff --git a/metadata/md5-cache/app-emacs/org-modern-0.6 b/metadata/md5-cache/app-emacs/org-modern-0.6
new file mode 100644
index 000000000000..0c087d7e0ada
--- /dev/null
+++ b/metadata/md5-cache/app-emacs/org-modern-0.6
@@ -0,0 +1,13 @@
+BDEPEND=>=app-editors/emacs-23.1:*
+DEFINED_PHASES=compile configure install postinst postrm prepare setup unpack
+DESCRIPTION=Modern style for your GNU Emacs Org buffers
+EAPI=8
+HOMEPAGE=https://github.com/minad/org-modern/
+INHERIT=elisp
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3+
+RDEPEND=>=app-editors/emacs-23.1:*
+SLOT=0
+SRC_URI=https://github.com/minad/org-modern/archive/0.6.tar.gz -> org-modern-0.6.tar.gz
+_eclasses_=elisp	8aab2c847b5894dc40503ae1d203abcf	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b
+_md5_=3cd2c5e8003f55b7624c00b03e868748
diff --git a/metadata/md5-cache/app-forensics/Manifest.gz b/metadata/md5-cache/app-forensics/Manifest.gz
index 97bc619fb28b..c69d1fed02e5 100644
--- a/metadata/md5-cache/app-forensics/Manifest.gz
+++ b/metadata/md5-cache/app-forensics/Manifest.gz
diff --git a/metadata/md5-cache/app-forensics/aflplusplus-4.03c b/metadata/md5-cache/app-forensics/aflplusplus-4.03c
index 5b797d1005bb..cda552582a3f 100644
--- a/metadata/md5-cache/app-forensics/aflplusplus-4.03c
+++ b/metadata/md5-cache/app-forensics/aflplusplus-4.03c
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/AFLplusplus/AFLplusplus
 INHERIT=toolchain-funcs llvm optfeature python-single-r1
 IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm64
+KEYWORDS=amd64 arm64
 LICENSE=Apache-2.0
 RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) >=sys-devel/llvm-13:= || ( sys-devel/clang:13 sys-devel/clang:15 ) !app-forensics/afl
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/4.03c.tar.gz -> aflplusplus-4.03c.tar.gz https://dev.gentoo.org/~sam/distfiles/app-forensics/aflplusplus/aflplusplus-4.03c-patches.tar.xz
 _eclasses_=llvm	3badffa48d565e089e59ed52e3a11b93	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=628adcc07844b477aefc2f0eb792e058
+_md5_=32d42b51cf174b04a11927c083a5b17d
diff --git a/metadata/md5-cache/app-forensics/aflplusplus-4.02c-r1 b/metadata/md5-cache/app-forensics/aflplusplus-4.04c-r1
index 2338ee39c73e..600f37d56e11 100644
--- a/metadata/md5-cache/app-forensics/aflplusplus-4.02c-r1
+++ b/metadata/md5-cache/app-forensics/aflplusplus-4.04c-r1
@@ -1,5 +1,5 @@
 DEFINED_PHASES=compile install postinst setup test
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) >=sys-devel/llvm-13:= || ( sys-devel/clang:13 sys-devel/clang:14 ) !app-forensics/afl test? ( dev-util/cmocka ) !!sys-devel/llvm:0
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) >=sys-devel/llvm-13:= || ( sys-devel/clang:13 sys-devel/clang:14 sys-devel/clang:15 ) !app-forensics/afl test? ( dev-util/cmocka ) !!sys-devel/llvm:0
 DESCRIPTION=A fork of AFL, the popular compile-time instrumentation fuzzer
 EAPI=8
 HOMEPAGE=https://github.com/AFLplusplus/AFLplusplus
@@ -7,10 +7,10 @@ INHERIT=toolchain-funcs llvm optfeature python-single-r1
 IUSE=test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~arm64
 LICENSE=Apache-2.0
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) >=sys-devel/llvm-13:= || ( sys-devel/clang:13 sys-devel/clang:14 ) !app-forensics/afl
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) >=sys-devel/llvm-13:= || ( sys-devel/clang:13 sys-devel/clang:14 sys-devel/clang:15 ) !app-forensics/afl
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 RESTRICT=test
 SLOT=0
-SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/4.02c.tar.gz -> aflplusplus-4.02c.tar.gz
+SRC_URI=https://github.com/AFLplusplus/AFLplusplus/archive/4.04c.tar.gz -> aflplusplus-4.04c.tar.gz https://dev.gentoo.org/~sam/distfiles/app-forensics/aflplusplus/aflplusplus-4.04c-patches.tar.xz
 _eclasses_=llvm	3badffa48d565e089e59ed52e3a11b93	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=bea56a37d159abcc03d8ec68b3701d91
+_md5_=8b45ab1f7d062e83bb3343df294aada9
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 2cb104302601..1ab4a2a8b41a 100644
--- a/metadata/md5-cache/app-misc/Manifest.gz
+++ b/metadata/md5-cache/app-misc/Manifest.gz
diff --git a/metadata/md5-cache/app-misc/ca-certificates-20211016.3.86 b/metadata/md5-cache/app-misc/ca-certificates-20211016.3.86
new file mode 100644
index 000000000000..391b099326bf
--- /dev/null
+++ b/metadata/md5-cache/app-misc/ca-certificates-20211016.3.86
@@ -0,0 +1,14 @@
+BDEPEND=app-misc/c_rehash sys-apps/debianutils || ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 )
+DEFINED_PHASES=compile install postinst prepare setup unpack
+DESCRIPTION=Common CA Certificates PEM files
+EAPI=8
+HOMEPAGE=https://packages.debian.org/sid/ca-certificates
+INHERIT=python-any-r1
+IUSE=cacert
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=MPL-1.1
+RDEPEND=app-misc/c_rehash sys-apps/debianutils
+SLOT=0
+SRC_URI=mirror://debian/pool/main/c/ca-certificates/ca-certificates_20211016.tar.xz https://archive.mozilla.org/pub/security/nss/releases/NSS_3_86_RTM/src/nss-3.86.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=331366f0f525eead715279b1e627a21b
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index 1ae5b9e80bf1..3c8adde19d8f 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/elt-patches-20211104 b/metadata/md5-cache/app-portage/elt-patches-20211104
deleted file mode 100644
index 79e6366f3f48..000000000000
--- a/metadata/md5-cache/app-portage/elt-patches-20211104
+++ /dev/null
@@ -1,11 +0,0 @@
-BDEPEND=app-arch/xz-utils
-DEFINED_PHASES=compile install
-DESCRIPTION=Collection of patches for libtool.eclass
-EAPI=7
-HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
-LICENSE=GPL-2
-RDEPEND=sys-apps/gentoo-functions
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~grobian/distfiles/elt-patches-20211104.tar.xz https://dev.gentoo.org/~vapier/dist/elt-patches-20211104.tar.xz https://dev.gentoo.org/~sam/distfiles/app-portage/elt-patches/elt-patches-20211104.tar.xz
-_md5_=00f75ddc8e6b943b12bedf30cc0755ba
diff --git a/metadata/md5-cache/app-portage/elt-patches-20221210 b/metadata/md5-cache/app-portage/elt-patches-20221210
new file mode 100644
index 000000000000..06a86aed40cc
--- /dev/null
+++ b/metadata/md5-cache/app-portage/elt-patches-20221210
@@ -0,0 +1,11 @@
+BDEPEND=app-arch/xz-utils
+DEFINED_PHASES=compile install
+DESCRIPTION=Collection of patches for libtool.eclass
+EAPI=8
+HOMEPAGE=https://gitweb.gentoo.org/proj/elt-patches.git/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~arm64-linux ~ppc64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=GPL-2
+RDEPEND=sys-apps/gentoo-functions
+SLOT=0
+SRC_URI=https://dev.gentoo.org/~grobian/distfiles/elt-patches-20221210.tar.xz https://dev.gentoo.org/~vapier/dist/elt-patches-20221210.tar.xz https://dev.gentoo.org/~sam/distfiles/app-portage/elt-patches/elt-patches-20221210.tar.xz
+_md5_=a8793cca8935d6585f6aeba91f251870
diff --git a/metadata/md5-cache/dev-cpp/Manifest.gz b/metadata/md5-cache/dev-cpp/Manifest.gz
index 98e217038e52..88cb510dfdb5 100644
--- a/metadata/md5-cache/dev-cpp/Manifest.gz
+++ b/metadata/md5-cache/dev-cpp/Manifest.gz
diff --git a/metadata/md5-cache/dev-cpp/elfio-3.10 b/metadata/md5-cache/dev-cpp/elfio-3.10
deleted file mode 100644
index 2b5e01a36062..000000000000
--- a/metadata/md5-cache/dev-cpp/elfio-3.10
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-libs/boost )
-DESCRIPTION=ELF reader/producer header-only C++ library
-EAPI=8
-HOMEPAGE=https://github.com/serge1/ELFIO
-INHERIT=cmake
-IUSE=test
-KEYWORDS=~amd64
-LICENSE=MIT
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/serge1/elfio/archive/Release_3.10.tar.gz -> elfio-3.10.tar.gz
-_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=347563b94116eed0f751bf78646ea357
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 5f93aae38f18..9cfaed29574e 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/asm-5.1-r1 b/metadata/md5-cache/dev-java/asm-5.1-r1
index 01497a8fb117..04b2b35af2ae 100644
--- a/metadata/md5-cache/dev-java/asm-5.1-r1
+++ b/metadata/md5-cache/dev-java/asm-5.1-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=4
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_5_1/asm-ASM_5_1.tar.bz2 https://gitlab.ow2.org/asm/asm/-/archive/ASM_4_0/asm-ASM_4_0.tar.bz2
 _eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=450e45b81757654e5c60311d001384ef
+_md5_=744d68a9161e33c0127f8becaa8b5ec9
diff --git a/metadata/md5-cache/dev-java/asm-9.3 b/metadata/md5-cache/dev-java/asm-9.3
index d2d76193a2b3..401d9a94755e 100644
--- a/metadata/md5-cache/dev-java/asm-9.3
+++ b/metadata/md5-cache/dev-java/asm-9.3
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 SLOT=9
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_3/asm-ASM_9_3.tar.gz
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=d35853d5037bf4cdee1e5b1b109f346b
+_md5_=28984bb9880d9593f3d04dc8d4acf07b
diff --git a/metadata/md5-cache/dev-java/asm-9.4 b/metadata/md5-cache/dev-java/asm-9.4
index 619fb3ba32f0..d45201bc3bf6 100644
--- a/metadata/md5-cache/dev-java/asm-9.4
+++ b/metadata/md5-cache/dev-java/asm-9.4
@@ -11,4 +11,4 @@ RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/z
 SLOT=9
 SRC_URI=https://gitlab.ow2.org/asm/asm/-/archive/ASM_9_4/asm-ASM_9_4.tar.bz2
 _eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=f79fb73081c4956f416d1e3a84c3c07f
+_md5_=4d4163ff63e8131606443c6034fdcf88
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index daa4e30e4b95..ba464164f250 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/libpcre2-10.40-r1 b/metadata/md5-cache/dev-libs/libpcre2-10.40-r1
index f43a9619c004..f17ec7e6d60c 100644
--- a/metadata/md5-cache/dev-libs/libpcre2-10.40-r1
+++ b/metadata/md5-cache/dev-libs/libpcre2-10.40-r1
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.pcre.org/
 INHERIT=flag-o-matic libtool multilib-minimal usr-ldscript verify-sig
 IUSE=bzip2 +jit libedit +pcre16 pcre32 +readline static-libs unicode 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 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=BSD
 RDEPEND=bzip2? ( app-arch/bzip2 ) libedit? ( dev-libs/libedit ) readline? ( sys-libs/readline:= ) zlib? ( sys-libs/zlib )
 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/~whissi/dist/libpcre2/libpcre2-10.36-patchset-01.tar.xz https://dev.gentoo.org/~polynomial-c/dist/libpcre2-10.36-patchset-01.tar.xz
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	usr-ldscript	7cda204db1974f6e912eb98dd34261ad	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=42967705b76be822addb73a880801c12
+_md5_=12ab2c673c7b9db85a0749f94889ccac
diff --git a/metadata/md5-cache/dev-libs/mpc-1.2.1 b/metadata/md5-cache/dev-libs/mpc-1.2.1
index 3b6be31445de..f18c10d828fd 100644
--- a/metadata/md5-cache/dev-libs/mpc-1.2.1
+++ b/metadata/md5-cache/dev-libs/mpc-1.2.1
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install test
 DEPEND=>=dev-libs/gmp-5.0.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?] >=dev-libs/mpfr-4.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(-)?,static-libs?]
 DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
 EAPI=7
-HOMEPAGE=https://www.multiprecision.org/mpc/
+HOMEPAGE=https://www.multiprecision.org/mpc/ https://gitlab.inria.fr/mpc/mpc
 INHERIT=multilib-minimal
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/gmp-5.0.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,ab
 SLOT=0/3
 SRC_URI=mirror://gnu/mpc/mpc-1.2.1.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=4f07acbc14d4bb9f89cf4747bf2c7b29
+_md5_=81f2e18dbcfb13354496a79fbf9a6544
diff --git a/metadata/md5-cache/dev-libs/mpc-1.3.0 b/metadata/md5-cache/dev-libs/mpc-1.3.0
index 6b98b30ad42f..c04f0feeae1d 100644
--- a/metadata/md5-cache/dev-libs/mpc-1.3.0
+++ b/metadata/md5-cache/dev-libs/mpc-1.3.0
@@ -2,7 +2,7 @@ DEFINED_PHASES=compile configure install test
 DEPEND=>=dev-libs/gmp-5.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?,static-libs?] >=dev-libs/mpfr-4.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(-)?,static-libs?]
 DESCRIPTION=A library for multiprecision complex arithmetic with exact rounding
 EAPI=8
-HOMEPAGE=https://www.multiprecision.org/mpc/
+HOMEPAGE=https://www.multiprecision.org/mpc/ https://gitlab.inria.fr/mpc/mpc
 INHERIT=multilib-minimal
 IUSE=static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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
@@ -11,4 +11,4 @@ RDEPEND=>=dev-libs/gmp-5.0.0:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi
 SLOT=0/3
 SRC_URI=mirror://gnu/mpc/mpc-1.3.0.tar.gz
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=0d002bfb957afb9f28c13f3973862395
+_md5_=be28c426bfe1e1eec72bb7e50abad10c
diff --git a/metadata/md5-cache/dev-libs/nss-3.86 b/metadata/md5-cache/dev-libs/nss-3.86
new file mode 100644
index 000000000000..2af48b5896ca
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/nss-3.86
@@ -0,0 +1,16 @@
+BDEPEND=dev-lang/perl
+DEFINED_PHASES=compile configure install postinst postrm prepare test
+DEPEND=>=dev-libs/nspr-4.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
+DESCRIPTION=Mozilla's Network Security Services library that implements PKI support
+EAPI=8
+HOMEPAGE=https://developer.mozilla.org/en-US/docs/Mozilla/Projects/NSS
+INHERIT=flag-o-matic multilib toolchain-funcs multilib-minimal
+IUSE=cacert test +utils cpu_flags_ppc_altivec cpu_flags_ppc_vsx abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=|| ( MPL-2.0 GPL-2 LGPL-2.1 )
+RDEPEND=>=dev-libs/nspr-4.35[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=dev-db/sqlite-3.8.2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/pkgconfig
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://archive.mozilla.org/pub/security/nss/releases/NSS_3_86_RTM/src/nss-3.86.tar.gz cacert? ( https://dev.gentoo.org/~whissi/dist/ca-certificates/nss-cacert-class1-class3-r2.patch )
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=d6ac2a27cc86fc370a5da1f71f8e1fa8
diff --git a/metadata/md5-cache/dev-libs/openssl-1.1.1s b/metadata/md5-cache/dev-libs/openssl-1.1.1s
index fd9d8194d3db..c8970102f233 100644
--- a/metadata/md5-cache/dev-libs/openssl-1.1.1s
+++ b/metadata/md5-cache/dev-libs/openssl-1.1.1s
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://www.openssl.org/
 INHERIT=edo flag-o-matic toolchain-funcs multilib-minimal verify-sig
 IUSE=+asm rfc3779 sctp cpu_flags_x86_sse2 sslv3 static-libs test tls-compression tls-heartbeat vanilla verify-sig weak-ssl-ciphers abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=openssl
 PDEPEND=app-misc/ca-certificates
 RDEPEND=>=app-misc/c_rehash-1.7-r1 tls-compression? ( >=sys-libs/zlib-1.2.8-r1[static-libs(+)?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !<net-misc/openssh-8.0_p1-r3
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/1.1
 SRC_URI=mirror://openssl/source/openssl-1.1.1s.tar.gz verify-sig? ( mirror://openssl/source/openssl-1.1.1s.tar.gz.asc )
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=d3529aa4592990f3cc1f121f388a7e8a
+_md5_=430d17ed8f2bd1faf000855e185d38b0
diff --git a/metadata/md5-cache/dev-libs/pocl-3.1 b/metadata/md5-cache/dev-libs/pocl-3.1
new file mode 100644
index 000000000000..0231c1ccdf77
--- /dev/null
+++ b/metadata/md5-cache/dev-libs/pocl-3.1
@@ -0,0 +1,16 @@
+BDEPEND=!cuda? ( <sys-devel/clang-16:= ) cuda? ( <sys-devel/clang-16:=[llvm_targets_NVPTX] ) virtual/pkgconfig doc? ( || ( ( >=dev-lang/python-3.10.8_p3:3.10 <dev-python/markupsafe-2.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 <dev-python/markupsafe-2.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 <dev-python/markupsafe-2.0[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p9:0 <dev-python/markupsafe-2.0[python_targets_pypy3(-)] ) ) ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 doc? ( || ( ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/sphinx[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/sphinx[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/sphinx[python_targets_python3_8(-)] ) ( >=dev-python/pypy3-7.3.9_p9:0 dev-python/sphinx[python_targets_pypy3(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=dev-libs/libltdl <sys-devel/llvm-16:* virtual/opencl !cuda? ( <sys-devel/clang-16:= ) cuda? ( <sys-devel/clang-16:=[llvm_targets_NVPTX] ) debug? ( dev-util/lttng-ust:= ) hwloc? ( sys-apps/hwloc:=[cuda?] ) !!sys-devel/llvm:0
+DESCRIPTION=Portable Computing Language (an implementation of OpenCL)
+EAPI=8
+HOMEPAGE=http://portablecl.org https://github.com/pocl/pocl
+INHERIT=cmake llvm python-any-r1 docs
+IUSE=accel +conformance cuda debug examples float-conversion hardening +hwloc memmanager lto test doc
+KEYWORDS=~amd64 ~ppc64
+LICENSE=GPL-2
+RDEPEND=dev-libs/libltdl <sys-devel/llvm-16:* virtual/opencl !cuda? ( <sys-devel/clang-16:= ) cuda? ( <sys-devel/clang-16:=[llvm_targets_NVPTX] ) debug? ( dev-util/lttng-ust:= ) hwloc? ( sys-apps/hwloc:=[cuda?] )
+RESTRICT=!test? ( test ) test
+SLOT=0
+SRC_URI=https://github.com/pocl/pocl/archive/v3.1.tar.gz -> pocl-3.1.tar.gz
+_eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	docs	2af4a2f0074bd646101ce0f66ca6dd03	flag-o-matic	69394e25812406faa1f90edaf4969395	llvm	3badffa48d565e089e59ed52e3a11b93	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=38c4d43e47a11b9c6c6a3c5e5c403d99
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 29ac90d250d5..0ac235bb94b5 100644
--- a/metadata/md5-cache/dev-python/Manifest.gz
+++ b/metadata/md5-cache/dev-python/Manifest.gz
diff --git a/metadata/md5-cache/dev-python/ansible-compat-2.2.7 b/metadata/md5-cache/dev-python/ansible-compat-2.2.7
new file mode 100644
index 000000000000..dfe7d76eb7fb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/ansible-compat-2.2.7
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools_scm-7.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/flaky[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-plus[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_p2: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.8_p3: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(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/ansible-pygments[python_targets_python3_9(-)] dev-python/myst_parser[python_targets_python3_9(-)] dev-python/sphinx_ansible_theme[python_targets_python3_9(-)] ) ) ) test? ( >=app-admin/ansible-core-2.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=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_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~riscv
+LICENSE=MIT
+RDEPEND=>=app-admin/ansible-core-2.9.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jsonschema-4.6.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/subprocess-tee-0.3.5[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/ansible-compat/ansible-compat-2.2.7.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=fdb30d7d8683093326455c879232a07e
diff --git a/metadata/md5-cache/dev-python/black-22.12.0 b/metadata/md5-cache/dev-python/black-22.12.0
new file mode 100644
index 000000000000..12746484bcc7
--- /dev/null
+++ b/metadata/md5-cache/dev-python/black-22.12.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/hatch-fancy-pypi-readme[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/hatch-vcs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/aiohttp-3.7.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/aiohttp-cors[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/colorama[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/parameterized[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-3.10.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[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=The uncompromising Python code formatter
+EAPI=8
+HOMEPAGE=https://black.readthedocs.io/en/stable/ https://github.com/psf/black/ https://pypi.org/project/black/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MIT
+RDEPEND=>=dev-python/click-8.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mypy_extensions-0.4.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pathspec-0.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-1.1.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/typing-extensions-3.10.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/psf/black/archive/22.12.0.tar.gz -> black-22.12.0.gh.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=6750711b3216861bbe9d75db07ad1485
diff --git a/metadata/md5-cache/dev-python/boto3-1.26.27 b/metadata/md5-cache/dev-python/boto3-1.26.27
new file mode 100644
index 000000000000..a0cf2059703f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/boto3-1.26.27
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_p2: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.8_p3:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( >=dev-python/botocore-1.29.27[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=The AWS SDK for Python
+EAPI=8
+HOMEPAGE=https://github.com/boto/boto3/ https://pypi.org/project/boto3/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=>=dev-python/botocore-1.29.27[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jmespath-0.7.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/s3transfer-0.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/boto3/archive/1.26.27.tar.gz -> boto3-1.26.27.gh.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=50e9b19da5bcce80f05fd9be69fe0ff8
diff --git a/metadata/md5-cache/dev-python/botocore-1.29.27 b/metadata/md5-cache/dev-python/botocore-1.29.27
new file mode 100644
index 000000000000..eb5196b8c187
--- /dev/null
+++ b/metadata/md5-cache/dev-python/botocore-1.29.27
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/jsonschema[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) doc? ( || ( ( >=dev-lang/python-3.11.0_p2: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.8_p3:3.10 >=dev-python/sphinx-5.3.0[python_targets_python3_10(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 >=dev-python/sphinx-5.3.0[python_targets_python3_9(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 >=dev-python/sphinx-5.3.0[python_targets_python3_8(-)] dev-python/guzzle_sphinx_theme[python_targets_python3_8(-)] ) ) ) test? ( dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Low-level, data-driven core of boto 3
+EAPI=8
+HOMEPAGE=https://github.com/boto/botocore/ https://pypi.org/project/botocore/
+INHERIT=distutils-r1 multiprocessing
+IUSE=doc test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-python/six[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] <dev-python/jmespath-2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/urllib3-1.25.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/boto/botocore/archive/1.29.27.tar.gz -> botocore-1.29.27.gh.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=9633098aa11334a684a751cd62bacde5
diff --git a/metadata/md5-cache/dev-python/line_profiler-4.0.2 b/metadata/md5-cache/dev-python/line_profiler-4.0.2
new file mode 100644
index 000000000000..abdd88ee81a6
--- /dev/null
+++ b/metadata/md5-cache/dev-python/line_profiler-4.0.2
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/cython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/coverage[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ubelt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Line-by-line profiler
+EAPI=8
+HOMEPAGE=https://github.com/pyutils/line_profiler/ https://pypi.org/project/line-profiler/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=dev-python/ipython[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/pyutils/line_profiler/archive/v4.0.2.tar.gz -> line_profiler-4.0.2.gh.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=8874a6befbee42cf56dd3151749895de
diff --git a/metadata/md5-cache/dev-python/pathspec-0.10.3 b/metadata/md5-cache/dev-python/pathspec-0.10.3
new file mode 100644
index 000000000000..9a6ec784bb48
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pathspec-0.10.3
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utility library for gitignore style pattern matching of file paths
+EAPI=8
+HOMEPAGE=https://github.com/cpburnz/python-pathspec/ https://pypi.org/project/pathspec/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=MPL-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pathspec/pathspec-0.10.3.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=ce88b0e2214a670d6987c361fc65c515
diff --git a/metadata/md5-cache/dev-python/patiencediff-0.2.11 b/metadata/md5-cache/dev-python/patiencediff-0.2.11
new file mode 100644
index 000000000000..27a8e4f5e129
--- /dev/null
+++ b/metadata/md5-cache/dev-python/patiencediff-0.2.11
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python implementation of the patiencediff algorithm
+EAPI=8
+HOMEPAGE=https://github.com/breezy-team/patiencediff/ https://pypi.org/project/patiencediff/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/patiencediff/patiencediff-0.2.11.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=ba6118247751766662e0f9cb7490cff8
diff --git a/metadata/md5-cache/dev-python/pip-run-9.0.0 b/metadata/md5-cache/dev-python/pip-run-9.0.0
new file mode 100644
index 000000000000..3cc99e7568bb
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pip-run-9.0.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/autocommand[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/path[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Install packages and run Python with them
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/pip-run/ https://pypi.org/project/pip-run/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/autocommand[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/path[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pip[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jaraco/pip-run/archive/v9.0.0.tar.gz -> pip-run-9.0.0.gh.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=419602adad61b2b3674176da66325b57
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.10.4 b/metadata/md5-cache/dev-python/snakeoil-0.10.4
new file mode 100644
index 000000000000..e06b967736aa
--- /dev/null
+++ b/metadata/md5-cache/dev-python/snakeoil-0.10.4
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/flit_core-3.8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/lazy-object-proxy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=misc common functionality and useful optimizations
+EAPI=8
+HOMEPAGE=https://github.com/pkgcore/snakeoil
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=BSD BSD-2 MIT
+RDEPEND=dev-python/lazy-object-proxy[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/s/snakeoil/snakeoil-0.10.4.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=3d830f302e2d8325db1929458e05df4f
diff --git a/metadata/md5-cache/dev-python/starlette-0.23.1 b/metadata/md5-cache/dev-python/starlette-0.23.1
new file mode 100644
index 000000000000..0262cbfebaa4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/starlette-0.23.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/trio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( <dev-python/anyio-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-multipart[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/typing-extensions-3.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=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_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=<dev-python/anyio-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/anyio-3.4.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/httpx-0.22.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/itsdangerous[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-multipart[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/typing-extensions-3.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/typing-extensions-3.10.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/encode/starlette/archive/0.23.1.tar.gz -> starlette-0.23.1.gh.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=1bd33e4c4adec6826c0ca5e410260644
diff --git a/metadata/md5-cache/dev-python/tox-4.0.0_rc1 b/metadata/md5-cache/dev-python/tox-4.0.0_rc1
deleted file mode 100644
index 1109b7a6ad25..000000000000
--- a/metadata/md5-cache/dev-python/tox-4.0.0_rc1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/build[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flaky-3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/re-assert-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/time-machine-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/cachetools-5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/tomli-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.16.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=virtualenv-based automation of test activities
-EAPI=8
-HOMEPAGE=https://tox.readthedocs.io/ https://github.com/tox-dev/tox/ https://pypi.org/project/tox/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/cachetools-5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/tomli-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.16.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/tox/archive/4.0.0rc1.tar.gz -> tox-4.0.0rc1.gh.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=38a5c66f981bfa5b033e9b27380be81d
diff --git a/metadata/md5-cache/dev-python/tox-4.0.0_rc3 b/metadata/md5-cache/dev-python/tox-4.0.0_rc3
deleted file mode 100644
index 1651e7821dfc..000000000000
--- a/metadata/md5-cache/dev-python/tox-4.0.0_rc3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/build[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flaky-3.7[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.9.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-3.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/re-assert-1.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/time-machine-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/cachetools-5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/tomli-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.17.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=virtualenv-based automation of test activities
-EAPI=8
-HOMEPAGE=https://tox.readthedocs.io/ https://github.com/tox-dev/tox/ https://pypi.org/project/tox/
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/cachetools-5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.5.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.2.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/tomli-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.17.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/tox/archive/4.0.0rc3.tar.gz -> tox-4.0.0rc3.gh.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=e233bd2a380880af11000d58d688f141
diff --git a/metadata/md5-cache/dev-python/tox-4.0.0_rc4 b/metadata/md5-cache/dev-python/tox-4.0.0_rc4
deleted file mode 100644
index f3d9e3d9f906..000000000000
--- a/metadata/md5-cache/dev-python/tox-4.0.0_rc4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=dev-python/hatch-vcs[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flaky-3.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.9.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/re-assert-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/time-machine-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/time-machine-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/time-machine-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/time-machine-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/cachetools-5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.5.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.17.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=virtualenv-based automation of test activities
-EAPI=8
-HOMEPAGE=https://tox.readthedocs.io/ https://github.com/tox-dev/tox/ https://pypi.org/project/tox/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=>=dev-python/cachetools-5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.5.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.17.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/tox-dev/tox/archive/4.0.0rc4.tar.gz -> tox-4.0.0rc4.gh.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=e6865b8b2517028a7a399a989f921aad
diff --git a/metadata/md5-cache/dev-python/tox-4.0.5 b/metadata/md5-cache/dev-python/tox-4.0.5
new file mode 100644
index 000000000000..2d48b7d6b79d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tox-4.0.5
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/hatch-vcs-0.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( dev-python/build[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/distlib-0.3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flaky-3.7[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/psutil-5.9.4[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-xdist-3.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/re-assert-1.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-python/time-machine-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-python/time-machine-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( >=dev-python/time-machine-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( >=dev-python/time-machine-2.8.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) test? ( >=dev-python/cachetools-5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.17.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=virtualenv-based automation of test activities
+EAPI=8
+HOMEPAGE=https://tox.readthedocs.io/ https://github.com/tox-dev/tox/ https://pypi.org/project/tox/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/cachetools-5.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/chardet-5.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/colorama-0.4.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/filelock-3.8.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/packaging-21.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/platformdirs-2.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pyproject-api-1.2.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/tomli-2.0.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/virtualenv-20.17.1[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p9:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/tox-dev/tox/archive/4.0.5.tar.gz -> tox-4.0.5.gh.tar.gz
+_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=5f5d9ba5de524041321dad4534cf6f8c
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index ded6e26af941..a51679b6bb2c 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/diffoscope-223 b/metadata/md5-cache/dev-util/diffoscope-223
deleted file mode 100644
index 74961f65738b..000000000000
--- a/metadata/md5-cache/dev-util/diffoscope-223
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-text/docx2txt media-libs/libcaca virtual/imagemagick-tools[jpeg] ) test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[ncurses] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Will try to get to the bottom of what makes files or directories different
-EAPI=8
-HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
-INHERIT=distutils-r1
-IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=amd64 ~arm ~arm64 ~ppc64 x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[ncurses] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-223.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=0e5efb17660123079f9e1896705f6028
diff --git a/metadata/md5-cache/dev-util/diffoscope-227 b/metadata/md5-cache/dev-util/diffoscope-227
deleted file mode 100644
index eb5fb20a1441..000000000000
--- a/metadata/md5-cache/dev-util/diffoscope-227
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( app-text/docx2txt app-text/html2text media-libs/libcaca virtual/imagemagick-tools[jpeg] ) test? ( dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[ncurses] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Will try to get to the bottom of what makes files or directories different
-EAPI=8
-HOMEPAGE=https://diffoscope.org/ https://pypi.org/project/diffoscope/
-INHERIT=distutils-r1
-IUSE=acl binutils bzip2 libcaca colord cpio +diff docx dtc e2fsprogs file find gettext gif gpg haskell hdf5 hex imagemagick iso java llvm lzma mono opendocument pascal pdf postscript R rpm sqlite squashfs ssh tar test tcpdump zip zlib zstd test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
-LICENSE=GPL-3+
-RDEPEND=dev-python/python-magic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/libarchive-c[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/distro[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tlsh[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] acl? ( sys-apps/acl ) binutils? ( sys-devel/binutils ) bzip2? ( app-arch/bzip2 ) libcaca? ( media-libs/libcaca ) colord? ( x11-misc/colord ) cpio? ( app-arch/cpio ) diff? ( sys-apps/diffutils ) docx? ( app-text/docx2txt ) dtc? ( sys-apps/dtc ) e2fsprogs? ( sys-fs/e2fsprogs ) file? ( sys-apps/file ) find? ( sys-apps/findutils ) gettext? ( sys-devel/gettext ) gif? ( media-libs/giflib ) gpg? ( app-crypt/gnupg ) haskell? ( dev-lang/ghc ) hdf5? ( sci-libs/hdf5 ) hex? ( app-editors/vim-core ) imagemagick? ( media-gfx/imagemagick ) iso? ( app-cdr/cdrtools ) java? ( virtual/jdk ) llvm? ( sys-devel/llvm ) lzma? ( app-arch/xz-utils ) mono? ( dev-lang/mono ) opendocument? ( app-text/odt2txt ) pascal? ( dev-lang/fpc ) pdf? ( app-text/pdftk app-text/poppler dev-python/PyPDF2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) postscript? ( app-text/ghostscript-gpl ) R? ( dev-lang/R ) rpm? ( app-arch/rpm ) sqlite? ( dev-db/sqlite:3 ) squashfs? ( sys-fs/squashfs-tools ) ssh? ( net-misc/openssh ) tar? ( app-arch/tar ) tcpdump? ( net-analyzer/tcpdump ) zip? ( app-arch/unzip ) zlib? ( app-arch/gzip ) zstd? ( app-arch/zstd ) !dev-python/filemagic python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8[ncurses] ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9[ncurses] ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10[ncurses] )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
-RESTRICT=!test? ( test ) !test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/d/diffoscope/diffoscope-227.tar.gz
-_eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=802742b4f4e959641bd2d0639d82fefa
diff --git a/metadata/md5-cache/dev-util/meson-0.63.2-r1 b/metadata/md5-cache/dev-util/meson-0.63.2-r1
deleted file mode 100644
index ae534328322e..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.63.2-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
-DESCRIPTION=Open source build system
-EAPI=8
-HOMEPAGE=https://mesonbuild.com/
-INHERIT=bash-completion-r1 distutils-r1 toolchain-funcs
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~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=Apache-2.0
-RDEPEND=virtual/pkgconfig python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.63.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=f021fe52e123ce07eae33f40e9672775
diff --git a/metadata/md5-cache/dev-util/meson-0.64.0 b/metadata/md5-cache/dev-util/meson-0.64.0
deleted file mode 100644
index 0cea56f4faae..000000000000
--- a/metadata/md5-cache/dev-util/meson-0.64.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[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_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( dev-libs/glib:2 dev-libs/gobject-introspection dev-util/ninja dev-vcs/git sys-libs/zlib[static-libs(+)] virtual/pkgconfig )
-DESCRIPTION=Open source build system
-EAPI=8
-HOMEPAGE=https://mesonbuild.com/
-INHERIT=bash-completion-r1 distutils-r1 toolchain-funcs
-IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~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=Apache-2.0
-RDEPEND=virtual/pkgconfig python_targets_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/m/meson/meson-0.64.0.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=ab054d7c561ee4b5ce242caa5446eac2
diff --git a/metadata/md5-cache/dev-util/pwndbg-20220105 b/metadata/md5-cache/dev-util/pwndbg-20220105
deleted file mode 100644
index 2ed7ac414392..000000000000
--- a/metadata/md5-cache/dev-util/pwndbg-20220105
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=install postinst prepare setup
-DESCRIPTION=A GDB plug-in that makes debugging with GDB suck less
-EAPI=8
-HOMEPAGE=https://github.com/pwndbg/pwndbg
-INHERIT=python-single-r1 wrapper
-IUSE=python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 ~x86
-LICENSE=MIT
-RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) sys-devel/gdb[python,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] python_single_target_python3_9? ( dev-libs/capstone[python,python_targets_python3_9(-)] dev-python/future[python_targets_python3_9(-)] dev-python/isort[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pycparser[python_targets_python3_9(-)] dev-python/pyelftools[python_targets_python3_9(-)] dev-python/python-ptrace[python_targets_python3_9(-)] dev-python/six[python_targets_python3_9(-)] dev-python/pygments[python_targets_python3_9(-)] dev-util/ROPgadget[python_targets_python3_9(-)] dev-util/unicorn[python,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-libs/capstone[python,python_targets_python3_10(-)] dev-python/future[python_targets_python3_10(-)] dev-python/isort[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] dev-python/pycparser[python_targets_python3_10(-)] dev-python/pyelftools[python_targets_python3_10(-)] dev-python/python-ptrace[python_targets_python3_10(-)] dev-python/six[python_targets_python3_10(-)] dev-python/pygments[python_targets_python3_10(-)] dev-util/ROPgadget[python_targets_python3_10(-)] dev-util/unicorn[python,python_targets_python3_10(-)] )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/pwndbg/pwndbg/archive/2022.01.05.tar.gz -> pwndbg-20220105.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e9ea59515930cf9321531d3b564083f0
diff --git a/metadata/md5-cache/dev-util/seer-1.11 b/metadata/md5-cache/dev-util/seer-1.13
index a4e42609b689..3792674d37c7 100644
--- a/metadata/md5-cache/dev-util/seer-1.11
+++ b/metadata/md5-cache/dev-util/seer-1.13
@@ -10,6 +10,6 @@ KEYWORDS=~amd64
 LICENSE=GPL-3+ CC-BY-3.0 CC-BY-4.0
 RDEPEND=dev-qt/qtcharts:5 dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtprintsupport:5 dev-qt/qtwidgets:5 sys-devel/gdb
 SLOT=0
-SRC_URI=https://github.com/epasveer/seer/archive/refs/tags/v1.11.tar.gz -> seer-1.11.tar.gz
+SRC_URI=https://github.com/epasveer/seer/archive/refs/tags/v1.13.tar.gz -> seer-1.13.tar.gz
 _eclasses_=cmake	646b7a2a63596361551a6c1fabf28057	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=86adb8d3c9d398bbac22232ff95c8a65
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index f17e043a25d7..28bf5a3f11e2 100644
--- a/metadata/md5-cache/media-libs/Manifest.gz
+++ b/metadata/md5-cache/media-libs/Manifest.gz
diff --git a/metadata/md5-cache/media-libs/fdk-aac-2.0.2 b/metadata/md5-cache/media-libs/fdk-aac-2.0.2
index 8a4ffd45fd97..b03af7e020aa 100644
--- a/metadata/md5-cache/media-libs/fdk-aac-2.0.2
+++ b/metadata/md5-cache/media-libs/fdk-aac-2.0.2
@@ -1,12 +1,13 @@
+BDEPEND=>=app-portage/elt-patches-20170815
 DEFINED_PHASES=compile configure install postinst prepare test
 DESCRIPTION=Fraunhofer AAC codec library
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/opencore-amr/
-INHERIT=multilib-minimal
+INHERIT=multilib-minimal libtool
 IUSE=examples abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
 KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv x86 ~x64-macos
 LICENSE=FraunhoferFDK
 SLOT=0/2
 SRC_URI=mirror://sourceforge/opencore-amr/fdk-aac-2.0.2.tar.gz
-_eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=2af23d663ea4f5b60363ce8c6a7c3de1
+_eclasses_=libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=75960832c698a39900cedf135a24e45a
diff --git a/metadata/md5-cache/media-libs/tiff-4.5.0_rc1 b/metadata/md5-cache/media-libs/tiff-4.5.0_rc1
new file mode 100644
index 000000000000..7057ce05e284
--- /dev/null
+++ b/metadata/md5-cache/media-libs/tiff-4.5.0_rc1
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( sec-keys/openpgp-keys-evenrouault ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( 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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-r1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
+DESCRIPTION=Tag Image File Format (TIFF) library
+EAPI=8
+HOMEPAGE=http://libtiff.maptools.org
+INHERIT=autotools multilib-minimal verify-sig flag-o-matic
+IUSE=+cxx jbig jpeg lzma static-libs test webp zlib zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
+LICENSE=libtiff
+RDEPEND=jbig? ( >=media-libs/jbigkit-2.1:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) jpeg? ( 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(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) webp? ( media-libs/libwebp:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zlib? ( >=sys-libs/zlib-1.2.8-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( >=app-arch/zstd-1.3.7-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(-)?] )
+REQUIRED_USE=test? ( jpeg )
+RESTRICT=!test? ( test )
+SLOT=0/6
+SRC_URI=https://download.osgeo.org/libtiff/tiff-4.5.0rc1.tar.xz verify-sig? ( https://download.osgeo.org/libtiff/tiff-4.5.0rc1.tar.xz.sig )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=55a5480eabadd357e28612cd76f595ee
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index b12f908528b5..2c62f63a889b 100644
--- a/metadata/md5-cache/media-video/Manifest.gz
+++ b/metadata/md5-cache/media-video/Manifest.gz
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.56 b/metadata/md5-cache/media-video/pipewire-0.3.56
deleted file mode 100644
index 958cf9dd91ea..000000000000
--- a/metadata/md5-cache/media-video/pipewire-0.3.56
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=>=dev-util/meson-0.59 virtual/pkgconfig || ( >=dev-lang/python-3.11.0_p2:3.11 >=dev-lang/python-3.10.8_p3:3.10 >=dev-lang/python-3.9.15_p3:3.9 >=dev-lang/python-3.8.15_p3:3.8 ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/docutils[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/docutils[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/docutils[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/docutils[python_targets_python3_8(-)] ) ) doc? ( app-doc/doxygen media-gfx/graphviz ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-DESCRIPTION=Multimedia processing graphs
-EAPI=8
-HOMEPAGE=https://pipewire.org/
-INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
-IUSE=bluetooth dbus doc echo-cancel extra gstreamer jack-client jack-sdk lv2 pipewire-alsa sound-server ssl system-service systemd test udev v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=MIT LGPL-2.1+ GPL-2
-PDEPEND=>=media-video/wireplumber-0.4.8-r3
-RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/readline:= sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
-REQUIRED_USE=jack-sdk? ( !jack-client ) system-service? ( systemd ) !sound-server? ( !pipewire-alsa ) jack-client? ( dbus )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.56/pipewire-0.3.56.tar.gz
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=8165ad58aff64fe64c8eaee79f8a28da
diff --git a/metadata/md5-cache/media-video/pipewire-0.3.61 b/metadata/md5-cache/media-video/pipewire-0.3.61
index a55a4142ed82..370946f41297 100644
--- a/metadata/md5-cache/media-video/pipewire-0.3.61
+++ b/metadata/md5-cache/media-video/pipewire-0.3.61
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://pipewire.org/
 INHERIT=flag-o-matic meson-multilib optfeature prefix python-any-r1 systemd udev
 IUSE=bluetooth dbus doc echo-cancel extra flatpak gstreamer jack-client jack-sdk lv2 modemmanager pipewire-alsa readline sound-server ssl system-service systemd test udev v4l X zeroconf abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~amd64 arm arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
 LICENSE=MIT LGPL-2.1+ GPL-2
 PDEPEND=>=media-video/wireplumber-0.4.8-r3
 RDEPEND=acct-group/audio media-libs/alsa-lib sys-libs/ncurses:=[unicode(+)] virtual/libintl[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] bluetooth? ( media-libs/fdk-aac media-libs/libldac media-libs/libfreeaptx media-libs/opus media-libs/sbc >=net-wireless/bluez-4.101:= virtual/libusb:1 ) dbus? ( sys-apps/dbus[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) echo-cancel? ( media-libs/webrtc-audio-processing:0 ) extra? ( >=media-libs/libsndfile-1.0.20 ) flatpak? ( dev-libs/glib ) gstreamer? ( >=dev-libs/glib-2.32.0:2 >=media-libs/gstreamer-1.10.0:1.0 media-libs/gst-plugins-base:1.0 ) jack-client? ( >=media-sound/jack2-1.9.10:2[dbus] ) jack-sdk? ( !media-sound/jack-audio-connection-kit !media-sound/jack2 ) lv2? ( media-libs/lilv ) modemmanager? ( >=net-misc/modemmanager-1.10.0 ) pipewire-alsa? ( >=media-libs/alsa-lib-1.1.7[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) sound-server? ( !media-sound/pulseaudio[daemon(+)] !media-sound/pulseaudio-daemon ) readline? ( sys-libs/readline:= ) ssl? ( dev-libs/openssl:= ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire ) udev? ( virtual/libudev[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) v4l? ( media-libs/libv4l ) X? ( media-libs/libcanberra x11-libs/libX11 x11-libs/libXfixes ) zeroconf? ( net-dns/avahi )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0/0.4
 SRC_URI=https://gitlab.freedesktop.org/pipewire/pipewire/-/archive/0.3.61/pipewire-0.3.61.tar.bz2
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	optfeature	1a2157392a869265b2afcb63a26c12ac	prefix	eab3c99d77fe00506c109c8a736186f7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=8e75857008836d7d659340ee908ff8a4
+_md5_=76e7597211288179c133769e7d6bd3aa
diff --git a/metadata/md5-cache/media-video/wireplumber-0.4.11-r3 b/metadata/md5-cache/media-video/wireplumber-0.4.11-r3
deleted file mode 100644
index 775fc89f2998..000000000000
--- a/metadata/md5-cache/media-video/wireplumber-0.4.11-r3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=dev-libs/glib dev-util/gdbus-codegen dev-util/glib-utils sys-devel/gettext >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst setup test
-DEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd )
-DESCRIPTION=Replacement for pipewire-media-session
-EAPI=8
-HOMEPAGE=https://gitlab.freedesktop.org/pipewire/wireplumber
-INHERIT=lua-single meson systemd
-IUSE=elogind system-service systemd test lua_single_target_lua5-3 lua_single_target_lua5-4
-KEYWORDS=amd64 arm arm64 ~loong ppc ppc64 ~riscv ~sparc x86
-LICENSE=MIT
-RDEPEND=lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) lua_single_target_lua5-4? ( dev-lang/lua:5.4 ) >=dev-libs/glib-2.62 >=media-video/pipewire-0.3.53-r1:= virtual/libintl elogind? ( sys-auth/elogind ) systemd? ( sys-apps/systemd ) system-service? ( acct-user/pipewire acct-group/pipewire )
-REQUIRED_USE=^^ ( lua_single_target_lua5-3 lua_single_target_lua5-4 ) ?? ( elogind systemd ) system-service? ( systemd )
-RESTRICT=!test? ( test )
-SLOT=0/0.4
-SRC_URI=https://gitlab.freedesktop.org/pipewire/wireplumber/-/archive/0.4.11/wireplumber-0.4.11.tar.gz
-_eclasses_=lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=d8b1e65e33b8c088585057b6153f42da
diff --git a/metadata/md5-cache/net-analyzer/Manifest.gz b/metadata/md5-cache/net-analyzer/Manifest.gz
index b592157312bb..0a583101015a 100644
--- a/metadata/md5-cache/net-analyzer/Manifest.gz
+++ b/metadata/md5-cache/net-analyzer/Manifest.gz
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-0.11.2-r4 b/metadata/md5-cache/net-analyzer/fail2ban-0.11.2-r4
deleted file mode 100644
index 2848e7203cb3..000000000000
--- a/metadata/md5-cache/net-analyzer/fail2ban-0.11.2-r4
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_8? ( >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DESCRIPTION=Scans log files and bans IPs that show malicious signs
-EAPI=7
-HOMEPAGE=https://www.fail2ban.org/
-INHERIT=bash-completion-r1 distutils-r1 systemd tmpfiles
-IUSE=selinux systemd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86
-LICENSE=GPL-2
-RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python3_8? ( || ( dev-python/python-systemd[python_targets_python3_8(-)] sys-apps/systemd[python(-),python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( || ( dev-python/python-systemd[python_targets_python3_9(-)] sys-apps/systemd[python(-),python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( || ( dev-python/python-systemd[python_targets_python3_10(-)] sys-apps/systemd[python(-),python_targets_python3_10(-)] ) ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/fail2ban/fail2ban/archive/0.11.2.tar.gz -> fail2ban-0.11.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	da32ffc285e9f13313f2387570e35b87	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=c3c63e4b44be62636049840e62258e33
diff --git a/metadata/md5-cache/net-analyzer/fail2ban-1.0.1 b/metadata/md5-cache/net-analyzer/fail2ban-1.0.1
deleted file mode 100644
index c91d310c0712..000000000000
--- a/metadata/md5-cache/net-analyzer/fail2ban-1.0.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) python_single_target_python3_8? ( >=dev-python/setuptools-65.5.1[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-python/setuptools-65.5.1[python_targets_python3_10(-)] ) python_single_target_python3_11? ( >=dev-python/setuptools-65.5.1[python_targets_python3_11(-)] ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare setup test
-DESCRIPTION=Scans log files and bans IPs that show malicious signs
-EAPI=8
-HOMEPAGE=https://www.fail2ban.org/
-INHERIT=bash-completion-r1 distutils-r1 systemd tmpfiles
-IUSE=selinux systemd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=virtual/logger virtual/mta selinux? ( sec-policy/selinux-fail2ban ) systemd? ( python_single_target_python3_8? ( || ( dev-python/python-systemd[python_targets_python3_8(-)] sys-apps/systemd[python(-),python_targets_python3_8(-)] ) ) python_single_target_python3_9? ( || ( dev-python/python-systemd[python_targets_python3_9(-)] sys-apps/systemd[python(-),python_targets_python3_9(-)] ) ) python_single_target_python3_10? ( || ( dev-python/python-systemd[python_targets_python3_10(-)] sys-apps/systemd[python(-),python_targets_python3_10(-)] ) ) python_single_target_python3_11? ( || ( dev-python/python-systemd[python_targets_python3_11(-)] sys-apps/systemd[python(-),python_targets_python3_11(-)] ) ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_p2:3.11 ) virtual/tmpfiles
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/fail2ban/fail2ban/archive/1.0.1.tar.gz -> fail2ban-1.0.1.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	da32ffc285e9f13313f2387570e35b87	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=a1545c60fef65a383da659303da19318
diff --git a/metadata/md5-cache/net-analyzer/tcpdump-4.99.1 b/metadata/md5-cache/net-analyzer/tcpdump-4.99.1
deleted file mode 100644
index 618983dd8d02..000000000000
--- a/metadata/md5-cache/net-analyzer/tcpdump-4.99.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=drop-root? ( virtual/pkgconfig ) verify-sig? ( sec-keys/openpgp-keys-tcpdump ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure install postinst prepare test unpack
-DEPEND=>=net-libs/libpcap-1.10.1 drop-root? ( acct-group/pcap acct-user/pcap sys-libs/libcap-ng ) smi? ( net-libs/libsmi ) ssl? ( >=dev-libs/openssl-0.9.6m:0= ) suid? ( acct-group/pcap acct-user/pcap ) test? ( dev-lang/perl )
-DESCRIPTION=A tool for network monitoring and data acquisition
-EAPI=7
-HOMEPAGE=https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump
-INHERIT=autotools verify-sig
-IUSE=+drop-root +smi +ssl +samba suid test verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD
-RDEPEND=>=net-libs/libpcap-1.10.1 drop-root? ( acct-group/pcap acct-user/pcap sys-libs/libcap-ng ) smi? ( net-libs/libsmi ) ssl? ( >=dev-libs/openssl-0.9.6m:0= ) suid? ( acct-group/pcap acct-user/pcap )
-REQUIRED_USE=test? ( samba )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://www.tcpdump.org/release/tcpdump-4.99.1.tar.gz -> tcpdump-4.99.1-upstream.tar.gz verify-sig? ( https://www.tcpdump.org/release/tcpdump-4.99.1.tar.gz.sig -> tcpdump-4.99.1-upstream.tar.gz.sig )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=3cef2c602dd85acdb80385aba50fcd0e
diff --git a/metadata/md5-cache/net-analyzer/vnstat-2.9 b/metadata/md5-cache/net-analyzer/vnstat-2.9
deleted file mode 100644
index 0a598ef2d996..000000000000
--- a/metadata/md5-cache/net-analyzer/vnstat-2.9
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/openpgp-keys-teemutoivola ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile install postinst unpack
-DEPEND=acct-group/vnstat acct-user/vnstat dev-db/sqlite gd? ( media-libs/gd[png] ) test? ( dev-libs/check )
-DESCRIPTION=Console-based network traffic monitor that keeps statistics of network usage
-EAPI=8
-HOMEPAGE=https://humdi.net/vnstat/
-INHERIT=systemd tmpfiles verify-sig
-IUSE=gd selinux test verify-sig
-KEYWORDS=amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86
-LICENSE=GPL-2
-RDEPEND=acct-group/vnstat acct-user/vnstat dev-db/sqlite gd? ( media-libs/gd[png] ) selinux? ( sec-policy/selinux-vnstatd ) virtual/tmpfiles
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://humdi.net/vnstat/vnstat-2.9.tar.gz verify-sig? ( https://humdi.net/vnstat/vnstat-2.9.tar.gz.asc )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=df66f09502e04e4923561d0f0b92ff0e
diff --git a/metadata/md5-cache/net-firewall/Manifest.gz b/metadata/md5-cache/net-firewall/Manifest.gz
index 7fec91202868..6b186ba5abc8 100644
--- a/metadata/md5-cache/net-firewall/Manifest.gz
+++ b/metadata/md5-cache/net-firewall/Manifest.gz
diff --git a/metadata/md5-cache/net-firewall/firewalld-1.1.1 b/metadata/md5-cache/net-firewall/firewalld-1.1.1
deleted file mode 100644
index 90be43e5d610..000000000000
--- a/metadata/md5-cache/net-firewall/firewalld-1.1.1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd >=dev-util/intltool-0.35 sys-devel/gettext sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) iptables? ( net-firewall/iptables[ipv6(+)] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) dev-libs/glib:2
-DESCRIPTION=A firewall daemon with D-Bus interface providing a dynamic firewall
-EAPI=8
-HOMEPAGE=https://firewalld.org/
-INHERIT=autotools bash-completion-r1 gnome2-utils linux-info optfeature plocale python-single-r1 systemd xdg-utils
-IUSE=gui +nftables +iptables python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) iptables? ( net-firewall/iptables[ipv6(+)] net-firewall/ebtables net-firewall/ipset nftables? ( net-firewall/nftables[xtables(+)] ) ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] gui? ( x11-libs/gtk+:3 dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=test
-SLOT=0
-SRC_URI=https://github.com/firewalld/firewalld/archive/v1.1.1.tar.gz -> firewalld-1.1.1.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=c1bf048bf27b9139adf9e5d13fd476e3
diff --git a/metadata/md5-cache/net-firewall/firewalld-1.1.3 b/metadata/md5-cache/net-firewall/firewalld-1.1.3
deleted file mode 100644
index b40c92601e8c..000000000000
--- a/metadata/md5-cache/net-firewall/firewalld-1.1.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=app-text/docbook-xml-dtd >=dev-util/intltool-0.35 sys-devel/gettext test? ( net-firewall/nftables ) virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm preinst prepare setup
-DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] gui? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] x11-libs/gtk+:3 ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] gui? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] x11-libs/gtk+:3 ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] gui? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] x11-libs/gtk+:3 ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) iptables? ( net-firewall/ebtables net-firewall/ipset net-firewall/iptables[ipv6(+)] nftables? ( net-firewall/nftables[xtables(+)] ) ) dev-libs/glib:2
-DESCRIPTION=A firewall daemon with D-Bus interface providing a dynamic firewall
-EAPI=8
-HOMEPAGE=https://firewalld.org/
-INHERIT=bash-completion-r1 gnome2-utils linux-info optfeature plocale python-single-r1 systemd xdg-utils
-IUSE=gui +nftables +iptables test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64 arm arm64 ppc64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.15_p3:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.15_p3:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.8_p3:3.10 ) || ( >=sys-apps/openrc-0.11.5 sys-apps/systemd ) python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/pygobject:3[python_targets_python3_8(-)] gui? ( dev-python/PyQt5[gui,widgets,python_targets_python3_8(-)] x11-libs/gtk+:3 ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/pygobject:3[python_targets_python3_9(-)] gui? ( dev-python/PyQt5[gui,widgets,python_targets_python3_9(-)] x11-libs/gtk+:3 ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/pygobject:3[python_targets_python3_10(-)] gui? ( dev-python/PyQt5[gui,widgets,python_targets_python3_10(-)] x11-libs/gtk+:3 ) nftables? ( >=net-firewall/nftables-0.9.4[python,json] ) ) iptables? ( net-firewall/ebtables net-firewall/ipset net-firewall/iptables[ipv6(+)] nftables? ( net-firewall/nftables[xtables(+)] ) )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test ) test? ( userpriv )
-SLOT=0
-SRC_URI=https://github.com/firewalld/firewalld/releases/download/v1.1.3/firewalld-1.1.3.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	plocale	7ce00136a77130df46fbbd5966f98a61	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	25c880c1db58e21b80b684bacc964958	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=32701171eabfdebc2e716aa5afaa5ea7
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index 5ef3a3885c34..6da868dba996 100644
--- a/metadata/md5-cache/net-im/Manifest.gz
+++ b/metadata/md5-cache/net-im/Manifest.gz
diff --git a/metadata/md5-cache/net-im/discord-bin-0.0.21-r1 b/metadata/md5-cache/net-im/discord-bin-0.0.22
index 86e0e56de0e6..72ede9dfadeb 100644
--- a/metadata/md5-cache/net-im/discord-bin-0.0.21-r1
+++ b/metadata/md5-cache/net-im/discord-bin-0.0.22
@@ -10,6 +10,6 @@ LICENSE=all-rights-reserved
 RDEPEND=|| ( >=app-accessibility/at-spi2-core-2.46.0:2 ( app-accessibility/at-spi2-atk dev-libs/atk ) ) app-crypt/libsecret dev-libs/expat dev-libs/glib:2 dev-libs/nspr dev-libs/nss media-libs/alsa-lib media-libs/fontconfig media-libs/mesa[gbm(+)] net-print/cups sys-apps/dbus sys-apps/util-linux sys-libs/glibc x11-libs/cairo x11-libs/libdrm x11-libs/gdk-pixbuf:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libXScrnSaver x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libxcb x11-libs/libxkbcommon x11-libs/libxshmfence x11-libs/pango system-ffmpeg? ( media-video/ffmpeg[chromium] )
 RESTRICT=bindist mirror strip test
 SLOT=0
-SRC_URI=https://dl.discordapp.net/apps/linux/0.0.21/discord-0.0.21.tar.gz
+SRC_URI=https://dl.discordapp.net/apps/linux/0.0.22/discord-0.0.22.tar.gz
 _eclasses_=chromium-2	1004ce9fd1ae9622a0b7eabcd8fc0d69	desktop	7eb20ad915a0a318176d51bc2508ff5c	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	unpacker	bc57272a0491765c71d973c8cfd35063	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=a03755448a7f878d2bccb007491b53da
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 2f54e3416912..1328e76dac95 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/chrony-4.3-r1 b/metadata/md5-cache/net-misc/chrony-4.3-r1
deleted file mode 100644
index fa95c5d9898d..000000000000
--- a/metadata/md5-cache/net-misc/chrony-4.3-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/bison html? ( dev-ruby/asciidoctor ) nts? ( virtual/pkgconfig ) sechash? ( nettle? ( virtual/pkgconfig ) nss? ( virtual/pkgconfig ) ) verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 ) virtual/pkgconfig verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst preinst prepare unpack
-DEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) pps? ( net-misc/pps-tools ) seccomp? ( sys-libs/libseccomp )
-DESCRIPTION=NTP client and server programs
-EAPI=8
-HOMEPAGE=https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git
-INHERIT=edo systemd tmpfiles toolchain-funcs verify-sig
-IUSE=+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
-LICENSE=GPL-2
-RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) libedit? ( dev-libs/libedit ) !libedit? ( sys-libs/readline:= ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) pps? ( net-misc/pps-tools ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
-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	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=a6f4e52512c9d071bcad4ceb16e103c6
diff --git a/metadata/md5-cache/net-misc/chrony-4.3-r2 b/metadata/md5-cache/net-misc/chrony-4.3-r2
index 3cbda70c25b4..18f837af22ab 100644
--- a/metadata/md5-cache/net-misc/chrony-4.3-r2
+++ b/metadata/md5-cache/net-misc/chrony-4.3-r2
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git
 INHERIT=edo systemd tmpfiles toolchain-funcs verify-sig
 IUSE=+caps +cmdmon debug html ipv6 libtomcrypt +nettle nss +ntp +nts +phc pps +readline +refclock +rtc samba +seccomp +sechash selinux verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha ~amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=caps? ( acct-group/ntp acct-user/ntp sys-libs/libcap ) nettle? ( dev-libs/nettle:= ) nss? ( dev-libs/nss:= ) nts? ( net-libs/gnutls:= ) pps? ( net-misc/pps-tools ) readline? ( dev-libs/libedit ) seccomp? ( sys-libs/libseccomp ) selinux? ( sec-policy/selinux-chronyd ) virtual/tmpfiles
 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	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=af4f69a6de8d4c41466dc9b4ea352210
+_md5_=b4c583a00ad7d2545bd2f93675538454
diff --git a/metadata/md5-cache/net-misc/iperf-3.11 b/metadata/md5-cache/net-misc/iperf-3.11
deleted file mode 100644
index 16ac6823dfc2..000000000000
--- a/metadata/md5-cache/net-misc/iperf-3.11
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=dev-libs/openssl:= sctp? ( net-misc/lksctp-tools )
-DESCRIPTION=A TCP, UDP, and SCTP network bandwidth measurement tool
-EAPI=8
-HOMEPAGE=https://github.com/esnet/iperf
-INHERIT=systemd
-IUSE=sctp
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos
-LICENSE=BSD
-RDEPEND=dev-libs/openssl:= sctp? ( net-misc/lksctp-tools )
-SLOT=3
-SRC_URI=https://github.com/esnet/iperf/archive/3.11.tar.gz -> iperf-3.11.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=ed59e05be70f2e509c7755ba87d3217a
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index 4430c712f425..cfdb30cb3e59 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/hostapd-2.9-r6 b/metadata/md5-cache/net-wireless/hostapd-2.9-r6
deleted file mode 100644
index ea5531e07dcf..000000000000
--- a/metadata/md5-cache/net-wireless/hostapd-2.9-r6
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare pretend unpack
-DEPEND=internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
-DESCRIPTION=IEEE 802.11 wireless LAN Host AP daemon
-EAPI=7
-HOMEPAGE=https://w1.fi/ https://w1.fi/cgit/hostap/
-INHERIT=flag-o-matic systemd savedconfig toolchain-funcs
-IUSE=internal-tls ipv6 netlink sqlite +suiteb +wps +crda savedconfig
-KEYWORDS=amd64 arm arm64 ~mips ppc x86
-LICENSE=BSD
-RDEPEND=internal-tls? ( dev-libs/libtommath ) !internal-tls? ( dev-libs/openssl:0=[-bindist(-)] ) kernel_linux? ( dev-libs/libnl:3 crda? ( net-wireless/crda ) ) netlink? ( net-libs/libnfnetlink ) sqlite? ( >=dev-db/sqlite-3 )
-SLOT=0
-SRC_URI=https://dev.gentoo.org/~andrey_utkin/distfiles/net-wireless_hostapd_2.7-r2_extras.tar.xz https://w1.fi/releases/hostapd-2.9.tar.gz
-_eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	portability	58227860123d3e8da23290064ce3373e	savedconfig	4011d8d7370446e970e2c92b20a31341	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=f5bd28da7dc8c61d948a9919212c052e
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index c9926debd8f2..1d35f58ee60f 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20221101 b/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20221101
index 4dc476bf9649..c87d309b75df 100644
--- a/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20221101
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-openssl-20221101
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=OpenPGP keys used by OpenSSL
 EAPI=8
 HOMEPAGE=https://www.openssl.net/
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=public-domain
 SLOT=0
 SRC_URI=https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20221101-5B2545DAB21995F4088CEFAA36CEE4DEB00CFE33.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20221101-8657ABB260F056B1E5190839D9C4D26D0E604491.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20221101-B7C1C14360F353A36862E4D5231C84CDDCC69C45.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20221101-95A9908DDFA16830BE9FB9003D30A3A9FF1360DC.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20221101-A21FAB74B0088AA361152586B8EF1A6BA9DA2D5C.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20221101-C1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD.asc https://dev.gentoo.org/~sam/distfiles/sec-keys/openpgp-keys-openssl/openssl-keys-20221101-E5E52560DD91C556DDBDA5D02064C53641C25E5D.asc
-_md5_=ea8dffb8bb571b6f57cad12f9f990e5c
+_md5_=da0fe556acd338c1b4d0c4919604fbbd
diff --git a/metadata/md5-cache/sys-apps/Manifest.gz b/metadata/md5-cache/sys-apps/Manifest.gz
index d6b912feb3a5..5e065a3437dd 100644
--- a/metadata/md5-cache/sys-apps/Manifest.gz
+++ b/metadata/md5-cache/sys-apps/Manifest.gz
diff --git a/metadata/md5-cache/sys-apps/portage-3.0.41 b/metadata/md5-cache/sys-apps/portage-3.0.41
index 070508e1aa6a..ab0e480e2e97 100644
--- a/metadata/md5-cache/sys-apps/portage-3.0.41
+++ b/metadata/md5-cache/sys-apps/portage-3.0.41
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://gitweb.gentoo.org/proj/portage.git/snapshot/portage-3.0.41.tar.bz2
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=119fc27e5b96f8d80793c0b008f80daf
+_md5_=c5e6351e13bc91aa4f0d9c21763750b2
diff --git a/metadata/md5-cache/sys-apps/portage-9999 b/metadata/md5-cache/sys-apps/portage-9999
index 4b9abdffb9e2..8d627ad9e09f 100644
--- a/metadata/md5-cache/sys-apps/portage-9999
+++ b/metadata/md5-cache/sys-apps/portage-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_p
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=distutils-r1	da32ffc285e9f13313f2387570e35b87	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	prefix	eab3c99d77fe00506c109c8a736186f7	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	25c880c1db58e21b80b684bacc964958	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=eb7715d02ab07a88992881646cccdbca
+_md5_=9084a20a6a83ad08786d07da19ee5ae5
diff --git a/metadata/md5-cache/sys-apps/sed-4.9 b/metadata/md5-cache/sys-apps/sed-4.9
index 9a2d134c61cc..a40d2d805b5e 100644
--- a/metadata/md5-cache/sys-apps/sed-4.9
+++ b/metadata/md5-cache/sys-apps/sed-4.9
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=http://sed.sourceforge.net/
 INHERIT=flag-o-matic verify-sig
 IUSE=acl nls selinux static verify-sig
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
 LICENSE=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	37a4612ce5522df5a100359a8dbc8491	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=9829a53587bf203b8ad06dfca4a67517
+_md5_=6cf078212607e61f2ecc3fc9bee0d89b
diff --git a/metadata/md5-cache/sys-apps/systemd-251.7 b/metadata/md5-cache/sys-apps/systemd-251.7
deleted file mode 100644
index 3db081c196db..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-251.7
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/lxml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-4.15 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=System and service manager for Linux
-EAPI=7
-HOMEPAGE=http://systemd.io/
-INHERIT=bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-IUSE=acl apparmor audit cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] sec-policy/selinux-ntp ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) pwquality? ( homed )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v251.7/systemd-stable-251.7.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	7cda204db1974f6e912eb98dd34261ad	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=c8b80d9768ee539f56a4bdf3b63cde01
diff --git a/metadata/md5-cache/sys-apps/systemd-252.2 b/metadata/md5-cache/sys-apps/systemd-252.2
deleted file mode 100644
index ac75220411cc..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-252.2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=app-arch/xz-utils:0 dev-util/gperf >=dev-util/meson-0.46 >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig test? ( app-text/tree dev-lang/perl sys-apps/dbus ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt:0 || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/lxml[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/lxml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/lxml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/lxml[python_targets_python3_8(-)] ) ) >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst preinst prepare prerm pretend setup test unpack
-DEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-kernel/linux-headers-4.15 gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=System and service manager for Linux
-EAPI=7
-HOMEPAGE=http://systemd.io/
-INHERIT=bash-completion-r1 flag-o-matic linux-info meson-multilib pam python-any-r1 systemd toolchain-funcs udev usr-ldscript
-IUSE=acl apparmor audit cgroup-hybrid cryptsetup curl +dns-over-tls elfutils fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod +lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode +resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=>=sys-apps/dbus-1.9.8[systemd] >=sys-fs/udev-init-scripts-34 policykit? ( sys-auth/polkit ) !vanilla? ( sys-apps/gentoo-systemd-integration )
-RDEPEND=>=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) apparmor? ( sys-libs/libapparmor:0= ) audit? ( >=sys-process/audit-2:0= ) cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= ) curl? ( net-misc/curl:0= ) elfutils? ( >=dev-libs/elfutils-0.158:0= ) fido2? ( dev-libs/libfido2:0= ) gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) gnutls? ( >=net-libs/gnutls-3.6.0:0= ) http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] ) idn? ( net-dns/libidn2:= ) importd? ( app-arch/bzip2:0= sys-libs/zlib:0= ) kmod? ( >=sys-apps/kmod-15:0= ) lz4? ( >=app-arch/lz4-0_p131:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) iptables? ( net-firewall/iptables:0= ) openssl? ( >=dev-libs/openssl-1.1.0:0= ) pam? ( sys-libs/pam:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) pkcs11? ( app-crypt/p11-kit:0= ) pcre? ( dev-libs/libpcre2 ) pwquality? ( dev-libs/libpwquality:0= ) qrcode? ( media-gfx/qrencode:0= ) seccomp? ( >=sys-libs/libseccomp-2.3.3:0= ) selinux? ( sys-libs/libselinux:0= ) tpm? ( app-crypt/tpm2-tss:0= ) xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= ) zstd? ( >=app-arch/zstd-1.4.0:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=acct-group/adm-0-r1 >=acct-group/wheel-0-r1 >=acct-group/kmem-0-r1 >=acct-group/tty-0-r1 >=acct-group/utmp-0-r1 >=acct-group/audio-0-r1 >=acct-group/cdrom-0-r1 >=acct-group/dialout-0-r1 >=acct-group/disk-0-r1 >=acct-group/input-0-r1 >=acct-group/kvm-0-r1 >=acct-group/lp-0-r1 >=acct-group/render-0-r1 acct-group/sgx >=acct-group/tape-0-r1 acct-group/users >=acct-group/video-0-r1 >=acct-group/systemd-journal-0-r1 >=acct-user/root-0-r1 acct-user/nobody >=acct-user/systemd-journal-remote-0-r1 >=acct-user/systemd-coredump-0-r1 >=acct-user/systemd-network-0-r1 acct-user/systemd-oom >=acct-user/systemd-resolve-0-r1 >=acct-user/systemd-timesync-0-r1 >=sys-apps/baselayout-2.2 selinux? ( sec-policy/selinux-base-policy[systemd] sec-policy/selinux-ntp ) sysv-utils? ( !sys-apps/openrc[sysv-utils(-)] !sys-apps/sysvinit ) !sysv-utils? ( sys-apps/sysvinit ) resolvconf? ( !net-dns/openresolv ) !sys-apps/hwids[udev] !sys-auth/nss-myhostname !sys-fs/eudev !sys-fs/udev
-REQUIRED_USE=dns-over-tls? ( || ( gnutls openssl ) ) homed? ( cryptsetup pam openssl ) importd? ( curl lzma || ( gcrypt openssl ) ) pwquality? ( homed )
-RESTRICT=!test? ( test )
-SLOT=0/2
-SRC_URI=https://github.com/systemd/systemd-stable/archive/v252.2/systemd-stable-252.2.tar.gz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7a3f8b289bc442b8151fb29bfefe3b76	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	pam	e44a1dd98f13e1ad76de01e919bde1f1	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	7cda204db1974f6e912eb98dd34261ad	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=e52fcd4b35ed9d173980afd2ed2c8911
diff --git a/metadata/md5-cache/sys-apps/systemd-utils-251.4-r2 b/metadata/md5-cache/sys-apps/systemd-utils-251.4-r2
deleted file mode 100644
index d1cf8c339083..000000000000
--- a/metadata/md5-cache/sys-apps/systemd-utils-251.4-r2
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.11.0_p2:3.11 dev-python/jinja[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.8_p3:3.10 dev-python/jinja[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.15_p3:3.9 dev-python/jinja[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.15_p3:3.8 dev-python/jinja[python_targets_python3_8(-)] ) ) app-text/docbook-xml-dtd:4.2 app-text/docbook-xml-dtd:4.5 app-text/docbook-xsl-stylesheets dev-libs/libxslt dev-util/gperf >=sys-apps/coreutils-8.16 sys-devel/gettext virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst prepare setup test
-DEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) >=sys-kernel/linux-headers-3.11 boot? ( >=sys-boot/gnu-efi-3.0.2 )
-DESCRIPTION=Utilities split out from systemd for OpenRC users
-EAPI=8
-HOMEPAGE=https://systemd.io/
-INHERIT=bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-IUSE=+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 split-usr
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=GPL-2 LGPL-2.1 MIT public-domain
-PDEPEND=udev? ( >=sys-fs/udev-init-scripts-34 )
-RDEPEND=elibc_musl? ( >=sys-libs/musl-1.2.3 ) selinux? ( sys-libs/libselinux:0= ) tmpfiles? ( acl? ( sys-apps/acl:0= ) ) udev? ( >=sys-apps/util-linux-2.30:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libcap:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] virtual/libcrypt:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] acl? ( sys-apps/acl:0= ) kmod? ( >=sys-apps/kmod-15:0= ) ) !udev? ( >=sys-apps/util-linux-2.30:0= sys-libs/libcap:0= virtual/libcrypt:= ) boot? ( !<sys-boot/systemd-boot-250 ) tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 ) udev? ( acct-group/audio acct-group/cdrom acct-group/dialout acct-group/disk acct-group/input acct-group/kmem acct-group/kvm acct-group/lp acct-group/render acct-group/sgx acct-group/tape acct-group/tty acct-group/video !sys-apps/gentoo-systemd-integration !sys-apps/hwids[udev] !<sys-fs/udev-250 !sys-fs/eudev ) !sys-apps/systemd
-REQUIRED_USE=|| ( boot tmpfiles sysusers udev )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/systemd/systemd-stable/archive/refs/tags/v251.4.tar.gz -> systemd-stable-251.4.tar.gz elibc_musl? ( https://dev.gentoo.org/~floppym/dist/systemd-musl-patches-251.2.tar.gz )
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	flag-o-matic	69394e25812406faa1f90edaf4969395	meson	1994a5aef5d4f5798b92f64d6f9a6003	meson-multilib	84c0d4019bf29be0d9d0a2d98fb8b0d9	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	8ed38f92fe095be374d6c4c8d4c0dda7	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	25c880c1db58e21b80b684bacc964958	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491	udev	eec0bbab06977f1cfc5597269c1fa152	usr-ldscript	7cda204db1974f6e912eb98dd34261ad
-_md5_=12a65f373f199be624c85b32ac871861
diff --git a/metadata/md5-cache/sys-block/Manifest.gz b/metadata/md5-cache/sys-block/Manifest.gz
index 1603baba346b..63c1d39cbe8c 100644
--- a/metadata/md5-cache/sys-block/Manifest.gz
+++ b/metadata/md5-cache/sys-block/Manifest.gz
diff --git a/metadata/md5-cache/sys-block/partimage-0.6.9-r4 b/metadata/md5-cache/sys-block/partimage-0.6.9-r4
index 9ed1e3d4f8c5..353c2dc9c1b9 100644
--- a/metadata/md5-cache/sys-block/partimage-0.6.9-r4
+++ b/metadata/md5-cache/sys-block/partimage-0.6.9-r4
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.partimage.org/
 INHERIT=autotools flag-o-matic pam
 IUSE=nls nologin pam ssl static
-KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~riscv ~sparc ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~loong ppc ~riscv ~sparc x86
 LICENSE=GPL-2+
 RDEPEND=acct-group/partimag acct-user/partimag pam? ( sys-libs/pam ) !static? ( app-arch/bzip2 >=dev-libs/newt-0.52 >=sys-libs/slang-2 sys-libs/zlib:= !nologin? ( virtual/libcrypt:= ) ssl? ( dev-libs/openssl:0= ) )
 REQUIRED_USE=static? ( !pam )
 SLOT=0
 SRC_URI=mirror://sourceforge/partimage/partimage-0.6.9.tar.bz2
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	e44a1dd98f13e1ad76de01e919bde1f1	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=2fc46abffb6f58a954f95d981bc6a9ab
+_md5_=f46629bf2db78373ffe2956da17843fe
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index f41ded20b3d9..fb4bedfb02ab 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221208 b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221208
new file mode 100644
index 000000000000..bb4c1e335f8c
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-10.4.1_p20221208
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/binutils sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=10
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/10-20221208/gcc-10-20221208.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-patches-1.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-10.5.0-musl-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f71e29d177972a4d89d655cd863c2b27	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=a571ad6bc96d976395d1a45ad75e47d2
diff --git a/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221209 b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221209
new file mode 100644
index 000000000000..bf4c3cceb2d6
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-11.3.1_p20221209
@@ -0,0 +1,16 @@
+BDEPEND=>=sys-devel/binutils-2.30[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=11
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/11-20221209/gcc-11-20221209.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-patches-3.tar.xz https://dev.gentoo.org/~sam/distfiles/sys-devel/gcc/gcc-11.4.0-musl-patches-0.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	f71e29d177972a4d89d655cd863c2b27	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=58ce513f45d91e404e761ca6622ad447
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.7 b/metadata/md5-cache/sys-devel/libtool-2.4.7
index e43e2276dda1..be00494d8fc2 100644
--- a/metadata/md5-cache/sys-devel/libtool-2.4.7
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.7
@@ -6,10 +6,10 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libtool/
 INHERIT=autotools prefix
 IUSE=vanilla
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
 LICENSE=GPL-2
 RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69:* >=sys-devel/automake-1.13:* >=dev-libs/libltdl-2.4.7
 SLOT=2
 SRC_URI=mirror://gnu/libtool/libtool-2.4.7.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
-_md5_=6ead3d4cf10e3752aa25b28d979e2819
+_md5_=cdd497b9ee1fd7bd17e8d482e10c9594
diff --git a/metadata/md5-cache/sys-devel/libtool-2.4.7-r1 b/metadata/md5-cache/sys-devel/libtool-2.4.7-r1
new file mode 100644
index 000000000000..7fbc6c32539f
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/libtool-2.4.7-r1
@@ -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
+DEFINED_PHASES=configure install prepare
+DEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69:* >=sys-devel/automake-1.13:* >=dev-libs/libltdl-2.4.7
+DESCRIPTION=A shared library tool for developers
+EAPI=7
+HOMEPAGE=https://www.gnu.org/software/libtool/
+INHERIT=autotools prefix
+IUSE=vanilla
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt
+LICENSE=GPL-2
+RDEPEND=sys-devel/gnuconfig >=sys-devel/autoconf-2.69:* >=sys-devel/automake-1.13:* >=dev-libs/libltdl-2.4.7
+SLOT=2
+SRC_URI=mirror://gnu/libtool/libtool-2.4.7.tar.xz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	37a4612ce5522df5a100359a8dbc8491
+_md5_=7ccfca8183a5585092d05334ef73d424
diff --git a/metadata/md5-cache/sys-process/Manifest.gz b/metadata/md5-cache/sys-process/Manifest.gz
index 2ae95d4515d6..d58369a667a0 100644
--- a/metadata/md5-cache/sys-process/Manifest.gz
+++ b/metadata/md5-cache/sys-process/Manifest.gz
diff --git a/metadata/md5-cache/sys-process/parallel-20220822 b/metadata/md5-cache/sys-process/parallel-20220822
deleted file mode 100644
index 8155817d15aa..000000000000
--- a/metadata/md5-cache/sys-process/parallel-20220822
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-oletange-20210423 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure unpack
-DEPEND=dev-lang/perl dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/
-INHERIT=verify-sig
-IUSE=verify-sig
-KEYWORDS=amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-SLOT=0
-SRC_URI=mirror://gnu/parallel/parallel-20220822.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20220822.tar.bz2.sig )
-_eclasses_=verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=1914107741f25dd16a29b24c56c14ddc
diff --git a/metadata/md5-cache/sys-process/parallel-20220922 b/metadata/md5-cache/sys-process/parallel-20220922
deleted file mode 100644
index 204353e47a9f..000000000000
--- a/metadata/md5-cache/sys-process/parallel-20220922
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( >=sec-keys/openpgp-keys-oletange-20210423 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=configure unpack
-DEPEND=dev-lang/perl dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-DESCRIPTION=A shell tool for executing jobs in parallel locally or on remote machines
-EAPI=8
-HOMEPAGE=https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/
-INHERIT=verify-sig
-IUSE=verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=dev-lang/perl dev-perl/Devel-Size dev-perl/Text-CSV virtual/perl-Data-Dumper virtual/perl-File-Temp virtual/perl-IO
-SLOT=0
-SRC_URI=mirror://gnu/parallel/parallel-20220922.tar.bz2 verify-sig? ( mirror://gnu/parallel/parallel-20220922.tar.bz2.sig )
-_eclasses_=verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=9ac9c1b38bfa689bed61a81e0663fdf9
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 4be2563eb03d..ea0d25a02a23 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14601 BLAKE2B b2b03f784771869c2af8238b7eb177f68542d9936c68fb72d5570f7586fc5bfa6ebef91d68006df82de3cb72959aeb4bab278be90309ec4475d99a0a7c116698 SHA512 63ddd1056929f887c0a4815b7d7a2bf2cee40e7678885b8dae9d5f1bfc4b69ae36456367dc791d7e3ada9047919456bd6d6dbfc92df0cef91b9e64733254a40c
-TIMESTAMP 2022-12-10T02:40:00Z
+TIMESTAMP 2022-12-10T08:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOT8YBfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmOURdlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDQAA//URz0BBvemKionzcsHG1ou9c98ZVpNCug9YsTgAi0IesK6Qchd5UlsCCC
-DEgTLS/8vAg0dmAEXducBfsIohY2xmsvk17jNl/1VHJ88Gy9Xyd8hBZdJtgSOYXo
-vO2Y5N3kRu5WUams8M8T0eokNv1eKeISkGRBmknay84A/kdd3DKM6ViOOTB+nMte
-K86p0WAkd1wOOWz/1UJaIUk2QIWD969c1vd4RwlCZNqcB2IfcRBOzSR9ALafLf+T
-VCdJy2Yesk2hv89ZQAo5L1+3IfndRGhgDPGMBANhUoy+T9/72HIpElZqaF2HTtVp
-DDJvnrHUImozSH+tSnB+CEcXtHvWq5AQ2BPhH1qAIYv5tdqP9j8h9Ez0LF38lPc5
-Q9ODmxkfjrYqGShzOw0UD62BntsoE45jLlzy6VSb5E9Aw1N6NRz+f0Ta+N41jH8/
-9ZE9cnlxx/jkVrPLZXrJ96MF2eWoVRTIRYsACedTqZJtHIInTp/Pme0EZ/P5wGcY
-F4y7wsGmC/RBqjD0YV4Cmrz1hbKEbIj6H3U6pMs817AHkRJ+a6A/p9PXt9tU4BPJ
-dCv+nl5ZkGZXQ9qbw6Qv3HuIx9tgECqi98dkcRAUdB7PUQE9RlqKWcrIvc1HOpu3
-OjpX0Cat0BTPQN2SDO4Y4CjQLLiXBAei6Xhg4ArQYzgKWvvAn9s=
-=LmoS
+klCgcg//aYKzjBgsQmkfm8DPHz0QaF4EID9rf5aHmBmcTlxh9N8lp+9baDe1dkXC
+oYPL0gthtBcz30k29WzAf1T2VuV3lsiPp7cokT3m9KVTNnRncpUY1b2wFjk6FDGO
+s6dA3gfgGJ7GLWVI9Lh/JBAQ61KSeSwKExo7Et1PSiIZEmLE1kbix+OcaUn9quc2
++e2qcNnTAHxrR6RAajLGMJwse9Upnn9l2hEUPTWt1PtVvwD7Q+SjJT4/Jw86DQOj
+zj4pah8kx4YzdQviZrJlSi+VTxUNY97QF3UL4QEc6k+B66xs8KoI/A94rOu8YnGP
+81WIpE9qLHBf0TrmJLCWGAqTYhJv1bGLUy+hQ2lxT84eo3OgtNt2wAXpnNb1oU6I
+KIxdpc4mxGkEEhhWkeib1K8dff2mFfp0wZqwRwCSm4nU4th0iE1MxnG1+nrh1mB7
+VkAPcLsW8MzXIEuD7GiAX4oLe5JVVy5in3N235dmx4SInMd1j8GZ548EuI/YSkAx
+GvWX+0g0p4jtOdmQgVaC+c2aN6w19Y+sYDd/Qpndwzvb+WR69Dm85hzmeLoaSEHA
+x4XAIuVitTLpmxutYxcGOZ8jUvYHNvlei6dyiVOzuWOmtq7wtYGFLdNYwUScStNK
+64w703FnDUkdSb0ql3J28zbsc1nmFo3/94sv7CtwX3vWLi0U7+s=
+=51mT
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index f77705afb9ce..739543fa782d 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sat, 10 Dec 2022 02:39:56 +0000
+Sat, 10 Dec 2022 08:39:50 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index a21b7be795b8..589f85165e21 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sat Dec 10 02:39:56 AM UTC 2022
+Sat Dec 10 08:39:49 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 490dda61e299..b9b3c354d846 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sat, 10 Dec 2022 02:45:02 +0000
+Sat, 10 Dec 2022 08:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index d741d5cf0e5f..eeff7a534184 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-e86023957b4d5ce83a4fe634b4d1d2e02a50631f 1670638860 2022-12-10T02:21:00+00:00
+6079757cf15ff7a64abe0a5ad902ffc85ec5febc 1670660416 2022-12-10T08:20:16+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 9ff69791f14e..1171b34e4b2c 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1670640001 Sat 10 Dec 2022 02:40:01 AM UTC
+1670661601 Sat 10 Dec 2022 08:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index f77705afb9ce..b3d71998efa0 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sat, 10 Dec 2022 02:39:56 +0000
+Sat, 10 Dec 2022 08:39:49 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 01faee724ecb..7d77d78f5394 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/fail2ban/Manifest b/net-analyzer/fail2ban/Manifest
index abddd163dd5c..fa608dcc541a 100644
--- a/net-analyzer/fail2ban/Manifest
+++ b/net-analyzer/fail2ban/Manifest
@@ -1,14 +1,5 @@
 AUX fail2ban-0.11.2-adjust-apache-logs-paths.patch 893 BLAKE2B 5b80b81488a5245d9d9d15a1b0205a1d86f132e3faa5ea3e5cf91d55082b2d264e558dca4b7fbe62f643601b3315ac31cae387c433c2d90b670965abfa744f87 SHA512 dddff4858431170f5a24daab2d3cedcdcd7a1194b8ecbbcd794dfe00dcaee4af410afef102d3a25f86f541267d7be63e3e1d239c879e95d20cef9f0dacdcdc4c
-AUX fail2ban-0.11.2-fix-2to3-usage.patch 3905 BLAKE2B f159ac35845bb32f71e5f24e8ea9550c240d1245e0620a72a5df2fd76e8021ca4143959a592dd6fe222b23486280a525ac76d76b4918cc549f5876f4352f8065 SHA512 59cd4d13f7d05111096159e295ba294619c29b223c05f7e79eac0762a1aabb29a7f5465820bc81b5a727ce4549e57c51d29a1099cb0a50d7ad6f86770fb47242
-AUX fail2ban-0.11.2-fix-py3.10-collections.patch 949 BLAKE2B eebed48d15c6a1dcbe00744794c47b460d12cdaee408bd19a48f333aeb6bb5aaedc2ec5d3ce46f32b3830d9ad97a98a635d9822b397d1cce0522936c073f63bd SHA512 ec778e5924253a4f1ebb18c49193e9b2db3a9dc18fd239af582d2b6eb3cbc7aafc12008fe008d0e56bfd345709c6aac9388127650dd52e0f3401746f11ba1179
-AUX fail2ban-0.11.2-fix-systemd-test.patch 863 BLAKE2B 4f506097ceb1d62a076d695a5286075847e1f5757603c2c670f7bfdfd9c5ab6e4844300ff2488c0e5ee9a357a79cbdabaca9c591bc3d664f2f548c57b6638810 SHA512 d47b081f4271a645f56a0ccebbb2af67a0b0e278c192cf12345bb22a988330dff59fcbb0ee838245bbcfe1bf69c1dcc8355ef714a48cf2104c154673dc8a47b6
-AUX fail2ban-0.11.2-fix-tests-for-2021.patch 1821 BLAKE2B 52fae8ace32d6205d290d7e3a57378e10398742a735e9bf734d1ba4c6ff73abeb7bff8d0f76924c815a1dcdd7e57bf1a584956e1c03ff0db93f20ce68f1c8176 SHA512 a3db4065b5e815d409318c7aeb0f2fac87b2f91f7b1923a4c1684cbc97eb086ccd0fab993270d8c84d6f9da911f467d391689f312d89cea7cc6d59c20cfd39b0
-AUX fail2ban-0.11.2-upstream-openrc.patch 8205 BLAKE2B ee85888dbd5ed9b7aa5b8edaba7a0eff430df4677b33c37223d04b46d8b39ff29ded81be8fdd77d0e92e14654e2fb9726064772232af393a053bd3234843218b SHA512 bc4d3ba2c8c1008efe128abe07f6c5125479bf4fb5b96c38b9e5e6401da30faf1a58242b1e01e71638ff922c7e020e16b789f013a0227a8aa6f5bba232dacfd4
-DIST fail2ban-0.11.2.tar.gz 559552 BLAKE2B 0c61c1d5f6eb23d585533fbb84e69343cb305df188537a97002489318292c6056447c4c221c9d4d4cde6cca52f0c2fb877b597957f703e4d6707801a646e52b0 SHA512 46b27abd947b00ea64106dbac563ef8afef38eec86684024d47d9a0e8c1969ff864ad6df7f4f8de2aa3eb1af6d769fb6796592d9f0e35521d5f95f17b8cade97
-DIST fail2ban-1.0.1.tar.gz 582122 BLAKE2B 1fe1e5b3d6a1790304c29066b7a8edcb5a6ea11bea6fd8a2bf5f42a4725db1d5bfdd9ed1215a51bfc0eeccafa8a0e93c45940e897ceba7335965126f9b913ab0 SHA512 a4d0ee5405225b1ec950f3209bc304c1168c644d06309a187d77119f6bea12c382db046130a86411aad4210b458a16ee092269dc7953400950969a34550c6da5
 DIST fail2ban-1.0.2.tar.gz 583295 BLAKE2B 84eb5e3487c4db734f4f0a36af142d520e1cc53c2960893ee2f05ff4e78133860be59ed9580fa0d972509a03c17e5d9458b8e3f6b470a4c3154f10911f94691e SHA512 688a84361b5794e1658f53d2d200ce752fe1e3320ddb1742c32c4b4b82a79ace16ae464e7ea3eeb94a0e862bcac73c2d3a0e61dd7b28e179a4c857f950d74dbb
-EBUILD fail2ban-0.11.2-r4.ebuild 3867 BLAKE2B 5119d5d09bb26701bb6f740759437aa4c1f52f4cff3eec90729291c5ff742ca7cd349b32d9fddddbf441b07f48c489da7e18dba5daf47f668c45c9e96aae4851 SHA512 a3dd3e4d7b8ede3606282366eeede6a5fc2b817cb7a9004476e84ac2d5dc6eb813e25abc74fa803d1f7a0349356121aa2c790b21c984a18d0a5e08edf0ac3e01
-EBUILD fail2ban-1.0.1.ebuild 3668 BLAKE2B 3dd73b46392b5b5acae89aa0da2a3c1dcfad025462a9ec459e64cf5cebccdced2464e1be7a14d360b53a018c8f829ee0f167c3756702b3b224d394fb455a3c56 SHA512 32d928b9c698b7c13e7d2f2d44934e7ff0b1722aba1fa8f7bb9ffa500e1eb6acd36d71d9c8073adea90c8fe8c7797c3272bb99930142634c5bbd5f6dac6b794a
 EBUILD fail2ban-1.0.2.ebuild 3660 BLAKE2B e740d8aeb42fc1db298febaf7030ca58a2bcbf5d6961ef1d710844d58e4b2661cd00abf314d623574699df6e45578a6c46e3489b28745249e5fe63d3b75c8d11 SHA512 331c968869dd56056b387bd3ae54fd4375feb1708dc81914595fa56102a746761b37ace214540bebb59dbaafe2e8072de732be396b474648e7e197de422466ee
 EBUILD fail2ban-9999.ebuild 3668 BLAKE2B 3dd73b46392b5b5acae89aa0da2a3c1dcfad025462a9ec459e64cf5cebccdced2464e1be7a14d360b53a018c8f829ee0f167c3756702b3b224d394fb455a3c56 SHA512 32d928b9c698b7c13e7d2f2d44934e7ff0b1722aba1fa8f7bb9ffa500e1eb6acd36d71d9c8073adea90c8fe8c7797c3272bb99930142634c5bbd5f6dac6b794a
 MISC metadata.xml 357 BLAKE2B a5dee8c760b80bbfad6bca9a7adae797eda34b9db80716db8842c6813b4ed25ed4707290756dc869a7db4163de1ff6114c1995fcc2c485df1bcc6cad9c9a8f14 SHA512 9877a507bd3617c33351036317c5dc7855a1024d8f04f76a57edb93bd80e62b2b7c4f35784f447e94497305eab33246ae5913ba36ea001aa9068d1f91aeee9f0
diff --git a/net-analyzer/fail2ban/fail2ban-0.11.2-r4.ebuild b/net-analyzer/fail2ban/fail2ban-0.11.2-r4.ebuild
deleted file mode 100644
index ffabcf3a0b71..000000000000
--- a/net-analyzer/fail2ban/fail2ban-0.11.2-r4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-DISTUTILS_SINGLE_IMPL=1
-
-inherit bash-completion-r1 distutils-r1 systemd tmpfiles
-
-DESCRIPTION="Scans log files and bans IPs that show malicious signs"
-HOMEPAGE="https://www.fail2ban.org/"
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/${PN}/${PN}"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ppc ppc64 sparc x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux systemd"
-
-RDEPEND="
-	virtual/logger
-	virtual/mta
-	selinux? ( sec-policy/selinux-fail2ban )
-	systemd? (
-		$(python_gen_cond_dep '
-			|| (
-				dev-python/python-systemd[${PYTHON_USEDEP}]
-				sys-apps/systemd[python(-),${PYTHON_USEDEP}]
-			)' 'python*' )
-	)
-"
-
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${P}-fix-tests-for-2021.patch
-	"${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch
-	"${FILESDIR}"/${P}-fix-2to3-usage.patch
-	"${FILESDIR}"/${P}-fix-systemd-test.patch
-	"${FILESDIR}"/${P}-fix-py3.10-collections.patch
-	"${FILESDIR}"/${P}-upstream-openrc.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Replace /var/run with /run, but not in the top source directory
-	find . -mindepth 2 -type f -exec \
-		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
-}
-
-python_compile() {
-	./fail2ban-2to3 || die
-	distutils-r1_python_compile
-}
-
-python_test() {
-	bin/fail2ban-testcases \
-		--no-network \
-		--no-gamin \
-		--verbosity=4 || die "Tests failed with ${EPYTHON}"
-
-	# Workaround for bug #790251
-	rm -r fail2ban.egg-info || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die
-
-	newconfd files/fail2ban-openrc.conf ${PN}
-
-	# These two are placed in the ${BUILD_DIR} after being "built"
-	# in install_scripts().
-	newinitd "${BUILD_DIR}/fail2ban-openrc.init" "${PN}"
-	systemd_dounit "${BUILD_DIR}/${PN}.service"
-
-	dotmpfiles files/${PN}-tmpfiles.conf
-
-	doman man/*.{1,5}
-
-	# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
-	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
-	insinto /etc/logrotate.d
-	newins files/${PN}-logrotate ${PN}
-
-	keepdir /var/lib/${PN}
-
-	newbashcomp files/bash-completion ${PN}-client
-	bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-0.7"
-	previous_less_than_0_7=$?
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}-tmpfiles.conf
-
-	if [[ ${previous_less_than_0_7} = 0 ]] ; then
-		elog
-		elog "Configuration files are now in /etc/fail2ban/"
-		elog "You probably have to manually update your configuration"
-		elog "files before restarting Fail2Ban!"
-		elog
-		elog "Fail2Ban is not installed under /usr/lib anymore. The"
-		elog "new location is under /usr/share."
-		elog
-		elog "You are upgrading from version 0.6.x, please see:"
-		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
-	fi
-
-	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin ; then
-		elog "For most jail.conf configurations, it is recommended you install either"
-		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
-		elog "to control how log file modifications are detected"
-	fi
-
-	if ! has_version dev-lang/python[sqlite] ; then
-		elog "If you want to use ${PN}'s persistent database, then reinstall"
-		elog "dev-lang/python with USE=sqlite. If you do not use the"
-		elog "persistent database feature, then you should set"
-		elog "dbfile = :memory: in fail2ban.conf accordingly."
-	fi
-
-	if has_version sys-apps/systemd[-python] ; then
-		elog "If you want to track logins through sys-apps/systemd's"
-		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
-	fi
-}
diff --git a/net-analyzer/fail2ban/fail2ban-1.0.1.ebuild b/net-analyzer/fail2ban/fail2ban-1.0.1.ebuild
deleted file mode 100644
index cf108a52442c..000000000000
--- a/net-analyzer/fail2ban/fail2ban-1.0.1.ebuild
+++ /dev/null
@@ -1,133 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit bash-completion-r1 distutils-r1 systemd tmpfiles
-
-DESCRIPTION="Scans log files and bans IPs that show malicious signs"
-HOMEPAGE="https://www.fail2ban.org/"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/fail2ban/fail2ban"
-	inherit git-r3
-else
-	SRC_URI="https://github.com/fail2ban/fail2ban/archive/${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~sparc ~x86"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="selinux systemd"
-
-RDEPEND="
-	virtual/logger
-	virtual/mta
-	selinux? ( sec-policy/selinux-fail2ban )
-	systemd? (
-		$(python_gen_cond_dep '
-			|| (
-				dev-python/python-systemd[${PYTHON_USEDEP}]
-				sys-apps/systemd[python(-),${PYTHON_USEDEP}]
-			)' 'python*' )
-	)
-"
-
-DOCS=( ChangeLog DEVELOP README.md THANKS TODO doc/run-rootless.txt )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-0.11.2-adjust-apache-logs-paths.patch
-)
-
-python_prepare_all() {
-	distutils-r1_python_prepare_all
-
-	# Replace /var/run with /run, but not in the top source directory
-	find . -mindepth 2 -type f -exec \
-		sed -i -e 's|/var\(/run/fail2ban\)|\1|g' {} + || die
-}
-
-python_compile() {
-	./fail2ban-2to3 || die
-	distutils-r1_python_compile
-}
-
-python_test() {
-	bin/fail2ban-testcases \
-		--no-network \
-		--no-gamin \
-		--verbosity=4 || die "Tests failed with ${EPYTHON}"
-
-	# Workaround for bug #790251
-	rm -r fail2ban.egg-info || die
-}
-
-python_install_all() {
-	distutils-r1_python_install_all
-
-	rm -rf "${ED}"/usr/share/doc/${PN} "${ED}"/run || die
-
-	newconfd files/fail2ban-openrc.conf ${PN}
-
-	# These two are placed in the ${BUILD_DIR} after being "built"
-	# in install_scripts().
-	newinitd "${BUILD_DIR}/fail2ban-openrc.init" "${PN}"
-	systemd_dounit "${BUILD_DIR}/${PN}.service"
-
-	dotmpfiles files/${PN}-tmpfiles.conf
-
-	doman man/*.{1,5}
-
-	# Use INSTALL_MASK if you do not want to touch /etc/logrotate.d.
-	# See http://thread.gmane.org/gmane.linux.gentoo.devel/35675
-	insinto /etc/logrotate.d
-	newins files/${PN}-logrotate ${PN}
-
-	keepdir /var/lib/${PN}
-
-	newbashcomp files/bash-completion ${PN}-client
-	bashcomp_alias ${PN}-client ${PN}-server ${PN}-regex
-}
-
-pkg_preinst() {
-	has_version "<${CATEGORY}/${PN}-0.7"
-	previous_less_than_0_7=$?
-}
-
-pkg_postinst() {
-	tmpfiles_process ${PN}-tmpfiles.conf
-
-	if [[ ${previous_less_than_0_7} = 0 ]] ; then
-		elog
-		elog "Configuration files are now in /etc/fail2ban/"
-		elog "You probably have to manually update your configuration"
-		elog "files before restarting Fail2Ban!"
-		elog
-		elog "Fail2Ban is not installed under /usr/lib anymore. The"
-		elog "new location is under /usr/share."
-		elog
-		elog "You are upgrading from version 0.6.x, please see:"
-		elog "http://www.fail2ban.org/wiki/index.php/HOWTO_Upgrade_from_0.6_to_0.8"
-	fi
-
-	if ! has_version dev-python/pyinotify && ! has_version app-admin/gamin ; then
-		elog "For most jail.conf configurations, it is recommended you install either"
-		elog "dev-python/pyinotify or app-admin/gamin (in order of preference)"
-		elog "to control how log file modifications are detected"
-	fi
-
-	if ! has_version dev-lang/python[sqlite] ; then
-		elog "If you want to use ${PN}'s persistent database, then reinstall"
-		elog "dev-lang/python with USE=sqlite. If you do not use the"
-		elog "persistent database feature, then you should set"
-		elog "dbfile = :memory: in fail2ban.conf accordingly."
-	fi
-
-	if has_version sys-apps/systemd[-python] ; then
-		elog "If you want to track logins through sys-apps/systemd's"
-		elog "journal backend, then reinstall sys-apps/systemd with USE=python"
-	fi
-}
diff --git a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-2to3-usage.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-2to3-usage.patch
deleted file mode 100644
index 9098d096e8ad..000000000000
--- a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-2to3-usage.patch
+++ /dev/null
@@ -1,109 +0,0 @@
-https://github.com/fail2ban/fail2ban/commit/7f22c4873aed3b5ffce0953f079f3c1977297c9a
-https://github.com/fail2ban/fail2ban/commit/5ac303df8a171f748330d4c645ccbf1c2c7f3497
-https://github.com/fail2ban/fail2ban/commit/d6b884f3b72b8a42b21da863836569ef6836c2ea
-https://github.com/fail2ban/fail2ban/issues/3098
-https://bugs.gentoo.org/818733
-
-From: "Sergey G. Brester" <serg.brester@sebres.de>
-Date: Sun, 19 Sep 2021 18:36:02 +0200
-Subject: [PATCH] remove 2to3 in setup (should be called outside before setup)
-
---- a/setup.py
-+++ b/setup.py
-@@ -39,14 +39,6 @@
- if setuptools is None:
- 	from distutils.command.install import install
- 	from distutils.command.install_scripts import install_scripts
--try:
--	# python 3.x
--	from distutils.command.build_py import build_py_2to3
--	from distutils.command.build_scripts import build_scripts_2to3
--	_2to3 = True
--except ImportError:
--	# python 2.x
--	_2to3 = False
- 
- import os
- from os.path import isfile, join, isdir, realpath
-
-From: sebres <info@sebres.de>
-Date: Sun, 19 Sep 2021 18:49:18 +0200
-Subject: [PATCH] fix gh-3098: build fails with error in fail2ban setup
- command: use_2to3 is invalid (setuptools 58+)
-
---- a/setup.py
-+++ b/setup.py
-@@ -48,7 +48,7 @@
- from glob import glob
- 
- from fail2ban.setup import updatePyExec
--
-+from fail2ban.version import version
- 
- source_dir = os.path.realpath(os.path.dirname(
- 	# __file__ seems to be overwritten sometimes on some python versions (e.g. bug of 2.6 by running under cProfile, etc.):
-@@ -112,22 +112,12 @@ def update_scripts(self, dry_run=False):
- # Wrapper to specify fail2ban own options:
- class install_command_f2b(install):
- 	user_options = install.user_options + [
--		('disable-2to3', None, 'Specify to deactivate 2to3, e.g. if the install runs from fail2ban test-cases.'),
- 		('without-tests', None, 'without tests files installation'),
- 	]
- 	def initialize_options(self):
--		self.disable_2to3 = None
- 		self.without_tests = not with_tests
- 		install.initialize_options(self)
- 	def finalize_options(self):
--		global _2to3
--		## in the test cases 2to3 should be already done (fail2ban-2to3):
--		if self.disable_2to3:
--			_2to3 = False
--		if _2to3:
--			cmdclass = self.distribution.cmdclass
--			cmdclass['build_py'] = build_py_2to3
--			cmdclass['build_scripts'] = build_scripts_2to3
- 		if self.without_tests:
- 			self.distribution.scripts.remove('bin/fail2ban-testcases')
- 
-@@ -178,7 +168,6 @@ def run(self):
- if setuptools:
- 	setup_extra = {
- 		'test_suite': "fail2ban.tests.utils.gatherTests",
--		'use_2to3': True,
- 	}
- else:
- 	setup_extra = {}
-@@ -202,9 +191,6 @@ def run(self):
- 		('/usr/share/doc/fail2ban', doc_files)
- 	)
- 
--# Get version number, avoiding importing fail2ban.
--# This is due to tests not functioning for python3 as 2to3 takes place later
--exec(open(join("fail2ban", "version.py")).read())
- 
- setup(
- 	name = "fail2ban",
-From: sebres <info@sebres.de>
-Date: Sun, 19 Sep 2021 18:52:34 +0200
-Subject: [PATCH] amend to fix gh-3098: no option `--disable-2to3` anymore
-
---- a/fail2ban/tests/misctestcase.py
-+++ b/fail2ban/tests/misctestcase.py
-@@ -111,7 +111,7 @@ def testSetupInstallDryRun(self):
- 		supdbgout = ' >/dev/null 2>&1' if unittest.F2B.log_level >= logging.DEBUG else '' # HEAVYDEBUG
- 		try:
- 			# try dry-run:
--			os.system("%s %s --dry-run install --disable-2to3 --root=%s%s"
-+			os.system("%s %s --dry-run install --root=%s%s"
- 					  % (sys.executable, self.setup , tmp, supdbgout))
- 			# check nothing was created:
- 			self.assertTrue(not os.listdir(tmp))
-@@ -127,7 +127,7 @@ def testSetupInstallRoot(self):
- 		# suppress stdout (and stderr) if not heavydebug
- 		supdbgout = ' >/dev/null' if unittest.F2B.log_level >= logging.DEBUG else '' # HEAVYDEBUG
- 		try:
--			self.assertEqual(os.system("%s %s install --disable-2to3 --root=%s%s"
-+			self.assertEqual(os.system("%s %s install --root=%s%s"
- 					  % (sys.executable, self.setup, tmp, supdbgout)), 0)
- 
- 			def strippath(l):
diff --git a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-py3.10-collections.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-py3.10-collections.patch
deleted file mode 100644
index 6cf4e194b089..000000000000
--- a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-py3.10-collections.patch
+++ /dev/null
@@ -1,33 +0,0 @@
---- a/fail2ban/server/action.py
-+++ b/fail2ban/server/action.py
-@@ -30,7 +30,7 @@ import tempfile
- import threading
- import time
- from abc import ABCMeta
--from collections import MutableMapping
-+from collections.abc import MutableMapping
- 
- from .failregex import mapTag2Opt
- from .ipdns import DNSUtils
---- a/fail2ban/server/actions.py
-+++ b/fail2ban/server/actions.py
-@@ -28,7 +28,7 @@ import logging
- import os
- import sys
- import time
--from collections import Mapping
-+from collections.abc import Mapping
- try:
- 	from collections import OrderedDict
- except ImportError:
---- a/fail2ban/server/jails.py
-+++ b/fail2ban/server/jails.py
-@@ -22,7 +22,7 @@ __copyright__ = "Copyright (c) 2004 Cyril Jaquier, 2013- Yaroslav Halchenko"
- __license__ = "GPL"
- 
- from threading import Lock
--from collections import Mapping
-+from collections.abc import Mapping
- 
- from ..exceptions import DuplicateJailException, UnknownJailException
- from .jail import Jail
diff --git a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-systemd-test.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-systemd-test.patch
deleted file mode 100644
index 865ce19912bb..000000000000
--- a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-systemd-test.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-https://github.com/fail2ban/fail2ban/pull/3037
-https://bugs.gentoo.org/794931
-
-From: Mike Gilbert <floppym@gentoo.org>
-Date: Tue, 8 Jun 2021 17:48:12 -0400
-Subject: [PATCH] tests: improve detection of readable systemd journal
-
-Look for system.journal in journal sub-directory.
-Add -readable to the find command.
-
-Bug: https://bugs.gentoo.org/794931
---- a/fail2ban/tests/filtertestcase.py
-+++ b/fail2ban/tests/filtertestcase.py
-@@ -1396,7 +1396,7 @@ def _getRuntimeJournal(self):
- 				# check one at at time until the first hit
- 				for systemd_var in 'system-runtime-logs', 'system-state-logs':
- 					tmp = Utils.executeCmd(
--						'find "$(systemd-path %s)" -name system.journal' % systemd_var,
-+						'find "$(systemd-path %s)/journal" -name system.journal -readable' % systemd_var,
- 						timeout=10, shell=True, output=True
- 					)
- 					self.assertTrue(tmp)
diff --git a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-tests-for-2021.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-tests-for-2021.patch
deleted file mode 100644
index 36193b181933..000000000000
--- a/net-analyzer/fail2ban/files/fail2ban-0.11.2-fix-tests-for-2021.patch
+++ /dev/null
@@ -1,50 +0,0 @@
-https://github.com/fail2ban/fail2ban/issues/2904
-
-From 747d4683221b5584f9663695fb48145689b42ceb Mon Sep 17 00:00:00 2001
-From: sebres <info@sebres.de>
-Date: Mon, 4 Jan 2021 02:42:38 +0100
-Subject: [PATCH] fixes century selector of %ExY and %Exy in datepattern for
- tests, considering interval from 2005 (alternate now) to now; + better
- grouping algorithm for resulting century RE
-
----
- fail2ban/server/strptime.py | 24 ++++++++++++++++++++++--
- 1 file changed, 22 insertions(+), 2 deletions(-)
-
-diff --git a/fail2ban/server/strptime.py b/fail2ban/server/strptime.py
-index 1464a96d1f..39fc795865 100644
---- a/fail2ban/server/strptime.py
-+++ b/fail2ban/server/strptime.py
-@@ -36,10 +36,30 @@ def _getYearCentRE(cent=(0,3), distance=3, now=(MyTime.now(), MyTime.alternateNo
- 	Thereby respect possible run in the test-cases (alternate date used there)
- 	"""
- 	cent = lambda year, f=cent[0], t=cent[1]: str(year)[f:t]
-+	def grp(exprset):
-+		c = None
-+		if len(exprset) > 1:
-+			for i in exprset:
-+				if c is None or i[0:-1] == c:
-+					c = i[0:-1]
-+				else:
-+					c = None
-+					break
-+			if not c:
-+				for i in exprset:
-+					if c is None or i[0] == c:
-+						c = i[0]
-+					else:
-+						c = None
-+						break
-+			if c:
-+				return "%s%s" % (c, grp([i[len(c):] for i in exprset]))
-+		return ("(?:%s)" % "|".join(exprset) if len(exprset[0]) > 1 else "[%s]" % "".join(exprset)) \
-+			if len(exprset) > 1 else "".join(exprset)
- 	exprset = set( cent(now[0].year + i) for i in (-1, distance) )
- 	if len(now) and now[1]:
--		exprset |= set( cent(now[1].year + i) for i in (-1, distance) )
--	return "(?:%s)" % "|".join(exprset) if len(exprset) > 1 else "".join(exprset)
-+		exprset |= set( cent(now[1].year + i) for i in xrange(-1, now[0].year-now[1].year+1, distance) )
-+	return grp(sorted(list(exprset)))
- 
- timeRE = TimeRE()
- 
diff --git a/net-analyzer/fail2ban/files/fail2ban-0.11.2-upstream-openrc.patch b/net-analyzer/fail2ban/files/fail2ban-0.11.2-upstream-openrc.patch
deleted file mode 100644
index bbe655124d36..000000000000
--- a/net-analyzer/fail2ban/files/fail2ban-0.11.2-upstream-openrc.patch
+++ /dev/null
@@ -1,247 +0,0 @@
-https://github.com/fail2ban/fail2ban/pull/2182
-
-diff --git a/MANIFEST b/MANIFEST
-index 48c751a0..c2df1e51 100644
---- a/MANIFEST
-+++ b/MANIFEST
-@@ -393,8 +393,8 @@ files/fail2ban.service.in
- files/fail2ban-tmpfiles.conf
- files/fail2ban.upstart
- files/gen_badbots
--files/gentoo-confd
--files/gentoo-initd
-+files/fail2ban-openrc.conf
-+files/fail2ban-openrc.init.in
- files/ipmasq-ZZZzzz_fail2ban.rul
- files/logwatch/fail2ban
- files/logwatch/fail2ban-0.8.log
-diff --git a/files/fail2ban-openrc.conf b/files/fail2ban-openrc.conf
-new file mode 100644
-index 00000000..9454ef68
---- /dev/null
-+++ b/files/fail2ban-openrc.conf
-@@ -0,0 +1,2 @@
-+# For available options, please run "fail2ban-server --help".
-+#FAIL2BAN_OPTIONS="-x"
-diff --git a/files/fail2ban-openrc.init.in b/files/fail2ban-openrc.init.in
-new file mode 100755
-index 00000000..2c56ee3a
---- /dev/null
-+++ b/files/fail2ban-openrc.init.in
-@@ -0,0 +1,86 @@
-+#!/sbin/openrc-run
-+# This file is part of Fail2Ban.
-+#
-+# Fail2Ban is free software; you can redistribute it and/or modify
-+# it under the terms of the GNU General Public License as published by
-+# the Free Software Foundation; either version 2 of the License, or
-+# (at your option) any later version.
-+#
-+# Fail2Ban is distributed in the hope that it will be useful,
-+# but WITHOUT ANY WARRANTY; without even the implied warranty of
-+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-+# GNU General Public License for more details.
-+#
-+# You should have received a copy of the GNU General Public License
-+# along with Fail2Ban; if not, write to the Free Software
-+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
-+#
-+# Author: Sireyessire, Cyril Jaquier
-+#
-+
-+description="Ban hosts that cause multiple authentication errors"
-+description_reload="reload configuration without dropping bans"
-+extra_started_commands="reload"
-+
-+# Can't (and shouldn't) be changed by the end-user.
-+#
-+# Note that @BINDIR@ is already supplied by the build system. Some
-+# day, it might be nice to have @RUNDIR@ supplied by the build system
-+# as well, so that we don't have to hard-code /run here.
-+FAIL2BAN_RUNDIR="/run/${RC_SVCNAME}"
-+FAIL2BAN_SOCKET="${FAIL2BAN_RUNDIR}/${RC_SVCNAME}.sock"
-+
-+# The fail2ban-client program is also capable of starting and stopping
-+# the server, but things are simpler if we let start-stop-daemon do it.
-+command="@BINDIR@/fail2ban-server"
-+pidfile="${FAIL2BAN_RUNDIR}/${RC_SVCNAME}.pid"
-+
-+# We force the pidfile/socket location in this service script because
-+# we're taking responsibility for ensuring that their parent directory
-+# exists and has the correct permissions (which we can't do if the
-+# user is allowed to change them).
-+command_args="${FAIL2BAN_OPTIONS} -p ${pidfile} -s ${FAIL2BAN_SOCKET}"
-+retry="30"
-+
-+depend() {
-+	use logger
-+	after iptables
-+}
-+
-+checkconfig() {
-+    "${command}" ${command_args} --test
-+}
-+
-+start_pre() {
-+	# If this isn't a restart, make sure that the user's config isn't
-+	# busted before we try to start the daemon (this will produce
-+	# better error messages than if we just try to start it blindly).
-+	#
-+	# If, on the other hand, this *is* a restart, then the stop_pre
-+	# action will have ensured that the config is usable and we don't
-+	# need to do that again.
-+	if [ "${RC_CMD}" != "restart" ] ; then
-+		checkconfig || return $?
-+	fi
-+	checkpath -d "${FAIL2BAN_RUNDIR}"
-+}
-+
-+stop_pre() {
-+	# If this is a restart, check to make sure the user's config
-+	# isn't busted before we stop the running daemon.
-+	if [ "${RC_CMD}" = "restart" ] ; then
-+		checkconfig || return $?
-+	fi
-+}
-+
-+reload() {
-+	# The fail2ban-client uses an undocumented protocol to tell
-+	# the server to reload(), so we have to use it here rather
-+	# than e.g. sending a signal to the server daemon. Note that
-+	# the reload will fail (on the server side) if the new config
-+	# is invalid; we therefore don't need to test it ourselves
-+	# with checkconfig() before initiating the reload.
-+	ebegin "Reloading ${RC_SVCNAME}"
-+	"@BINDIR@/fail2ban-client" ${command_args} reload
-+	eend $? "Failed to reload ${RC_SVCNAME}"
-+}
-diff --git a/files/gentoo-confd b/files/gentoo-confd
-deleted file mode 100644
-index 00d19f8b..00000000
---- a/files/gentoo-confd
-+++ /dev/null
-@@ -1,8 +0,0 @@
--# Config file for /etc/init.d/fail2ban
--#
--# For information on options, see "/usr/bin/fail2ban-client -h".
--
--FAIL2BAN_OPTIONS=""
--
--# Force execution of the server even if the socket already exists:
--#FAIL2BAN_OPTIONS="-x"
-diff --git a/files/gentoo-initd b/files/gentoo-initd
-deleted file mode 100755
-index 0fb157cd..00000000
---- a/files/gentoo-initd
-+++ /dev/null
-@@ -1,60 +0,0 @@
--#!/sbin/openrc-run
--# This file is part of Fail2Ban.
--#
--# Fail2Ban is free software; you can redistribute it and/or modify
--# it under the terms of the GNU General Public License as published by
--# the Free Software Foundation; either version 2 of the License, or
--# (at your option) any later version.
--#
--# Fail2Ban is distributed in the hope that it will be useful,
--# but WITHOUT ANY WARRANTY; without even the implied warranty of
--# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--# GNU General Public License for more details.
--#
--# You should have received a copy of the GNU General Public License
--# along with Fail2Ban; if not, write to the Free Software
--# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
--#
--# Author: Sireyessire, Cyril Jaquier
--#
--
--description="Daemon to ban hosts that cause multiple authentication errors"
--description_reload="reload configuration"
--description_showlog="show fail2ban logs"
--extra_started_commands="reload showlog"
--
--FAIL2BAN="/usr/bin/fail2ban-client ${FAIL2BAN_OPTIONS}"
--
--depend() {
--	need net
--	need logger
--	after iptables
--}
--
--start() {
--	ebegin "Starting fail2ban"
--	mkdir -p /var/run/fail2ban || return 1
--	# remove stalled sock file after system crash
--	# bug 347477
--	rm -f /var/run/fail2ban/fail2ban.sock || return 1
--	start-stop-daemon --start --pidfile /var/run/fail2ban/fail2ban.pid \
--	-- ${FAIL2BAN} start
--	eend $? "Failed to start fail2ban"
--}
--
--stop() {
--	ebegin "Stopping fail2ban"
--	start-stop-daemon --stop --pidfile /var/run/fail2ban/fail2ban.pid --retry 30 \
--	-- ${FAIL2BAN} stop
--	eend $? "Failed to stop fail2ban"
--}
--
--reload() {
--	ebegin "Reloading fail2ban"
--	${FAIL2BAN} reload
--	eend $? "Failed to reload fail2ban"
--}
--
--showlog(){
--	less /var/log/fail2ban.log
--}
-diff --git a/setup.py b/setup.py
-index 98413273..91f71cf2 100755
---- a/setup.py
-+++ b/setup.py
-@@ -89,24 +89,27 @@ class install_scripts_f2b(install_scripts):
- 			if install_dir.startswith(root):
- 				install_dir = install_dir[len(root):]
- 		except: # pragma: no cover
--			print('WARNING: Cannot find root-base option, check the bin-path to fail2ban-scripts in "fail2ban.service".')
--		print('Creating %s/fail2ban.service (from fail2ban.service.in): @BINDIR@ -> %s' % (buildroot, install_dir))
--		with open(os.path.join(source_dir, 'files/fail2ban.service.in'), 'r') as fn:
--			lines = fn.readlines()
--		fn = None
--		if not dry_run:
--			fn = open(os.path.join(buildroot, 'fail2ban.service'), 'w')
--		try:
--			for ln in lines:
--				ln = re.sub(r'@BINDIR@', lambda v: install_dir, ln)
--				if dry_run:
--					sys.stdout.write(' | ' + ln)
--					continue
--				fn.write(ln)
--		finally:
--			if fn: fn.close()
--		if dry_run:
--			print(' `')
-+			print('WARNING: Cannot find root-base option, check the bin-path to fail2ban-scripts in "fail2ban.service" and "fail2ban-openrc.init".')
-+
-+		scripts = ['fail2ban.service', 'fail2ban-openrc.init']
-+		for script in scripts:
-+			print('Creating %s/%s (from %s.in): @BINDIR@ -> %s' % (buildroot, script, script, install_dir))
-+			with open(os.path.join(source_dir, 'files/%s.in' % script), 'r') as fn:
-+				lines = fn.readlines()
-+			fn = None
-+			if not dry_run:
-+				fn = open(os.path.join(buildroot, script), 'w')
-+			try:
-+				for ln in lines:
-+					ln = re.sub(r'@BINDIR@', lambda v: install_dir, ln)
-+					if dry_run:
-+						sys.stdout.write(' | ' + ln)
-+						continue
-+					fn.write(ln)
-+			finally:
-+				if fn: fn.close()
-+			if dry_run:
-+				print(' `')
- 
- 
- # Wrapper to specify fail2ban own options:
diff --git a/net-analyzer/tcpdump/Manifest b/net-analyzer/tcpdump/Manifest
index 1c0afb545066..926c11107e02 100644
--- a/net-analyzer/tcpdump/Manifest
+++ b/net-analyzer/tcpdump/Manifest
@@ -3,6 +3,5 @@ AUX tcpdump-9999-libdir.patch 505 BLAKE2B 903bbbd4d860053168c92a3bf2ef76bf8ab32a
 DIST tcpdump-4.99.1-upstream.tar.gz 2014324 BLAKE2B 0a10fe68afdfe80d3e7e661352fcaf1c47702df27fbed959f52fb0ec81543a1d4ce6b0de16a8b081de48dd43e09a13f5e1f0fb11d7590f92cbff29dc511bea12 SHA512 53d31355e1a6ef5a65bb3bf72454169fc80adf973a327a5768840e6ccf0550fbeb3c8a41f959635076d871df0619680321910a3a97879607f481cdaa8b7ceda7
 DIST tcpdump-4.99.1-upstream.tar.gz.sig 442 BLAKE2B 9a80b1796ef777bd06d0b8953fe1ff446431d0ff1dffcd58e29a0b771f6734f70f3f0da7c36a1eaa1b6e57719d79c601872a84b7734208a7e8951cad9aca86ee SHA512 b438643701efbbb5579d9d51ed48756a47dd644e0acb10b0edff6d04f3ae4cea6528b40820a656407b73f983b2a634e0165a6c8c0fca3b557394a14e2f2384ab
 EBUILD tcpdump-4.99.1-r1.ebuild 2381 BLAKE2B ff478905635a0873ef9c13e27716e4eff5eb733fc4984904458e8400898161474a33aea7aacf3b0b108feb98e283af845e1be8e2a66d36ca9e046fe123833372 SHA512 1ff9d8b7ccd4929d61d48d1f2b7cb5cf2055bfeccd91634664be803d337cad8e5a412dce88ae59a9c26deb6c6bf0ae88197d9152e79b57db3f5dfbd9c1e82349
-EBUILD tcpdump-4.99.1.ebuild 2329 BLAKE2B 4dc8d991e0d6b479565d8fe7d59f9f6cf519b65a22226cf0ec25447f640ac9237b4db65cf92cb2f0462c9c6eb17d7c441b0c7649a782100ba5a983cfaf2fe182 SHA512 d4122ee6542f6555f85a6609b8ec787b3e3362c8037e234691d1039a19204f555b2e08a43e2c4f316245812d8296762dd8d8e9207e38c573cbbfc77192a2be80
 EBUILD tcpdump-9999.ebuild 2133 BLAKE2B 2a41983b9ed30850a6dfcc5a91da5faaefaf0afbd88d4a98f6d3555c30fb6cbabc28c060c7f4405bdece1617fae374a1b38c945cb6565682da5718914ea6ac81 SHA512 f20fe488b097c450be2623d3fede6aabd49f1a463753c03a61cbf361f9aa4e07ae4430ae863927ca56dc6a74204874f131584fcc0b25702a6125e2ca53d00402
 MISC metadata.xml 701 BLAKE2B 0e637bc6e801996414b02cc17023641e07a7b81c4b50b6535fd4668f3fc7e3750f3cfa2e138e5c3c5d1fce8b2b89543f99cbee499c0ecf0960862e5a6f5c86bd SHA512 f891a980cb348222d83103a746354374beef485d9072cfe61eb1a6285dd5b282200490ffe8c7b953ef30958316e12a24dfe86b0c11bf7b7519c61f68d0f27737
diff --git a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild b/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
deleted file mode 100644
index 6dc1d3f43826..000000000000
--- a/net-analyzer/tcpdump/tcpdump-4.99.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit autotools
-
-DESCRIPTION="A tool for network monitoring and data acquisition"
-HOMEPAGE="https://www.tcpdump.org/ https://github.com/the-tcpdump-group/tcpdump"
-
-if [[ ${PV} == *9999* ]] ; then
-	inherit git-r3
-
-	EGIT_REPO_URI="https://github.com/the-tcpdump-group/tcpdump"
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/tcpdump.asc
-	inherit verify-sig
-
-	# Note: drop -upstream on bump, this is just because we switched to the official
-	# distfiles for verify-sig
-	SRC_URI="https://www.tcpdump.org/release/${P}.tar.gz -> ${P}-upstream.tar.gz"
-	SRC_URI+=" verify-sig? ( https://www.tcpdump.org/release/${P}.tar.gz.sig -> ${P}-upstream.tar.gz.sig )"
-
-	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="+drop-root +smi +ssl +samba suid test"
-REQUIRED_USE="test? ( samba )"
-
-RESTRICT="!test? ( test )"
-# Assorted failures: bug #768498
-#RESTRICT="test"
-
-RDEPEND="
-	>=net-libs/libpcap-1.10.1
-	drop-root? (
-		acct-group/pcap
-		acct-user/pcap
-		sys-libs/libcap-ng
-	)
-	smi? ( net-libs/libsmi )
-	ssl? (
-		>=dev-libs/openssl-0.9.6m:0=
-	)
-	suid? (
-		acct-group/pcap
-		acct-user/pcap
-	)
-"
-DEPEND="
-	${RDEPEND}
-	test? (
-		dev-lang/perl
-	)
-"
-BDEPEND="drop-root? ( virtual/pkgconfig )"
-
-if [[ ${PV} != *9999* ]] ; then
-	BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-tcpdump )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-9999-libdir.patch
-)
-
-src_prepare() {
-	default
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		$(use_enable samba smb) \
-		$(use_with drop-root cap-ng) \
-		$(use_with drop-root chroot '') \
-		$(use_with smi) \
-		$(use_with ssl crypto "${ESYSROOT}/usr") \
-		$(usex drop-root "--with-user=pcap" "")
-}
-
-src_test() {
-	if [[ ${EUID} -ne 0 ]] || ! use drop-root ; then
-		emake check
-	else
-		ewarn "If you want to run the test suite, make sure you either"
-		ewarn "set FEATURES=userpriv or set USE=-drop-root"
-	fi
-}
-
-src_install() {
-	dosbin tcpdump
-	doman tcpdump.1
-	dodoc *.awk
-	dodoc CHANGES CREDITS README.md
-
-	if use suid ; then
-		fowners root:pcap /usr/sbin/tcpdump
-		fperms 4110 /usr/sbin/tcpdump
-	fi
-}
-
-pkg_postinst() {
-	use suid && elog "To let normal users run tcpdump, add them to the pcap group."
-}
diff --git a/net-analyzer/vnstat/Manifest b/net-analyzer/vnstat/Manifest
index d2cdec1be594..ead59b7a560b 100644
--- a/net-analyzer/vnstat/Manifest
+++ b/net-analyzer/vnstat/Manifest
@@ -6,9 +6,6 @@ AUX vnstatd.systemd 262 BLAKE2B e54c30a1bfa6c7a8bba32fa93c3d2417506c55e949975441
 AUX vnstatd.tmpfile 35 BLAKE2B c56373ebe1abe1111f6927839d79094b6ffd11527ce4e21016c31fc227f9564218ca479455b7cf4eb697d18d8389ba65266b91d71c5bf22c83a9337ae1d861d9 SHA512 e13b52e3c4fe8743074ab2704b6a6cbe0c855589fe19e05bba98f0193473437f350dfdc9675689172c54ed83491d9caef0cbb842f6c2533b98366cd78a4f0bac
 DIST vnstat-2.10.tar.gz 304464 BLAKE2B 82fcb54cf00a8122f31dc27f41f830ef68b92452bf7ae22bf2f1be13a1526bd12e8365002edef7766156f2df15472b189b3f219074532cb00a81156775b08997 SHA512 86c761290ec059a3252049b4f2a0a2aecdd7f8c159ee3db904339b1a9b14157a2125b919dd52754a29320ccdb41c89739bca78548b5a44b158b493f48be24a78
 DIST vnstat-2.10.tar.gz.asc 833 BLAKE2B bb3b7ef9d52c7ba4e8fb3ae7c8693e36803374c0ced0a0d6c4c16c8ca554290ab805e6f732ea2d188d78246e34b7a747673cf99725fcb74f65192cba1fbaeac4 SHA512 2b3c0f381bad8ce542cc0fa287a7a9a16f4381a8aecb342dbb5622464131a7c7cdbf01cb12f5b75964d0e2b6792d28e37f4f8e6ca607cb8122462013b0077773
-DIST vnstat-2.9.tar.gz 300796 BLAKE2B 1671fe49f3add0087431b57aaa69d4c6280066a299e6899c00cd5bf6ec21380d1457295f884f683ebfb89959eea08a9d900e898a865e3f6ff2a82ecf354d974a SHA512 883f273c02f6d91478991d95deffba9d90457a1bb0b9dd818c01398365df97ffb72dda88299231d9076756192b05524b6f8820470c9caf6ee6a12e5914a82176
-DIST vnstat-2.9.tar.gz.asc 833 BLAKE2B 4dd17e02e6c0c5232354ea8c4dea1d86ac43015ac66c60dc227b143aa5352e5a1eb0870932662778b2350928b124e2bbc56dfa13cfe7c2fd74538d84c00f9b4c SHA512 bf57974afb028fef7ec311a15bb1dcf275f10b845c5512efe73711b622b5912c4de0ff0553db4152389d2421a468c888191eab8fca08212e164f997ad1e04778
 EBUILD vnstat-2.10.ebuild 1980 BLAKE2B 5f079567a4a08e734f68d419ade7a73f501b85d3da8189ba773fe3a4c25dcd384231bf24a7a5290dfe0c72603dfa74c1e4ea6cfb7f7e54a53d8ecdadcfb7a1cb SHA512 d7be34a5776aac20e908e3727571745f70359e6ce8d5c3890011c0f32c440f6bd4b05496e98b5575cd307304e646cbe62f25f69f04d150b73d00e8b2ad1a4de7
-EBUILD vnstat-2.9.ebuild 1815 BLAKE2B 9be3168b107e6104b5cffba20c184deb102d1d0e0c65fe801c6d00924ff22b53f560b5a746babc84a16818b0c02ceed587036cdcbae0895a1ef79150283491e5 SHA512 ef0dadfb970c72a758faded22a3dde9c229c9e9a69ae4ae39dae6567873add83432ea097f07faab68b5c82a375c0daf32775fb5e882043cdc46cc0d3b237411f
 EBUILD vnstat-9999.ebuild 1988 BLAKE2B f6a1eec6f4af0fed11eb24ec5ea5d77572b8e58e70a5098d3508c974b776cbe152ee4a80ea36adeb13d86e96fefe3b456aa64df4cbda0d00b0f2a622cf70458d SHA512 c0cdb810fe2560b1713258e7980a478a79ff5231f2d786ca750de972978e19b7cc716c366cdee7a97209e67a988c7ed2dff564b500764dd41f81d4693fdce579
 MISC metadata.xml 836 BLAKE2B f87c7da72d6510825ef2a437e02a0b29febae258debbf922885923aac4032eda5f122f29d6f0d0cf4c9876fdba09b030246f851083ae424ec1859073273e0e30 SHA512 21e9f14e00563ea52ebe117d0b80739566d043956c16cc95ad7a67bf9df6360e96ad700d2c739ab20ae2dc2c321432f5c98b67c5cc59853b1fdced8ca70fce01
diff --git a/net-analyzer/vnstat/vnstat-2.9.ebuild b/net-analyzer/vnstat/vnstat-2.9.ebuild
deleted file mode 100644
index b2186d2f4e6a..000000000000
--- a/net-analyzer/vnstat/vnstat-2.9.ebuild
+++ /dev/null
@@ -1,84 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd tmpfiles
-
-DESCRIPTION="Console-based network traffic monitor that keeps statistics of network usage"
-HOMEPAGE="https://humdi.net/vnstat/"
-
-if [[ ${PV} == *9999 ]] ; then
-	EGIT_REPO_URI="https://github.com/vergoh/vnstat"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/teemutoivola.asc
-	inherit verify-sig
-
-	SRC_URI="https://humdi.net/vnstat/${P}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://humdi.net/vnstat/${P}.tar.gz.asc )"
-
-	KEYWORDS="amd64 arm arm64 hppa ~mips ppc ppc64 ~riscv sparc x86"
-
-	BDEPEND="verify-sig? ( sec-keys/openpgp-keys-teemutoivola )"
-fi
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="gd selinux test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	acct-group/vnstat
-	acct-user/vnstat
-	dev-db/sqlite
-	gd? ( media-libs/gd[png] )
-"
-DEPEND="
-	${RDEPEND}
-	test? ( dev-libs/check )
-"
-RDEPEND+=" selinux? ( sec-policy/selinux-vnstatd )"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.9-conf.patch
-)
-
-src_compile() {
-	emake \
-		${PN} \
-		${PN}d \
-		$(usex gd ${PN}i '')
-}
-
-src_install() {
-	use gd && dobin vnstati
-	dobin vnstat vnstatd
-
-	exeinto /usr/share/${PN}
-	newexe "${FILESDIR}"/vnstat.cron-r1 vnstat.cron
-
-	insinto /etc
-	doins cfg/vnstat.conf
-	fowners root:vnstat /etc/vnstat.conf
-
-	keepdir /var/lib/vnstat
-	fowners vnstat:vnstat /var/lib/vnstat
-
-	newconfd "${FILESDIR}"/vnstatd.confd-r1 vnstatd
-	newinitd "${FILESDIR}"/vnstatd.initd-r2 vnstatd
-
-	systemd_newunit "${FILESDIR}"/vnstatd.systemd vnstatd.service
-	newtmpfiles "${FILESDIR}"/vnstatd.tmpfile vnstatd.conf
-
-	use gd && doman man/vnstati.1
-
-	doman man/vnstat.1 man/vnstatd.8
-
-	newdoc INSTALL README.setup
-	dodoc CHANGES README UPGRADE FAQ examples/vnstat.cgi
-}
-
-pkg_postinst() {
-	tmpfiles_process vnstatd.conf
-}
diff --git a/net-firewall/Manifest.gz b/net-firewall/Manifest.gz
index a48884a59d6e..deb87bcff1dc 100644
--- a/net-firewall/Manifest.gz
+++ b/net-firewall/Manifest.gz
diff --git a/net-firewall/firewalld/Manifest b/net-firewall/firewalld/Manifest
index 71730ad67565..f13f7c8f7854 100644
--- a/net-firewall/firewalld/Manifest
+++ b/net-firewall/firewalld/Manifest
@@ -1,11 +1,7 @@
 AUX firewalld.init 250 BLAKE2B 1c0f690e24313037b801902aa772a9d1cb6889a05f142bc3d84602002ef053cd059b5193983f9fe6d89065a070a566a6a9ba8212a092435953ebed80ea7c7b40 SHA512 457cda01449f38563e98e1db937fe1c50745eab91797f52687e3ab9f5d94dd42d129740ae6669e99666a3f096d631dd3a44e66010b638b31b9c6ba798362403e
 AUX firewalld.service 581 BLAKE2B b4eb7549305da68bc53f913d5d0a3ff2595e8e482ed2a474ede645f33b8192e142cd1aa964c5c1dcf8a7c336c68d494ee13421ec7566312a4f89330c236cab9c SHA512 b81fb8414619b3661985cbac001a47c76d76b13eebe421919a838fa0396e6470a3109e0d20d88f423ff43b6e48c0537467125a85bf8939ef0ab6ded4d4829b03
-DIST firewalld-1.1.1.tar.gz 1325362 BLAKE2B 0167d9bc1c76da420dfe8aa5e6bfdd743116fbe6959d5920b972fac09c72608c90b9d6b2bb4bd7bb01250cbab2bdbb30a017becf5d050f490f4f289661e4366a SHA512 ecf75c30be63d2285d0b915b26d20e679c2f45f121c37b8cecc236da02d21039c692d1fec72e6c29d2a7b6de570daad573c230deacaef7491a2fd39c35332479
-DIST firewalld-1.1.3.tar.gz 2124653 BLAKE2B 178afc1c76538abbc2927819f35a81a642aabe5d9139a7dde69c50e061e59ae9f362374cc0bbfb4e8ad25c99caf8e45ddd92f1709478afb109d700b16bf84e38 SHA512 5108b363017b947907f104fb361bcc85443fc1b523718d8e0883932cb212a447391c9cea8b1e3f69bb9cc1c3a05b9042a8b9d91798d1dd09d4d4a224c9ce9d71
 DIST firewalld-1.2.1.tar.gz 2142992 BLAKE2B 4d9763373bc5b35fd4e9a435669bfba148b8ba7054c3ebb1c24ac96739bb62fa6b424b8b95bd9a0394716a36df5e9c3f4b84efcf4ca2811661265f548eedacef SHA512 a9b2d7346291d0c54e850913f2d40a08d121d64df75ee87655fa2ee022ade908c762e5b6d372d4e8879eec1138f73635ee9398cdb3703efe67039769c5e2a42a
 DIST firewalld-1.2.2.tar.gz 2145443 BLAKE2B 495bbd79fdab6f84e97533654b1d2b378841f14a60052a816d399d0ac8c2e2fe588486fae00dceeab5a13f7e03b030ae6db71c27208da415773ad033f0ea4ea2 SHA512 1b37b2daedb818afa6fe9d1512bdeebe48e39c39f94926d8aa93837816c211e30760706f536d63f51407a493a17927568c47118218d935949e22a78f7821441c
-EBUILD firewalld-1.1.1.ebuild 5166 BLAKE2B 40802a29a71d688686acdb223f493c0ca2b5552416b5ffb5dad7ca75d5a8af433df72a289a57fd527a97ae6d33173db2059241f4951f0bbdfaceaa8ad734ab20 SHA512 d65f3b8c9c2aedd4d9ee76fb28bcd77e9eebfa23e326b05225e94f84ce9b9b7c6a0491da3ca867ab3c49bbac244aa3a8622b281e3ccfae321889e27a58ab9dfd
-EBUILD firewalld-1.1.3.ebuild 5260 BLAKE2B 96a6ecd9fcb8004a4166af3ee4e9eccc3d9c2c08d224b48120b220acbd6ed4cc5c7adec71c6911ff6bc51f685f811b314b3a5c2fedf6c15b94f30669f99f74c7 SHA512 0b39d406b770eb670c1ead767e8a9d5a14cb7905113820bd23923fd8b6a26280ce6602ff5c2fa11efcd6fe3df72002a3ffab9315e11f1bddb9afa42c0c3cae4b
 EBUILD firewalld-1.2.1.ebuild 5225 BLAKE2B 8c65782c6d4e0b1a36e5c81ad906a6d37cfa18f3903547b67cbf2537de3bf28ae7aa180583509059014125193acb3dde20836edb64e00b94080f4a8b5db6ef79 SHA512 23dc50770913de141cad9a4efdfe0bb2fb2c554926f4d4451f7d144d5102b0101fac61251260c47025dd33d69769e5786679f571138d9463ba38014f9fbf465c
 EBUILD firewalld-1.2.2.ebuild 5298 BLAKE2B bcbe3316d06113403d32fab9a4ef57fc1b74ee793cf6621ca3f49f204b73f1af72f51b208f043c819c31584ea4cac40cf60efd878e3a30bd28356f3400a4e554 SHA512 171ef5cda5e526902093e94513bc99edb615460a3f24e07fbb808b87e39ba2911e551802e298e379a6023c5cdffd2f2fe9ee815d68ffe9f7092a712d932f42ce
 MISC metadata.xml 671 BLAKE2B 69c4bda7cc74a243aa1738bed90d16a3bc2c2085f6c0718becc7797a68da63035ef4d4f5e59c0583987d54032c163df6052d012fb7ca49026ca7259088793d33 SHA512 dd2d482251a4e33cb12ba324e1a21b4758f82de83c0cf83d5fa6259444c272360b47c5666e596103eba4703183fc9864a6bbb07a254aba67146b89d9870e9bbe
diff --git a/net-firewall/firewalld/firewalld-1.1.1.ebuild b/net-firewall/firewalld/firewalld-1.1.1.ebuild
deleted file mode 100644
index 44aacd0abb81..000000000000
--- a/net-firewall/firewalld/firewalld-1.1.1.ebuild
+++ /dev/null
@@ -1,214 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8,9,10} )
-inherit autotools bash-completion-r1 gnome2-utils linux-info optfeature plocale python-single-r1 systemd xdg-utils
-
-DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
-HOMEPAGE="https://firewalld.org/"
-SRC_URI="https://github.com/${PN}/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="${PYTHON_DEPS}
-	iptables? (
-		net-firewall/iptables[ipv6(+)]
-		net-firewall/ebtables
-		net-firewall/ipset
-		nftables? ( net-firewall/nftables[xtables(+)] )
-	)
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gui? (
-			x11-libs/gtk+:3
-			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-		)
-		nftables? ( >=net-firewall/nftables-0.9.4[python,json] )
-	')"
-DEPEND="${RDEPEND}
-	dev-libs/glib:2"
-BDEPEND="app-text/docbook-xml-dtd
-	>=dev-util/intltool-0.35
-	sys-devel/gettext"
-
-RESTRICT="test" # bug 650760
-
-# Testsuite's Makefile.am calls missing(!)
-# ... but this seems to be consistent with the autoconf docs?
-# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
-QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
-
-PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_COUNTER
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	eautoreconf
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local econf_args=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${econf_args[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-firewall/firewalld/firewalld-1.1.3.ebuild b/net-firewall/firewalld/firewalld-1.1.3.ebuild
deleted file mode 100644
index 8c5ed2edc597..000000000000
--- a/net-firewall/firewalld/firewalld-1.1.3.ebuild
+++ /dev/null
@@ -1,219 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-inherit bash-completion-r1 gnome2-utils linux-info optfeature plocale python-single-r1 systemd xdg-utils
-
-DESCRIPTION="A firewall daemon with D-Bus interface providing a dynamic firewall"
-HOMEPAGE="https://firewalld.org/"
-SRC_URI="https://github.com/firewalld/firewalld/releases/download/v${PV}/${P}.tar.gz"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ppc64 ~riscv x86"
-IUSE="gui +nftables +iptables test"
-# Tests previously restricted for bug #650760
-RESTRICT="!test? ( test ) test? ( userpriv )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-RDEPEND="
-	${PYTHON_DEPS}
-	|| ( >=sys-apps/openrc-0.11.5 sys-apps/systemd )
-	$(python_gen_cond_dep '
-		dev-python/dbus-python[${PYTHON_USEDEP}]
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-		gui? (
-			dev-python/PyQt5[gui,widgets,${PYTHON_USEDEP}]
-			x11-libs/gtk+:3
-		)
-		nftables? ( >=net-firewall/nftables-0.9.4[python,json] )
-	')
-	iptables? (
-		net-firewall/ebtables
-		net-firewall/ipset
-		net-firewall/iptables[ipv6(+)]
-		nftables? ( net-firewall/nftables[xtables(+)] )
-	)
-"
-DEPEND="
-	${RDEPEND}
-	dev-libs/glib:2
-"
-BDEPEND="
-	app-text/docbook-xml-dtd
-	>=dev-util/intltool-0.35
-	sys-devel/gettext
-	test? ( net-firewall/nftables )
-"
-
-# Testsuite's Makefile.am calls missing(!)
-# ... but this seems to be consistent with the autoconf docs?
-# Needs more investigation: https://www.gnu.org/software/autoconf/manual/autoconf-2.67/html_node/autom4te-Invocation.html
-QA_AM_MAINTAINER_MODE=".*--run autom4te --language=autotest.*"
-
-PLOCALES="ar as ast bg bn_IN ca cs da de el en_GB en_US es et eu fa fi fr gl gu hi hr hu ia id it ja ka kn ko lt ml mr nl or pa pl pt pt_BR ru si sk sq sr sr@latin sv ta te tr uk zh_CN zh_TW"
-
-pkg_setup() {
-	# See bug #830132 for the huge list
-	# We can probably narrow it down a bit but it's rather fragile
-	local CONFIG_CHECK="~NF_CONNTRACK ~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER
-	~NETFILTER_ADVANCED
-	~NETFILTER_INGRESS
-	~NF_NAT_MASQUERADE
-	~NF_NAT_REDIRECT
-	~NF_TABLES_INET
-	~NF_TABLES_IPV4
-	~NF_TABLES_IPV6
-	~NF_CONNTRACK
-	~NF_CONNTRACK_BROADCAST
-	~NF_CONNTRACK_NETBIOS_NS
-	~NF_CONNTRACK_TFTP
-	~NF_CT_NETLINK
-	~NF_CT_NETLINK_HELPER
-	~NF_DEFRAG_IPV4
-	~NF_DEFRAG_IPV6
-	~NF_NAT
-	~NF_NAT_TFTP
-	~NF_REJECT_IPV4
-	~NF_REJECT_IPV6
-	~NF_SOCKET_IPV4
-	~NF_SOCKET_IPV6
-	~NF_TABLES
-	~NF_TPROXY_IPV4
-	~NF_TPROXY_IPV6
-	~IP_NF_FILTER
-	~IP_NF_IPTABLES
-	~IP_NF_MANGLE
-	~IP_NF_NAT
-	~IP_NF_RAW
-	~IP_NF_SECURITY
-	~IP_NF_TARGET_MASQUERADE
-	~IP_NF_TARGET_REJECT
-	~IP6_NF_FILTER
-	~IP6_NF_IPTABLES
-	~IP6_NF_MANGLE
-	~IP6_NF_NAT
-	~IP6_NF_RAW
-	~IP6_NF_SECURITY
-	~IP6_NF_TARGET_MASQUERADE
-	~IP6_NF_TARGET_REJECT
-	~IP_SET
-	~NETFILTER_CONNCOUNT
-	~NETFILTER_NETLINK
-	~NETFILTER_NETLINK_OSF
-	~NETFILTER_NETLINK_QUEUE
-	~NETFILTER_SYNPROXY
-	~NETFILTER_XTABLES
-	~NETFILTER_XT_CONNMARK
-	~NETFILTER_XT_MATCH_CONNTRACK
-	~NETFILTER_XT_MATCH_MULTIPORT
-	~NETFILTER_XT_MATCH_STATE
-	~NETFILTER_XT_NAT
-	~NETFILTER_XT_TARGET_MASQUERADE
-	~NFT_COMPAT
-	~NFT_COUNTER
-	~NFT_CT
-	~NFT_FIB
-	~NFT_FIB_INET
-	~NFT_FIB_IPV4
-	~NFT_FIB_IPV6
-	~NFT_HASH
-	~NFT_LIMIT
-	~NFT_LOG
-	~NFT_MASQ
-	~NFT_NAT
-	~NFT_OBJREF
-	~NFT_QUEUE
-	~NFT_QUOTA
-	~NFT_REDIR
-	~NFT_REJECT
-	~NFT_REJECT_INET
-	~NFT_REJECT_IPV4
-	~NFT_REJECT_IPV6
-	~NFT_SOCKET
-	~NFT_SYNPROXY
-	~NFT_TPROXY
-	~NFT_TUNNEL
-	~NFT_XFRM"
-
-	# kernel >= 4.19 has unified a NF_CONNTRACK module, bug #692944
-	if kernel_is -lt 4 19; then
-		CONFIG_CHECK+=" ~NF_CONNTRACK_IPV4 ~NF_CONNTRACK_IPV6"
-	fi
-
-	# bug #831259
-	if kernel_is -le 5 4 ; then
-		CONFIG_CHECK+=" ~NF_TABLES_SET"
-	fi
-
-	linux-info_pkg_setup
-}
-
-src_prepare() {
-	default
-
-	plocale_find_changes "po" "" ".po" || die
-	plocale_get_locales | sed -e 's/ /\n/g' > po/LINGUAS
-}
-
-src_configure() {
-	python_setup
-
-	local myeconfargs=(
-		--enable-systemd
-		$(use_with iptables iptables "${EPREFIX}/sbin/iptables")
-		$(use_with iptables iptables_restore "${EPREFIX}/sbin/iptables-restore")
-		$(use_with iptables ip6tables "${EPREFIX}/sbin/ip6tables")
-		$(use_with iptables ip6tables_restore "${EPREFIX}/sbin/ip6tables-restore")
-		$(use_with iptables ebtables "${EPREFIX}/sbin/ebtables")
-		$(use_with iptables ebtables_restore "${EPREFIX}/sbin/ebtables-restore")
-		$(use_with iptables ipset "${EPREFIX}/usr/sbin/ipset")
-		--with-systemd-unitdir="$(systemd_get_systemunitdir)"
-		--with-bashcompletiondir="$(get_bashcompdir)"
-	)
-
-	econf "${myeconfargs[@]}"
-}
-
-src_install() {
-	default
-	python_optimize
-
-	# Get rid of junk
-	rm -rf "${D}/etc/sysconfig/" || die
-
-	# For non-gui installs we need to remove GUI bits
-	if ! use gui; then
-		rm -rf "${D}/etc/xdg/autostart" || die
-		rm -f "${D}/usr/bin/firewall-applet" || die
-		rm -f "${D}/usr/bin/firewall-config" || die
-		rm -rf "${D}/usr/share/applications" || die
-		rm -rf "${D}/usr/share/icons" || die
-	fi
-
-	newinitd "${FILESDIR}"/firewalld.init firewalld
-
-	# Our version drops the/an obsolete 'conflicts' line with old iptables services
-	# bug #833506
-	systemd_dounit "${FILESDIR}"/firewalld.service
-}
-
-pkg_preinst() {
-	gnome2_schemas_savelist
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-
-	# bug #833569
-	optfeature "changing zones with NetworkManager" gnome-extra/nm-applet
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-im/Manifest.gz b/net-im/Manifest.gz
index 9a02510bff73..23640e9932cb 100644
--- a/net-im/Manifest.gz
+++ b/net-im/Manifest.gz
diff --git a/net-im/discord-bin/Manifest b/net-im/discord-bin/Manifest
index 19b46afc0605..0629667764e9 100644
--- a/net-im/discord-bin/Manifest
+++ b/net-im/discord-bin/Manifest
@@ -1,3 +1,3 @@
-DIST discord-0.0.21.tar.gz 77529460 BLAKE2B 33281b155abe027965e0c6954fe582bce2135d650d46a473fc8b2d98ff74f4522fc60a502b3afb4385274ede4f7901cb9779efd0abfae2954d04834dd8ad282f SHA512 149ae5b8b7d92549e12eca52e45d3f5761ef022ae321cf33fadc3b56c4cee0616a5166380faea038256213713a7aa90e1befc4caa3e6a4de8e15c1cb1d8f925d
-EBUILD discord-bin-0.0.21-r1.ebuild 3815 BLAKE2B f80d35014beec420549387e8816846018e76c405208eca94b00321488c08e40e5d77c2023a7eef9964a2de947233be48633cebe62c134b960c347ce8e2edf005 SHA512 ea6e13c461190262108c9e2c974b1dd6da814bdb198791996d94aa821b31054c0fb42b80d0aa68e18da98b9901e82bdab5da7c219c46c1c0a9a7bb1dbdef898e
+DIST discord-0.0.22.tar.gz 77553233 BLAKE2B c0c9a5a9b088a3f619f498c345f46f5e43712c353f723427a1ffd95a2a66817e8d5e5298a8290d88df807251cc156db0e26ec1403ed4b3cba241b624d436346b SHA512 96c8486577bee7ae165bf96aab50c0733d83a2d9435357d9a4d9a3e9f3225ae6a7bf46e1a7d8b419ecc7ab4e270755332621a4f786ddb89a842379f5da40b271
+EBUILD discord-bin-0.0.22.ebuild 3815 BLAKE2B f80d35014beec420549387e8816846018e76c405208eca94b00321488c08e40e5d77c2023a7eef9964a2de947233be48633cebe62c134b960c347ce8e2edf005 SHA512 ea6e13c461190262108c9e2c974b1dd6da814bdb198791996d94aa821b31054c0fb42b80d0aa68e18da98b9901e82bdab5da7c219c46c1c0a9a7bb1dbdef898e
 MISC metadata.xml 521 BLAKE2B d35802fb6784e2029bd0478c24ec5d4c43f7183c4c94c3aea0c7c3e172855d1f4fe1ee5e163b7d5d1b41d2cdcf9bc5b9ecc56e4556e2ab8ffdc5503f19f0ee87 SHA512 3d0e4099b7881affc0a6e6cc6bb13d68a83df833db8def22d60d441f27ad576f88651f6f4133b82146e9e346cc646c2d347c517ec5e90d01118e1a1f9d2bdfa1
diff --git a/net-im/discord-bin/discord-bin-0.0.21-r1.ebuild b/net-im/discord-bin/discord-bin-0.0.22.ebuild
index e006e6ca8030..e006e6ca8030 100644
--- a/net-im/discord-bin/discord-bin-0.0.21-r1.ebuild
+++ b/net-im/discord-bin/discord-bin-0.0.22.ebuild
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 8d9613c9d304..6d48ec596a2a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/chrony/Manifest b/net-misc/chrony/Manifest
index be6c04ae8736..c2a2919137c6 100644
--- a/net-misc/chrony/Manifest
+++ b/net-misc/chrony/Manifest
@@ -11,7 +11,6 @@ DIST chrony-4.2.tar.gz.asc 833 BLAKE2B 41cb83f62dd58489313438672d209cc65fdbb5f8f
 DIST chrony-4.3.tar.gz 593560 BLAKE2B 51ba6d19312fd52cd6d6d8ab9437c886a3779877170674db6dc37d657e849101e2669fd6c8723d24e43c895cd1924c3d8d2ff442baeef9abe8a6c313929edf5f SHA512 1394bac3ed684352fe89b7fef7da50e61f9f522abee807627ae1fc4c2dde891017bc8e5b13759fced028f3a1e875d5e4e5a4f85de65c63b5f83d0ca03bb4c5df
 DIST chrony-4.3.tar.gz.asc 833 BLAKE2B 12399205da4ee5c442207bfdf936ac88552a49b21b0db8c15b09118b579e2076f7cfec6ad916b08b41edc4f9f8e03b13d7758ed08e116bee54d0f0f9cd68a505 SHA512 300b06f253ac3727edb86a1b7c337f9529ee752bbb471b266217b6a8ac5183e827264177a3210d436425d746673bf11fbdc41da145673213e28165197c6c76b7
 EBUILD chrony-4.2-r1.ebuild 6719 BLAKE2B 9dbf927768234a5e9f4a38463815395ae78b982c784cf25be1d6e78c0b268a6b9ed327d9de71505a4c1c4f158be50c15e6ecdff691369fb25f6ff664d73dce55 SHA512 12c3470d09c3b98f81649b8d16c58b53f9a2721540ae4fb376f4aea9a1f144540e0e415f94d08aceee9d69afddf1571855798c7ee175a278096f63fc32dcb0ab
-EBUILD chrony-4.3-r1.ebuild 6762 BLAKE2B cc0d5d8cd199f7400fcf0818e30bc5d48bce048e8abdbb538574c957a4b4ee8ea79c670f1bca4a0313cac51953d7640f7e43783db85a865866b522d64b2be8c4 SHA512 683a123f0d4eac1cb9df71a278f4b44ddcdd29137f9365dccdf98d3de45b56e997e378ef3b2d130087ceb5a485695573556469d4bc2914edcca4f01303b69c8c
-EBUILD chrony-4.3-r2.ebuild 6871 BLAKE2B b80da69db3a956e47f654e383e8db9c74ed03b193e24eedbba2c4d0b6df38ccfe78e5e1fe7147dbf1bc1b9fdaed56d0b92c5f32c7b454c98717970dadc749a3e SHA512 b2332ad5124c03ece64e8b9b0f88bb23fc2a19095a0cbeb682462467e1ec55c9885a3cb599935029392711897847796cfd72a5e0200ca389db3e429e415d33df
+EBUILD chrony-4.3-r2.ebuild 6866 BLAKE2B 0cd0e639f4fee4c174b08abf8e4490cc376f1ce8bd0c3134c5f7e6b88cef4753434087edf29d705a5740c21b523db0f0f686132d9349af2fe53f31fd6e8eacff SHA512 e9898c703d666c541b47f59ba3a5f0df94516a3d904bec4726efccc604de706fc05dc5e0ea73f4dd383a6c6d9425b47fa02e2e445051ab40c89225e82ccff1d9
 EBUILD chrony-9999.ebuild 6733 BLAKE2B cb8d7772b290da4aa82645073b2337a4f0684834e93d258ea5189708ad76d123d9401b6e0dd02a52277854e2a8bb3e26f3a323adb7359b0c2bc7d71c78934ca5 SHA512 8cbfeefb39b8cee35d02192aa09258c30a2204eba9ada5eb7b7e7c9707885bdb49ae550065ab8283a0482626f0826b625363793bf0f758c751cac06fb4f9a738
 MISC metadata.xml 2300 BLAKE2B 8d0e8822361fef70945eab4eb365fee2f0c278fb36ad0641520310bf895d04202fce88d485149d021ebf577ee848b408cf46f4141f8606ff020d2483370c3b16 SHA512 57c813c655fa7a5083f26f908d7476dd165284feef014c750e845c60830af7baffe91e9444915d3994b053498714b4e717bfe7a2af34e90de50d823542c913d0
diff --git a/net-misc/chrony/chrony-4.3-r1.ebuild b/net-misc/chrony/chrony-4.3-r1.ebuild
deleted file mode 100644
index 021c2b2f5fb2..000000000000
--- a/net-misc/chrony/chrony-4.3-r1.ebuild
+++ /dev/null
@@ -1,254 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit edo systemd tmpfiles toolchain-funcs
-
-DESCRIPTION="NTP client and server programs"
-HOMEPAGE="https://chrony.tuxfamily.org/ https://git.tuxfamily.org/chrony/chrony.git"
-
-if [[ ${PV} == 9999 ]] ; then
-	EGIT_REPO_URI="https://git.tuxfamily.org/chrony/chrony.git"
-	inherit git-r3
-else
-	VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/mlichvar.asc
-	inherit verify-sig
-
-	SRC_URI="https://download.tuxfamily.org/${PN}/${P/_/-}.tar.gz"
-	SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
-
-	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
-	fi
-fi
-
-S="${WORKDIR}/${P/_/-}"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+caps +cmdmon debug html ipv6 libedit libtomcrypt +nettle nss +ntp +nts +phc pps +refclock +rtc samba +seccomp +sechash selinux"
-# nettle > nss > libtomcrypt in configure
-REQUIRED_USE="
-	sechash? ( || ( nettle nss libtomcrypt ) )
-	nettle? ( !nss )
-	nss? ( !nettle )
-	libtomcrypt? ( !nettle !nss )
-	!sechash? ( !nss )
-	!sechash? ( !nts? ( !nettle ) )
-"
-
-DEPEND="
-	caps? (
-		acct-group/ntp
-		acct-user/ntp
-		sys-libs/libcap
-	)
-	libedit? ( dev-libs/libedit )
-	!libedit? ( sys-libs/readline:= )
-	nettle? ( dev-libs/nettle:= )
-	nss? ( dev-libs/nss:= )
-	nts? ( net-libs/gnutls:= )
-	pps? ( net-misc/pps-tools )
-	seccomp? ( sys-libs/libseccomp )
-"
-RDEPEND="
-	${DEPEND}
-	selinux? ( sec-policy/selinux-chronyd )
-"
-# bison dep only for 4.3-r1 for ${P}-strict-prototypes-clang16.patch
-BDEPEND="
-	sys-devel/bison
-	html? ( dev-ruby/asciidoctor )
-	nts? ( virtual/pkgconfig )
-	sechash? (
-		nettle? ( virtual/pkgconfig )
-		nss? ( virtual/pkgconfig )
-	)
-"
-
-if [[ ${PV} == 9999 ]] ; then
-	# Needed for doc generation in 9999
-	REQUIRED_USE+=" html"
-	BDEPEND+=" virtual/w3m"
-else
-	BDEPEND+=" verify-sig? ( >=sec-keys/openpgp-keys-mlichvar-20210513 )"
-fi
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.5-pool-vendor-gentoo.patch
-	"${FILESDIR}"/${PN}-4.2-systemd-gentoo.patch
-	"${FILESDIR}"/${P}-strict-prototypes-clang16.patch
-)
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e 's:/etc/chrony\.conf:/etc/chrony/chrony.conf:g' \
-		doc/* examples/* || die
-
-	cp "${FILESDIR}"/chronyd.conf-r3 "${T}"/chronyd.conf || die
-}
-
-src_configure() {
-	if ! use caps ; then
-		sed -i \
-			-e 's/ -u ntp//' \
-			"${T}"/chronyd.conf examples/chronyd.service || die
-	fi
-
-	if ! use seccomp ; then
-		sed -i \
-			-e 's/ -F 2//' \
-			"${T}"/chronyd.conf examples/chronyd.service || die
-	fi
-
-	tc-export CC PKG_CONFIG
-
-	# Update from time to time with output from "date +%s"
-	# on a system that is time-synced.
-	export SOURCE_DATE_EPOCH=1607976314
-
-	# Not an autotools generated script
-	local myconf=(
-		$(use_enable seccomp scfilter)
-
-		$(usex caps '' '--disable-linuxcaps')
-		$(usex cmdmon '' '--disable-cmdmon')
-		$(usex debug '--enable-debug' '')
-		$(usex ipv6 '' '--disable-ipv6')
-		$(usex libedit '' '--without-editline')
-		$(usex libtomcrypt '' '--without-tomcrypt')
-		$(usex nettle '' '--without-nettle')
-		$(usex nss '' '--without-nss')
-		$(usex ntp '' '--disable-ntp')
-		$(usex nts '' '--disable-nts')
-		$(usex nts '' '--without-gnutls')
-		$(usex phc '' '--disable-phc')
-		$(usex pps '' '--disable-pps')
-		$(usex refclock '' '--disable-refclock')
-		$(usex rtc '' '--disable-rtc')
-		$(usex samba '--enable-ntp-signd' '')
-		$(usex sechash '' '--disable-sechash')
-
-		--chronysockdir="${EPREFIX}/run/chrony"
-		--docdir="${EPREFIX}/usr/share/doc/${PF}"
-		--mandir="${EPREFIX}/usr/share/man"
-		--prefix="${EPREFIX}/usr"
-		--sysconfdir="${EPREFIX}/etc/chrony"
-		--with-hwclockfile="${EPREFIX}/etc/adjtime"
-		--with-pidfile="${EPREFIX}/run/chrony/chronyd.pid"
-
-		${EXTRA_ECONF}
-	)
-
-	# Print the ./configure call
-	edo ./configure "${myconf[@]}" || die
-}
-
-src_compile() {
-	if [[ ${PV} == 9999 ]] ; then
-		# Uses w3m
-		emake -C doc man txt
-	fi
-
-	emake all docs $(usex html '' 'ADOC=true')
-}
-
-src_install() {
-	default
-
-	newinitd "${FILESDIR}"/chronyd.init-r2 chronyd
-	newconfd "${T}"/chronyd.conf chronyd
-
-	insinto /etc/${PN}
-	newins examples/chrony.conf.example1 chrony.conf
-
-	docinto examples
-	dodoc examples/*.example*
-
-	newtmpfiles - chronyd.conf <<<"d /run/chrony 0750 $(usex caps 'ntp ntp' 'root root')"
-
-	if use html ; then
-		docinto html
-		dodoc doc/*.html
-	fi
-
-	keepdir /var/{lib,log}/chrony
-
-	if use caps ; then
-		# Prepare a directory for the chrony.drift file (a la ntpsec)
-		# Ensures the environment is sane on new installs
-		# bug #711058
-		fowners -R ntp:ntp /var/{lib,log}/chrony
-		fperms -R 770 /var/lib/chrony
-	fi
-
-	insinto /etc/logrotate.d
-	newins "${FILESDIR}"/chrony-2.4-r1.logrotate chrony
-
-	systemd_dounit examples/chronyd.service
-	systemd_dounit examples/chrony-wait.service
-	systemd_enable_ntpunit 50-chrony chronyd.service
-}
-
-pkg_preinst() {
-	HAD_CAPS=0
-	HAD_SECCOMP=0
-	HAD_PRE_NEW_SECCOMP_LEVEL=0
-
-	# See https://dev.gentoo.org/~zmedico/portage/doc/portage.html#package-ebuild-phases-after-2.1.5
-	# in "Ebuild Phases" for an explanation of why we need to save the variable beforehand
-	if has_version 'net-misc/chrony[caps]' ; then
-		HAD_CAPS=1
-	fi
-
-	if has_version 'net-misc/chrony[seccomp]' ; then
-		HAD_SECCOMP=1
-	fi
-
-	if has_version '>=net-misc/chrony-4.1[seccomp]' ; then
-		# This version introduced a new filter level: -F 2
-		# It's a limited set of seccomp filters designed to be 'bare minimum'
-		HAD_PRE_NEW_SECCOMP_LEVEL=1
-	fi
-}
-
-pkg_postinst() {
-	tmpfiles_process chronyd.conf
-
-	if [[ -n "${REPLACING_VERSIONS}" ]] ; then
-		if use caps && ! [[ ${HAD_CAPS} -eq 1 ]] ; then
-			# bug #719876
-			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by ntp:ntp"
-			ewarn "e.g. chown -R ntp:ntp ${EROOT}/var/{lib,log}/chrony"
-			ewarn "This is necessary for chrony to drop privileges"
-		elif ! use caps && [[ ${HAD_CAPS} -eq 0 ]] ; then
-			ewarn "Please adjust permissions on ${EROOT}/var/{lib,log}/chrony to be owned by root:root"
-		fi
-	fi
-
-	# See bug #783915 for general discussion on enabling seccomp filtering
-	# by default.
-	local show_seccomp_enable_msg=0
-
-	# Was seccomp disabled before and now enabled?
-	if [[ ${HAD_SECCOMP} -eq 0 ]] && use seccomp ; then
-		show_seccomp_enable_msg=1
-	fi
-
-	# Are we coming from an old version without the new 'minimal' filter?
-	# (-F 2)
-	if [[ ${HAD_PRE_NEW_SECCOMP_LEVEL} -eq 0 ]] ; then
-		show_seccomp_enable_msg=1
-	fi
-
-	if [[ ${show_seccomp_enable_msg} -eq 1 ]] ; then
-		elog "To enable seccomp in a stricter mode, please modify:"
-		elog "- ${EROOT}/etc/conf.d/chronyd for OpenRC"
-		elog "- systemctl edit chronyd for systemd"
-		elog "to use -F 1 or -F -1 instead of -F 2 (see man chronyd)"
-		elog "By default, we now use -F 2 which is a baseline/minimal filter."
-	fi
-}
diff --git a/net-misc/chrony/chrony-4.3-r2.ebuild b/net-misc/chrony/chrony-4.3-r2.ebuild
index 191ac4decba4..2de7680beb81 100644
--- a/net-misc/chrony/chrony-4.3-r2.ebuild
+++ b/net-misc/chrony/chrony-4.3-r2.ebuild
@@ -19,7 +19,7 @@ else
 	SRC_URI+=" verify-sig? ( https://download.tuxfamily.org/chrony/${P/_/-}-tar-gz-asc.txt -> ${P/_/-}.tar.gz.asc )"
 
 	if [[ ${PV} != *_pre* ]] ; then
-		KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~m68k ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+		KEYWORDS="~alpha ~amd64 arm arm64 ~hppa ~m68k ~mips ppc ppc64 ~riscv ~sparc x86"
 	fi
 fi
 
diff --git a/net-misc/iperf/Manifest b/net-misc/iperf/Manifest
index a056c1de3e5c..d26b3b9c63ed 100644
--- a/net-misc/iperf/Manifest
+++ b/net-misc/iperf/Manifest
@@ -7,10 +7,8 @@ AUX iperf.confd 200 BLAKE2B 3ea37bb2ee8c3994e3d2f877e0c0d4a695e26ea0ecc51005c059
 AUX iperf.initd-r1 437 BLAKE2B 66c72b35df0002d972ea483c3748a2ef5a1809c8e953f4fe1ba0022957046973839303596c43cca2b5c1ec4673fcf7c148c71b6c9b17f05506119734439897ba SHA512 5515ee1ca14d15fe2968e3f88e4ec1eb3860625aec27b4ae2f94667e6d3b3cb25dd76891121e658ad4346d8bfc9e1047630e586d90361ef364cb1bc8208ac4c1
 AUX iperf3.initd 287 BLAKE2B 4e99a38963676e411481f18ebbe492b5d0cea179be7fe590712f4a83c45ef426a8eada38b671c32023e5661e03d9bd52c9f361f8702a94999ce8134534f87bc2 SHA512 39718252b3ffc9e8cbc8da82308a3ba0ecd77f9bb7d5ab27dded0292e15079b8a877996e37d3ecd527ed1de6f6dd65b360180dc624fbbda8541605b657620040
 DIST iperf-2.0.13.tar.gz 326148 BLAKE2B 2a40aea9e2d7fdc935b91be5e4e586bf68dd27604375d2570570145e5db1ea5837469a4989f47586986932bef33cba05ed19ed3a9ce40c0a5531581c6d3ba982 SHA512 40fcfb8f4d27887f53a743ac07396511fb2a7ac59f4b300fe36896bd0241e191945fa253705990711772ee776d5e4227ed62760fc92abebdfebcedd11c27c0ea
-DIST iperf-3.11.tar.gz 638521 BLAKE2B b2981c170aac947c407b0a5686cd9708012282044be30ec7e5f993a9d61d55c4517003024890a194f6e55d342be0e60f1bcab27460541d2b9631a3bb88e094a5 SHA512 4be3e407f77a083d826bddc5ce2939047c85f5b816a6aeb3293eacabf2ea23bf13df4226e629ade3bf390c2eb08d6a1cb96f8cdb0fefb290a0fa4c8331d11a17
 DIST iperf-3.12.tar.gz 648136 BLAKE2B 95753e4fd2b7ca640b17501f6b21b0e63ea0a3df2ba920c672ffcccd991502cacf4bf3641be1ffbbb993c86e6915ceada5745cffe1796bb86b6a6a1dff8811ae SHA512 9b0600a19750311557833b32ca5c4be809ab98643522f125645dd8f83c482017e42fbe5fc9484624731176a59b67203a468eb81eebf1a37b9c1b3eff818857ba
 EBUILD iperf-2.0.14a.ebuild 863 BLAKE2B 48a3db3ec6b41bad2abef2854e694949a1e14cb71c01b52de2ca28149c9430a9b052f70959b1eb0630ca6ee6460dd54e0e0420a65892e6a86eb3e67875b673b0 SHA512 cd0241a86c550a18572042151c402913ec5e362611580b7a70de5b38c6664c3398f06258be706d311704046f4add0b868a81f913c7afd1d06622307fdc215913
 EBUILD iperf-2.9999.ebuild 670 BLAKE2B bb3d273743f45439dbcf4b88ea83010ceac93f7659a33a4c1197b1c946366dc4c00a7f7b017ff2050642b6a1b333934b272345aa3713b1a508f9c232f31dbbae SHA512 4b2ef29cca81a9d849356163c1d2e5c2f8eb19f45ee8c468c30950a2397e4a8a6f8c5ade0db47e9769f8a8e7d2fb77026bfa75b1325475ed9fcf80e07fa731c7
-EBUILD iperf-3.11.ebuild 940 BLAKE2B 123c3572e33d063a05da78244a8f8baca587c5577b2465535ea06f291c4ea91222fe10722d21ef19a7e040ba32eab66dec480ba99e0e3b6f8e7fa0ae3234fdfb SHA512 fd76f0f30e04ab19e943e2c455263487c14f741c3312c89bdaf4218808dbcf667ec6b0582380a710dcfaae99e816f5eb0fc56736f8af6918eabad0e535994534
 EBUILD iperf-3.12.ebuild 1189 BLAKE2B cd30777e1d825e069e852e344964c5f31fa26c1a34cba6a3c107315c49c7c6efef43d8ba1b10e3840e030e84620e5e20cdfd42f3f7db6a38e922d456415479ac SHA512 1c6ef9201b20c2da6294e8b2997990a5eb03452b2abc90be05ae6c38ecf9fd9e1a179e0e3531503f78b502f1d6b7ec139688a9cecc167ce6d5747213aaa1de30
 MISC metadata.xml 570 BLAKE2B e17cc2b8458663f6ed2e9de7cca4e6a0d2e21e7f0c22a92c7b2d8589a944a466436f0dec4e18843641cc9364f407b061ff44dbbe342162ab28556ec953b029b4 SHA512 e3acd2262d442675557b837bbed0feaf7a1f148f7306b64139d8ba39d052794a9e7b60f125eee8745b0d13cdeafbb93012c62d1c524caa1e0f4730d1200426cc
diff --git a/net-misc/iperf/iperf-3.11.ebuild b/net-misc/iperf/iperf-3.11.ebuild
deleted file mode 100644
index 188df4bf878d..000000000000
--- a/net-misc/iperf/iperf-3.11.ebuild
+++ /dev/null
@@ -1,40 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit systemd
-
-DESCRIPTION="A TCP, UDP, and SCTP network bandwidth measurement tool"
-HOMEPAGE="https://github.com/esnet/iperf"
-SRC_URI="https://github.com/esnet/iperf/archive/${PV/_/}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}"/${P/_/}
-
-LICENSE="BSD"
-SLOT="3"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos"
-IUSE="sctp"
-
-DEPEND="dev-libs/openssl:=
-	sctp? ( net-misc/lksctp-tools )"
-RDEPEND="${DEPEND}"
-
-DOCS=( README.md RELNOTES.md )
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.10.1-drop-forced-debugging-symbols.patch
-)
-
-src_configure() {
-	econf $(use_with sctp)
-}
-
-src_install() {
-	default
-
-	newconfd "${FILESDIR}"/iperf.confd iperf3
-	newinitd "${FILESDIR}"/iperf3.initd iperf3
-	systemd_dounit contrib/iperf3.service
-
-	find "${ED}" -name '*.la' -delete || die
-}
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 49e493f8e436..84aaca1115ba 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/hostapd/Manifest b/net-wireless/hostapd/Manifest
index 06f80e647cae..501184e3d810 100644
--- a/net-wireless/hostapd/Manifest
+++ b/net-wireless/hostapd/Manifest
@@ -1,12 +1,5 @@
-AUX hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch 5909 BLAKE2B 2a5e3650e9872aaed73085131f3a6f80a12bf7d353b4df927346a9f2c13e828b9c4196386ded935f0ff960eee380be49325a98541bbc23a99cfe3f00e91581fe SHA512 b76bbca282a74ef16c0303e5dbd2ccd33a62461595964d52c1481b0bfa4f41deacde56830b85409b288803b87ceb6f33cf0ccc69c5b17ec632c2d4784b872f3c
-AUX hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch 2284 BLAKE2B 0c454ca976d2ee538a874f1a4f583434bdf3abe6c5d20517f3350d9852c0f50849ae1ad4611acecf5a754339678e4952b8c9ae1abb783e06cffa615b36464d06 SHA512 00cc739e78c42353a555c0de2f29defecff372927040e14407a231d1ead7ff32a37c9fd46bea7cdf1c24e3ac891bc3d483800d44fc6d2c8a12d2ae886523b12c
-AUX hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch 1553 BLAKE2B 736e51142cf4402cc8aa6858022fda23ea5f37ba256bc922349365ff4824322db31ea04add04d1b55d0d41f4cb0272de8dcf44ae4671309e808cc4f4a57fe6ac SHA512 69243af20cdcfa837c51917a3723779f4825e11436fb83311355b4ffe8f7a4b7a5747a976f7bf923038c410c9e9055b13b866d9a396913ad08bdec3a70e9f6e0
-AUX hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch 2775 BLAKE2B fa9fb5db77955095e083a98a067072fccde02bf55f27af226c8aec515b047f28ab37d9f7c9a1bcc18e584ad3e582bc4dd59beabfcf15b5305394b05e687980a6 SHA512 63710cfb0992f2c346a9807d8c97cbeaed032fa376a0e93a2e56f7742ce515e9c4dfadbdb1af03ba272281f639aab832f0178f67634c222a5d99e1d462aa9e38
-AUX hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch 3839 BLAKE2B 943ccc90d23c60eef15a336108d14e74909ecb782f772145ee48d049806c289c42867999e489fdfc0795846bf41a756303e6da81f4624d26043c618b8485cf43 SHA512 88608529763a6fd9e8cb1e9c9a35630dc2e311a260e023e2a69002d0db700d5f58fc7723a00433b4ea895b92c371cf1db221f38742490b4ed9b4b049892b65e1
 DIST hostapd-2.10.tar.gz 2440435 BLAKE2B dbeeae2f62a8ab52df3e2d05ff0467b643cd68349ef3b28814a11dfb67d4b23d14cf2461a3040694706ec614fcd7c2e0fe58f3597e877cf47296cd75e11c792f SHA512 243baa82d621f859d2507d8d5beb0ebda15a75548a62451dc9bca42717dcc8607adac49b354919a41d8257d16d07ac7268203a79750db0cfb34b51f80ff1ce8f
-DIST hostapd-2.9.tar.gz 2244312 BLAKE2B 07308376dd1576313513fba815b220e4ab2f30ed1a402e24b5c8e62ded79c6d718ff47aad1a2222c9e46ffb7334580b556f19a8aef013eab34a8d61d708d2f01 SHA512 66c729380152db18b64520bda55dfa00af3b0264f97b5de100b81a46e2593571626c4bdcf900f0988ea2131e30bc8788f75d8489dd1f57e37fd56e8098e48a9c
 DIST net-wireless_hostapd_2.7-r2_extras.tar.xz 1820 BLAKE2B 5c4daf0e4fcf5ae0803cdbe2aabcc75e89b1e92048e8a01894d73639a16b049174b37eca6b6206c337a2874a6e6d5588d50fa5b8a4813e7f6c22bf02efca852f SHA512 65bc4634c8314280ceab44d1f5d6d62092f4bca48253f107b076211020f6f6502388490aee907f9910846a25ba2da7e4122bdb1873eb2b12bf94e867e3295f4c
 EBUILD hostapd-2.10.ebuild 7068 BLAKE2B 971d45b9f956f9b737f92bf45c1e39f151439de7f4cabc600d74b35a1242136648a910b0f17719e8ab7862719ccc04d2cd4feb69c169e5d6f2a284f43601e345 SHA512 1e9679584f60a477fb3140c039a9a8a801bde2517f99c64b87ca1520de6c2adbe4113e6a70382898a9f4f705e30bd7e4050a91fde677326c62b41890a07c5944
-EBUILD hostapd-2.9-r6.ebuild 7764 BLAKE2B ae08449d2e279ac1b0d26e53a2487f35ea2a1230699649427c2e67fef9ff5f626003c1b46752fdf0bf5b967de63ee5f635e57d517ffd7cd92be8fa974bf2f2e9 SHA512 83dc807a9e8bf561b370c5b7b0366788b8ff0a72f3f592c50767456e296dcf18e700e4dbac1661a8181cfd4e9c7dba7401ed74f2096f9aa1a72e9dd223e5bfc3
 EBUILD hostapd-9999.ebuild 7073 BLAKE2B 1a7077a0919dcc19a40a1098b6fa54d3dacb2b1618317ac5561c61a61c39676bc03f6d7ce2d530856f280dbc1226428bd6a5a537046db5d63d8e38fcf3238450 SHA512 98c5a12822c07101689e203a6342512352959da6f6432b844700615f02b7f82aa858743b80b494736f7925a6fdeb8a59f4b80ac189f2d5371c94b19195b6eb26
 MISC metadata.xml 1017 BLAKE2B 90f775b08fe2389ab1d84c35662d7ddb79e8f01b3419ce852f72cc82b02fd94b8e10493428f09308ed463a0b9fa1bb6b406172fe4d33a1ef0603c2cae51f1505 SHA512 6947ad5f84c87fdf2fb94136647038d99c5a0a0cbdb2f895acf998d25d035c5041233064069d325f73f01f1cafd0ba23fc4acd87ac05a6ec3f4babed7df711f1
diff --git a/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch b/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
deleted file mode 100644
index 0aa8a5ea1de0..000000000000
--- a/net-wireless/hostapd/files/hostapd-2.9-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
+++ /dev/null
@@ -1,150 +0,0 @@
-From 5b78c8f961f25f4dc22d6f2b77ddd06d712cec63 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni@codeaurora.org>
-Date: Wed, 3 Jun 2020 23:17:35 +0300
-Subject: [PATCH 1/3] WPS UPnP: Do not allow event subscriptions with URLs to
- other networks
-
-The UPnP Device Architecture 2.0 specification errata ("UDA errata
-16-04-2020.docx") addresses a problem with notifications being allowed
-to go out to other domains by disallowing such cases. Do such filtering
-for the notification callback URLs to avoid undesired connections to
-external networks based on subscriptions that any device in the local
-network could request when WPS support for external registrars is
-enabled (the upnp_iface parameter in hostapd configuration).
-
-Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
----
- src/wps/wps_er.c     |  2 +-
- src/wps/wps_upnp.c   | 38 ++++++++++++++++++++++++++++++++++++--
- src/wps/wps_upnp_i.h |  3 ++-
- 3 files changed, 39 insertions(+), 4 deletions(-)
-
-diff --git a/src/wps/wps_er.c b/src/wps/wps_er.c
-index 6bded14327f8..31d2e50e4cff 100644
---- a/src/wps/wps_er.c
-+++ b/src/wps/wps_er.c
-@@ -1298,7 +1298,7 @@ wps_er_init(struct wps_context *wps, const char *ifname, const char *filter)
- 			   "with %s", filter);
- 	}
- 	if (get_netif_info(er->ifname, &er->ip_addr, &er->ip_addr_text,
--			   er->mac_addr)) {
-+			   NULL, er->mac_addr)) {
- 		wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
- 			   "for %s. Does it have IP address?", er->ifname);
- 		wps_er_deinit(er, NULL, NULL);
-diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
-index 6e10e4bc0c3f..7d4b7439940e 100644
---- a/src/wps/wps_upnp.c
-+++ b/src/wps/wps_upnp.c
-@@ -303,6 +303,14 @@ static void subscr_addr_free_all(struct subscription *s)
- }
- 
- 
-+static int local_network_addr(struct upnp_wps_device_sm *sm,
-+			      struct sockaddr_in *addr)
-+{
-+	return (addr->sin_addr.s_addr & sm->netmask.s_addr) ==
-+		(sm->ip_addr & sm->netmask.s_addr);
-+}
-+
-+
- /* subscr_addr_add_url -- add address(es) for one url to subscription */
- static void subscr_addr_add_url(struct subscription *s, const char *url,
- 				size_t url_len)
-@@ -381,6 +389,7 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
- 
- 	for (rp = result; rp; rp = rp->ai_next) {
- 		struct subscr_addr *a;
-+		struct sockaddr_in *addr = (struct sockaddr_in *) rp->ai_addr;
- 
- 		/* Limit no. of address to avoid denial of service attack */
- 		if (dl_list_len(&s->addr_list) >= MAX_ADDR_PER_SUBSCRIPTION) {
-@@ -389,6 +398,13 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
- 			break;
- 		}
- 
-+		if (!local_network_addr(s->sm, addr)) {
-+			wpa_printf(MSG_INFO,
-+				   "WPS UPnP: Ignore a delivery URL that points to another network %s",
-+				   inet_ntoa(addr->sin_addr));
-+			continue;
-+		}
-+
- 		a = os_zalloc(sizeof(*a) + alloc_len);
- 		if (a == NULL)
- 			break;
-@@ -890,11 +906,12 @@ static int eth_get(const char *device, u8 ea[ETH_ALEN])
-  * @net_if: Selected network interface name
-  * @ip_addr: Buffer for returning IP address in network byte order
-  * @ip_addr_text: Buffer for returning a pointer to allocated IP address text
-+ * @netmask: Buffer for returning netmask or %NULL if not needed
-  * @mac: Buffer for returning MAC address
-  * Returns: 0 on success, -1 on failure
-  */
- int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
--		   u8 mac[ETH_ALEN])
-+		   struct in_addr *netmask, u8 mac[ETH_ALEN])
- {
- 	struct ifreq req;
- 	int sock = -1;
-@@ -920,6 +937,19 @@ int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
- 	in_addr.s_addr = *ip_addr;
- 	os_snprintf(*ip_addr_text, 16, "%s", inet_ntoa(in_addr));
- 
-+	if (netmask) {
-+		os_memset(&req, 0, sizeof(req));
-+		os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name));
-+		if (ioctl(sock, SIOCGIFNETMASK, &req) < 0) {
-+			wpa_printf(MSG_ERROR,
-+				   "WPS UPnP: SIOCGIFNETMASK failed: %d (%s)",
-+				   errno, strerror(errno));
-+			goto fail;
-+		}
-+		addr = (struct sockaddr_in *) &req.ifr_netmask;
-+		netmask->s_addr = addr->sin_addr.s_addr;
-+	}
-+
- #ifdef __linux__
- 	os_strlcpy(req.ifr_name, net_if, sizeof(req.ifr_name));
- 	if (ioctl(sock, SIOCGIFHWADDR, &req) < 0) {
-@@ -1026,11 +1056,15 @@ static int upnp_wps_device_start(struct upnp_wps_device_sm *sm, char *net_if)
- 
- 	/* Determine which IP and mac address we're using */
- 	if (get_netif_info(net_if, &sm->ip_addr, &sm->ip_addr_text,
--			   sm->mac_addr)) {
-+			   &sm->netmask, sm->mac_addr)) {
- 		wpa_printf(MSG_INFO, "WPS UPnP: Could not get IP/MAC address "
- 			   "for %s. Does it have IP address?", net_if);
- 		goto fail;
- 	}
-+	wpa_printf(MSG_DEBUG, "WPS UPnP: Local IP address %s netmask %s hwaddr "
-+		   MACSTR,
-+		   sm->ip_addr_text, inet_ntoa(sm->netmask),
-+		   MAC2STR(sm->mac_addr));
- 
- 	/* Listen for incoming TCP connections so that others
- 	 * can fetch our "xml files" from us.
-diff --git a/src/wps/wps_upnp_i.h b/src/wps/wps_upnp_i.h
-index e87a93232df1..6ead7b4e9a30 100644
---- a/src/wps/wps_upnp_i.h
-+++ b/src/wps/wps_upnp_i.h
-@@ -128,6 +128,7 @@ struct upnp_wps_device_sm {
- 	u8 mac_addr[ETH_ALEN]; /* mac addr of network i.f. we use */
- 	char *ip_addr_text; /* IP address of network i.f. we use */
- 	unsigned ip_addr; /* IP address of network i.f. we use (host order) */
-+	struct in_addr netmask;
- 	int multicast_sd; /* send multicast messages over this socket */
- 	int ssdp_sd; /* receive discovery UPD packets on socket */
- 	int ssdp_sd_registered; /* nonzero if we must unregister */
-@@ -158,7 +159,7 @@ struct subscription * subscription_find(struct upnp_wps_device_sm *sm,
- 					const u8 uuid[UUID_LEN]);
- void subscr_addr_delete(struct subscr_addr *a);
- int get_netif_info(const char *net_if, unsigned *ip_addr, char **ip_addr_text,
--		   u8 mac[ETH_ALEN]);
-+		   struct in_addr *netmask, u8 mac[ETH_ALEN]);
- 
- /* wps_upnp_ssdp.c */
- void msearchreply_state_machine_stop(struct advertisement_state_machine *a);
--- 
-2.20.1
-
diff --git a/net-wireless/hostapd/files/hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch b/net-wireless/hostapd/files/hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
deleted file mode 100644
index c7a449e0b5c6..000000000000
--- a/net-wireless/hostapd/files/hostapd-2.9-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
+++ /dev/null
@@ -1,59 +0,0 @@
-From f7d268864a2660b7239b9a8ff5ad37faeeb751ba Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni@codeaurora.org>
-Date: Wed, 3 Jun 2020 22:41:02 +0300
-Subject: [PATCH 2/3] WPS UPnP: Fix event message generation using a long URL
- path
-
-More than about 700 character URL ended up overflowing the wpabuf used
-for building the event notification and this resulted in the wpabuf
-buffer overflow checks terminating the hostapd process. Fix this by
-allocating the buffer to be large enough to contain the full URL path.
-However, since that around 700 character limit has been the practical
-limit for more than ten years, start explicitly enforcing that as the
-limit or the callback URLs since any longer ones had not worked before
-and there is no need to enable them now either.
-
-Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
----
- src/wps/wps_upnp.c       | 9 +++++++--
- src/wps/wps_upnp_event.c | 3 ++-
- 2 files changed, 9 insertions(+), 3 deletions(-)
-
-diff --git a/src/wps/wps_upnp.c b/src/wps/wps_upnp.c
-index 7d4b7439940e..ab685d52ecab 100644
---- a/src/wps/wps_upnp.c
-+++ b/src/wps/wps_upnp.c
-@@ -328,9 +328,14 @@ static void subscr_addr_add_url(struct subscription *s, const char *url,
- 	int rerr;
- 	size_t host_len, path_len;
- 
--	/* url MUST begin with http: */
--	if (url_len < 7 || os_strncasecmp(url, "http://", 7))
-+	/* URL MUST begin with HTTP scheme. In addition, limit the length of
-+	 * the URL to 700 characters which is around the limit that was
-+	 * implicitly enforced for more than 10 years due to a bug in
-+	 * generating the event messages. */
-+	if (url_len < 7 || os_strncasecmp(url, "http://", 7) || url_len > 700) {
-+		wpa_printf(MSG_DEBUG, "WPS UPnP: Reject an unacceptable URL");
- 		goto fail;
-+	}
- 	url += 7;
- 	url_len -= 7;
- 
-diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
-index d7e6edcc6503..08a23612f338 100644
---- a/src/wps/wps_upnp_event.c
-+++ b/src/wps/wps_upnp_event.c
-@@ -147,7 +147,8 @@ static struct wpabuf * event_build_message(struct wps_event_ *e)
- 	struct wpabuf *buf;
- 	char *b;
- 
--	buf = wpabuf_alloc(1000 + wpabuf_len(e->data));
-+	buf = wpabuf_alloc(1000 + os_strlen(e->addr->path) +
-+			   wpabuf_len(e->data));
- 	if (buf == NULL)
- 		return NULL;
- 	wpabuf_printf(buf, "NOTIFY %s HTTP/1.1\r\n", e->addr->path);
--- 
-2.20.1
-
diff --git a/net-wireless/hostapd/files/hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch b/net-wireless/hostapd/files/hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
deleted file mode 100644
index 9d0376043d0b..000000000000
--- a/net-wireless/hostapd/files/hostapd-2.9-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
+++ /dev/null
@@ -1,47 +0,0 @@
-From 85aac526af8612c21b3117dadc8ef5944985b476 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <jouni@codeaurora.org>
-Date: Thu, 4 Jun 2020 21:24:04 +0300
-Subject: [PATCH 3/3] WPS UPnP: Handle HTTP initiation failures for events more
- properly
-
-While it is appropriate to try to retransmit the event to another
-callback URL on a failure to initiate the HTTP client connection, there
-is no point in trying the exact same operation multiple times in a row.
-Replve the event_retry() calls with event_addr_failure() for these cases
-to avoid busy loops trying to repeat the same failing operation.
-
-These potential busy loops would go through eloop callbacks, so the
-process is not completely stuck on handling them, but unnecessary CPU
-would be used to process the continues retries that will keep failing
-for the same reason.
-
-Signed-off-by: Jouni Malinen <jouni@codeaurora.org>
----
- src/wps/wps_upnp_event.c | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/src/wps/wps_upnp_event.c b/src/wps/wps_upnp_event.c
-index 08a23612f338..c0d9e41d9a38 100644
---- a/src/wps/wps_upnp_event.c
-+++ b/src/wps/wps_upnp_event.c
-@@ -294,7 +294,7 @@ static int event_send_start(struct subscription *s)
- 
- 	buf = event_build_message(e);
- 	if (buf == NULL) {
--		event_retry(e, 0);
-+		event_addr_failure(e);
- 		return -1;
- 	}
- 
-@@ -302,7 +302,7 @@ static int event_send_start(struct subscription *s)
- 					 event_http_cb, e);
- 	if (e->http_event == NULL) {
- 		wpabuf_free(buf);
--		event_retry(e, 0);
-+		event_addr_failure(e);
- 		return -1;
- 	}
- 
--- 
-2.20.1
-
diff --git a/net-wireless/hostapd/files/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch b/net-wireless/hostapd/files/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch
deleted file mode 100644
index d764a9db016c..000000000000
--- a/net-wireless/hostapd/files/hostapd-2.9-AP-Silently-ignore-management-frame-from-unexpected.patch
+++ /dev/null
@@ -1,73 +0,0 @@
-From 8c07fa9eda13e835f3f968b2e1c9a8be3a851ff9 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Thu, 29 Aug 2019 11:52:04 +0300
-Subject: [PATCH] AP: Silently ignore management frame from unexpected source
- address
-
-Do not process any received Management frames with unexpected/invalid SA
-so that we do not add any state for unexpected STA addresses or end up
-sending out frames to unexpected destination. This prevents unexpected
-sequences where an unprotected frame might end up causing the AP to send
-out a response to another device and that other device processing the
-unexpected response.
-
-In particular, this prevents some potential denial of service cases
-where the unexpected response frame from the AP might result in a
-connected station dropping its association.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/ap/drv_callbacks.c | 13 +++++++++++++
- src/ap/ieee802_11.c    | 12 ++++++++++++
- 2 files changed, 25 insertions(+)
-
-diff --git a/src/ap/drv_callbacks.c b/src/ap/drv_callbacks.c
-index 31587685fe3b..34ca379edc3d 100644
---- a/src/ap/drv_callbacks.c
-+++ b/src/ap/drv_callbacks.c
-@@ -131,6 +131,19 @@ int hostapd_notif_assoc(struct hostapd_data *hapd, const u8 *addr,
- 			   "hostapd_notif_assoc: Skip event with no address");
- 		return -1;
- 	}
-+
-+	if (is_multicast_ether_addr(addr) ||
-+	    is_zero_ether_addr(addr) ||
-+	    os_memcmp(addr, hapd->own_addr, ETH_ALEN) == 0) {
-+		/* Do not process any frames with unexpected/invalid SA so that
-+		 * we do not add any state for unexpected STA addresses or end
-+		 * up sending out frames to unexpected destination. */
-+		wpa_printf(MSG_DEBUG, "%s: Invalid SA=" MACSTR
-+			   " in received indication - ignore this indication silently",
-+			   __func__, MAC2STR(addr));
-+		return 0;
-+	}
-+
- 	random_add_randomness(addr, ETH_ALEN);
- 
- 	hostapd_logger(hapd, addr, HOSTAPD_MODULE_IEEE80211,
-diff --git a/src/ap/ieee802_11.c b/src/ap/ieee802_11.c
-index c85a28db44b7..e7065372e158 100644
---- a/src/ap/ieee802_11.c
-+++ b/src/ap/ieee802_11.c
-@@ -4626,6 +4626,18 @@ int ieee802_11_mgmt(struct hostapd_data *hapd, const u8 *buf, size_t len,
- 	fc = le_to_host16(mgmt->frame_control);
- 	stype = WLAN_FC_GET_STYPE(fc);
- 
-+	if (is_multicast_ether_addr(mgmt->sa) ||
-+	    is_zero_ether_addr(mgmt->sa) ||
-+	    os_memcmp(mgmt->sa, hapd->own_addr, ETH_ALEN) == 0) {
-+		/* Do not process any frames with unexpected/invalid SA so that
-+		 * we do not add any state for unexpected STA addresses or end
-+		 * up sending out frames to unexpected destination. */
-+		wpa_printf(MSG_DEBUG, "MGMT: Invalid SA=" MACSTR
-+			   " in received frame - ignore this frame silently",
-+			   MAC2STR(mgmt->sa));
-+		return 0;
-+	}
-+
- 	if (stype == WLAN_FC_STYPE_BEACON) {
- 		handle_beacon(hapd, mgmt, len, fi);
- 		return 1;
--- 
-2.20.1
-
diff --git a/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch b/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch
deleted file mode 100644
index 8c8ba9335504..000000000000
--- a/net-wireless/hostapd/files/hostapd-2.9-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch
+++ /dev/null
@@ -1,115 +0,0 @@
-From a0541334a6394f8237a4393b7372693cd7e96f15 Mon Sep 17 00:00:00 2001
-From: Jouni Malinen <j@w1.fi>
-Date: Sat, 13 Mar 2021 18:19:31 +0200
-Subject: ASN.1: Validate DigestAlgorithmIdentifier parameters
-
-The supported hash algorithms do not use AlgorithmIdentifier parameters.
-However, there are implementations that include NULL parameters in
-addition to ones that omit the parameters. Previous implementation did
-not check the parameters value at all which supported both these cases,
-but did not reject any other unexpected information.
-
-Use strict validation of digest algorithm parameters and reject any
-unexpected value when validating a signature. This is needed to prevent
-potential forging attacks.
-
-Signed-off-by: Jouni Malinen <j@w1.fi>
----
- src/tls/pkcs1.c  | 21 +++++++++++++++++++++
- src/tls/x509v3.c | 20 ++++++++++++++++++++
- 2 files changed, 41 insertions(+)
-
-diff --git a/src/tls/pkcs1.c b/src/tls/pkcs1.c
-index bbdb0d7..5761dfe 100644
---- a/src/tls/pkcs1.c
-+++ b/src/tls/pkcs1.c
-@@ -244,6 +244,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk,
- 		os_free(decrypted);
- 		return -1;
- 	}
-+	wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestInfo",
-+		    hdr.payload, hdr.length);
- 
- 	pos = hdr.payload;
- 	end = pos + hdr.length;
-@@ -265,6 +267,8 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk,
- 		os_free(decrypted);
- 		return -1;
- 	}
-+	wpa_hexdump(MSG_MSGDUMP, "PKCS #1: DigestAlgorithmIdentifier",
-+		    hdr.payload, hdr.length);
- 	da_end = hdr.payload + hdr.length;
- 
- 	if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) {
-@@ -273,6 +277,23 @@ int pkcs1_v15_sig_ver(struct crypto_public_key *pk,
- 		os_free(decrypted);
- 		return -1;
- 	}
-+	wpa_hexdump(MSG_MSGDUMP, "PKCS #1: Digest algorithm parameters",
-+		    next, da_end - next);
-+
-+	/*
-+	 * RFC 5754: The correct encoding for the SHA2 algorithms would be to
-+	 * omit the parameters, but there are implementation that encode these
-+	 * as a NULL element. Allow these two cases and reject anything else.
-+	 */
-+	if (da_end > next &&
-+	    (asn1_get_next(next, da_end - next, &hdr) < 0 ||
-+	     !asn1_is_null(&hdr) ||
-+	     hdr.payload + hdr.length != da_end)) {
-+		wpa_printf(MSG_DEBUG,
-+			   "PKCS #1: Unexpected digest algorithm parameters");
-+		os_free(decrypted);
-+		return -1;
-+	}
- 
- 	if (!asn1_oid_equal(&oid, hash_alg)) {
- 		char txt[100], txt2[100];
-diff --git a/src/tls/x509v3.c b/src/tls/x509v3.c
-index a8944dd..df337ec 100644
---- a/src/tls/x509v3.c
-+++ b/src/tls/x509v3.c
-@@ -1964,6 +1964,7 @@ int x509_check_signature(struct x509_certificate *issuer,
- 		os_free(data);
- 		return -1;
- 	}
-+	wpa_hexdump(MSG_MSGDUMP, "X509: DigestInfo", hdr.payload, hdr.length);
- 
- 	pos = hdr.payload;
- 	end = pos + hdr.length;
-@@ -1985,6 +1986,8 @@ int x509_check_signature(struct x509_certificate *issuer,
- 		os_free(data);
- 		return -1;
- 	}
-+	wpa_hexdump(MSG_MSGDUMP, "X509: DigestAlgorithmIdentifier",
-+		    hdr.payload, hdr.length);
- 	da_end = hdr.payload + hdr.length;
- 
- 	if (asn1_get_oid(hdr.payload, hdr.length, &oid, &next)) {
-@@ -1992,6 +1995,23 @@ int x509_check_signature(struct x509_certificate *issuer,
- 		os_free(data);
- 		return -1;
- 	}
-+	wpa_hexdump(MSG_MSGDUMP, "X509: Digest algorithm parameters",
-+		    next, da_end - next);
-+
-+	/*
-+	 * RFC 5754: The correct encoding for the SHA2 algorithms would be to
-+	 * omit the parameters, but there are implementation that encode these
-+	 * as a NULL element. Allow these two cases and reject anything else.
-+	 */
-+	if (da_end > next &&
-+	    (asn1_get_next(next, da_end - next, &hdr) < 0 ||
-+	     !asn1_is_null(&hdr) ||
-+	     hdr.payload + hdr.length != da_end)) {
-+		wpa_printf(MSG_DEBUG,
-+			   "X509: Unexpected digest algorithm parameters");
-+		os_free(data);
-+		return -1;
-+	}
- 
- 	if (x509_sha1_oid(&oid)) {
- 		if (signature->oid.oid[6] != 5 /* sha-1WithRSAEncryption */) {
--- 
-cgit v0.12
-
diff --git a/net-wireless/hostapd/hostapd-2.9-r6.ebuild b/net-wireless/hostapd/hostapd-2.9-r6.ebuild
deleted file mode 100644
index 1b8727055c94..000000000000
--- a/net-wireless/hostapd/hostapd-2.9-r6.ebuild
+++ /dev/null
@@ -1,275 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit flag-o-matic systemd savedconfig toolchain-funcs
-
-DESCRIPTION="IEEE 802.11 wireless LAN Host AP daemon"
-HOMEPAGE="https://w1.fi/ https://w1.fi/cgit/hostap/"
-EXTRAS_VER="2.7-r2"
-EXTRAS_NAME="${CATEGORY}_${PN}_${EXTRAS_VER}_extras"
-SRC_URI="https://dev.gentoo.org/~andrey_utkin/distfiles/${EXTRAS_NAME}.tar.xz"
-S="${S}/${PN}"
-
-if [[ ${PV} == 9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="https://w1.fi/hostap.git"
-else
-	if [[ ${PV} =~ ^.*_p[0-9]{8}$ ]]; then
-		SRC_URI+=" https://dev.gentoo.org/~andrey_utkin/distfiles/${P}.tar.xz"
-	else
-		SRC_URI+=" https://w1.fi/releases/${P}.tar.gz"
-	fi
-
-	# Never stabilize snapshot ebuilds please
-	KEYWORDS="amd64 arm arm64 ~mips ppc x86"
-fi
-
-LICENSE="BSD"
-SLOT="0"
-IUSE="internal-tls ipv6 netlink sqlite +suiteb +wps +crda"
-
-DEPEND="
-	internal-tls? ( dev-libs/libtommath )
-	!internal-tls? ( dev-libs/openssl:0=[-bindist(-)] )
-	kernel_linux? (
-		dev-libs/libnl:3
-		crda? ( net-wireless/crda )
-	)
-	netlink? ( net-libs/libnfnetlink )
-	sqlite? ( >=dev-db/sqlite-3 )"
-RDEPEND="${DEPEND}"
-BDEPEND="virtual/pkgconfig"
-
-pkg_pretend() {
-	if use internal-tls; then
-		ewarn "internal-tls implementation is experimental and provides fewer features"
-	fi
-}
-
-src_unpack() {
-	# Override default one because we need the SRC_URI ones even in case of 9999 ebuilds
-	default
-
-	if [[ ${PV} == 9999 ]] ; then
-		git-r3_src_unpack
-	fi
-}
-
-src_prepare() {
-	# Allow users to apply patches to src/drivers for example,
-	# i.e. anything outside ${S}/${PN}
-	pushd ../ >/dev/null || die
-	default
-
-	# CVE-2019-16275 (bug #696032)
-	eapply "${FILESDIR}"/${P}-AP-Silently-ignore-management-frame-from-unexpected.patch
-	# CVE-2020-12695 (bug #727542)
-	eapply "${FILESDIR}"/${P}-0001-WPS-UPnP-Do-not-allow-event-subscriptions-with-URLs-.patch
-	eapply "${FILESDIR}"/${P}-0002-WPS-UPnP-Fix-event-message-generation-using-a-long-U.patch
-	eapply "${FILESDIR}"/${P}-0003-WPS-UPnP-Handle-HTTP-initiation-failures-for-events-.patch
-	# CVE-2021-30004 (bug #780135)
-	eapply "${FILESDIR}"/${P}-ASN-1-Validate-DigestAlgorithmIdentifier-parameters.patch
-
-	popd >/dev/null || die
-
-	sed -i -e "s:/etc/hostapd:/etc/hostapd/hostapd:g" \
-		"${S}/hostapd.conf" || die
-}
-
-src_configure() {
-	local CONFIG="${S}"/.config
-
-	restore_config "${CONFIG}"
-	if [[ -f "${CONFIG}" ]]; then
-		default
-		return 0
-	fi
-
-	# toolchain setup
-	echo "CC = $(tc-getCC)" > ${CONFIG} || die
-
-	# EAP authentication methods
-	echo "CONFIG_EAP=y" >> ${CONFIG} || die
-	echo "CONFIG_ERP=y" >> ${CONFIG} || die
-	echo "CONFIG_EAP_MD5=y" >> ${CONFIG} || die
-
-	if use suiteb; then
-		echo "CONFIG_SUITEB=y" >> ${CONFIG} || die
-		echo "CONFIG_SUITEB192=y" >> ${CONFIG} || die
-	fi
-
-	if use internal-tls ; then
-		echo "CONFIG_TLS=internal" >> ${CONFIG} || die
-	else
-		# SSL authentication methods
-		echo "CONFIG_DPP=y" >> ${CONFIG} || die
-		echo "CONFIG_EAP_FAST=y" >> ${CONFIG} || die
-		echo "CONFIG_EAP_MSCHAPV2=y" >> ${CONFIG} || die
-		echo "CONFIG_EAP_PEAP=y" >> ${CONFIG} || die
-		echo "CONFIG_EAP_PWD=y" >> ${CONFIG} || die
-		echo "CONFIG_EAP_TLS=y" >> ${CONFIG} || die
-		echo "CONFIG_EAP_TTLS=y" >> ${CONFIG} || die
-		echo "CONFIG_OWE=y" >> ${CONFIG} || die
-		echo "CONFIG_SAE=y" >> ${CONFIG} || die
-		echo "CONFIG_TLSV11=y" >> ${CONFIG} || die
-		echo "CONFIG_TLSV12=y" >> ${CONFIG} || die
-	fi
-
-	if use wps; then
-		# Enable Wi-Fi Protected Setup
-		echo "CONFIG_WPS=y" >> ${CONFIG} || die
-		echo "CONFIG_WPS2=y" >> ${CONFIG} || die
-		echo "CONFIG_WPS_UPNP=y" >> ${CONFIG} || die
-		echo "CONFIG_WPS_NFC=y" >> ${CONFIG} || die
-		einfo "Enabling Wi-Fi Protected Setup support"
-	fi
-
-	echo "CONFIG_EAP_IKEV2=y" >> ${CONFIG} || die
-	echo "CONFIG_EAP_TNC=y" >> ${CONFIG} || die
-	echo "CONFIG_EAP_GTC=y" >> ${CONFIG} || die
-	echo "CONFIG_EAP_SIM=y" >> ${CONFIG} || die
-	echo "CONFIG_EAP_AKA=y" >> ${CONFIG} || die
-	echo "CONFIG_EAP_AKA_PRIME=y" >> ${CONFIG} || die
-	echo "CONFIG_EAP_EKE=y" >> ${CONFIG} || die
-	echo "CONFIG_EAP_PAX=y" >> ${CONFIG} || die
-	echo "CONFIG_EAP_PSK=y" >> ${CONFIG} || die
-	echo "CONFIG_EAP_SAKE=y" >> ${CONFIG} || die
-	echo "CONFIG_EAP_GPSK=y" >> ${CONFIG} || die
-	echo "CONFIG_EAP_GPSK_SHA256=y" >> ${CONFIG} || die
-
-	einfo "Enabling drivers: "
-
-	# drivers
-	echo "CONFIG_DRIVER_HOSTAP=y" >> ${CONFIG} || die
-	einfo "  HostAP driver enabled"
-	echo "CONFIG_DRIVER_WIRED=y" >> ${CONFIG} || die
-	einfo "  Wired driver enabled"
-	echo "CONFIG_DRIVER_NONE=y" >> ${CONFIG} || die
-	einfo "  None driver enabled"
-
-	einfo "  nl80211 driver enabled"
-	echo "CONFIG_DRIVER_NL80211=y" >> ${CONFIG} || die
-
-	# epoll
-	echo "CONFIG_ELOOP_EPOLL=y" >> ${CONFIG} || die
-
-	# misc
-	echo "CONFIG_DEBUG_FILE=y" >> ${CONFIG} || die
-	echo "CONFIG_PKCS12=y" >> ${CONFIG} || die
-	echo "CONFIG_RADIUS_SERVER=y" >> ${CONFIG} || die
-	echo "CONFIG_IAPP=y" >> ${CONFIG} || die
-	echo "CONFIG_IEEE80211R=y" >> ${CONFIG} || die
-	echo "CONFIG_IEEE80211W=y" >> ${CONFIG} || die
-	echo "CONFIG_IEEE80211N=y" >> ${CONFIG} || die
-	echo "CONFIG_IEEE80211AC=y" >> ${CONFIG} || die
-	echo "CONFIG_OCV=y" >> ${CONFIG} || die
-	echo "CONFIG_PEERKEY=y" >> ${CONFIG} || die
-	echo "CONFIG_RSN_PREAUTH=y" >> ${CONFIG} || die
-	echo "CONFIG_INTERWORKING=y" >> ${CONFIG} || die
-	echo "CONFIG_FULL_DYNAMIC_VLAN=y" >> ${CONFIG} || die
-	echo "CONFIG_HS20=y" >> ${CONFIG} || die
-	echo "CONFIG_WNM=y" >> ${CONFIG} || die
-	echo "CONFIG_FST=y" >> ${CONFIG} || die
-	echo "CONFIG_FST_TEST=y" >> ${CONFIG} || die
-	echo "CONFIG_ACS=y" >> ${CONFIG} || die
-
-	if use netlink; then
-		# Netlink support
-		echo "CONFIG_VLAN_NETLINK=y" >> ${CONFIG} || die
-	fi
-
-	if use ipv6; then
-		# IPv6 support
-		echo "CONFIG_IPV6=y" >> ${CONFIG} || die
-	fi
-
-	if use sqlite; then
-		# Sqlite support
-		echo "CONFIG_SQLITE=y" >> ${CONFIG} || die
-	fi
-
-	# If we are using libnl 2.0 and above, enable support for it
-	# Removed for now, since the 3.2 version is broken, and we don't
-	# support it.
-	if has_version ">=dev-libs/libnl-3.2"; then
-		echo "CONFIG_LIBNL32=y" >> ${CONFIG} || die
-		append-cflags $($(tc-getPKG_CONFIG) --cflags libnl-3.0)
-	fi
-
-	# TODO: Add support for BSD drivers
-
-	default
-}
-
-src_compile() {
-	emake V=1
-
-	if ! use internal-tls; then
-		emake V=1 nt_password_hash
-		emake V=1 hlr_auc_gw
-	fi
-}
-
-src_install() {
-	insinto /etc/${PN}
-	doins ${PN}.{conf,accept,deny,eap_user,radius_clients,sim_db,wpa_psk}
-
-	fperms -R 600 /etc/${PN}
-
-	dosbin ${PN}
-	dobin ${PN}_cli
-
-	if ! use internal-tls; then
-		dobin nt_password_hash hlr_auc_gw
-	fi
-
-	newinitd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-init.d ${PN}
-	newconfd "${WORKDIR}/${EXTRAS_NAME}"/${PN}-conf.d ${PN}
-	systemd_dounit "${WORKDIR}/${EXTRAS_NAME}"/${PN}.service
-
-	doman ${PN}{.8,_cli.1}
-
-	dodoc ChangeLog README
-	use wps && dodoc README-WPS
-
-	docinto examples
-	dodoc wired.conf
-
-	insinto /etc/log.d/conf/services/
-	doins logwatch/${PN}.conf
-
-	exeinto /etc/log.d/scripts/services/
-	doexe logwatch/${PN}
-
-	save_config .config
-}
-
-pkg_postinst() {
-	einfo
-	einfo "If you are running OpenRC you need to follow this instructions:"
-	einfo "In order to use ${PN} you need to set up your wireless card"
-	einfo "for master mode in /etc/conf.d/net and then start"
-	einfo "/etc/init.d/${PN}."
-	einfo
-	einfo "Example configuration:"
-	einfo
-	einfo "config_wlan0=( \"192.168.1.1/24\" )"
-	einfo "channel_wlan0=\"6\""
-	einfo "essid_wlan0=\"test\""
-	einfo "mode_wlan0=\"master\""
-	einfo
-
-	#if [[ -e "${KV_DIR}"/net/mac80211 ]]; then
-	#	einfo "This package now compiles against the headers installed by"
-	#	einfo "the kernel source for the mac80211 driver. You should "
-	#	einfo "re-emerge ${PN} after upgrading your kernel source."
-	#fi
-
-	if use wps; then
-		einfo "You have enabled Wi-Fi Protected Setup support, please"
-		einfo "read the README-WPS file in /usr/share/doc/${PF}"
-		einfo "for info on how to use WPS"
-	fi
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index cb58f98a8606..5d07df15f287 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/default/linux/amd64/23.0/readme.txt b/profiles/default/linux/amd64/23.0/readme.txt
new file mode 100644
index 000000000000..4554ad58a9c2
--- /dev/null
+++ b/profiles/default/linux/amd64/23.0/readme.txt
@@ -0,0 +1,135 @@
+
+WARNING - the 23.0 profile tree is still experimental.
+
+Recommended upgrade path:
+(please make sure to read the annotations like [*] if applicable)
+
+default/linux/amd64/17.1
+==> default/linux/amd64/23.0/split-usr
+
+default/linux/amd64/17.1/selinux
+==> default/linux/amd64/23.0/split-usr/selinux
+
+default/linux/amd64/17.1/hardened
+==> default/linux/amd64/23.0/split-usr/hardened
+
+default/linux/amd64/17.1/hardened/selinux
+==> default/linux/amd64/23.0/split-usr/hardened/selinux
+
+default/linux/amd64/17.1/desktop
+==> default/linux/amd64/23.0/split-usr/desktop
+
+default/linux/amd64/17.1/desktop/gnome
+==> default/linux/amd64/23.0/split-usr/desktop/gnome
+
+default/linux/amd64/17.1/desktop/gnome/systemd
+==> default/linux/amd64/23.0/desktop/gnome/systemd  [*]
+
+default/linux/amd64/17.1/desktop/gnome/systemd/merged-usr
+==> default/linux/amd64/23.0/desktop/gnome/systemd
+
+default/linux/amd64/17.1/desktop/plasma
+==> default/linux/amd64/23.0/split-usr/desktop/plasma
+
+default/linux/amd64/17.1/desktop/plasma/systemd
+==> default/linux/amd64/23.0/desktop/plasma/systemd  [*]
+
+default/linux/amd64/17.1/desktop/plasma/systemd/merged-usr
+==> default/linux/amd64/23.0/desktop/plasma/systemd
+
+default/linux/amd64/17.1/desktop/systemd
+==> default/linux/amd64/23.0/desktop/systemd  [*]
+
+default/linux/amd64/17.1/desktop/systemd/merged-usr
+==> default/linux/amd64/23.0/desktop/systemd
+
+default/linux/amd64/17.1/developer
+==> default/linux/amd64/23.0  [*,#]
+
+default/linux/amd64/17.1/no-multilib
+==> default/linux/amd64/23.0/split-usr/no-multilib
+
+default/linux/amd64/17.1/no-multilib/hardened
+==> default/linux/amd64/23.0/split-usr/no-multilib/hardened
+
+default/linux/amd64/17.1/no-multilib/hardened/selinux
+==> default/linux/amd64/23.0/split-usr/no-multilib/hardened/selinux
+
+default/linux/amd64/17.1/no-multilib/systemd
+==> default/linux/amd64/23.0/no-multilib/systemd  [*]
+
+default/linux/amd64/17.1/no-multilib/systemd/merged-usr
+==> default/linux/amd64/23.0/no-multilib/systemd
+
+default/linux/amd64/17.1/no-multilib/systemd/selinux
+==> default/linux/amd64/23.0/no-multilib/selinux/systemd  [*]
+
+default/linux/amd64/17.1/no-multilib/systemd/selinux/merged-usr
+==> default/linux/amd64/23.0/no-multilib/selinux/systemd
+
+default/linux/amd64/17.1/systemd
+==> default/linux/amd64/23.0/systemd  [*]
+
+default/linux/amd64/17.1/systemd/merged-usr
+==> default/linux/amd64/23.0/systemd
+
+default/linux/amd64/17.1/systemd/selinux
+==> default/linux/amd64/23.0/selinux/systemd  [*]
+
+default/linux/amd64/17.1/systemd/selinux/merged-usr
+==> default/linux/amd64/23.0/selinux/systemd
+
+default/linux/amd64/17.1/clang
+==> default/linux/amd64/23.0/split-usr/llvm
+
+default/linux/amd64/17.1/systemd/clang
+==> default/linux/amd64/23.0/llvm/systemd  [*]
+
+default/linux/amd64/17.1/systemd/clang/merged-usr
+==> default/linux/amd64/23.0/llvm/systemd
+
+default/linux/amd64/17.0/x32
+==> default/linux/amd64/23.0/split-usr/x32
+
+default/linux/amd64/17.0/x32/systemd
+==> default/linux/amd64/23.0/x32/systemd  [*]
+
+default/linux/amd64/17.0/x32/systemd/merged-usr
+==> default/linux/amd64/23.0/x32/systemd
+
+default/linux/amd64/17.0/musl
+
+default/linux/amd64/17.0/musl/clang
+
+default/linux/amd64/17.0/musl/hardened
+
+default/linux/amd64/17.0/musl/hardened/selinux
+
+default/linux/amd64/17.0/no-multilib/prefix/kernel-3.2+
+==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-3.2+  [&]
+
+default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.32+
+==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.32+  [&]
+
+default/linux/amd64/17.0/no-multilib/prefix/kernel-2.6.16+
+==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.16+  [&]
+
+default/linux/amd64/17.1/no-multilib/prefix/kernel-3.2+
+==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-3.2+
+
+default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.32+
+==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.32+
+
+default/linux/amd64/17.1/no-multilib/prefix/kernel-2.6.16+
+==> default/linux/amd64/23.0/split-usr/no-multilib/prefix/kernel-2.6.16+
+
+
+
+[*] This upgrade switches from split-usr to merged-usr layout since
+    the corresponding profile is not available anymore.
+    Please follow the migration guide.
+
+[#] The developer profiles are gone. Please migrate eventual settings
+    to your make.conf.
+
+[&] You will have to do the symlink migration from 17.0 to 17.1 first.
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index c91a2fa52d0d..35123879a70b 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-openssl/Manifest b/sec-keys/openpgp-keys-openssl/Manifest
index aedf88f90f94..9060cacce8ae 100644
--- a/sec-keys/openpgp-keys-openssl/Manifest
+++ b/sec-keys/openpgp-keys-openssl/Manifest
@@ -8,5 +8,5 @@ DIST openssl-keys-20221101-B7C1C14360F353A36862E4D5231C84CDDCC69C45.asc 2249 BLA
 DIST openssl-keys-20221101-C1F33DD8CE1D4CC613AF14DA9195C48241FBF7DD.asc 1534 BLAKE2B b572d5893a44f120b5ddec55d96d53cb5bd490e563253906f597fb8253c198f0fa318a955b4f30db3b93565ea87e0e423db661de17253fc2255843513a86b6b6 SHA512 359acc73f14e9c6ba68729b234f0bc94d67bc16eec7a18bb641bdfc8d51e19c2afa96292e99c97308ebce4bb5e4aa040beabba051f08b42fca242dff2e99b7f7
 DIST openssl-keys-20221101-E5E52560DD91C556DDBDA5D02064C53641C25E5D.asc 6131 BLAKE2B 36e076cb5ab722c5efe378fc70a9109c30db12bf59af3634af0b7df1cc6beaec8d1fdf5099ffbfb66ce59d51581009ed59278336238755122ba5126cf1b191e5 SHA512 ee72fff17111f437b372b0bbfaa851075125da524a8d0f861232fe9bec2da0c0933c4d0ab3fa9ad1aa9015f9ae302773d0f5eb25bea270f0a5884f0d5b9b6fc1
 EBUILD openpgp-keys-openssl-20220316-r1.ebuild 946 BLAKE2B 6b8ac9655a53640847401483270e68c1841f91c1c29fac69c8a40298854881d02306ab5c9725230e622f64cf6c642276bc8bc797f682bbfacb202c871d7ff81e SHA512 c6efc3cbee447ba2e3d3708b0c3a68787d475458a57f7c3f3d0743a72e259f8c517054678d01ea764c5fe59b6a745bbcdc45cb81e47978a28f20fcf30ce71341
-EBUILD openpgp-keys-openssl-20221101.ebuild 1887 BLAKE2B cc75ae5c1a581d0846c73eaadc8f06f7485a7180f39e663046d1bc2e4effd01add90d073ef12b5a374182ba750e84a9c771d01b534b4bd2497030dc05eeaf464 SHA512 88f659b25a04c54af967cc01d3f739cdb44c13c2d50ba0e93c8ae952aef686c86b3bc8bcd2ab7549e2e3684e842b9ef376fa58903b74c04de1df858f186c7740
+EBUILD openpgp-keys-openssl-20221101.ebuild 1883 BLAKE2B a96c1a61eb0976a42da72dee4e3092fa83bbf267f0af061eaaea48677092496e40a1ee7148b33d55618fd0708c83597abce7404a3f716f017bd74fc8fe6248e3 SHA512 99f41f7bd71c7dbc0a5877c5e3cf501a7f47d562fc0a52c33aecf5a3a7fb7a6a26d9a1f09ca554340a19501df5c7f39157f124778b19a0ec347c13713ccfca0b
 MISC metadata.xml 248 BLAKE2B 4d2533691da4a661545bc76aae55b72077dd0f54a21c67450fad5565393db92779160e268c4ac7e1557cef6ac13e9476b32c6ff6e516c3afd404ab40a28164b3 SHA512 5c660412e95fdb471f41390d1d2fe96c549f2a00c932b2ce5832a56d3ce49df6b08991bfdcabcb296434d0d6599bdb3fb1ec4dbf7373fe2effaa6655ab411184
diff --git a/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20221101.ebuild b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20221101.ebuild
index a74cc406ce37..5a55eef3f50c 100644
--- a/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20221101.ebuild
+++ b/sec-keys/openpgp-keys-openssl/openpgp-keys-openssl-20221101.ebuild
@@ -55,7 +55,7 @@ S="${WORKDIR}"
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ppc64 ~riscv ~s390 ~sparc ~x86"
 
 src_install() {
 	local files=( ${A} )
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index 31ab257bc5c3..3e76d0228519 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/portage/Manifest b/sys-apps/portage/Manifest
index c72214f494e0..5adaff56d546 100644
--- a/sys-apps/portage/Manifest
+++ b/sys-apps/portage/Manifest
@@ -7,6 +7,6 @@ AUX portage-tmpdir.conf 76 BLAKE2B 79f35df57dbdcd461d94d558212261df7df54253d5205
 DIST portage-3.0.38.1.tar.bz2 1116216 BLAKE2B d1cb4cc1924673d07ea7174ad0a84b3af977dd28ca659695d3e4014e4aa83b054acba82a160e7c0a8d3d4fbc3514bea619c3d720e450cb4890818e4b1bc1e43a SHA512 1375565e936276fd6cfd2a4f6f782b91e234e973d6a998f2276a076dd165272bcf12067fd01e77b238f194eac69edf967bbe3ac62edc3701fe9375c693622ab9
 DIST portage-3.0.41.tar.bz2 1119737 BLAKE2B 6c6d1fa11f16362505e321eb530d233cf73a7e1cc7dab2fc88ad40701c16835e08a7d16a408381e2f717ac5f48d46344e57b9b5296be4eba0a7583540c6a81aa SHA512 046621ee59b2b1b374a63091028ed3462b1212960b337e8e034c739d5c51d5ae1e7b491c88940199e710081409e38778749a5c86576cf5bb6c59b1890dc892b5
 EBUILD portage-3.0.38.1-r4.ebuild 9166 BLAKE2B a16bc125979b171a567935314d6895c371fa90394e7366dc4af678541817cdd8cd44ac1d30005953298b936db059fe226b47678d5cb0eb2610c0e871a39204b1 SHA512 bd647fbe3f7255de375a36b5bc843113fcf1505de5d9851b088546c94ca85d369e84647af7d8eb3115e5c0fab61616ab0aff6fb3d5691bc1d1ac20c4f0a61e23
-EBUILD portage-3.0.41.ebuild 9130 BLAKE2B 3c91fcdfbc8b1bb1fe24326b96ab344dd917a36b18b47d02b5b14bcfcb69e0f15c41d174e79716570fdff8d3181ecc85c006833eccbeca8b2a258020894e471d SHA512 f8b87636dd4933dcb2ed4da1a257780560ed09c1e0d70fcf8cb7b58215efff9256cb175ddd70193a1eec8f8cf2117aaf7fd0127fd57d1a2ee3d438f0cee2bbde
-EBUILD portage-9999.ebuild 8377 BLAKE2B 11d2bb192cd0fb41b528f7b7fa734aa91432d3a3dd51a28d8d1ab4c9f4d677e2f6ebc3caa0dce66651ce73c1d4a9a6cb5210cd7e392c88817fa2b55db12d492a SHA512 71551c10785fe35c4856e4d33343e59a663e16ff1d1d0bdcbaed58be4dd083e51a63b142fb7d17ace1ca9bd9b307a8597c5a3d0344693555cfa784d68fee91ec
+EBUILD portage-3.0.41.ebuild 9133 BLAKE2B da86606f3d9ccd9d6a8b60984215b05e929e647b19ba80fdfe5f15ebf22ba13b3742eeb47f3cf58e135a8d49af899c4fe58d9e50d12c209ab5b326144002210a SHA512 bda79871838d335b63b8e54c5ea5ca765fb0a95dda6da37a1c9fe11d6eaf58d0e0ef978a15f6446e77f92124146d393a82871171cc8cf0d37cb95689e7273db5
+EBUILD portage-9999.ebuild 8380 BLAKE2B 4fe3b5d204bc48a037b47b96a3ef07699ba6f46fdcf21d861c9123c53f406ee9f55ca15fc7d4d361defec55f3223c172ed611a7368f7087caf886b5bad53dc18 SHA512 8cd9e1d18b15d5f70c5d8b21c4b23362d68b32f59fa739f70f3d60b6aa54ae1d5bbf22d61b1ea174aaff97c9006e3b7c36ddc92d55bff77afdd0968a1ae2af52
 MISC metadata.xml 1487 BLAKE2B 5b9833e8bfc2c38e4db95f2368a65d85623aa8dd166e4e09bed4cbe3a7e59d47da69a9dff1e6615fd64f349cc05f57217ee61ebfd23e3e13622a7573ea135659 SHA512 b22f8c1f3a4dce636d0f823f1303f60d32fd570b484e93a64dfbdcbe145534b3472ae94c1ac992a478c9e2930fbc8a5311e0080b4722f9b5dc29dff59ddaa7c8
diff --git a/sys-apps/portage/portage-3.0.41.ebuild b/sys-apps/portage/portage-3.0.41.ebuild
index 432429097eab..bf69edc241ee 100644
--- a/sys-apps/portage/portage-3.0.41.ebuild
+++ b/sys-apps/portage/portage-3.0.41.ebuild
@@ -160,7 +160,7 @@ python_prepare_all() {
 	fi
 
 	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
+	if [[ -f "make.conf.example.${ARCH}".diff ]] ; then
 		patch make.conf.example "make.conf.example.${ARCH}".diff || \
 			die "Failed to patch make.conf.example"
 	else
diff --git a/sys-apps/portage/portage-9999.ebuild b/sys-apps/portage/portage-9999.ebuild
index 9d56bb80d781..5cb014dee233 100644
--- a/sys-apps/portage/portage-9999.ebuild
+++ b/sys-apps/portage/portage-9999.ebuild
@@ -155,7 +155,7 @@ python_prepare_all() {
 	fi
 
 	cd "${S}/cnf" || die
-	if [ -f "make.conf.example.${ARCH}".diff ]; then
+	if [[ -f "make.conf.example.${ARCH}".diff ]] ; then
 		patch make.conf.example "make.conf.example.${ARCH}".diff || \
 			die "Failed to patch make.conf.example"
 	else
diff --git a/sys-apps/sed/Manifest b/sys-apps/sed/Manifest
index 3372d2f98c34..fa7375a10226 100644
--- a/sys-apps/sed/Manifest
+++ b/sys-apps/sed/Manifest
@@ -5,5 +5,5 @@ DIST sed-4.9.tar.xz 1397092 BLAKE2B 6c7c7dc782b87c3bd0b5e826ba46c2f1dc7bd8c11599
 DIST sed-4.9.tar.xz.sig 833 BLAKE2B 256bb112aa3aec1a8d40544ef1b0a7570f35d66369047ed3d261c57f938042dcb4a169137eaed6639bcfb472e4a6fc6ebec2de243b2c4d4c0ba0e9081f92556d SHA512 ceb235850184b99017783486e182ade9db38313d20b2b34d23f54d8affe180f7a191139b993e8ec7718ca33eff732f547ca4b3b59aaf865feaae611dfeae5c46
 EBUILD sed-4.8-r1.ebuild 1367 BLAKE2B 968433d890a8dc4580dbbc3a838cf30fce88d759ad62ae5a14b46007a817f2ab8a12baf6f8e4a1ed0d4203a69b7fffafae9a904c8dbf26352a44381ccd39967d SHA512 f5e471827bc96436b28501129153b6c2383ec618861ddc78ffe0049d6fd3f2a0c245bff7332fae9da07be1040fbde67f72ae74cf0e198ac4977dd2651b15d40a
 EBUILD sed-4.8.ebuild 1168 BLAKE2B f37487186c7ddd1e36f5aa18c6bfb6e57b8e4ffd947c1e1d43212ecc801d1cc11d1f4ec4c38c82b5baf7a2977fd119daeb2b57db600b6f5aedbef6c6b602bf40 SHA512 dd3c72f6c08075537e71e2760b1cd64dfe12a8c4f20325d92e0994d8dc426c68bbbf800938264276794afa5f120fa16d40cd3401297dfdca97a909f11b1f5610
-EBUILD sed-4.9.ebuild 1302 BLAKE2B fa5bdcd6a2a12c8104f48e57b1c34b81b099580d11b8a3b3e1e0bd91efe509cfe2b8840024917a0938ce6209faca795e54dea8604e836f5ecb5bb78c1e4dde03 SHA512 fca1ad908dfe0861e7417fa0208e34bde5c4854eaf12448e51457d868d2ba0b74feb2b432a304b01f1cb63af7dea258df8118fe8624d0326838d2749f8965fa7
+EBUILD sed-4.9.ebuild 1295 BLAKE2B d9f06c5edd70dac7f81d077a4e7afc305ddca083133c36bb851de956d8b8cb5e5a3c77ac75a7b2552d6937b60516772c5d9ba3dcb22f204d512259f70d5a5c22 SHA512 64d0ce04b73e02878225c013e5b024aaa16b15f37805a493e2ebf236850c9c8d53857d76acb223ba7c315946e176eee5b46858f3461854f6c4ec87d6790aa401
 MISC metadata.xml 374 BLAKE2B a7f25f18d1ffcd990f11d66f403f5e283af61b7a81127b8a4450506b5432610972d4d28df0c60b5e45d502d2f2e260f0390836b43d9e5efd48e4594796f751c4 SHA512 7efb14e44bc0d9d25b0e90f776f25ee5fbcb8b44b226255dcdd5e54cb1fb414f9c7dcd33ec2aa6f6bfa82159be8bba19069fc9e13576bfe2b99a87c898f2d002
diff --git a/sys-apps/sed/sed-4.9.ebuild b/sys-apps/sed/sed-4.9.ebuild
index 1c4032498092..acbbafc860a5 100644
--- a/sys-apps/sed/sed-4.9.ebuild
+++ b/sys-apps/sed/sed-4.9.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( mirror://gnu/sed/${P}.tar.xz.sig )"
 
 LICENSE="GPL-3+"
 SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
 IUSE="acl nls selinux static"
 
 RDEPEND="
diff --git a/sys-apps/systemd-utils/Manifest b/sys-apps/systemd-utils/Manifest
index bc386c8cc31b..308bc313c1e0 100644
--- a/sys-apps/systemd-utils/Manifest
+++ b/sys-apps/systemd-utils/Manifest
@@ -6,10 +6,8 @@ AUX systemd-tmpfiles-clean 58 BLAKE2B 6a33f92a136218f3a27ea31e5cdd519706b15a3bba
 AUX systemd-tmpfiles-setup 329 BLAKE2B 7b4d801ec7c29a3d6073c47af8fa1c9fa670b3762c5358d0008ecf372e675e3f65cba3ea453d374c5e23453cfe32252421b69dff23aaeea636c611b960eb7b11 SHA512 cd7f7c69d1b1861cb4eac90d44579361e365ee77906376b6124ff79ba1c0d414b8891ffca19e715585d7400bddc5e9ad973f191125039a4a2c37acb95a111c37
 AUX systemd-tmpfiles-setup-dev 342 BLAKE2B 95956e57d4f2aa10a09f23c08045ceed6fac3c569ee604a83707310f074740a41832d2e3fa3b528a3816202132e18be50ce40dbcded9430031ed9a2a172d3187 SHA512 3c5e29fc5bc2829984458149de1186075eec48775983376a8b47da162cbf4892754f19a3b277170f8b759a862bb5d910789da1db2bbf8447d6dacccb411be222
 DIST systemd-musl-patches-251.2.tar.gz 28512 BLAKE2B 4ac6a5220dab8409962a3954af2fb2484af718d0f282129957236ce241fbe8538a90d507a96c7c3d86f4f408ab784a6888b37486405d3276e7734a1bd5aa9680 SHA512 6e56b62234ac54929faea5a7cad699d0b932f869b48e3ba4e1f349a88653b7c787efec24a09b00290c3dc566614e3c1dc2f3c04f04e943f513108a91eca1be82
-DIST systemd-stable-251.4.tar.gz 11440203 BLAKE2B 58a0ee4adcc9d35b15b9cc98b3da81d1103b61a6c0bee722468a5113cd7d6de1d40c46ef964ba9ecc4746e81b516ae4b2f1d046874d62db066735c652592612e SHA512 7bbfadd80b88a4c3510a5e4e3572e4eab71dafbf6289da038e552988e09ee8da16da3c9bb8a4fbbde6c6236e0e3c352b0a33f9ee0b84f10241f3499383387738
 DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc89e5e7ac1cc3b163e2af2a582211b91316da5ffba37b854978b7b2a5b3f9aae3651701a23e4391da6676e078747df1a37b SHA512 a4c06b2d25c47af58abb1e1dc85737b2fb0eb394f09d2bb7c6b7b716cb4b1383a145885bbc8e5ffcdc26611fd44d362fba2152c4dd0ead6a03a93965b82bb9a4
 DIST systemd-stable-251.8.tar.gz 11457551 BLAKE2B d4ca799a5b22164362fa8948bbec95215d6ebc04380f13f755916c4bfd4e1cc43a82177c21d2c56aa9d8440b44872b773f21682fc127c7f6d2b3542661c27d80 SHA512 c337fad3cf2beef11401850ddd6418efef035d4ec6405049084302738042f77ac1f8bfd7eb3611668a13038878389c9617e63278ec0b37782b3e0242e69c4843
-EBUILD systemd-utils-251.4-r2.ebuild 12125 BLAKE2B 52231a564efb262dd4c92e9f25a977ba437a5b82f9d85ac0218f8abc11a79cc169a774527ff8b35908a52b8506ff31b79b8e110c34272341f53c455c26800b19 SHA512 2c03448bb728c023ea733146a3b5e8e0131070b0fd01ca7d25c6f5ab49e66645a223b2a85db4dace2923e4d4dc1541a84b6f499be61fe45d73b7e1e59e6c91b7
 EBUILD systemd-utils-251.7.ebuild 12136 BLAKE2B 2f408ed102c3665bfa2f29272dc95a138f7ac34d8f28be72c6fbafea60da14ebb0a2331adb0a1405fe4792582800dfb80c5e296a4894e0a141a17d1503084e04 SHA512 148ab4d8aa2d22fc1e16ce46d09a3f00cc88a3db245fee4fda57634e20cf3bcd4d97167fcef6f2381171ccb0be8de70580c06495ee95df2ff6c746fb08ba1e94
 EBUILD systemd-utils-251.8-r1.ebuild 11954 BLAKE2B 81aa07ef9fadf86b368d447f4f71e03f9aa481e9b5a8ef11458a39ad558338742b7350c6eacbe4521b02352192dd351ba7b44cd6192939cb834439fce59143eb SHA512 7e9f86f068521089966b7b91f11e2028cd107d0349b7f579839bd6be7abe920f7cbb00ef55bd97a67d5c7b676e5cbc39200fdd860ec34d654b33e75ca8f6c404
 MISC metadata.xml 713 BLAKE2B 1dcb5d9949600c9a8c8ac0c005ffa03b2ca91293a932fa96092a24c094e9fb29f2cf063af041432c12daec4aa4e60d11ea77ed0a423e188095f995c68e75b91a SHA512 46d167a6d898abfc56130e373d232c18fb3ef8865755379fa7678c049515458e7354b7a8cab3bf3faa7326932cccceb0b0745b4695ab9bea492bc2344abf9da4
diff --git a/sys-apps/systemd-utils/systemd-utils-251.4-r2.ebuild b/sys-apps/systemd-utils/systemd-utils-251.4-r2.ebuild
deleted file mode 100644
index f5bf60312050..000000000000
--- a/sys-apps/systemd-utils/systemd-utils-251.4-r2.ebuild
+++ /dev/null
@@ -1,527 +0,0 @@
-# Copyright 2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PYTHON_COMPAT=( python3_{8..11} )
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-inherit bash-completion-r1 flag-o-matic meson-multilib python-any-r1 toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="Utilities split out from systemd for OpenRC users"
-HOMEPAGE="https://systemd.io/"
-
-if [[ ${PV} == *.* ]]; then
-	MY_P="systemd-stable-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/systemd/systemd-stable/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-else
-	MY_P="systemd-${PV}"
-	S="${WORKDIR}/${MY_P}"
-	SRC_URI="https://github.com/systemd/systemd/archive/refs/tags/v${PV}.tar.gz -> ${MY_P}.tar.gz"
-fi
-
-MUSL_PATCHSET="systemd-musl-patches-251.2"
-SRC_URI+=" elibc_musl? ( https://dev.gentoo.org/~floppym/dist/${MUSL_PATCHSET}.tar.gz )"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="+acl boot +kmod selinux split-usr sysusers +tmpfiles test +udev"
-REQUIRED_USE="|| ( boot tmpfiles sysusers udev )"
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND="
-	elibc_musl? ( >=sys-libs/musl-1.2.3 )
-	selinux? ( sys-libs/libselinux:0= )
-	tmpfiles? (
-		acl? ( sys-apps/acl:0= )
-	)
-	udev? (
-		>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-		sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-		virtual/libcrypt:=[${MULTILIB_USEDEP}]
-		acl? ( sys-apps/acl:0= )
-		kmod? ( >=sys-apps/kmod-15:0= )
-	)
-	!udev? (
-		>=sys-apps/util-linux-2.30:0=
-		sys-libs/libcap:0=
-		virtual/libcrypt:=
-	)
-"
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-3.11
-	boot? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-RDEPEND="${COMMON_DEPEND}
-	boot? ( !<sys-boot/systemd-boot-250 )
-	tmpfiles? ( !<sys-apps/systemd-tmpfiles-250 )
-	udev? (
-		acct-group/audio
-		acct-group/cdrom
-		acct-group/dialout
-		acct-group/disk
-		acct-group/input
-		acct-group/kmem
-		acct-group/kvm
-		acct-group/lp
-		acct-group/render
-		acct-group/sgx
-		acct-group/tape
-		acct-group/tty
-		acct-group/video
-		!sys-apps/gentoo-systemd-integration
-		!sys-apps/hwids[udev]
-		!<sys-fs/udev-250
-		!sys-fs/eudev
-	)
-	!sys-apps/systemd
-"
-PDEPEND="
-	udev? ( >=sys-fs/udev-init-scripts-34 )
-"
-BDEPEND="
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt
-	dev-util/gperf
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-python_check_deps() {
-	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]"
-}
-
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-
-src_prepare() {
-	local PATCHES=(
-		# Breaks Clang. Revert the commit for now and force off F_S=3.
-		"${FILESDIR}/251-revert-fortify-source-3-fix.patch"
-	)
-
-	if use elibc_musl; then
-		PATCHES+=( "${WORKDIR}/${MUSL_PATCHSET}" )
-		# Applied upstream in 251.3
-		rm "${WORKDIR}/${MUSL_PATCHSET}/0001-Add-sys-file.h-for-LOCK_.patch" || die
-	fi
-	default
-
-	# Remove install_rpath; we link statically
-	local rpath_pattern="install_rpath : rootlibexecdir,"
-	grep -q -e "${rpath_pattern}" meson.build || die
-	sed -i -e "/${rpath_pattern}/d" meson.build || die
-}
-
-src_configure() {
-	# When bumping to 251, please keep this, but add the revert patch
-	# like in sys-apps/systemd!
-	#
-	# Broken with FORTIFY_SOURCE=3 without a patch. And the patch
-	# wasn't backported to 250.x, but it turns out to break Clang
-	# anyway:  bug #841770.
-	#
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-		# We can't unconditionally do this b/c we fortify needs
-		# some level of optimisation.
-		filter-flags -D_FORTIFY_SOURCE=3
-		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local emesonargs=(
-		$(meson_use split-usr)
-		$(meson_use split-usr split-bin)
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		-Dsysvinit-path=
-		$(meson_native_use_bool boot efi)
-		$(meson_native_use_bool boot gnu-efi)
-		$(meson_native_use_bool boot kernel-install)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool sysusers)
-		$(meson_use test tests)
-		$(meson_native_use_bool tmpfiles)
-		$(meson_use udev hwdb)
-
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-
-		# Link staticly with libsystemd-shared
-		-Dlink-boot-shared=false
-		-Dlink-udev-shared=false
-
-		# systemd-tmpfiles has a separate "systemd-tmpfiles.standalone" target
-		-Dstandalone-binaries=true
-
-		# Disable all optional features
-		-Dadm-group=false
-		-Danalyze=false
-		-Dapparmor=false
-		-Daudit=false
-		-Dbacklight=false
-		-Dbinfmt=false
-		-Dbzip2=false
-		-Dcoredump=false
-		-Ddbus=false
-		-Delfutils=false
-		-Denvironment-d=false
-		-Dfdisk=false
-		-Dgcrypt=false
-		-Dglib=false
-		-Dgshadow=false
-		-Dgnutls=false
-		-Dhibernate=false
-		-Dhostnamed=false
-		-Didn=false
-		-Dima=false
-		-Dinitrd=false
-		-Dfirstboot=false
-		-Dldconfig=false
-		-Dlibcryptsetup=false
-		-Dlibcurl=false
-		-Dlibfido2=false
-		-Dlibidn=false
-		-Dlibidn2=false
-		-Dlibiptc=false
-		-Dlocaled=false
-		-Dlogind=false
-		-Dlz4=false
-		-Dmachined=false
-		-Dmicrohttpd=false
-		-Dnetworkd=false
-		-Dnscd=false
-		-Dnss-myhostname=false
-		-Dnss-resolve=false
-		-Dnss-systemd=false
-		-Doomd=false
-		-Dopenssl=false
-		-Dp11kit=false
-		-Dpam=false
-		-Dpcre2=false
-		-Dpolkit=false
-		-Dportabled=false
-		-Dpstore=false
-		-Dpwquality=false
-		-Drandomseed=false
-		-Dresolve=false
-		-Drfkill=false
-		-Dseccomp=false
-		-Dsmack=false
-		-Dsysext=false
-		-Dtimedated=false
-		-Dtimesyncd=false
-		-Dtpm=false
-		-Dqrencode=false
-		-Dquotacheck=false
-		-Duserdb=false
-		-Dutmp=false
-		-Dvconsole=false
-		-Dwheel-group=false
-		-Dxdg-autostart=false
-		-Dxkbcommon=false
-		-Dxz=false
-		-Dzlib=false
-		-Dzstd=false
-	)
-
-	if use tmpfiles || use udev; then
-		emesonargs+=( $(meson_native_use_bool acl) )
-	else
-		emesonargs+=( -Dacl=false )
-	fi
-
-	if use udev; then
-		emesonargs+=( $(meson_native_use_bool kmod) )
-	else
-		emesonargs+=( -Dkmod=false )
-	fi
-
-	if use elibc_musl; then
-		# Avoid redefinition of struct ethhdr.
-		append-cppflags -D__UAPI_DEF_ETHHDR=0
-	fi
-
-	if multilib_is_native_abi || use udev; then
-		meson_src_configure
-	fi
-}
-
-efi_arch() {
-	case "$(tc-arch)" in
-		amd64) echo x64 ;;
-		arm)   echo arm ;;
-		arm64) echo aa64 ;;
-		x86)   echo x86 ;;
-	esac
-}
-
-multilib_src_compile() {
-	local targets=()
-	if multilib_is_native_abi; then
-		if use boot; then
-			targets+=(
-				bootctl
-				kernel-install
-				man/bootctl.1
-				man/kernel-install.8
-				src/boot/efi/linux$(efi_arch).{efi,elf}.stub
-				src/boot/efi/systemd-boot$(efi_arch).efi
-			)
-		fi
-		if use sysusers; then
-			targets+=(
-				systemd-sysusers.standalone
-				man/sysusers.d.5
-				man/systemd-sysusers.8
-			)
-			if use test; then
-				targets+=(
-					systemd-runtest.env
-				)
-			fi
-		fi
-		if use tmpfiles; then
-			targets+=(
-				systemd-tmpfiles.standalone
-				man/tmpfiles.d.5
-				man/systemd-tmpfiles.8
-			)
-			if use test; then
-				targets+=( test-tmpfiles )
-			fi
-		fi
-		if use udev; then
-			targets+=(
-				udevadm
-				systemd-hwdb
-				src/udev/ata_id
-				src/udev/cdrom_id
-				src/udev/fido_id
-				src/udev/mtd_probe
-				src/udev/scsi_id
-				src/udev/udev.pc
-				src/udev/v4l_id
-				man/udev.conf.5
-				man/systemd.link.5
-				man/hwdb.7
-				man/udev.7
-				man/systemd-hwdb.8
-				man/systemd-udevd.service.8
-				man/udevadm.8
-				hwdb.d/60-autosuspend-chromiumos.hwdb
-				rules.d/50-udev-default.rules
-				rules.d/64-btrfs.rules
-			)
-			if use test; then
-				targets+=(
-					# Used by udev-test.pl
-					systemd-detect-virt
-					test/sys
-					test-udev
-
-					test-fido-id-desc
-					test-udev-builtin
-					test-udev-event
-					test-udev-netlink
-					test-udev-node
-					test-udev-util
-				)
-			fi
-		fi
-	fi
-	if use udev; then
-		targets+=(
-			udev:shared_library
-			src/libudev/libudev.pc
-		)
-		if use test; then
-			targets+=(
-				test-libudev
-				test-libudev-sym
-				test-udev-device-thread
-			)
-		fi
-	fi
-	if multilib_is_native_abi || use udev; then
-		meson_src_compile "${targets[@]}"
-	fi
-}
-
-multilib_src_test() {
-	local tests=()
-	if multilib_is_native_abi; then
-		if use sysusers; then
-			tests+=(
-				test-sysusers.standalone
-			)
-		fi
-		if use tmpfiles; then
-			tests+=(
-				test-systemd-tmpfiles.standalone
-				test-tmpfiles
-			)
-		fi
-		if use udev; then
-			tests+=(
-				rule-syntax-check
-				test-fido-id-desc
-				test-udev-builtin
-				test-udev-event
-				test-udev-netlink
-				test-udev-node
-				test-udev-util
-			)
-			if [[ -w /dev ]]; then
-				tests+=( udev-test )
-			else
-				ewarn "Skipping udev-test (needs write access to /dev)"
-			fi
-		fi
-	fi
-	if use udev; then
-		tests+=(
-			test-libudev
-			test-libudev-sym
-			test-udev-device-thread
-		)
-	fi
-	if [[ ${#tests[@]} -ne 0 ]]; then
-		meson_src_test "${tests[@]}"
-	fi
-}
-
-src_install() {
-	local rootprefix="$(usex split-usr '' /usr)"
-	meson-multilib_src_install
-}
-
-multilib_src_install() {
-	if multilib_is_native_abi; then
-		if use boot; then
-			into /usr
-			dobin bootctl kernel-install
-			doman man/{bootctl.1,kernel-install.8}
-			insinto usr/lib/systemd/boot/efi
-			doins src/boot/efi/{linux$(efi_arch).{efi,elf}.stub,systemd-boot$(efi_arch).efi}
-		fi
-		if use sysusers; then
-			into "${rootprefix:-/}"
-			newbin systemd-sysusers{.standalone,}
-			doman man/{systemd-sysusers.8,sysusers.d.5}
-		fi
-		if use tmpfiles; then
-			into "${rootprefix:-/}"
-			newbin systemd-tmpfiles{.standalone,}
-			doman man/{systemd-tmpfiles.8,tmpfiles.d.5}
-		fi
-		if use udev; then
-			into "${rootprefix:-/}"
-			dobin udevadm systemd-hwdb
-			dosym ../../bin/udevadm "${rootprefix}"/lib/systemd/systemd-udevd
-
-			exeinto "${rootprefix}"/lib/udev
-			doexe src/udev/{ata_id,cdrom_id,fido_id,mtd_probe,scsi_id,v4l_id}
-
-			insinto "${rootprefix}"/lib/udev/rules.d
-			doins rules.d/*.rules
-
-			insinto "${rootprefix}"/lib/udev/hwdb.d
-			doins hwdb.d/*.hwdb
-
-			insinto /usr/share/pkgconfig
-			doins src/udev/udev.pc
-
-			doman man/{udev.conf.5,systemd.link.5,hwdb.7,systemd-hwdb.8,udev.7,udevadm.8}
-			newman man/systemd-udevd.service.8 systemd-udevd.8
-		fi
-	fi
-	if use udev; then
-		meson_install --no-rebuild --tags libudev
-		gen_usr_ldscript -a udev
-		insinto "/usr/$(get_libdir)/pkgconfig"
-		doins src/libudev/libudev.pc
-	fi
-}
-
-multilib_src_install_all() {
-	einstalldocs
-	if use boot; then
-		into /usr
-		exeinto usr/lib/kernel/install.d
-		doexe src/kernel-install/*.install
-		dobashcomp shell-completion/bash/bootctl
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/{_bootctl,_kernel-install}
-	fi
-	if use tmpfiles; then
-		doinitd "${FILESDIR}"/systemd-tmpfiles-setup
-		doinitd "${FILESDIR}"/systemd-tmpfiles-setup-dev
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/_systemd-tmpfiles
-	fi
-	if use udev; then
-		doheader src/libudev/libudev.h
-
-		insinto /etc/udev
-		doins src/udev/udev.conf
-		keepdir /etc/udev/{hwdb.d,rules.d}
-
-		insinto "${rootprefix}"/lib/systemd/network
-		doins network/99-default.link
-
-		# Remove to avoid conflict with elogind
-		# https://bugs.gentoo.org/856433
-		rm rules.d/70-power-switch.rules || die
-		insinto "${rootprefix}"/lib/udev/rules.d
-		doins rules.d/*.rules
-		doins "${FILESDIR}"/40-gentoo.rules
-
-		insinto "${rootprefix}"/lib/udev/hwdb.d
-		doins hwdb.d/*.hwdb
-
-		dobashcomp shell-completion/bash/udevadm
-
-		insinto /usr/share/zsh/site-functions
-		doins shell-completion/zsh/_udevadm
-	fi
-}
-
-add_service() {
-	local initd=$1
-	local runlevel=$2
-
-	ebegin "Adding '${initd}' service to the '${runlevel}' runlevel"
-	mkdir -p "${EROOT}/etc/runlevels/${runlevel}" &&
-	ln -snf "${EPREFIX}/etc/init.d/${initd}" "${EROOT}/etc/runlevels/${runlevel}/${initd}"
-	eend $?
-}
-
-pkg_postinst() {
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		add_service systemd-tmpfiles-setup-dev sysinit
-		add_service systemd-tmpfiles-setup boot
-	fi
-	if use udev; then
-		ebegin "Updating hwdb"
-		systemd-hwdb --root="${ROOT}" update
-		eend $?
-		udev_reload
-	fi
-}
diff --git a/sys-apps/systemd/Manifest b/sys-apps/systemd/Manifest
index 2b96ade9342b..03d0362545c4 100644
--- a/sys-apps/systemd/Manifest
+++ b/sys-apps/systemd/Manifest
@@ -6,13 +6,9 @@ AUX gentoo-journald-audit.patch 1485 BLAKE2B 9cba28ce907330bbc1eafcf04a837987ed6
 AUX gentoo-systemctl-disable-sysv-sync-r1.patch 821 BLAKE2B f5ef796725e023bb1ed83b34a3e4d45bb008de9a134892a5321b37b56809c7a44530d18e33c7877177e8b64b2d89dfc2de844bed433db6d5e57831d20fbfb456 SHA512 8d697dbd305f6b95a4ddc47cf9d99a0e954f54e161bd59164917b62a78ff5c23fa2d5be2614569c0a2297595dae59e1ee71bb04da72cbe0c0807e1abd7da974d
 AUX nsswitch.conf 734 BLAKE2B 5f5a7821a84f6c8aa31fe9a68c29a1a0f24be578d427a623f14a9ef795e7da481f226efe5511d92932b5edf5638fa719808a0c3a0b8fd340799dd6bcb703a0a1 SHA512 dcbd51dacaaebdff32edb3840cc7b9b47b6521009b8786690e3673a2e78bc60bfd8e591b1048c5d452117c6659b9917ae2864462f5057cc39b704b0130522e60
 AUX systemd-user.pam 122 BLAKE2B cccc07cab47dfc0481438e503c34fa1a0b2c6b1f8ab282197719a523421d2a526f19230bb459e0347cbeb2046e35a407c78178a3fb5b79619e987cbc4ac7d5e4 SHA512 c5437677ff00fbb45798fe594e8d61b1c2bfc2d103105d7bd82e476240452477ac263700800f5d0ba91ddc895eb85f4517d5cb15c80611ec1680a686d47cd781
-DIST systemd-stable-251.7.tar.gz 11448429 BLAKE2B 959ac7944d778c8e6d7a3c67ea6adc89e5e7ac1cc3b163e2af2a582211b91316da5ffba37b854978b7b2a5b3f9aae3651701a23e4391da6676e078747df1a37b SHA512 a4c06b2d25c47af58abb1e1dc85737b2fb0eb394f09d2bb7c6b7b716cb4b1383a145885bbc8e5ffcdc26611fd44d362fba2152c4dd0ead6a03a93965b82bb9a4
 DIST systemd-stable-251.8.tar.gz 11457551 BLAKE2B d4ca799a5b22164362fa8948bbec95215d6ebc04380f13f755916c4bfd4e1cc43a82177c21d2c56aa9d8440b44872b773f21682fc127c7f6d2b3542661c27d80 SHA512 c337fad3cf2beef11401850ddd6418efef035d4ec6405049084302738042f77ac1f8bfd7eb3611668a13038878389c9617e63278ec0b37782b3e0242e69c4843
-DIST systemd-stable-252.2.tar.gz 11745627 BLAKE2B a0a8d8c3fdfef22163cf628e022d55a0091a6c9b7e3971889dd88ff332b6280d45a4fad367aac6e1ebb61346c5c90a1140243d2a1787019497ae0aaf7f3950e9 SHA512 4a4f7382a6a2d7aea3a2866034a4562d1b45a4e18f733a371bb83d67bf4ef5d31d480e703fd353ee847fadc76005f9191a9a44d95c57f6849fdd451cc1b9e21d
 DIST systemd-stable-252.3.tar.gz 11750469 BLAKE2B 855ca884d8e843605f8b467e8453ccdadf0c17e45f4511f2ba25decd5a46429ca5d765346bd5a2ec345cb62d425c8961306cc91f179566f2ff64d043ada3fdfb SHA512 fd7594f0cb232996fda33f14a09565b4c315db8969579512f39a3f96734fc0841a1c6a83c3668103b70d108f73ffc11e7465bf5867d1ff313d0e428d4a6e2134
-EBUILD systemd-251.7.ebuild 15373 BLAKE2B bf0d5028ce7d06e81b43bb2a5f2101f0964d65e8654c93108d92194d211becaa761c3eca40f7ffcb9e02268198c305bdc55f188a3c41ce1ee974b2ffba0d3b57 SHA512 8985b9bf2d42c126dab19a46ac7a565d1416225d678bb9547f01420739fcaf3439fc5e94074a65588d685074c54b1adab458ca039f10931baee6d294861b00e4
 EBUILD systemd-251.8.ebuild 15112 BLAKE2B 635842b3738399e3396f468f264464b3429b0893c5e20d56738c616423b6c5d3e958738a6b6ae27c99753983e06f6e13156cb80b7152ba3756760bd4aa4c5bc2 SHA512 41608cc213cc0f2ffb781274c45750389c2f034ce1c83f714b157904d4630638bd804ab302abe9266e48d5145b4895c8c385f6ec706ed0b23a1c3136ec2bb9c5
-EBUILD systemd-252.2.ebuild 15071 BLAKE2B 44c5a6bc034d0ae2c155ebdf2bf0b9d9ebe8f18d9d622a4e674a0b5c0c6151a2652d81b5edc17c00910f1e74dbf598f8691854f617c314311d01f90d46644abb SHA512 a072edd9753935be12099565db628e79fde0ed6a33830ce4e31e4ba7e827f824368e1dc50a90895e9a6d436fa72910a54f3b8787c3bee2d7e8a42092f7132bac
 EBUILD systemd-252.3.ebuild 15071 BLAKE2B 44c5a6bc034d0ae2c155ebdf2bf0b9d9ebe8f18d9d622a4e674a0b5c0c6151a2652d81b5edc17c00910f1e74dbf598f8691854f617c314311d01f90d46644abb SHA512 a072edd9753935be12099565db628e79fde0ed6a33830ce4e31e4ba7e827f824368e1dc50a90895e9a6d436fa72910a54f3b8787c3bee2d7e8a42092f7132bac
 EBUILD systemd-9999.ebuild 15071 BLAKE2B 44c5a6bc034d0ae2c155ebdf2bf0b9d9ebe8f18d9d622a4e674a0b5c0c6151a2652d81b5edc17c00910f1e74dbf598f8691854f617c314311d01f90d46644abb SHA512 a072edd9753935be12099565db628e79fde0ed6a33830ce4e31e4ba7e827f824368e1dc50a90895e9a6d436fa72910a54f3b8787c3bee2d7e8a42092f7132bac
 MISC metadata.xml 2545 BLAKE2B fc424b7f9e471860cba69b6f11ea2094c70f125cd55c42ea77e4549a399680c4444119c79424c266828a284b0214001421f760477b1341844dddd2d474d70c33 SHA512 f0b8c4614e3c88d123916bb3399d6025ab30ff839849b136a29e1960bf0c50699b3f09b5307f40b77cc8c5566c20b11de2364a08311adceb15507df3e4bb0565
diff --git a/sys-apps/systemd/systemd-251.7.ebuild b/sys-apps/systemd/systemd-251.7.ebuild
deleted file mode 100644
index 84c6c3db0074..000000000000
--- a/sys-apps/systemd/systemd-251.7.ebuild
+++ /dev/null
@@ -1,526 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..11} )
-
-# Avoid QA warnings
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-fi
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam
-inherit python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://systemd.io/"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="
-	acl apparmor audit cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-	fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
-	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
-	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
-"
-REQUIRED_USE="
-	dns-over-tls? ( || ( gnutls openssl ) )
-	homed? ( cryptsetup pam openssl )
-	importd? ( curl lzma || ( gcrypt openssl ) )
-	pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="4.15"
-
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-	curl? ( net-misc/curl:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	fido2? ( dev-libs/libfido2:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
-	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	iptables? ( net-firewall/iptables:0= )
-	openssl? ( >=dev-libs/openssl-1.1.0:0= )
-	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( app-crypt/p11-kit:0= )
-	pcre? ( dev-libs/libpcre2 )
-	pwquality? ( dev-libs/libpwquality:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	tpm? ( app-crypt/tpm2-tss:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=acct-group/adm-0-r1
-	>=acct-group/wheel-0-r1
-	>=acct-group/kmem-0-r1
-	>=acct-group/tty-0-r1
-	>=acct-group/utmp-0-r1
-	>=acct-group/audio-0-r1
-	>=acct-group/cdrom-0-r1
-	>=acct-group/dialout-0-r1
-	>=acct-group/disk-0-r1
-	>=acct-group/input-0-r1
-	>=acct-group/kvm-0-r1
-	>=acct-group/lp-0-r1
-	>=acct-group/render-0-r1
-	acct-group/sgx
-	>=acct-group/tape-0-r1
-	acct-group/users
-	>=acct-group/video-0-r1
-	>=acct-group/systemd-journal-0-r1
-	>=acct-user/root-0-r1
-	acct-user/nobody
-	>=acct-user/systemd-journal-remote-0-r1
-	>=acct-user/systemd-coredump-0-r1
-	>=acct-user/systemd-network-0-r1
-	acct-user/systemd-oom
-	>=acct-user/systemd-resolve-0-r1
-	>=acct-user/systemd-timesync-0-r1
-	>=sys-apps/baselayout-2.2
-	selinux? (
-		sec-policy/selinux-base-policy[systemd]
-		sec-policy/selinux-ntp
-	)
-	sysv-utils? (
-		!sys-apps/openrc[sysv-utils(-)]
-		!sys-apps/sysvinit
-	)
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!sys-apps/hwids[udev]
-	!sys-auth/nss-myhostname
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-fs/udev-init-scripts-34
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		app-text/tree
-		dev-lang/perl
-		sys-apps/dbus
-	)
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
-			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-
-		if kernel_is -ge 5 10 20; then
-			CONFIG_CHECK+=" ~KCMP"
-		else
-			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
-		fi
-
-		if kernel_is -ge 4 18; then
-			CONFIG_CHECK+=" ~AUTOFS_FS"
-		else
-			CONFIG_CHECK+=" ~AUTOFS4_FS"
-		fi
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	local PATCHES=(
-		# Breaks Clang. Revert the commit for now and force off F_S=3.
-		# bug #841770.
-		"${FILESDIR}/251-revert-fortify-source-3-fix.patch"
-		"${FILESDIR}/251-gpt-auto-no-cryptsetup.patch"
-		"${FILESDIR}/251-meson-0.64.patch"
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-generator-path-r2.patch"
-			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
-			"${FILESDIR}/gentoo-journald-audit.patch"
-		)
-	fi
-
-	# Fails with split-usr.
-	sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	# Broken with FORTIFY_SOURCE=3 without a patch. We have to revert
-	# the upstream patch for it because it breaks Clang: bug #841770.
-	#
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-		# We can't unconditionally do this b/c we fortify needs
-		# some level of optimisation.
-		filter-flags -D_FORTIFY_SOURCE=3
-		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		$(meson_use split-usr)
-		$(meson_use split-usr split-bin)
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# Optional components/dependencies
-		$(meson_native_use_bool acl)
-		$(meson_native_use_bool apparmor)
-		$(meson_native_use_bool audit)
-		$(meson_native_use_bool cryptsetup libcryptsetup)
-		$(meson_native_use_bool curl libcurl)
-		$(meson_native_use_bool dns-over-tls dns-over-tls)
-		$(meson_native_use_bool elfutils)
-		$(meson_native_use_bool fido2 libfido2)
-		$(meson_use gcrypt)
-		$(meson_native_use_bool gnuefi gnu-efi)
-		$(meson_native_use_bool gnutls)
-		-Defi-includedir="${ESYSROOT}/usr/include/efi"
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		$(meson_native_use_bool homed)
-		$(meson_native_use_bool http microhttpd)
-		$(meson_native_use_bool idn)
-		$(meson_native_use_bool importd)
-		$(meson_native_use_bool importd bzip2)
-		$(meson_native_use_bool importd zlib)
-		$(meson_native_use_bool kmod)
-		$(meson_use lz4)
-		$(meson_use lzma xz)
-		$(meson_use zstd)
-		$(meson_native_use_bool iptables libiptc)
-		$(meson_native_use_bool openssl)
-		$(meson_use pam)
-		$(meson_native_use_bool pkcs11 p11kit)
-		$(meson_native_use_bool pcre pcre2)
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool pwquality)
-		$(meson_native_use_bool qrcode qrencode)
-		$(meson_native_use_bool seccomp)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool tpm tpm2)
-		$(meson_native_use_bool test dbus)
-		$(meson_native_use_bool xkb xkbcommon)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		$(meson_native_true backlight)
-		$(meson_native_true binfmt)
-		$(meson_native_true coredump)
-		$(meson_native_true environment-d)
-		$(meson_native_true firstboot)
-		$(meson_native_true hibernate)
-		$(meson_native_true hostnamed)
-		$(meson_native_true ldconfig)
-		$(meson_native_true localed)
-		$(meson_native_true man)
-		$(meson_native_true networkd)
-		$(meson_native_true quotacheck)
-		$(meson_native_true randomseed)
-		$(meson_native_true rfkill)
-		$(meson_native_true sysusers)
-		$(meson_native_true timedated)
-		$(meson_native_true timesyncd)
-		$(meson_native_true tmpfiles)
-		$(meson_native_true vconsole)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	meson_src_test
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-	local sbin=$(usex split-usr sbin bin)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die
-	fi
-
-	rm "${ED}"/etc/init.d/README || die
-	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils && use split-usr; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# https://bugs.gentoo.org/761763
-	rm -r "${ED}"/usr/lib/sysusers.d || die
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/rules.d
-
-	keepdir /etc/udev/hwdb.d
-
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
-	if use pam; then
-		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-	fi
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-
-	gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_preinst() {
-	if ! use split-usr; then
-		local dir
-		for dir in bin sbin lib usr/sbin; do
-			if [[ ! -L ${EROOT}/${dir} ]]; then
-				eerror "'${EROOT}/${dir}' is not a symbolic link."
-				FAIL=1
-			fi
-		done
-		if [[ ${FAIL} ]]; then
-			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "installing ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
-			die "System layout with split directories still used"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required.
-	systemd-hwdb --root="${ROOT}" update
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respected, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-apps/systemd/systemd-252.2.ebuild b/sys-apps/systemd/systemd-252.2.ebuild
deleted file mode 100644
index 6a423f8c5593..000000000000
--- a/sys-apps/systemd/systemd-252.2.ebuild
+++ /dev/null
@@ -1,520 +0,0 @@
-# Copyright 2011-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PYTHON_COMPAT=( python3_{8..11} )
-
-# Avoid QA warnings
-TMPFILES_OPTIONAL=1
-UDEV_OPTIONAL=1
-
-QA_PKGCONFIG_VERSION=$(ver_cut 1)
-
-if [[ ${PV} == 9999 ]]; then
-	EGIT_REPO_URI="https://github.com/systemd/systemd.git"
-	inherit git-r3
-else
-	if [[ ${PV} == *.* ]]; then
-		MY_PN=systemd-stable
-	else
-		MY_PN=systemd
-	fi
-	MY_PV=${PV/_/-}
-	MY_P=${MY_PN}-${MY_PV}
-	S=${WORKDIR}/${MY_P}
-	SRC_URI="https://github.com/systemd/${MY_PN}/archive/v${MY_PV}/${MY_P}.tar.gz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
-fi
-
-inherit bash-completion-r1 flag-o-matic linux-info meson-multilib pam
-inherit python-any-r1 systemd toolchain-funcs udev usr-ldscript
-
-DESCRIPTION="System and service manager for Linux"
-HOMEPAGE="http://systemd.io/"
-
-LICENSE="GPL-2 LGPL-2.1 MIT public-domain"
-SLOT="0/2"
-IUSE="
-	acl apparmor audit cgroup-hybrid cryptsetup curl +dns-over-tls elfutils
-	fido2 +gcrypt gnuefi gnutls homed http idn importd iptables +kmod
-	+lz4 lzma +openssl pam pcre pkcs11 policykit pwquality qrcode
-	+resolvconf +seccomp selinux split-usr +sysv-utils test tpm vanilla xkb +zstd
-"
-REQUIRED_USE="
-	dns-over-tls? ( || ( gnutls openssl ) )
-	homed? ( cryptsetup pam openssl )
-	importd? ( curl lzma || ( gcrypt openssl ) )
-	pwquality? ( homed )
-"
-RESTRICT="!test? ( test )"
-
-MINKV="4.15"
-
-COMMON_DEPEND="
-	>=sys-apps/util-linux-2.30:0=[${MULTILIB_USEDEP}]
-	sys-libs/libcap:0=[${MULTILIB_USEDEP}]
-	virtual/libcrypt:=[${MULTILIB_USEDEP}]
-	acl? ( sys-apps/acl:0= )
-	apparmor? ( sys-libs/libapparmor:0= )
-	audit? ( >=sys-process/audit-2:0= )
-	cryptsetup? ( >=sys-fs/cryptsetup-2.0.1:0= )
-	curl? ( net-misc/curl:0= )
-	elfutils? ( >=dev-libs/elfutils-0.158:0= )
-	fido2? ( dev-libs/libfido2:0= )
-	gcrypt? ( >=dev-libs/libgcrypt-1.4.5:0=[${MULTILIB_USEDEP}] )
-	gnutls? ( >=net-libs/gnutls-3.6.0:0= )
-	http? ( >=net-libs/libmicrohttpd-0.9.33:0=[epoll(+)] )
-	idn? ( net-dns/libidn2:= )
-	importd? (
-		app-arch/bzip2:0=
-		sys-libs/zlib:0=
-	)
-	kmod? ( >=sys-apps/kmod-15:0= )
-	lz4? ( >=app-arch/lz4-0_p131:0=[${MULTILIB_USEDEP}] )
-	lzma? ( >=app-arch/xz-utils-5.0.5-r1:0=[${MULTILIB_USEDEP}] )
-	iptables? ( net-firewall/iptables:0= )
-	openssl? ( >=dev-libs/openssl-1.1.0:0= )
-	pam? ( sys-libs/pam:=[${MULTILIB_USEDEP}] )
-	pkcs11? ( app-crypt/p11-kit:0= )
-	pcre? ( dev-libs/libpcre2 )
-	pwquality? ( dev-libs/libpwquality:0= )
-	qrcode? ( media-gfx/qrencode:0= )
-	seccomp? ( >=sys-libs/libseccomp-2.3.3:0= )
-	selinux? ( sys-libs/libselinux:0= )
-	tpm? ( app-crypt/tpm2-tss:0= )
-	xkb? ( >=x11-libs/libxkbcommon-0.4.1:0= )
-	zstd? ( >=app-arch/zstd-1.4.0:0=[${MULTILIB_USEDEP}] )
-"
-
-# Newer linux-headers needed by ia64, bug #480218
-DEPEND="${COMMON_DEPEND}
-	>=sys-kernel/linux-headers-${MINKV}
-	gnuefi? ( >=sys-boot/gnu-efi-3.0.2 )
-"
-
-# baselayout-2.2 has /run
-RDEPEND="${COMMON_DEPEND}
-	>=acct-group/adm-0-r1
-	>=acct-group/wheel-0-r1
-	>=acct-group/kmem-0-r1
-	>=acct-group/tty-0-r1
-	>=acct-group/utmp-0-r1
-	>=acct-group/audio-0-r1
-	>=acct-group/cdrom-0-r1
-	>=acct-group/dialout-0-r1
-	>=acct-group/disk-0-r1
-	>=acct-group/input-0-r1
-	>=acct-group/kvm-0-r1
-	>=acct-group/lp-0-r1
-	>=acct-group/render-0-r1
-	acct-group/sgx
-	>=acct-group/tape-0-r1
-	acct-group/users
-	>=acct-group/video-0-r1
-	>=acct-group/systemd-journal-0-r1
-	>=acct-user/root-0-r1
-	acct-user/nobody
-	>=acct-user/systemd-journal-remote-0-r1
-	>=acct-user/systemd-coredump-0-r1
-	>=acct-user/systemd-network-0-r1
-	acct-user/systemd-oom
-	>=acct-user/systemd-resolve-0-r1
-	>=acct-user/systemd-timesync-0-r1
-	>=sys-apps/baselayout-2.2
-	selinux? (
-		sec-policy/selinux-base-policy[systemd]
-		sec-policy/selinux-ntp
-	)
-	sysv-utils? (
-		!sys-apps/openrc[sysv-utils(-)]
-		!sys-apps/sysvinit
-	)
-	!sysv-utils? ( sys-apps/sysvinit )
-	resolvconf? ( !net-dns/openresolv )
-	!sys-apps/hwids[udev]
-	!sys-auth/nss-myhostname
-	!sys-fs/eudev
-	!sys-fs/udev
-"
-
-# sys-apps/dbus: the daemon only (+ build-time lib dep for tests)
-PDEPEND=">=sys-apps/dbus-1.9.8[systemd]
-	>=sys-fs/udev-init-scripts-34
-	policykit? ( sys-auth/polkit )
-	!vanilla? ( sys-apps/gentoo-systemd-integration )"
-
-BDEPEND="
-	app-arch/xz-utils:0
-	dev-util/gperf
-	>=dev-util/meson-0.46
-	>=sys-apps/coreutils-8.16
-	sys-devel/gettext
-	virtual/pkgconfig
-	test? (
-		app-text/tree
-		dev-lang/perl
-		sys-apps/dbus
-	)
-	app-text/docbook-xml-dtd:4.2
-	app-text/docbook-xml-dtd:4.5
-	app-text/docbook-xsl-stylesheets
-	dev-libs/libxslt:0
-	$(python_gen_any_dep 'dev-python/jinja[${PYTHON_USEDEP}]')
-	$(python_gen_any_dep 'dev-python/lxml[${PYTHON_USEDEP}]')
-"
-
-python_check_deps() {
-	python_has_version "dev-python/jinja[${PYTHON_USEDEP}]" &&
-	python_has_version "dev-python/lxml[${PYTHON_USEDEP}]"
-}
-
-QA_FLAGS_IGNORED="usr/lib/systemd/boot/efi/.*"
-QA_EXECSTACK="usr/lib/systemd/boot/efi/*"
-
-pkg_pretend() {
-	if [[ ${MERGE_TYPE} != buildonly ]]; then
-		if use test && has pid-sandbox ${FEATURES}; then
-			ewarn "Tests are known to fail with PID sandboxing enabled."
-			ewarn "See https://bugs.gentoo.org/674458."
-		fi
-
-		local CONFIG_CHECK=" ~BINFMT_MISC ~BLK_DEV_BSG ~CGROUPS
-			~CGROUP_BPF ~DEVTMPFS ~EPOLL ~FANOTIFY ~FHANDLE
-			~INOTIFY_USER ~IPV6 ~NET ~NET_NS ~PROC_FS ~SIGNALFD ~SYSFS
-			~TIMERFD ~TMPFS_XATTR ~UNIX ~USER_NS
-			~CRYPTO_HMAC ~CRYPTO_SHA256 ~CRYPTO_USER_API_HASH
-			~!GRKERNSEC_PROC ~!IDE ~!SYSFS_DEPRECATED
-			~!SYSFS_DEPRECATED_V2"
-
-		use acl && CONFIG_CHECK+=" ~TMPFS_POSIX_ACL"
-		use seccomp && CONFIG_CHECK+=" ~SECCOMP ~SECCOMP_FILTER"
-
-		if kernel_is -ge 5 10 20; then
-			CONFIG_CHECK+=" ~KCMP"
-		else
-			CONFIG_CHECK+=" ~CHECKPOINT_RESTORE"
-		fi
-
-		if kernel_is -ge 4 18; then
-			CONFIG_CHECK+=" ~AUTOFS_FS"
-		else
-			CONFIG_CHECK+=" ~AUTOFS4_FS"
-		fi
-
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n ${uevent_helper_path} ]] && [[ ${uevent_helper_path} != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-			if linux_chkconfig_present X86; then
-				CONFIG_CHECK+=" ~DMIID"
-			fi
-		fi
-
-		if kernel_is -lt ${MINKV//./ }; then
-			ewarn "Kernel version at least ${MINKV} required"
-		fi
-
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	:
-}
-
-src_unpack() {
-	default
-	[[ ${PV} != 9999 ]] || git-r3_src_unpack
-}
-
-src_prepare() {
-	local PATCHES=(
-	)
-
-	if ! use vanilla; then
-		PATCHES+=(
-			"${FILESDIR}/gentoo-generator-path-r2.patch"
-			"${FILESDIR}/gentoo-systemctl-disable-sysv-sync-r1.patch"
-			"${FILESDIR}/gentoo-journald-audit.patch"
-		)
-	fi
-
-	# Fails with split-usr.
-	sed -i -e '2i exit 77' test/test-rpm-macros.sh || die
-
-	default
-}
-
-src_configure() {
-	# Prevent conflicts with i686 cross toolchain, bug 559726
-	tc-export AR CC NM OBJCOPY RANLIB
-
-	# Broken with FORTIFY_SOURCE=3: bug #841770.
-	#
-	# Our toolchain sets F_S=2 by default w/ >= -O2, so we need
-	# to unset F_S first, then explicitly set 2, to negate any default
-	# and anything set by the user if they're choosing 3 (or if they've
-	# modified GCC to set 3).
-	#
-	if is-flagq '-O[23]' || is-flagq '-Ofast' ; then
-		# We can't unconditionally do this b/c we fortify needs
-		# some level of optimisation.
-		filter-flags -D_FORTIFY_SOURCE=3
-		append-cppflags -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2
-	fi
-
-	python_setup
-
-	multilib-minimal_src_configure
-}
-
-multilib_src_configure() {
-	local myconf=(
-		--localstatedir="${EPREFIX}/var"
-		-Dsupport-url="https://gentoo.org/support/"
-		-Dpamlibdir="$(getpam_mod_dir)"
-		# avoid bash-completion dep
-		-Dbashcompletiondir="$(get_bashcompdir)"
-		$(meson_use split-usr)
-		$(meson_use split-usr split-bin)
-		-Drootprefix="$(usex split-usr "${EPREFIX:-/}" "${EPREFIX}/usr")"
-		-Drootlibdir="${EPREFIX}/usr/$(get_libdir)"
-		# Avoid infinite exec recursion, bug 642724
-		-Dtelinit-path="${EPREFIX}/lib/sysvinit/telinit"
-		# no deps
-		-Dima=true
-		-Ddefault-hierarchy=$(usex cgroup-hybrid hybrid unified)
-		# Optional components/dependencies
-		$(meson_native_use_bool acl)
-		$(meson_native_use_bool apparmor)
-		$(meson_native_use_bool audit)
-		$(meson_native_use_bool cryptsetup libcryptsetup)
-		$(meson_native_use_bool curl libcurl)
-		$(meson_native_use_bool dns-over-tls dns-over-tls)
-		$(meson_native_use_bool elfutils)
-		$(meson_native_use_bool fido2 libfido2)
-		$(meson_use gcrypt)
-		$(meson_native_use_bool gnuefi gnu-efi)
-		$(meson_native_use_bool gnutls)
-		-Defi-includedir="${ESYSROOT}/usr/include/efi"
-		-Defi-libdir="${ESYSROOT}/usr/$(get_libdir)"
-		$(meson_native_use_bool homed)
-		$(meson_native_use_bool http microhttpd)
-		$(meson_native_use_bool idn)
-		$(meson_native_use_bool importd)
-		$(meson_native_use_bool importd bzip2)
-		$(meson_native_use_bool importd zlib)
-		$(meson_native_use_bool kmod)
-		$(meson_use lz4)
-		$(meson_use lzma xz)
-		$(meson_use zstd)
-		$(meson_native_use_bool iptables libiptc)
-		$(meson_native_use_bool openssl)
-		$(meson_use pam)
-		$(meson_native_use_bool pkcs11 p11kit)
-		$(meson_native_use_bool pcre pcre2)
-		$(meson_native_use_bool policykit polkit)
-		$(meson_native_use_bool pwquality)
-		$(meson_native_use_bool qrcode qrencode)
-		$(meson_native_use_bool seccomp)
-		$(meson_native_use_bool selinux)
-		$(meson_native_use_bool tpm tpm2)
-		$(meson_native_use_bool test dbus)
-		$(meson_native_use_bool xkb xkbcommon)
-		-Dntp-servers="0.gentoo.pool.ntp.org 1.gentoo.pool.ntp.org 2.gentoo.pool.ntp.org 3.gentoo.pool.ntp.org"
-		# Breaks screen, tmux, etc.
-		-Ddefault-kill-user-processes=false
-		-Dcreate-log-dirs=false
-
-		# multilib options
-		$(meson_native_true backlight)
-		$(meson_native_true binfmt)
-		$(meson_native_true coredump)
-		$(meson_native_true environment-d)
-		$(meson_native_true firstboot)
-		$(meson_native_true hibernate)
-		$(meson_native_true hostnamed)
-		$(meson_native_true ldconfig)
-		$(meson_native_true localed)
-		$(meson_native_true man)
-		$(meson_native_true networkd)
-		$(meson_native_true quotacheck)
-		$(meson_native_true randomseed)
-		$(meson_native_true rfkill)
-		$(meson_native_true sysusers)
-		$(meson_native_true timedated)
-		$(meson_native_true timesyncd)
-		$(meson_native_true tmpfiles)
-		$(meson_native_true vconsole)
-	)
-
-	meson_src_configure "${myconf[@]}"
-}
-
-multilib_src_test() {
-	unset DBUS_SESSION_BUS_ADDRESS XDG_RUNTIME_DIR
-	meson_src_test
-}
-
-multilib_src_install_all() {
-	local rootprefix=$(usex split-usr '' /usr)
-	local sbin=$(usex split-usr sbin bin)
-
-	# meson doesn't know about docdir
-	mv "${ED}"/usr/share/doc/{systemd,${PF}} || die
-
-	einstalldocs
-	dodoc "${FILESDIR}"/nsswitch.conf
-
-	if ! use resolvconf; then
-		rm -f "${ED}${rootprefix}/${sbin}"/resolvconf || die
-	fi
-
-	rm "${ED}"/etc/init.d/README || die
-	rm "${ED}${rootprefix}"/lib/systemd/system-generators/systemd-sysv-generator || die
-
-	if ! use sysv-utils; then
-		rm "${ED}${rootprefix}/${sbin}"/{halt,init,poweroff,reboot,runlevel,shutdown,telinit} || die
-		rm "${ED}"/usr/share/man/man1/init.1 || die
-		rm "${ED}"/usr/share/man/man8/{halt,poweroff,reboot,runlevel,shutdown,telinit}.8 || die
-	fi
-
-	if ! use resolvconf && ! use sysv-utils && use split-usr; then
-		rmdir "${ED}${rootprefix}"/sbin || die
-	fi
-
-	# https://bugs.gentoo.org/761763
-	rm -r "${ED}"/usr/lib/sysusers.d || die
-
-	# Preserve empty dirs in /etc & /var, bug #437008
-	keepdir /etc/{binfmt.d,modules-load.d,tmpfiles.d}
-	keepdir /etc/kernel/install.d
-	keepdir /etc/systemd/{network,system,user}
-	keepdir /etc/udev/rules.d
-
-	keepdir /etc/udev/hwdb.d
-
-	keepdir "${rootprefix}"/lib/systemd/{system-sleep,system-shutdown}
-	keepdir /usr/lib/{binfmt.d,modules-load.d}
-	keepdir /usr/lib/systemd/user-generators
-	keepdir /var/lib/systemd
-	keepdir /var/log/journal
-
-	# Symlink /etc/sysctl.conf for easy migration.
-	dosym ../../../etc/sysctl.conf /usr/lib/sysctl.d/99-sysctl.conf
-
-	if use pam; then
-		newpamd "${FILESDIR}"/systemd-user.pam systemd-user
-	fi
-
-	if use split-usr; then
-		# Avoid breaking boot/reboot
-		dosym ../../../lib/systemd/systemd /usr/lib/systemd/systemd
-		dosym ../../../lib/systemd/systemd-shutdown /usr/lib/systemd/systemd-shutdown
-	fi
-
-	gen_usr_ldscript -a systemd udev
-}
-
-migrate_locale() {
-	local envd_locale_def="${EROOT}/etc/env.d/02locale"
-	local envd_locale=( "${EROOT}"/etc/env.d/??locale )
-	local locale_conf="${EROOT}/etc/locale.conf"
-
-	if [[ ! -L ${locale_conf} && ! -e ${locale_conf} ]]; then
-		# If locale.conf does not exist...
-		if [[ -e ${envd_locale} ]]; then
-			# ...either copy env.d/??locale if there's one
-			ebegin "Moving ${envd_locale} to ${locale_conf}"
-			mv "${envd_locale}" "${locale_conf}"
-			eend ${?} || FAIL=1
-		else
-			# ...or create a dummy default
-			ebegin "Creating ${locale_conf}"
-			cat > "${locale_conf}" <<-EOF
-				# This file has been created by the sys-apps/systemd ebuild.
-				# See locale.conf(5) and localectl(1).
-
-				# LANG=${LANG}
-			EOF
-			eend ${?} || FAIL=1
-		fi
-	fi
-
-	if [[ ! -L ${envd_locale} ]]; then
-		# now, if env.d/??locale is not a symlink (to locale.conf)...
-		if [[ -e ${envd_locale} ]]; then
-			# ...warn the user that he has duplicate locale settings
-			ewarn
-			ewarn "To ensure consistent behavior, you should replace ${envd_locale}"
-			ewarn "with a symlink to ${locale_conf}. Please migrate your settings"
-			ewarn "and create the symlink with the following command:"
-			ewarn "ln -s -n -f ../locale.conf ${envd_locale}"
-			ewarn
-		else
-			# ...or just create the symlink if there's nothing here
-			ebegin "Creating ${envd_locale_def} -> ../locale.conf symlink"
-			ln -n -s ../locale.conf "${envd_locale_def}"
-			eend ${?} || FAIL=1
-		fi
-	fi
-}
-
-pkg_preinst() {
-	if ! use split-usr; then
-		local dir
-		for dir in bin sbin lib usr/sbin; do
-			if [[ ! -L ${EROOT}/${dir} ]]; then
-				eerror "'${EROOT}/${dir}' is not a symbolic link."
-				FAIL=1
-			fi
-		done
-		if [[ ${FAIL} ]]; then
-			eerror "Migration to system layout with merged directories must be performed before"
-			eerror "installing ${CATEGORY}/${PN} with USE=\"-split-usr\" to avoid run-time breakage."
-			die "System layout with split directories still used"
-		fi
-	fi
-}
-
-pkg_postinst() {
-	systemd_update_catalog
-
-	# Keep this here in case the database format changes so it gets updated
-	# when required.
-	systemd-hwdb --root="${ROOT}" update
-
-	udev_reload || FAIL=1
-
-	# Bug 465468, make sure locales are respected, and ensure consistency
-	# between OpenRC & systemd
-	migrate_locale
-
-	if [[ -z ${REPLACING_VERSIONS} ]]; then
-		if type systemctl &>/dev/null; then
-			systemctl --root="${ROOT:-/}" enable getty@.service remote-fs.target || FAIL=1
-		fi
-		elog "To enable a useful set of services, run the following:"
-		elog "  systemctl preset-all --preset-mode=enable-only"
-	fi
-
-	if [[ -L ${EROOT}/var/lib/systemd/timesync ]]; then
-		rm "${EROOT}/var/lib/systemd/timesync"
-	fi
-
-	if [[ ${FAIL} ]]; then
-		eerror "One of the postinst commands failed. Please check the postinst output"
-		eerror "for errors. You may need to clean up your system and/or try installing"
-		eerror "systemd again."
-		eerror
-	fi
-}
-
-pkg_prerm() {
-	# If removing systemd completely, remove the catalog database.
-	if [[ ! ${REPLACED_BY_VERSION} ]]; then
-		rm -f -v "${EROOT}"/var/lib/systemd/catalog/database
-	fi
-}
diff --git a/sys-block/Manifest.gz b/sys-block/Manifest.gz
index d60c7ba43e75..d9de79bb0656 100644
--- a/sys-block/Manifest.gz
+++ b/sys-block/Manifest.gz
diff --git a/sys-block/partimage/Manifest b/sys-block/partimage/Manifest
index 12589de6a1a3..30d704ae1c40 100644
--- a/sys-block/partimage/Manifest
+++ b/sys-block/partimage/Manifest
@@ -10,5 +10,5 @@ AUX partimaged.pam.2 249 BLAKE2B e40a15c5fe4dc394cbcf9c478c3c764e67ec317f31c0397
 AUX servercert.cnf 980 BLAKE2B 0660f9b92fe422754e36d6ce1889e8b8feb40954b36b3e00e58f5e534b85171ac42e66f74020a55dd1b14d56d7764c94427b8d1d112ca1a878dff388ac3ea787 SHA512 8aa0592ce0be3f08124880b823db59aa167e7d509ea1a9b48d9f895482f96e99a6e4df330c567b9ce331eed43cb4f1a70b1b7727878972a8b074265898b1e557
 DIST partimage-0.6.9.tar.bz2 666522 BLAKE2B d9a240f82a7b6ae73997df46c964fdddf8dddea9e3bd9548252d9409a526358714908316c52864b60bc9fcc1113a5e1c6cf294faff6845a183c7ffe1012475a6 SHA512 252885921b23933fdcdf0bb6efa4b82066b08ca95cc653296912d384ae875b421c1d39f347a90115315139176d4eab4a930c24919c2d38cf00ed29c764cd14d9
 EBUILD partimage-0.6.9-r3.ebuild 3452 BLAKE2B fd4613278a34e0b5c1275a10b1898fe8d4c343df19aac6ed90a2ec056eec380a61660873219a212029ff025be3712d8a1e5e8c763fa7e86fb179ee4736a2dd14 SHA512 0c71b580820caebb21b5c18f09e5751c3d60c7c845673fa076f224aa196dd908536930c9ef1ec9a0e41121b08555ccae4879538e6b0d66d85faa88340befab3a
-EBUILD partimage-0.6.9-r4.ebuild 3511 BLAKE2B 27ad131f7eefd78709bf98466c73c588911af8a10a2dee14b273b0b186a4f8fb3bd53267137348c4e4b2c01e69f481d660b15e46311e2c6b99cf30e3c19af3d7 SHA512 ede2efcb5801cce33082b9f26889dfa1437e4df569e2e08b0b7989f3e3cf2334e71061bddbf8e76e8b5d5b22e61fbbfb3034434fab7e63cf875c84a463bfe64b
+EBUILD partimage-0.6.9-r4.ebuild 3508 BLAKE2B 8473c71fbaf184a21fc5628f1400578aa8c4fe1aaadb7c3fdf36e528f9ee3719660724d17c48612d87b5b3cf2a8072e114c86e640f5281568ed9f42f61157f23 SHA512 07dafc831bb7c01924ac12ec3ab217920195640f6be299dbcb0cefc8afca67da82dfd9317d0e9986cf75d96d879c91023f5afe12dc773e7c959a082be84b7c2b
 MISC metadata.xml 505 BLAKE2B cdec044381791ad6f7503bb19acba3604cc49b4e3f49ad06658029ac5700566e25c0b6de37a4bbf1ecae898a92ab3cedc77a3e36f76a90f0731f68ffaff9e194 SHA512 652db70705956848e88316ef18bb5fce688565c47e6f0dfcaafb1fee2c4919e18eb00f1c4b8e58b9deb0412e2c3eb001a86dc59a49f5d4ebbfce7dcf4e6e9ef1
diff --git a/sys-block/partimage/partimage-0.6.9-r4.ebuild b/sys-block/partimage/partimage-0.6.9-r4.ebuild
index e2033e200544..0f42bcc967f1 100644
--- a/sys-block/partimage/partimage-0.6.9-r4.ebuild
+++ b/sys-block/partimage/partimage-0.6.9-r4.ebuild
@@ -11,7 +11,7 @@ SRC_URI="mirror://sourceforge/${PN}/${P}.tar.bz2"
 
 LICENSE="GPL-2+"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~riscv ~sparc ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ~loong ppc ~riscv ~sparc x86"
 IUSE="nls nologin pam ssl static"
 REQUIRED_USE="static? ( !pam )"
 
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 08bccd84d592..db6ae55fa58d 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index ab9bd5a754f5..2d15f0f4bb4f 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -3,6 +3,7 @@ AUX gcc-configure-texinfo.patch 341 BLAKE2B d2ea3b2ea08f5d3a498ba27d0fb95e325097
 DIST gcc-10-20221006.tar.xz 71755692 BLAKE2B 0099821e5fcd5e1a069369a72f105607cb7f20fbef3d627a598d8c7a6439491e050533d6577b4f7953aabb52daf926ffc8eb9cecd8853833a14c90bd878e1ad9 SHA512 3fc1dceff31ec8a84babe31d88a312d9d3d30450ff0c42730b9a9fe45c0fc9509216fb95cd84df7477faebe2b9b7d8f7e269c9e76cecc05417dc6192e3b96c67
 DIST gcc-10-20221124.tar.xz 71781080 BLAKE2B ec7f4f140102d25a7469f7931df7b87b4b91c1c94fc263ecd9cc9aca36d120e9f5e09776efefba1099abe5282eb1cc4ec8201bcdca3a13c7b1bbdd6b34ad994d SHA512 b7af71bb2dd594643393b3e4dea4e641dcfad6e5249b6ee05617f0648ef2609b707b18f12f3985b3d13cbee6af0f799d7377c28092420b251b34e93f910e686e
 DIST gcc-10-20221201.tar.xz 72102628 BLAKE2B cfd245eb7c364b1480987d259a2c7b569d08830a3af656e6e493864ceda1eb8b0a8a67c405566a826c0c1bb044dc07a6123e6c53c5eac15882cb02a003e95214 SHA512 87da77d035688e033bb1b0c4f95df411a111d87499b18f3ecfb67d0550860243a58fdd5e4cec2d20535d2e3cc5261267fe26f11d2d03e7eb12b3f306b17eb961
+DIST gcc-10-20221208.tar.xz 72098912 BLAKE2B 8167b3d91fb95c727caa3a76d8bd6d70e0d0bd79eda72305f3005c9f7163dcd425c75386ba55b2d71644ecf83d998a4bccb6fd265bb615dcdd104f27cadb8e76 SHA512 5e49159d86300eaa4c2f34fb3537b5f257931e861a1a1217dbabcfcd5ef9da224d4a6023aaf8d24c8893ecd204ec0cd6e96349ae0dd445d62d92ebb041aeb054
 DIST gcc-10.4.0-musl-patches-1.tar.xz 3808 BLAKE2B 804d1fcc451dcd03be71240dd498ec2d179869571d44012967c48dccf5a478dd8c55000a964a80fdd5584d739a777dee1c83241cffce514ef002df2572854a67 SHA512 83e4a9c0f7062baf0c606a2bcc56a818494991403d7577dea65f04bbc25bdb786a5889b80d45d80e7f4be07c1aef786802cbfcfafd1a17ec255a2d4e93a77570
 DIST gcc-10.4.0-patches-5.tar.xz 17056 BLAKE2B f336d69a8ad105b8c4a84e8248a5b8a88175d3f1d67d32c6bee1780d252d86947059bd624992e6292610e86c9012f4d901a1a54df0d184dd023d404a0707700e SHA512 aa8fb42f20587f8519e7b06037da4d8f7d386b63e228b239a0445a51df4e401940fcd81482381d966622054aef3e0db06d1def5c74ac3d3dcc9c75c3b966c758
 DIST gcc-10.4.0.tar.xz 75018092 BLAKE2B ec1169025d3896b70ab80a4b8ce5040763a95529fc7e120c6bc3a3eb1db5cf938ebde347c1e595a8ff7d4081e79ded6252702d7a1a09648449b7a0783188e434 SHA512 440c08ca746da450d9a1b35e8fd2305cb27e7e6987cd9d0f7d375f3b1fc9e4b0bd7acb3cd7bf795e72fcbead59cdef5b6c152862f5d35cd9fbfe6902101ce648
@@ -12,6 +13,7 @@ DIST gcc-10.5.0-patches-1.tar.xz 17180 BLAKE2B d8ecc7cc15fa1ab420fa9eff11173a1d5
 DIST gcc-11-20221007.tar.xz 75790520 BLAKE2B de52f7fc5c7f5f82d9cbaeaa13b216e149a4aac8162188c628007c17ddb40aa838d19f2ca18216e8bfe5df2d21438f10c8e87298b53cbde4359f72c9cff87589 SHA512 b785236a00647041c9ea4552e5ea82a09e23a801b029773ba77bfc03675c530369ad0b5fc279330f3d8dd4b9b40aeaa9de84a39b6397f73984b7e2fdf8f0bad2
 DIST gcc-11-20221125.tar.xz 76248264 BLAKE2B c2fe15a14c77ce36f117d8d3bb78d38684e237db16db249134dd1e24d1455dfe7ca544fe22155b2c368dc6658b96d626af87d47478aaf94c216eb84b469e43e9 SHA512 3efbd7dc4cbf748d41369bff5bedb586a1c9397fa7fa56be7869e62bd567273b056aeec01a4191783bad737640e163489f1b368fcaac3155ae3ac8f7b33f478d
 DIST gcc-11-20221202.tar.xz 76241508 BLAKE2B 313a73cf579a1899996b35494484debbb3c5aa13cd90f54830e30e962d9df2eee059bb3afd429fb3a3e7cb6a889c8c7d03a22a64e57d8d3e046b0c8c431847e3 SHA512 6c8e4654041d84129d94a7317a125348d2d3db4f1029ad069bd271ae11e51f80adfabf970634f6faca52356891a6a87a503ba9421750d6e0a11527ec7fa7bd91
+DIST gcc-11-20221209.tar.xz 76240768 BLAKE2B 3be0f1ece4473bbbf10f7242102f330a6e246c8481da5bd32620dcb15d2acd008bad60d2576a301f03e444e3d93a3c72d5184740c6fb3de2bc05e1863b68a0bc SHA512 33d9581d434c012526eb4d49a4453cf77c57b459fd43f84e49bc764745e0772939eac007e119269f4f1989755df8678613732a84474c691b0c2452237c5b38a3
 DIST gcc-11.3.0-musl-patches-1.tar.xz 3856 BLAKE2B f511f8b4c0696771d906beee9645b5d009ea4b673602baa1ca562d6f23c5b0caf2012aae93578671624617c4286e3937d79a7383d6a03bb438c5b774a06fe8e6 SHA512 cd375ff2affb213475acaabf02989b1f05d719d972970ea0304d20a816986807390893d1401826f3b497787642f35d90a244195f8e466db41e8d768366057334
 DIST gcc-11.3.0-patches-7.tar.xz 15184 BLAKE2B 426f00feaa982a35d2c459e7a2c2e9d29b4b467ac3625ebd72bb31077c75bbf0c028137df03921c52ddc97a14d92c49777bd3f27b47a7b47d8a05e2d106b6bdb SHA512 bec8bf26b3e50633a5a2e0bb75ffeaba86becb704c14365ff3342e8d651ab75bb3ceec7808d88a25989b8c7182398184b95b6d1267aaef9aa828f687e4895e9d
 DIST gcc-11.3.0.tar.xz 81141364 BLAKE2B 7e562d25446ca4ab9fe8cdb714866f66aba3744d78bf84f31bfb097c1a981e4c7f990cb1e6bcfec5ae6671836a4984e2b70eb8fed81dcef5e244f88da8623469 SHA512 f0be5ad705c73b84477128a69c047f57dd47002f375eb60e1e842e08cf2009a509e92152bca345823926d550b7395ae6d4de7db51d1ee371c2dc37313881fca7
@@ -39,11 +41,13 @@ EBUILD gcc-10.4.0.ebuild 1445 BLAKE2B 05518ec2cdf0180f4db63dcab413097ca777381b49
 EBUILD gcc-10.4.1_p20221006.ebuild 1453 BLAKE2B 638b9b95bff53ae5e2a001d4b5c7ad44fcc8cf8830142c444e4d24e99c3402b486ee741d41027924fcd5b33c8182ac8cba4ddb8ccdbb3fcf295de5aa40a748b8 SHA512 5beacfa72aa919baa740a9916626a6e77935a4019bbf275fb1c40a639a9fb9dafd51dcfc86a39df3508886b290ae60c20293f538c21856e41b987396f669c458
 EBUILD gcc-10.4.1_p20221124.ebuild 1456 BLAKE2B 85a813eda1eb69abcd00094024769bdb1999ef3b59b69c443aa9a30556f5720148eb94b92f44b557374b2d5781acaf9b5ce7e1f9cfb14a58d23205e2f657c27f SHA512 28ed2aab1f545b2506a6729772f5e08d67816504edb2882633ff466900643849469b7f72b0432f457897042530b808c3cfe157c4e7464d632ac52d1c3b34a70e
 EBUILD gcc-10.4.1_p20221201.ebuild 1456 BLAKE2B 85a813eda1eb69abcd00094024769bdb1999ef3b59b69c443aa9a30556f5720148eb94b92f44b557374b2d5781acaf9b5ce7e1f9cfb14a58d23205e2f657c27f SHA512 28ed2aab1f545b2506a6729772f5e08d67816504edb2882633ff466900643849469b7f72b0432f457897042530b808c3cfe157c4e7464d632ac52d1c3b34a70e
+EBUILD gcc-10.4.1_p20221208.ebuild 1456 BLAKE2B 85a813eda1eb69abcd00094024769bdb1999ef3b59b69c443aa9a30556f5720148eb94b92f44b557374b2d5781acaf9b5ce7e1f9cfb14a58d23205e2f657c27f SHA512 28ed2aab1f545b2506a6729772f5e08d67816504edb2882633ff466900643849469b7f72b0432f457897042530b808c3cfe157c4e7464d632ac52d1c3b34a70e
 EBUILD gcc-10.5.9999.ebuild 1108 BLAKE2B 2db612df53fbaec59c707acb56bac804a4ee797d156ea3dfca6396d27268385f1d5177c44bd58a926c981ab1c0c7b7adf5e4ea060a65a9e84e7f8ed1713701b0 SHA512 5193d1f4359ef8963645d25150731ab1929801eae16e94ddef3fb0169ed365d2ac43765a2d4848966508144e121b8b24feccbe66f59ee9363764d5a3db79f946
 EBUILD gcc-11.3.0.ebuild 659 BLAKE2B 310352b879c732515ce63983db79b32bf7c8c200a650627a14b5284fceea9a7e7f3e545044a8c00ccc44cd760b18123542bd233242cb3ebc48ef422439c8e430 SHA512 44c89a7782e5e37c5ef61c50d5aa6d07c09f19bada293ed657d7062837a5a9be9483fda0b1845ee794f42031ea098a1b88d439f7be202f4276f77748ff45815e
 EBUILD gcc-11.3.1_p20221007.ebuild 1294 BLAKE2B b7ebe383beab66923f219509ca9afd6f4d77d4796041acee361644bcd874a86a6bb3c72a5418e669062af7b946646cea92ce8010546e26d09ceb9894e4f67d0a SHA512 13fc00a6381cdfdb5646ce8b405458d2d966fb5daef28ccadade709e1be4375698ab36dd9d97a0c25a8a257b1227076ec8112fdb3716699adc6fcace42240649
 EBUILD gcc-11.3.1_p20221125.ebuild 1297 BLAKE2B f3d59b1d083b63bda25302a810d2a889310a0bcdaf692092a6a9c869ec7435215277a5618742997d55154c6e07c3b1ac64fbd899840895edf436e00a28aaf87c SHA512 24a214d02520bc06309d1201bbeb804c86ef2228c2db717d964e57e9580b174211e5a21c2f91f8042c5f8fc0148528a9fbf094f8a074f7d3d2718c2531af5bff
 EBUILD gcc-11.3.1_p20221202.ebuild 1294 BLAKE2B 81f1040b9198522aba53d14fb9f887128de24641069470ee63d938897fc46ed2b1bfca1c7b536e501579ba39e649b24053e59cda79351bc2750eeee1d8683e0d SHA512 962b28ff32aac7b810afcc1b19be91fcd3fe794478d38a02cafed04bf06e17416f1c7d72633054f30b55aff0dca68e8ee491446b82438fca2ac2ee15f4df1742
+EBUILD gcc-11.3.1_p20221209.ebuild 1297 BLAKE2B f3d59b1d083b63bda25302a810d2a889310a0bcdaf692092a6a9c869ec7435215277a5618742997d55154c6e07c3b1ac64fbd899840895edf436e00a28aaf87c SHA512 24a214d02520bc06309d1201bbeb804c86ef2228c2db717d964e57e9580b174211e5a21c2f91f8042c5f8fc0148528a9fbf094f8a074f7d3d2718c2531af5bff
 EBUILD gcc-11.4.9999.ebuild 1267 BLAKE2B 09a26812068945e11164d0a4f8f5cc10dc261a20a647fd4102decc83eecbbe8fcc7f38093609314fa1f26c46164e8248aede741880f7cff64dd5a94836765fa2 SHA512 4ecf698cd6e96dc08683a0e9b69936cdd9085c300d330fb9830cee0e38783e0a1fc8409db39159f9b247f28fc5d7d7572ad3e975f3951f1cb8537f49886bdcde
 EBUILD gcc-12.2.0.ebuild 1434 BLAKE2B a02496eb0178f8f3e38487b233eea12467e9e799763eb447cd545ea5afd48460bc8fc64bd68c84fca38f2d4cdb7487a65b34f4ceedf335393964ec770c0a69de SHA512 62d1a2dfac584c8abe548ff03c960a9e545e34ee1bd61977413af1b31ce98e281b5b90a33be2c666f418a272658f5188e9355bacc51dd0cc7ff456bcc47f2edd
 EBUILD gcc-12.2.1_p20221008.ebuild 1434 BLAKE2B a02496eb0178f8f3e38487b233eea12467e9e799763eb447cd545ea5afd48460bc8fc64bd68c84fca38f2d4cdb7487a65b34f4ceedf335393964ec770c0a69de SHA512 62d1a2dfac584c8abe548ff03c960a9e545e34ee1bd61977413af1b31ce98e281b5b90a33be2c666f418a272658f5188e9355bacc51dd0cc7ff456bcc47f2edd
diff --git a/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild b/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild
new file mode 100644
index 000000000000..1fa3a3601536
--- /dev/null
+++ b/sys-devel/gcc/gcc-10.4.1_p20221208.ebuild
@@ -0,0 +1,58 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+#TOOLCHAIN_GCC_RC=1
+PATCH_GCC_VER="10.5.0"
+PATCH_VER="1"
+MUSL_VER="1"
+MUSL_GCC_VER="10.5.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+elif [[ -n ${TOOLCHAIN_GCC_RC} ]] ; then
+	# Cheesy hack for RCs
+	MY_PV=$(ver_cut 1).$((($(ver_cut 2) + 1))).$((($(ver_cut 3) - 1)))-RC-$(ver_cut 5)
+	MY_P=${PN}-${MY_PV}
+	GCC_TARBALL_SRC_URI="https://gcc.gnu.org/pub/gcc/snapshots/${MY_PV}/${MY_P}.tar.xz"
+	TOOLCHAIN_SET_S=no
+	S="${WORKDIR}"/${MY_P}
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+RDEPEND=""
+BDEPEND="${CATEGORY}/binutils"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	if has_version '>=sys-libs/glibc-2.32-r1'; then
+		rm -v "${WORKDIR}/patch/23_all_disable-riscv32-ABIs.patch" || die
+	fi
+
+	toolchain_src_prepare
+}
diff --git a/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild b/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild
new file mode 100644
index 000000000000..d6ead8b3a521
--- /dev/null
+++ b/sys-devel/gcc/gcc-11.3.1_p20221209.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_SUFFIX="xz"
+TOOLCHAIN_PATCH_DEV="sam"
+PATCH_VER="3"
+PATCH_GCC_VER="11.4.0"
+MUSL_VER="0"
+MUSL_GCC_VER="11.4.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.$(($(ver_cut 3) - 9998))
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=releases/gcc-$(ver_cut 1)
+
+# Don't keyword live ebuilds
+#if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+#	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+#fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND=">=${CATEGORY}/binutils-2.30[cet(-)?]"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/libtool/Manifest b/sys-devel/libtool/Manifest
index 370a79a797aa..a205fe4b04da 100644
--- a/sys-devel/libtool/Manifest
+++ b/sys-devel/libtool/Manifest
@@ -6,7 +6,9 @@ AUX libtool-2.4.6-mint.patch 1158 BLAKE2B aef4853bd00a459c939c1afbaf5ab70da22dc2
 AUX libtool-2.4.6-ppc64le.patch 3672 BLAKE2B 1c1f068f0f1ab8b8180a98412e6a3bb1e4cc84c3e9c8894b4a0a2f8e110ea7ce198fc02d07ba2f18023cf38696d8cfd46e9fae979d5ab30ace2c82b020493f34 SHA512 e9dc9fad5eebabcc65506dddabf3a917c73237485f2ad24765a20437404f654a8c04411755381c7c5d90c2ae13cabd5d89f9ad15839e2e1b9d43300d57adf178
 AUX libtool-2.4.6-pthread.patch 1496 BLAKE2B dc49604133c6c65a2290a8879c243b35b2019cb63b4901b6de68f5efcfe9d42dbaafd7c40ea03f1b247cea8718ef92a51c1bd0ce429ec49665f05a61e26d25fa SHA512 037cf598c644d167de5fef9f4ecee6ccd573d2516f2f777eeaad94135ff05dd0775191d3e21cca397bb664bc0449a5db0b9ef0bbaa16e178762be9769c13c31e
 AUX libtool-2.4.6-pthread_bootstrapped.patch 532 BLAKE2B aeb1592c07a9c5eeed81c483e348786fb1cede29b09fa8e74d0fcf7fdb6ad36fd980823d13b3e20cc7a54d5c518e0f557928b440ef9d0fd6723a8d5f8774c098 SHA512 05c1cee7a3d90bf4768cabaaba47290dc668db7c14173abf99ed8e64dae92191537f89c3304a4d42c01ecc2280d37104c47f621e44b3d19db481846bb225a2a1
+AUX libtool-2.4.7-werror-lto.patch 2248 BLAKE2B 3537c599ee310fda695b1a671770e1d2c5a943e763641515738e8d13907b807b92727182a34af4c20598c3ad228a2b660f10fd582c2f65d1fdef11b92f5fc68a SHA512 b16f835fbec1ecf6c8408c0705fc94886f35443394298e9ae1d1893dbf7dbad11325b636ccc9d0ddeecc00a13a7b5ae78867dd1369b0fc2fcd9276808f326146
 DIST libtool-2.4.7.tar.xz 1016040 BLAKE2B 5e022586337637dd634bd40578ad944bec6e3b8de41f95d55777b90cc88cbc4badb3d76cbf0e638166ece1ea7de828e83590e1e6bac30c1e4b1c254a11a742f2 SHA512 47f4c6de40927254ff9ba452612c0702aea6f4edc7e797f0966c8c6bf0340d533598976cdba17f0bdc64545572e71cd319bbb587aa5f47cd2e7c1d96f873a3da
-EBUILD libtool-2.4.7.ebuild 3327 BLAKE2B a5ec108c02a1f02aa5cd5af8e733e20b61c4c35ba41b7e1780b0037748628739d2f6d29b8879556bd600ee5907e07cea4ae3c872631ca9a8fac292da9b4dbdc0 SHA512 b1f8dd0045bcae3c4072af4109d98e1287ff231506981ea6aff9c7590ea084274f61b36f41b33dd00ae28eecdaeb9a685e6c230127cf55c02c0cdeaf53f2f7c4
+EBUILD libtool-2.4.7-r1.ebuild 3386 BLAKE2B 632fbd05cc5d68ac399a5cba403a195331cb6ebee94973c9d8fe0f196249306a5fdd6f113923e76bad2be97b07e82b2b9c5109b2b46795831b1a45371f017e10 SHA512 572a9f696f28e0f9fb86724034f232519a6a88dac00d252f46f7c24a29034f4d965a8a056973edeb68950c23ca86edce647527b75b3cc305dcd64ae060f9a503
+EBUILD libtool-2.4.7.ebuild 3334 BLAKE2B 196ccbd4276180bfaf120646fadfd75ea6572b0bb7ae587e4ce6a8cc5131fe8eac0d10429bb46b14ab936f083082c1898a583f41c9fd12e165768f4bf95890f8 SHA512 6da3a005faf45047ba8b25677b6c8f34348f978410920db68c44a5c0d388733f4dc3adea27034883256cd43f1eaab03ed55947b18e5bf061b96a3327346b2bf3
 EBUILD libtool-9999.ebuild 3342 BLAKE2B 34bd3f7dc0c7b42eb419a107eeff91a3d5f1f7074c56615bcd924a5f1190951f510f7ae270046dcaff5826285b4ebb64f3d3899828a6af012bc4dd28a3a37824 SHA512 705d5ce0f3c8c506771208325b62072c1c4cafacdfa9f0af4ed4988ebfb3995f090b70d20f8d5566ba382beaea037f99e92e7734c8987f1e8140ea4d15b173a8
 MISC metadata.xml 331 BLAKE2B 4a4cfaad20b2f1c22b0b5ab23b4557e1bef50dbc49d0b7d821d4099e06bf488fdc6c7cb4a29431910d0e1b8cfb7c8b565cd3296afb30925a08389e023c777150 SHA512 9ca8e937181de31beb06558475dc8c10e61765d5280a882576a2d1e4e87fb750bc1c2e99aafdfffe343343797e0565814c0a5f8c18c7fba5b7fe9275100f2609
diff --git a/sys-devel/libtool/files/libtool-2.4.7-werror-lto.patch b/sys-devel/libtool/files/libtool-2.4.7-werror-lto.patch
new file mode 100644
index 000000000000..c0db69f3e2b6
--- /dev/null
+++ b/sys-devel/libtool/files/libtool-2.4.7-werror-lto.patch
@@ -0,0 +1,47 @@
+https://lists.gnu.org/archive/html/libtool-patches/2022-12/msg00000.html
+
+From d72817b1ee5d7b666bf30b0234e32423252d6ad8 Mon Sep 17 00:00:00 2001
+From: Sam James <sam@gentoo.org>
+Date: Sat, 10 Dec 2022 02:00:22 +0000
+Subject: [PATCH] Allow -Werror and -Werror=* through flag filtering
+
+* build-aux/ltmain.in (func_mode_link): allow -Werror and -Werror=* through
+  flat filtering at link time.
+
+  This is needed for detecting likely-runtime problems with LTO using
+  e.g. -Werror=odr or -Werror=lto-type-mismatch.
+
+Bug: https://bugs.gentoo.org/884767
+Signed-off-by: Sam James <sam@gentoo.org>
+--- a/build-aux/ltmain.in
++++ b/build-aux/ltmain.in
+@@ -5408,10 +5408,11 @@ func_mode_link ()
+       # -fsanitize=*         Clang/GCC memory and address sanitizer
+       # -fuse-ld=*           Linker select flags for GCC
+       # -Wa,*                Pass flags directly to the assembler
++      # -Werror, -Werror=*   Report (specified) warnings as errors
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+-      -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*)
++      -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*|-Werror|-Werror=*)
+         func_quote_arg pretty "$arg"
+ 	arg=$func_quote_arg_result
+         func_append compile_command " $arg"
+--- a/build-aux/ltmain.sh
++++ a/build-aux/ltmain.sh
+@@ -5408,10 +5408,11 @@ func_mode_link ()
+       # -fsanitize=*         Clang/GCC memory and address sanitizer
+       # -fuse-ld=*           Linker select flags for GCC
+       # -Wa,*                Pass flags directly to the assembler
++      # -Werror, -Werror=*   Report (specified) warnings as errors
+       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
+       -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+       -O*|-g*|-flto*|-fwhopr*|-fuse-linker-plugin|-fstack-protector*|-stdlib=*| \
+-      -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*)
++      -specs=*|-fsanitize=*|-fuse-ld=*|-Wa,*|-Werror|-Werror=*)
+         func_quote_arg pretty "$arg"
+ 	arg=$func_quote_arg_result
+         func_append compile_command " $arg"
+-- 
+2.38.1
diff --git a/sys-devel/libtool/libtool-2.4.7-r1.ebuild b/sys-devel/libtool/libtool-2.4.7-r1.ebuild
new file mode 100644
index 000000000000..75a9976589a1
--- /dev/null
+++ b/sys-devel/libtool/libtool-2.4.7-r1.ebuild
@@ -0,0 +1,116 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+# Please bump with dev-libs/libltdl.
+
+# bug #225559
+LIBTOOLIZE="true"
+WANT_LIBTOOL="none"
+inherit autotools prefix
+
+if [[ ${PV} == *9999 ]] ; then
+	EGIT_REPO_URI="https://git.savannah.gnu.org/git/libtool.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+fi
+
+DESCRIPTION="A shared library tool for developers"
+HOMEPAGE="https://www.gnu.org/software/libtool/"
+
+LICENSE="GPL-2"
+SLOT="2"
+IUSE="vanilla"
+
+# Pull in libltdl directly until we convert packages to the new dep.
+RDEPEND="
+	sys-devel/gnuconfig
+	>=sys-devel/autoconf-2.69:*
+	>=sys-devel/automake-1.13:*
+	>=dev-libs/libltdl-2.4.7"
+DEPEND="${RDEPEND}"
+[[ ${PV} == *9999 ]] && BDEPEND="sys-apps/help2man"
+
+PATCHES=(
+	# bug #109105
+	"${FILESDIR}"/${PN}-2.4.3-use-linux-version-in-fbsd.patch
+	# bug #581314
+	"${FILESDIR}"/${PN}-2.4.6-ppc64le.patch
+
+	"${FILESDIR}"/${PN}-2.4.6-mint.patch
+	"${FILESDIR}"/${PN}-2.2.6a-darwin-module-bundle.patch
+	"${FILESDIR}"/${PN}-2.4.6-darwin-use-linux-version.patch
+	"${FILESDIR}"/${PN}-2.4.7-werror-lto.patch
+)
+
+src_prepare() {
+	if [[ ${PV} == *9999 ]] ; then
+		eapply "${FILESDIR}"/${PN}-2.4.6-pthread.patch # bug #650876
+		./bootstrap || die
+	else
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-2.4.6-pthread_bootstrapped.patch # bug #650876
+		)
+	fi
+
+	# WARNING: File build-aux/ltmain.sh is read-only; trying to patch anyway
+	chmod +w build-aux/ltmain.sh || die
+
+	if use vanilla ; then
+		eapply_user
+		return 0
+	else
+		default
+	fi
+
+	if use prefix ; then
+		# seems that libtool has to know about EPREFIX a little bit
+		# better, since it fails to find prefix paths to search libs
+		# from, resulting in some packages building static only, since
+		# libtool is fooled into thinking that libraries are unavailable
+		# (argh...). This could also be fixed by making the gcc wrapper
+		# return the correct result for -print-search-dirs (doesn't
+		# include prefix dirs ...).
+		eapply "${FILESDIR}"/${PN}-2.2.10-eprefix.patch
+		eprefixify m4/libtool.m4
+	fi
+
+	pushd libltdl >/dev/null || die
+	AT_NOELIBTOOLIZE=yes eautoreconf
+	popd >/dev/null || die
+	AT_NOELIBTOOLIZE=yes eautoreconf
+
+	# Make sure timestamps don't trigger a rebuild of man pages. #556512
+	if [[ ${PV} != *9999 ]] ; then
+		touch doc/*.1 || die
+		export HELP2MAN=true
+	fi
+}
+
+src_configure() {
+	# the libtool script uses bash code in it and at configure time, tries
+	# to find a bash shell.  if /bin/sh is bash, it uses that.  this can
+	# cause problems for people who switch /bin/sh on the fly to other
+	# shells, so just force libtool to use /bin/bash all the time.
+	export CONFIG_SHELL="$(type -P bash)"
+
+	# Do not bother hardcoding the full path to sed.
+	# Just rely on $PATH. bug #574550
+	export ac_cv_path_SED="$(basename "$(type -P sed)")"
+
+	[[ ${CHOST} == *-darwin* ]] && local myconf="--program-prefix=g"
+
+	ECONF_SOURCE="${S}" econf ${myconf} --disable-ltdl-install
+}
+
+src_install() {
+	default
+
+	local x
+	while read -d $'\0' -r x ; do
+		ln -sf "${EPREFIX}"/usr/share/gnuconfig/${x##*/} "${x}" || die
+	done < <(find "${ED}" '(' -name config.guess -o -name config.sub ')' -print0)
+}
diff --git a/sys-devel/libtool/libtool-2.4.7.ebuild b/sys-devel/libtool/libtool-2.4.7.ebuild
index c21cd363e6fe..7b2a962644b8 100644
--- a/sys-devel/libtool/libtool-2.4.7.ebuild
+++ b/sys-devel/libtool/libtool-2.4.7.ebuild
@@ -15,7 +15,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="mirror://gnu/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
+	KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris ~x86-winnt"
 fi
 
 DESCRIPTION="A shared library tool for developers"
diff --git a/sys-process/Manifest.gz b/sys-process/Manifest.gz
index ba5179bdc962..9268adc5426c 100644
--- a/sys-process/Manifest.gz
+++ b/sys-process/Manifest.gz
diff --git a/sys-process/parallel/Manifest b/sys-process/parallel/Manifest
index ebe9ed46ca2d..db459ce1e449 100644
--- a/sys-process/parallel/Manifest
+++ b/sys-process/parallel/Manifest
@@ -1,13 +1,7 @@
-DIST parallel-20220822.tar.bz2 2389888 BLAKE2B 95e94064eaecf661a46d45f33f61c51c3873b38935adcb9705678f44e4583d4338d9914ca2b5be87f3551148ad9889cb11beda11ac5771d840337d5a1d33c1c4 SHA512 d2dc3b2e59eb777e24c4564c7a9b8460ae85d587b32aa50358583d90f1beea8f321c5e93bd6adf34731a447d7fc22942c81e27a75a4b0b02616af2887be6db12
-DIST parallel-20220822.tar.bz2.sig 2080 BLAKE2B 12b41f979f8a8c69c370cb1c0ff3687d1d7f12447060f3174d6379ed50caa8fb08682a71f7591bfb73e7f975a2f28cceda8e00a646afc5467caed4664767e6a8 SHA512 f0c6e1ddb08751da577d27a9cc1be725bfd7fce6fecb3b48f0fbddae42d5fdef264da36530cdf722bd19fa19308a77d9f7d16703f9f54697e60c4ea03286f58d
-DIST parallel-20220922.tar.bz2 2407177 BLAKE2B 5cdb9daef3731a0de9a845f9686d506abe378973992953feec0b3502498adb0b20ed6ed13795748180555fc3557127dbb5b847030432d7b0039ea2f56818cea4 SHA512 8a1b8b0e3cd5548ceb32b3dd160303e5efd2ed3c4bce09abc09e17437c17b3688324a6b257893e838fb19ca0d55d08288ce2898098346dd78298ffb04a3c9536
-DIST parallel-20220922.tar.bz2.sig 2080 BLAKE2B 79878e925776020308d6b0d981f3c83242f55c05fde5468b4da283ce5a2619edc7def6ad9f54287e16c948744ff37ac3934012b031844e0ad3bf7e4d8147857d SHA512 384cf27a7160327d31933b0a45b0eb340ae3b321c98463a2a9733db82aaf5cca9971dbdaffe223cca24daeb14bc87b33bbfd879d9715cd2e042cd3f44dec8bff
 DIST parallel-20221022.tar.bz2 2409374 BLAKE2B 715ea3b0dbd103a7f37fc7f8a6e28d039393fa562f85283e7aba0e8e64dc673101d561eb1290a69ed9daf9876b40c9b8855d8c72ac35af0323298e9a54594272 SHA512 13746e51435271b702f4c581ece70689b1fb8d45115deb1543dc325a5026f4f23095fb85656314d7f7405e44e523a9e6629eba8ed37751f9c8e008354c76b2f9
 DIST parallel-20221022.tar.bz2.sig 2080 BLAKE2B b2b33ff702a718184eae78e32c3c9447a49d3025d930368d400a93719aef2b2a2edde95a26acd69c95407dd98f7be4b0a447612bf2d79915db89dca17cadec03 SHA512 40f14494db66274e121ffa6ce1668c0e9bc70c0fdb11fd91fe8c1bb035d9417add50fa49dbaa0f649ec2b2fdf7f4eb85d103727b2fff7ee0fa74e2df5d4dcb82
 DIST parallel-20221122.tar.bz2 2415514 BLAKE2B 0bb85853f3dd84dc51a9382f7d7867352ce45fb8ce628e8c7f09a6cc14f469164f290bdb50efc609963478f4644bce36237a4bbec8568a8c23ba34a85670d6a1 SHA512 cdae4ec3a5aaf1ae6c0d9dc35bad930c2b34ad4f91209de80d55258f1945e2df345708000a2facef3b647b6e0d4c275c909faf073961ae0b80b89efa8831211f
 DIST parallel-20221122.tar.bz2.sig 2080 BLAKE2B a75d39ae0cf64c7979d211fca2f2daf2fa9c724b8b15970a02e67f0321d4495b1d90639085a732467eaf2ded3035d628bf3743bb6dcaa1941ab53dc541d47801 SHA512 f9d6bdf9aa35def812a28752e6f8a8780e6aba574167098251148efe7e6426d21a616ddb94ebd8d61c31f722ccf15f6e028e4d7034f7f277c8514a16a5fc372d
-EBUILD parallel-20220822.ebuild 905 BLAKE2B 97af6a0e201cef8e35b18d39385f6e631d0f8272935f2f749e445f0464bfcfa7123913b85106b682ad7bba8436c655e8c4e8f5a804b59223e51ed842275a7dd4 SHA512 13dc53c700f0651ba79142c42402304b37f28da042eebf7f8771f3074e346c4516820f4f451d5186404ba3daeb4eb9a9a5c7e0dbbfb5d01e3c144a1768363af8
-EBUILD parallel-20220922.ebuild 909 BLAKE2B 6874c466cbf7beae2e851b4f4cf0d2668ea46afce7e362a9a00b9bec552eb5d37be05e93cbced0896bd69da2c09ab076cb546f5ff8f1d5570ff57528e19cba29 SHA512 aa19025c50738d5d73070c34d88a538511a6924264b04193d958868d5871b2b96f62bd01dd2e018dac52060a9a4be058922f8609810eabf35292b3350107b292
 EBUILD parallel-20221022.ebuild 905 BLAKE2B 97af6a0e201cef8e35b18d39385f6e631d0f8272935f2f749e445f0464bfcfa7123913b85106b682ad7bba8436c655e8c4e8f5a804b59223e51ed842275a7dd4 SHA512 13dc53c700f0651ba79142c42402304b37f28da042eebf7f8771f3074e346c4516820f4f451d5186404ba3daeb4eb9a9a5c7e0dbbfb5d01e3c144a1768363af8
 EBUILD parallel-20221122.ebuild 909 BLAKE2B 6874c466cbf7beae2e851b4f4cf0d2668ea46afce7e362a9a00b9bec552eb5d37be05e93cbced0896bd69da2c09ab076cb546f5ff8f1d5570ff57528e19cba29 SHA512 aa19025c50738d5d73070c34d88a538511a6924264b04193d958868d5871b2b96f62bd01dd2e018dac52060a9a4be058922f8609810eabf35292b3350107b292
 MISC metadata.xml 1078 BLAKE2B 190d48305a18559658e87132e6be2831db9d8c314b29cf4e5808b6308cf86cb5d46a1b80214fcb8f45f12578a18ebefad8b0b91912c9fbb68126be66ae62ad55 SHA512 80b649870b5b9e12b436f82ce8fd3efad8b3e251c919a90b8c32945332bb3dd88e5bfc96acca6a12a38f2d6e1ce63effa593ef975c8109bad3a85d2d69b2ed98
diff --git a/sys-process/parallel/parallel-20220822.ebuild b/sys-process/parallel/parallel-20220822.ebuild
deleted file mode 100644
index 35785e7adb17..000000000000
--- a/sys-process/parallel/parallel-20220822.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/oletange.asc
-inherit verify-sig
-
-DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
-HOMEPAGE="https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~ppc64 ~riscv x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Devel-Size
-	dev-perl/Text-CSV
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-IO
-"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-oletange-20210423 )"
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
diff --git a/sys-process/parallel/parallel-20220922.ebuild b/sys-process/parallel/parallel-20220922.ebuild
deleted file mode 100644
index 5f26fa471823..000000000000
--- a/sys-process/parallel/parallel-20220922.ebuild
+++ /dev/null
@@ -1,31 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}"/usr/share/openpgp-keys/oletange.asc
-inherit verify-sig
-
-DESCRIPTION="A shell tool for executing jobs in parallel locally or on remote machines"
-HOMEPAGE="https://www.gnu.org/software/parallel/ https://git.savannah.gnu.org/cgit/parallel.git/"
-SRC_URI="mirror://gnu/${PN}/${P}.tar.bz2"
-SRC_URI+=" verify-sig? ( mirror://gnu/${PN}/${P}.tar.bz2.sig )"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~x86-linux ~x64-macos"
-
-RDEPEND="
-	dev-lang/perl
-	dev-perl/Devel-Size
-	dev-perl/Text-CSV
-	virtual/perl-Data-Dumper
-	virtual/perl-File-Temp
-	virtual/perl-IO
-"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( >=sec-keys/openpgp-keys-oletange-20210423 )"
-
-src_configure() {
-	econf --docdir="${EPREFIX}"/usr/share/doc/${PF}/html
-}
author	V3n3RiX <venerix@koprulu.sector>	2022-12-10 09:20:14 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-12-10 09:20:14 +0000
commit	c15acf374d4b25ba5afcb52435da6090f2d98a20 (patch)
tree	f3be21d2a949edee4af8b18e1d9ae7501ae5f186
parent	caf79cb4f7c4d5f7cce488d8f50dfb98ddbd09ab (diff)