gentoo auto-resync : 15:11:2022 - 18:53:15

author: V3n3RiX <venerix@koprulu.sector> 2022-11-15 18:53:15 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2022-11-15 18:53:15 +0000
commit: 57e62db33bb33adb6593a2be7b3a5990aaf01f56 (patch)
tree: 704b2b7ce3d7048511ed7400b090f035b81fbbb1
parent: 8b256c06858dd62dc5a70f801c732e9ab8226123 (diff)
193 files changed, 3128 insertions, 2449 deletions
diff --git a/Manifest b/Manifest
index 166d6877fa73..b03bc317104a 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29590 BLAKE2B 25d8a766807abcf84ca4fb06961bd45102901dd4c1d94533a64f51d5d26f9740d496e71f178216166edd34a29e93b6d251d61ceb2db9722a4d6b71866a6bd73f SHA512 79e41d608917534d233bd5751c889fd68f9ddb7d9d1c90d55b8a627ff807f6d58d117487dc8770c96017e582bb757152056665c94955503f7cb153b6391d5ae2
-TIMESTAMP 2022-11-15T12:09:46Z
+MANIFEST Manifest.files.gz 29615 BLAKE2B 1873310d3501a8beb17dee54f17009f774b4bffe371045ce10bfb0b5247621c9d588906ca80e6cb3bcaadf05d2379c3c94669d0f7ca795bb1fee4b7ae9536529 SHA512 be9e86e66e9db8f74d8c8310387f107bb0a0d9798790317b6cb9789f70e91c940f83eb8b762226779ddd3d30e85672d35ae9671ca8063af6b170d82408b4213d
+TIMESTAMP 2022-11-15T18:09:49Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNzgYpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNz1e1fFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBPgQ/+IuKWkPacZ99mykoxUkfIEigvRx2Q/TMd+4ad8KuwQP7u2CeJriw5wbrM
-atyDNIBj+1qdba0TflAIPSMV8eXk/jOFn1xkN45HZgeqG8avkt8Yv7DjPEKWPa60
-XmC1nGEDsyrwNFUnfMnUFWEFO1eq/p9mpVutqtDouIgtupzPBlgdOl4gjx/JX+Mf
-scXcbLn8NdWshzGZjzKhqghpZjcBlL1AfqFASEt78BPRupwKm7IQd0aI3srUAVVx
-Jioo+hwbezrC6RlvnkJD2SkOjq3ky352XQyEQ9IDbkVkwD50tGCqIG3KfKKhiXaR
-c/+U0HaV4rKz151vqh41GaQ0vlejIuztKGw3jYlFIxNMkCjgYNDmofwCiRdlS+R7
-zVh9T1vr/xfilwQe4DBaKZ+rLzYNAKAx4AyzUwlamXdtIDmLXsrM1Frk9TGEnHz7
-gRYdWN808d2YDcs4WgXyn77k88V8ZoyJbX1qvJ2kedKk1z/P/yP15VZTNqgkKbSa
-4iuh+0Sonwt4flPx9sQ1omxARiAtj6NaFHLxYQa7J2giu6TuG492Id1H5NV5cmUA
-DOn+g/ucJ2MrBtJLsegsthxI6bkjLTFSJbcIu/QHLNJUVTL/6686eQOw4zGSzfwi
-E7OxmI7FNlNyG7kYFQAL9VOF5l7W5/kSRYM9dRVW4QFTtAyWqYk=
-=+pC5
+klC33Q/9HTyRSMoXs3hpJ2weq1KYVUYVMxthVhwuU3Y8OizNM3MLCmzccR4oBsqa
+6sgcbJu8jejDfUZtCLtvxvYVjrw2FvZTe8kiXtYoCGryM5FeylDNtN7dxBxAqPiv
+Y/KAXSp53wZdOu2pEKDldwHBuyrxYwimBlP72eOxGkE1jxCL8WXF5fhPNuF4qV3c
+46ElfJ8QspITfrQMKbS2/JIcyyr0IDtdthb4t/KwCnAi/W1Vd9NZoRo1B0LGPRF8
+W8lX9HDLqsMGIhL3kmDMeGDSsATJUPfReW6FuZQSQ0cx0SXskEMWp4KZSQ4fKi66
+f/yGuNRWVCPjFuPzLAeLQFtEQVlpsPjvmRMeXrgTGegCDo1LpmIZgbpIUf67vCxn
+T802Xpd1CbLj9nWFAvDYqRrXeuC9fo6gfJb8XAYG07n4XuUlR2RbCEILJ+0R3QpP
+meKxnSzqrZIusAhs/b/xmO4c3rXwp2So52gOFM0AGWkRRhC/yByOZy+KPIp4XTl8
+YJxTgUjGl5lCPz9UCE1Pm84zB9TnvAxlC3O9odJrc4QpIXnYqiqBkWrxlCFwKyRo
+JZu8lMGFHutG+qg9ez4mVQGUAOKdnwbCR+e8/JrkA7NcWdEZ6IowWf/mphqjmkHj
+icqodmyEeIEfXa/LgXrGpz3H3tCQ5rxkHzpPEzdBug5+6qHq3SQ=
+=k9Sm
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 8163e993f180..bce5e8817cea 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-i18n/Manifest.gz b/app-i18n/Manifest.gz
index 7c8f9a755de3..09e015e3e801 100644
--- a/app-i18n/Manifest.gz
+++ b/app-i18n/Manifest.gz
diff --git a/app-i18n/scim-sunpinyin/Manifest b/app-i18n/scim-sunpinyin/Manifest
deleted file mode 100644
index ff8169a90179..000000000000
--- a/app-i18n/scim-sunpinyin/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST sunpinyin-3.0.0_rc1.tar.gz 547138 BLAKE2B 682e733241d690d1fef8ce452c497a894c5ab61bf5298c1f292ce3a25a681d594744db43ebd51b3e59274cce0e47a1bce15a793f2c20e2998915c3432f2a7c32 SHA512 c9d4936de5835a7f02e52c5b32bf1a42d76bf7588449aaa813f3df7ab2d72f3ca0f4e18f74a60be4860f0724b5e05cbe567c67e6f3150b0e71b23b3a9002fc5e
-EBUILD scim-sunpinyin-3.0.0_rc1.ebuild 910 BLAKE2B 455568a0c21627c509a562ef3a97608d0e78cce4ea38dbf2c72a0b170236cdb6a291a741af155f614636e534a501378c6b6ffb059b3961c64fdc7eea3f9f53ac SHA512 04cd0eb615f9411c2558537f8c10bdf869b50d36081979364f047cd509d76f6607f5cfeca213766166185e5dd557b4ce3432315f0aefd8a0f8bf4c3254d2e33f
-MISC metadata.xml 407 BLAKE2B 12246b33510e9b889affb92da36e84265be240cf61565a2a9af3806124ba763e638d76c73328ed74398630bf5612ccfc9ad20be6cbdda04c2e4a9dddcd1d951e SHA512 0e6482e2854fc0271bf0c16fd22bfe97fd81ac25da50a81464220430a14d3359f115a38d4cfd88f7b83a22455b022cb6b998e9aa975e4d2f5050160d538d7ee2
diff --git a/app-i18n/scim-sunpinyin/metadata.xml b/app-i18n/scim-sunpinyin/metadata.xml
deleted file mode 100644
index 1c401324a2f6..000000000000
--- a/app-i18n/scim-sunpinyin/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-	<maintainer type="project">
-		<email>cjk@gentoo.org</email>
-		<name>Cjk</name>
-	</maintainer>
-	<use>
-		<flag name="gtk3">Enable support for <pkg>x11-libs/gtk+</pkg>:3</flag>
-	</use>
-	<upstream>
-		<remote-id type="github">sunpinyin/sunpinyin</remote-id>
-	</upstream>
-</pkgmetadata>
diff --git a/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild b/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild
deleted file mode 100644
index ed668fa02f72..000000000000
--- a/app-i18n/scim-sunpinyin/scim-sunpinyin-3.0.0_rc1.ebuild
+++ /dev/null
@@ -1,41 +0,0 @@
-# Copyright 1999-2018 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="6"
-PYTHON_COMPAT=( python2_7 )
-
-inherit python-any-r1 scons-utils toolchain-funcs vcs-snapshot
-
-MY_P="${P#*-}"
-
-DESCRIPTION="SunPinyin IMEngine for SCIM"
-HOMEPAGE="https://github.com/sunpinyin/sunpinyin"
-SRC_URI="https://github.com/${PN#*-}/${PN#*-}/archive/v${PV/_rc/-rc}.tar.gz -> ${MY_P}.tar.gz"
-
-LICENSE="LGPL-2.1 CDDL"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-IUSE="gtk3"
-
-RDEPEND="app-i18n/scim[gtk3=]
-	~app-i18n/sunpinyin-${PV}:="
-DEPEND="${RDEPEND}
-	virtual/pkgconfig"
-S="${WORKDIR}/${MY_P}"
-
-src_prepare() {
-	default
-	tc-export CXX
-}
-
-src_compile() {
-	escons -C wrapper/scim \
-		--prefix="${EPREFIX}"/usr \
-		--libdir="${EPREFIX}"/usr/$(get_libdir) \
-		--libexecdir="${EPREFIX}"/usr/libexec
-}
-
-src_install() {
-	escons -C wrapper/scim --install-sandbox="${D}" install
-	dodoc wrapper/scim/README
-}
diff --git a/app-office/Manifest.gz b/app-office/Manifest.gz
index 187cf8a2da08..ff20ac59a752 100644
--- a/app-office/Manifest.gz
+++ b/app-office/Manifest.gz
diff --git a/app-office/planner/Manifest b/app-office/planner/Manifest
index 64592186c5bd..974f435d317b 100644
--- a/app-office/planner/Manifest
+++ b/app-office/planner/Manifest
@@ -1,5 +1,5 @@
 DIST planner-0.14.6_p20130520.tar.xz 4200624 BLAKE2B 4dd3965a3091fe69d9ac125745f7d3ac54cbe1d81f794c0dded02c0983867d2469848af7f74f1eb745a2e2c42c79be7955d6790f0b263faa5ee821bc28c6a339 SHA512 d658b68c96742340a06a9e96d7910f70fb296cb7a19cc335afdcbec01b36326b1574522155cf19fec012363e1e4d4120c35e1319c699613833be2eb0fa999024
 EBUILD planner-0.14.6_p20130520-r2.ebuild 1663 BLAKE2B 02c3c3765d6da0d1468a5f9788155ea90b63a75446c49415bbd1e74c83110f3eb1ca455cb0459b3108b479f7dc6f32baf5b21ae18da3f367b14bc5cb0f3ecf4e SHA512 0a476057b17d1467ec184e872f1afe9d43014c255099a4eeb2850a10005515b741b7d2d9c53ccf9f40c5660a8ae721fa37ac2a0a7fe1c99f5231a867834697e3
 EBUILD planner-0.14.6_p20130520-r3.ebuild 1580 BLAKE2B b7ca3ac654cd83e5c01e65419cf5db87dfdf018c21a198900045e3e76bd8f5bb65c6561fc49632113bb5339cc261f68acb5b0b47fc89ac857a9357899697f2d0 SHA512 930619cf94fbabab7ffcafb90d924f6e1fb5aace3f0c901672df3887dc141e68b1c13806322a2c74ebb158260c8e03645e72f2c17d95983d3a6dc01f891b0131
-EBUILD planner-9999.ebuild 1397 BLAKE2B 2002f4e43f243d0481c8e7941b7febfaf4b3de3c84a826bb35c27eb2d2b474043416dbeb588dfe7b09f7c7bc55b42080a21fd87174bbe018106dc8acd350adea SHA512 9f875495c7acae63b918653525bb165786892603e1794f0ba66cc91409a0ccdc0da0fa4aa46200328e828f8ed46d04cdfd858d28fd0a0d7bb1a3dc7125fe70cd
+EBUILD planner-9999.ebuild 1397 BLAKE2B cb83952f335c47802def6673644fb44ce7cd26622174d16fb5946be7c9f4ae0f21bafad91e49efe80c4ec6183982f019ed776da7b94057fd72a1ce415feef3d4 SHA512 6cde9f378dd9f71581e0a9f4930f024de6f7e4e306f3d62d8ccc72ea5c0127df00f67ed23be31ada3ff8498ee0d6b8708c1234155cd503f426688427f0abb436
 MISC metadata.xml 417 BLAKE2B 539a490f9b6e00cbff3fc951a25b938c2ed52bfe181ebf578b39559074852729c7ed628dbba0bdd1afea3cc9d590f19ec17bece72ca46f92452c6e1a1b690768 SHA512 2aa152beb3aee59531eda5a62097dad7ff624da1de3eb5b7917e208ae2fb770e86d0ad4a039d4f03a16b355912eaa6a6c5f258a69a5f88d0356655a4dfb808f4
diff --git a/app-office/planner/planner-9999.ebuild b/app-office/planner/planner-9999.ebuild
index b3239ac6b40b..6643bdc69e13 100644
--- a/app-office/planner/planner-9999.ebuild
+++ b/app-office/planner/planner-9999.ebuild
@@ -20,7 +20,7 @@ LICENSE="GPL-2+"
 IUSE="examples gtk-doc libgda" # eds
 
 RDEPEND="
-	>=dev-libs/glib-2.50:2
+	>=dev-libs/glib-2.56:2
 	>=x11-libs/gtk+-3.22:3
 	>=dev-libs/libxml2-2.6.27:2
 	>=dev-libs/libxslt-1.1.23
diff --git a/app-text/Manifest.gz b/app-text/Manifest.gz
index fd51584d4eff..f352409f25eb 100644
--- a/app-text/Manifest.gz
+++ b/app-text/Manifest.gz
diff --git a/app-text/zotero-bin/Manifest b/app-text/zotero-bin/Manifest
index d7b9cceb93c9..540f679ddcae 100644
--- a/app-text/zotero-bin/Manifest
+++ b/app-text/zotero-bin/Manifest
@@ -1,4 +1,7 @@
 DIST zotero-bin-6.0.16-amd64.tar.bz2 69199096 BLAKE2B 3b97576a930df2eca06b052b23c60871772ec94b9a42fd257e3b20aba3fd90aa96db656f174a9544fad737481bd5a1fca36db804207acdd7971fda67b72f9802 SHA512 e79c052ab8d94cc53cdf1fa3e0852a3984b3305768e8363f515440b20a6f0390781a16e14dc753a71493313df6f3c626832aa1a4ced9d4305a8a54a233ac4a2d
 DIST zotero-bin-6.0.16-x86.tar.bz2 70892888 BLAKE2B a2ad3f880960af100863c60da3066d5223f6e2336cefcba9ed0bf0088f15f72155bfb11b4ea0e3b7017cc77d26999d8d16d5264c310e8241fdbbccbacd6153c0 SHA512 434f447d3f754d7e7b02617b02673d0fe565a5c642537bc16ca634ed2f747fd60fe025d2e448cd63644bf671443685bf998223df5cbe875cf56d1b0f48740412
+DIST zotero-bin-6.0.18-amd64.tar.bz2 69200236 BLAKE2B c1dc30b1c295652866068742051c5e42f686a4073fb1501d8d4e0eac2945d65205d92f65f2d2626ad279a7c1f073e22bb58b72ff5bd48497158de5587e753896 SHA512 c839ab2f34f946d2f58c544ca915b9e7386f115aa6a68ea95e0b7293e234140bb64118eac7640cbfa09592879b398db8c8be97da3cee3bab58e8ecbbbe09f9e1
+DIST zotero-bin-6.0.18-x86.tar.bz2 70892698 BLAKE2B 49f23ef1d2a682bb945bf4b43c52e05551414597e6d16b89cefcd07588d158d917c63a7014d23969b5590caf2c79bc8875d03e9e6b2d709ce168acd8420435b6 SHA512 d7c70336a66c208f636ea4c96fde3b1e6547b7f1422a328f24f1ab2e2f25fce21d0ab69a98c787d9ffaa6f70e02995231365c07bf8da0f145adec875d008aa84
 EBUILD zotero-bin-6.0.16.ebuild 2123 BLAKE2B bb11d701d8eececc97f7fd4800976010784b410baa12e63337d515cc7598c897af3a71af43670d6d5381fb0f52164161afb8c419033815e042aaf081231c9b59 SHA512 46f59f4baa820ebade203cc2e34b75178504045322794be8ee8fa29d7333c31355bef8ad7313ac6882938977663b0e084c7f55d38ef15c7b8e7dc53849457dfd
+EBUILD zotero-bin-6.0.18.ebuild 2123 BLAKE2B bb11d701d8eececc97f7fd4800976010784b410baa12e63337d515cc7598c897af3a71af43670d6d5381fb0f52164161afb8c419033815e042aaf081231c9b59 SHA512 46f59f4baa820ebade203cc2e34b75178504045322794be8ee8fa29d7333c31355bef8ad7313ac6882938977663b0e084c7f55d38ef15c7b8e7dc53849457dfd
 MISC metadata.xml 398 BLAKE2B ef8965041b1ddb5dafacd8d3b913c2c272b50460607018468446993062620044b77ee4033d9811979768aafba6def9b3e06775d48f8f194f7ca95ec6ad048c5c SHA512 5a67ca8cbadcfa83e38f983b3e448073970e71f2d2a3c0756d8cbbe54050382095df564bdd5e52b0976a9588f882d814a71179957e09e429a2881a7f48041e53
diff --git a/app-text/zotero-bin/zotero-bin-6.0.18.ebuild b/app-text/zotero-bin/zotero-bin-6.0.18.ebuild
new file mode 100644
index 000000000000..8f643569fc34
--- /dev/null
+++ b/app-text/zotero-bin/zotero-bin-6.0.18.ebuild
@@ -0,0 +1,87 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit desktop xdg
+
+DESCRIPTION="Helps you collect, organize, cite, and share your research sources"
+HOMEPAGE="https://www.zotero.org"
+SRC_URI="
+	amd64? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=${PV} -> ${P}-amd64.tar.bz2 )
+	x86? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-i686&version=${PV} -> ${P}-x86.tar.bz2 )
+"
+S="${WORKDIR}"
+
+LICENSE="AGPL-3"
+SLOT="0"
+KEYWORDS="-* ~amd64 ~x86"
+
+RDEPEND="
+	app-accessibility/at-spi2-core
+	dev-libs/dbus-glib
+	dev-libs/glib
+	dev-libs/nspr
+	dev-libs/nss
+	media-libs/fontconfig
+	media-libs/freetype
+	sys-apps/dbus
+	sys-libs/glibc
+	x11-libs/cairo
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:2
+	x11-libs/gtk+:3
+	x11-libs/libX11
+	x11-libs/libxcb
+	x11-libs/libXcomposite
+	x11-libs/libXcursor
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXi
+	x11-libs/libXrender
+	x11-libs/libXt
+	x11-libs/pango
+"
+
+QA_PREBUILT="opt/zotero/*"
+
+src_prepare() {
+	if use amd64; then
+		cd Zotero_linux-x86_64 || die
+	elif use x86; then
+		cd Zotero_linux-i686 || die
+	fi
+
+	# disable auto-update
+	sed -i -e 's/\(pref("app.update.enabled"\).*/\1, false);/' defaults/preferences/prefs.js || die
+
+	# disable default oo installation questions - manual installation is still possible
+	sed -i -e 's/\(pref("extensions.zoteroOpenOfficeIntegration.skipInstallation"\).*/\1, true);/' \
+		extensions/zoteroOpenOfficeIntegration@zotero.org/defaults/preferences/zoteroOpenOfficeIntegration.js || die
+
+	# fix desktop-file
+	sed -i -e 's#^Exec=.*#Exec=zotero#' zotero.desktop || die
+	sed -i -e 's#Icon=zotero.*#Icon=zotero#' zotero.desktop || die
+
+	default
+}
+
+src_install() {
+	if use amd64; then
+		cd Zotero_linux-x86_64 || die
+	elif use x86; then
+		cd Zotero_linux-i686 || die
+	fi
+
+	dodir opt/zotero
+	cp -a * "${ED}/opt/zotero" || die
+
+	dosym ../../opt/zotero/zotero usr/bin/zotero
+
+	domenu zotero.desktop
+
+	for size in 16 32 48 256; do
+		newicon -s ${size} chrome/icons/default/default${size}.png zotero.png
+	done
+}
diff --git a/dev-db/Manifest.gz b/dev-db/Manifest.gz
index bcb98cd19612..88abdea7d733 100644
--- a/dev-db/Manifest.gz
+++ b/dev-db/Manifest.gz
diff --git a/dev-db/mongodb/Manifest b/dev-db/mongodb/Manifest
index fc0fc383535e..2534ebda5be8 100644
--- a/dev-db/mongodb/Manifest
+++ b/dev-db/mongodb/Manifest
@@ -24,10 +24,12 @@ AUX mongos.conf-r2 648 BLAKE2B 420bebfafc1ef4af4b90580077a803fe30f37d63eca6509e7
 AUX mongos.confd-r3 470 BLAKE2B 9cf6f201d337430901d957a5a0811ff11ac2e81814aac2120c5018e6ec4c38b5ca22d19caea593834416c63609c69a8294227fb6b30200b41dfb29799cc5c1b4 SHA512 952fb9cf5d3eeea2006b101e23142e408c98d66d1f4f868f6ea5a4df6a6331ddcbcbdfb24f4b031c1a8c42652141a3684073b96dfc0b3fbd21dc6b5bcf0e36cb
 AUX mongos.initd-r3 422 BLAKE2B 90872d0d8cdc5e33e3eebee848f58a2db0511d48b496ba9318117b74ad9265ead53a21b7d1790729a62d61839099bee315ace8ff3646c01e096a943c2251bf88 SHA512 bf5897614d59c6b4e72529b126408a62ea37d9e9368e5ff69c8fcf2bad3ec09065cff09467f82117a892c51090018706d2f38c03cb9a974a61a49bd9efa0f144
 DIST mongodb-src-r4.2.17.tar.gz 62216350 BLAKE2B 48169685a25fe00b5a1985bce1e65e13d1dc9c0a56ece6b9c735d8cd212d9c0c5e2912d593bdda351cceda49c8ed7962db42ca37814f88e0bf927066a2d8241b SHA512 ad5448aa6ea232746fdbc7107bd642e827fb7b9182c075f204722e7f625cbc83e7b0a199d2feb56bf27a8851bb38f9740abf0b38c022ddc92e676e7a2d81aef6
+DIST mongodb-src-r4.2.23.tar.gz 62276834 BLAKE2B bb3dfee47ece9a5cc43e10a322b7191709d32bcfcb9659b08a6412d60a83eaf2d8bc4b5784e99d8fc95be643498212d512a11dc93052f02086456a2d2e565da3 SHA512 5c0b341b0700af9f3682e63912569dd4063d8cff85c35f9e19d5882291f62bb1a56f85666278fe38f1bd7f06a46b8423c5e90969be5bb595281d883256c8def4
 DIST mongodb-src-r4.4.10.tar.gz 50636024 BLAKE2B 4b840e1a17b3fcba32d30c649d981b1e2b1d5dd98deab99be599fd5d2aa70b75ff4225542d8da095ec4cb4615f9ccccfa455129d71ed39549efde0a025d7dac4 SHA512 afc04f90e03ec64fd74bdfe2bf33aaa5fc148811af91a8437dfb81fd3a784eedd80128886db99e247ec7e09dc5a73cf34f908ab927942648e15c8f12af6b64e2
 DIST mongodb-src-r4.4.8.tar.gz 50492854 BLAKE2B 4776b17e88104879ea69468ff277b07dc317d936654bb26c69750e0aaf8f51bea73994e7fc4841228d8506db392e0454b5fd16257071b86a2e4ad34e90f33632 SHA512 9b0cd81c9c731255a6c079c040ed342a51a72e3ea72047d3ae959c0afde50b0cdb1fcfe7fcbea30c449a3618a09d213752277cee6eb9bc0a55915b9229543606
 DIST mongodb-src-r5.0.5.tar.gz 54862473 BLAKE2B aafa693da904177a11067603f3835e2ee69abcdb206c2d36983633baa6008b861efeb590880098557e224cd7d6ac8fb23e4e9c63724d76bf90422862c99cdfe9 SHA512 318e58285c8a88fc3a4467ba8c1e6487a2aec403db02c50dbdb53df9a6671b9ea2417c8ee8212b205d642327d0d4bdd76f4bc9543c47e53115dfb981ef73f63e
 EBUILD mongodb-4.2.17-r2.ebuild 5062 BLAKE2B ab63f1a1059cc674390fad7c4e99869d4b1444f46663f5f9909eb0403530b9d852e8a44264979ddd729ddc62a8f53ee42947b94612b27f2d47ba2379560e9cb5 SHA512 ee8d4941459daadd03fe64a4f809b1abecaf70daaaae701ddee649b5c95a756e1e11b27471f1394b63da4165f814549379761c4f914787a2efdf1e59da1309bb
+EBUILD mongodb-4.2.23.ebuild 5019 BLAKE2B 28c100b28fbf4cfc36f61c4785186d84033158ead641aad67f3da3911bda8dd2e0afb076d53fc024587ada87b9ecfcbd4ce71cfb8faffef9ea3c80bb14362a6e SHA512 0837039f24d737060d9111e47f1003a14557d7c053d69c2f6199805a5f2e7e2f218c88148ac5d90901b12e5fe17d8777431380f43e4fc09fb78b3f68d92e9cbe
 EBUILD mongodb-4.4.10-r1.ebuild 5162 BLAKE2B 424240dfb4564eed94c0ab18c936ca5f02cbe8838833cd8f4b4f8c6ca6c5a270e269995715a1d55f3e59e74503d369a3ec25d4e6b96da8eb4e53faba15f5e151 SHA512 8b5980a67d93b0f693c85824b1d5271fee0112157252cf040e8f741822660072185745f272a1043208181d08f5ac8f991cfeb78d400d6dcf3f2d68b3a8abacc9
 EBUILD mongodb-4.4.8-r1.ebuild 4903 BLAKE2B c602d42d89270459366686525694272cd54787fd754ddc6b00701c8de5ddbdf0519bef71a0c71d59e70d9b0e3b97c62c4280cb6737600f88ef8a5b94bba4f483 SHA512 ef2172a0bd7b8d8d8c9dc5ae0300dc0ac0c314f13ae21b746fd2379491b3cd24d1af5cce7e109729f32afbf9f4bc29bfff4333ace1fb0480c92b7eed3aa1b62c
 EBUILD mongodb-4.4.8-r2.ebuild 4924 BLAKE2B 5d86b73af2fdb8acda610b78d86f7c03df78cc1e5b7402b387c7b9ae949ed80acdaad7b9ba8f46009c0297bd0bde4b254c26ce8ef093bcc0d4dfe512ccc6d716 SHA512 e93418f15093950e6818dd5bad0b5f0d6ac83cd5cfc13b50068cd6ef71ef2ac2781488652f38f00adcffbdc02e09e7edc7830380c5f4e2707bf26f7ed85d3b61
diff --git a/dev-db/mongodb/mongodb-4.2.23.ebuild b/dev-db/mongodb/mongodb-4.2.23.ebuild
new file mode 100644
index 000000000000..a56c83d47041
--- /dev/null
+++ b/dev-db/mongodb/mongodb-4.2.23.ebuild
@@ -0,0 +1,183 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..10} )
+
+SCONS_MIN_VERSION="2.5.0"
+CHECKREQS_DISK_BUILD="2400M"
+CHECKREQS_DISK_USR="512M"
+CHECKREQS_MEMORY="1024M"
+
+inherit check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+
+MY_P=${PN}-src-r${PV/_rc/-rc}
+
+DESCRIPTION="A high-performance, open source, schema-free document-oriented database"
+HOMEPAGE="https://www.mongodb.com"
+SRC_URI="https://fastdl.mongodb.org/src/${MY_P}.tar.gz"
+
+LICENSE="Apache-2.0 SSPL-1"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="debug kerberos lto ssl test +tools"
+RESTRICT="!test? ( test )"
+
+RDEPEND="acct-group/mongodb
+	acct-user/mongodb
+	>=app-arch/snappy-1.1.3:=
+	>=dev-cpp/yaml-cpp-0.6.2:=
+	dev-libs/boost:=
+	>=dev-libs/libpcre-8.42[cxx]
+	app-arch/zstd:=
+	dev-libs/snowball-stemmer:=
+	net-libs/libpcap
+	>=sys-libs/zlib-1.2.11:=
+	kerberos? ( dev-libs/cyrus-sasl[kerberos] )
+	ssl? (
+		>=dev-libs/openssl-1.0.1g:0=
+	)"
+DEPEND="${RDEPEND}
+	${PYTHON_DEPS}
+	sys-libs/ncurses:0=
+	sys-libs/readline:0=
+	debug? ( dev-util/valgrind )"
+BDEPEND="
+	$(python_gen_any_dep '
+		test? ( dev-python/pymongo[${PYTHON_USEDEP}] dev-python/requests[${PYTHON_USEDEP}] )
+		>=dev-util/scons-2.5.0[${PYTHON_USEDEP}]
+		dev-python/cheetah3[${PYTHON_USEDEP}]
+		dev-python/psutil[${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+	')
+"
+PDEPEND="tools? ( >=app-admin/mongo-tools-${PV} )"
+
+PATCHES=(
+	"${FILESDIR}/${PN}-4.2.0-fix-scons.patch"
+	"${FILESDIR}/${PN}-4.4.1-gcc11.patch"
+	"${FILESDIR}/${PN}-4.2.15-no-compass.patch"
+	"${FILESDIR}/${PN}-4.2.17-boost-1.79.patch"
+)
+
+S="${WORKDIR}/${MY_P}"
+
+python_check_deps() {
+	if use test; then
+		python_has_version "dev-python/pymongo[${PYTHON_USEDEP}]" || return 1
+		python_has_version "dev-python/requests[${PYTHON_USEDEP}]" || return 1
+	fi
+
+	python_has_version ">=dev-util/scons-2.5.0[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/cheetah3[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/psutil[${PYTHON_USEDEP}]" &&
+	python_has_version "dev-python/pyyaml[${PYTHON_USEDEP}]"
+}
+
+pkg_pretend() {
+	if [[ -n ${REPLACING_VERSIONS} ]]; then
+		if ver_test "$REPLACING_VERSIONS" -lt 4.0; then
+			ewarn "To upgrade from a version earlier than the 4.0-series, you must"
+			ewarn "successively upgrade major releases until you have upgraded"
+			ewarn "to 4.0-series. Then upgrade to 4.2 series."
+		else
+			ewarn "Be sure to set featureCompatibilityVersion to 4.0 before upgrading."
+		fi
+	fi
+}
+
+src_prepare() {
+	default
+
+	# remove bundled libs
+	rm -r src/third_party/{boost-*,pcre-*,scons-*,snappy-*,yaml-cpp-*,zlib-*,zstandard-*} || die
+
+	# remove compass
+	rm -r src/mongo/installer/compass || die
+}
+
+src_configure() {
+	# https://github.com/mongodb/mongo/wiki/Build-Mongodb-From-Source
+	# --use-system-icu fails tests
+	# --use-system-tcmalloc is strongly NOT recommended:
+	scons_opts=(
+		AR="$(tc-getAR)"
+		CC="$(tc-getCC)"
+		CXX="$(tc-getCXX)"
+
+		--disable-warnings-as-errors
+		--use-system-boost
+		--use-system-pcre
+		--use-system-snappy
+		--use-system-stemmer
+		--use-system-yaml
+		--use-system-zlib
+		--use-system-zstd
+	)
+
+	use arm64 && scons_opts+=( --use-hardware-crc32=off ) # Bug 701300
+	use debug && scons_opts+=( --dbg=on )
+	use kerberos && scons_opts+=( --use-sasl-client )
+	use lto && scons_opts+=( --lto=on )
+	use ssl && scons_opts+=( --ssl )
+
+	# Needed to avoid forcing FORTIFY_SOURCE
+	# Gentoo's toolchain applies these anyway
+	scons_opts+=( --runtime-hardening=off )
+
+	# respect mongoDB upstream's basic recommendations
+	# see bug #536688 and #526114
+	if ! use debug; then
+		filter-flags '-m*'
+		filter-flags '-O?'
+	fi
+
+	default
+}
+
+src_compile() {
+	escons "${scons_opts[@]}" core tools
+}
+
+# FEATURES="test -usersandbox" emerge dev-db/mongodb
+src_test() {
+	ewarn "Tests may hang with FEATURES=usersandbox"
+	"${EPYTHON}" ./buildscripts/resmoke.py run --dbpathPrefix=test --suites core --jobs=$(makeopts_jobs) || die "Tests failed with ${EPYTHON}"
+}
+
+src_install() {
+	escons "${scons_opts[@]}" --nostrip install --prefix="${ED}"/usr
+
+	doman debian/mongo*.1
+	dodoc README docs/building.md
+
+	newinitd "${FILESDIR}/${PN}.initd-r3" ${PN}
+	newconfd "${FILESDIR}/${PN}.confd-r3" ${PN}
+	newinitd "${FILESDIR}/mongos.initd-r3" mongos
+	newconfd "${FILESDIR}/mongos.confd-r3" mongos
+
+	insinto /etc
+	newins "${FILESDIR}/${PN}.conf-r3" ${PN}.conf
+	newins "${FILESDIR}/mongos.conf-r2" mongos.conf
+
+	systemd_newunit "${FILESDIR}/${PN}.service-r1" "${PN}.service"
+
+	insinto /etc/logrotate.d/
+	newins "${FILESDIR}/${PN}.logrotate" ${PN}
+
+	# see bug #526114
+	pax-mark emr "${ED}"/usr/bin/{mongo,mongod,mongos}
+
+	local x
+	for x in /var/{lib,log}/${PN}; do
+		diropts -m0750 -o mongodb -g mongodb
+		keepdir "${x}"
+	done
+}
+
+pkg_postinst() {
+	ewarn "Make sure to read the release notes and follow the upgrade process:"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/"
+	ewarn "  https://docs.mongodb.com/manual/release-notes/$(ver_cut 1-2)/#upgrade-procedures"
+}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index 8ac3e3bad31b..a5ad150cd585 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jakartaee-migration/Manifest b/dev-java/jakartaee-migration/Manifest
index 763ff5455368..5bc55b2791c7 100644
--- a/dev-java/jakartaee-migration/Manifest
+++ b/dev-java/jakartaee-migration/Manifest
@@ -1,3 +1,5 @@
 DIST jakartaee-migration-1.0.4-sources.tar.gz 38400 BLAKE2B c0c0151adfde56632ad95919a88eedd6a44056e2d29320e63e0dc64c59cf7ba928135f817ddb3c79a96dd7a8418ab92c8fe4aa9f50a51442bb55384349de603f SHA512 a9d49463f44affa1c5f57d9342e7b4dc77a829c904ba2376f87f086c3662f01e05a2b1cfe2dc746e33605a66849f12415ebb2b63eb05c5e476a4eab9ffd39644
+DIST jakartaee-migration-1.0.5-sources.tar.gz 41061 BLAKE2B 51002b1859b0beaf78fca50b6ac76ae2e7ee0cc9a84cefcf9222028d54b5dd7910e9efed0f25d4842d073128c55085ce3ca25ac4fc2603fe19e83b6916779bff SHA512 c58d042047ccce396b273c5718996511b52014067e311c1ce69b4fc3d866ef6ad31b6c319b4becb60c3fddbb062f9c02abbf20587c8fabb6674f28d5162dbcd8
 EBUILD jakartaee-migration-1.0.4.ebuild 2979 BLAKE2B 1213e1b55b6822382c81fe9d8643b6ad6c55a5ef1ad204f732fafabec6d914f9b2b04c70ef6ec4af26e9e39026f96a67a64f0f23ff2bf81d2b3c4a43e582a1b8 SHA512 9740c0f632d1c6d9102806bca98eb87ee8728aff425515af033a5c6cb895af7ca500a347a51a943ae52dcfe5f3955bbc7a181b916c399336761f87ac61a2918d
+EBUILD jakartaee-migration-1.0.5.ebuild 2983 BLAKE2B 657de2ac8b5b2e4f888c05fce584ae61afd52bc3925eadf83b966fb7a33e0116a7fb91e2c21c5fc9633d2247d291c4df09bdbb31763f037fa37933b2557c804a SHA512 015c1dc8eb17c726ff1d9189fea18809ef04d5e4890ebbf1728cdf53716a1b0ce18e59c405e7b702873fa5d6fb817ebd91ec4797a9f3a2dd340eae059b9f4f7f
 MISC metadata.xml 233 BLAKE2B 2b385ca77219f08b2874b3a4a91a0c836d3cb45ec44b05babb33d590c56ceb5337ecb93a8450a37f8e6bbf4cfc1455892e8142d22e0a1d527d40361e2dce350b SHA512 1acc975a7dc3344bc63282d652ca00d8245970b58353b4fd00f09a4859db3eaba2dcd85e1537d424b7174e4f9c01c2ffb10ec6d107b5c895c9ca20730666de7f
diff --git a/dev-java/jakartaee-migration/jakartaee-migration-1.0.5.ebuild b/dev-java/jakartaee-migration/jakartaee-migration-1.0.5.ebuild
new file mode 100644
index 000000000000..cbce676a1509
--- /dev/null
+++ b/dev-java/jakartaee-migration/jakartaee-migration-1.0.5.ebuild
@@ -0,0 +1,92 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+# Skeleton command:
+# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://ftp.fau.de/apache/tomcat/jakartaee-migration/v1.0.5/source/jakartaee-migration-1.0.5-src.tar.gz --slot 0 --keywords "~amd64" --ebuild jakartaee-migration-1.0.5.ebuild
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+MAVEN_ID="org.apache.tomcat:jakartaee-migration:1.0.5"
+JAVA_TESTING_FRAMEWORKS="junit-4"
+
+inherit java-pkg-2 java-pkg-simple
+
+DESCRIPTION="Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9"
+HOMEPAGE="https://tomcat.apache.org"
+SRC_URI="mirror://apache/tomcat/${PN}/v${PV}/source/${P}-src.tar.gz -> ${P}-sources.tar.gz"
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64"
+
+# Common dependencies
+# POM: pom.xml
+# commons-io:commons-io:2.11.0 -> >=dev-java/commons-io-2.11.0:1
+# org.apache.bcel:bcel:6.6.0 -> >=dev-java/bcel-6.6.0:0
+# org.apache.commons:commons-compress:1.22 -> !!!suitable-mavenVersion-not-found!!!
+
+CDEPEND="
+	dev-java/ant-core:0
+	>=dev-java/bcel-6.6.0:0
+	>=dev-java/commons-compress-1.21:0
+	>=dev-java/commons-io-2.11.0:1
+"
+
+# Compile dependencies
+# POM: pom.xml
+# org.apache.ant:ant:1.10.12 -> !!!suitable-mavenVersion-not-found!!!
+# POM: pom.xml
+# test? junit:junit:4.13.2 -> >=dev-java/junit-4.13.2:4
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CDEPEND}
+"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CDEPEND}"
+
+S="${WORKDIR}/${P}"
+
+JAVA_LAUNCHER_FILENAME="${PN}"
+
+JAVA_GENTOO_CLASSPATH="ant-core,bcel,commons-compress,commons-io-1"
+JAVA_SRC_DIR="src/main/java"
+JAVA_MAIN_CLASS="org.apache.tomcat.jakartaee.MigrationCLI"
+JAVA_RESOURCE_DIRS=(
+	"src/main/resources"
+)
+
+JAVA_TEST_GENTOO_CLASSPATH="junit-4"
+JAVA_TEST_SRC_DIR="src/test/java"
+JAVA_TEST_RESOURCE_DIRS=(
+	"src/test/resources"
+)
+JAVA_TEST_EXCLUDES=(
+	"org.apache.tomcat.jakartaee.TesterConstants"
+)
+
+src_prepare() {
+	default
+	sed -i "s/\${project.version}/${PV}/g" src/main/resources/info.properties
+}
+
+src_test() {
+	# we need to create jar files for the tests the same way as it's done using pom.xml
+	local implementation_version=$(grep Implementation-Version pom.xml | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
+	mkdir -p target/test-classes/META-INF || die
+	pushd target/test-classes || die
+	echo "Implementation-Version: ${implementation_version}" > META-INF/MANIFEST.MF
+	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name CommonGatewayInterface.java) || die
+	jar cfm cgi-api.jar META-INF/MANIFEST.MF $(find -name CommonGatewayInterface.class) || die
+	ejavac -d . -encoding ${JAVA_ENCODING} $(find "${S}/${JAVA_TEST_SRC_DIR}" -name HelloCGI.java) || die
+	jar cfm hellocgi.jar META-INF/MANIFEST.MF $(find -name HelloCGI.class) || die
+	for enc in rsa dsa ec; do
+		cp hellocgi.jar hellocgi-signed-${enc}.jar || die
+		jarsigner -keystore "${S}/src/test/resources/keystore.p12" -storepass apache hellocgi-signed-${enc}.jar ${enc} || die
+	done
+	popd
+
+	java-pkg-simple_src_test
+}
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index b69893ab5c2c..bb2866799c00 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -1,9 +1,15 @@
 DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
 DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
+DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
+DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
+DIST apache-tomcat-9.0.69-src.tar.gz 6214949 BLAKE2B 21387c7dbc830c5292d5ea315bf93c2faac2160dd21e8524184495e34cee0739ef57ce77ba46c99a64f7389047da431cffe000da9a5db2aabd481e84f149153f SHA512 8178ef757d8a8a04b87a08e0a5d45e2d244fe0c0fd11b8f6b50182da1811758b7e4b1ea52188e4b241278c32737c0f61ed93d53b5a95075ebabb9209fe57a3b1
+DIST apache-tomcat-9.0.69-src.tar.gz.asc 833 BLAKE2B e4002185d7054ff963d0ecb1373afb2affb4795281bd344fa5b707e45dac4c6168cc2365853923a0cca1b5c21806554987513177ed64e01d7905f5d46ee9c581 SHA512 7d9ea8ac9986303bf649781524dd93db22c9ab1101a50be9aad7b4b65f902640b24462117047ddeba99b3652d63e980deaa232f6b93aff2266887a183059ff8f
 EBUILD tomcat-el-api-10.0.27-r1.ebuild 1081 BLAKE2B 6857d00f026a30c1ead3172c2ef5e14bc3ad1ecb654664fb497592fefec76348fdf2ff33be25b3dcb0053cc12a7eb7370be6df54e2a8e95d73fd7e73a4ec60db SHA512 4486b915b1fec57e9ae076377267c9232d20a47d835144173157fb2bb25682c93e846add000e7d9cc1b00c74d1c9526fdbcb10fe7e5ae7242f4d37945b78799d
 EBUILD tomcat-el-api-10.1.1.ebuild 1078 BLAKE2B 102936dff87a81ba38b59eb82a4e6643021278e203d5a1f929d0d59affe5664b28c9be24b71e87a19c67547c33d20717a1bdd4d1d688336978cbb46ec7db1603 SHA512 d5b14c813a66af8ef01b30b515f524c1adfedace4b82fa6b8761cd9c7c8ffcee3522ad063d0a7432f9482501af532dff71123602e1cd43a0a4d8c3f429ec5a4d
+EBUILD tomcat-el-api-10.1.2.ebuild 1378 BLAKE2B 8a81c24f9ef4ad38ccb2bbd79e0ac11c08c913a50f48c2e0d81a37e6bb894f3527b02606f4bd43ec63ecf3dfd865ba77e48b4ff4e49da1934959caf98e401bdd SHA512 da1ff8e697ee12f3a7325ad51c9cccd04f739d9c2af8627e8b6d0e15799b486f16f9aad58dbfddd6c0f0fcf1f9d33bd6ddb2a4de8cd236bf1284c1acadce5450
 EBUILD tomcat-el-api-8.5.83-r1.ebuild 1074 BLAKE2B 0265263b3c8ffb18c4f298f37825077154ff548e36a02817752826d603c35e1b47b58d099253d5f8b23e5c194c2157947970faa52459809c0136fdbb00a3193d SHA512 bb5dfb679a825e5d7cc69d37871ef541dab45d3c234d39baf373745528c5dbeaf5388b3c63407d606cda053a07ae867f25347f88dda7acaf6f49467020fcb61a
 EBUILD tomcat-el-api-9.0.68-r1.ebuild 1074 BLAKE2B 6c7857d992e45f72ea22e6aa1cbd149ab0e163418ebf49d576b0f2fcb0ab5c47f63993bb8ac892611205d33a1895128892d4e570c513b252120665b347b87d66 SHA512 988472477469d03e307ff4c36461ac024d76e8e7e05cb209dc5111f9d118aead88a41e930583b1a5bb56f45de7fd7dbcf6203d51fc271a1435870d62ca5d7a1a
+EBUILD tomcat-el-api-9.0.69.ebuild 1374 BLAKE2B d31798630a337c614b052a07a6ab144f0678efab63f56b627be30e99c2be05b3175d296a72f1bd81807cbeb3fd305858d0c15205eaed2bd626ea03309b9da01b SHA512 56b991c2cdfb78a987dc93845c960ba4de8cbb09d2c27c3e1465320ce534810f9aa8bafad1c68b711f6cb3cb6a1bc84c7baf05be06e0efa1954708146bdbc259
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild
new file mode 100644
index 000000000000..c878a2711301
--- /dev/null
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-el-api:10.1.2"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's EL API 5.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-11:*"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/el"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/jakarta \( -name 'jsp' -o -name 'servlet' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/jakarta resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-9.0.69.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-9.0.69.ebuild
new file mode 100644
index 000000000000..0a1f771e5a4c
--- /dev/null
+++ b/dev-java/tomcat-el-api/tomcat-el-api-9.0.69.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-el-api:9.0.69"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's EL API 5.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/el"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/javax \( -name 'jsp' -o -name 'servlet' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/javax resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest
index a727ccaa45e8..dec64026bc0f 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -1,9 +1,15 @@
 DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
 DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
+DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
+DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
+DIST apache-tomcat-9.0.69-src.tar.gz 6214949 BLAKE2B 21387c7dbc830c5292d5ea315bf93c2faac2160dd21e8524184495e34cee0739ef57ce77ba46c99a64f7389047da431cffe000da9a5db2aabd481e84f149153f SHA512 8178ef757d8a8a04b87a08e0a5d45e2d244fe0c0fd11b8f6b50182da1811758b7e4b1ea52188e4b241278c32737c0f61ed93d53b5a95075ebabb9209fe57a3b1
+DIST apache-tomcat-9.0.69-src.tar.gz.asc 833 BLAKE2B e4002185d7054ff963d0ecb1373afb2affb4795281bd344fa5b707e45dac4c6168cc2365853923a0cca1b5c21806554987513177ed64e01d7905f5d46ee9c581 SHA512 7d9ea8ac9986303bf649781524dd93db22c9ab1101a50be9aad7b4b65f902640b24462117047ddeba99b3652d63e980deaa232f6b93aff2266887a183059ff8f
 EBUILD tomcat-jsp-api-10.0.27-r1.ebuild 1124 BLAKE2B 156423a2485711c72c10edf6617587872ec1ce3f89d4e1722f1969089b90d96cd49153cf9139437a4d08a8980243059a35c27be20345339ff99861bb77fee663 SHA512 e717a54ac7176b45f5a55eed7063a9cc6fa7457029a68f5a3eafd461cd1586d6fb2a36d02d9b98bd0b139232786670680bc2f4f3e8ac91ac82041e20d6e2dc79
 EBUILD tomcat-jsp-api-10.1.1.ebuild 1121 BLAKE2B 28281e634eae4990fda6afdcc45b451eb2fa397ba8f0ef26c0403a67618c1062a77002c051729c9238bfde185be4878bfcca113ff55d36cee3aaa0b9a5082686 SHA512 b476387af9ceeea788ecf9e54243e60533aec90d0f6609b4c86d9bc9860f9bf07d6cf8460ea508be28c1190a9d18c5f4bfb3af1dd3a735150ae80e81b61054b4
+EBUILD tomcat-jsp-api-10.1.2.ebuild 1421 BLAKE2B 386285f7b823c7babcf7626af895d4d403dd2a31c6b6a220188251da2227ec180d657a01f5f37ddd32806b5672c66f64e02809d0d0308d00695cb9aefbafd348 SHA512 995e9e4293fbb5e9c6503c0bb2b8e85ebfeaa0bb4155c04df91e49f8d61cb2c58fc0f43b6b05aa26e63e08a38ec1f4d484145cd28c582d1b45899c0b1d2b4777
 EBUILD tomcat-jsp-api-8.5.83-r1.ebuild 1117 BLAKE2B 5d9eb8bd7e2e79e2f4e7e37d3e9a41ab87a375a9aa72b1a73bead1335a730c3a9c5d3b60526e4b87d7e46f0d25f70b251002b1ecccfe3df40cf9bb96e0dd0d7b SHA512 abadc559103fb67928be0f0a62cdff998248f5843284011556a08c3aaa5f06ba5764cb2e6448a8de05c3dfeff5d276d201c900fa434a145ba6914106839fda5f
 EBUILD tomcat-jsp-api-9.0.68-r1.ebuild 1117 BLAKE2B 80e7bc1fad34ae43c7d84a5caf0fee14d40d2b162398ede8b0eb1faf9f6e7ba5f48765186bb68922dcd163a5a2b4fa6a90b2bd044d530fd331785d7d783c49a2 SHA512 41af601effda53de446251bab678b846b6508fe5e92d2d03d7966f51095d4d907f302ac0c8dee6356b4af35dfd3802f326423515e559313b737d9b573c7f6336
+EBUILD tomcat-jsp-api-9.0.69.ebuild 1417 BLAKE2B a1c84669f61683e0e9754be12ea28c06d522b52f19a249951685b23d57af2ff61ed87c1eceb1832549f3e6a1f1f75b81c77e34c5bc19bad41b64ea84d179ae6b SHA512 b2f9be6528fddfd656102edc0a6e2eadbb97404ff13fb6e86902eab56ed7395308bc85c7fa76f9e7ec157518d033d4908815857e095e88913b3ed61a6ed93128
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild
new file mode 100644
index 000000000000..8ed840e8e5e8
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:10.1.2"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's JSP API 3.1 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/tomcat-el-api-${PV}:5.0
+	~dev-java/tomcat-servlet-api-${PV}:6.0
+"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-11:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/servlet/jsp"
+
+src_prepare() {
+	default
+	mkdir -p resources/jakarta/servlet || "creating \"resources\" failed"
+	cp -r {java,resources}/jakarta/servlet/jsp || "cannot copy to \"resources\" dir"
+	find resources \( -name '*.java' -o -name 'tagext' \) \
+		-exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.69.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.69.ebuild
new file mode 100644
index 000000000000..15e31b866629
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.69.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:9.0.69"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's JSP API 3.1 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/tomcat-el-api-${PV}:3.0
+	~dev-java/tomcat-servlet-api-${PV}:4.0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/servlet/jsp"
+
+src_prepare() {
+	default
+	mkdir -p resources/javax/servlet || "creating \"resources\" failed"
+	cp -r {java,resources}/javax/servlet/jsp || "cannot copy to \"resources\" dir"
+	find resources \( -name '*.java' -o -name 'tagext' \) \
+		-exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index 808b3d230005..c350813a8c93 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -3,18 +3,24 @@ AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
 DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
 DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
+DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
+DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
 DIST apache-tomcat-7.0.109-src.tar.gz 5314401 BLAKE2B 56583caea6879bf8ca5cc02a886de3d7af413032f88d367653e709dc1c8f590e78620c788317bbff4b6e65dd3e242cc26863164ac8e7c87334a22636f3ed0703 SHA512 ecf9c0bee0e3e1aa24f299fe633705c5a2f6aa264d9e4968cfc96aa5d0a425c2b0ff07765a8b6c67221766733bdfaed6e6c6377a8d0870d889e7063ce90a46ce
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
+DIST apache-tomcat-9.0.69-src.tar.gz 6214949 BLAKE2B 21387c7dbc830c5292d5ea315bf93c2faac2160dd21e8524184495e34cee0739ef57ce77ba46c99a64f7389047da431cffe000da9a5db2aabd481e84f149153f SHA512 8178ef757d8a8a04b87a08e0a5d45e2d244fe0c0fd11b8f6b50182da1811758b7e4b1ea52188e4b241278c32737c0f61ed93d53b5a95075ebabb9209fe57a3b1
+DIST apache-tomcat-9.0.69-src.tar.gz.asc 833 BLAKE2B e4002185d7054ff963d0ecb1373afb2affb4795281bd344fa5b707e45dac4c6168cc2365853923a0cca1b5c21806554987513177ed64e01d7905f5d46ee9c581 SHA512 7d9ea8ac9986303bf649781524dd93db22c9ab1101a50be9aad7b4b65f902640b24462117047ddeba99b3652d63e980deaa232f6b93aff2266887a183059ff8f
 EBUILD tomcat-servlet-api-10.0.27-r1.ebuild 1171 BLAKE2B 2e49a8a90f7936385988b221b6a1dd540590bac31a0969f38727441d7f6448236c82b6345f713b285834fcb3a4407fcb661889fe0f95b8d54f35d33d961f33f9 SHA512 cefdd4b9433d4cc16a4c6ba38752911a278bd97a78161755b98b96eb0280826b46300dc0ef26591ae9f28a2df47fcac58bf64b96064008c2cd2e5a4997435655
 EBUILD tomcat-servlet-api-10.1.1.ebuild 1168 BLAKE2B ec65a3778cbc678f576e564fbb99ca990f99bfc6f02eea04beb6525e54e1b7a64fdbbf621df0af3106dfd6f8f0e9508c49e0c31c2f04aecce75138b7cf410cfc SHA512 6b6c241894e17a37eecee863454e98d56a274bafe3ef913aeb139d7aec1f906488a4485604f5178ed404d35a3953c1dd62b51e97c9a8de66b477deb2d5f38695
+EBUILD tomcat-servlet-api-10.1.2.ebuild 1468 BLAKE2B 67d55f97786e2e4f191b8d9b76ec902b1d362e43f178f2f9b5afd49d70dfd0fa06ecbe519e0fa48cf7592438ddef6119f4917de642bd2380bc9af64b152276a0 SHA512 f654acecda8b6bef951d896355762bb95b2c59a37ea1fece08d0ae611b7bca43c6f363fce7405a87c6cc3df8df3dba3ba9a4d8408e274bf40b035e4d0ec4ff4c
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.83-r1.ebuild 1324 BLAKE2B 079d3ad08580256a30a3d359818e940be01f962be2019c7468f17c1bf6a4e8c8f685056ad4d08419175c4d5983333332b07117ecc07326df63c2de5083ee0cf7 SHA512 122bf1cb7a4ef88481888715d878c5c4bbb117e2214b28722173e60ddf6458e377487679312755105e360bb94b261b77e496f80bcde0e1a8e402794cf8a1cca8
 EBUILD tomcat-servlet-api-9.0.68-r1.ebuild 1164 BLAKE2B 89ee54e02f25080b1faa6e2279dbda2394e7efd74465818afb9d6da5a21ff0b6d8dbc0e3e7ba6ebafb8e0979ef7e3950cc4de9e2242df10b67521f1cad1531b0 SHA512 c32dc63e1dfffcb4ddaa3869a9e5b7ead54005f2d316593a0b1ec6dd98014321e9c7f3144830a924ecf88ba9e2cfdc446a76ab47166ed78efd4e4c49e63dbf03
+EBUILD tomcat-servlet-api-9.0.69.ebuild 1464 BLAKE2B bb7a34bb8c3103c7506e789957a200cec40a2b7677846bd0aa07c446e38dd29c6ae440b72728a5f82b7599c1411ddcd698cb6471a554b54fb74419f230d7760f SHA512 7f9e8ff1e074e40b1bae69a983d5ee22326b4c0251281d5142b0ff1f0ccc1dbcff2798594b7b4067b3d7288644a5453f049453621a8826e9595db0268977f2ee
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.2.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.2.ebuild
new file mode 100644
index 000000000000..52b5decd1a17
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.2.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-servlet-api:10.1.2"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's Servlet API 6.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="6.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="~dev-java/tomcat-el-api-${PV}:5.0"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-11:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/servlet"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/jakarta \( -name 'el' -o -name 'jsp' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/jakarta resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.69.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.69.ebuild
new file mode 100644
index 000000000000..afd2f770ec07
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.69.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-servlet-api:9.0.69"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's Servlet API 6.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="~dev-java/tomcat-el-api-${PV}:3.0"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/servlet"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/javax \( -name 'el' -o -name 'jsp' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/javax resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 16996a1c108e..2a45afdecae8 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index a0ce6ec3d43c..4c8e19d3b48d 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -8,30 +8,24 @@ DIST Python-3.11.0.tar.xz 19819768 BLAKE2B 3a9852b8973e0e6ce414742f08f17f2c239d2
 DIST Python-3.11.0.tar.xz.asc 833 BLAKE2B 7133f390ff8e7d856466c8d310903ef694196f5d945d6b753dcd7bf3e5416d69ef0e2320252ecce419ecce07ac5e2a37ad1657e2ded393d0c38a6521a65cebc2 SHA512 d20fb152c5b16cfef1f59af588f7576eb45c903d9e15fd4ad0e15fd32bef7ffd951b99a062d2944234ecffcf29eb9266544e92d2f6584710cbb20ba38f8ac224
 DIST Python-3.12.0a1.tar.xz 19776600 BLAKE2B 035e75c5713f9ff139f6df50329d9b74ade3b255f5413311d7012b2298dd3cb6d71ed11f5855d01e79d6bac334f80bd6a3340591fc3654d9723fd1c5f80eb750 SHA512 fa69dddf36dfe89b869d4de71cb8e878ef1e8be2b96ddfe2d58286710dd09b64db67c130d0438e3cea6679f6e9cd6bb83633691c8b7d6f346b730668866a28f7
 DIST Python-3.12.0a1.tar.xz.asc 963 BLAKE2B 5027ce705b80ad2d186f45c27d00542df1090dcaa30e9d97e483d7debdaeb35b5bf94c9f0cd000715a8ccf6dc5f752e0129bb42e48bfd6b308754bd73ee26090 SHA512 4db7946d27505da9c9b358a3b0fc2f47bb79b10bbcdb8f3ce2f918d1b74665e41a51600de3b94d50b126b66c72f191f8532f4030af184698c32430c35ef8d821
+DIST Python-3.12.0a2.tar.xz 19633668 BLAKE2B 03c5b5637d43bd324f3dce2d16d8d12a585b2bbed82e165c1491e798f9a321547ab035372fe775b28098c6b8f65fc115f77d9ef677ec34da65cbf882689d6181 SHA512 0f830fdb514078c5403727b31fd81912382eca4decb52ae9bfb0f00b8a007be9f8e29bad349034ec97e2229f60fe0baae417227413350485d747d31f4567d5c1
+DIST Python-3.12.0a2.tar.xz.asc 963 BLAKE2B a5508457e61db805cbadcef66ebb92d6e62a797704827483cca616d6441a60f99ec7a826ad3ebdaa7c92865a9aa2e5b41fde248467d5b9e1c57fb4295f7910b4 SHA512 f0c22e071c68d648c8cf2823647f0c807db41b81b94b8100b50d2049a47f19475a4323c5ac488eb5a3798f942978054f358090c1e460804232bb46093fb3fd55
 DIST Python-3.8.15.tar.xz 19038408 BLAKE2B 4ce84171b2f7ca8c9cf1d130adf70f16a0899766cea98965c3e7afcb84b73c482bcb400b59b91736d20e31c57be79edc178f6eeecd775a1f8920a8fbfdd90c24 SHA512 4fb3827b13c2452faa75e5ed18dddf381e80b4fffcfde046e289b4629cff0bb87fba1d09916b9b8a6f8039dc422c952293ebdb381c49f8ca7e7893ae4be6c28d
 DIST Python-3.8.15.tar.xz.asc 833 BLAKE2B bff055e28f4a2e59bb9e6d131ed39f954b729ac791279a6ac618521b545ace16e4eba3aaab629ca1c155d973c0c255b3d184b38fd82ee943d59a328d0603b1b6 SHA512 8ed69db7773a111e7b356848e18fc35b8835426e8d2cb8f311644d511682960c97740232c32c92196391adaecebc0ff842c2f918aad07e5dd46b168e8277ac04
 DIST Python-3.9.15.tar.xz 19712208 BLAKE2B a8490c998c89ed4e3e87ef48e3b5d622e5d06ebd7b8b79db564d668cd1f0c7fe89e0ef37ec4481ff82b30778e2be1a96c1b16199b9dce1f82de32f73b4343ddd SHA512 9310d263bc7a7925f73a6f66fd254ae61f377f43011a6bc5c58e57c8b170c2da4f197a646927ab9d05f8912ed8be4369c09576063931a3f93c3b0228ccb33a39
 DIST Python-3.9.15.tar.xz.asc 833 BLAKE2B c325fb52fae254153456c24c1039b07c9ccf8734df3665640215d35219ccacb705f99d94c9f8b644d15d4ea4612f5ac0da599814f68f7d3b6fc1fdc175db9002 SHA512 722625091731536757b9db447590c31620665133d45076367a3281f2ee3add23a781b10ce5cea582d65caabb18814583c1a347689d2b396214e36a6771182f38
 DIST python-gentoo-patches-2.7.18_p16.tar.xz 35448 BLAKE2B 0139c0944f62f9cdd236f6a8557e0ed19704c7d72869af1cb7d8bd3e646a746cd4a0201e1b44232a5e78ef49f254db20b0d0271bf744fbfd4fe0f1e99b8f3e6c SHA512 810be590d0e06fab4b2165e6852ca49662f09dcd7e20b47a29f613ad7653252c8dfac3f0eb228d77c8a914efa7c08788b2fbd552a4b47504f5fd0ec17450c48f
-DIST python-gentoo-patches-3.10.8_p2.tar.xz 13252 BLAKE2B 34424b7337c5bcde63bfd0149f9e343056696f4126b8b093c5120dbfd13bdb98e1b8395bf09dfd0dcc1e6c7de062cb54ddfb91ede25c6aa5a1c02e8f05c1685f SHA512 6f99f6b3ff0b5375e9d516e3299e197a175a589e6773e3e07277cc25f8d6d7d5f04952d4b5110055fdd3923e3908d8154e4580da0fca03ffd8788e6999036d85
 DIST python-gentoo-patches-3.10.8_p3-r1.tar.xz 16468 BLAKE2B be00739bdfc78623781139b8218d5173f13f252d3394482c38aeda8efd9b6bb4988a8dbec1b521a028448a0a92c7dce8b979eb2c38fdd6749bd9be682847d719 SHA512 094a058d2b956dfe017ae8b1da4c8da0a6aad82b70eebe9cdeb8d86bfe8b625aba57526186c97a805392c6baa62e5daaf005b54864e096f946f40ef3ce703bda
-DIST python-gentoo-patches-3.11.0_p1.tar.xz 5920 BLAKE2B c1fefa593faa4b65b646310bf924f697c2e85ccc620d749ca478839198687147813f0794597bd0451403958c56b575ece27209b152f3872a1a510ebbafa63206 SHA512 241313f70d282ada1c7153ffd62556722d4763c1a6053b91fc0a10be3d18304c39086202ccd02be99c4dca849e2de998d79c8799c0b0cdf25b2d1ff866267491
 DIST python-gentoo-patches-3.11.0_p2-r1.tar.xz 9140 BLAKE2B 3fa95d054c2702ec04f92493c1a721064a5119bfe555dc413f54977d2349d513c00586ec379ee3719e8c5a213c1c43b8702e945d1f6b746ba71dc53d70d98d9c SHA512 2372b40f5e5d391193c8560430c21d6b1d8d9aaefd8ea77aff68decc08addaea17c34ae3b3f754b6069bbab797f06361438585411276d680da2a18d6361be1fd
-DIST python-gentoo-patches-3.12.0a1_p1.tar.xz 5436 BLAKE2B 6d69bc7bc5c1cca6ef099efd1236fb5ce3a1437f5c97f924e1d9070651deb77661634801f0cd8af4344d4c23f3cbaec5e0114bcae0d086606059f30e98348feb SHA512 c37569133492a61cc77a69669b0a04376b832252197fc1164f254c0f50be1e8ec45af3db25db0d2bbc2c6f27bc752c0da70ba145b14e052824b79d5d30a20ca7
 DIST python-gentoo-patches-3.12.0a1_p2-r1.tar.xz 9168 BLAKE2B c2f1018c7890518c66051a3470bb4bec45342c0656a143e0a25ea5b2ec5c27a1285345f8f6fbc7eaea5e216ae1bd2462ecd6ad251851368921cb3fe816652d43 SHA512 7c5436768e3e4de8bafe16f0709115901c90892b127e6f81c06a6da4a3a35c973cb38542180c714d0f2848972db18a0f70e33f0a4dce9b037ea0d15ace045f5a
-DIST python-gentoo-patches-3.8.15_p2.tar.xz 27472 BLAKE2B eef7e3f944b59573078580ad056e2720d1ee04bfb0c86b3b387775a9b93990011babad7f2a59ece0dd490b4e52804c2bd5ed5587683314045503e3863600520b SHA512 f56d61cf93fe9981e6d126bc3c4f9e18d322b605b6d4e76f8e44288f21063c23dc49544653e4c92879020eb178f96f919dd8606a4f9d2bbe5fb75ae93ac5a2b8
+DIST python-gentoo-patches-3.12.0a2.tar.xz 6164 BLAKE2B 734068ed87dae1bb30b61f42436664936f27c2507e89fde6da0ce10f791d444b54e8298810717e461b60b7fe572a8fbf2cc9c787e59f01aa0eb5fd1360b212bd SHA512 96e060dc6f2cf412cb1a1be251a6cdd2c30cd2706bfc669dfb920815bcc768b712ed53cc43ee6a1606504a19fdcd9492e7d88bf7e334e1dde2769aa7f1e6ed2d
 DIST python-gentoo-patches-3.8.15_p3-r1.tar.xz 30604 BLAKE2B 68ddeff291a70dfe22e8a0276b30db5a37d7e53dfc5d52c311573136f6fc322cddc65478684ed6339cd8156170588fe8ea3a454a5ec18e0bb91a898dc7c99f1e SHA512 ce9c73cd2b53c5c7f8bb27c65d5ea02bb7c38bfc1b25c972203fcea52bd1ffe4afcb65eedc8556b026a2faf0fc402f566c38b91ee54d6580bc958c0322e90e0a
-DIST python-gentoo-patches-3.9.15_p2.tar.xz 23244 BLAKE2B 0917396dd08f652f8ba06c019961c81f795678da55979934e4d3d8b85ff53bd44f98bc1564ab47efaf11f581271b49f15a41538452d49dbe8ea6bfd0a9d6e3e9 SHA512 c4635fe88cb59f3d16a2a3c1d1519c9566b069995151d6caabc661af3d980522dd00b4a7c9de9969c0d10dafe27b6e0524af4469148fad6841e5f3329a5dad3d
 DIST python-gentoo-patches-3.9.15_p3-r1.tar.xz 26400 BLAKE2B 27198acf3e9087b96ef15328b9da6d80837a459c62b21c9785fde77dc6f4a5c8c4ccbc3cb48e5af684a253a978c5562fb1a342e6a554d2247aa968fd5890d6f5 SHA512 d658dc89ca29070de2a39d643cc9585ae7f66232dececfd7007cb57a6c6ededd30ae030dbe9226686b8517c48fdb5ed7e681decb64b207e41173a0993f461aea
 EBUILD python-2.7.18_p16.ebuild 8307 BLAKE2B 4be343c831fc645acc31432978f0ddb6da538abadc55238b5907a7b7c822c2e308455d1bb0d27d53c887be89fca742088932c2d4ba570293097113f6b5c0c2a6 SHA512 5fb05c1a8f045fd3eb3e24fafef2063fc51db7cfd13fcb3475a1c0e54c458db76c5667f9e164bd9ec084ba9965b7745bbf3c6bc7070db228b32c934a19722ecf
-EBUILD python-3.10.8_p2.ebuild 12901 BLAKE2B b406040e5412b528ae58e26fbc8226707f22137cc372eb386267b45d3ba047c8cd03d94027e60ef337be05ff8b1f5d89a258d1f4568925a4495f6e577f829249 SHA512 5bfd248c730be86592a747b47e23f87dc7eb1a249e3eb61cea87c4add7738755a9d4badc12f59e0fe0cba5190d94dd4a29bb6707f255f16ca748e2acfcc2a042
 EBUILD python-3.10.8_p3.ebuild 12904 BLAKE2B a315705cf5d6090791a8f3ebd5498c31e0c0cbdda4a0b69e9f775700d34030db47da02a6263708888aea7dde111c04970eaafafad3b51d86b5390227dc01e797 SHA512 df7f75ffac6b2ea3b3dd1123ed9a89c87d2774a1071080f0e0c0c03e6e50467c09e2265aeaa458d159cc2ee7255d59bb4868e6f558b2927b64e245518ea9d6d1
-EBUILD python-3.11.0_p1.ebuild 13801 BLAKE2B cdff9df837481ddf9a6e008dff0fe9f235fe0c8847b5b2af351b207daa201d9bf5a9faa218aab640f6044c516a03d4676525224fc9fc83ca44f77c998a6a9030 SHA512 25640cfc9428e9b18d7fcd3653df65912eff1060717f8f8ef97ee33549471fe54f2c1b7088b55577fc3169f3c16da0ea53da18fd6ae22fb173cabeae2183d1c0
 EBUILD python-3.11.0_p2.ebuild 13803 BLAKE2B 82568fdd418e76dd25c9cf943b3ed4954eaf17c2a69d18c1821f0bac7d0e83f01d8fb3d193841f291130677c252fb915a0c734e4cdc8259d65dcedd080dffca9 SHA512 1e388e7e84cf0e48e5a61b96743a6b15301de8953e9210134e0c6ef8e087c65e8d0367752f5a23e8c02dac74c7e721d380a8d00dd9b4097d2c9f3dd6ad62fba7
-EBUILD python-3.12.0_alpha1_p1.ebuild 13694 BLAKE2B 77802b95f3b9bf8c5a88d4a50e7529cc094c332f408be39a1cbdf243ceba3a084765247f5acc9094f939fede82b24ff7967e6544cf73b755fb3b502be4979e96 SHA512 8b2665b81a0ffa78529e66db5559d23ef682244de9849aff3985ee013d3e6fbfbb359542744ef1f90e2ba85c7b22be2f5c6e2c3751a2d9fce449564f9abc99ae
 EBUILD python-3.12.0_alpha1_p2.ebuild 13697 BLAKE2B 40bf6c2ab7a475b8d430dc63989c50b8ea9a75813329f06efe4835a45ab90bb6358e22846eedc8794a791ab15004a90fd3314859ce186093d8c692eef66b58ce SHA512 5eec79eb25429604b17f3ceabcf5e9bc123168d050f1c368308ccc1306fcb29952edc6aeba9782930b75feed3676fac9514438bce380b1cb5588ed03030285e7
-EBUILD python-3.8.15_p2.ebuild 11439 BLAKE2B d6daa1f6acb91842a3eed6d47291ec664ce9e7fdb10644aaee576aa25ba50af80d613f47a97a0714d5ff981332efc3efca4b247bc852c08a5542ed4224fe499a SHA512 10fdfa955eed007c37640959b19ac01689cb38b9e1e2181439473ad1ca06e014393d8c7aec79835a00351d1e5b46b6b6ddba9037169920c4fbd2c637b9be0025
-EBUILD python-3.8.15_p3.ebuild 11443 BLAKE2B 9192615606cb6c0cb268b4254e3f45225b2f54c7d5699fff13b776b9ce9b2888e1356b7939de0e9f49ece2ef97d7d0a391e72a49d9545ca89569ba78a02b44a7 SHA512 fab83e945ddb349d76cd33174337cf8cab6e2fb1f2c2ffca7c3f6d7654dbd711da04ac88493b2f7db3f00dc5ba47ee738558b81212aca305aabf1175f72b7a88
-EBUILD python-3.9.15_p2.ebuild 12699 BLAKE2B 0c79c486faf93fbf44143cdac9a4cae7d7f5296294209be9c0e6bbab524e80aa41a88f7be3f449a92e3ccb5e1edab0b412f4aa375f615825a77fe162edbc4ac4 SHA512 bd797e9555e3b67486a33431baf5e34a55756ce6afb849d36550ff12e7aa5fb80cf6e9148e6292ffe222318368f12b2e2ab65657444e35f44aa81aa8eef6c9bd
+EBUILD python-3.12.0_alpha2.ebuild 13570 BLAKE2B 30bee0a8270c960ab09047e5be0a3d647a3fd25e6204e02c9359ef63d9849bdce1808210cf089aec130c78b32e0cd69c0bb0f1cf6ca83ec2ffdfa6ec931ec1b0 SHA512 f29a1182b930d9b267c3c986ce6b61953f0b3096f2f53738a35d79d0295d7f03e07cf1c94dd0fa8a4214fa6b89f6b5309af00dee085936ef2feeebf2d6c7a4b6
+EBUILD python-3.8.15_p3.ebuild 11442 BLAKE2B 437d3e82f23f0f543437f834c5911bf4ca47a30b37ac6c07d9d7532d21cc73182fcba85c3294f3a6491e996bc96330ff8b9f417bf3bed7d189e795ccecff7e44 SHA512 1b3703410dc85bb4e915de71804b7fad680d2f5786d302f1fb6db8d3e091aea3caa45a76d2e6a40d5e8a565d07d4725085f44c92bb0333bef04a64c12bcd5ef1
 EBUILD python-3.9.15_p3.ebuild 12702 BLAKE2B 3a57a413b7b9bea8c346528585ce53bc557b8261fc05686c7f2f45158cc7781c5c4fb62059e1c70ad3b0fc965bf38622fc0711ecaf6f26a0e97d99ade69cbcbd SHA512 affd28ab1f63958aa44a43e92bec10854a20481017b270af6230630ca144ae28ab5a51c5c8baeaf3dec81f1b25a7fd288a706285543ab14bbc1da92566d747a3
 MISC metadata.xml 1125 BLAKE2B 5302c84538eb30fe86c91d15faa2f6de0eaa4ee38c26a0f6845b4a95bda94ad0006a509bedf9f71288332a593d245191c0f358f0515d96c8aec8693eca22fd2a SHA512 2280aa3f309e1338d7e41c8cfa50cde4d0441bee7d98a86ce7bf4969560b34dfab8ef6171cbbe0d6a19f56c676e9c9dd63c65340ac7145317d2eab0fe618ae0d
diff --git a/dev-lang/python/python-3.10.8_p2.ebuild b/dev-lang/python/python-3.10.8_p2.ebuild
deleted file mode 100644
index 9430e1042550..000000000000
--- a/dev-lang/python/python-3.10.8_p2.ebuild
+++ /dev/null
@@ -1,469 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build +ensurepip examples gdbm hardened libedit lto
-	+ncurses pgo +readline +sqlite +ssl test tk +xml
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-lang/python-exec[python_targets_python3_10(-)]
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )
-	!!<sys-apps/sandbox-2.21
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# https://bugs.gentoo.org/850151
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs)
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-	local disable
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-x test_gdb
-			-u-network
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-		)
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910 and bug #864911.
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross.
-			--without-lto
-			--disable-optimizations
-		)
-
-		# Point the imminent CHOST build to the Python we just
-		# built for CBUILD.
-		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS=disabled
-			MODULE__DBM=disabled
-			MODULE__GDBM=disabled
-			MODULE__DBM=disabled
-			MODULE__SQLITE3=disabled
-			MODULE__HASHLIB=disabled
-			MODULE__SSL=disabled
-			MODULE__CURSES=disabled
-			MODULE__CURSES_PANEL=disabled
-			MODULE_READLINE=disabled
-			MODULE__TKINTER=disabled
-			MODULE_PYEXPAT=disabled
-			MODULE_ZLIB=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the Python it was pointed to
-		# immediately.
-		emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite "/usr/lib/python${PYVER}/site-packages"
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.11.0_p1.ebuild b/dev-lang/python/python-3.11.0_p1.ebuild
deleted file mode 100644
index 6eb6fd9f59c0..000000000000
--- a/dev-lang/python/python-3.11.0_p1.ebuild
+++ /dev/null
@@ -1,498 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86"
-IUSE="
-	bluetooth build +ensurepip examples gdbm hardened libedit lto
-	+ncurses pgo +readline +sqlite +ssl test tk
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	app-crypt/libb2
-	>=dev-libs/expat-2.1:=
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? (
-		!libedit? ( >=sys-libs/readline-4.1:= )
-		libedit? ( dev-libs/libedit:= )
-	)
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	!!<sys-apps/sandbox-2.21
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-if [[ ${PV} != *_alpha* ]]; then
-	RDEPEND+="
-		dev-lang/python-exec[python_targets_python${PYVER/./_}(-)]
-	"
-fi
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# https://bugs.gentoo.org/850151
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs)
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	local disable
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-x test_gdb
-			-u-network
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-		)
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--without-static-libpython
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-		--with-platlibdir=lib
-		--with-pkg-config=yes
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-		$(use_with readline readline "$(usex libedit editline readline)")
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross to satisfy --with-build-python.
-			--without-lto
-			--without-readline
-			--disable-optimizations
-		)
-
-		myeconfargs+=(
-			# Point the imminent CHOST build to the Python we just
-			# built for CBUILD.
-			--with-build-python="${WORKDIR}"/${P}-${CBUILD}/python
-		)
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__GDBM_STATE=disabled
-			MODULE__DBM_STATE=disabled
-			MODULE__SQLITE3_STATE=disabled
-			MODULE__HASHLIB_STATE=disabled
-			MODULE__SSL_STATE=disabled
-			MODULE__CURSES_STATE=disabled
-			MODULE__CURSES_PANEL_STATE=disabled
-			MODULE_READLINE_STATE=disabled
-			MODULE__TKINTER_STATE=disabled
-			MODULE_PYEXPAT_STATE=disabled
-			MODULE_ZLIB_STATE=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the --with-build-python value
-		# immediately.
-		emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# force-disable modules we don't want built
-	local disable_modules=( NIS )
-	use gdbm || disable_modules+=( _GDBM _DBM )
-	use sqlite || disable_modules+=( _SQLITE3 )
-	use ssl || disable_modules+=( _HASHLIB _SSL )
-	use ncurses || disable_modules+=( _CURSES _CURSES_PANEL )
-	use readline || disable_modules+=( READLINE )
-	use tk || disable_modules+=( _TKINTER )
-
-	local mod
-	for mod in "${disable_modules[@]}"; do
-		echo "MODULE_${mod}_STATE=disabled"
-	done >> Makefile || die
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-	export PYTHONSTRICTEXTENSIONBUILD=1
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	# this just happens to skip test_support.test_freeze that is broken
-	# without bundled expat
-	# TODO: get a proper skip for it upstream
-	local -x LOGNAME=buildbot
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-	# workaround https://bugs.gentoo.org/775416
-	addwrite "/usr/lib/python${PYVER}/site-packages"
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	# -j1 hack for now for bug #843458
-	emake -j1 DESTDIR="${D}" altinstall
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"sqlite3 || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
-
-pkg_postinst() {
-	local v
-	for v in ${REPLACING_VERSIONS}; do
-		if ver_test "${v}" -lt 3.11.0_beta4-r2; then
-			ewarn "Python 3.11.0b4 has changed its module ABI.  The .pyc files"
-			ewarn "installed previously are no longer valid and will be regenerated"
-			ewarn "(or ignored) on the next import.  This may cause sandbox failures"
-			ewarn "when installing some packages and checksum mismatches when removing"
-			ewarn "old versions.  To actively prevent this, rebuild all packages"
-			ewarn "installing Python 3.11 modules, e.g. using:"
-			ewarn
-			ewarn "  emerge -1v /usr/lib/python3.11/site-packages"
-		fi
-	done
-}
diff --git a/dev-lang/python/python-3.12.0_alpha1_p1.ebuild b/dev-lang/python/python-3.12.0_alpha2.ebuild
index df8279e32c7e..e10b1c493b27 100644
--- a/dev-lang/python/python-3.12.0_alpha1_p1.ebuild
+++ b/dev-lang/python/python-3.12.0_alpha2.ebuild
@@ -307,9 +307,6 @@ src_compile() {
 	# Ensure sed works as expected
 	# https://bugs.gentoo.org/594768
 	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
 	export PYTHONSTRICTEXTENSIONBUILD=1
 
 	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
diff --git a/dev-lang/python/python-3.8.15_p2.ebuild b/dev-lang/python/python-3.8.15_p2.ebuild
deleted file mode 100644
index 649ae9032e52..000000000000
--- a/dev-lang/python/python-3.8.15_p2.ebuild
+++ /dev/null
@@ -1,410 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
-	+readline +sqlite +ssl test tk wininst +xml
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-lang/python-exec[python_targets_python3_8(-)]
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-QA_PKGCONFIG_VERSION=${PYVER}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# https://bugs.gentoo.org/850151
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs)
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-	local disable
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	append-flags -fwrapv
-
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910 and bug #864911.
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross.
-			--without-lto
-			--disable-optimizations
-		)
-
-		# Point the imminent CHOST build to the Python we just
-		# built for CBUILD.
-		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS=disabled
-			MODULE__DBM=disabled
-			MODULE__GDBM=disabled
-			MODULE__DBM=disabled
-			MODULE__SQLITE3=disabled
-			MODULE__HASHLIB=disabled
-			MODULE__SSL=disabled
-			MODULE__CURSES=disabled
-			MODULE__CURSES_PANEL=disabled
-			MODULE_READLINE=disabled
-			MODULE__TKINTER=disabled
-			MODULE_PYEXPAT=disabled
-			MODULE_ZLIB=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the Python it was pointed to
-		# immediately.
-		emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-	if ! use wininst; then
-		rm "${libdir}/distutils/command/"wininst-*.exe || die
-	fi
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-lang/python/python-3.8.15_p3.ebuild b/dev-lang/python/python-3.8.15_p3.ebuild
index 5d213501fa6d..d2a1816f893b 100644
--- a/dev-lang/python/python-3.8.15_p3.ebuild
+++ b/dev-lang/python/python-3.8.15_p3.ebuild
@@ -28,7 +28,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="PSF-2"
 SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 IUSE="
 	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
 	+readline +sqlite +ssl test tk wininst +xml
diff --git a/dev-lang/python/python-3.9.15_p2.ebuild b/dev-lang/python/python-3.9.15_p2.ebuild
deleted file mode 100644
index b55a6f73b915..000000000000
--- a/dev-lang/python/python-3.9.15_p2.ebuild
+++ /dev/null
@@ -1,464 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="7"
-WANT_LIBTOOL="none"
-
-inherit autotools check-reqs flag-o-matic multiprocessing pax-utils
-inherit python-utils-r1 toolchain-funcs verify-sig
-
-MY_PV=${PV/_rc/rc}
-MY_P="Python-${MY_PV%_p*}"
-PYVER=$(ver_cut 1-2)
-PATCHSET="python-gentoo-patches-${MY_PV}"
-
-DESCRIPTION="An interpreted, interactive, object-oriented programming language"
-HOMEPAGE="
-	https://www.python.org/
-	https://github.com/python/cpython/
-"
-SRC_URI="
-	https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mgorny/dist/python/${PATCHSET}.tar.xz
-	verify-sig? (
-		https://www.python.org/ftp/python/${PV%%_*}/${MY_P}.tar.xz.asc
-	)
-"
-S="${WORKDIR}/${MY_P}"
-
-LICENSE="PSF-2"
-SLOT="${PYVER}"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
-IUSE="
-	bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo
-	+readline +sqlite +ssl test tk +xml
-"
-RESTRICT="!test? ( test )"
-
-# Do not add a dependency on dev-lang/python to this ebuild.
-# If you need to apply a patch which requires python for bootstrapping, please
-# run the bootstrap code on your dev box and include the results in the
-# patchset. See bug 447752.
-
-RDEPEND="
-	app-arch/bzip2:=
-	app-arch/xz-utils:=
-	dev-lang/python-exec[python_targets_python3_9(-)]
-	dev-libs/libffi:=
-	sys-apps/util-linux:=
-	>=sys-libs/zlib-1.1.3:=
-	virtual/libcrypt:=
-	virtual/libintl
-	ensurepip? ( dev-python/ensurepip-wheels )
-	gdbm? ( sys-libs/gdbm:=[berkdb] )
-	ncurses? ( >=sys-libs/ncurses-5.2:= )
-	readline? ( >=sys-libs/readline-4.1:= )
-	sqlite? ( >=dev-db/sqlite-3.3.8:3= )
-	ssl? ( >=dev-libs/openssl-1.1.1:= )
-	tk? (
-		>=dev-lang/tcl-8.0:=
-		>=dev-lang/tk-8.0:=
-		dev-tcltk/blt:=
-		dev-tcltk/tix
-	)
-	xml? ( >=dev-libs/expat-2.1:= )
-"
-# bluetooth requires headers from bluez
-DEPEND="
-	${RDEPEND}
-	bluetooth? ( net-wireless/bluez )
-	test? ( app-arch/xz-utils[extra-filters(+)] )
-"
-# autoconf-archive needed to eautoreconf
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/awk
-	virtual/pkgconfig
-	verify-sig? ( sec-keys/openpgp-keys-python )
-"
-RDEPEND+="
-	!build? ( app-misc/mime-types )
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/python.org.asc
-
-# large file tests involve a 2.5G file being copied (duplicated)
-CHECKREQS_DISK_BUILD=5500M
-
-QA_PKGCONFIG_VERSION=${PYVER}
-
-pkg_pretend() {
-	use test && check-reqs_pkg_pretend
-}
-
-pkg_setup() {
-	use test && check-reqs_pkg_setup
-}
-
-src_unpack() {
-	if use verify-sig; then
-		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.xz{,.asc}
-	fi
-	default
-}
-
-src_prepare() {
-	# Ensure that internal copies of expat and libffi are not used.
-	rm -r Modules/expat || die
-	rm -r Modules/_ctypes/libffi* || die
-
-	local PATCHES=(
-		"${WORKDIR}/${PATCHSET}"
-	)
-
-	default
-
-	# https://bugs.gentoo.org/850151
-	sed -i -e "s:@@GENTOO_LIBDIR@@:$(get_libdir):g" setup.py || die
-
-	# force the correct number of jobs
-	# https://bugs.gentoo.org/737660
-	local jobs=$(makeopts_jobs)
-	sed -i -e "s:-j0:-j${jobs}:" Makefile.pre.in || die
-	sed -i -e "/self\.parallel/s:True:${jobs}:" setup.py || die
-
-	eautoreconf
-}
-
-src_configure() {
-	# disable automagic bluetooth headers detection
-	if ! use bluetooth; then
-		local -x ac_cv_header_bluetooth_bluetooth_h=no
-	fi
-	local disable
-	use gdbm      || disable+=" gdbm"
-	use ncurses   || disable+=" _curses _curses_panel"
-	use readline  || disable+=" readline"
-	use sqlite    || disable+=" _sqlite3"
-	use ssl       || export PYTHON_DISABLE_SSL="1"
-	use tk        || disable+=" _tkinter"
-	use xml       || disable+=" _elementtree pyexpat" # _elementtree uses pyexpat.
-	export PYTHON_DISABLE_MODULES="${disable}"
-
-	if ! use xml; then
-		ewarn "You have configured Python without XML support."
-		ewarn "This is NOT a recommended configuration as you"
-		ewarn "may face problems parsing any XML documents."
-	fi
-
-	if [[ -n "${PYTHON_DISABLE_MODULES}" ]]; then
-		einfo "Disabled modules: ${PYTHON_DISABLE_MODULES}"
-	fi
-
-	append-flags -fwrapv
-	filter-flags -malign-double
-
-	# https://bugs.gentoo.org/700012
-	if is-flagq -flto || is-flagq '-flto=*'; then
-		append-cflags $(test-flags-CC -ffat-lto-objects)
-	fi
-
-	# Export CXX so it ends up in /usr/lib/python3.X/config/Makefile.
-	# PKG_CONFIG needed for cross.
-	tc-export CXX PKG_CONFIG
-
-	local dbmliborder=
-	if use gdbm; then
-		dbmliborder+="${dbmliborder:+:}gdbm"
-	fi
-
-	if use pgo; then
-		local profile_task_flags=(
-			-m test
-			"-j$(makeopts_jobs)"
-			--pgo-extended
-			-x test_gdb
-			-u-network
-
-			# All of these seem to occasionally hang for PGO inconsistently
-			# They'll even hang here but be fine in src_test sometimes.
-			# bug #828535 (and related: bug #788022)
-			-x test_asyncio
-			-x test_httpservers
-			-x test_logging
-			-x test_multiprocessing_fork
-			-x test_socket
-			-x test_xmlrpc
-		)
-
-		if has_version "app-arch/rpm" ; then
-			# Avoid sandbox failure (attempts to write to /var/lib/rpm)
-			profile_task_flags+=(
-				-x test_distutils
-			)
-		fi
-		local -x PROFILE_TASK="${profile_task_flags[*]}"
-	fi
-
-	local myeconfargs=(
-		# glibc-2.30 removes it; since we can't cleanly force-rebuild
-		# Python on glibc upgrade, remove it proactively to give
-		# a chance for users rebuilding python before glibc
-		ac_cv_header_stropts_h=no
-
-		--enable-shared
-		--enable-ipv6
-		--infodir='${prefix}/share/info'
-		--mandir='${prefix}/share/man'
-		--with-computed-gotos
-		--with-dbmliborder="${dbmliborder}"
-		--with-libc=
-		--enable-loadable-sqlite-extensions
-		--without-ensurepip
-		--with-system-expat
-		--with-system-ffi
-		--with-wheel-pkg-dir="${EPREFIX}"/usr/lib/python/ensurepip
-
-		$(use_with lto)
-		$(use_enable pgo optimizations)
-	)
-
-	# disable implicit optimization/debugging flags
-	local -x OPT=
-
-	if tc-is-cross-compiler ; then
-		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-		# propagated to sysconfig for built extensions
-		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
-		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
-		local -x CFLAGS= LDFLAGS=
-
-		# We need to build our own Python on CBUILD first, and feed it in.
-		# bug #847910 and bug #864911.
-		local myeconfargs_cbuild=(
-			"${myeconfargs[@]}"
-
-			# As minimal as possible for the mini CBUILD Python
-			# we build just for cross.
-			--without-lto
-			--disable-optimizations
-		)
-
-		# Point the imminent CHOST build to the Python we just
-		# built for CBUILD.
-		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
-
-		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
-		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
-		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
-
-		# Avoid as many dependencies as possible for the cross build.
-		cat >> Makefile <<-EOF || die
-			MODULE_NIS=disabled
-			MODULE__DBM=disabled
-			MODULE__GDBM=disabled
-			MODULE__DBM=disabled
-			MODULE__SQLITE3=disabled
-			MODULE__HASHLIB=disabled
-			MODULE__SSL=disabled
-			MODULE__CURSES=disabled
-			MODULE__CURSES_PANEL=disabled
-			MODULE_READLINE=disabled
-			MODULE__TKINTER=disabled
-			MODULE_PYEXPAT=disabled
-			MODULE_ZLIB=disabled
-		EOF
-
-		# Unfortunately, we do have to build this immediately, and
-		# not in src_compile, because CHOST configure for Python
-		# will check the existence of the Python it was pointed to
-		# immediately.
-		emake
-		popd &> /dev/null || die
-	fi
-
-	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
-	# propagated to sysconfig for built extensions
-	local -x CFLAGS_NODIST=${CFLAGS}
-	local -x LDFLAGS_NODIST=${LDFLAGS}
-	local -x CFLAGS= LDFLAGS=
-
-	# Fix implicit declarations on cross and prefix builds. Bug #674070.
-	if use ncurses; then
-		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
-	fi
-
-	econf "${myeconfargs[@]}"
-
-	if grep -q "#define POSIX_SEMAPHORES_NOT_ENABLED 1" pyconfig.h; then
-		eerror "configure has detected that the sem_open function is broken."
-		eerror "Please ensure that /dev/shm is mounted as a tmpfs with mode 1777."
-		die "Broken sem_open function (bug 496328)"
-	fi
-
-	# install epython.py as part of stdlib
-	echo "EPYTHON='python${PYVER}'" > Lib/epython.py || die
-}
-
-src_compile() {
-	# Ensure sed works as expected
-	# https://bugs.gentoo.org/594768
-	local -x LC_ALL=C
-	# Prevent using distutils bundled by setuptools.
-	# https://bugs.gentoo.org/823728
-	export SETUPTOOLS_USE_DISTUTILS=stdlib
-
-	# Save PYTHONDONTWRITEBYTECODE so that 'has_version' doesn't
-	# end up writing bytecode & violating sandbox.
-	# bug #831897
-	local -x _PYTHONDONTWRITEBYTECODE=${PYTHONDONTWRITEBYTECODE}
-
-	if use pgo ; then
-		# bug 660358
-		local -x COLUMNS=80
-		local -x PYTHONDONTWRITEBYTECODE=
-
-		addpredict "/usr/lib/python${PYVER}/site-packages"
-	fi
-
-	# also need to clear the flags explicitly here or they end up
-	# in _sysconfigdata*
-	emake CPPFLAGS= CFLAGS= LDFLAGS=
-
-	# Restore saved value from above.
-	local -x PYTHONDONTWRITEBYTECODE=${_PYTHONDONTWRITEBYTECODE}
-
-	# Work around bug 329499. See also bug 413751 and 457194.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E python
-	else
-		pax-mark m python
-	fi
-}
-
-src_test() {
-	# Tests will not work when cross compiling.
-	if tc-is-cross-compiler; then
-		elog "Disabling tests due to crosscompiling."
-		return
-	fi
-
-	local test_opts=(
-		-u-network
-		-j "$(makeopts_jobs)"
-
-		# fails
-		-x test_gdb
-	)
-
-	if use sparc ; then
-		# bug #788022
-		test_opts+=(
-			-x test_multiprocessing_fork
-			-x test_multiprocessing_forkserver
-		)
-	fi
-
-	# workaround docutils breaking tests
-	cat > Lib/docutils.py <<-EOF || die
-		raise ImportError("Thou shalt not import!")
-	EOF
-
-	# bug 660358
-	local -x COLUMNS=80
-	local -x PYTHONDONTWRITEBYTECODE=
-
-	nonfatal emake test EXTRATESTOPTS="${test_opts[*]}" \
-		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty
-	local ret=${?}
-
-	rm Lib/docutils.py || die
-
-	[[ ${ret} -eq 0 ]] || die "emake test failed"
-}
-
-src_install() {
-	local libdir=${ED}/usr/lib/python${PYVER}
-
-	emake DESTDIR="${D}" altinstall
-
-	# Remove static library
-	rm "${ED}"/usr/$(get_libdir)/libpython*.a || die
-
-	# Fix collisions between different slots of Python.
-	rm "${ED}/usr/$(get_libdir)/libpython3.so" || die
-
-	# Cheap hack to get version with ABIFLAGS
-	local abiver=$(cd "${ED}/usr/include"; echo python*)
-	if [[ ${abiver} != python${PYVER} ]]; then
-		# Replace python3.X with a symlink to python3.Xm
-		rm "${ED}/usr/bin/python${PYVER}" || die
-		dosym "${abiver}" "/usr/bin/python${PYVER}"
-		# Create python3.X-config symlink
-		dosym "${abiver}-config" "/usr/bin/python${PYVER}-config"
-		# Create python-3.5m.pc symlink
-		dosym "python-${PYVER}.pc" "/usr/$(get_libdir)/pkgconfig/${abiver/${PYVER}/-${PYVER}}.pc"
-	fi
-
-	# python seems to get rebuilt in src_install (bug 569908)
-	# Work around it for now.
-	if has_version dev-libs/libffi[pax-kernel]; then
-		pax-mark E "${ED}/usr/bin/${abiver}"
-	else
-		pax-mark m "${ED}/usr/bin/${abiver}"
-	fi
-
-	rm -r "${libdir}"/ensurepip/_bundled || die
-	if ! use ensurepip; then
-		rm -r "${libdir}"/ensurepip || die
-	fi
-	if ! use sqlite; then
-		rm -r "${libdir}/"{sqlite3,test/test_sqlite*} || die
-	fi
-	if ! use tk; then
-		rm -r "${ED}/usr/bin/idle${PYVER}" || die
-		rm -r "${libdir}/"{idlelib,tkinter,test/test_tk*} || die
-	fi
-
-	dodoc Misc/{ACKS,HISTORY,NEWS}
-
-	if use examples; then
-		docinto examples
-		find Tools -name __pycache__ -exec rm -fr {} + || die
-		dodoc -r Tools
-	fi
-	insinto /usr/share/gdb/auto-load/usr/$(get_libdir) #443510
-	local libname=$(
-		printf 'e:\n\t@echo $(INSTSONAME)\ninclude Makefile\n' |
-		emake --no-print-directory -s -f - 2>/dev/null
-	)
-	newins Tools/gdb/libpython.py "${libname}"-gdb.py
-
-	newconfd "${FILESDIR}/pydoc.conf" pydoc-${PYVER}
-	newinitd "${FILESDIR}/pydoc.init" pydoc-${PYVER}
-	sed \
-		-e "s:@PYDOC_PORT_VARIABLE@:PYDOC${PYVER/./_}_PORT:" \
-		-e "s:@PYDOC@:pydoc${PYVER}:" \
-		-i "${ED}/etc/conf.d/pydoc-${PYVER}" \
-		"${ED}/etc/init.d/pydoc-${PYVER}" || die "sed failed"
-
-	# python-exec wrapping support
-	local pymajor=${PYVER%.*}
-	local EPYTHON=python${PYVER}
-	local scriptdir=${D}$(python_get_scriptdir)
-	mkdir -p "${scriptdir}" || die
-	# python and pythonX
-	ln -s "../../../bin/${abiver}" "${scriptdir}/python${pymajor}" || die
-	ln -s "python${pymajor}" "${scriptdir}/python" || die
-	# python-config and pythonX-config
-	# note: we need to create a wrapper rather than symlinking it due
-	# to some random dirname(argv[0]) magic performed by python-config
-	cat > "${scriptdir}/python${pymajor}-config" <<-EOF || die
-		#!/bin/sh
-		exec "${abiver}-config" "\${@}"
-	EOF
-	chmod +x "${scriptdir}/python${pymajor}-config" || die
-	ln -s "python${pymajor}-config" "${scriptdir}/python-config" || die
-	# 2to3, pydoc
-	ln -s "../../../bin/2to3-${PYVER}" "${scriptdir}/2to3" || die
-	ln -s "../../../bin/pydoc${PYVER}" "${scriptdir}/pydoc" || die
-	# idle
-	if use tk; then
-		ln -s "../../../bin/idle${PYVER}" "${scriptdir}/idle" || die
-	fi
-}
diff --git a/dev-perl/Manifest.gz b/dev-perl/Manifest.gz
index e2fed9b4bb1f..828331488669 100644
--- a/dev-perl/Manifest.gz
+++ b/dev-perl/Manifest.gz
diff --git a/dev-perl/Net-SSLeay/Manifest b/dev-perl/Net-SSLeay/Manifest
index 328c699a4a45..4ebeb93339cc 100644
--- a/dev-perl/Net-SSLeay/Manifest
+++ b/dev-perl/Net-SSLeay/Manifest
@@ -3,5 +3,5 @@ AUX Net-SSLeay-1.88-fix-network-tests.patch 600 BLAKE2B aac7cfbf6770d56df1af455b
 DIST Net-SSLeay-1.90.tar.gz 534246 BLAKE2B 2510fa886db8b7c5f185aa1145ae1b50b7c4101a9bd80e17c8c1d77718765f288c9180464d831775c35aa94b5a6f6c8f717ecaeb4974f7280829b63f10567f22 SHA512 8a5f251b5ef1d8c2d619d984594a7a22ddeed2e5e726fe683a45f299d7878f4ca8ffab00480ebf5ef7a94ae1fcf6be05dfdaa68b8bfe2ad68443150765adb891
 DIST Net-SSLeay-1.92.tar.gz 555930 BLAKE2B 04d97860817b013a9680e0ef29b0004ddb98da2db859761a45612c4d25b6edd16bf92645293d1108d83352bce18665721c6df05455426b32a95a42b464119a3d SHA512 e9d9161ebeb7be90f4c7a0ea98f1034892ce6d33aa72872683177b19daa1f4c5819f85ea9a052a076ec8d7c21705f6c344aef64680bc881bf3218d38e8b7b173
 EBUILD Net-SSLeay-1.900.0.ebuild 1463 BLAKE2B eaa31e733dc8d19370f77d608e84fa9cfc7e2746793e01ec48c1aadb75a5c1c8e2b6c2f80be118b1b877c2c555196d3ad584251a29deac729299a9ff1c0f8687 SHA512 c3a0c8db551f138be800afc8396f263d3601f13a5737d0595cc9df869cd06da68c18b7c8b32dd274b20d654157ddbe3c0abd4675e5ec0c962327232d9df5800e
-EBUILD Net-SSLeay-1.920.0.ebuild 1466 BLAKE2B 06a246536cf65de9ab07f52ff9e8c065a8642f6e0154de7485bc490315864a68d98f182fccdd6d6cf00c3966f0b069f7e63bcfb3f13b132690d4ef246cfb2fe6 SHA512 ed455b01a641baa010b3dfe59bc56df1ad554ee0a13394dd187efaf9c6bfd47e6a0120992a4df896a2a16291cfb71f8b0c4516e797839d879953733ec89d0044
+EBUILD Net-SSLeay-1.920.0.ebuild 1465 BLAKE2B 0d51db1285c510bfa423af7393c2f970f8bd5fdfdbecc12afde08b0c96c725d5fec565cc304696a08c33fab0be58d4d258f5cde6839bbbf6adaa87414ba6654d SHA512 01caab65129d04ec552460286db454361dd9fa74bcf208361526037a40ab6d83bb7875abd80c0cdce7f84dda2a7cbf61299d16e60852a6d09e847f03c22939f1
 MISC metadata.xml 459 BLAKE2B c3621c53dd1e2593f2855530c57671797678132180f2b3e7983f1ee62eebc0da4655ca78def94ceb2543e0f34cad1261afffad60ee86f879094be1c43d7b6e55 SHA512 2dcfa628355849c903774c7bf983e3b8b98810bce37effc7eece1c3b92c54941641f0da5024fe42220b824adb4141bf1555894adbc80d03f9396b739e6c360ba
diff --git a/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild b/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild
index bda9eb9b887d..95ff770030f7 100644
--- a/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild
+++ b/dev-perl/Net-SSLeay/Net-SSLeay-1.920.0.ebuild
@@ -12,7 +12,7 @@ DESCRIPTION="Perl extension for using OpenSSL"
 
 LICENSE="Artistic-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-cygwin ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+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="minimal examples"
 
 RDEPEND="
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 8afd86bc5a28..bf8a7b01569f 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/python-docs/Manifest b/dev-python/python-docs/Manifest
index fcc8396de290..4277d6e3166e 100644
--- a/dev-python/python-docs/Manifest
+++ b/dev-python/python-docs/Manifest
@@ -5,7 +5,7 @@ DIST python-3.8.15-docs-html.tar.bz2 6695025 BLAKE2B 614bd68c7038887e4d8f1758b73
 DIST python-3.9.15-docs-html.tar.bz2 6964615 BLAKE2B c5faf1c6d86dba0ceae0a613a0c0bfd86b9605a134762872bc30dd6df113cc836d551032cfb4ba5812aa0d47933bcff28eeff0b68331e4dff1d27497d6e20ff9 SHA512 7f94c2c9569f3e9aa87ab90edbe584b6871a686fee72d8e257a7ae63af301596f7aae1bd63fcac30fa67bdf396453ec6cadc85d3b668514514927131cf70b5d0
 EBUILD python-docs-2.7.18.ebuild 627 BLAKE2B 2146c6b420275e346d9b84a96d3318088c46b1bcea16ea9acbb5b9b9777e20c774e56b846f1956f9906a243f1d3b3a15a7f12a8d190f996f67b332f655eb5c27 SHA512 ab50141e18c1cebbbd89facfc7a415fafebfd3f26ab9e6af02d6163c3d694aa885a452b7b47abe45c1c301394fc0c665e0f84fcada0929e8d907a3d3daa4976d
 EBUILD python-docs-3.10.8.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
-EBUILD python-docs-3.11.0.ebuild 628 BLAKE2B 5ac903162e0c1f983fd581f14bb6ffeb20d0cd303fe76ed1f65b9db463d815443d3bfab3d2b772fb35b21ae5589c09e3f64b0e17cc737d0cc229029327a3d6d6 SHA512 4e01aa1f1f30352df0cb479a73a85dc4e1961595575f81e4f22cf3558e697c3387b0ce56dbfc4ebdf971d6e5356eab486c3b398609800e0513d137bd12e27654
+EBUILD python-docs-3.11.0.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
 EBUILD python-docs-3.8.15.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
 EBUILD python-docs-3.9.15.ebuild 627 BLAKE2B 0280b92081a27130dc59996a404aa0a3e7a7457f4b0602460a5974b5b27b81b63f051fb230f92c24b49aa74c94b9f94508e2a4b2e99e7d9306b96cb40757583c SHA512 d29fbbc395ad6061d58ea1b4e5382e1050ab0b2573718bb87762addb6c4c623c4b4933c6b8894cd98d875f1404aef18c54e0645f9cb4cfff2de63a8dcef44c11
 MISC metadata.xml 237 BLAKE2B e0ddb660341d52285c05ef71475c4790faf6a2c02dfcae63852cf6ec1d59f8d8d05f0053f4dabcc655cee5c52d4105ab7c49b1d073ef81564776ef2ab1dd18cd SHA512 b7c9ef68c5b33164535e398194694d571950d673409429aba5d40fdeffbc69871645509798671b80e47bce55e4237c094e50968e22534b4e83a020b11f4804f3
diff --git a/dev-python/python-docs/python-docs-3.11.0.ebuild b/dev-python/python-docs/python-docs-3.11.0.ebuild
index 685b5047caa6..0d66370bcd05 100644
--- a/dev-python/python-docs/python-docs-3.11.0.ebuild
+++ b/dev-python/python-docs/python-docs-3.11.0.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}/python-${PV}-docs-html"
 
 LICENSE="PSF-2"
 SLOT="$(ver_cut 1-2)"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 
 src_install() {
 	rm -r _sources || die
diff --git a/dev-python/snakeoil/Manifest b/dev-python/snakeoil/Manifest
index 4ca528daa932..5644b8c05d6a 100644
--- a/dev-python/snakeoil/Manifest
+++ b/dev-python/snakeoil/Manifest
@@ -1,6 +1,8 @@
 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
 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 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.3.ebuild b/dev-python/snakeoil/snakeoil-0.10.3.ebuild
new file mode 100644
index 000000000000..50e5f7ee3893
--- /dev/null
+++ b/dev-python/snakeoil/snakeoil-0.10.3.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/eclass/Manifest.gz b/eclass/Manifest.gz
index 04bffbd315b5..4cb1cfaaf9d0 100644
--- a/eclass/Manifest.gz
+++ b/eclass/Manifest.gz
diff --git a/eclass/scons-utils.eclass b/eclass/scons-utils.eclass
index ff6550ae048a..acb51300f348 100644
--- a/eclass/scons-utils.eclass
+++ b/eclass/scons-utils.eclass
@@ -4,7 +4,7 @@
 # @ECLASS: scons-utils.eclass
 # @MAINTAINER:
 # mgorny@gentoo.org
-# @SUPPORTED_EAPIS: 0 1 2 3 4 5 6 7
+# @SUPPORTED_EAPIS: 7 8
 # @BLURB: helper functions to deal with SCons buildsystem
 # @DESCRIPTION:
 # This eclass provides a set of function to help developers sanely call
@@ -16,12 +16,13 @@
 # and use appropriate Python suite eclass to select the implementation.
 # The eclass needs to be inherited before scons-utils, and scons-utils
 # will automatically take advantage of it. For more details, please see:
-# https://wiki.gentoo.org/wiki/Project:Python/scons-utils_integration
+# https://projects.gentoo.org/python/guide/buildsys.html#scons
 #
 # Please note that SCons is more like a 'build system creation kit',
 # and requires a lot of upstream customization to be used sanely.
-# You will often need to request fixes upstream and/or patch the build
-# system. In particular:
+# We attempt to force sane behavior via custom patching but this is not
+# guaranteed to work. You will sometimes need to request fixes upstream
+# and/or patch the build system. In particular, normally:
 #
 # 1. There are no 'standard' variables. To respect CC, CXX, CFLAGS,
 # CXXFLAGS, CPPFLAGS, LDFLAGS, upstream needs to define appropriate
@@ -35,10 +36,10 @@
 #
 # @EXAMPLE:
 # @CODE
-# PYTHON_COMPAT=( python2_7 )
+# PYTHON_COMPAT=( python3_{8..11} )
 # inherit python-any-r1 scons-utils toolchain-funcs
 #
-# EAPI=5
+# EAPI=8
 #
 # src_configure() {
 # 	MYSCONS=(
@@ -63,22 +64,15 @@
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # The minimal version of SCons required for the build to work.
-
-# @VARIABLE: myesconsargs
-# @DEFAULT_UNSET
-# @DESCRIPTION:
-# DEPRECATED, EAPI 0..5 ONLY: pass options to escons instead
-#
-# List of package-specific options to pass to all SCons calls. Supposed to be
-# set in src_configure().
+: "${SCONS_MIN_VERSION:=4.4.0}"
 
 # @ECLASS_VARIABLE: SCONSOPTS
 # @USER_VARIABLE
 # @DEFAULT_UNSET
 # @DESCRIPTION:
 # The default set of options to pass to scons. Similar to MAKEOPTS,
-# supposed to be set in make.conf. If unset, escons() will use cleaned
-# up MAKEOPTS instead.
+# supposed to be set in make.conf. If unset, escons() will set -j
+# based on MAKEOPTS.
 
 # @ECLASS_VARIABLE: EXTRA_ESCONS
 # @USER_VARIABLE
@@ -88,24 +82,10 @@
 # Much like EXTRA_EMAKE, this is not supposed to be used in make.conf
 # and not in ebuilds!
 
-# @ECLASS_VARIABLE: USE_SCONS_TRUE
-# @DESCRIPTION:
-# DEPRECATED: use usex instead
-#
-# The default value for truth in scons-use() (1 by default).
-: ${USE_SCONS_TRUE:=1}
-
-# @ECLASS_VARIABLE: USE_SCONS_FALSE
-# @DESCRIPTION:
-# DEPRECATED: use usex instead
-#
-# The default value for false in scons-use() (0 by default).
-: ${USE_SCONS_FALSE:=0}
-
 # -- EAPI support check --
 
 case ${EAPI:-0} in
-	0|1|2|3|4|5|6|7) ;;
+	7|8) ;;
 	*) die "EAPI ${EAPI} unsupported."
 esac
 
@@ -113,18 +93,14 @@ inherit multiprocessing
 
 # -- ebuild variables setup --
 
-if [[ -n ${SCONS_MIN_VERSION} ]]; then
-	SCONS_DEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}"
-else
-	SCONS_DEPEND="dev-util/scons"
-fi
+SCONS_DEPEND=">=dev-util/scons-${SCONS_MIN_VERSION}"
 
 if [[ ${_PYTHON_ANY_R1} ]]; then
 	# when using python-any-r1, use any-of dep API
 	BDEPEND="$(python_gen_any_dep "${SCONS_DEPEND}[\${PYTHON_USEDEP}]")"
 
 	scons-utils_python_check_deps() {
-		has_version "${SCONS_DEPEND}[${PYTHON_USEDEP}]"
+		python_has_version "${SCONS_DEPEND}[${PYTHON_USEDEP}]"
 	}
 	python_check_deps() { scons-utils_python_check_deps; }
 elif [[ ${_PYTHON_SINGLE_R1} ]]; then
@@ -132,16 +108,13 @@ elif [[ ${_PYTHON_SINGLE_R1} ]]; then
 	BDEPEND="
 		$(python_gen_cond_dep "${SCONS_DEPEND}[\${PYTHON_USEDEP}]")
 		${PYTHON_DEPS}"
-elif [[ ${EAPI:-0} == [0123456] ]]; then
-	# in older EAPIs, just force Python 2.7
-	BDEPEND="${SCONS_DEPEND}[python_targets_python2_7]"
 elif [[ ${_PYTHON_R1} ]]; then
 	# when using python-r1, you need to depend on scons yourself
 	# (depending on whether you need any-r1 or full -r1 API)
 	# -- since this is a breaking API change, it applies to EAPI 7+ only
 	BDEPEND=""
-elif [[ ${EAPI:-0} != [0123456] ]]; then
-	# in EAPI 7+, require appropriate eclass use
+else
+	# require appropriate eclass use
 	eerror "Using scons-utils.eclass without any python-r1 suite eclass is not supported."
 	eerror "Please make sure to configure and inherit appropriate -r1 eclass."
 	eerror "For more information and examples, please see:"
@@ -149,200 +122,39 @@ elif [[ ${EAPI:-0} != [0123456] ]]; then
 	die "Invalid use of scons-utils.eclass"
 fi
 
-if [[ ${EAPI:-0} == [0123456] ]]; then
-	DEPEND=${BDEPEND}
-	unset BDEPEND
-fi
-
 # -- public functions --
 
 # @FUNCTION: escons
 # @USAGE: [<args>...]
 # @DESCRIPTION:
 # Call scons, passing the supplied arguments. Like emake, this function
-# does die on failure in EAPI 4. Respects nonfatal in EAPI 6 and newer.
+# dies on failure, unless nonfatal is used.
 escons() {
 	local ret
 
 	debug-print-function ${FUNCNAME} "${@}"
 
 	if [[ ! ${EPYTHON} ]]; then
-		if [[ ${EAPI:-0} != [0123456] ]]; then
-			eerror "EPYTHON is unset while calling escons. This most likely means that"
-			eerror "the ebuild did not call the appropriate eclass function before calling scons."
-			if [[ ${_PYTHON_ANY_R1} ]]; then
-				eerror "Please ensure that python-any-r1_pkg_setup is called in pkg_setup()."
-			elif [[ ${_PYTHON_SINGLE_R1} ]]; then
-				eerror "Please ensure that python-single-r1_pkg_setup is called in pkg_setup()."
-			else # python-r1
-				eerror "Please ensure that python_setup is called before escons, or that escons"
-				eerror "is used within python_foreach_impl as appropriate."
-			fi
-			die "EPYTHON unset in escons"
-		else
-			local -x EPYTHON=python2.7
+		eerror "EPYTHON is unset while calling escons. This most likely means that"
+		eerror "the ebuild did not call the appropriate eclass function before calling scons."
+		if [[ ${_PYTHON_ANY_R1} ]]; then
+			eerror "Please ensure that python-any-r1_pkg_setup is called in pkg_setup()."
+		elif [[ ${_PYTHON_SINGLE_R1} ]]; then
+			eerror "Please ensure that python-single-r1_pkg_setup is called in pkg_setup()."
+		else # python-r1
+			eerror "Please ensure that python_setup is called before escons, or that escons"
+			eerror "is used within python_foreach_impl as appropriate."
 		fi
+		die "EPYTHON unset in escons"
 	fi
 
-	# Use myesconsargs in EAPI 5 and older
-	if [[ ${EAPI} == [012345] ]]; then
-		set -- "${myesconsargs[@]}" "${@}"
-	fi
-
-	# if SCONSOPTS are _unset_, use cleaned MAKEOPTS
-	if [[ ! ${SCONSOPTS+set} ]]; then
-		local SCONSOPTS
-		_scons_clean_makeopts
-	fi
+	# if SCONSOPTS are unset, grab -j from MAKEOPTS
+	: "${SCONSOPTS:=-j$(makeopts_jobs)}"
 
 	# pass ebuild environment variables through!
 	local -x GENTOO_SCONS_ENV_PASSTHROUGH=1
 
 	set -- scons ${SCONSOPTS} ${EXTRA_ESCONS} "${@}"
 	echo "${@}" >&2
-	"${@}"
-	ret=${?}
-
-	if [[ ${ret} -ne 0 ]]; then
-		case "${EAPI:-0}" in
-			0|1|2|3) # nonfatal in EAPIs 0 through 3
-				;;
-			4|5) # 100% fatal in 4 & 5
-				die "escons failed."
-				;;
-			*) # respect nonfatal in 6 onwards
-				die -n "escons failed."
-				;;
-		esac
-	fi
-	return ${ret}
-}
-
-# @FUNCTION: _scons_clean_makeopts
-# @USAGE: [makeflags] [...]
-# @INTERNAL
-# @DESCRIPTION:
-# Strip the supplied makeflags (or ${MAKEOPTS} if called without
-# an argument) of options not supported by SCons and make sure --jobs
-# gets an argument. Output the resulting flag list (suitable
-# for an assignment to SCONSOPTS).
-_scons_clean_makeopts() {
-	local new_makeopts=()
-
-	debug-print-function ${FUNCNAME} "${@}"
-
-	if [[ ${#} -eq 0 ]]; then
-		debug-print "Using MAKEOPTS: [${MAKEOPTS}]"
-		set -- ${MAKEOPTS}
-	else
-		# unquote if necessary
-		set -- ${*}
-	fi
-
-	# empty MAKEOPTS give out empty SCONSOPTS
-	# thus, we do need to worry about the initial setup
-	if [[ ${*} = ${_SCONS_CACHE_MAKEOPTS} ]]; then
-		SCONSOPTS=${_SCONS_CACHE_SCONSOPTS}
-		debug-print "Cache hit: [${SCONSOPTS}]"
-		return
-	fi
-	_SCONS_CACHE_MAKEOPTS=${*}
-
-	while [[ ${#} -gt 0 ]]; do
-		case ${1} in
-			# clean, simple to check -- we like that
-			--jobs=*|--keep-going)
-				new_makeopts+=( ${1} )
-				;;
-			# need to take a look at the next arg and guess
-			--jobs)
-				if [[ ${#} -gt 1 && ${2} =~ ^[0-9]+$ ]]; then
-					new_makeopts+=( ${1} ${2} )
-					shift
-				else
-					# no value means no limit, let's pass a default instead
-					new_makeopts+=( ${1}=$(( $(get_nproc) + 1 )) )
-				fi
-				;;
-			# strip other long options
-			--*)
-				;;
-			# short option hell
-			-*)
-				local str new_optstr
-				new_optstr=
-				str=${1#-}
-
-				while [[ -n ${str} ]]; do
-					case ${str} in
-						k*)
-							new_optstr+=k
-							;;
-						# -j needs to come last
-						j)
-							if [[ ${#} -gt 1 && ${2} =~ ^[0-9]+$ ]]; then
-								new_optstr+="j ${2}"
-								shift
-							else
-								new_optstr+="j $(( $(get_nproc) + 1 ))"
-							fi
-							;;
-						# otherwise, everything after -j is treated as an arg
-						j*)
-							new_optstr+=${str}
-							break
-							;;
-					esac
-					str=${str#?}
-				done
-
-				if [[ -n ${new_optstr} ]]; then
-					new_makeopts+=( -${new_optstr} )
-				fi
-				;;
-		esac
-		shift
-	done
-
-	SCONSOPTS=${new_makeopts[*]}
-	_SCONS_CACHE_SCONSOPTS=${SCONSOPTS}
-	debug-print "New SCONSOPTS: [${SCONSOPTS}]"
-}
-
-# @FUNCTION: use_scons
-# @USAGE: <use-flag> [var-name] [var-opt-true] [var-opt-false]
-# @DESCRIPTION:
-# DEPRECATED, EAPI 0..5 ONLY: use usex instead
-#
-# Output a SCons parameter with value depending on the USE flag state.
-# If the USE flag is set, output <var-name>=<var-opt-true>; otherwise
-# <var-name>=<var-opt-false>.
-#
-# If <var-name> is omitted, <use-flag> will be used instead. However,
-# if <use-flag> starts with an exclamation mark (!flag), 'no' will be
-# prepended to the name (e.g. noflag).
-#
-# If <var-opt-true> and/or <var-opt-false> are omitted,
-# ${USE_SCONS_TRUE} and/or ${USE_SCONS_FALSE} will be used instead.
-use_scons() {
-	[[ ${EAPI} == [012345] ]] \
-		|| die "${FUNCNAME} is banned in EAPI ${EAPI}, use usex instead"
-
-	local flag=${1}
-	local varname=${2:-${flag/\!/no}}
-	local vartrue=${3:-${USE_SCONS_TRUE}}
-	local varfalse=${4:-${USE_SCONS_FALSE}}
-
-	debug-print-function ${FUNCNAME} "${@}"
-
-	if [[ ${#} -eq 0 ]]; then
-		eerror "Usage: scons-use <use-flag> [var-name] [var-opt-true] [var-opt-false]"
-		die 'scons-use(): not enough arguments'
-	fi
-
-	if use "${flag}"; then
-		echo "${varname}=${vartrue}"
-	else
-		echo "${varname}=${varfalse}"
-	fi
+	"${@}" || die -n "escons failed."
 }
diff --git a/eclass/tests/scons-utils.sh b/eclass/tests/scons-utils.sh
deleted file mode 100755
index 5f1cd2036047..000000000000
--- a/eclass/tests/scons-utils.sh
+++ /dev/null
@@ -1,64 +0,0 @@
-#!/bin/bash
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-_PYTHON_R1=1
-source tests-common.sh || exit
-
-inherit scons-utils
-
-test-scons_clean_makeopts() {
-	tbegin "scons_clean_makeopts() for ${1}"
-
-	local SCONSOPTS ret=0
-	_scons_clean_makeopts ${1}
-
-	if [[ ${SCONSOPTS} != ${2-${1}} ]]; then
-		eerror "Self-test failed:"
-		eindent
-		eerror "MAKEOPTS: ${1}"
-		eerror "Expected: ${2-${1}}"
-		eerror "Actual: ${SCONSOPTS}"
-		eoutdent
-		ret=1
-	fi
-
-	tend ${ret}
-	return ${ret}
-}
-
-# jobcount expected for non-specified state
-jc=$(( $(get_nproc) + 1 ))
-# failed test counter
-failed=0
-
-# sane MAKEOPTS
-test-scons_clean_makeopts '--jobs=14 -k'
-test-scons_clean_makeopts '--jobs=14 -k'
-test-scons_clean_makeopts '--jobs 15 -k'
-test-scons_clean_makeopts '--jobs=16 --keep-going'
-test-scons_clean_makeopts '-j17 --keep-going'
-test-scons_clean_makeopts '-j 18 --keep-going'
-
-# needing cleaning
-test-scons_clean_makeopts '--jobs -k' "--jobs=${jc} -k"
-test-scons_clean_makeopts '--jobs --keep-going' "--jobs=${jc} --keep-going"
-test-scons_clean_makeopts '-kj' "-kj ${jc}"
-
-# broken by definition (but passed as it breaks make as well)
-test-scons_clean_makeopts '-jk'
-test-scons_clean_makeopts '--jobs=randum'
-test-scons_clean_makeopts '-kjrandum'
-
-# needing stripping
-test-scons_clean_makeopts '--load-average=25 -kj16' '-kj16'
-test-scons_clean_makeopts '--load-average 25 -k -j17' '-k -j17'
-test-scons_clean_makeopts '-j2 HOME=/tmp' '-j2'
-test-scons_clean_makeopts '--jobs funnystuff -k' "--jobs=${jc} -k"
-
-# bug #388961
-test-scons_clean_makeopts '--jobs -l3' "--jobs=${jc}"
-test-scons_clean_makeopts '-j -l3' "-j ${jc}"
-
-texit
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 526ce4a44128..0febf74fc934 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libva-intel-media-driver/Manifest b/media-libs/libva-intel-media-driver/Manifest
index de0c10f66a08..05be60adee0e 100644
--- a/media-libs/libva-intel-media-driver/Manifest
+++ b/media-libs/libva-intel-media-driver/Manifest
@@ -12,6 +12,6 @@ EBUILD libva-intel-media-driver-22.5.3.1.ebuild 1349 BLAKE2B 0bd3d76f5d3f7d9ec48
 EBUILD libva-intel-media-driver-22.5.3.ebuild 1349 BLAKE2B 0bd3d76f5d3f7d9ec48ab77a424d3ef24c902484be12b3549f0d2dffe3857c49c09f08bdc3b48ad27aece6dddaff5de25cb7597a602dd1097f48bd2466c86a36 SHA512 125bac3e4dabaf97c8c4a6e1ac6fbde226adb6bce69942bbe2d03807a533bd518b71e000461810674aeec67038d7ffa5e9447ec89581dfe28380528f2a1a36a9
 EBUILD libva-intel-media-driver-22.5.4.ebuild 1348 BLAKE2B 06e45d9018fdfd720c9e2251d179cfb28db544595ef2daede5bce4c37e35c5e22b7a335fb19f7d239c5ed017362b91601144aa00efc836470c42ff88c21aef22 SHA512 5525f59567a4cba6ae9ed1d0db84c01445e349a2c9bb8040a08b503d98533a45559d7c128b895fdd9e6479ceb0ead7e71d95f9f899257166df59931d0ceacbdf
 EBUILD libva-intel-media-driver-22.6.1.ebuild 1349 BLAKE2B 0bd3d76f5d3f7d9ec48ab77a424d3ef24c902484be12b3549f0d2dffe3857c49c09f08bdc3b48ad27aece6dddaff5de25cb7597a602dd1097f48bd2466c86a36 SHA512 125bac3e4dabaf97c8c4a6e1ac6fbde226adb6bce69942bbe2d03807a533bd518b71e000461810674aeec67038d7ffa5e9447ec89581dfe28380528f2a1a36a9
-EBUILD libva-intel-media-driver-22.6.2.ebuild 1349 BLAKE2B 0bd3d76f5d3f7d9ec48ab77a424d3ef24c902484be12b3549f0d2dffe3857c49c09f08bdc3b48ad27aece6dddaff5de25cb7597a602dd1097f48bd2466c86a36 SHA512 125bac3e4dabaf97c8c4a6e1ac6fbde226adb6bce69942bbe2d03807a533bd518b71e000461810674aeec67038d7ffa5e9447ec89581dfe28380528f2a1a36a9
+EBUILD libva-intel-media-driver-22.6.2-r1.ebuild 1349 BLAKE2B e5e57ea19168eeaf13bf11f61f1b4e708b3a0536b921d87531717ffd02303eb103374b0f3c4379ffea0fce10ca6edcdcde2b1301a4dc583dca722972909c0ae0 SHA512 761bc71fcac39829bb61822832f1f71bddaec9108aa2cdc1073edf75d3c9400096ba25ba045defcdad39ff1ae390960c1188f10ffc3cf2d8b136800520b14c4d
 EBUILD libva-intel-media-driver-9999.ebuild 1372 BLAKE2B a48874cc6d1cff79803390c8f1ff2651ddb6464f21365d74a2f0b7bc97e392ad0eefa0002f659feda8db7b3424d66938db48be1a238c8bbd76eed220fd241507 SHA512 d6414971a1487d155214b8cfdc053b4657364e547aeafdc3d18d8f16bea241a2b775616f614a4c5320c6c52f119e20ae3ea208f23af684ee712f90bc006ef487
-MISC metadata.xml 416 BLAKE2B 749876c200cd1ef9b1ecb850c8fc0c208ec2f51f7ea521621758f6e08851beb536efb8f042057eeb8289ffc46bd5ca2ed3b1117c581be28b7bc5c0b78b23236a SHA512 0acedef15e1a7f39639116b9fa911433ecd024bb404de211fab032c56f105690fbb5ee82bf66afb324760d548230727aa273c4f77396ac3e7029bebc2d0e53f7
+MISC metadata.xml 565 BLAKE2B e630d474342839898d53aef1849b002ef651c9f4fe3bfcfe72e809012e6c65153b1a6c14db922a45440ffd5717b90dddd6973185f8a625906e9d5571e50728d9 SHA512 22227f8a9cc39fff74f0bf2cdc8953f110e94ce0ab107076269d604c3cf8ae46c8496c9bcf47598e351cb9714e427f213ade5e446a5e8c67acfc87db5530b370
diff --git a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.2.ebuild b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.2-r1.ebuild
index 92a6257bc1b1..c330de59e4c2 100644
--- a/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.2.ebuild
+++ b/media-libs/libva-intel-media-driver/libva-intel-media-driver-22.6.2-r1.ebuild
@@ -29,7 +29,7 @@ IUSE="+redistributable test X"
 
 RESTRICT="!test? ( test )"
 
-DEPEND=">=media-libs/gmmlib-22.1.8:=
+DEPEND=">=media-libs/gmmlib-22.3.0:=
 	>=media-libs/libva-2.14.0[X?]
 "
 RDEPEND="${DEPEND}"
diff --git a/media-libs/libva-intel-media-driver/metadata.xml b/media-libs/libva-intel-media-driver/metadata.xml
index b1e97d47fc20..c5d69a80eef0 100644
--- a/media-libs/libva-intel-media-driver/metadata.xml
+++ b/media-libs/libva-intel-media-driver/metadata.xml
@@ -8,4 +8,8 @@
 	<use>
 		<flag name="redistributable">Install redistributable media kernel binaries (no source code) files (primarily needed for video encoding support)</flag>
 	</use>
+	<upstream>
+		<bugs-to>https://github.com/intel/media-driver/issues</bugs-to>
+		<remote-id type="github">intel/media-driver</remote-id>
+	</upstream>
 </pkgmetadata>
diff --git a/media-libs/openexr/Manifest b/media-libs/openexr/Manifest
index c482cc289297..bf7af6a6a374 100644
--- a/media-libs/openexr/Manifest
+++ b/media-libs/openexr/Manifest
@@ -4,6 +4,8 @@ AUX openexr-3.1.1-0003-disable-failing-test.patch 1193 BLAKE2B d4a40151e2c0b2278
 AUX openexr-3.1.5-Add-missing-include-cstdint-required-by-gcc-13-1264.patch 1187 BLAKE2B 2e415fce94cf501b3780f6aff6bdc076db6395b53334d98484a8ac2d7b1e9ec0a5b85bc2199e7861cfb6870f81b843621ffb9a90c493cfb544b219f353362d87 SHA512 19431be0f2d8733265840ae9d428a9ddae823e37017e23d798a12a3390c879b1d8bcffd4b7d12bca8f7f929fe307fd4bff9f421830ca7b5607a188364f02bb8f
 AUX openexr-3.1.5-add-missed-include-cstdint-statement.patch 546 BLAKE2B 43a64e815ef6fb9ef6d0022560553f1f025dd0cea0b309a7126602b30440125d8aaca8b550c7f07778db4888499662fd3afdb6557c9ac67b98bb3238a7f4df0a SHA512 04d538237c9945eb33546098be4b34a3c82d93fa3f14655528bf8da49bc1e34402f74385d6d6f93fa2a724d7a495082c35bd0abbc5965119c52d5efa49229bce
 AUX openexr-3.1.5-drop-failing-testDwaLookups.patch 868 BLAKE2B 6ae9b57b222e038a57499e3b466f018840b0e358048283acea7519eca5f2a4140b9d553ad6cdca9bd449e8fc3d42fd84dae11a34f5c4264c3786b38a59ab4125 SHA512 f8cdab71c97953984ada16cf2a26fea0fce5ebfcfa465992a80080ad1882a3eecd925fc94bacdd60e1463a7c8a1678e93c89d9c7a9ec5e27726bcc98465f909f
+DIST openexr-2.5.8.tar.gz 27539605 BLAKE2B b54b72aa82c947fd7f252bf4d15b2727be2da7cdd257a9d96c6c2a3c892438ff850177549144e492617bfe5d260ddd14d21eac70a55f124784bbdf5f7077d1e9 SHA512 5b1ad99cfa639892292109a26c084868b3fe0acf572dd69750e951cec2127d63c78309241de92b0052f0abe50d86f2518e3185194121010db5f826d217e37f4f
 DIST openexr-3.1.5.tar.gz 20327926 BLAKE2B 77ece3c62b34292d4714873149a5a54a47fe811e96f992f1082e7dca99ad7717649f937c2dd7b18011c4201f15056526fc4b706c4d2f1b7fa593b9f1ed6314bd SHA512 01ef16eacd2dde83c67b81522bae87f47ba272a41ce7d4e35d865dbdcaa03093e7ac504b95d2c1b3a19535f2364a4f937b0e0570c74243bb1c6e021fce7b620c
+EBUILD openexr-2.5.8.ebuild 2037 BLAKE2B 0a934e0f8cf659d3a9209f1c289fcfefca2c08603950d940e24c445a16d056549e4a36bab8bcbbab0f2cea015908e9ecc56b471f73e0d9785b8a6cd9b46597ec SHA512 ca402e055f8ef05a96dc89245af3d675c66c3ac58ade050db66cb8be0132545d467f7d8930529fdbf47d215e53c0b45166b65a9e77fdccccc4b44deffca871e8
 EBUILD openexr-3.1.5.ebuild 2097 BLAKE2B fbf6c8253b2e0a2a57ce576b8810bf0b3aebe592af78f914eae3419c611e3df2d15989bff213f6c77d2a7161c6ecd0277b0d72d755f7d6f044dae4f0f10db899 SHA512 bd88bf3a5564f65e89319952c4e8838c4158689e55d044b66e7e4b503c75e5fd532a2c4d1896818c197ab1f4c7cf79b551629d0dab067f5baaebba9b6c673a26
 MISC metadata.xml 797 BLAKE2B e9d8032b4c63b24e2e7b1874d46bbbcf4f31342c4540279d1ba243e69090c320e6d9caed29e15dee87f7fbfb4b806de3a1665b7a4385baa4107ea41a2ae74d32 SHA512 12f7cce7d5cee0a88e4c3f8babfa10f890d5b38c0131becafa46423dc642c2df03ac78b2e3bbcdb4846b929eeb7138e9b3d12cddbf1da984ac5446b6cc792dee
diff --git a/media-libs/openexr/openexr-2.5.8.ebuild b/media-libs/openexr/openexr-2.5.8.ebuild
new file mode 100644
index 000000000000..fbe8a897d4ff
--- /dev/null
+++ b/media-libs/openexr/openexr-2.5.8.ebuild
@@ -0,0 +1,70 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+DESCRIPTION="ILM's OpenEXR high dynamic-range image file format libraries"
+HOMEPAGE="https://www.openexr.com/"
+SRC_URI="https://github.com/AcademySoftwareFoundation/openexr/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+S="${WORKDIR}/${P}/OpenEXR"
+
+LICENSE="BSD"
+SLOT="0/25" # based on SONAME
+# -ppc -sparc because broken on big endian, bug #818424
+KEYWORDS="amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
+IUSE="cpu_flags_x86_avx doc examples static-libs utils test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	~media-libs/ilmbase-${PV}:=[static-libs?,${MULTILIB_USEDEP}]
+	sys-libs/zlib[${MULTILIB_USEDEP}]
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+DOCS=( PATENTS README.md )
+
+src_prepare() {
+	# Fix path for testsuite
+	sed -i -e "s:/var/tmp/:${T}:" "${S}"/IlmImfTest/tmpDir.h || die "failed to set temp path for tests"
+
+	# disable failing tests on various arches
+	if use test; then
+		if use abi_x86_32; then
+			eapply "${FILESDIR}/${PN}-2.5.2-0001-IlmImfTest-main.cpp-disable-tests.patch"
+		fi
+
+		# Technically this doesn't disable anything, it just gives this test time to complete.
+		# Could probably be applied unconditionally but will leave this to the maintainers.
+		if use riscv; then
+			eapply "${FILESDIR}/${PN}-2.5.7-0002-increase-IlmImfTest-timeout.patch"
+		fi
+	fi
+
+	multilib_foreach_abi cmake_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DBUILD_TESTING=$(usex test)
+		-DINSTALL_OPENEXR_DOCS=$(usex doc)
+		-DINSTALL_OPENEXR_EXAMPLES=$(usex examples)
+		-DOPENEXR_BUILD_BOTH_STATIC_SHARED=$(usex static-libs)
+		-DOPENEXR_BUILD_UTILS=$(usex utils)
+		-DOPENEXR_INSTALL_PKG_CONFIG=ON
+		-DOPENEXR_USE_CLANG_TIDY=OFF		# don't look for clang-tidy
+	)
+
+	cmake_src_configure
+}
+
+multilib_src_install_all() {
+	if use doc; then
+		DOCS+=( doc/*.pdf )
+	fi
+	einstalldocs
+
+	use examples && docompress -x /usr/share/doc/${PF}/examples
+}
diff --git a/media-tv/Manifest.gz b/media-tv/Manifest.gz
index 2e1788cb318d..f77bd50dc194 100644
--- a/media-tv/Manifest.gz
+++ b/media-tv/Manifest.gz
diff --git a/media-tv/kodi/Manifest b/media-tv/kodi/Manifest
index a65178d43f36..1ddd1f0f4ace 100644
--- a/media-tv/kodi/Manifest
+++ b/media-tv/kodi/Manifest
@@ -12,5 +12,5 @@ DIST libdvdread-6.1.3-Next-Nexus-Alpha2.tar.gz 110631 BLAKE2B f84f6ac77ba3fb94cf
 EBUILD kodi-19.4-r3.ebuild 10942 BLAKE2B 85dc752a08c5e097482960bb723f4f96dfc995a74024d80ef9c7ac8c12205f407807f38c43ed2e33e4334831067d1bb39f8959dd4ac8c5f156a18189315d57fe SHA512 4791df2eb0c39f75ff3f6798722a463ef8dc941b003665566c0bbb4c9948a399acc8ba6f647ff89332e6dcf1e9bbbf08c61d53d8e37b387255b4cd3db8e21cf5
 EBUILD kodi-19.4-r4.ebuild 10991 BLAKE2B ca068efdf5b381e950b429bbd33b36d45e6aa8f62f0af706a8b87a85fdb102dd9f879f8ce8eac229c1d93b4a4444f7a18fe6e203a18cefdf4ae02ad6cf6eb7eb SHA512 593ac6be1106800c542ded9ffe65f1f3d091aeba634e4c877b426269e25a64bb4bf41607d7ea811bd7c01e0740868b56cb621117f74b3d2f9875d8381fd86371
 EBUILD kodi-19.9999.ebuild 10907 BLAKE2B ea5348a8a581c7ad94c9110843e98e18ae52320b7e7342920342fa0e70c4289fa5d26aba80573a8b17a2c3ec21f08ae0b322458b9abcc8c95e09a7559c05e12a SHA512 ec55a6010a8121f0efb672d595d7091373be2b493a83253b61d772a92b50387c24e823e39e4c435c1b1e4413c2dd3dcef34f4289dea77e6c91be0b7be75cad5f
-EBUILD kodi-9999.ebuild 10973 BLAKE2B 89ae5104ca3edbaefab0397330b1142aa2b8f11277c94b99b8c84cd92cb4992d26eebec18c59c47985a9ca43822ae2a136ace88206c6ff80d71a8f2a5ba66a6f SHA512 0398133a136939987b3e7390a19628ad227b862fceb705e5b838405ed8bf06dcdfe0edaaf1025fddfde55f1e0b0759bd1d62b2dd1886d49d3f418044f87c50d7
+EBUILD kodi-9999.ebuild 10968 BLAKE2B 6f49e40d9545d853c815868637ff1c89a0cd219516e5697178363e0ab65ec16602af82427141c0812bd3e304339b93caba28a6c04a78b345f92951424fab976c SHA512 c4474c5ff1cf52e722eca24fe5f4608c646a0eb0dcf23a785ed8e053ef78284002da5e2b69427cd8a61c903abb856b6efdbe7df99f6d1219b13f8f1a8e671a1e
 MISC metadata.xml 2763 BLAKE2B 6ec3b7c4eb4e0686de8f7cc0b8ead41538afe9c1cfb77952087a515647474797ee2901bd47a919c0634551196937d2810e624f0a5ecacd11afa0aaead88342a6 SHA512 c476b5108d33ce322f45268bdcbb224b045584f6b110fda25c074426dced4e87379d82b2c16bfe43157b882390e1cd5affa27da283e49c60e328a094eaa7e588
diff --git a/media-tv/kodi/kodi-9999.ebuild b/media-tv/kodi/kodi-9999.ebuild
index b98fc959bf7f..4e5506aed931 100644
--- a/media-tv/kodi/kodi-9999.ebuild
+++ b/media-tv/kodi/kodi-9999.ebuild
@@ -10,7 +10,7 @@ LIBDVDNAV_VERSION="6.1.1-Next-Nexus-Alpha2"
 FFMPEG_VERSION="4.4.1"
 CODENAME="Nexus"
 FFMPEG_KODI_VERSION="Alpha1"
-PYTHON_COMPAT=( python3_{8,9,10} )
+PYTHON_COMPAT=( python3_11 )
 SRC_URI="https://github.com/xbmc/libdvdcss/archive/${LIBDVDCSS_VERSION}.tar.gz -> libdvdcss-${LIBDVDCSS_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdread/archive/${LIBDVDREAD_VERSION}.tar.gz -> libdvdread-${LIBDVDREAD_VERSION}.tar.gz
 	https://github.com/xbmc/libdvdnav/archive/${LIBDVDNAV_VERSION}.tar.gz -> libdvdnav-${LIBDVDNAV_VERSION}.tar.gz
@@ -62,7 +62,7 @@ RESTRICT="!test? ( test )"
 COMMON_DEPEND="
 	>=dev-libs/lzo-2.04
 	>=dev-libs/flatbuffers-1.11.0:=
-	>=media-libs/libjpeg-turbo-2.0.4:=
+	>=media-libs/libjpeg-turbo-2.1.4:=
 	>=media-libs/libpng-1.6.26:0=
 "
 COMMON_TARGET_DEPEND="${PYTHON_DEPS}
@@ -72,7 +72,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	)
 	alsa? ( >=media-libs/alsa-lib-1.1.4.1 )
 	bluetooth? ( net-wireless/bluez )
-	bluray? ( >=media-libs/libbluray-1.1.2 )
+	bluray? ( >=media-libs/libbluray-1.3.2 )
 	caps? ( sys-libs/libcap )
 	dbus? ( sys-apps/dbus )
 	dev-db/sqlite
@@ -87,7 +87,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 		dev-python/pycryptodome[${PYTHON_USEDEP}]
 	')
 	>=dev-libs/libcdio-2.1.0[cxx]
-	>=dev-libs/libfmt-6.1.2
+	>=dev-libs/libfmt-9.1.0
 	dev-libs/libfstrcmp
 	gbm? (
 		>=dev-libs/libinput-1.10.5
@@ -116,7 +116,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	mysql? ( dev-db/mysql-connector-c:= )
 	mariadb? ( dev-db/mariadb-connector-c:= )
 	>=net-misc/curl-7.68.0[http2]
-	nfs? ( >=net-fs/libnfs-2.0.0:= )
+	nfs? ( >=net-fs/libnfs-5.0.2:= )
 	!gles? ( media-libs/glu )
 	>=dev-libs/openssl-1.1.0:0=
 	raspberry-pi? (
@@ -145,7 +145,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 		>=dev-libs/wayland-protocols-1.7
 		>=x11-libs/libxkbcommon-0.4.1
 	)
-	webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] )
+	webserver? ( >=net-libs/libmicrohttpd-0.9.75[messages(+)] )
 	X? (
 		media-libs/mesa[X]
 		!gles? ( media-libs/libglvnd[X] )
@@ -157,7 +157,7 @@ COMMON_TARGET_DEPEND="${PYTHON_DEPS}
 	x11-libs/libdrm
 	xslt? (
 		dev-libs/libxslt
-		>=dev-libs/libxml2-2.9.4
+		>=dev-libs/libxml2-2.10.1
 	)
 	zeroconf? ( net-dns/avahi[dbus] )
 "
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index eae114731cf8..86a86d2f7a9f 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index e465fecdc325..1f52a71af157 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Nov 2022 12:09:42 +0000
+Tue, 15 Nov 2022 18:09:45 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index ea1c52c66d89..199d4f9b0cba 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 536244 BLAKE2B 47908e9e54099299278f14e5112b789aac78178d7406b6880e3986163e8e2aeec411757dbe131202da7291c508ea72a7d158f7fe08facf6e36a23a28a992a7d8 SHA512 ef16d73b0d889ec01efae4d55e398ba1b384a7b46066c129d82b336f46e8804d0dd1765c65c49d93842dc829696efc67759ac790655f316a70359fb8847d9e4e
-TIMESTAMP 2022-11-15T12:09:45Z
+TIMESTAMP 2022-11-15T18:09:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNzgYlfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNz1exfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDHYg/8CZV+yDi+epny2Rrta5LsDw75Or+irP0XzMHzCdcFwscGRfyoR/sTneBA
-McdMrKtScvWwRHDRf8lsGeOQx7cZMCl+4awvNpCnITH82Z/TwZvQ69r6IXQHZqAt
-TZ/zE/ttC67B5uZWQY0QR+zs+5kIRmuAJtgVcp2PqR9HIO7eCLOo6TB5f9q3jJJ1
-0Yy92FiF2G9ZR9O349e+51LeZhBp0/g6yKysaccF8GLrCpQb/8oPFMEO+ZLool3P
-ueD50yqxMH0A15DUXzuKYf0nixTUPQgTIDSj1xNrV2Bg/7kbNvI9cHjqu2BoCu+7
-LV0MZHNYWVnhB+6oTgB/gKu1UYCDbBqMpuEM4ex/hsa6JyG1jokziXShnpm7zuFU
-A8Cc++Kv9oVmsDE2hHElgP8VsLTzF2fnKh9/dhneJBg5YlNRzNUXRU8ipPxUKCo2
-TUrMsP9r7dop9B7A1Hw3fq7cmY2e/f+rTUB+xrameOksX+uXb+tCFKVTaG3HBTwu
-N8KBjytfzDp0QPNZpL56ooiJndLIBzbPITNAY94vsE10uCeINZou3Y3G/YrDApQT
-4EyKMFEfjfQVvJR7Qy54ZCqixfdpnJORzBaVtGAHjn7mXqMnV0p++PQneHz+PoZU
-yMhgM3rfuz41sCpYNoXXKQAV+F37i31A+yFTgwI4Q/I6PBtFSE0=
-=vTVX
+klCR1hAAn5ER/nYauawUSyT2xqkXch1QwGi4fUPc9eC8Xilw5W3XMYNwSxSp0q90
+Ix/pxYjySepfJ1kjya7FcXf0zCI8a3nH684VypY7M8RKjTGbVLHPzu3r21tJ99r/
+bw2zMW4RW48QCe4hqXhOd5nZ040ttNDRSqf9gRv8thn8Dj/jvaRDTdGM/0is9ZoY
+ZLxhpXCriwZ/ZylzVAtEci7IjOEiUBF0mXfUsEc3f2hOL3c/mPO+GNkI3shRekRt
+/b4Ci/VoJ0h7QpaTXAJXq6nb9fSxTGUOgiZHMiVcr5Up/0CLIsNGIgSgsBUCXm8v
+kSC4SOidB4WdYKzEIzpmtn9V7Gh6bd1jozEHQoJs9U3OgJg87+Jr2wXKXQDG+OYT
+IUj1AHpCmQsRrt0Z8PjTMn62JtP0VbgcYm0at1rCwYQnUKxxpXErDHEP6f9u8nnn
+/9PFgQvSHikk+4W0dICAlXQUuGqvp1xVMUNqw8kIp9+2kmTi3+p7eXtyDFNkKE3O
+sG+v6uCFwZ3TYtmK88o9ky91b11DfKCZClBw5VbWiKa5punHSKl8Ui1b3chI+QL4
+cD2iJ0G4t1xv/vDld5KxxOsYgcFOAYYkwbgMkTEANHqUrESbjWIAMyKGqJWbsz9H
+B9l/67vfeV4rfdf9etpyCNwAsBvNSQ5Y4CnN3d2scvzCigvKQ5I=
+=7BcV
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index e465fecdc325..1f52a71af157 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Nov 2022 12:09:42 +0000
+Tue, 15 Nov 2022 18:09:45 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 534b7e1ceaaf..4056b022bae9 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/Manifest.gz b/metadata/md5-cache/app-i18n/Manifest.gz
index 5c44d43e84c2..56ec94529957 100644
--- a/metadata/md5-cache/app-i18n/Manifest.gz
+++ b/metadata/md5-cache/app-i18n/Manifest.gz
diff --git a/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20200306162733 b/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20200306162733
index 452260647530..3b9ab47be664 100644
--- a/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20200306162733
+++ b/metadata/md5-cache/app-i18n/ibus-sunpinyin-2.0.4_pre20200306162733
@@ -1,4 +1,4 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig python_single_target_python3_8? ( dev-util/scons[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/scons[python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
+BDEPEND=sys-devel/gettext virtual/pkgconfig python_single_target_python3_8? ( >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=app-i18n/ibus ~app-i18n/sunpinyin-2.0.4_pre20200306162733 dev-libs/glib:2 virtual/libintl
 DESCRIPTION=Chinese SunPinyin engine for IBus
@@ -12,5 +12,5 @@ RDEPEND=app-i18n/ibus ~app-i18n/sunpinyin-2.0.4_pre20200306162733 dev-libs/glib:
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 )
 SLOT=0
 SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/f39c195db08661e894017507842991a1ef70bedf.tar.gz -> sunpinyin-2.0.4_pre20200306162733.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=8e16ac8cf4119eeb03ef09735cce7786
diff --git a/metadata/md5-cache/app-i18n/scim-sunpinyin-3.0.0_rc1 b/metadata/md5-cache/app-i18n/scim-sunpinyin-3.0.0_rc1
deleted file mode 100644
index d68d9672cc3a..000000000000
--- a/metadata/md5-cache/app-i18n/scim-sunpinyin-3.0.0_rc1
+++ /dev/null
@@ -1,14 +0,0 @@
-DEFINED_PHASES=compile install prepare setup unpack
-DEPEND=app-i18n/scim[gtk3=] ~app-i18n/sunpinyin-3.0.0_rc1:= virtual/pkgconfig || ( ( >=dev-lang/python-2.7.10_p15:2.7 dev-util/scons[python_targets_python2_7(-)] ) )
-DESCRIPTION=SunPinyin IMEngine for SCIM
-EAPI=6
-HOMEPAGE=https://github.com/sunpinyin/sunpinyin
-INHERIT=python-any-r1 scons-utils toolchain-funcs vcs-snapshot
-IUSE=gtk3
-KEYWORDS=~amd64 ~x86
-LICENSE=LGPL-2.1 CDDL
-RDEPEND=app-i18n/scim[gtk3=] ~app-i18n/sunpinyin-3.0.0_rc1:=
-SLOT=0
-SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/v3.0.0-rc1.tar.gz -> sunpinyin-3.0.0_rc1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	eqawarn	c9847c43b3253a276ae2eabddedab3d7	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	vcs-snapshot	eab6d8533446763c2e9777d8bbd1594e
-_md5_=a0311e0de4414a2ec2c575b5a0787f5a
diff --git a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733 b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733
index 4799acaa81ef..3c4308910eb0 100644
--- a/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733
+++ b/metadata/md5-cache/app-i18n/sunpinyin-2.0.4_pre20200306162733
@@ -1,4 +1,4 @@
-BDEPEND=dev-lang/perl virtual/pkgconfig || ( ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=dev-lang/perl virtual/pkgconfig || ( ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=dev-db/sqlite:3 virtual/libiconv
 DESCRIPTION=Statistical Language Model (SLM) based Chinese input method library
@@ -10,5 +10,5 @@ LICENSE=|| ( CDDL LGPL-2.1 )
 RDEPEND=dev-db/sqlite:3 virtual/libiconv
 SLOT=0/3
 SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/f39c195db08661e894017507842991a1ef70bedf.tar.gz -> sunpinyin-2.0.4_pre20200306162733.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=918511d807ddff86379d8463de484909
diff --git a/metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20200306162733 b/metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20200306162733
index 68578e5423f2..85a3945978d6 100644
--- a/metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20200306162733
+++ b/metadata/md5-cache/app-i18n/xsunpinyin-2.0.4_pre20200306162733
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=~app-i18n/sunpinyin-2.0.4_pre20200306162733 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango
 DESCRIPTION=Standalone XIM server for SunPinyin
@@ -10,5 +10,5 @@ LICENSE=|| ( CDDL LGPL-2.1 )
 RDEPEND=~app-i18n/sunpinyin-2.0.4_pre20200306162733 dev-libs/glib:2 x11-libs/cairo x11-libs/gdk-pixbuf:2 x11-libs/gtk+:2 x11-libs/libX11 x11-libs/pango app-i18n/sunpinyin-data
 SLOT=0
 SRC_URI=https://github.com/sunpinyin/sunpinyin/archive/f39c195db08661e894017507842991a1ef70bedf.tar.gz -> sunpinyin-2.0.4_pre20200306162733.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=a35027fff86f26c5abb142321208401a
diff --git a/metadata/md5-cache/app-misc/Manifest.gz b/metadata/md5-cache/app-misc/Manifest.gz
index 4f353c19115b..1ccbbee28970 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/rmlint-2.10.1 b/metadata/md5-cache/app-misc/rmlint-2.10.1
index 1814935f5c24..28ff79573711 100644
--- a/metadata/md5-cache/app-misc/rmlint-2.10.1
+++ b/metadata/md5-cache/app-misc/rmlint-2.10.1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_10(-)] ) ) nls? ( sys-devel/gettext ) test? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) app-shells/dash python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] dev-python/parameterized[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyxattr[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] dev-python/parameterized[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyxattr[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] dev-python/parameterized[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyxattr[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( dev-util/scons[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/scons[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/scons[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+BDEPEND=virtual/pkgconfig doc? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_8? ( dev-python/sphinx[python_targets_python3_8(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/sphinx[python_targets_python3_9(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/sphinx[python_targets_python3_10(-)] dev-python/sphinx-bootstrap-theme[python_targets_python3_10(-)] ) ) nls? ( sys-devel/gettext ) test? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) app-shells/dash python_single_target_python3_8? ( dev-python/nose[python_targets_python3_8(-)] dev-python/parameterized[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyxattr[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/nose[python_targets_python3_9(-)] dev-python/parameterized[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyxattr[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/nose[python_targets_python3_10(-)] dev-python/parameterized[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyxattr[python_targets_python3_10(-)] ) ) python_single_target_python3_8? ( >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
 DEPEND=dev-libs/glib:2 dev-libs/json-glib virtual/libelf:0=
 DESCRIPTION=Extremely fast tool to remove duplicates and other lint from your filesystem
@@ -13,5 +13,5 @@ REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sahib/rmlint/archive/v2.10.1.tar.gz -> rmlint-2.10.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=b9206043a4af4db4591f81acc627a999
diff --git a/metadata/md5-cache/app-office/Manifest.gz b/metadata/md5-cache/app-office/Manifest.gz
index 529d72b233b4..394f50ff2ac9 100644
--- a/metadata/md5-cache/app-office/Manifest.gz
+++ b/metadata/md5-cache/app-office/Manifest.gz
diff --git a/metadata/md5-cache/app-office/planner-9999 b/metadata/md5-cache/app-office/planner-9999
index 8d0017c9892a..dba9419785f7 100644
--- a/metadata/md5-cache/app-office/planner-9999
+++ b/metadata/md5-cache/app-office/planner-9999
@@ -1,6 +1,6 @@
 BDEPEND=gtk-doc? ( dev-util/gtk-doc app-text/docbook-xml-dtd:4.1.2 ) virtual/pkgconfig sys-devel/gettext app-arch/xz-utils >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst test unpack
-DEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.23 libgda? ( >=gnome-extra/libgda-1.0:5 )
+DEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.23 libgda? ( >=gnome-extra/libgda-1.0:5 )
 DESCRIPTION=Project manager for Gnome
 EAPI=8
 HOMEPAGE=https://wiki.gnome.org/Apps/Planner
@@ -9,7 +9,7 @@ INHERIT=gnome.org gnome2-utils meson xdg git-r3
 IUSE=examples gtk-doc libgda
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=>=dev-libs/glib-2.50:2 >=x11-libs/gtk+-3.22:3 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.23 libgda? ( >=gnome-extra/libgda-1.0:5 )
+RDEPEND=>=dev-libs/glib-2.56:2 >=x11-libs/gtk+-3.22:3 >=dev-libs/libxml2-2.6.27:2 >=dev-libs/libxslt-1.1.23 libgda? ( >=gnome-extra/libgda-1.0:5 )
 SLOT=0
 _eclasses_=git-r3	2347f8fe2d392b2a091191f94be37e6f	gnome.org	429073e99d7067d3462e875bf5c6e14a	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=a2fd7df3e167c27da3090b1a0859a519
+_md5_=46706f438e079ec38d7df20bb6d81510
diff --git a/metadata/md5-cache/app-text/Manifest.gz b/metadata/md5-cache/app-text/Manifest.gz
index 2dcdace91720..400b8c01b937 100644
--- a/metadata/md5-cache/app-text/Manifest.gz
+++ b/metadata/md5-cache/app-text/Manifest.gz
diff --git a/metadata/md5-cache/app-text/zotero-bin-6.0.18 b/metadata/md5-cache/app-text/zotero-bin-6.0.18
new file mode 100644
index 000000000000..24f417fcc517
--- /dev/null
+++ b/metadata/md5-cache/app-text/zotero-bin-6.0.18
@@ -0,0 +1,13 @@
+DEFINED_PHASES=install postinst postrm preinst prepare
+DESCRIPTION=Helps you collect, organize, cite, and share your research sources
+EAPI=8
+HOMEPAGE=https://www.zotero.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=desktop xdg
+KEYWORDS=-* ~amd64 ~x86
+LICENSE=AGPL-3
+RDEPEND=app-accessibility/at-spi2-core dev-libs/dbus-glib dev-libs/glib dev-libs/nspr dev-libs/nss media-libs/fontconfig media-libs/freetype sys-apps/dbus sys-libs/glibc x11-libs/cairo x11-libs/gdk-pixbuf x11-libs/gtk+:2 x11-libs/gtk+:3 x11-libs/libX11 x11-libs/libxcb x11-libs/libXcomposite x11-libs/libXcursor x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXi x11-libs/libXrender x11-libs/libXt x11-libs/pango
+SLOT=0
+SRC_URI=amd64? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-x86_64&version=6.0.18 -> zotero-bin-6.0.18-amd64.tar.bz2 ) x86? ( https://www.zotero.org/download/client/dl?channel=release&platform=linux-i686&version=6.0.18 -> zotero-bin-6.0.18-x86.tar.bz2 )
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=1021d3c9e3aaf9607b8b86641b8e7510
diff --git a/metadata/md5-cache/dev-db/Manifest.gz b/metadata/md5-cache/dev-db/Manifest.gz
index 6f189d37e5cb..b0cb134acdf6 100644
--- a/metadata/md5-cache/dev-db/Manifest.gz
+++ b/metadata/md5-cache/dev-db/Manifest.gz
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.17-r2 b/metadata/md5-cache/dev-db/mongodb-4.2.17-r2
index 66273e20e13a..b63bc7aa8594 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.2.17-r2
+++ b/metadata/md5-cache/dev-db/mongodb-4.2.17-r2
@@ -13,5 +13,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.17.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=b10a9d7316ed172db79fb3f716693071
diff --git a/metadata/md5-cache/dev-db/mongodb-4.2.23 b/metadata/md5-cache/dev-db/mongodb-4.2.23
new file mode 100644
index 000000000000..11a4d1729b58
--- /dev/null
+++ b/metadata/md5-cache/dev-db/mongodb-4.2.23
@@ -0,0 +1,17 @@
+BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 test? ( dev-python/pymongo[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] ) >=dev-util/scons-2.5.0[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/psutil[python_targets_python3_10(-)] dev-python/pyyaml[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 test? ( dev-python/pymongo[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] ) >=dev-util/scons-2.5.0[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/psutil[python_targets_python3_9(-)] dev-python/pyyaml[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 test? ( dev-python/pymongo[python_targets_python3_8(-)] dev-python/requests[python_targets_python3_8(-)] ) >=dev-util/scons-2.5.0[python_targets_python3_8(-)] dev-python/cheetah3[python_targets_python3_8(-)] dev-python/psutil[python_targets_python3_8(-)] dev-python/pyyaml[python_targets_python3_8(-)] ) ) || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-2.5.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-2.5.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-2.5.0[python_targets_python3_8(-)] ) ) virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst prepare pretend setup test
+DEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp/yaml-cpp-0.6.2:= dev-libs/boost:= >=dev-libs/libpcre-8.42[cxx] app-arch/zstd:= dev-libs/snowball-stemmer:= net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( >=dev-libs/openssl-1.0.1g:0= ) || ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) sys-libs/ncurses:0= sys-libs/readline:0= debug? ( dev-util/valgrind )
+DESCRIPTION=A high-performance, open source, schema-free document-oriented database
+EAPI=7
+HOMEPAGE=https://www.mongodb.com
+INHERIT=check-reqs flag-o-matic multiprocessing pax-utils python-any-r1 scons-utils systemd toolchain-funcs
+IUSE=debug kerberos lto ssl test +tools
+KEYWORDS=~amd64 ~arm64
+LICENSE=Apache-2.0 SSPL-1
+PDEPEND=tools? ( >=app-admin/mongo-tools-4.2.23 )
+RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp/yaml-cpp-0.6.2:= dev-libs/boost:= >=dev-libs/libpcre-8.42[cxx] app-arch/zstd:= dev-libs/snowball-stemmer:= net-libs/libpcap >=sys-libs/zlib-1.2.11:= kerberos? ( dev-libs/cyrus-sasl[kerberos] ) ssl? ( >=dev-libs/openssl-1.0.1g:0= )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.2.23.tar.gz
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=6412dcc949bba45adc71073226b4bf3b
diff --git a/metadata/md5-cache/dev-db/mongodb-4.4.10-r1 b/metadata/md5-cache/dev-db/mongodb-4.4.10-r1
index 5b599b453416..304b4249ab98 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.4.10-r1
+++ b/metadata/md5-cache/dev-db/mongodb-4.4.10-r1
@@ -13,5 +13,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.10.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=037a7dab6e1ef8e097d0771b4de5ef32
diff --git a/metadata/md5-cache/dev-db/mongodb-4.4.8-r1 b/metadata/md5-cache/dev-db/mongodb-4.4.8-r1
index 0bf8809f5473..217ed1f2896f 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.4.8-r1
+++ b/metadata/md5-cache/dev-db/mongodb-4.4.8-r1
@@ -13,5 +13,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.8.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=de65ac1a8fc31f465f9225047895b11d
diff --git a/metadata/md5-cache/dev-db/mongodb-4.4.8-r2 b/metadata/md5-cache/dev-db/mongodb-4.4.8-r2
index 201c1d7a7046..a7425df1d360 100644
--- a/metadata/md5-cache/dev-db/mongodb-4.4.8-r2
+++ b/metadata/md5-cache/dev-db/mongodb-4.4.8-r2
@@ -13,5 +13,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r4.4.8.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=399e71654c345e7c99f73c1c67b820b2
diff --git a/metadata/md5-cache/dev-db/mongodb-5.0.5-r2 b/metadata/md5-cache/dev-db/mongodb-5.0.5-r2
index 4eb26bb4e904..a1a72e035463 100644
--- a/metadata/md5-cache/dev-db/mongodb-5.0.5-r2
+++ b/metadata/md5-cache/dev-db/mongodb-5.0.5-r2
@@ -13,5 +13,5 @@ RDEPEND=acct-group/mongodb acct-user/mongodb >=app-arch/snappy-1.1.3:= >=dev-cpp
 RESTRICT=test
 SLOT=0
 SRC_URI=https://fastdl.mongodb.org/src/mongodb-src-r5.0.5.tar.gz
-_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=ee135cbb2eba73a8e68476f03d3da87f
diff --git a/metadata/md5-cache/dev-games/Manifest.gz b/metadata/md5-cache/dev-games/Manifest.gz
index 34d107642124..b9c061d0bf74 100644
--- a/metadata/md5-cache/dev-games/Manifest.gz
+++ b/metadata/md5-cache/dev-games/Manifest.gz
diff --git a/metadata/md5-cache/dev-games/godot-3.5.1 b/metadata/md5-cache/dev-games/godot-3.5.1
index b1996e23a404..85d9c80699fc 100644
--- a/metadata/md5-cache/dev-games/godot-3.5.1
+++ b/metadata/md5-cache/dev-games/godot-3.5.1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
 DEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli] media-libs/libpng:= <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= bullet? ( sci-physics/bullet:= ) gui? ( media-libs/alsa-lib media-libs/libglvnd[X] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender pulseaudio? ( media-libs/libpulse ) tools? ( raycast? ( media-libs/embree:3 ) ) udev? ( virtual/udev ) ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) tools? ( app-misc/ca-certificates ) upnp? ( net-libs/miniupnpc:= ) webm? ( media-libs/libvorbis media-libs/libvpx:= media-libs/opus ) webp? ( media-libs/libwebp:= ) gui? ( x11-base/xorg-proto ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Multi-platform 2D and 3D game engine with a feature-rich editor
@@ -11,5 +11,5 @@ LICENSE=MIT Apache-2.0 BSD Boost-1.0 CC0-1.0 Unlicense ZLIB gui? ( CC-BY-4.0 ) t
 RDEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli] media-libs/libpng:= <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= bullet? ( sci-physics/bullet:= ) gui? ( media-libs/alsa-lib media-libs/libglvnd[X] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender pulseaudio? ( media-libs/libpulse ) tools? ( raycast? ( media-libs/embree:3 ) ) udev? ( virtual/udev ) ) theora? ( media-libs/libogg media-libs/libtheora media-libs/libvorbis ) tools? ( app-misc/ca-certificates ) upnp? ( net-libs/miniupnpc:= ) webm? ( media-libs/libvorbis media-libs/libvpx:= media-libs/opus ) webp? ( media-libs/libwebp:= )
 SLOT=3
 SRC_URI=https://downloads.tuxfamily.org/godotengine/3.5.1/godot-3.5.1-stable.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=8cd4611b90e2acd7c0d69030d07115ba
diff --git a/metadata/md5-cache/dev-games/godot-4.0_beta4-r1 b/metadata/md5-cache/dev-games/godot-4.0_beta4-r1
index 1e9565289f53..932302591dc4 100644
--- a/metadata/md5-cache/dev-games/godot-4.0_beta4-r1
+++ b/metadata/md5-cache/dev-games/godot-4.0_beta4-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
 DEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/libpcre2:=[pcre32] media-libs/freetype[brotli,harfbuzz] media-libs/harfbuzz:=[icu] media-libs/libogg media-libs/libpng:= media-libs/libvorbis <net-libs/mbedtls-3:= net-libs/wslay sys-libs/zlib:= fontconfig? ( media-libs/fontconfig ) gui? ( media-libs/alsa-lib media-libs/libglvnd[X] media-libs/vulkan-loader[X] x11-libs/libX11 x11-libs/libXcursor x11-libs/libXext x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr x11-libs/libXrender dbus? ( sys-apps/dbus ) pulseaudio? ( media-libs/libpulse ) tools? ( raycast? ( media-libs/embree:3 ) ) udev? ( virtual/udev ) ) speech? ( app-accessibility/speech-dispatcher ) theora? ( media-libs/libtheora ) tools? ( app-misc/ca-certificates ) upnp? ( net-libs/miniupnpc:= ) webp? ( media-libs/libwebp:= ) gui? ( x11-base/xorg-proto ) tools? ( test? ( dev-cpp/doctest ) ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Multi-platform 2D and 3D game engine with a feature-rich editor
@@ -12,5 +12,5 @@ RDEPEND=app-arch/zstd:= dev-games/recastnavigation:= dev-libs/icu:= dev-libs/lib
 RESTRICT=test
 SLOT=4
 SRC_URI=https://downloads.tuxfamily.org/godotengine/4.0/beta4/godot-4.0-beta4.tar.xz
-_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=9aa49cbb835afd206772971d77cd3825
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 1fd25eaedb2a..b1f11ada5b68 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/jakartaee-migration-1.0.5 b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.5
new file mode 100644
index 000000000000..3ce089b43c00
--- /dev/null
+++ b/metadata/md5-cache/dev-java/jakartaee-migration-1.0.5
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=>=virtual/jdk-1.8:* dev-java/ant-core:0 >=dev-java/bcel-6.6.0:0 >=dev-java/commons-compress-1.21:0 >=dev-java/commons-io-2.11.0:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
+DESCRIPTION=Apache Tomcat tool for migration from Java EE 8 to Jakarta EE 9
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=doc source test
+KEYWORDS=~amd64
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* dev-java/ant-core:0 >=dev-java/bcel-6.6.0:0 >=dev-java/commons-compress-1.21:0 >=dev-java/commons-io-2.11.0:1 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://apache/tomcat/jakartaee-migration/v1.0.5/source/jakartaee-migration-1.0.5-src.tar.gz -> jakartaee-migration-1.0.5-sources.tar.gz
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=633b9d98bf9ef477362f98cb6c751c3b
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-10.1.2 b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.2
new file mode 100644
index 000000000000..15c61ad96a9a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.2
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.2:10.1.2 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's EL API 5.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=5.0
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.2/src/apache-tomcat-10.1.2-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.2/src/apache-tomcat-10.1.2-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=cdceea4a4fb7e21e05a62ce8b2a5f558
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-9.0.69 b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.69
new file mode 100644
index 000000000000..df9902661b8e
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.69
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.69:9.0.69 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's EL API 5.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.69/src/apache-tomcat-9.0.69-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.69/src/apache-tomcat-9.0.69-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=2e120bd3289e25aeca098056508ff262
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.2 b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.2
new file mode 100644
index 000000000000..1ee5b3fffdc5
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.2
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.2:10.1.2 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-11:* ~dev-java/tomcat-el-api-10.1.2:5.0 ~dev-java/tomcat-servlet-api-10.1.2:6.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's JSP API 3.1 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.2:5.0 ~dev-java/tomcat-servlet-api-10.1.2:6.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.2/src/apache-tomcat-10.1.2-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.2/src/apache-tomcat-10.1.2-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=f9d7879d36b3545f25e45b763650dc3a
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.69 b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.69
new file mode 100644
index 000000000000..5b053d610bd9
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.69
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.69:9.0.69 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/tomcat-el-api-9.0.69:3.0 ~dev-java/tomcat-servlet-api-9.0.69:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's JSP API 3.1 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.69:3.0 ~dev-java/tomcat-servlet-api-9.0.69:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2.3
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.69/src/apache-tomcat-9.0.69-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.69/src/apache-tomcat-9.0.69-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=30f27c75a7ad2b1d47629ae13db0090e
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.2 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.2
new file mode 100644
index 000000000000..7b5cdbb1226a
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.2
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.2:10.1.2 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-11:* ~dev-java/tomcat-el-api-10.1.2:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 6.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.2:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=6.0
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.2/src/apache-tomcat-10.1.2-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.2/src/apache-tomcat-10.1.2-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=4cc3ef039041cce1f84696a3605ba135
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.69 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.69
new file mode 100644
index 000000000000..f724349ad8bc
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.69
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.69:9.0.69 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/tomcat-el-api-9.0.69:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 6.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.69:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.69/src/apache-tomcat-9.0.69-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.69/src/apache-tomcat-9.0.69-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=13e1a8ed6c97579427937a113ffb385c
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index e1b59f45051c..e6bbe150ca66 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/python-3.10.8_p2 b/metadata/md5-cache/dev-lang/python-3.10.8_p2
deleted file mode 100644
index ad9c017e8fc4..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.10.8_p2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_10(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.10
-SRC_URI=https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.8_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tar.xz.asc )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a4604e3bde46868b36d6d4a915d19ef1
diff --git a/metadata/md5-cache/dev-lang/python-3.11.0_p1 b/metadata/md5-cache/dev-lang/python-3.11.0_p1
deleted file mode 100644
index f6eb8bd8682d..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.11.0_p1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install postinst prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build +ensurepip examples gdbm hardened libedit lto +ncurses pgo +readline +sqlite +ssl test tk verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 ~sparc x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types ) dev-lang/python-exec[python_targets_python3_11(-)]
-RESTRICT=!test? ( test )
-SLOT=3.11
-SRC_URI=https://www.python.org/ftp/python/3.11.0/Python-3.11.0.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.0_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.0/Python-3.11.0.tar.xz.asc )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=0af5a2aa4d5a88dbe32eb73aeaa5c34d
diff --git a/metadata/md5-cache/dev-lang/python-3.12.0_alpha1_p1 b/metadata/md5-cache/dev-lang/python-3.12.0_alpha2
index cc6e8c76da6e..1f895dba4348 100644
--- a/metadata/md5-cache/dev-lang/python-3.12.0_alpha1_p1
+++ b/metadata/md5-cache/dev-lang/python-3.12.0_alpha2
@@ -11,6 +11,6 @@ LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= app-crypt/libb2 >=dev-libs/expat-2.1:= dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( !libedit? ( >=sys-libs/readline-4.1:= ) libedit? ( dev-libs/libedit:= ) ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) !!<sys-apps/sandbox-2.21 !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.12
-SRC_URI=https://www.python.org/ftp/python/3.12.0/Python-3.12.0a1.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0a1_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.12.0/Python-3.12.0a1.tar.xz.asc )
+SRC_URI=https://www.python.org/ftp/python/3.12.0/Python-3.12.0a2.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.12.0a2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.12.0/Python-3.12.0a2.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=91239183e448679ebaacc15f7752520a
+_md5_=2d19602bb94e9c2894899dca81aeccaf
diff --git a/metadata/md5-cache/dev-lang/python-3.8.15_p2 b/metadata/md5-cache/dev-lang/python-3.8.15_p2
deleted file mode 100644
index 79f35d58801f..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.8.15_p2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.8
-SRC_URI=https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.15_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz.asc )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=d1993c98a89af8b4ec65daa2b271ebd0
diff --git a/metadata/md5-cache/dev-lang/python-3.8.15_p3 b/metadata/md5-cache/dev-lang/python-3.8.15_p3
index 30afb0a7619a..bb235cc22562 100644
--- a/metadata/md5-cache/dev-lang/python-3.8.15_p3
+++ b/metadata/md5-cache/dev-lang/python-3.8.15_p3
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
 INHERIT=autotools flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
 IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk wininst +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=PSF-2
 RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_8(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
 RESTRICT=!test? ( test )
 SLOT=3.8
 SRC_URI=https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.15_p3-r1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz.asc )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=666e18ab0594e1dd2a8e8bd92c101647
+_md5_=6164729ae0246373bcc4631ec4867ab7
diff --git a/metadata/md5-cache/dev-lang/python-3.9.15_p2 b/metadata/md5-cache/dev-lang/python-3.9.15_p2
deleted file mode 100644
index 5647c036bf94..000000000000
--- a/metadata/md5-cache/dev-lang/python-3.9.15_p2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive virtual/awk virtual/pkgconfig verify-sig? ( sec-keys/openpgp-keys-python ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile configure install prepare pretend setup test unpack
-DEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) bluetooth? ( net-wireless/bluez ) test? ( app-arch/xz-utils[extra-filters(+)] )
-DESCRIPTION=An interpreted, interactive, object-oriented programming language
-EAPI=7
-HOMEPAGE=https://www.python.org/ https://github.com/python/cpython/
-INHERIT=autotools check-reqs flag-o-matic multiprocessing pax-utils python-utils-r1 toolchain-funcs verify-sig
-IUSE=bluetooth build +ensurepip examples gdbm hardened lto +ncurses pgo +readline +sqlite +ssl test tk +xml verify-sig
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~loong ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
-LICENSE=PSF-2
-RDEPEND=app-arch/bzip2:= app-arch/xz-utils:= dev-lang/python-exec[python_targets_python3_9(-)] dev-libs/libffi:= sys-apps/util-linux:= >=sys-libs/zlib-1.1.3:= virtual/libcrypt:= virtual/libintl ensurepip? ( dev-python/ensurepip-wheels ) gdbm? ( sys-libs/gdbm:=[berkdb] ) ncurses? ( >=sys-libs/ncurses-5.2:= ) readline? ( >=sys-libs/readline-4.1:= ) sqlite? ( >=dev-db/sqlite-3.3.8:3= ) ssl? ( >=dev-libs/openssl-1.1.1:= ) tk? ( >=dev-lang/tcl-8.0:= >=dev-lang/tk-8.0:= dev-tcltk/blt:= dev-tcltk/tix ) xml? ( >=dev-libs/expat-2.1:= ) !build? ( app-misc/mime-types )
-RESTRICT=!test? ( test )
-SLOT=3.9
-SRC_URI=https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.15_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tar.xz.asc )
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=704be6d971500e846c982831d93933ba
diff --git a/metadata/md5-cache/dev-perl/Manifest.gz b/metadata/md5-cache/dev-perl/Manifest.gz
index e66b5e6e4089..d11155e7a852 100644
--- a/metadata/md5-cache/dev-perl/Manifest.gz
+++ b/metadata/md5-cache/dev-perl/Manifest.gz
diff --git a/metadata/md5-cache/dev-perl/Net-SSLeay-1.920.0 b/metadata/md5-cache/dev-perl/Net-SSLeay-1.920.0
index 7a4b1d8b91a3..e5d41009dbf8 100644
--- a/metadata/md5-cache/dev-perl/Net-SSLeay-1.920.0
+++ b/metadata/md5-cache/dev-perl/Net-SSLeay-1.920.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://metacpan.org/release/Net-SSLeay
 INHERIT=perl-module
 IUSE=minimal examples test examples
-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=Artistic-2
 RDEPEND=dev-libs/openssl:= virtual/perl-MIME-Base64 dev-lang/perl:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://cpan/authors/id/C/CH/CHRISN/Net-SSLeay-1.92.tar.gz
 _eclasses_=multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	perl-functions	c3fca037246e877693badea0df3b0ef8	perl-module	21a0cb6221498d0e7894bdf445b79887	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55
-_md5_=1eedea2ef2796a7e3b2bd89a5ffdf6d9
+_md5_=93723fbcc2b2d79d32dbd1fb146446f0
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 332e61781982..555d3abd54a7 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/python-docs-3.11.0 b/metadata/md5-cache/dev-python/python-docs-3.11.0
index 89fc3f4236c9..f44ef238bbff 100644
--- a/metadata/md5-cache/dev-python/python-docs-3.11.0
+++ b/metadata/md5-cache/dev-python/python-docs-3.11.0
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=HTML documentation for Python
 EAPI=7
 HOMEPAGE=https://www.python.org/doc/
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 ~sparc x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=PSF-2
 SLOT=3.11
 SRC_URI=https://www.python.org/ftp/python/doc/3.11.0/python-3.11.0-docs-html.tar.bz2
-_md5_=a95cd84713e02e0200fff1cbc281d878
+_md5_=8067c614a34845a6e9edc32d95762e9a
diff --git a/metadata/md5-cache/dev-python/snakeoil-0.10.3 b/metadata/md5-cache/dev-python/snakeoil-0.10.3
new file mode 100644
index 000000000000..9f0edf59029b
--- /dev/null
+++ b/metadata/md5-cache/dev-python/snakeoil-0.10.3
@@ -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_p1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.7.1[python_targets_pypy3(-)?,python_targets_python3_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_p1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_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.3.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=3d830f302e2d8325db1929458e05df4f
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index 4ded4ff37811..e4b27e42b706 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20210623 b/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20210623
index dae5e5b8fd1e..3b5a13e10fe2 100644
--- a/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20210623
+++ b/metadata/md5-cache/games-action/dxx-rebirth-0.61.0_pre20210623
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
 DEPEND=dev-games/physfs[hog,mvl,zip] opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng ) !sdl2? ( media-libs/libsdl[joystick?,opengl?,sound,video] media-libs/sdl-image music? ( media-libs/sdl-mixer ) ) sdl2? ( media-libs/libsdl2[joystick?,opengl?,sound,video] media-libs/sdl2-image music? ( media-libs/sdl2-mixer ) ) valgrind? ( dev-util/valgrind ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Descent Rebirth - enhanced Descent 1 & 2 engine
@@ -12,5 +12,5 @@ RDEPEND=dev-games/physfs[hog,mvl,zip] opengl? ( virtual/opengl virtual/glu ) png
 REQUIRED_USE=|| ( d1x d2x ) flac? ( music ) midi? ( music ) mp3? ( music ) vorbis? ( music ) opl3-musicpack? ( vorbis ) sc55-musicpack? ( vorbis ) sdl2? ( opengl )
 SLOT=0
 SRC_URI=https://www.dxx-rebirth.com/download/dxx/rebirth/dxx-rebirth_20210623-src.tar.xz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=e1268e78473422b3cd094235635a2681
diff --git a/metadata/md5-cache/games-action/dxx-rebirth-9999 b/metadata/md5-cache/games-action/dxx-rebirth-9999
index b2cb54537cd0..10357414d238 100644
--- a/metadata/md5-cache/games-action/dxx-rebirth-9999
+++ b/metadata/md5-cache/games-action/dxx-rebirth-9999
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) ) >=dev-vcs/git-1.8.2.1[curl]
+BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) ) >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup unpack
 DEPEND=dev-games/physfs[hog,mvl,zip] opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng ) !sdl2? ( media-libs/libsdl[joystick?,opengl?,sound,video] media-libs/sdl-image music? ( media-libs/sdl-mixer ) ) sdl2? ( media-libs/libsdl2[joystick?,opengl?,sound,video] media-libs/sdl2-image music? ( media-libs/sdl2-mixer ) ) valgrind? ( dev-util/valgrind ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Descent Rebirth - enhanced Descent 1 & 2 engine
@@ -11,5 +11,5 @@ PROPERTIES=live
 RDEPEND=dev-games/physfs[hog,mvl,zip] opengl? ( virtual/opengl virtual/glu ) png? ( media-libs/libpng ) !sdl2? ( media-libs/libsdl[joystick?,opengl?,sound,video] media-libs/sdl-image music? ( media-libs/sdl-mixer ) ) sdl2? ( media-libs/libsdl2[joystick?,opengl?,sound,video] media-libs/sdl2-image music? ( media-libs/sdl2-mixer ) ) !sdl2? ( music? ( media-libs/sdl-mixer[flac?,midi?,mp3?,vorbis?] ) ) sdl2? ( music? ( media-libs/sdl2-mixer[flac?,midi?,mp3?,vorbis?] ) ) d1x? ( !<games-action/d1x-rebirth-0.59.100 data? ( || ( games-action/descent1-data games-action/descent1-demodata ) ) l10n_de? ( games-action/descent1-freedata[l10n_de] ) opl3-musicpack? ( games-action/descent1-freedata[opl3-musicpack] ) sc55-musicpack? ( games-action/descent1-freedata[sc55-musicpack] ) ) d2x? ( !<games-action/d2x-rebirth-0.59.100 data? ( || ( games-action/descent2-data games-action/descent2-demodata ) ) l10n_de? ( games-action/descent2-freedata[l10n_de] ) opl3-musicpack? ( games-action/descent2-freedata[opl3-musicpack] ) sc55-musicpack? ( games-action/descent2-freedata[sc55-musicpack] ) )
 REQUIRED_USE=|| ( d1x d2x ) flac? ( music ) midi? ( music ) mp3? ( music ) vorbis? ( music ) opl3-musicpack? ( vorbis ) sc55-musicpack? ( vorbis ) sdl2? ( opengl )
 SLOT=0
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=093fe4618a831b9edcd5185c668abdbe
diff --git a/metadata/md5-cache/games-puzzle/Manifest.gz b/metadata/md5-cache/games-puzzle/Manifest.gz
index 3b40bf42defb..375b580ba30d 100644
--- a/metadata/md5-cache/games-puzzle/Manifest.gz
+++ b/metadata/md5-cache/games-puzzle/Manifest.gz
diff --git a/metadata/md5-cache/games-puzzle/pingus-0.7.6-r3 b/metadata/md5-cache/games-puzzle/pingus-0.7.6-r3
index 6b62a227e5a9..74d18ac8cc14 100644
--- a/metadata/md5-cache/games-puzzle/pingus-0.7.6-r3
+++ b/metadata/md5-cache/games-puzzle/pingus-0.7.6-r3
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup
 DEPEND=media-libs/libsdl[joystick,opengl?,video] media-libs/sdl-image[png] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) opengl? ( virtual/opengl ) media-libs/libpng:0= dev-libs/boost:= dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Free Lemmings clone
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=media-libs/libsdl[joystick,opengl?,video] media-libs/sdl-image[png] media-libs/sdl-mixer music? ( media-libs/sdl-mixer[mod] ) opengl? ( virtual/opengl ) media-libs/libpng:0= dev-libs/boost:=
 SLOT=0
 SRC_URI=https://pingus.googlecode.com/files/pingus-0.7.6.tar.bz2
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=26dc1c68ca282b2a589b63e19ae3ebe0
diff --git a/metadata/md5-cache/games-strategy/Manifest.gz b/metadata/md5-cache/games-strategy/Manifest.gz
index 90b43d0f5374..bb5f255f56b2 100644
--- a/metadata/md5-cache/games-strategy/Manifest.gz
+++ b/metadata/md5-cache/games-strategy/Manifest.gz
diff --git a/metadata/md5-cache/games-strategy/endless-sky-0.9.14 b/metadata/md5-cache/games-strategy/endless-sky-0.9.14
index 07f65b2f8c9f..73cd82c45a23 100644
--- a/metadata/md5-cache/games-strategy/endless-sky-0.9.14
+++ b/metadata/md5-cache/games-strategy/endless-sky-0.9.14
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
 DEPEND=media-libs/glew:0= media-libs/libsdl2 media-libs/libjpeg-turbo:= media-libs/libmad media-libs/libpng:= media-libs/openal virtual/opengl test? ( dev-cpp/catch:0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=Space exploration, trading & combat in the tradition of Terminal Velocity
@@ -12,5 +12,5 @@ RDEPEND=media-libs/glew:0= media-libs/libsdl2 media-libs/libjpeg-turbo:= media-l
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/endless-sky/endless-sky/archive/v0.9.14.tar.gz -> endless-sky-0.9.14.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
 _md5_=29c37f5590ea045cffdcb1817ec99c16
diff --git a/metadata/md5-cache/games-util/Manifest.gz b/metadata/md5-cache/games-util/Manifest.gz
index ef26268fdb41..bfff35c25c43 100644
--- a/metadata/md5-cache/games-util/Manifest.gz
+++ b/metadata/md5-cache/games-util/Manifest.gz
diff --git a/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r1 b/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r1
index 5f45f4a9f102..e0755096103f 100644
--- a/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r1
+++ b/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r1
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) ) virtual/pkgconfig virtual/pkgconfig
+BDEPEND=dev-util/glib-utils virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) ) virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install postinst setup
 DEPEND=dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libudev:= virtual/libusb:1 x11-libs/libX11
 DESCRIPTION=Userspace Xbox 360 Controller driver
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libudev:= virtual/libusb:1 x11-libs/libX11
 SLOT=0
 SRC_URI=https://gitlab.com/xboxdrv/xboxdrv/-/archive/v0.8.8/xboxdrv-v0.8.8.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=0fb05663ae9a5e25e0bf7a9d1f00434d
diff --git a/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r2 b/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r2
index 33563e9a90bf..0ef225a5b003 100644
--- a/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r2
+++ b/metadata/md5-cache/games-util/xboxdrv-0.8.8_p20190118-r2
@@ -1,4 +1,4 @@
-BDEPEND=dev-util/glib-utils virtual/pkgconfig || ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-util/scons[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) ) virtual/pkgconfig virtual/pkgconfig
+BDEPEND=dev-util/glib-utils virtual/pkgconfig || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-util/scons-4.4.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) ) virtual/pkgconfig virtual/pkgconfig
 DEFINED_PHASES=compile install postinst postrm setup
 DEPEND=dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libudev:= virtual/libusb:1 x11-libs/libX11
 DESCRIPTION=Userspace Xbox 360 Controller driver
@@ -10,5 +10,5 @@ LICENSE=GPL-3
 RDEPEND=dev-libs/boost:= dev-libs/dbus-glib dev-libs/glib:2 sys-apps/dbus virtual/libudev:= virtual/libusb:1 x11-libs/libX11
 SLOT=0
 SRC_URI=https://gitlab.com/xboxdrv/xboxdrv/-/archive/v0.8.8/xboxdrv-v0.8.8.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=e28c079ff5ebf50fe414be5709e02292
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index edcba589ca99..af237d3d47ff 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/libffado-2.4.6 b/metadata/md5-cache/media-libs/libffado-2.4.6
index 76c36c135043..8aab8e4d67d3 100644
--- a/metadata/md5-cache/media-libs/libffado-2.4.6
+++ b/metadata/md5-cache/media-libs/libffado-2.4.6
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig python_single_target_python3_8? ( dev-util/scons[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/scons[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/scons[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) virtual/pkgconfig
+BDEPEND=virtual/pkgconfig python_single_target_python3_8? ( >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) virtual/pkgconfig
 DEFINED_PHASES=compile configure install postinst postrm prepare setup test
 DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-cpp/libxmlpp:2.6[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/dbus-c++ dev-libs/libconfig:=[cxx,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] media-libs/alsa-lib media-libs/libiec61883[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-apps/dbus sys-libs/libavc1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/libraw1394[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] qt5? ( python_single_target_python3_8? ( dev-python/dbus-python[python_targets_python3_8(-)] dev-python/PyQt5[dbus,python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/dbus-python[python_targets_python3_9(-)] dev-python/PyQt5[dbus,python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/dbus-python[python_targets_python3_10(-)] dev-python/PyQt5[dbus,python_targets_python3_10(-)] ) x11-misc/xdg-utils )
 DESCRIPTION=Driver for IEEE1394 (Firewire) audio interfaces
@@ -12,5 +12,5 @@ RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=http://www.ffado.org/files/libffado-2.4.6.tgz
-_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=bb1bacc8dc354aa82e77ed652fa6ae8c
diff --git a/metadata/md5-cache/media-libs/libva-intel-media-driver-22.6.2 b/metadata/md5-cache/media-libs/libva-intel-media-driver-22.6.2-r1
index fa3c72f1e813..8b948ca83509 100644
--- a/metadata/md5-cache/media-libs/libva-intel-media-driver-22.6.2
+++ b/metadata/md5-cache/media-libs/libva-intel-media-driver-22.6.2-r1
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-libs/gmmlib-22.1.8:= >=media-libs/libva-2.14.0[X?]
+DEPEND=>=media-libs/gmmlib-22.3.0:= >=media-libs/libva-2.14.0[X?]
 DESCRIPTION=Intel Media Driver for VA-API (iHD)
 EAPI=8
 HOMEPAGE=https://github.com/intel/media-driver
@@ -8,9 +8,9 @@ INHERIT=cmake
 IUSE=+redistributable test X
 KEYWORDS=~amd64
 LICENSE=MIT BSD redistributable? ( no-source-code )
-RDEPEND=>=media-libs/gmmlib-22.1.8:= >=media-libs/libva-2.14.0[X?]
+RDEPEND=>=media-libs/gmmlib-22.3.0:= >=media-libs/libva-2.14.0[X?]
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/intel/media-driver/archive/intel-media-22.6.2.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=099991138a4f2411725f7c65b6e934cf
+_md5_=0e694897e702d964029907f39c2d218d
diff --git a/metadata/md5-cache/media-libs/openexr-2.5.8 b/metadata/md5-cache/media-libs/openexr-2.5.8
new file mode 100644
index 000000000000..f357be981f19
--- /dev/null
+++ b/metadata/md5-cache/media-libs/openexr-2.5.8
@@ -0,0 +1,16 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=~media-libs/ilmbase-2.5.8:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+DESCRIPTION=ILM's OpenEXR high dynamic-range image file format libraries
+EAPI=8
+HOMEPAGE=https://www.openexr.com/
+INHERIT=cmake-multilib
+IUSE=cpu_flags_x86_avx doc examples static-libs utils test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=amd64 ~arm arm64 ~ia64 -ppc ~ppc64 ~riscv -sparc x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+LICENSE=BSD
+RDEPEND=~media-libs/ilmbase-2.5.8:=[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] sys-libs/zlib[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?]
+RESTRICT=!test? ( test )
+SLOT=0/25
+SRC_URI=https://github.com/AcademySoftwareFoundation/openexr/archive/v2.5.8.tar.gz -> openexr-2.5.8.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=7591303b4e2cf4aad0f716b326b3f89c
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index f7bc84debe22..1e5a3351da86 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/klick-0.12.2-r3 b/metadata/md5-cache/media-sound/klick-0.12.2-r3
index 76dc2a2b547e..e422e6c7b953 100644
--- a/metadata/md5-cache/media-sound/klick-0.12.2-r3
+++ b/metadata/md5-cache/media-sound/klick-0.12.2-r3
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile configure install setup
 DEPEND=media-libs/libsamplerate media-libs/libsndfile virtual/jack osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband ) dev-libs/boost
 DESCRIPTION=An advanced command-line based metronome for JACK
@@ -11,5 +11,5 @@ LICENSE=GPL-2+
 RDEPEND=media-libs/libsamplerate media-libs/libsndfile virtual/jack osc? ( media-libs/liblo ) rubberband? ( media-libs/rubberband )
 SLOT=0
 SRC_URI=http://das.nasophon.de/download/klick-0.12.2.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=e47ee3dcbd71534e98478878ccc3cf7f
diff --git a/metadata/md5-cache/media-tv/Manifest.gz b/metadata/md5-cache/media-tv/Manifest.gz
index 8c984a5dd6fe..60e4253a4b7a 100644
--- a/metadata/md5-cache/media-tv/Manifest.gz
+++ b/metadata/md5-cache/media-tv/Manifest.gz
diff --git a/metadata/md5-cache/media-tv/kodi-9999 b/metadata/md5-cache/media-tv/kodi-9999
index 13c3cb2eef7b..26e0e66b6343 100644
--- a/metadata/md5-cache/media-tv/kodi-9999
+++ b/metadata/md5-cache/media-tv/kodi-9999
@@ -1,17 +1,17 @@
-BDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.11.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= dev-lang/swig dev-util/cmake media-libs/giflib >=dev-libs/flatbuffers-1.11.0 >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= virtual/pkgconfig virtual/jre >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+BDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.11.0:= >=media-libs/libjpeg-turbo-2.1.4:= >=media-libs/libpng-1.6.26:0= dev-lang/swig dev-util/cmake media-libs/giflib >=dev-libs/flatbuffers-1.11.0 >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= virtual/pkgconfig virtual/jre >=dev-vcs/git-1.8.2.1[curl] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.11.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.15.1 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.4.1:=[dav1d?,encode,postproc] media-video/ffmpeg[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.0:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pipewire? ( media-video/pipewire ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.11.0:= >=media-libs/libjpeg-turbo-2.1.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.3.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_11? ( dev-python/pillow[python_targets_python3_11(-)] dev-python/pycryptodome[python_targets_python3_11(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-9.1.0 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.15.1 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.4.1:=[dav1d?,encode,postproc] media-video/ffmpeg[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-5.0.2:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.0:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pipewire? ( media-video/pipewire ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.75[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.10.1 ) zeroconf? ( net-dns/avahi[dbus] ) dev-libs/rapidjson test? ( >=dev-cpp/gtest-1.10.0 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
 DESCRIPTION=A free and open source media-player and entertainment hub
 EAPI=7
 HOMEPAGE=https://kodi.tv/ https://kodi.wiki/
 INHERIT=git-r3 autotools cmake desktop libtool linux-info pax-utils python-single-r1 xdg
-IUSE=airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
+IUSE=airplay alsa bluetooth bluray caps cec +css dav1d dbus eventclients gbm gles lcms libusb lirc mariadb mysql nfs +optical pipewire power-control pulseaudio raspberry-pi samba +system-ffmpeg test udf udev udisks upnp upower vaapi vdpau wayland webserver +X +xslt zeroconf cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon +python_single_target_python3_11
 LICENSE=GPL-2+
 PROPERTIES=live
-RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.11.0:= >=media-libs/libjpeg-turbo-2.0.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite,ssl] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite,ssl] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.1.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] dev-python/pycryptodome[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] dev-python/pycryptodome[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] dev-python/pycryptodome[python_targets_python3_10(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-6.1.2 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.15.1 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.4.1:=[dav1d?,encode,postproc] media-video/ffmpeg[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-2.0.0:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.0:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pipewire? ( media-video/pipewire ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.55[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.9.4 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
+RDEPEND=>=dev-libs/lzo-2.04 >=dev-libs/flatbuffers-1.11.0:= >=media-libs/libjpeg-turbo-2.1.4:= >=media-libs/libpng-1.6.26:0= python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite,ssl] ) airplay? ( >=app-pda/libplist-2.0.0 net-libs/shairplay ) alsa? ( >=media-libs/alsa-lib-1.1.4.1 ) bluetooth? ( net-wireless/bluez ) bluray? ( >=media-libs/libbluray-1.3.2 ) caps? ( sys-libs/libcap ) dbus? ( sys-apps/dbus ) dev-db/sqlite dev-libs/crossguid >=dev-libs/fribidi-1.0.5 cec? ( >=dev-libs/libcec-4.0[raspberry-pi?] ) dev-libs/libpcre[cxx] >=dev-libs/spdlog-1.5.0:= dev-libs/tinyxml[stl] python_single_target_python3_11? ( dev-python/pillow[python_targets_python3_11(-)] dev-python/pycryptodome[python_targets_python3_11(-)] ) >=dev-libs/libcdio-2.1.0[cxx] >=dev-libs/libfmt-9.1.0 dev-libs/libfstrcmp gbm? ( >=dev-libs/libinput-1.10.5 media-libs/mesa[gbm(+)] x11-libs/libxkbcommon ) gles? ( !raspberry-pi? ( media-libs/mesa[gles2] ) ) lcms? ( media-libs/lcms:2 ) libusb? ( virtual/libusb:1 ) virtual/ttf-fonts media-fonts/roboto >=media-libs/freetype-2.10.1 >=media-libs/libass-0.15.1 !raspberry-pi? ( media-libs/mesa[egl(+)] ) >=media-libs/taglib-1.11.1 system-ffmpeg? ( >=media-video/ffmpeg-4.4.1:=[dav1d?,encode,postproc] media-video/ffmpeg[openssl] ) !system-ffmpeg? ( app-arch/bzip2 dav1d? ( media-libs/dav1d ) ) mysql? ( dev-db/mysql-connector-c:= ) mariadb? ( dev-db/mariadb-connector-c:= ) >=net-misc/curl-7.68.0[http2] nfs? ( >=net-fs/libnfs-5.0.2:= ) !gles? ( media-libs/glu ) >=dev-libs/openssl-1.1.0:0= raspberry-pi? ( || ( media-libs/raspberrypi-userland media-libs/raspberrypi-userland-bin media-libs/mesa[egl(+),gles2,video_cards_vc4] ) ) pipewire? ( media-video/pipewire ) pulseaudio? ( media-sound/pulseaudio ) samba? ( >=net-fs/samba-3.4.6[smbclient(+)] ) >=sys-libs/zlib-1.2.11 udf? ( >=dev-libs/libudfread-1.0.0 ) udev? ( virtual/udev ) vaapi? ( media-libs/libva:= system-ffmpeg? ( media-video/ffmpeg[vaapi] ) wayland? ( media-libs/libva[wayland] ) X? ( media-libs/libva[X] ) ) virtual/libiconv vdpau? ( || ( >=x11-libs/libvdpau-1.1 >=x11-drivers/nvidia-drivers-180.51 ) system-ffmpeg? ( media-video/ffmpeg[vdpau] ) ) wayland? ( >=dev-cpp/waylandpp-0.2.3:= media-libs/mesa[wayland] >=dev-libs/wayland-protocols-1.7 >=x11-libs/libxkbcommon-0.4.1 ) webserver? ( >=net-libs/libmicrohttpd-0.9.75[messages(+)] ) X? ( media-libs/mesa[X] !gles? ( media-libs/libglvnd[X] ) x11-libs/libX11 x11-libs/libXrandr x11-libs/libXrender system-ffmpeg? ( media-video/ffmpeg[X] ) ) x11-libs/libdrm xslt? ( dev-libs/libxslt >=dev-libs/libxml2-2.10.1 ) zeroconf? ( net-dns/avahi[dbus] ) lirc? ( app-misc/lirc ) power-control? ( || ( sys-apps/systemd sys-auth/elogind ) ) udisks? ( sys-fs/udisks:2 ) upower? ( sys-power/upower )
+REQUIRED_USE=^^ ( python_single_target_python3_11 ) || ( gbm wayland X ) ?? ( mariadb mysql ) bluray? ( udf ) udev? ( !libusb ) udisks? ( dbus ) upower? ( dbus ) power-control? ( dbus ) vdpau? ( X !gles !gbm ) zeroconf? ( dbus )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/xbmc/libdvdcss/archive/1.4.3-Next-Nexus-Alpha2.tar.gz -> libdvdcss-1.4.3-Next-Nexus-Alpha2.tar.gz https://github.com/xbmc/libdvdread/archive/6.1.3-Next-Nexus-Alpha2.tar.gz -> libdvdread-6.1.3-Next-Nexus-Alpha2.tar.gz https://github.com/xbmc/libdvdnav/archive/6.1.1-Next-Nexus-Alpha2.tar.gz -> libdvdnav-6.1.1-Next-Nexus-Alpha2.tar.gz !system-ffmpeg? ( https://github.com/xbmc/FFmpeg/archive/4.4.1-Nexus-Alpha1.tar.gz -> ffmpeg-kodi-4.4.1-Nexus-Alpha1.tar.gz )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	7eb20ad915a0a318176d51bc2508ff5c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4da1e0e32dcdfc34256b14d3f84fbf59
+_md5_=331bf9ed7abedd2b5d351425c5a4d934
diff --git a/metadata/md5-cache/media-video/Manifest.gz b/metadata/md5-cache/media-video/Manifest.gz
index 9b179677a4ab..d32325b1f1f0 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/ffmpeg2theora-0.30-r1 b/metadata/md5-cache/media-video/ffmpeg2theora-0.30-r1
index b5b6ed3150d0..a98b64f157be 100644
--- a/metadata/md5-cache/media-video/ffmpeg2theora-0.30-r1
+++ b/metadata/md5-cache/media-video/ffmpeg2theora-0.30-r1
@@ -1,4 +1,4 @@
-BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=virtual/pkgconfig || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=media-video/ffmpeg:0=[postproc] >=media-libs/libvorbis-1.1 >=media-libs/libogg-1.1 >=media-libs/libtheora-1.1[encode] kate? ( >=media-libs/libkate-0.3.7 )
 DESCRIPTION=A simple converter to create Ogg Theora files
@@ -11,5 +11,5 @@ LICENSE=GPL-3
 RDEPEND=media-video/ffmpeg:0=[postproc] >=media-libs/libvorbis-1.1 >=media-libs/libogg-1.1 >=media-libs/libtheora-1.1[encode] kate? ( >=media-libs/libkate-0.3.7 )
 SLOT=0
 SRC_URI=http://www.v2v.cc/~j/ffmpeg2theora/downloads/ffmpeg2theora-0.30.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=3a141b3bec8c08fd6efdbd0d42f966d4
diff --git a/metadata/md5-cache/net-im/Manifest.gz b/metadata/md5-cache/net-im/Manifest.gz
index c32aa3fabd31..e3c84eea44a1 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/swift-4.0.2-r102 b/metadata/md5-cache/net-im/swift-4.0.2-r102
index cf3fe1c1d4bd..945ea8dce66a 100644
--- a/metadata/md5-cache/net-im/swift-4.0.2-r102
+++ b/metadata/md5-cache/net-im/swift-4.0.2-r102
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.11.0_beta4:3.11 dev-util/scons[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=|| ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-util/scons-4.4.0[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test
 DEPEND=dev-db/sqlite:3 dev-libs/boost:= dev-libs/openssl:0= net-libs/libnatpmp net-libs/miniupnpc:= sys-libs/zlib expat? ( dev-libs/expat ) !expat? ( dev-libs/libxml2:2 ) icu? ( dev-libs/icu:= ) idn? ( net-dns/libidn:= ) lua? ( lua_single_target_luajit? ( dev-lang/luajit:= ) lua_single_target_lua5-1? ( dev-lang/lua:5.1 ) ) >=dev-util/scons-3.0.1-r3 test? ( net-dns/avahi )
 DESCRIPTION=An elegant, secure, adaptable and intuitive XMPP Client
@@ -13,5 +13,5 @@ REQUIRED_USE=|| ( icu idn ) lua? ( ^^ ( lua_single_target_luajit lua_single_targ
 RESTRICT=test
 SLOT=4/0
 SRC_URI=https://swift.im/downloads/releases/swift-4.0.2/swift-4.0.2.tar.gz https://dev.gentoo.org/~conikost/distfiles/patches/swift-4.0.2-python3-compatibility.patch.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=829d7407e16bfa0966533e98a166ea65
diff --git a/metadata/md5-cache/net-libs/Manifest.gz b/metadata/md5-cache/net-libs/Manifest.gz
index 4ef78ce64a99..d45b72683345 100644
--- a/metadata/md5-cache/net-libs/Manifest.gz
+++ b/metadata/md5-cache/net-libs/Manifest.gz
diff --git a/metadata/md5-cache/net-libs/ngtcp2-0.11.0 b/metadata/md5-cache/net-libs/ngtcp2-0.11.0
new file mode 100644
index 000000000000..6f6a0fd9861a
--- /dev/null
+++ b/metadata/md5-cache/net-libs/ngtcp2-0.11.0
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.7.2:0= ) openssl? ( >=dev-libs/openssl-1.1.1:0= ) ) test? ( >=dev-util/cunit-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(-)?] )
+DESCRIPTION=Implementation of the IETF QUIC Protocol
+EAPI=8
+HOMEPAGE=https://github.com/ngtcp2/ngtcp2/
+INHERIT=cmake-multilib
+IUSE=+gnutls openssl +ssl test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
+KEYWORDS=~amd64 ~hppa ~riscv
+LICENSE=MIT
+RDEPEND=ssl? ( gnutls? ( >=net-libs/gnutls-3.7.2:0= ) openssl? ( >=dev-libs/openssl-1.1.1:0= ) )
+REQUIRED_USE=ssl? ( || ( gnutls openssl ) )
+RESTRICT=!test? ( test )
+SLOT=0/0
+SRC_URI=https://github.com/ngtcp2/ngtcp2/releases/download/v0.11.0/ngtcp2-0.11.0.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=578b0e697b83323de7db7551103b38db
diff --git a/metadata/md5-cache/net-libs/ngtcp2-9999 b/metadata/md5-cache/net-libs/ngtcp2-9999
index 736c3eda4142..a2995d68e9bd 100644
--- a/metadata/md5-cache/net-libs/ngtcp2-9999
+++ b/metadata/md5-cache/net-libs/ngtcp2-9999
@@ -13,4 +13,4 @@ REQUIRED_USE=ssl? ( || ( gnutls openssl ) )
 RESTRICT=!test? ( test )
 SLOT=0/0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2b3a120ec4f52f19635ed4618d43b13a
+_md5_=578b0e697b83323de7db7551103b38db
diff --git a/metadata/md5-cache/net-libs/serf-1.3.9-r3 b/metadata/md5-cache/net-libs/serf-1.3.9-r3
index e96183ded5f1..87ce217a3f5d 100644
--- a/metadata/md5-cache/net-libs/serf-1.3.9-r3
+++ b/metadata/md5-cache/net-libs/serf-1.3.9-r3
@@ -1,4 +1,4 @@
-BDEPEND=>=dev-util/scons-2.3.0 || ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=>=dev-util/scons-2.3.0 || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile install prepare setup test
 DEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/openssl:0= sys-libs/zlib:0= kerberos? ( virtual/krb5 )
 DESCRIPTION=HTTP client library
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/apr:1= dev-libs/apr-util:1= dev-libs/openssl:0= sys-libs/zlib:0
 RESTRICT=test
 SLOT=1
 SRC_URI=mirror://apache/serf/serf-1.3.9.tar.bz2
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=edbd60f40d904dca9577e57e3fb5f79a
diff --git a/metadata/md5-cache/net-voip/Manifest.gz b/metadata/md5-cache/net-voip/Manifest.gz
index c97411042903..bc27f62334ce 100644
--- a/metadata/md5-cache/net-voip/Manifest.gz
+++ b/metadata/md5-cache/net-voip/Manifest.gz
diff --git a/metadata/md5-cache/net-voip/mumble-9999 b/metadata/md5-cache/net-voip/mumble-9999
index 1b278153a3c2..854005892d2a 100644
--- a/metadata/md5-cache/net-voip/mumble-9999
+++ b/metadata/md5-cache/net-voip/mumble-9999
@@ -12,4 +12,4 @@ RDEPEND=>=dev-libs/openssl-1.0.0b:0= dev-libs/poco[util,xml,zip] >=dev-libs/prot
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=05fe6e614767ab7e336641c39c672422
+_md5_=591c35ca73cab81ee8ce420cd42bc196
diff --git a/metadata/md5-cache/sci-geosciences/Manifest.gz b/metadata/md5-cache/sci-geosciences/Manifest.gz
index abffc597b366..321a8e5a330a 100644
--- a/metadata/md5-cache/sci-geosciences/Manifest.gz
+++ b/metadata/md5-cache/sci-geosciences/Manifest.gz
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.23.1-r2 b/metadata/md5-cache/sci-geosciences/gpsd-3.23.1-r2
index d3a64a193ec5..a915f2b3aec4 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.23.1-r2
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.23.1-r2
@@ -13,5 +13,5 @@ REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gps
 RESTRICT=!test? ( test )
 SLOT=0/29
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.23.1.tar.xz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=48c95866c28f5d7f6e0155d3aaaedc32
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-3.24 b/metadata/md5-cache/sci-geosciences/gpsd-3.24
index 6a3195b6872b..9db10ba55205 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-3.24
+++ b/metadata/md5-cache/sci-geosciences/gpsd-3.24
@@ -13,5 +13,5 @@ REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gps
 RESTRICT=!test? ( test )
 SLOT=0/29
 SRC_URI=mirror://nongnu/gpsd/gpsd-3.24.tar.xz
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=e5a69762aced3dac12b5d61cbc9894d3
diff --git a/metadata/md5-cache/sci-geosciences/gpsd-9999 b/metadata/md5-cache/sci-geosciences/gpsd-9999
index ff65d377a108..479da89a613b 100644
--- a/metadata/md5-cache/sci-geosciences/gpsd-9999
+++ b/metadata/md5-cache/sci-geosciences/gpsd-9999
@@ -12,5 +12,5 @@ RDEPEND=acct-user/gpsd acct-group/dialout >=net-misc/pps-tools-0.0.20120407 blue
 REQUIRED_USE=X? ( python ) gpsd_protocols_nmea2000? ( gpsd_protocols_aivdm ) gpsd_protocols_isync? ( gpsd_protocols_ublox ) gpsd_protocols_ublox? ( python ) gpsd_protocols_greis? ( python ) python? ( || ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ) qt5? ( cxx )
 RESTRICT=!test? ( test )
 SLOT=0/29
-_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	git-r3	2347f8fe2d392b2a091191f94be37e6f	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
 _md5_=d41d306d099526edb84ff029b4936571
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index a27ab346e1ca..be92e72adef9 100644
--- a/metadata/md5-cache/sci-libs/Manifest.gz
+++ b/metadata/md5-cache/sci-libs/Manifest.gz
diff --git a/metadata/md5-cache/sci-libs/cantera-2.5.1-r1 b/metadata/md5-cache/sci-libs/cantera-2.5.1-r1
index 686b521e173a..1dbd0154b622 100644
--- a/metadata/md5-cache/sci-libs/cantera-2.5.1-r1
+++ b/metadata/md5-cache/sci-libs/cantera-2.5.1-r1
@@ -1,4 +1,4 @@
-BDEPEND=fortran? ( virtual/fortran ) python_single_target_python3_8? ( dev-util/scons[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/scons[python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
+BDEPEND=fortran? ( virtual/fortran ) python_single_target_python3_8? ( >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 )
 DEFINED_PHASES=compile configure install postinst setup test
 DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) lapack? ( virtual/lapack ) cti? ( python_single_target_python3_8? ( dev-python/ruamel-yaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/ruamel-yaml[python_targets_python3_9(-)] ) ) python? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) ) dev-cpp/yaml-cpp <sci-libs/sundials-5.3.0:0=[lapack?] dev-cpp/eigen:3 dev-libs/boost dev-libs/libfmt python? ( python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) ) test? ( >=dev-cpp/gtest-1.8.0 python? ( python_single_target_python3_8? ( dev-python/h5py[python_targets_python3_8(-)] dev-python/pandas[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/h5py[python_targets_python3_9(-)] dev-python/pandas[python_targets_python3_9(-)] ) ) ) fortran? ( virtual/fortran )
 DESCRIPTION=Object-oriented tool suite for chemical kinetics, thermodynamics, and transport
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( cti ) ^^ ( python_single_target_python3_8 python_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Cantera/cantera/archive/v2.5.1.tar.gz -> cantera-2.5.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=f9bacaf1e83fe4d016f9f442f951e3a3
diff --git a/metadata/md5-cache/sci-libs/cantera-2.5.1-r4 b/metadata/md5-cache/sci-libs/cantera-2.5.1-r4
index fd8d6264f812..5e6a2c06dbf7 100644
--- a/metadata/md5-cache/sci-libs/cantera-2.5.1-r4
+++ b/metadata/md5-cache/sci-libs/cantera-2.5.1-r4
@@ -1,4 +1,4 @@
-BDEPEND=fortran? ( virtual/fortran ) python_single_target_python3_8? ( dev-util/scons[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/scons[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/scons[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+BDEPEND=fortran? ( virtual/fortran ) python_single_target_python3_8? ( >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 DEFINED_PHASES=compile configure install postinst setup test
 DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) lapack? ( virtual/lapack ) cti? ( python_single_target_python3_8? ( dev-python/ruamel-yaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/ruamel-yaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/ruamel-yaml[python_targets_python3_10(-)] ) ) python? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) ) dev-cpp/yaml-cpp !lapack? ( <sci-libs/sundials-5.9.0:0= ) lapack? ( <sci-libs/sundials-5.3.0:0=[lapack] ) dev-cpp/eigen:3 dev-libs/boost dev-libs/libfmt python? ( python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] ) ) test? ( >=dev-cpp/gtest-1.8.0 python? ( python_single_target_python3_8? ( dev-python/h5py[python_targets_python3_8(-)] dev-python/pandas[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/h5py[python_targets_python3_9(-)] dev-python/pandas[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/h5py[python_targets_python3_10(-)] dev-python/pandas[python_targets_python3_10(-)] ) ) ) fortran? ( virtual/fortran )
 DESCRIPTION=Object-oriented tool suite for chemical kinetics, thermodynamics, and transport
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( cti ) ^^ ( python_single_target_python3_8 python_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Cantera/cantera/archive/v2.5.1.tar.gz -> cantera-2.5.1.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=50fa07a1ada08d3d642c64128ebc4d17
diff --git a/metadata/md5-cache/sci-libs/cantera-2.6.0-r1 b/metadata/md5-cache/sci-libs/cantera-2.6.0-r1
index 9bf9ebb2c692..8bda1fdb6c21 100644
--- a/metadata/md5-cache/sci-libs/cantera-2.6.0-r1
+++ b/metadata/md5-cache/sci-libs/cantera-2.6.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=fortran? ( virtual/fortran ) python_single_target_python3_8? ( dev-util/scons[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-util/scons[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-util/scons[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+BDEPEND=fortran? ( virtual/fortran ) python_single_target_python3_8? ( >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) python_single_target_python3_9? ( >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) python_single_target_python3_10? ( >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 DEFINED_PHASES=compile configure install postinst setup test
 DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) lapack? ( virtual/lapack ) cti? ( python_single_target_python3_8? ( dev-python/ruamel-yaml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/ruamel-yaml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/ruamel-yaml[python_targets_python3_10(-)] ) ) python? ( python_single_target_python3_8? ( dev-python/numpy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/numpy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/numpy[python_targets_python3_10(-)] ) ) dev-cpp/yaml-cpp !lapack? ( sci-libs/sundials:0= ) lapack? ( <sci-libs/sundials-5.3.0:0=[lapack?] ) dev-cpp/eigen:3 dev-libs/boost dev-libs/libfmt python? ( python_single_target_python3_8? ( dev-python/cython[python_targets_python3_8(-)] dev-python/pip[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/cython[python_targets_python3_9(-)] dev-python/pip[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/cython[python_targets_python3_10(-)] dev-python/pip[python_targets_python3_10(-)] ) ) test? ( >=dev-cpp/gtest-1.11.0 python? ( python_single_target_python3_8? ( dev-python/h5py[python_targets_python3_8(-)] dev-python/pandas[python_targets_python3_8(-)] dev-python/pytest[python_targets_python3_8(-)] dev-python/scipy[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/h5py[python_targets_python3_9(-)] dev-python/pandas[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] dev-python/scipy[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/h5py[python_targets_python3_10(-)] dev-python/pandas[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] dev-python/scipy[python_targets_python3_10(-)] ) ) ) fortran? ( virtual/fortran )
 DESCRIPTION=Object-oriented tool suite for chemical kinetics, thermodynamics, and transport
@@ -13,5 +13,5 @@ REQUIRED_USE=python? ( cti ) ^^ ( python_single_target_python3_8 python_single_t
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/Cantera/cantera/archive/v2.6.0.tar.gz -> cantera-2.6.0.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	fortran-2	72d28c6872beb1e7cb99684b0ae4715d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=21c86faa1e5fce07dcd76366cd46bb24
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index a0777dec7092..34a2470fb00c 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-apache-tomcat-10.1.2 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.2
new file mode 100644
index 000000000000..8199efea2f7c
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.2
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-90.cgi
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=public-domain
+SLOT=10.1.2
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-10/v10.1.2/KEYS -> openpgp-keys-apache-tomcat-10.1.2-KEYS.asc
+_md5_=2a0dd85294d3a36dbaa4f7672373bf44
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.69 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.69
new file mode 100644
index 000000000000..97ed732318aa
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.69
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-90.cgi
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86
+LICENSE=public-domain
+SLOT=9.0.69
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-9/v9.0.69/KEYS -> openpgp-keys-apache-tomcat-9.0.69-KEYS.asc
+_md5_=2a0dd85294d3a36dbaa4f7672373bf44
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index fd069ffe668b..f110d85c7d71 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.28-r2 b/metadata/md5-cache/sys-cluster/galera-25.3.28-r2
index 43225da049a8..bfce3e54a966 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.28-r2
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.28-r2
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/gcc-4.4 || ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=>=sys-devel/gcc-4.4 || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= dev-libs/boost:= dev-libs/check >=dev-cpp/asio-1.10.1[ssl(+)] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/openssl:0= dev-libs/boost:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://nyc2.mirrors.digitalocean.com/mariadb/mariadb-10.3.20/galera-25.3.28/src/galera-25.3.28.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a9bb0d59bf985c200a22c3f1281bc7e0
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.35 b/metadata/md5-cache/sys-cluster/galera-25.3.35
index 7fa0f8fcff06..1ec5fdbf7ad7 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.35
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.35
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=dev-libs/openssl:0= dev-libs/boost:= dev-libs/check >=dev-cpp/asio-1.10.1[ssl(+)] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/openssl:0= dev-libs/boost:=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.galeracluster.com/galera-3/source/galera-3-25.3.35.tar.gz -> galera-25.3.35.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=602311ebdd55c5bee17c31ed2be8dc18
diff --git a/metadata/md5-cache/sys-cluster/galera-25.3.37 b/metadata/md5-cache/sys-cluster/galera-25.3.37
index 89be932f879a..857af4d1c054 100644
--- a/metadata/md5-cache/sys-cluster/galera-25.3.37
+++ b/metadata/md5-cache/sys-cluster/galera-25.3.37
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl(+)] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://releases.galeracluster.com/galera-3/source/galera-3-25.3.37.tar.gz -> galera-25.3.37.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=d5925847a4c981497feb218e9e7d1aa1
diff --git a/metadata/md5-cache/sys-cluster/galera-26.4.10-r1 b/metadata/md5-cache/sys-cluster/galera-26.4.10-r1
index b176d43ae43d..7201fba77da9 100644
--- a/metadata/md5-cache/sys-cluster/galera-26.4.10-r1
+++ b/metadata/md5-cache/sys-cluster/galera-26.4.10-r1
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=dev-libs/openssl:0= dev-libs/boost:= dev-libs/check >=dev-cpp/asio-1.10.1[ssl(+)] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/openssl:0= dev-libs/boost:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.galeracluster.com/galera-4/source/galera-4-26.4.10.tar.gz -> galera-26.4.10.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=80c5e8c7147173763fd3304185669cf2
diff --git a/metadata/md5-cache/sys-cluster/galera-26.4.12 b/metadata/md5-cache/sys-cluster/galera-26.4.12
index 4709f7e72fb3..471d901a9566 100644
--- a/metadata/md5-cache/sys-cluster/galera-26.4.12
+++ b/metadata/md5-cache/sys-cluster/galera-26.4.12
@@ -1,4 +1,4 @@
-BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=|| ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0= dev-libs/check >=dev-cpp/asio-1.10.1[ssl(+)] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/openssl:0= >=dev-libs/boost-1.41:0=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.galeracluster.com/galera-4/source/galera-4-26.4.12.tar.gz -> galera-26.4.12.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=4d0566e1c9e97dee44b65f36590623f7
diff --git a/metadata/md5-cache/sys-cluster/galera-26.4.8-r1 b/metadata/md5-cache/sys-cluster/galera-26.4.8-r1
index ee0e3bb9232c..9b689d44b178 100644
--- a/metadata/md5-cache/sys-cluster/galera-26.4.8-r1
+++ b/metadata/md5-cache/sys-cluster/galera-26.4.8-r1
@@ -1,4 +1,4 @@
-BDEPEND=>=sys-devel/gcc-4.4 || ( ( >=dev-lang/python-3.10.4:3.10 dev-util/scons[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 dev-util/scons[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 dev-util/scons[python_targets_python3_8(-)] ) )
+BDEPEND=>=sys-devel/gcc-4.4 || ( ( >=dev-lang/python-3.10.4:3.10 >=dev-util/scons-4.4.0[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-util/scons-4.4.0[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-util/scons-4.4.0[python_targets_python3_8(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup
 DEPEND=>=sys-devel/gcc-4.4 dev-libs/openssl:0= dev-libs/boost:= dev-libs/check >=dev-cpp/asio-1.10.1[ssl(+)] <dev-cpp/asio-1.12.0
 DESCRIPTION=Synchronous multi-master replication engine that provides the wsrep API
@@ -12,5 +12,5 @@ RDEPEND=dev-libs/openssl:0= dev-libs/boost:=
 RESTRICT=test
 SLOT=0
 SRC_URI=https://releases.galeracluster.com/galera-4/source/galera-4-26.4.8.tar.gz -> galera-26.4.8.tar.gz
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	c30e32d0d48c308fe47706846020fdfa	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	scons-utils	bec7e6195b3d988724ab87185cb13435	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
 _md5_=a01a986f2d67715a3cbe7b35f7688ec9
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 59fb9fb81dd0..12008ee7fcf7 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/glibc-2.35-r11 b/metadata/md5-cache/sys-libs/glibc-2.35-r11
index b2d45801f462..f5dd08c62d06 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.35-r11
+++ b/metadata/md5-cache/sys-libs/glibc-2.35-r11
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
 INHERIT=python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps cet +clone3 compile-locales +crypt custom-cflags doc experimental-loong gd headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.35.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.35-patches-12.tar.xz experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/glibc-2.35-loongarch-patches-20220522.tar.xz ) https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=800de50e04c66a0b53d4960e6c17a050
+_md5_=41ace19c66b1d7d70bc70ba3d7a02579
diff --git a/metadata/md5-cache/sys-libs/glibc-2.36-r5 b/metadata/md5-cache/sys-libs/glibc-2.36-r5
index ef9ccaa21f10..e00bc7b160eb 100644
--- a/metadata/md5-cache/sys-libs/glibc-2.36-r5
+++ b/metadata/md5-cache/sys-libs/glibc-2.36-r5
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://www.gnu.org/software/libc/
 INHERIT=python-any-r1 prefix preserve-libs toolchain-funcs flag-o-matic gnuconfig multilib systemd multiprocessing tmpfiles
 IUSE=audit caps cet compile-locales +crypt custom-cflags doc gd hash-sysv-compat headers-only +multiarch multilib multilib-bootstrap nscd profile selinux +ssp stack-realign +static-libs suid systemd systemtap test vanilla
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
 LICENSE=LGPL-2.1+ BSD HPND ISC inner-net rc PCRE
 PDEPEND=!vanilla? ( sys-libs/timezone-data )
 RDEPEND=gd? ( media-libs/gd:2= ) nscd? ( selinux? ( audit? ( sys-process/audit ) caps? ( sys-libs/libcap ) ) ) suid? ( caps? ( sys-libs/libcap ) ) selinux? ( sys-libs/libselinux ) systemtap? ( dev-util/systemtap ) app-arch/gzip sys-apps/grep virtual/awk sys-apps/gentoo-functions !<app-misc/pax-utils-1.3.3 !<net-misc/openssh-8.1_p1-r2 >=net-dns/libidn2-2.3.0 vanilla? ( !sys-libs/timezone-data )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=2.2
 SRC_URI=mirror://gnu/glibc/glibc-2.36.tar.xz https://dev.gentoo.org/~dilfridge/distfiles/glibc-2.36-patches-5.tar.xz https://gitweb.gentoo.org/proj/locale-gen.git/snapshot/locale-gen-2.22.tar.gz multilib-bootstrap? ( https://dev.gentoo.org/~dilfridge/distfiles/gcc-multilib-bootstrap-20201208.tar.xz ) systemd? ( https://gitweb.gentoo.org/proj/toolchain/glibc-systemd.git/snapshot/glibc-systemd-20210729.tar.gz )
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	prefix	eab3c99d77fe00506c109c8a736186f7	preserve-libs	a8e50acee31b5759b4df1f7707cae54b	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=82b6bffefd6ccc5a2de8dd1fa1f3588f
+_md5_=cc0874481db1c0bbc60cfd16a8e3dc95
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 9e6d757f55f8..dcfd93a99160 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/prowlarr-0.4.8.2072 b/metadata/md5-cache/www-apps/prowlarr-0.4.9.2083
index 21946ea224df..14b8ab37bfdc 100644
--- a/metadata/md5-cache/www-apps/prowlarr-0.4.8.2072
+++ b/metadata/md5-cache/www-apps/prowlarr-0.4.9.2083
@@ -9,6 +9,6 @@ LICENSE=GPL-3
 RDEPEND=acct-group/prowlarr acct-user/prowlarr dev-libs/icu dev-util/lttng-ust:0 dev-db/sqlite sys-libs/glibc
 RESTRICT=bindist strip test
 SLOT=0
-SRC_URI=amd64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v0.4.8.2072/Prowlarr.develop.0.4.8.2072.linux-core-x64.tar.gz ) arm? ( https://github.com/Prowlarr/Prowlarr/releases/download/v0.4.8.2072/Prowlarr.develop.0.4.8.2072.linux-core-arm.tar.gz ) arm64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v0.4.8.2072/Prowlarr.develop.0.4.8.2072.linux-core-arm64.tar.gz )
+SRC_URI=amd64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v0.4.9.2083/Prowlarr.develop.0.4.9.2083.linux-core-x64.tar.gz ) arm? ( https://github.com/Prowlarr/Prowlarr/releases/download/v0.4.9.2083/Prowlarr.develop.0.4.9.2083.linux-core-arm.tar.gz ) arm64? ( https://github.com/Prowlarr/Prowlarr/releases/download/v0.4.9.2083/Prowlarr.develop.0.4.9.2083.linux-core-arm64.tar.gz )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=b397a1336ac6b1be246176b8ed1d24f7
diff --git a/metadata/md5-cache/www-client/Manifest.gz b/metadata/md5-cache/www-client/Manifest.gz
index 382819cb1377..bcf921f2d002 100644
--- a/metadata/md5-cache/www-client/Manifest.gz
+++ b/metadata/md5-cache/www-client/Manifest.gz
diff --git a/metadata/md5-cache/www-client/firefox-102.5.0 b/metadata/md5-cache/www-client/firefox-102.5.0
new file mode 100644
index 000000000000..65d9881bf541
--- /dev/null
+++ b/metadata/md5-cache/www-client/firefox-102.5.0
@@ -0,0 +1,17 @@
+BDEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11[ncurses,sqlite,ssl] >=dev-lang/python-3.10.4:3.10[ncurses,sqlite,ssl] >=dev-lang/python-3.9.12:3.9[ncurses,sqlite,ssl] >=dev-lang/python-3.8.13:3.8[ncurses,sqlite,ssl] ) || ( ( sys-devel/clang:15 sys-devel/llvm:15 clang? ( sys-devel/lld:15 pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] ) ) ) ( sys-devel/clang:14 sys-devel/llvm:14 clang? ( sys-devel/lld:14 pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] ) ) ) ) || ( virtual/rust:0/llvm-15 virtual/rust:0/llvm-14 ) app-arch/unzip app-arch/zip >=dev-util/cbindgen-0.24.3 net-libs/nodejs virtual/pkgconfig amd64? ( >=dev-lang/nasm-2.14 ) x86? ( >=dev-lang/nasm-2.14 ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) ~sys-devel/autoconf-2.13 >=sys-devel/libtool-2.4 pgo? ( x11-base/xorg-server[xvfb] x11-apps/xhost )
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare pretend setup unpack
+DEPEND=!www-client/firefox:0 !www-client/firefox:rapid screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk ) dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79.1 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) x11-libs/libICE x11-libs/libSM pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4[sdk] ) ) !!sys-devel/llvm:0
+DESCRIPTION=Firefox Web Browser
+EAPI=8
+HOMEPAGE=https://www.mozilla.com/firefox
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools check-reqs desktop flag-o-matic gnome2-utils linux-info llvm multiprocessing pax-utils python-any-r1 toolchain-funcs virtualx xdg
+IUSE=+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel jack libproxy lto +openh264 pgo pulseaudio sndio selinux +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp wayland wifi geckodriver +gmp-autoupdate screencast l10n_af l10n_ar l10n_ast l10n_be l10n_bg l10n_br l10n_ca l10n_cak l10n_cs l10n_cy l10n_da l10n_de l10n_dsb l10n_el l10n_en-CA l10n_en-GB l10n_es-AR l10n_es-ES l10n_et l10n_eu l10n_fi l10n_fr l10n_fy l10n_ga l10n_gd l10n_gl l10n_he l10n_hr l10n_hsb l10n_hu l10n_id l10n_is l10n_it l10n_ja l10n_ka l10n_kab l10n_kk l10n_ko l10n_lt l10n_lv l10n_ms l10n_nb l10n_nl l10n_nn l10n_pa l10n_pl l10n_pt-BR l10n_pt-PT l10n_rm l10n_ro l10n_ru l10n_sk l10n_sl l10n_sq l10n_sr l10n_sv l10n_th l10n_tr l10n_uk l10n_uz l10n_vi l10n_zh-CN l10n_zh-TW l10n_ach l10n_an l10n_az l10n_bn l10n_bs l10n_ca-valencia l10n_eo l10n_es-CL l10n_es-MX l10n_fa l10n_ff l10n_gn l10n_gu l10n_hi l10n_hy l10n_ia l10n_km l10n_kn l10n_lij l10n_mk l10n_mr l10n_my l10n_ne l10n_oc l10n_sco l10n_si l10n_son l10n_szl l10n_ta l10n_te l10n_tl l10n_trs l10n_ur l10n_xh pgo
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
+LICENSE=MPL-2.0 GPL-2 LGPL-2.1
+RDEPEND=!www-client/firefox:0 !www-client/firefox:rapid screencast? ( media-video/pipewire:= ) selinux? ( sec-policy/selinux-mozilla ) || ( >=app-accessibility/at-spi2-core-2.46.0:2 dev-libs/atk ) dev-libs/expat dev-libs/glib:2 dev-libs/libffi:= >=dev-libs/nss-3.79.1 >=dev-libs/nspr-4.34 media-libs/alsa-lib media-libs/fontconfig media-libs/freetype media-libs/mesa media-video/ffmpeg sys-libs/zlib virtual/freedesktop-icon-theme virtual/opengl x11-libs/cairo[X] x11-libs/gdk-pixbuf x11-libs/gtk+:3[X] x11-libs/libX11 x11-libs/libXcomposite x11-libs/libXdamage x11-libs/libXext x11-libs/libXfixes x11-libs/libXrandr x11-libs/libXtst x11-libs/libxcb:= x11-libs/libxkbcommon[X] x11-libs/pango x11-libs/pixman dbus? ( dev-libs/dbus-glib sys-apps/dbus ) jack? ( virtual/jack ) libproxy? ( net-libs/libproxy ) sndio? ( >=media-sound/sndio-1.8.0-r1 ) system-av1? ( >=media-libs/dav1d-1.0.0:= >=media-libs/libaom-1.0.0:= ) system-harfbuzz? ( >=media-gfx/graphite2-1.3.13 >=media-libs/harfbuzz-2.8.1:0= ) system-icu? ( >=dev-libs/icu-71.1:= ) system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 ) system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads] ) system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] ) system-png? ( >=media-libs/libpng-1.6.35:0=[apng] ) system-webp? ( >=media-libs/libwebp-1.1.0:0= ) wayland? ( x11-libs/gtk+:3[wayland] x11-libs/libdrm x11-libs/libxkbcommon[wayland] ) wifi? ( kernel_linux? ( dev-libs/dbus-glib net-misc/networkmanager sys-apps/dbus ) ) jack? ( virtual/jack ) openh264? ( media-libs/openh264:*[plugin] ) pulseaudio? ( || ( media-sound/pulseaudio >=media-sound/apulse-0.1.12-r4 ) )
+REQUIRED_USE=debug? ( !system-av1 ) pgo? ( lto ) wayland? ( dbus ) wifi? ( dbus ) screencast? ( wayland )
+SLOT=esr
+SRC_URI=https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/source/firefox-102.5.0esr.source.tar.xz -> firefox-102.5.0esr.source.tar.xz https://dev.gentoo.org/~juippis/mozilla/patchsets/firefox-102esr-patches-05j.tar.xz https://dev.gentoo.org/~whissi/mozilla/patchsets/firefox-102esr-patches-05j.tar.xz https://dev.gentoo.org/~slashbeast/mozilla/patchsets/firefox-102esr-patches-05j.tar.xz l10n_af? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/af.xpi -> firefox-102.5.0esr-af.xpi ) l10n_ar? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ar.xpi -> firefox-102.5.0esr-ar.xpi ) l10n_ast? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ast.xpi -> firefox-102.5.0esr-ast.xpi ) l10n_be? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/be.xpi -> firefox-102.5.0esr-be.xpi ) l10n_bg? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/bg.xpi -> firefox-102.5.0esr-bg.xpi ) l10n_br? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/br.xpi -> firefox-102.5.0esr-br.xpi ) l10n_ca? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ca.xpi -> firefox-102.5.0esr-ca.xpi ) l10n_cak? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/cak.xpi -> firefox-102.5.0esr-cak.xpi ) l10n_cs? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/cs.xpi -> firefox-102.5.0esr-cs.xpi ) l10n_cy? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/cy.xpi -> firefox-102.5.0esr-cy.xpi ) l10n_da? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/da.xpi -> firefox-102.5.0esr-da.xpi ) l10n_de? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/de.xpi -> firefox-102.5.0esr-de.xpi ) l10n_dsb? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/dsb.xpi -> firefox-102.5.0esr-dsb.xpi ) l10n_el? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/el.xpi -> firefox-102.5.0esr-el.xpi ) l10n_en-CA? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/en-CA.xpi -> firefox-102.5.0esr-en-CA.xpi ) l10n_en-GB? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/en-GB.xpi -> firefox-102.5.0esr-en-GB.xpi ) l10n_es-AR? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/es-AR.xpi -> firefox-102.5.0esr-es-AR.xpi ) l10n_es-ES? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/es-ES.xpi -> firefox-102.5.0esr-es-ES.xpi ) l10n_et? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/et.xpi -> firefox-102.5.0esr-et.xpi ) l10n_eu? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/eu.xpi -> firefox-102.5.0esr-eu.xpi ) l10n_fi? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/fi.xpi -> firefox-102.5.0esr-fi.xpi ) l10n_fr? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/fr.xpi -> firefox-102.5.0esr-fr.xpi ) l10n_fy? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/fy-NL.xpi -> firefox-102.5.0esr-fy-NL.xpi ) l10n_ga? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ga-IE.xpi -> firefox-102.5.0esr-ga-IE.xpi ) l10n_gd? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/gd.xpi -> firefox-102.5.0esr-gd.xpi ) l10n_gl? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/gl.xpi -> firefox-102.5.0esr-gl.xpi ) l10n_he? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/he.xpi -> firefox-102.5.0esr-he.xpi ) l10n_hr? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/hr.xpi -> firefox-102.5.0esr-hr.xpi ) l10n_hsb? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/hsb.xpi -> firefox-102.5.0esr-hsb.xpi ) l10n_hu? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/hu.xpi -> firefox-102.5.0esr-hu.xpi ) l10n_id? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/id.xpi -> firefox-102.5.0esr-id.xpi ) l10n_is? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/is.xpi -> firefox-102.5.0esr-is.xpi ) l10n_it? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/it.xpi -> firefox-102.5.0esr-it.xpi ) l10n_ja? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ja.xpi -> firefox-102.5.0esr-ja.xpi ) l10n_ka? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ka.xpi -> firefox-102.5.0esr-ka.xpi ) l10n_kab? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/kab.xpi -> firefox-102.5.0esr-kab.xpi ) l10n_kk? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/kk.xpi -> firefox-102.5.0esr-kk.xpi ) l10n_ko? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ko.xpi -> firefox-102.5.0esr-ko.xpi ) l10n_lt? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/lt.xpi -> firefox-102.5.0esr-lt.xpi ) l10n_lv? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/lv.xpi -> firefox-102.5.0esr-lv.xpi ) l10n_ms? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ms.xpi -> firefox-102.5.0esr-ms.xpi ) l10n_nb? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/nb-NO.xpi -> firefox-102.5.0esr-nb-NO.xpi ) l10n_nl? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/nl.xpi -> firefox-102.5.0esr-nl.xpi ) l10n_nn? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/nn-NO.xpi -> firefox-102.5.0esr-nn-NO.xpi ) l10n_pa? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/pa-IN.xpi -> firefox-102.5.0esr-pa-IN.xpi ) l10n_pl? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/pl.xpi -> firefox-102.5.0esr-pl.xpi ) l10n_pt-BR? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/pt-BR.xpi -> firefox-102.5.0esr-pt-BR.xpi ) l10n_pt-PT? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/pt-PT.xpi -> firefox-102.5.0esr-pt-PT.xpi ) l10n_rm? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/rm.xpi -> firefox-102.5.0esr-rm.xpi ) l10n_ro? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ro.xpi -> firefox-102.5.0esr-ro.xpi ) l10n_ru? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ru.xpi -> firefox-102.5.0esr-ru.xpi ) l10n_sk? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/sk.xpi -> firefox-102.5.0esr-sk.xpi ) l10n_sl? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/sl.xpi -> firefox-102.5.0esr-sl.xpi ) l10n_sq? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/sq.xpi -> firefox-102.5.0esr-sq.xpi ) l10n_sr? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/sr.xpi -> firefox-102.5.0esr-sr.xpi ) l10n_sv? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/sv-SE.xpi -> firefox-102.5.0esr-sv-SE.xpi ) l10n_th? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/th.xpi -> firefox-102.5.0esr-th.xpi ) l10n_tr? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/tr.xpi -> firefox-102.5.0esr-tr.xpi ) l10n_uk? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/uk.xpi -> firefox-102.5.0esr-uk.xpi ) l10n_uz? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/uz.xpi -> firefox-102.5.0esr-uz.xpi ) l10n_vi? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/vi.xpi -> firefox-102.5.0esr-vi.xpi ) l10n_zh-CN? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/zh-CN.xpi -> firefox-102.5.0esr-zh-CN.xpi ) l10n_zh-TW? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/zh-TW.xpi -> firefox-102.5.0esr-zh-TW.xpi ) l10n_ach? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ach.xpi -> firefox-102.5.0esr-ach.xpi ) l10n_an? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/an.xpi -> firefox-102.5.0esr-an.xpi ) l10n_az? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/az.xpi -> firefox-102.5.0esr-az.xpi ) l10n_bn? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/bn.xpi -> firefox-102.5.0esr-bn.xpi ) l10n_bs? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/bs.xpi -> firefox-102.5.0esr-bs.xpi ) l10n_ca-valencia? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ca-valencia.xpi -> firefox-102.5.0esr-ca-valencia.xpi ) l10n_eo? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/eo.xpi -> firefox-102.5.0esr-eo.xpi ) l10n_es-CL? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/es-CL.xpi -> firefox-102.5.0esr-es-CL.xpi ) l10n_es-MX? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/es-MX.xpi -> firefox-102.5.0esr-es-MX.xpi ) l10n_fa? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/fa.xpi -> firefox-102.5.0esr-fa.xpi ) l10n_ff? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ff.xpi -> firefox-102.5.0esr-ff.xpi ) l10n_gn? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/gn.xpi -> firefox-102.5.0esr-gn.xpi ) l10n_gu? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/gu-IN.xpi -> firefox-102.5.0esr-gu-IN.xpi ) l10n_hi? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/hi-IN.xpi -> firefox-102.5.0esr-hi-IN.xpi ) l10n_hy? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/hy-AM.xpi -> firefox-102.5.0esr-hy-AM.xpi ) l10n_ia? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ia.xpi -> firefox-102.5.0esr-ia.xpi ) l10n_km? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/km.xpi -> firefox-102.5.0esr-km.xpi ) l10n_kn? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/kn.xpi -> firefox-102.5.0esr-kn.xpi ) l10n_lij? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/lij.xpi -> firefox-102.5.0esr-lij.xpi ) l10n_mk? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/mk.xpi -> firefox-102.5.0esr-mk.xpi ) l10n_mr? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/mr.xpi -> firefox-102.5.0esr-mr.xpi ) l10n_my? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/my.xpi -> firefox-102.5.0esr-my.xpi ) l10n_ne? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ne-NP.xpi -> firefox-102.5.0esr-ne-NP.xpi ) l10n_oc? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/oc.xpi -> firefox-102.5.0esr-oc.xpi ) l10n_sco? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/sco.xpi -> firefox-102.5.0esr-sco.xpi ) l10n_si? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/si.xpi -> firefox-102.5.0esr-si.xpi ) l10n_son? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/son.xpi -> firefox-102.5.0esr-son.xpi ) l10n_szl? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/szl.xpi -> firefox-102.5.0esr-szl.xpi ) l10n_ta? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ta.xpi -> firefox-102.5.0esr-ta.xpi ) l10n_te? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/te.xpi -> firefox-102.5.0esr-te.xpi ) l10n_tl? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/tl.xpi -> firefox-102.5.0esr-tl.xpi ) l10n_trs? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/trs.xpi -> firefox-102.5.0esr-trs.xpi ) l10n_ur? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/ur.xpi -> firefox-102.5.0esr-ur.xpi ) l10n_xh? ( https://archive.mozilla.org/pub/firefox/releases/102.5.0esr/linux-x86_64/xpi/xh.xpi -> firefox-102.5.0esr-xh.xpi )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	29a755b1291d64133634d80b0328f153	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e35ec5c1bed4152c7e6ef46e24ebd52a
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 0acf1dd8c2ad..9e1b7955f1d6 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.2 b/metadata/md5-cache/www-servers/tomcat-10.1.2
new file mode 100644
index 000000000000..0aff738cb852
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.2
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.2:10.1.2 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.25 dev-java/glassfish-xmlrpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 ~dev-java/tomcat-el-api-10.1.2:5.0 ~dev-java/tomcat-jsp-api-10.1.2:3.1 ~dev-java/tomcat-servlet-api-10.1.2:6.0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-11:* test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.25 dev-java/glassfish-xmlrpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 ~dev-java/tomcat-el-api-10.1.2:5.0 ~dev-java/tomcat-jsp-api-10.1.2:3.1 ~dev-java/tomcat-servlet-api-10.1.2:6.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=10.1
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.2/src/apache-tomcat-10.1.2-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.3.1/biz.aQute.bnd-6.3.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.3.1/biz.aQute.bndlib-6.3.1.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.2/src/apache-tomcat-10.1.2-src.tar.gz.asc )
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=b39d92133857112800c53f1596d9b5bd
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.69 b/metadata/md5-cache/www-servers/tomcat-9.0.69
new file mode 100644
index 000000000000..b43dbcdda49a
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.69
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.69:9.0.69 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-el-api-9.0.69:3.0 ~dev-java/tomcat-jsp-api-9.0.69:2.3 ~dev-java/tomcat-servlet-api-9.0.69:4.0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 >=virtual/jdk-1.8:* test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.15 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-el-api-9.0.69:3.0 ~dev-java/tomcat-jsp-api-9.0.69:2.3 ~dev-java/tomcat-servlet-api-9.0.69:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=9
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.69/src/apache-tomcat-9.0.69-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.3.1/biz.aQute.bnd-6.3.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.3.1/biz.aQute.bndlib-6.3.1.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.69/src/apache-tomcat-9.0.69-src.tar.gz.asc )
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=7c53fbb4ecc87c3270bf5a8797db4298
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 1004e9d85906..ef41ec64873e 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14053 BLAKE2B c0a5bea7cd069c2e9b07dab158b876c74e027945a8fdd50fee280ec7abb59b03a223e89d53d1563fc784c8a353890e9928577f3cf4c4daaf3eebee6f871aa5c0 SHA512 43691780e35724149b779ecf32c3d83556a2e30fb3c35c56b8841fc4c866de83cb09e4b9be3071940181a4933de197417647dd3921df2f61e100510b23a9e327
-TIMESTAMP 2022-11-15T12:09:45Z
+TIMESTAMP 2022-11-15T18:09:48Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNzgYpfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNz1exfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAB6hAAs4nGsuJecUOw6zIIU5Db8LmgMapFf5WfBeJC6YQLWpuyLz1WqYH5A97H
-ny419KZ4TeZI8ze44oPyPjn2MRwWf7Ky+Q/DZO2A7DUc8hZRg4akpJ+fP+CEDBF9
-/B9f6Q2Z3qa3JiM8a5ImKY+8ImXBPzNlqAoJqsdtBNs/yhiyd+NYAdTcZn65SXQZ
-8rgv5oEXubnTN2I5aMcT3Q0rcWZL1NJl0GuNNVq86b56RTD3CUuHrsHI7KWnMDfF
-fiGTHtJvOil4yQj5ankD7yXG+q998m3TZI5L1G4SflW3TjFYEubwqRUo5GGx/CWr
-ROChZStnWqiHLPaP9ELdaZLlYjSysebjVY3OdaqBwyEsx53eyfR1R5zIhFRG6REw
-J4NcYSvd9+t7geIt4ZXkfholYm1689VNqd0GoiZtIWbZ1b7o/0LAPGFrM2dRoDuG
-SM8sNE5z/2Y2Shsom2HiolS0TI3MLXimOrOF7S4iinBOqgmAW6nmBEFukILBlQC3
-m9Wu9w2eR+FdUGnncb0RUi5nXMBgmOm73+xDkxPKWJzxrKB14R5A8gYOPtUpo9q/
-AvRThPrKJ9EASemAhaJZmYbyIPqCoLtso0hobbMaIhDAbKMrElxzSy8aupubbyXl
-uFUvsCvL+i6/D07SKJkgWzZrUZ7zBGA8UnWOR/e2jYrZm8TSZW4=
-=jti7
+klCH3BAAluOGPJc8gtH8qIGv2XlHxXfkMBK8dTtpWN7CMBtmr5b7u1vqJHJ+7EX5
+EyoU+26nUevcVt0c1qMWXFeJaMCvlYNuudmmw5hhTX+sohJMd1siBqmFH9vCUI87
++CBhMUKZUj5HZN+f47Mf9fLYLwgdyN2TiLf1ODhfweQGHOrPbdkj9xXHfGJAdsZI
+QtE9zcexMkjCwTALsCjBEZl9XkXZHHww22zO0pLwAGs2kqz25iwuaIV681NZii9A
+kxkPi9l5yPZN2SGfmkGR9Zfo+Iy+8k9ZP+kjvgDHFB1SSs3zQNTzRj6jSxCUWf1A
+qJrMzHusZpFexwKI3CyloTXeyN0TKQyZCeQ2vOlUcuBCEE6iDk963yhtC4FtbZ76
+7Ijr/d3LRI8nO92EtIUiFjUlmcvV/mr+yt9QJy22dUMXdNq1KVQyIqvTi+P9yUVh
+zYnI8rUBfNuoDruig4duX4FIlj1of+bJ04otdF2I9sSWvu59Nsf2053duZ5qQ14b
+Z7Ci6TTd2vxXgoAGuZsyVPa3bQ9PwUv8/9csH8DbGC8L6rDgzTk4n+hALcuEZ40O
+wlijt1wcaLO9zlYigzzQ89i/3AfTH5bZXx0Rq+kybFREgDdszbs67JUVs8QU86J7
+lK5fe0WPjna6ykeGBPphQZ0kQLAV0PNrcg35SLDeS20QrO9kwEA=
+=zusY
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 42d3123e39e4..1f52a71af157 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Nov 2022 12:09:43 +0000
+Tue, 15 Nov 2022 18:09:45 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 1ce80cf9ef3b..a0385776dc82 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Tue Nov 15 12:09:42 PM UTC 2022
+Tue Nov 15 06:09:45 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 3cb35287dcdb..36cabbd57b61 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Nov 2022 12:15:01 +0000
+Tue, 15 Nov 2022 18:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index ce05cb6f0655..6dee74fab4dd 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-db258530f2f6e5b7c0a06bc14210a98472ad43fa 1668509845 2022-11-15T10:57:25+00:00
+8b2209a98a005db9ddb13fd601ff85128729fd8c 1668535414 2022-11-15T18:03:34+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 1f1c36fddde0..831fe9a3fffc 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1668514201 Tue 15 Nov 2022 12:10:01 PM UTC
+1668535801 Tue 15 Nov 2022 06:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index e465fecdc325..1f52a71af157 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Tue, 15 Nov 2022 12:09:42 +0000
+Tue, 15 Nov 2022 18:09:45 +0000
diff --git a/net-libs/Manifest.gz b/net-libs/Manifest.gz
index 688b5c1360b8..8a01766f4dfb 100644
--- a/net-libs/Manifest.gz
+++ b/net-libs/Manifest.gz
diff --git a/net-libs/ngtcp2/Manifest b/net-libs/ngtcp2/Manifest
index 5e1480ac69a5..a5fdab972ab1 100644
--- a/net-libs/ngtcp2/Manifest
+++ b/net-libs/ngtcp2/Manifest
@@ -1,4 +1,6 @@
 DIST ngtcp2-0.10.0.tar.xz 582248 BLAKE2B 11c7153742657afc2df3b339e95e66e1ebc657ac251e6f1c742fb091277a4f3364e57322994f7a947e97cb0fdaa786fb48635e35b33346f1c04ef3f73d9a8128 SHA512 40ace3188ad53293df80a0f3fb144ced21897089026a18f90f45fe2aaa0d0f18ad184666a08d96263942573ed96ffa65b5f1837a008bd348a9c68c82e7508310
+DIST ngtcp2-0.11.0.tar.xz 583024 BLAKE2B 761f248a4f5e12f75d018f5285b894d8294edf102547306cb44498f97533b3e8929192c6c3a36671a4543536881b1471dd788aafe976da2efce191901af14923 SHA512 f652cb0189c485d3d007dda93f8441ea6d9a4f95d658ab763bd6d3e2e46985c0800e7fc3291c6fb4e07a0e5e0d4117d19631214a53f687f40913485182202057
 EBUILD ngtcp2-0.10.0.ebuild 1146 BLAKE2B 62bcad714d1c03ed2da4db9ade795ad571d42a1144038dcec2c4fdfdc1108d1167d6a68ac26b3d864583dd2f346d71644d14d93c53e07f04b10023fb88f3babd SHA512 51662787f1b891fc09e3c100fd388940dd10e1984ca117bac8e646f7a071fa169fbf3aa2abce41dbcf969c151ae6e31d530ca6d674ad647c54d1bd9835aa1433
-EBUILD ngtcp2-9999.ebuild 1139 BLAKE2B f8737a2707633e3d2cfd9f56b35a75067cf2ce902ce334204af5cceb869c98dee1ba852bb78ed4e1cb43955cc7a924baaed37dd54e16036910a4ae269bb544f8 SHA512 f4ac8703767231799f9b0dd7c03fe29c313a8a1b43c8b877e49e0080b08098dca222485401379f608cf308fd22b8c5f828a651e83da7ad4923e2de32593f69e0
+EBUILD ngtcp2-0.11.0.ebuild 1146 BLAKE2B 62bcad714d1c03ed2da4db9ade795ad571d42a1144038dcec2c4fdfdc1108d1167d6a68ac26b3d864583dd2f346d71644d14d93c53e07f04b10023fb88f3babd SHA512 51662787f1b891fc09e3c100fd388940dd10e1984ca117bac8e646f7a071fa169fbf3aa2abce41dbcf969c151ae6e31d530ca6d674ad647c54d1bd9835aa1433
+EBUILD ngtcp2-9999.ebuild 1146 BLAKE2B 62bcad714d1c03ed2da4db9ade795ad571d42a1144038dcec2c4fdfdc1108d1167d6a68ac26b3d864583dd2f346d71644d14d93c53e07f04b10023fb88f3babd SHA512 51662787f1b891fc09e3c100fd388940dd10e1984ca117bac8e646f7a071fa169fbf3aa2abce41dbcf969c151ae6e31d530ca6d674ad647c54d1bd9835aa1433
 MISC metadata.xml 445 BLAKE2B d27a34331ff5bd772b6228ff26ca20440a3bf932ccc88720a33409f329d41165d5fad6750221bae1fed3386d6e8244458c1c5073df8b36251156598e599bb15e SHA512 c09f5ac61f3c3b16bda0f12c2f31188aaaba469fbfde31e71d4f9834609b4c8d0cb7152a688934ba0b90c491da4e8b707e6ad5e54d5965b4109cbdc29ee0a4a2
diff --git a/net-libs/ngtcp2/ngtcp2-0.11.0.ebuild b/net-libs/ngtcp2/ngtcp2-0.11.0.ebuild
new file mode 100644
index 000000000000..707656ab86a7
--- /dev/null
+++ b/net-libs/ngtcp2/ngtcp2-0.11.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake-multilib
+
+if [[ ${PV} == 9999 ]] ; then
+	EGIT_REPO_URI="https://github.com/ngtcp2/ngtcp2.git"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~hppa ~riscv"
+fi
+
+DESCRIPTION="Implementation of the IETF QUIC Protocol"
+HOMEPAGE="https://github.com/ngtcp2/ngtcp2/"
+
+LICENSE="MIT"
+SLOT="0/0"
+IUSE="+gnutls openssl +ssl test"
+REQUIRED_USE="ssl? ( || ( gnutls openssl ) )"
+
+BDEPEND="virtual/pkgconfig"
+RDEPEND="
+	ssl? (
+		gnutls? ( >=net-libs/gnutls-3.7.2:0= )
+		openssl? (
+			>=dev-libs/openssl-1.1.1:0=
+		)
+	)"
+DEPEND="${RDEPEND}
+	test? ( >=dev-util/cunit-2.1[${MULTILIB_USEDEP}] )"
+RESTRICT="!test? ( test )"
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_OPENSSL=$(usex openssl)
+		-DENABLE_BORINGSSL=OFF
+		-DENABLE_PICOTLS=OFF
+		-DENABLE_WOLFSSL=OFF
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libev=ON
+		-DCMAKE_DISABLE_FIND_PACKAGE_Libnghttp3=ON
+	)
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build check
+}
diff --git a/net-libs/ngtcp2/ngtcp2-9999.ebuild b/net-libs/ngtcp2/ngtcp2-9999.ebuild
index 24ec2747596c..707656ab86a7 100644
--- a/net-libs/ngtcp2/ngtcp2-9999.ebuild
+++ b/net-libs/ngtcp2/ngtcp2-9999.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == 9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/ngtcp2/ngtcp2/releases/download/v${PV}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~hppa"
+	KEYWORDS="~amd64 ~hppa ~riscv"
 fi
 
 DESCRIPTION="Implementation of the IETF QUIC Protocol"
diff --git a/net-voip/Manifest.gz b/net-voip/Manifest.gz
index 3bb6cf2916b3..030078575732 100644
--- a/net-voip/Manifest.gz
+++ b/net-voip/Manifest.gz
diff --git a/net-voip/mumble/Manifest b/net-voip/mumble/Manifest
index 133fa06a498a..dbde3afd3320 100644
--- a/net-voip/mumble/Manifest
+++ b/net-voip/mumble/Manifest
@@ -7,5 +7,5 @@ DIST mumble-1.4.287.tar.gz 9457292 BLAKE2B 5fc89c184aa54ab8269870fd87b6c9ce271d7
 EBUILD mumble-1.3.4-r1.ebuild 3918 BLAKE2B 72a351f43bb49953dfb6c734de77dcd63be900fc806db30d411faae1077ca116b69a38364ca5d9f241bc070f12add5e40d6f4fbf4b9b80a265c7543fc21db44d SHA512 ee1c02a0dc5180112cc17efc826b56a635f7c5dbd476d417d2db155456ee6ebca283a55b168f46f2fd8f28d91e1e62e2e51bf0e040bc84d257c7384bcbeb896b
 EBUILD mumble-1.4.274-r1.ebuild 3958 BLAKE2B d47edfb82534b71c5db12071094730d5cd556540f32e11094b8b269e701fe8bd9b120d68cfffd05a67865543724bc0f94c65e53e554ee26d1299f82a974104fe SHA512 0250ff63bf995dc2a9783676092233a911d950be01d2e18c784bed8bda6a7284f4e2f55a9a7393d56f3f4bc686f81f6416c901e2458dae2954dbbbdec2ae245b
 EBUILD mumble-1.4.287.ebuild 3956 BLAKE2B 0ec9f3e8408b4b49ed3763bfb054a54dce33bb776ba304a80ac84ffbd2acaa9b20d889be4082891e1f99e0e64541367e04d8a8bf02711f536a7723c8f617a82e SHA512 351084c486853ad6e50b9775ea7ec6f0d33b1944869b286e90d3bcfb6cef92e84e75de8a7a6913dcd34981f70b87552b5b4aa41ec81e9ddeaabbe87d1fd07291
-EBUILD mumble-9999.ebuild 3739 BLAKE2B 43563be7a8e6b6cda4eb9fb8377ba9fa4b9b85a3c2c9e3d8e2008f414bce4f5f2883fc1f1c290e87d68a2cabc3dbf6221e049ed9cca6e72bbfb31f8396de794e SHA512 8e173e688d5d79d693390d3a770a57dd8ca2c4065c16189781d57712bc985da88f5d29999f035673a2d1b01b5df93b8c18e948f797461e778bbea9165114d201
+EBUILD mumble-9999.ebuild 4167 BLAKE2B 0c4233420ebcf7e29c2bcc8ef113d1aa62be990886089e8661bb657aa0f6315f51c529f7a2959e122267b40d33c7aeda5cd6cb822b8956b6864621080bb513e2 SHA512 9d23fdd7464a93ce088e00f46685469f90cb8ea87241dde7b754e4fc996fb283284dc97e957ac06e58581595dd22bb69a39b2297c586d4143ca59d75d9381f53
 MISC metadata.xml 729 BLAKE2B ebf94a9bcca010e62e9ad649805b25057cf9f18ce6d2e99f643b8d76ba97048d6dc68bc52358158c8eb208dcb0acc5c42c8267036d45a8c28bff2223afb3d9a5 SHA512 390ec775dfa1cf3106640fcac4f8fe57387586c98c1616dca6cc1d33a01ae4631e4263791f438116b4d2c0bbd605182da2d16d81dbc452ea4eb28645c0f35513
diff --git a/net-voip/mumble/mumble-9999.ebuild b/net-voip/mumble/mumble-9999.ebuild
index 4d6f06e23171..c6f9fc3576ea 100644
--- a/net-voip/mumble/mumble-9999.ebuild
+++ b/net-voip/mumble/mumble-9999.ebuild
@@ -11,7 +11,20 @@ HOMEPAGE="https://wiki.mumble.info"
 if [[ "${PV}" == 9999 ]] ; then
 	inherit git-r3
 	EGIT_REPO_URI="https://github.com/mumble-voip/mumble.git"
-	EGIT_SUBMODULES=( '-*' celt-0.7.0-src celt-0.11.0-src themes/Mumble 3rdparty/rnnoise-src 3rdparty/FindPythonInterpreter 3rdparty/tracy 3rdparty/gsl )
+
+	# needed for the included 3rdparty license script,
+	# even if these components may not be compiled in
+	EGIT_SUBMODULES=(
+		'-*'
+		themes/Mumble
+		3rdparty/FindPythonInterpreter
+		3rdparty/gsl
+		3rdparty/minhook
+		3rdparty/rnnoise-src
+		3rdparty/speexdsp
+		3rdparty/tracy
+		opus
+	)
 else
 	if [[ "${PV}" == *_pre* ]] ; then
 		SRC_URI="https://dev.gentoo.org/~concord/distfiles/${P}.tar.xz"
@@ -85,7 +98,6 @@ src_configure() {
 
 	local mycmakeargs=(
 		-Dalsa="$(usex alsa)"
-		-Dbundled-celt="ON"
 		-Dbundled-json="OFF"
 		-Dbundled-opus="OFF"
 		-Dbundled-speex="OFF"
@@ -112,6 +124,11 @@ src_configure() {
 		mycmakeargs+=( -DBUILD_NUMBER="$(ver_cut 3)" )
 	fi
 
+	# https://bugs.gentoo.org/879569
+	# convert absolute install paths to relative paths to satisfy path assertions
+	mycmakeargs+=( -DCMAKE_INSTALL_MANDIR="$(realpath --relative-to="${S}" "${ED}"/usr/share/man)" )
+	mycmakeargs+=( -DCMAKE_INSTALL_DOCDIR="$(realpath --relative-to="${S}" "${ED}"/usr/share/doc/"${PF}")" )
+
 	# https://bugs.gentoo.org/832978
 	# fix tests (and possibly runtime issues) on arches with unsigned chars
 	append-cxxflags -fsigned-char
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 883744b8385f..f99fbb3a3ae0 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/package.mask b/profiles/package.mask
index 69cb48ff0b64..8d38e08f537b 100644
--- a/profiles/package.mask
+++ b/profiles/package.mask
@@ -33,6 +33,12 @@
 
 #--- END OF EXAMPLES ---
 
+# Michał Górny <mgorny@gentoo.org> (2022-11-15)
+# Test-restricted since its introduction in 2016.  Not receiving package
+# maintainer's attention.  No revdeps left.
+# Removal on 2022-12-15.  Bug #759931.
+dev-python/pytest-html
+
 # Matt Turner <mattst88@gentoo.org> (2022-11-14)
 # Unmaintained in Gentoo since at least the transition to git. Last release in
 # 2014. Depends on x11-libs/gtk+:2 and gnome-base/gconf. Fails to build with
@@ -184,13 +190,6 @@ dev-libs/cloog
 # Removal in 30 days
 dev-python/pweave
 
-# Michał Górny <mgorny@gentoo.org> (2022-10-28)
-# Originally last rited in Aug 2020 due to lack of Python 3 support.
-# The last rites were undone, however this package never got fixed.
-# Instead, it has been covered by incorrect "downgrade" mask since then.
-# Removal on 2022-11-11.  Bug #695010.
-app-i18n/scim-sunpinyin
-
 # Jonas Stein <jstein@gentoo.org> (2022-10-26)
 # Dead upstream, open bugs.
 # Removal after 2022-12-24.  Bug #878337.
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index ec9e6834867d..d769a3d97a14 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -762,7 +762,6 @@ app-i18n/rime-data:extra - Install extra packages
 app-i18n/scim:gtk3 - Enable support for x11-libs/gtk+:3
 app-i18n/scim-anthy:gtk3 - Enable support for x11-libs/gtk+:3
 app-i18n/scim-anthy:kasumi - Use Anthy dictionary maintenance tool (app-dicts/kasumi)
-app-i18n/scim-sunpinyin:gtk3 - Enable support for x11-libs/gtk+:3
 app-i18n/tomoe:hyperestraier - Enable support for app-text/hyperestraier
 app-i18n/uim:anthy - Enable support for app-i18n/anthy
 app-i18n/uim:eb - Enable support for dev-libs/eb
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index 1880902cbfda..95a9653ce79a 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
new file mode 100644
index 000000000000..aa916786ee0a
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -0,0 +1,5 @@
+DIST openpgp-keys-apache-tomcat-10.1.2-KEYS.asc 29066 BLAKE2B 72cc4f65649cf9b0118936d3af7d122833aa3a8f55c13457e1656acaf0c0081fc0e2a276891ce7701cb672b69497dfe9bf21a39b08319d896c138abcd6c50afc SHA512 ced5f5251dfda8b5accd3278ff54df8038bdf1c2dc7a07abd2c2366167d9bc5788e26d2a8036649b9a6498d2c0008af4829103724e76a6cfd29b262a70037444
+DIST openpgp-keys-apache-tomcat-9.0.69-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
+EBUILD openpgp-keys-apache-tomcat-10.1.2.ebuild 566 BLAKE2B c40eb0bb820fd693c516bcf3fac70cbaefe797f81aa2ead058b7a7a997464bb7b59ae237db16d694673c3b874c3c7f3c572d1d9a4328d537f54251344f9ee00e SHA512 8b86c98c6382bed4f77284c7d730489996773fccb644f33017e386643577d6d7c13179dabdeca0a2a192b8a1b7e1fd05dcc9d8728235d956cb7ab9048d02b164
+EBUILD openpgp-keys-apache-tomcat-9.0.69.ebuild 566 BLAKE2B c40eb0bb820fd693c516bcf3fac70cbaefe797f81aa2ead058b7a7a997464bb7b59ae237db16d694673c3b874c3c7f3c572d1d9a4328d537f54251344f9ee00e SHA512 8b86c98c6382bed4f77284c7d730489996773fccb644f33017e386643577d6d7c13179dabdeca0a2a192b8a1b7e1fd05dcc9d8728235d956cb7ab9048d02b164
+MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/sec-keys/openpgp-keys-apache-tomcat/metadata.xml b/sec-keys/openpgp-keys-apache-tomcat/metadata.xml
new file mode 100644
index 000000000000..4221e170cbc0
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/metadata.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
+<pkgmetadata>
+	<maintainer type="project">
+		<email>java@gentoo.org</email>
+		<name>Java</name>
+	</maintainer>
+</pkgmetadata>
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.2.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.2.ebuild
new file mode 100644
index 000000000000..14300fd78599
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.69.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.69.ebuild
new file mode 100644
index 000000000000..14300fd78599
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.69.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 1c6b78ef776a..3ff0bc89c10c 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/glibc/Manifest b/sys-libs/glibc/Manifest
index d4b9d8e9b4ae..81d0baf06c3d 100644
--- a/sys-libs/glibc/Manifest
+++ b/sys-libs/glibc/Manifest
@@ -45,8 +45,8 @@ EBUILD glibc-2.32-r8.ebuild 44857 BLAKE2B d41468b9ca278945dc54ccc9b9ba7f61ac2d3d
 EBUILD glibc-2.33-r14.ebuild 48617 BLAKE2B bd3d13ab2419162e08cb204e279b1d570d5e6239bf860188e9ce5c4167efb3637e1292e31df94b1118254157ba2f05017758fbf577575954b75ec9ac53cfeac0 SHA512 b14238e6f88010570c3d4de6d2672bc4ba5c66f5c59a5a03e0ac0a827893f781d1a02c720c80755dd9dcae3958575f74c3a36f676b96371754986e1327e918b9
 EBUILD glibc-2.34-r14.ebuild 49608 BLAKE2B 387023eb99a184e90ae50a09375e9858307f458c4d48b487d50d83bbe571b0b186eeea1ce8a71bc1f243e4220b04eaf7426b75182157655fe44d31bbb60b4e6d SHA512 578c2f6599045b34410dc0905e35263325bb28fd73b6f5c8d487b432e966088b189e24fd16a1055efdf93128c5343db88b1adc514659f878aaefe2426ced56dc
 EBUILD glibc-2.35-r10.ebuild 50157 BLAKE2B dc920c979618e1d30028afffc2b0c895bcdcdbc039e6674557aaea875744fa954c34e13f04925e95449683d64bd476879ed6674ce8b6cd5797d5131d57b8b3fb SHA512 c748dff0ffdeaecdabc37c60422f1c01d7a9d893f260c0d72806df251e0036e74f60c9e8d88273d1e9afd00efc4637db7a31c96ca43228a99723cf48afc4d372
-EBUILD glibc-2.35-r11.ebuild 50157 BLAKE2B 4931436cde786568cf681c394c066438837d0a30391b21a1be5cfb92830f0fb812d73b9ba41af185aecb7d5a4acefa4cf3ae1a721fec2ee4b6fb1fd5442b0715 SHA512 0668b0b1ea339afb266b07124b51265c7c5ae100639ca420c0134d52dddb61f77d6dddb112b6c6db9abaaec2c9e2d62bcd80f8a00c1f76dc3a2c2c2b430634a7
+EBUILD glibc-2.35-r11.ebuild 50156 BLAKE2B 52b822a76cc00c4ad29d760a42daaed4b0eeccadff20d907a8d8f8e38f2ce90e4c408d43101fa76c299c411195ce7cab5dfc7b6b92f929eecc55c3588468e4bb SHA512 87b745251859541714a5b5a5473a877ad40f1cb6e1503aecf664d89ff53be4f6eb5709ea80c61335a7afad76c88fb9ebc87489a9419b32f48c00b68404d9d7c4
 EBUILD glibc-2.35-r8.ebuild 49639 BLAKE2B 4cc331274b2b17b57e594a42e73ddbdd1691077e9568b32490852bf10a39788cda466a6fdb64e07890ff5d0291a6f7841e0f5ff2724fbc6d77d2e8c5bb86fd89 SHA512 dda73c9736d0d35f50db6f03c35de07a70fae4ae6cfb232e78f87c22247e67c916748080cdfd3f2117ef8b324938ddffaf7484c6a54ba06e00e157225bfa72e0
-EBUILD glibc-2.36-r5.ebuild 50757 BLAKE2B d18eabc92ab2f38d0f0c08993907185f5a434fa7f679e32e8f49a09c629c88ea8aa6ca869375ec6e26be0da90972703e2043a3ec73cde33099f9c76cfa7b5a06 SHA512 485d22b7bce7b5271f7625bf5e30474de94800703c7bb2e76f5d5107843c288bac72ef7a6b082074d83193db4b45174b29051b28b4d7f67a2e46322b8cd65e79
+EBUILD glibc-2.36-r5.ebuild 50756 BLAKE2B 93f4e22a4aa81643f349b108a0dc9a13f3761d5d7771507e55aede48a23f06b149223b850464c4acb81a0d1a93b39e13ac7e8ad5b55e23bcd81416a0b51d00f0 SHA512 f9d8e06965c43def476fc373cc9a420c9bc111b6ec5ca190fb29dbaf06fce5a1190b28948213a5c9f688aebe19fecc403d2dfb5a64559bf3e77e69b18eca51ad
 EBUILD glibc-9999.ebuild 50758 BLAKE2B 6d0615192be2ab9183a966cca3aabbb4969e9362125aa69f3e4ebde9d5e5c942ac8b5faa8b7bae96ac24e4eeb1400bffd66771343983c929df8f337dcb24e3a5 SHA512 3ca0d9b4a2887ca81477d67250f9d8a07d837cfe5fe653d2a122678179c7f1081c885be4a254602ef74999f19a7ff486febc40ce1ba52b2dcec69ca69726c02d
 MISC metadata.xml 2072 BLAKE2B 441d10ce8368fa7b569ab9f29a2936ffd024534841bff3596f2dca05a5413e408a9ee6109fbc0fc6cb5d254b802b85241ff2f94da1f6d5dcb63b224930933e89 SHA512 26c8e9535e5c08ba86078084f25b6e4d3973ba1e004fb2bd3552c76deb383f53ad5fdb40ca071819be56d6fc3f7d5ef2ab6a76861fa7f94428ed06d681073985
diff --git a/sys-libs/glibc/glibc-2.35-r11.ebuild b/sys-libs/glibc/glibc-2.35-r11.ebuild
index 9374d5cf5d9b..30f64b22a1ec 100644
--- a/sys-libs/glibc/glibc-2.35-r11.ebuild
+++ b/sys-libs/glibc/glibc-2.35-r11.ebuild
@@ -26,7 +26,7 @@ PATCH_DEV=dilfridge
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 	SRC_URI+=" experimental-loong? ( https://dev.gentoo.org/~xen0n/distfiles/glibc-2.35-loongarch-patches-20220522.tar.xz )"
diff --git a/sys-libs/glibc/glibc-2.36-r5.ebuild b/sys-libs/glibc/glibc-2.36-r5.ebuild
index d29bb087218f..4b15f9e9f9c2 100644
--- a/sys-libs/glibc/glibc-2.36-r5.ebuild
+++ b/sys-libs/glibc/glibc-2.36-r5.ebuild
@@ -26,7 +26,7 @@ PATCH_DEV=dilfridge
 if [[ ${PV} == 9999* ]]; then
 	inherit git-r3
 else
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
 	SRC_URI="mirror://gnu/glibc/${P}.tar.xz"
 	SRC_URI+=" https://dev.gentoo.org/~${PATCH_DEV}/distfiles/${P}-patches-${PATCH_VER}.tar.xz"
 fi
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index 8e58e4540818..75cc4d73d3fa 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/prowlarr/Manifest b/www-apps/prowlarr/Manifest
index 440507964d9a..929497156911 100644
--- a/www-apps/prowlarr/Manifest
+++ b/www-apps/prowlarr/Manifest
@@ -1,8 +1,8 @@
 AUX prowlarr.init 139 BLAKE2B 5d2e870b142fd95c42459d5fbce0370a222c64385eb30d7642a1b9b42e76ba8ee3b6d4577e4fad1d6c27ac0018e966f8846fe3dd5451e67c2d42ed65e6ba551f SHA512 b32cadf3ee9ce142cb48c01cbc576dc8a56a03b55fe9e371cd4205a9c927001a988621827dad02618b1bd95cb44ace3fb90974340e8ce5d9f553c4be1ac8ba5e
 AUX prowlarr.logrotate 88 BLAKE2B c5480a0b3f2f21aeb7632c6f7bd6fd95aab8c4fde55447281939f1e1fc67bc4786b64db74f56682af5705b1654eb4a1bdb3f62300001b46eb92536f62502c15e SHA512 fbf91e62a30a929bf6b8b24a2708ef7eaaee7e42e83247f2f2af88a6d6f83571aabf7e9e8fc14253cf5b0efd4271f34ce143e24bd92c67674eba279e332e3ba1
 AUX prowlarr.service 558 BLAKE2B 8bb379f30a93ce537016133627e54cf5d71b666f31db50c29659d0e44fc0df54374fce23cf1e2d20f59e19b9cfaab66253c79df718e86b402c0572ac781e1f58 SHA512 0cb3461a5160da1a617691040c7d6378e5d89f5809a12faa8cb182c8180bceb7a459d3d881cd3a96eee4928eac410533876b90c90d3d62dcde12ba2f0b9f328b
-DIST Prowlarr.develop.0.4.8.2072.linux-core-arm.tar.gz 86081312 BLAKE2B 86bf7aeca34c6f4fd1c9470cade25e934ed90854303145f5669d4392e290e95d06c09177a6033f24f2c011a3e917f79799f8e0f52d77913183f13115565a1f95 SHA512 b4bf98e994280119398f39e096d2012b3e83fe52596257e72bb78381d8d082d966a8dc06b11b15269045cf9ae06f45c65837c1125e83738199e7ec7ab034cce7
-DIST Prowlarr.develop.0.4.8.2072.linux-core-arm64.tar.gz 85356669 BLAKE2B 38d7bf112d7d7a71249c338893d7fb03d3263445e86a4281f4de41a56684b4370263812507c6599a05cdbc5d8a97976b0e9b6c27938c1463a874f556a3f02743 SHA512 3160f466f9b2936ccab67fe3d8afbb99bce8a46693740cd217170e622f985fd35a771795ece9692465e53609bf1149ff1efe5c5a73f372122ac352d9540e2692
-DIST Prowlarr.develop.0.4.8.2072.linux-core-x64.tar.gz 90362722 BLAKE2B 3587325cd84a51b0683b0088203f0d5997e38be7f5a8f53461ccf89742d9e432b344a8ba2c4b3330825daf26e068ae889c72c730981b6e271564761580992536 SHA512 2d1aad2a02b1208baf3cef62e76a4bc29314f2fd86aba4082a029bebb70f2e8d9830c61b417d69ef685248235a9976205a840b676293454ec59b4f1382be2867
-EBUILD prowlarr-0.4.8.2072.ebuild 1463 BLAKE2B 2c888f1c7d073dfcf039a4097f74b046e6458ba626c8ddeecb867f26714f6000aea338a1c65f94f9012b303b55e55258df8352798bb2b18edfe10236b5449311 SHA512 f2f668f0ae3c3f8a30b0a6647ae065dbfae4d96cf7d6c1a266fb1e30e0f9af51ff0616144bd0cd27993d29da23e3a6a28c336aa0b0067b91fc2a6519d942ea66
+DIST Prowlarr.develop.0.4.9.2083.linux-core-arm.tar.gz 86080449 BLAKE2B 285c7480799759a0153bdfbde163874a0ab52a6384bdc20efe5ffbdf38cff656698cfb8dbe79c728ba13115fca99e7a75400ca96636437dbd1dea54ae13ee8a2 SHA512 4f9a50ee9a3a8b9b47c9805849a39fba213e9a5a6dc48936f19c8a3fec1791988b6bde4987781f62942288a4244d7b7a79630c0d13c7d008782a9be6d4c2973b
+DIST Prowlarr.develop.0.4.9.2083.linux-core-arm64.tar.gz 85362882 BLAKE2B db630ec1f7e6dec459cc5998ce55e9c30251072d77a6ca0ab4bea9af7f72612ed64b346048d41dc446411b5a11d9b7536363ca74d5eee1f4924e68650c4dccef SHA512 a084798a712e529e7b73ffd711d606a6def245a94dd806126fa05f37a5fbf8c25e863213474bf5c29a5a974b917a85b95183ccdb9bf89e817aec7cdb1dd902bb
+DIST Prowlarr.develop.0.4.9.2083.linux-core-x64.tar.gz 90354182 BLAKE2B 1c156ec4f81e3c6fa6cd6420e4ba94e83d6954e5e8f3ca51d6891028654f61cc7177cfe4eb385f939b0029b6cf8cca5dcc54ece3a1259ce91bd718814efbc260 SHA512 2d07da944b832eaf40efe2f6bb613b7bba3f43b2eb1fcc862b032b76b031959ccf6a8a992ef0696e2e648211327ff7ac8363eb5ec85451fbafaa8e6479ceed4a
+EBUILD prowlarr-0.4.9.2083.ebuild 1463 BLAKE2B 2c888f1c7d073dfcf039a4097f74b046e6458ba626c8ddeecb867f26714f6000aea338a1c65f94f9012b303b55e55258df8352798bb2b18edfe10236b5449311 SHA512 f2f668f0ae3c3f8a30b0a6647ae065dbfae4d96cf7d6c1a266fb1e30e0f9af51ff0616144bd0cd27993d29da23e3a6a28c336aa0b0067b91fc2a6519d942ea66
 MISC metadata.xml 707 BLAKE2B e235e7acd37580d513d82833ec45707d5a2074c77b31aaea4bb79ccebbe378938ca6eb88d2c2afe351f16afc29192b359558130edf249a9089f5bc9008969c56 SHA512 1531f1097c7c7b375a210caa2202dd4d3ca2c611d6c28bb357e0eeb6a1fdd9efcea157c12fe07a633e64475a590edc389a34e0cca1ca8e7e438f47c4793b260a
diff --git a/www-apps/prowlarr/prowlarr-0.4.8.2072.ebuild b/www-apps/prowlarr/prowlarr-0.4.9.2083.ebuild
index b19e1af8dd7d..b19e1af8dd7d 100644
--- a/www-apps/prowlarr/prowlarr-0.4.8.2072.ebuild
+++ b/www-apps/prowlarr/prowlarr-0.4.9.2083.ebuild
diff --git a/www-client/Manifest.gz b/www-client/Manifest.gz
index 796d51c6df7a..c1d9cf9077fd 100644
--- a/www-client/Manifest.gz
+++ b/www-client/Manifest.gz
diff --git a/www-client/firefox/Manifest b/www-client/firefox/Manifest
index 5e5bbca73840..25c6bf1f8074 100644
--- a/www-client/firefox/Manifest
+++ b/www-client/firefox/Manifest
@@ -105,6 +105,104 @@ DIST firefox-102.4.0esr-xh.xpi 427181 BLAKE2B 5f1966e0dbd2aa3813166dc850f177934a
 DIST firefox-102.4.0esr-zh-CN.xpi 589096 BLAKE2B ba7ec34f1f70fbc2800821ef4cd55bdae4544fdd71ba180907cccc68e1df773b1e4a681c67bf9a018eec4f9012c6750df829c81e4cc80f3a32ae1bd480304240 SHA512 85e624355363f9d2e5717723da6aeb920342c551f3448f1581c9ecafd7dcf06a7188176a73ab39faa54c4b856ea3d0a98438111e1211abc7af72fe5fe4470530
 DIST firefox-102.4.0esr-zh-TW.xpi 590475 BLAKE2B ca73c38446e2fc3daf4f5e7a4e27cca153f0df38ca83e9368a71e108820709ce588593e3562941d310224bce606da77682afee90829bbb4feb34d64ca595ef85 SHA512 94bac8f5b13099eef8570f1e9a7dc0509886aae3e3c1b952f970cf1adf99062405ea504e1417e3e54b92a551bfdb666274ad47c9fd08d2a72fa6f6579fb2b3a3
 DIST firefox-102.4.0esr.source.tar.xz 482118312 BLAKE2B dadb293edf4df20da5345aab6845ca9da8143a966b38d3660ea8ebc4f24ecab72097ba4345d30895907c83895883379867437f8097b86af4e7e0e691da551793 SHA512 30d9e6ef04fd86516e2cea3c797ec99af4c96b08576bb3409c0026da4fd1218167f89a007109e1fa4e2571f98f2dbe5ab58a26473533d45301f75b90ec3dbf28
+DIST firefox-102.5.0esr-ach.xpi 453457 BLAKE2B 106fa0802d4951f48de6f1a367cfe101a3f7fb78eade9c7f408cac1f650babc9d7410314019b33aa1c8cba2316700e849bff1c00242c22874ba585a39631e9ad SHA512 6c69a3ba9632b10c9ad1e45a00b5c9a91d9f4341486bdc20ebf473ba87791eadd3323e5764f9b74bf4c826f5dd5fe4e769175fd7c1486cf341f54ec61116ed3b
+DIST firefox-102.5.0esr-af.xpi 418244 BLAKE2B 3d42b1c96e183752baaa09f90226688b4343dea2a5d0f0687cd60316bc8e561d212bbeb05b0f45c8f973a0948d443646231abd5b89bae096af74facef27c7ba9 SHA512 f2d52b89eb19d9c03d92a6cfee0e392d9b50ca1fd0368b1f86842b64f2713fab143d454d322f2dcc52f349df91589058f76ab8dbfae317f1597ecc0a5d69de30
+DIST firefox-102.5.0esr-an.xpi 498407 BLAKE2B 801bcb466d00d5306fd048f4e4574dc60a54afb008e87105312328328198336ce325ded5513270e0d5ec81e5d4a8d0068c4b860cec236bc58fad6bc106e120fc SHA512 8b866c8c2dc45a494f46e6d61024dac55def58ad1470f0acad750aab2da9f64e5a3bea24daef8f54228a4967f83c444287bc1f3ca4c23aee689bc8b40781ed85
+DIST firefox-102.5.0esr-ar.xpi 563025 BLAKE2B e0e10bf881bd2c68ebe0742334599e8a94d45b59ba2f8806471e2d50c78c384276871dd0e3f487b631270f5d1d89675428e9fb4afdb8043788e1403132488f99 SHA512 a550a497dad738dc4ade42b72ba4f2823f7fae47e4805680ccd723a4cd5df6897ab45de44524ebcd73b4bc823c9c779a7ad81c8d39508a157119ab60d5d76ed4
+DIST firefox-102.5.0esr-ast.xpi 493501 BLAKE2B dca4c240ea7df846d0c8bee90dd9f3c3d7ce88f6b7a121a5ce95864d670c74aee1c04bd2fe3e81835dd8815d5761c3096259714fee7789d5dc8f3e08915c17e7 SHA512 08de506e490fcacd32e690799eae5ddce94239c7ee16cdf4631995f26ed4afe4bfc20f5349ed5d47e25d3a943c38a4bf43cf1dff7fe15ac8d2fcdb8c62ff6a93
+DIST firefox-102.5.0esr-az.xpi 485921 BLAKE2B a52532de81d8fcb0f593dd0b8fcb189b6b6d3c56d83c50ba2ccefbbc174d267c71996a191e8cf62f50dee7421695b6b79267a8f629e63e979fa812ddf1e21e16 SHA512 ee1ba86aa69793b97ff21d1ae4dedd50a7ef527f67db9ceb9955349367e855683dfbeb8b1c45a3560184132951cb8bf4dbb57f705466eb47c0b254abf6cdf085
+DIST firefox-102.5.0esr-be.xpi 638903 BLAKE2B f9a4923fc0f5ea62d720a8c4429dff425e1da114497442200e7458790b59caa8f0aff57b25f2fe12c94427866cbb8f86bbad2cbabc4ae9a5984efcf6048bcf27 SHA512 4232776d98d9e635b019e52f8147616fb7263b07657eda35d5c9070add728dec2f1de8c2cb29b80c73f2a220310812fc816a6464d6351ac46b6fd3ff3dd80aa2
+DIST firefox-102.5.0esr-bg.xpi 578855 BLAKE2B c00ea96984b9a9f34d209c9c1f6f7e2c8db90420e7ab956515ebc4631900137a7479adf8b3346c6c44f5405003142cdd2e3f00d68241acb25deee83b192d1dca SHA512 99c9b16110b5e309c35710a4264a7bf0521f2d10d2b955def2a673c2dfdbc906800eec75545dca3d89e89ca5c8800fd00db8b76aadefa821b282d74c145341cf
+DIST firefox-102.5.0esr-bn.xpi 576723 BLAKE2B 985923081414fe924fc0658e49e4a0de473618fc59177036f72cedea3bab72352244ec47b87baca5d936059dee6e01eee19eac9a15c5e32ef49749dbeb5f4803 SHA512 e8a954f74d9066057961242d86270fc0fa834e5db9637fda2e60055b6a8325245bea80639627bc11cebae3deac6a4e7234382673e3311fd8b54e4c9c682c89fc
+DIST firefox-102.5.0esr-br.xpi 531023 BLAKE2B f7aa266da79b0c526014fd84fb2f1f33b54106560215847826c2b38602ad66c7aec89f7bbce6f6ceb6d4c4ccdb1a01536c969e7360a2982d1bb0b8e246ce3048 SHA512 f3f30caf5a628d8136e22aa9ccae5ae77c902a845325f906c0cc18f2296d06436116b821636592ad89cc60b3f33194262898e09586601f4a5c613d706c32d79f
+DIST firefox-102.5.0esr-bs.xpi 462130 BLAKE2B 87d6dd7ed7aa4794df62efbd8b0a2bc6dc502394c42eb2469eedcb003209ef25754a91ed34f2366202ad58d1f2d491e6ae68411e0307534d6b68e5c583535121 SHA512 2f5ba8ffd334254d062b5248b33b442cedda8250092aa5773be0e171e83fb87386d05f27c73e6e05ef066a7890a07a5a3043f707ca62b9e2b125bb1caec6db2e
+DIST firefox-102.5.0esr-ca-valencia.xpi 537511 BLAKE2B cc110253e7e468a4ae455f821e3e64c6c48d3562753582def736ff027aa060bb52501e90d1b36dc31caecf073d91457f09e14b40252fbfa4a741e1c1c5847e6e SHA512 6c0f7d9a09c4f8e1c68e79fb1eb0e5197d5dfd0050366b19aa193050940b047450b3932d4cadeecfc47da580a9eef8152d87d4aa04295cb817a8243547c0e6e3
+DIST firefox-102.5.0esr-ca.xpi 540467 BLAKE2B f1fe65e2a34914c2ec4dcaa753cc17818ebaac3bfacc6364895097a87ad2b2006dbe3e27e6d8bf392029daf74ceaf53a6936c7a36951c1c2a40902068259a2ca SHA512 060ddd669523a5c22269340cbe23880df5fe9c124ed4d72b7f000ec2f4cbbd11d7f807659dcd78fc1146083c9d2419f8b7b2579bafee36eb4529eec29725d929
+DIST firefox-102.5.0esr-cak.xpi 550766 BLAKE2B 5d7f69d2cdeb9778b9a458c4f60a7fa35a40d26265b958dd74f7ddd260d68a0b74f66db23442425bfb7f57b63c7a05bf6ba01b239d7a0a729fdc7b77b99bf638 SHA512 80b6d1e9bd8ae9fde029315d8d66024480ddabbe5533a496c225af3f96ba1af7b555c9e329b55cf296a34a22d288d28a282f4f5de6547dd5087fa5d1a21e7fe2
+DIST firefox-102.5.0esr-cs.xpi 573457 BLAKE2B 160068ce7046a3097635a663343614926054a9f597f0f17596d62b48a6202555e2ca95dc42644179f53491e2df02610f911ea328577e85b5b24e357594141ff4 SHA512 c2cea9b7bb5918f8f82cadb91433d786e4555b3e0faf0fb5178b6fb3940f0b2582b8c10b08d1d6ee2e47f9e75bcb956697d0c29a0d0d342667890712f4343fdb
+DIST firefox-102.5.0esr-cy.xpi 554754 BLAKE2B e4e239bb1d2a34612a03a75d4f2d6c0449eb8af3b133f0d321b1340b87a5fcaeb78e09a13c91e0b2a4bde2e4a1e9a88f2025a5138b20dc8823e8aa1878aeda55 SHA512 d33fe367201246f2eadf5a769730d22ad46f5e6b3435caa28c019725afd0d8a7428df58b2cb4fc3e20930f0b67ab84e4a09840b26b1529016ace37c1dbbaf423
+DIST firefox-102.5.0esr-da.xpi 546951 BLAKE2B 4a162fdd8d4c0705c2e9cd307190a005523299b50462ab8a15dbd8470bc44d13b0dc86db05c1a634dc758865997dfd34987f953324f3f23ec0d1db860a6fedb5 SHA512 bab7d1dd313b1f7b57243298c6d9e2272a840e577c38489eb7948e8867f755c6ef0cc68f3c83da194071a18e09a252f666465b1111d80654ed95a79703504bb6
+DIST firefox-102.5.0esr-de.xpi 567045 BLAKE2B 116602ca36f9e11a978365081b44d6559c160a9c6189166b8b5248cb62f8e9c1fac0d46428fde885be51dd290c3ea84804fe6ff5e6186c85c0bedae15f582deb SHA512 2bdec0c76b467b71cb464681c8d6a22e1363d2e62cf1081e61fdc0376bb9740f853949f996727b6c3091d083e47d736457b0d21f4e22e8a2a58088a5302f23b0
+DIST firefox-102.5.0esr-dsb.xpi 579775 BLAKE2B 819bfe6c184653037cb7f21d1df3d3b41b5d2786ccf0f8e0fc0ed5c7e7b8dbf8ba873bd305b240670266ed71ec88b4099fcfe5dae3f7df47f328b33af79ce357 SHA512 b94755615c6ccba762c4677568c708c882a4319dbb840094aa7ecca1207aa6667c2abc667fa0a3f076c1385c120dadf7724ec9957cc92d0f451b9f6f5b8dbfad
+DIST firefox-102.5.0esr-el.xpi 655027 BLAKE2B c7e3cab1f7aa3e11f768aa947f9dcc5543e560fb54fa73e1e782f1e04fb893e7d0ca7f1cdc349f9ee62bdf85ca5f65817352e49d1d06f906b628fcd0921f2727 SHA512 5cbb0a0239857f5995e584f3e798c4ed9dfe0e31b587b83c55158d0909e7e77ae3ffc50c2981f67d33ccac361606d4981877dd2722e150b9775e2b9950b1e91d
+DIST firefox-102.5.0esr-en-CA.xpi 514605 BLAKE2B 5cad76f95eff283cba1a40f2223d094e1efaee9ebffa8ebd868e6e7c956b8ce885176794d399900138d1c5acab01f1df8db49230c911adeacf31c5a4634084d0 SHA512 b6e48d858952603299abbc1864797be4c8fa77ae1cd569b8ca0b16ae7c9fac9212b309760910391a762ba290d5686d77829b02d1502b2c68fc3c843ce6a838ca
+DIST firefox-102.5.0esr-en-GB.xpi 522701 BLAKE2B 2c1313167169608aac009703908027a6db3258eecc430ce162b7a1d0693e0d9d1a2ccf615bf4159d9f3563f4641cdc8355183f01e2aac0d7ee15020f517a8483 SHA512 62f343458a4f397a3d83d67b6c4d5ff04084ee0d6b06af20f8b9fc8fa6f0c76ecda4c1205b3f5cf72f5d7e254c53bb3b9ef091b45b4b5e1a8702f666ccc53296
+DIST firefox-102.5.0esr-eo.xpi 545928 BLAKE2B 0d950e575e69ff172490a2d7092bfd4ba7cf8284012285a810b4f75ffc7d7acfa44f67547046001e35573b3e89696919912b614cec23de9a571c0c9d420a75e2 SHA512 e644acea98fe5424f4447e6253db17187790255ad9ae7ac5ea51e500fa8daa9d33e3f1bf8f0eb6ef1979320444c443e9ac426296744e765128b7c648ab19558f
+DIST firefox-102.5.0esr-es-AR.xpi 560318 BLAKE2B b9ae13afabb3cd50e91cf8e047b00b421905148f443feeacc0d0695749bba00fb579640ca8aee2e7aa641061034749fdfd8a260748cc1b213478d5803916dd22 SHA512 ff3ceb6608f6ad752e35c2504cfb8718798c67c0deb3a5242ca8dc1b717a7919f848e7596680290c960b16cb086e34ca0ee50899cf07bd958ed8f6aa96d26c43
+DIST firefox-102.5.0esr-es-CL.xpi 559377 BLAKE2B 8cd31c9c8dd07819b36a7fc182d0020c134e6e339f759ec5a570ffbe29f6b8679989acc5847087e95bde490fa62cad44f6307993b1b031f157470ae905c8fbe9 SHA512 3d06d78682aee2a3f099e1a0f091f73574fe6830abdb3ce33aeb04819ccfb5f470295c0334638b12e0dd99bce877b6a4f502032372990dff8519b38a3dd7876f
+DIST firefox-102.5.0esr-es-ES.xpi 544159 BLAKE2B 95da9c1e6ba6d89596ef611c20e0d8f69ce0379f507531b71495bf64e84b6d4a0b0730d4efe1c808143bf6f8fe05c5773f3a71f4e13e6c1f90f40e5051ae15e5 SHA512 2e50629ba1115921cb1896d53e1af7d5eb92dc1f8b722263e5e02f7bc5f3ed9f5c30cf58091194a06836717f8a73183cfdcc3ea6e03409f69b9aff65b44a7d5c
+DIST firefox-102.5.0esr-es-MX.xpi 563470 BLAKE2B 1bf320b8b85689a58faaee75fe7a99f4438aac80bba530ec7ad81ac6e0b1eede9f5f800c732a3a5941087d062c33c97748d0592d1b7e6befeb3bee8425be304a SHA512 77726f1a3f76af11b75d41b3fa9ba1fc107e87339bbaa5b4472c9fe9424bf99e9477ad6bb12090167b4018fa529c99513ac66433fb6ad8ff273f9a5d32ed5b0e
+DIST firefox-102.5.0esr-et.xpi 531826 BLAKE2B 1210e49263a1215d492e9b6d2ec5df46b1195a209392156f993047e267ac07070c4a7b8192f12158bcb9ae2592138969e73fe6f67dff6bcc10da677b0a4b8ba5 SHA512 190ab22177ed814e829c68f521dce516b1c767ab47bb01f176f08c80c5f556d6bb1c672f1ee4f534c3abae644a0beb17e1dc22d986f5d53e63cca5da35eb23b4
+DIST firefox-102.5.0esr-eu.xpi 548194 BLAKE2B 80239ba2f7656213a5e939358f0ce0f70fe20182834cc6d47ca1617f399cd76824c9a5cf5049415d6ac56037e4c9f1a948a4f7d22cf81f009c4eb5e4258b6a1f SHA512 7667f1ae51528a2ade52c19dc8dbf52246143b35cdc61632933d238678acb9b71f447708594c4ea2c69f82c4bbaf929042e1df23ca812165fbb45fafa8af686f
+DIST firefox-102.5.0esr-fa.xpi 562332 BLAKE2B 541c7431c1f1a2c5f6693cf3d41b87242796a059397ac32b9dc199208e26bc3f015e4bee61cb8b1fcd59d9cba396ed7db6c22a7773228c7ca12b7067cddde5ed SHA512 be28048d545685c9df94fa1958cd4cc92fae62c43a9112e7e71ee6ec668b34de1c13c915b44bb11d6026494213afd7c5b472f32a882e181f82be6f999e4cab33
+DIST firefox-102.5.0esr-ff.xpi 472159 BLAKE2B ac2b4a7982eb2c522474934ddb747ecc9cb64a9ef26c0a8a56e5e9a1981308f982689aabb84d1ac1abeed5d7e1fcd5aab7cad7f4612fbd0ebd662d0d81c4b8d9 SHA512 3c3fbf0e13420b52e322dd136e4d04b733c17548a951e99be295d78a310d8b965519a9ecab37b79066ee6eef230c25da1f8cfdff0666466b70db5f0e21c76940
+DIST firefox-102.5.0esr-fi.xpi 544781 BLAKE2B f6a0b8081e1b43e20038223e09c831089d0aff090f28c19b1fef4d9e68e81d88a5df96c036e0227bf306f8d138bba7f8a1da1e411753f914c0ce1c744578d8ab SHA512 1ca8c01e4454a357e643802db02e16774495ba791639b73276c80a960e46b12327690434e9ea65c8d88151fc2754b1ec89a76c519424714228286d7e79b5a72d
+DIST firefox-102.5.0esr-fr.xpi 571374 BLAKE2B 95b403acccf30edcb8b2acadc75342d9dcfe32027477e26480ea898375b3ab3b269af4222d8364ba6909e503ce11d7bc2cb349a0cca6ffcaa876949bf834d738 SHA512 c6f191fc32f2ab3120d7ddf8ebe77f8a8972170dd4625afb1ca5cf4bbe392c8f392e3d2b67e7e83443cec6b2175494ddd3d81661f41685683afacaa876b7797e
+DIST firefox-102.5.0esr-fy-NL.xpi 556583 BLAKE2B a7da2c0e91c11a58f2795797278913b21eba28fcaef457e4cc8f0331396a6d668e5f28ddb3de3ea55298e6c15933bf3aabe7c240cc0b7bde13aab3760e3f7790 SHA512 fc988e0e120e153bd1663cdab13975bc27a3e86a1740be9a1ba0fc75f3cb1dc06d739c873db56193d56c10a0b2874f2a5dab51c15335d3fb87e2542b96fffa93
+DIST firefox-102.5.0esr-ga-IE.xpi 470602 BLAKE2B 6cf4d97cc4a7b9332d705312cce8a7bc1c5f834ce0b30f687fd26be659934d21cd26412ab77f1db032e32a81b14f5d46c1538c8f53b1e838976cad8a55728e38 SHA512 a1730fbe875f18cff992cacc285b8db209133b7dcd805c8fe524c58377c1d15fd880b487bd606163f11e8a9134569ef2be6fc7367ce72d3ac19aee4fb811b73d
+DIST firefox-102.5.0esr-gd.xpi 543719 BLAKE2B 9740a0ec2c0cd76dd1a20c5fda93e961552241977dbeb6ec4071bec6d73e0031b38733538060726c99d10c82ed167d4548f5d3c9bc8e05bec66c4da42471d1db SHA512 c21c298f9a8405b1f045240da83d4519d391ff56d6a0143f251579d82d40e8c946e5af356835fa2f5a90e798802f0d1b14a05af45a08d310a76e47333e944f30
+DIST firefox-102.5.0esr-gl.xpi 539051 BLAKE2B 46c1b726b2738d3509c0963b95b374e1a28c8f5f73c2692fc8812a383e6c55cc8c4c2b98084b72e3c73c2f002d9013b1cfbecef7bd9fb8522521b648d00d17eb SHA512 1758d382155156ccca237d1acc219d4383d3650930631afca98cff66c16b5dc409ef807cc02f69b031017bb88655d4e1c0ea23b904c9b75413408f7be39237ef
+DIST firefox-102.5.0esr-gn.xpi 570890 BLAKE2B f91614b3413d8e1daf1b647a9854d8947c6c810c8ab4f5ec4e67737c40b9927380ce51191c076c3f60e336690f578812ff48cc3ed4b8d077a2da47f964bddf49 SHA512 c228614fe5cff10540deae2e5fc96867e572b4d62a379d0769e55bf0671c4b2e059572bca4c7f85363937442e75d1864de30e0730f7100d63f287d28785640fe
+DIST firefox-102.5.0esr-gu-IN.xpi 527866 BLAKE2B 7c60f86d84399e29a7b81fb4913937e9222ab560d43ee858aca757989e76483db6d73bc95e4a27049b8fd5cc73de661c3e70ea3f41718d5f7543ada9f6d794c1 SHA512 7fff63125bbaf826d2e15fa103bbe3025f73427de43afac734ed7022dfcca08efe95524fcc65882a4790db3d19a8a8662834e9ca569a276bd3b2d13f9de9d0a1
+DIST firefox-102.5.0esr-he.xpi 568667 BLAKE2B 6cffe25a3ab6186ebf189c8c4a62261f06b5c482158b8f02efb7024846c978dd8a79777450082193ab7694e5bf2edeb6fb4a980ad915678eb18c6e64a2f5b7e6 SHA512 09ebdacd56f6cff8a99ae91866aa1aa0a0f1fb13b4cbe2abeec94d9f4d8cf30ff0c2c69858a422c5a18d593496ac01bbe0120c04b05078b4732652857e96c328
+DIST firefox-102.5.0esr-hi-IN.xpi 558530 BLAKE2B 9db2153c768adaba2bf6c295f24d2822fcd943b4aba2a4ef99ff760237c487011293b486ecc92b422c7e612126ee62767a10368903dfaaaa6cfd462ed2c025b6 SHA512 5130f784ac671e2130126462a7ce836756a725f5ef4dd0455703d8401b8d29493e677c54b9d0cb3854215141e378b15e9ca6fa44363a460d5094cbc948ee8baa
+DIST firefox-102.5.0esr-hr.xpi 529730 BLAKE2B f9622f5ee118b2868b615985d5c29fe2307ea47c3916d1341eb86297000eec5dde1797dbd6aabc02e050f528fb5a34a8e6e32aa37a25eb9d1e67ac205ce21dda SHA512 b473fc2cc1041f6cc6fe874f63462a42996f91de1d34e7d1eb044ca7b1e256003a8659a14f37914de05cecde4ddd7cff7370ca357f8728c262ef779f53facbe7
+DIST firefox-102.5.0esr-hsb.xpi 575944 BLAKE2B 526c44ae2a237afe8873a67e8a34658082b78ce17df1d24a674aca54401cfebe9d295cc5938104a16391bdc5fcbdf309cb405b33c4dee82ba9119c7bddd9fb03 SHA512 87c7bc9da8f6abb6df2ae6259e4b3574ed7a64bec5507f7e3be0a00b042e4f3855e37530cf8345b57fdb3d97354073495f4972c0cf1bd64418e6ac980c495682
+DIST firefox-102.5.0esr-hu.xpi 580242 BLAKE2B 333a0ceab57e682c64c71b3a2474a473813a7eea8454fbf43bcbdae0295a0103b9adbea81efe72bc9a63fee6c91475eb9b00b2a72547750c41cbbe9a8819b1cd SHA512 88f00c8de0375568607edbe4c61d30f4b20f2b51a98a006e228bb7678378cf8c69f662fd208b6840aaab71cd5ae55b4e6ba824eef0708bdaf6bb0409965ad7ea
+DIST firefox-102.5.0esr-hy-AM.xpi 582115 BLAKE2B 0a7b94854182bf1ffc54bb265a11b93950a4b4fc0efab404d54b680dd8a25b1d88e15a39b45fcfb386254283edcb06cb642db964f71d8b4204400086fff16b7d SHA512 83a86180dd786216302155667123a2183dfaf369b3f9bcf5f69010704c190d8766b5e8d4574854ccc088b396767ccf615356e1e9c09f72a6cfec3508ef727754
+DIST firefox-102.5.0esr-ia.xpi 545259 BLAKE2B 5af9501e6fcfdfb78cb0af7768f12f27ce4fd6581d670d03a1710623b8ff1f7628923724e781f48fb616cd5ad06077c7227a4ca0ee3c7a0030152e3100138433 SHA512 e4a457e6e1a4e3aadc3846c494f7dcbcf4016ba7e2afb0d3958256fc47a249a35f1d433b77597910af108bb8e58efc9fb70887d6f8168329721458f29a7a5492
+DIST firefox-102.5.0esr-id.xpi 542437 BLAKE2B e8f7d2eabde4a47e1b43a99a22e33c19a1a00281959b8f2432d4aa1967fa6610521f3953d046f1379bc785d4b36801887e297f9b801c8660f89642d58a1e01f0 SHA512 e8c1cf0282a6edd95ca795f9d6a77b48af93fdc16150178900878d1afc2d79e5c7690f2ee1d3881a942b7061a6ca24f033bc728bf6424c0415ee7c48af715774
+DIST firefox-102.5.0esr-is.xpi 551940 BLAKE2B 7267a5cc101d640bb4052441f51475058d90c0c3a4e7be2bbc786918b5cdd1f1c33cc6fe9e1e87d864b321018eea0e82a7197975df4c9f83fb9f80d931c36a1a SHA512 40868d892ddc2aaa5ef86bdbd5afbfff6fa6de0158eeae580f1ce6f83a6b7ee42ba080c389e1b16c5021f29dba4a7c3c983c28c4495f39e8298b58323f55c843
+DIST firefox-102.5.0esr-it.xpi 463201 BLAKE2B 855e7120f7c7703d9d63655d1c2c17b19b75a12bb80100f3613a2ebac140d4a78efa5be031d16fdfaaa9c25a6bf25eb6aa9745ad29dadd6dc5dc4b46bddbc40b SHA512 72cdbed8ac2c473bde825eecb415f75e309776d23b8fd0b8a6de4357f1bc14edfbc7d455b3dd3b1b20464953c74f98bd717e51d123b4cc78ee6768e4262f9f5c
+DIST firefox-102.5.0esr-ja.xpi 586292 BLAKE2B b36d32eeb61717f14f605cfbc44c644ec9cc6ac5ef1ee2395d27f173d8fb3fcbfb7f2e333f57d29a1c5b1e075495ba416a0e3e186cff8616d254c67f52a1c391 SHA512 be06c437cb03af625e9aae3ff360b27257ba1abeb676004f0cb70a54b2f69cff666ba9c1a5dde2158a13213c6761d83024a4e9ddbbe896389e8cde17803ddc94
+DIST firefox-102.5.0esr-ka.xpi 606127 BLAKE2B ffec35f22234d24d81bbac6faa9704dbb527fa10025ac943a5784ec390960c5b97e1805cce498154467f0b763c2f610c34571ffd6f38ce877356d7a9727ce9a4 SHA512 a515e4018039198ac6407eab04d7611687f7201ce63aa008464b1be1c69e325b4fe2ea547925c8dc619e01171b0fa3fb1131a4782e899fd5b0528e03fb34a2ab
+DIST firefox-102.5.0esr-kab.xpi 565742 BLAKE2B cdfa39e611de9d4ba134568552a5ab44ee3836fe1e6b9315413bf893d5a12746aaaccdc1846a08639ef9574ae22ec81d6e8378fcfe21be25d7dae1f881549028 SHA512 462356e40f24fb367297421a035323fc5a416efdb5deeca4f84200f7995e0a7a107ef419da282a234646bab63e8b0feebae7d69789b46625ad7e806a93e7e9c8
+DIST firefox-102.5.0esr-kk.xpi 621841 BLAKE2B b2a96b31ac75dd13514e78e4bbc3f269dd99a1f3b56839e2abadf6bb7cff68b7688a4b9f38d2f441b9dd3b632aaeba0cc4dd9a8252346e69fdeec894d648027b SHA512 9cada5cec73feb711c43d2c83704481bfac66b616f86fa802baf6db601bb00805228643af58275c216e386f8ee823e0ed1366d8f1a5fc4d1b8db6b024ca31dbe
+DIST firefox-102.5.0esr-km.xpi 531568 BLAKE2B 40eef6f86b0461d275d5aee49c0875615e98c4ba68305662231868d622028eab1a830972ea934f1fdaddc1923fe451b35605ad097d80f074819302b9cf72e53a SHA512 501e1b94d0aa1570b0cd27d228d93c815d3a7c6ad3f971fb3c7054f29088b97060bf695910f840c904765c3644f22f1e25120f6bc8e5ba9130bc3f9ca9069049
+DIST firefox-102.5.0esr-kn.xpi 497188 BLAKE2B 6c05699cc03f24e8ff12cce54c15968eae0dc596a98b06785ddbddc0979644474267befca82bc581afbbef2bdec999ee28cba2dd64784579b8f5e46040fc2789 SHA512 6c2ecfeeea8a415589f256eefef3d26f864a1af8104a620b86396f1e41c9b9ad39ee751f6e9c456a86c9c1a5d1aabd58bf8037370a225db0b55d7fe1c1f2e560
+DIST firefox-102.5.0esr-ko.xpi 593309 BLAKE2B a2e9dcd0b53f3196bd6ef6b00563e6efa78912b1908ab79b9cb503ddf76c0469731a8d3e3b23f05891b402d51a005785decfd70813c26477af573f2467b28fc4 SHA512 34256d447ceb1c7dad0f5570989f7a1372d5af7d83597ae7f98ac18bdd7760694a818b442ac24d0bad57b773b16dd057b2126fe9a2ba0ae39cb3f5f747597c93
+DIST firefox-102.5.0esr-lij.xpi 470144 BLAKE2B 50028dc7b8304e102ca248e0ba54e9eb50ecf396fb089587d253ed3a2ca11073278bfcbbed4f5f95fbdedecd20732d00f162c559d9f55a46306f1787133e98de SHA512 284ca7a9aed581858a24e447f306dab4f824158cac9336a376aa10863c6e71cc9861fcda58de311ac74534f7cd116f04d8666741d8c9620745f3037d94e88f91
+DIST firefox-102.5.0esr-lt.xpi 561125 BLAKE2B 7288f14fa7fa581d8023189e8a9b061ab7a9afd71bf2a7b85c133a3c076d141678fee3e6f71bbd0cf3e5411431ee2ae0ca09a3283ab4769eb30f73d4d2a38cf5 SHA512 31e3dda6a8dd7a9fc1e4305afd133f82702621e58609d1a7bfdf9c13367120079dd6436dd942172e4ff641e04dac40b497875d25a4f46b2f5b89b3a32b585306
+DIST firefox-102.5.0esr-lv.xpi 463015 BLAKE2B 4c196ad0bb968965bd1d64db2eb4f6e97ece0126e2facfeaee8ee3e1af9b2ba36a4e6ed981e113b6d4a85b366c8ccbd4beedcada8ac5e4014c2fc26e64a58417 SHA512 0c6bf6ce0ff721e848904842ec6bea54f18c4bfea0745d75be50439d80f6b50a06cebadc525298481b167668ab19e81f7f63cc4b8969c7d2cdcc331630447f44
+DIST firefox-102.5.0esr-mk.xpi 482312 BLAKE2B dad5b35fd0d3a59876e0c44f1f21cba91650b4dae86f70f8b26d8fcbdbacba6400c022ab1969e8a3b08522017c4c44bf9dbab52484bde5ac88b8fb36583c1590 SHA512 c2a30b6f04d9dec6b7890c8daa0b35da0c027bb5e34e0476ecf567ad39f8186a621abf2393153d1332585529a34e2c73bc553889f981ee0a623de0af257c9c03
+DIST firefox-102.5.0esr-mr.xpi 531250 BLAKE2B 38b4da609461d3f7b889452a312adc6311fc622b55a340760f1d1841e9f828eea3dbd1f1ea9784505b81b07edcc21ad4397cc860e07599d996efab1e897176dc SHA512 22f86ff9f47869e5f1f703dd1cd7e2dfa3e2338faba22faad55179b31a3800676334ba3c0c2be7c45f0c57e83c4e9bddb8ba4e2f5a957d06138f10e9c340fd26
+DIST firefox-102.5.0esr-ms.xpi 448108 BLAKE2B 673d0f7a1b76f2e9c6ed75d81d1a844c9b61c8e26f205c95e3f9a772b589e838092932c3f48914cbe4e50a708331c541601121bcb604bd91ba5781b4cf8a05b5 SHA512 1224c4e16b3573405ce0a2e16056090716c061a46e0a72f81f407ac5a578fbef52474e9f4a090ae38d1d8181af3980863265a9341f93686fc7f34b07f01c8e0c
+DIST firefox-102.5.0esr-my.xpi 511797 BLAKE2B 61e9bf40d8496957324019c8878a076f8d59e7a0e4ce5504982a272641bce0141ca2a04f583abcc0d3a17558e85ab386a243e9e3b4cad4da2abaa7e8cdef346b SHA512 03e820522bda322c7768df00bce854919419169901002b6feed455f691549d135b80ae06894efcb16e3e0968f07a25407761aa7a8e638d268363ea3ad2504017
+DIST firefox-102.5.0esr-nb-NO.xpi 541240 BLAKE2B 6a3a0fadd4d0ff286da2c18198c162bd4dfaa58593a7accb525249cf829d42551aa6f4d928bf3e3fc731f43bd1c5f39df10e2f0a12a19c6b1f482412ac1e5fe2 SHA512 2066cdd8a342c163a475682ef9ffc81c30f156fdde7e929a718ae6f18fa12ee33901e056147485742a6782b43364ce995807ae426f66bbe07c32598d7045b256
+DIST firefox-102.5.0esr-ne-NP.xpi 489423 BLAKE2B 899a853c0a05487c132671d86682e8dde0a810270e4b2ba5f44640d01bc16da84e52aa408e98123d7d23ea903fa852dbacf5b7b9e2640de59a8bc7d2abd8200b SHA512 cbc8e7b75b411fb9d014cdc72b892d76ba5b37fdc599c50a15383dfb2b6185edef7c227260da6e8f72a2868abf51040ce6d9c64cfe074b1de903a056326915ac
+DIST firefox-102.5.0esr-nl.xpi 550349 BLAKE2B e753862837852c39cffd2b8a662602531c44c8b2e8ebf911e902b69f314c792dd6c307c0cecc8f2642c2d3f4c7048dcc37cd6043c6cbf096f25ce81fc0729d9c SHA512 e57ea35bcf82816c33e8121f79fb7d16094937319244651b740c85731d1bb65a2551810466020abf6bb302e0f7f83ad10672ee7a0213ec144714491f8f7beb51
+DIST firefox-102.5.0esr-nn-NO.xpi 541467 BLAKE2B 53f41e00c9f47211732a64e2ee22f634463657def59886706a44c7918f4176c265c108b207e500bc050447ccb6d7ad7b6398fffc1a04193f2947450e973f1ec2 SHA512 8325edb3b13032a9284b30ad7709927832cf0d7f3d77141bfb25a88b2d096dbb72eb3c3b9f0c7adb6bf674564d1396a259d12a27275b32086ab01696cb76f338
+DIST firefox-102.5.0esr-oc.xpi 560886 BLAKE2B 188bb542f445345ad5e10198142cc908c864932e63eff41f9a6ea79ccfaeab0a1bf51e524de8ced70a5a8ead90b3554ed1c6426452ffa77772ae0a927d48c9f3 SHA512 0b137bbfd5857f14c64a9701e423a5a4abb1d86525fb03c6a957d723a11bfca66a6e3f0470647df8e9b7e3fd1b5ab1ea1afa79cda2b6e16df7f72a9b11d1f5c3
+DIST firefox-102.5.0esr-pa-IN.xpi 612450 BLAKE2B 6781861e41e368decc763dc38343040938c53922b3394c8f2f9afb6d4074d71346ea71aefb46ee35a97f1511af60b449fad943a38572695aeea825c6fde2feca SHA512 bc07451e61d249ec899bd48f814cb0f7884ae096e7fe3925d9ac1e61ae12059c1993935f26d43f6e40f5ff0e5b0b4445fddd65450d15e59734cbe794df1baf4a
+DIST firefox-102.5.0esr-pl.xpi 571734 BLAKE2B 74a5ca46727d08f7b31da70abc9e023e888a6ba9704286332eb5cdb9d193847b4118a964648d9c2d67a93070c328393886e5b1637dd866d212286dda7bd964ec SHA512 9d7c1ef0346d6139f136c17646c2d647f2559aa9ce1d423f5539f96a5d226734e3c8806da72e4bf0981b66e4682fe621401f518042c31252e61a47960fd19dbd
+DIST firefox-102.5.0esr-pt-BR.xpi 555933 BLAKE2B 444a2712fe545dd559cb642b919f5b2f77b5ee9b94e6677b3648ce44e51f244f2171c20fcf432204e92666d9d7b01887a853af67819fabd30be0364cd5c65de2 SHA512 9ca3c9aa4757f35be8b315c84b7a300e6e979796064b48950b6740d880c1c4ace599004b097be2febe0708a69d6a0a433ffb4e6a17ed2cdc6e847e3b841e9011
+DIST firefox-102.5.0esr-pt-PT.xpi 555215 BLAKE2B d73d490caaa7de287ee24b05e3624f8025098edb5a3fba7674e55b48d0cb34ef9a29f4b51c9776b5f1a131c18446de6907997988c04418c42d681b643296062e SHA512 681bb9bc8f4ace1b084a52739ed3a622274ae86bd8e32fe3e5584dfafcd02ae77b5ddfbaaa8cbfa203e5378a1df85e659e401df4e9ec3d7826ade47887c98502
+DIST firefox-102.5.0esr-rm.xpi 538498 BLAKE2B 7647b2c8d3c6a05f5b536e12e52076a4e707e019b90458dbbb1fea395a5ee3b17747c104bccb0e3c2393236202766c41da811d813aab3d2f71e53fae1a01e3ec SHA512 24a30fb12a370887d2b5463bf65fadbc630e44393852ed63b058d375854cf4b5f509865a4b54d8d456cfde5a3b645ae0ea1877cff39306ebf3d89b956b54be26
+DIST firefox-102.5.0esr-ro.xpi 527979 BLAKE2B c71eb939c20db14ea2129c588dc6ca2e5efae16f44574fa024ac000890d26b26ee19e0da6d4c8407894099480ad1f354dd1465281b122da5b12d750fa9f43c1f SHA512 5c58cdb81dc55e45386df546a51cdb24bc3dd247161737368bb9f6760628d2c60baf6606b23dd4cdd59827b52538311fe166f76f7420d88b58342c402d315d9c
+DIST firefox-102.5.0esr-ru.xpi 642373 BLAKE2B 666ae5e2c29c8ca826519f434068e029b3d188a6cb8eec55ee863a1dbcb554d165f28ff80f0d112d98cc7e69511c91eaff022a6512159bb538e9b3168d457f91 SHA512 d52b392f2a39e2260f49d6e21a35179d9150326a8dda24a0faa588f850a4f3d4077699fa6d1e43b7d6b0763874ff7c2a814daad175122afd624541afe2b0746d
+DIST firefox-102.5.0esr-sco.xpi 496335 BLAKE2B 3acc5676f80d530a6b5ce5a55079499110a8983edce54c9dfe9fa4873f0725c0b982e1fd7be06fd916321b529923ee60cb8dc0de31c8f8db814098fd24146417 SHA512 a92ced2d794186455115a7a54889f53bfe351179f208f2cb52c12d011aa8295f796979fb760f644238b3a7b18f11852f9e89c936e07c9809a84004e9ffb3b051
+DIST firefox-102.5.0esr-si.xpi 564316 BLAKE2B 389d4234858fc0a0abafad8fd82953418015a4620243e7da5f42674f4b875582dc7a4319c6344c12571607e98e4fa7b00e70da7511bd8f4fc1db831c31f1e6a1 SHA512 d1496e355659f3a837c82548733561220e41af3897879a8b08a28843b7d31703a5224ec0880f45383b036ec51e8f1bdcc597d3e5476324f17c03601ff53690e8
+DIST firefox-102.5.0esr-sk.xpi 580597 BLAKE2B ebd06e3d8ae3bf9fc14075330272642c3883b3e13f57b4f8bdc047d0f15aed4ed1f944c338f778d42a757936de2af47bbe0ad54cba67a18535bb71be55523e32 SHA512 8d36ee9debed3f816ba74156be09e4b9a54ac61513aab415724a7e2c84d06bd0d85842e22ef07cdcbb9ace30f679990170f02b0afb523985c37575174647c651
+DIST firefox-102.5.0esr-sl.xpi 553146 BLAKE2B 543b3eef6b1136ceb1de8f6e30f79f87fb2dc06ef6d52022ec07ed10fab5d60765c1bedbb911d4501c8a63927fd06a8a73bc07bb9a07ef7b32c985595066429f SHA512 ac729f056644ac21d32cb0a7d4ad0d69d2aef8930909fe55563cd66147aab18ca7c1480e777835493785846f9851cf5134bf47ddb797dcb2fdef9d31c134a449
+DIST firefox-102.5.0esr-son.xpi 424685 BLAKE2B ac51aeb0333d726c423f4bfe899a77b3f708e1268eb69aedfbe57175a48a70a86729a1e6107e6aa24c57ddb00100353ad5237da92d1bbed5f25fbd75f6e55f45 SHA512 3ec65e776216a2b815bd1ac006d7addfde37924d83d62fefef06ecaf3e24b003c9b1105c7aea261c192812aa13cda77a23518372392a055145ad0c4f8aeb13f7
+DIST firefox-102.5.0esr-sq.xpi 556101 BLAKE2B 2e1e357b8962fcd1fd44776eb82aa63ee9eabdfbf35cf0bc5216664742f66ecdc7a24e0d78a2bcd20b3f77f213596f0b699d857f23f013702c6e94f9fd83f6d8 SHA512 f4a6c9a411f5eacfcf43f50bb35716020db5042b5272504bede72401d863325a8c94e70341b685d550491cdf87f88f2bc7bded1c76f003ee4ccee822f2cbf38e
+DIST firefox-102.5.0esr-sr.xpi 595505 BLAKE2B cb0928ac7f20b45ba0629e986d5a0df31efe2c2d206abf8c90501106143d65d53f739c984aae652e439418a8c66969c33565a504e4b9cca691e0e0cbc14a35fd SHA512 6a3da502b576801da7acb31331524127f9728743733fd59a7719eb310b3055c2d093d47d1349eb87a4a249e748b1fb83eea70454a8e8c0d85515edd005636f93
+DIST firefox-102.5.0esr-sv-SE.xpi 553014 BLAKE2B 23fd74bfe1dbbc5859efe7dd0c2b72783e4cad1f511dde105d245e0556985725f662cd478d307760fb63b09a128d43507288a6ce93d8109bab10257fd6f59385 SHA512 02cd907ac918aa27416d3192702881a5e448fb64d3212a81b6880bb7b0ef4ea3de97026ebe42ee91625dd9ef0487b53a6977a72322239987485dad6658db6892
+DIST firefox-102.5.0esr-szl.xpi 512005 BLAKE2B fe712497579163c6ae3166ea17234182593a09dd778ab26783f6735ff0f8f45d7e10136e5babe83c52a13667e8596a35b194d7eb57855ee0e9d6ec8e7cbc6a93 SHA512 dd65a6a3cf2b61ce33e8af99e93018c93558576db1e158cea1a2f3ba3adce249d7e2df87d233193f1878a986682310df4daa76d0a34420f72925d7397fe1c18a
+DIST firefox-102.5.0esr-ta.xpi 510340 BLAKE2B 34b32c871791b482ed101148d990f172e39a795705365f45138a37e37b341ec92812ead3b9f7e7fb29322179688020a784471d9898740a17e8f14b04e83b8618 SHA512 208c81ec5ad4f622e223baa0b548fc8a4e785a861c1b8f199766f9baf2b440bb3f042ace371612fb4c53af95d359ab6d866dda4e393333bce323cbbf3784061a
+DIST firefox-102.5.0esr-te.xpi 551584 BLAKE2B dd6270a49b7f0507135c32e2fdb55da57367e3c114e490dd3d165aa5f61971471cf2c6bcc11d344ad609a5b0ab73a1c9b46d4125edfbfa90d2176142c0fed64c SHA512 0e8c7dc674a6f6b078b318a1c87f5dbe298c1f3499ace1e2f2f4dfd5796229a8cde02cd1edda5fea764975bb79d8b996ac041f17aef8975d12b58cef2ae7dc9a
+DIST firefox-102.5.0esr-th.xpi 612072 BLAKE2B 24e3858d6f844f5fcb4b659c35040fbd4dc99758e6f5f44258dfc91028dec49641dbf4a4819ca875c5616b959270493a01d0a5e14ba2df800c058d107f785b71 SHA512 8cfbbd08c80ef81a0d9ec6c1d871227293ef5b7da8ffe37c0ae02ff26c36d955b20a1e234a765e1faf8c304802eec2b5674d8161ca542d95eb8af517b04aadc1
+DIST firefox-102.5.0esr-tl.xpi 518951 BLAKE2B 3e3ccfdef9b5f767c168ac46b251fae204dd0e68f89456ae22eb8ee8f72fec3aa0ba31f97df508941161d3867bcc3dce0a9dbd158c81cb440eab2c1fc6b00aa6 SHA512 d613c4a2ac5cb61518492420a8d46ff539bb170043cb46fab1b6e03ffd29f4e2f4bd50866dc9e158f285fe088cd24323312877c33b6caac42e64cce64053afe3
+DIST firefox-102.5.0esr-tr.xpi 567022 BLAKE2B 0b8b2bddebc4c44083f2158ae6c435f0d68f4e09de87893a81dcfa0b1a8c0d6ee40d530119592d8f906abc2d4e6ce93c4bdcc7bfd930031dc10311d1f951967c SHA512 8b01f631938b5b6b9f12dbc200ef90eaeb6cfc85b661be7d116f98bee0f09b2e404999fa8157081c742737d399b3702b05dace6340c4e197566cffee240d74a0
+DIST firefox-102.5.0esr-trs.xpi 490202 BLAKE2B 2573d9c238d6bea29cb41313709c4568b27496a1ad6e5ac287eb636dad73a04bd49ae068fa464953338c468ace8bc069026db671f21a66b45d159dd81fc529b0 SHA512 a69f47a246983619be83ee7ca2bf4abb4385b5160be8ddc32f462b8bed8fa43e8ccaf05fc02b020427f796de18dae42592aa75d9e2a2a735bab3f7aad5214961
+DIST firefox-102.5.0esr-uk.xpi 635956 BLAKE2B 788e3332b768257e35008075ecd8c29b753c1d361a48e3885625c332153cd9851105edbc8890837d92b446021090801d9b6446f8953aae248d63f2a43b65ca69 SHA512 63d5bd4d784f2300ae4ce9764123043d12e4b2b199ad842d2ed99c4679a3ed4e75fcab66d9bdcb4b6477ab6fd27e9be2d17a6404c41488130c3fcb7aff03c4ef
+DIST firefox-102.5.0esr-ur.xpi 558052 BLAKE2B 815bd141ac2fa81364313e80c40d72e2b6bb3a061761f7b5174ae2f5460bcadb23eb919ea0a5514452c6d623ba6f256f37c0c79fff041c22bb93ec1378e1376b SHA512 e7d7c8188ab341935b60f31dd00f9ce21a71c4df0ad89ba10f16306146507a2a4a2a9ee906898d60aed4eb78e7c253bdc801435fddd325984988f18ca6b77fcd
+DIST firefox-102.5.0esr-uz.xpi 478237 BLAKE2B 2dd2f920f470699201457896bbeb0a52fc2499a8d91050a6afe6e0153b79e8107de371efc3ef86e5b8c3da6ead29b1bad50fec6237dc846284e4ee6c53b661e3 SHA512 284586451e607af153278711d40c2823e3ed3043b5525a5ea97200de959d63f1269e54fe027909efe5b932224f56336c163fca83711e250406b8bf0b466cb591
+DIST firefox-102.5.0esr-vi.xpi 586374 BLAKE2B 1f68081dd066fe09d07ee979393669c19563cce1effb15f0a4b321fabf7cc1e84cc7ad46bf83c44484552fe7766a058fa673da7b4816ec2edaf212f6d74550b4 SHA512 347e97f3734a272e42cff89157a7aecfa957422fd5ad70810d51d8e1a5f89696a812793db37ffe248fe99ddbb58d27df4b28665415f0c74949cda5df2359a10e
+DIST firefox-102.5.0esr-xh.xpi 427184 BLAKE2B 09709cb2a2359ef3ce64955ca6521f200eb09784ec6358fd2a6bdd7d8247e121fa6134aca629b7a5c8e107a07ff791ad1926964ff9f2cde592fd517f8e5e4c53 SHA512 aa2215fb36b9504cdee8b419bbde02ef78006024a1aa4b01abfdf575f8ef3e00ca49b9f7011e0c0ba354f422f1032bc168094e4b7a486bcd6654dc9b4a4f95bc
+DIST firefox-102.5.0esr-zh-CN.xpi 589089 BLAKE2B a365c477592821805849e510963b0d4a3714fa43c701eb48853a07fa263e9b546ed8b2169a672b1e78d38263e1d907d9b845d92c71262f1687515310f3d37e86 SHA512 1a3273bed3512b7ab95e77327a85b086e10807ee117a6221e3200dbace217f9b6d5df44bcdafe0a52e6b3c8c83f99b4c60cd00bc162a90fc8f588ea8578e578c
+DIST firefox-102.5.0esr-zh-TW.xpi 590475 BLAKE2B dd808e6dd8dbb8bafb9113c5989db6c4cacdda9853e2b317246d77fa72d7fdda698098786dafbb95decc255f0ad0c8a6c6fc442736b73bffd18b3111755d2586 SHA512 c92ebe2b1ef5bd0aab3e213bad0e0d2d422704cbf61dd0c5c27e323af1436f927587b6586c051d2ac73cc33b5fe9730c1967297c9e355125f4064aa734f3ae41
+DIST firefox-102.5.0esr.source.tar.xz 478705384 BLAKE2B ee005b0e75151e39a9f34ab38a7a704a1f2efd4fe33bacb6a604a8a6ce8727210d0794b81e03e448d5baa2be264a7150728aac4f5b86d0a5154d549abf0c75ac SHA512 f4e105209c61e9537ddc90afdb05ede0a31caceb9b164d96276c811abbd646d14bc246c00caa386c0b0561055096d30b298329c69270dd085b943bdbc3a91a13
 DIST firefox-102esr-patches-05j.tar.xz 22180 BLAKE2B ea90ac860b20e6c44ad0abcc0275ffb8d09f29df07b9031b45642163408a0ed88a7ea3c5f2d40020ae1129521f3234c4bc22b2956a4aaf8679fe5f2e85c18fd4 SHA512 93733f8e3cbd19b5cbfb62487369ca7e5fda8f3335539e5af66d3d89c8b0bbcca4251bb56d92a008d47a6790f5cb2874268b2421c307307bbd34e4b3712b403e
 DIST firefox-106-patches-03j.tar.xz 22468 BLAKE2B 7c582c5305b6a79defa464c1c85debb1d95ca6116defbdf8d467c75d19b4e5aed95703290c13beafa7b020b3badb55607ba06b2203104357fe5ae6cc499ded89 SHA512 8885675f3accd1a1db98c5b195b5cfb9ff983e2f81b3e09f29cbac913e109c1d0e1a83755ccf3fbf92c5c6dffd87bee26268c833e73272f060371355910e343f
 DIST firefox-106.0.5-ach.xpi 460141 BLAKE2B 23a2807b68108b94efe96632c66c31af9be6ac02bafcfaf1b81fe0ece1326a5ce498c09e1e12fc437e0c6894ef593300528623b7436882962e200df30e36ae82 SHA512 989a52559baeab98583137dcf737d0df5fa039d6d2b1720a13c828c0c871fd2914fa82b907e1683b1975aad0a9fdb2e8c4e5dcd8769e666ab64579c3d8f55923
@@ -305,6 +403,7 @@ DIST firefox-107.0-zh-CN.xpi 585092 BLAKE2B d1b48117604df85a097f6f46c4554f0ddcdf
 DIST firefox-107.0-zh-TW.xpi 586218 BLAKE2B 2ed318648e4fe0371c43860a67c72a005c52470759562788ef8ce68eab118db16c55580173106f287131b8888ff597664d40a819ca30d0c125ae8a43ca087866 SHA512 4e44e5937717ffc71680cc33aa144e0c8270f1dd085aaeafd3482c8da38012c3a24535e9cc5a9997ca8924ef037aa98269476947a69b86c7ddbfc5e395d51235
 DIST firefox-107.0.source.tar.xz 510848468 BLAKE2B 3266e1dafb3e0befe746f6ae33679474e70335b32baafc25981c7a13f385d6080a313887c7828d76a47d2e456056c6d93140b84f1eee502dc9590247d31ecff2 SHA512 4b442631079a13e1d11223499b1d8daf622d9d84b38898f9084670ddcb5738b73e0d967a5050d5930bf862aa69e8d46ebf6d751ac6d0f075a1d75ff4738bdb6e
 EBUILD firefox-102.4.0.ebuild 36296 BLAKE2B 88c04e1bae9e61ba54656820a2995abc0df2a3af32db11ebb56be70884e35c379ed3289a70060a490ca5beea29634f8548eb4ba7635e9fc5b7d4338ad67d5f26 SHA512 2bdd22e1ce0f451e517878783acc8227c926f31ea20a4dd79877a4d5c683ea7b97782781ff785632c02a4c1209bedccf65e52337d30e54d3fddad8f0374abc6a
+EBUILD firefox-102.5.0.ebuild 36351 BLAKE2B 7b36450f66a25787a8193c3b5bfd44eab3fa573602cfc747b87cea1b071f7f6a860e8d42a033d0983036f4a3d56f453f61edbd7fbbe0ac3ad4f94a8f4445dbb1 SHA512 4beb5b717c378f3b8429a8b4eb85cd9a37e27896abd06124f321e9724abe708fc802506d92945fa847cf211fcbe5ac69293ae77c1e2495214b92ca8e83312f98
 EBUILD firefox-106.0.5.ebuild 38130 BLAKE2B ae8396647f85a7a3abe6df686602c1d47ad0778f20df714ff9a7f7a5889c3ac80527002c538011612e9fcafcbb109bc5ee95b2117f691b4f1e47115165e439b7 SHA512 d8b1d453f862fa1707e986f8b098cd54f3c6a4dbbfb11bbd4b89632ea835d282913d42f9fda22bc6ea0a761114f14ecc31a7b1878125c19a63884b440338e6f7
 EBUILD firefox-107.0.ebuild 38068 BLAKE2B ed9856f6a43339c7bdb0b06a81ad6b6c4c65decc5d9a982462bffe0cbb629a62486934152e1736eb4405a2af475a68e0578faa1463731823f36d45146a403651 SHA512 3870981635f38d17c4e9a8135afd7999e79f08da7979a3c11ea319cb34277f264b907b4ed22e134ddbaded7f516991e6f864e5d85685a5e5cbce9e7f8c58a855
 MISC metadata.xml 2219 BLAKE2B 064f486eecd2a66ef4c9cccef46803f877039bf16bc40b699a48e28e04e816d0ad434ce65ae2e056e1a4126a67a7dd7eff16040276159c1f5aa8966b1c0d7b6c SHA512 522b09ffc2857553e240b1e7c82c11ccc281dd87c720c6292ec9314b91319e0a55ca2838f17e878f5c1e58e4f22caa1b0c3b90506b65b350beff06f3f397d897
diff --git a/www-client/firefox/firefox-102.5.0.ebuild b/www-client/firefox/firefox-102.5.0.ebuild
new file mode 100644
index 000000000000..61ed1435716f
--- /dev/null
+++ b/www-client/firefox/firefox-102.5.0.ebuild
@@ -0,0 +1,1271 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+FIREFOX_PATCHSET="firefox-102esr-patches-05j.tar.xz"
+
+LLVM_MAX_SLOT=15
+
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE="ncurses,sqlite,ssl"
+
+WANT_AUTOCONF="2.1"
+
+VIRTUALX_REQUIRED="pgo"
+
+MOZ_ESR=yes
+
+MOZ_PV=${PV}
+MOZ_PV_SUFFIX=
+if [[ ${PV} =~ (_(alpha|beta|rc).*)$ ]] ; then
+	MOZ_PV_SUFFIX=${BASH_REMATCH[1]}
+
+	# Convert the ebuild version to the upstream Mozilla version
+	MOZ_PV="${MOZ_PV/_alpha/a}" # Handle alpha for SRC_URI
+	MOZ_PV="${MOZ_PV/_beta/b}"  # Handle beta for SRC_URI
+	MOZ_PV="${MOZ_PV%%_rc*}"    # Handle rc for SRC_URI
+fi
+
+if [[ -n ${MOZ_ESR} ]] ; then
+	# ESR releases have slightly different version numbers
+	MOZ_PV="${MOZ_PV}esr"
+fi
+
+MOZ_PN="${PN%-bin}"
+MOZ_P="${MOZ_PN}-${MOZ_PV}"
+MOZ_PV_DISTFILES="${MOZ_PV}${MOZ_PV_SUFFIX}"
+MOZ_P_DISTFILES="${MOZ_PN}-${MOZ_PV_DISTFILES}"
+
+inherit autotools check-reqs desktop flag-o-matic gnome2-utils linux-info \
+	llvm multiprocessing pax-utils python-any-r1 toolchain-funcs \
+	virtualx xdg
+
+MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/releases/${MOZ_PV}"
+
+if [[ ${PV} == *_rc* ]] ; then
+	MOZ_SRC_BASE_URI="https://archive.mozilla.org/pub/${MOZ_PN}/candidates/${MOZ_PV}-candidates/build${PV##*_rc}"
+fi
+
+PATCH_URIS=(
+	https://dev.gentoo.org/~{juippis,whissi,slashbeast}/mozilla/patchsets/${FIREFOX_PATCHSET}
+)
+
+SRC_URI="${MOZ_SRC_BASE_URI}/source/${MOZ_P}.source.tar.xz -> ${MOZ_P_DISTFILES}.source.tar.xz
+	${PATCH_URIS[@]}"
+
+DESCRIPTION="Firefox Web Browser"
+HOMEPAGE="https://www.mozilla.com/firefox"
+
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+
+SLOT="esr"
+LICENSE="MPL-2.0 GPL-2 LGPL-2.1"
+
+IUSE="+clang cpu_flags_arm_neon dbus debug eme-free hardened hwaccel"
+IUSE+=" jack libproxy lto +openh264 pgo pulseaudio sndio selinux"
+IUSE+=" +system-av1 +system-harfbuzz +system-icu +system-jpeg +system-libevent +system-libvpx system-png system-python-libs +system-webp"
+IUSE+=" wayland wifi"
+
+# Firefox-only IUSE
+IUSE+=" geckodriver +gmp-autoupdate screencast"
+
+REQUIRED_USE="debug? ( !system-av1 )
+	pgo? ( lto )
+	wayland? ( dbus )
+	wifi? ( dbus )"
+
+# Firefox-only REQUIRED_USE flags
+REQUIRED_USE+=" screencast? ( wayland )"
+
+FF_ONLY_DEPEND="!www-client/firefox:0
+	!www-client/firefox:rapid
+	screencast? ( media-video/pipewire:= )
+	selinux? ( sec-policy/selinux-mozilla )"
+BDEPEND="${PYTHON_DEPS}
+	|| (
+		(
+			sys-devel/clang:15
+			sys-devel/llvm:15
+			clang? (
+				sys-devel/lld:15
+				pgo? ( =sys-libs/compiler-rt-sanitizers-15*[profile] )
+			)
+		)
+		(
+			sys-devel/clang:14
+			sys-devel/llvm:14
+			clang? (
+				sys-devel/lld:14
+				pgo? ( =sys-libs/compiler-rt-sanitizers-14*[profile] )
+			)
+		)
+	)
+	|| (
+		virtual/rust:0/llvm-15
+		virtual/rust:0/llvm-14
+	)
+	app-arch/unzip
+	app-arch/zip
+	>=dev-util/cbindgen-0.24.3
+	net-libs/nodejs
+	virtual/pkgconfig
+	amd64? ( >=dev-lang/nasm-2.14 )
+	x86? ( >=dev-lang/nasm-2.14 )"
+
+COMMON_DEPEND="${FF_ONLY_DEPEND}
+	|| (
+		>=app-accessibility/at-spi2-core-2.46.0:2
+		dev-libs/atk
+	)
+	dev-libs/expat
+	dev-libs/glib:2
+	dev-libs/libffi:=
+	>=dev-libs/nss-3.79.1
+	>=dev-libs/nspr-4.34
+	media-libs/alsa-lib
+	media-libs/fontconfig
+	media-libs/freetype
+	media-libs/mesa
+	media-video/ffmpeg
+	sys-libs/zlib
+	virtual/freedesktop-icon-theme
+	virtual/opengl
+	x11-libs/cairo[X]
+	x11-libs/gdk-pixbuf
+	x11-libs/gtk+:3[X]
+	x11-libs/libX11
+	x11-libs/libXcomposite
+	x11-libs/libXdamage
+	x11-libs/libXext
+	x11-libs/libXfixes
+	x11-libs/libXrandr
+	x11-libs/libXtst
+	x11-libs/libxcb:=
+	x11-libs/libxkbcommon[X]
+	x11-libs/pango
+	x11-libs/pixman
+	dbus? (
+		dev-libs/dbus-glib
+		sys-apps/dbus
+	)
+	jack? ( virtual/jack )
+	libproxy? ( net-libs/libproxy )
+	sndio? ( >=media-sound/sndio-1.8.0-r1 )
+	system-av1? (
+		>=media-libs/dav1d-1.0.0:=
+		>=media-libs/libaom-1.0.0:=
+	)
+	system-harfbuzz? (
+		>=media-gfx/graphite2-1.3.13
+		>=media-libs/harfbuzz-2.8.1:0=
+	)
+	system-icu? ( >=dev-libs/icu-71.1:= )
+	system-jpeg? ( >=media-libs/libjpeg-turbo-1.2.1 )
+	system-libevent? ( >=dev-libs/libevent-2.1.12:0=[threads] )
+	system-libvpx? ( >=media-libs/libvpx-1.8.2:0=[postproc] )
+	system-png? ( >=media-libs/libpng-1.6.35:0=[apng] )
+	system-webp? ( >=media-libs/libwebp-1.1.0:0= )
+	wayland? (
+		x11-libs/gtk+:3[wayland]
+		x11-libs/libdrm
+		x11-libs/libxkbcommon[wayland]
+	)
+	wifi? (
+		kernel_linux? (
+			dev-libs/dbus-glib
+			net-misc/networkmanager
+			sys-apps/dbus
+		)
+	)"
+
+RDEPEND="${COMMON_DEPEND}
+	jack? ( virtual/jack )
+	openh264? ( media-libs/openh264:*[plugin] )
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4
+		)
+	)"
+
+DEPEND="${COMMON_DEPEND}
+	x11-libs/libICE
+	x11-libs/libSM
+	pulseaudio? (
+		|| (
+			media-sound/pulseaudio
+			>=media-sound/apulse-0.1.12-r4[sdk]
+		)
+	)"
+
+S="${WORKDIR}/${PN}-${PV%_*}"
+
+# Allow MOZ_GMP_PLUGIN_LIST to be set in an eclass or
+# overridden in the enviromnent (advanced hackers only)
+if [[ -z "${MOZ_GMP_PLUGIN_LIST+set}" ]] ; then
+	MOZ_GMP_PLUGIN_LIST=( gmp-gmpopenh264 gmp-widevinecdm )
+fi
+
+llvm_check_deps() {
+	if ! has_version -b "sys-devel/clang:${LLVM_SLOT}" ; then
+		einfo "sys-devel/clang:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+		return 1
+	fi
+
+	if use clang ; then
+		if ! has_version -b "sys-devel/lld:${LLVM_SLOT}" ; then
+			einfo "sys-devel/lld:${LLVM_SLOT} is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+			return 1
+		fi
+
+		if use pgo ; then
+			if ! has_version -b "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}*" ; then
+				einfo "=sys-libs/compiler-rt-sanitizers-${LLVM_SLOT}* is missing! Cannot use LLVM slot ${LLVM_SLOT} ..." >&2
+				return 1
+			fi
+		fi
+	fi
+
+	einfo "Using LLVM slot ${LLVM_SLOT} to build" >&2
+}
+
+MOZ_LANGS=(
+	af ar ast be bg br ca cak cs cy da de dsb
+	el en-CA en-GB en-US es-AR es-ES et eu
+	fi fr fy-NL ga-IE gd gl he hr hsb hu
+	id is it ja ka kab kk ko lt lv ms nb-NO nl nn-NO
+	pa-IN pl pt-BR pt-PT rm ro ru
+	sk sl sq sr sv-SE th tr uk uz vi zh-CN zh-TW
+)
+
+# Firefox-only LANGS
+MOZ_LANGS+=( ach )
+MOZ_LANGS+=( an )
+MOZ_LANGS+=( az )
+MOZ_LANGS+=( bn )
+MOZ_LANGS+=( bs )
+MOZ_LANGS+=( ca-valencia )
+MOZ_LANGS+=( eo )
+MOZ_LANGS+=( es-CL )
+MOZ_LANGS+=( es-MX )
+MOZ_LANGS+=( fa )
+MOZ_LANGS+=( ff )
+MOZ_LANGS+=( gn )
+MOZ_LANGS+=( gu-IN )
+MOZ_LANGS+=( hi-IN )
+MOZ_LANGS+=( hy-AM )
+MOZ_LANGS+=( ia )
+MOZ_LANGS+=( km )
+MOZ_LANGS+=( kn )
+MOZ_LANGS+=( lij )
+MOZ_LANGS+=( mk )
+MOZ_LANGS+=( mr )
+MOZ_LANGS+=( my )
+MOZ_LANGS+=( ne-NP )
+MOZ_LANGS+=( oc )
+MOZ_LANGS+=( sco )
+MOZ_LANGS+=( si )
+MOZ_LANGS+=( son )
+MOZ_LANGS+=( szl )
+MOZ_LANGS+=( ta )
+MOZ_LANGS+=( te )
+MOZ_LANGS+=( tl )
+MOZ_LANGS+=( trs )
+MOZ_LANGS+=( ur )
+MOZ_LANGS+=( xh )
+
+mozilla_set_globals() {
+	# https://bugs.gentoo.org/587334
+	local MOZ_TOO_REGIONALIZED_FOR_L10N=(
+		fy-NL ga-IE gu-IN hi-IN hy-AM nb-NO ne-NP nn-NO pa-IN sv-SE
+	)
+
+	local lang xflag
+	for lang in "${MOZ_LANGS[@]}" ; do
+		# en and en_US are handled internally
+		if [[ ${lang} == en ]] || [[ ${lang} == en-US ]] ; then
+			continue
+		fi
+
+		# strip region subtag if $lang is in the list
+		if has ${lang} "${MOZ_TOO_REGIONALIZED_FOR_L10N[@]}" ; then
+			xflag=${lang%%-*}
+		else
+			xflag=${lang}
+		fi
+
+		SRC_URI+=" l10n_${xflag/[_@]/-}? ("
+		SRC_URI+=" ${MOZ_SRC_BASE_URI}/linux-x86_64/xpi/${lang}.xpi -> ${MOZ_P_DISTFILES}-${lang}.xpi"
+		SRC_URI+=" )"
+		IUSE+=" l10n_${xflag/[_@]/-}"
+	done
+}
+mozilla_set_globals
+
+moz_clear_vendor_checksums() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -ne 1 ]] ; then
+		die "${FUNCNAME} requires exact one argument"
+	fi
+
+	einfo "Clearing cargo checksums for ${1} ..."
+
+	sed -i \
+		-e 's/\("files":{\)[^}]*/\1/' \
+		"${S}"/third_party/rust/${1}/.cargo-checksum.json \
+		|| die
+}
+
+moz_install_xpi() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local DESTDIR=${1}
+	shift
+
+	insinto "${DESTDIR}"
+
+	local emid xpi_file xpi_tmp_dir
+	for xpi_file in "${@}" ; do
+		emid=
+		xpi_tmp_dir=$(mktemp -d --tmpdir="${T}")
+
+		# Unpack XPI
+		unzip -qq "${xpi_file}" -d "${xpi_tmp_dir}" || die
+
+		# Determine extension ID
+		if [[ -f "${xpi_tmp_dir}/install.rdf" ]] ; then
+			emid=$(sed -n -e '/install-manifest/,$ { /em:id/!d; s/.*[\">]\([^\"<>]*\)[\"<].*/\1/; p; q }' "${xpi_tmp_dir}/install.rdf")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from install.rdf"
+		elif [[ -f "${xpi_tmp_dir}/manifest.json" ]] ; then
+			emid=$(sed -n -e 's/.*"id": "\([^"]*\)".*/\1/p' "${xpi_tmp_dir}/manifest.json")
+			[[ -z "${emid}" ]] && die "failed to determine extension id from manifest.json"
+		else
+			die "failed to determine extension id"
+		fi
+
+		einfo "Installing ${emid}.xpi into ${ED}${DESTDIR} ..."
+		newins "${xpi_file}" "${emid}.xpi"
+	done
+}
+
+mozconfig_add_options_ac() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "ac_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_add_options_mk() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 2 ]] ; then
+		die "${FUNCNAME} requires at least two arguments"
+	fi
+
+	local reason=${1}
+	shift
+
+	local option
+	for option in ${@} ; do
+		echo "mk_add_options ${option} # ${reason}" >>${MOZCONFIG}
+	done
+}
+
+mozconfig_use_enable() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_enable "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+mozconfig_use_with() {
+	debug-print-function ${FUNCNAME} "$@"
+
+	if [[ ${#} -lt 1 ]] ; then
+		die "${FUNCNAME} requires at least one arguments"
+	fi
+
+	local flag=$(use_with "${@}")
+	mozconfig_add_options_ac "$(use ${1} && echo +${1} || echo -${1})" "${flag}"
+}
+
+pkg_pretend() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has usersandbox $FEATURES ; then
+				die "You must enable usersandbox as X server can not run as root!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6600M"
+		fi
+
+		check-reqs_pkg_pretend
+	fi
+}
+
+pkg_setup() {
+	if [[ ${MERGE_TYPE} != binary ]] ; then
+		if use pgo ; then
+			if ! has userpriv ${FEATURES} ; then
+				eerror "Building ${PN} with USE=pgo and FEATURES=-userpriv is not supported!"
+			fi
+		fi
+
+		# Ensure we have enough disk space to compile
+		if use pgo || use lto || use debug ; then
+			CHECKREQS_DISK_BUILD="13500M"
+		else
+			CHECKREQS_DISK_BUILD="6400M"
+		fi
+
+		check-reqs_pkg_setup
+
+		llvm_pkg_setup
+
+		if use clang && use lto ; then
+			local version_lld=$(ld.lld --version 2>/dev/null | awk '{ print $2 }')
+			[[ -n ${version_lld} ]] && version_lld=$(ver_cut 1 "${version_lld}")
+			[[ -z ${version_lld} ]] && die "Failed to read ld.lld version!"
+
+			local version_llvm_rust=$(rustc -Vv 2>/dev/null | grep -F -- 'LLVM version:' | awk '{ print $3 }')
+			[[ -n ${version_llvm_rust} ]] && version_llvm_rust=$(ver_cut 1 "${version_llvm_rust}")
+			[[ -z ${version_llvm_rust} ]] && die "Failed to read used LLVM version from rustc!"
+
+			if ver_test "${version_lld}" -ne "${version_llvm_rust}" ; then
+				eerror "Rust is using LLVM version ${version_llvm_rust} but ld.lld version belongs to LLVM version ${version_lld}."
+				eerror "You will be unable to link ${CATEGORY}/${PN}. To proceed you have the following options:"
+				eerror "  - Manually switch rust version using 'eselect rust' to match used LLVM version"
+				eerror "  - Switch to dev-lang/rust[system-llvm] which will guarantee matching version"
+				eerror "  - Build ${CATEGORY}/${PN} without USE=lto"
+				eerror "  - Rebuild lld with llvm that was used to build rust (may need to rebuild the whole "
+				eerror "    llvm/clang/lld/rust chain depending on your @world updates)"
+				die "LLVM version used by Rust (${version_llvm_rust}) does not match with ld.lld version (${version_lld})!"
+			fi
+		fi
+
+		python-any-r1_pkg_setup
+
+		# Avoid PGO profiling problems due to enviroment leakage
+		# These should *always* be cleaned up anyway
+		unset \
+			DBUS_SESSION_BUS_ADDRESS \
+			DISPLAY \
+			ORBIT_SOCKETDIR \
+			SESSION_MANAGER \
+			XAUTHORITY \
+			XDG_CACHE_HOME \
+			XDG_SESSION_COOKIE
+
+		# Build system is using /proc/self/oom_score_adj, bug #604394
+		addpredict /proc/self/oom_score_adj
+
+		if use pgo ; then
+			# Allow access to GPU during PGO run
+			local ati_cards mesa_cards nvidia_cards render_cards
+			shopt -s nullglob
+
+			ati_cards=$(echo -n /dev/ati/card* | sed 's/ /:/g')
+			if [[ -n "${ati_cards}" ]] ; then
+				addpredict "${ati_cards}"
+			fi
+
+			mesa_cards=$(echo -n /dev/dri/card* | sed 's/ /:/g')
+			if [[ -n "${mesa_cards}" ]] ; then
+				addpredict "${mesa_cards}"
+			fi
+
+			nvidia_cards=$(echo -n /dev/nvidia* | sed 's/ /:/g')
+			if [[ -n "${nvidia_cards}" ]] ; then
+				addpredict "${nvidia_cards}"
+			fi
+
+			render_cards=$(echo -n /dev/dri/renderD128* | sed 's/ /:/g')
+			if [[ -n "${render_cards}" ]] ; then
+				addpredict "${render_cards}"
+			fi
+
+			shopt -u nullglob
+		fi
+
+		if ! mountpoint -q /dev/shm ; then
+			# If /dev/shm is not available, configure is known to fail with
+			# a traceback report referencing /usr/lib/pythonN.N/multiprocessing/synchronize.py
+			ewarn "/dev/shm is not mounted -- expect build failures!"
+		fi
+
+		# Google API keys (see http://www.chromium.org/developers/how-tos/api-keys)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_GOOGLE+set}" ]] ; then
+			MOZ_API_KEY_GOOGLE="AIzaSyDEAOvatFogGaPi0eTgsV_ZlEzx0ObmepsMzfAc"
+		fi
+
+		if [[ -z "${MOZ_API_KEY_LOCATION+set}" ]] ; then
+			MOZ_API_KEY_LOCATION="AIzaSyB2h2OuRgGaPicUgy5N-5hsZqiPW6sH3n_rptiQ"
+		fi
+
+		# Mozilla API keys (see https://location.services.mozilla.com/api)
+		# Note: These are for Gentoo Linux use ONLY. For your own distribution, please
+		# get your own set of keys.
+		if [[ -z "${MOZ_API_KEY_MOZILLA+set}" ]] ; then
+			MOZ_API_KEY_MOZILLA="edb3d487-3a84-46m0ap1e3-9dfd-92b5efaaa005"
+		fi
+
+		# Ensure we use C locale when building, bug #746215
+		export LC_ALL=C
+	fi
+
+	CONFIG_CHECK="~SECCOMP"
+	WARNING_SECCOMP="CONFIG_SECCOMP not set! This system will be unable to play DRM-protected content."
+	linux-info_pkg_setup
+}
+
+src_unpack() {
+	local _lp_dir="${WORKDIR}/language_packs"
+	local _src_file
+
+	if [[ ! -d "${_lp_dir}" ]] ; then
+		mkdir "${_lp_dir}" || die
+	fi
+
+	for _src_file in ${A} ; do
+		if [[ ${_src_file} == *.xpi ]]; then
+			cp "${DISTDIR}/${_src_file}" "${_lp_dir}" || die "Failed to copy '${_src_file}' to '${_lp_dir}'!"
+		else
+			unpack ${_src_file}
+		fi
+	done
+}
+
+src_prepare() {
+	if use lto; then
+		rm -v "${WORKDIR}"/firefox-patches/*-LTO-Only-enable-LTO-*.patch || die
+	fi
+
+	eapply "${WORKDIR}/firefox-patches"
+
+	# Allow user to apply any additional patches without modifing ebuild
+	eapply_user
+
+	# Make cargo respect MAKEOPTS
+	export CARGO_BUILD_JOBS="$(makeopts_jobs)"
+
+	# Make LTO respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/build/moz.configure/lto-pgo.configure \
+		|| die "sed failed to set num_cores"
+
+	# Make ICU respect MAKEOPTS
+	sed -i \
+		-e "s/multiprocessing.cpu_count()/$(makeopts_jobs)/" \
+		"${S}"/intl/icu_sources_data.py \
+		|| die "sed failed to set num_cores"
+
+	# sed-in toolchain prefix
+	sed -i \
+		-e "s/objdump/${CHOST}-objdump/" \
+		"${S}"/python/mozbuild/mozbuild/configure/check_debug_ranges.py \
+		|| die "sed failed to set toolchain prefix"
+
+	sed -i \
+		-e 's/ccache_stats = None/return None/' \
+		"${S}"/python/mozbuild/mozbuild/controller/building.py \
+		|| die "sed failed to disable ccache stats call"
+
+	einfo "Removing pre-built binaries ..."
+	find "${S}"/third_party -type f \( -name '*.so' -o -name '*.o' \) -print -delete || die
+
+	# Create build dir
+	BUILD_DIR="${WORKDIR}/${PN}_build"
+	mkdir -p "${BUILD_DIR}" || die
+
+	# Write API keys to disk
+	echo -n "${MOZ_API_KEY_GOOGLE//gGaPi/}" > "${S}"/api-google.key || die
+	echo -n "${MOZ_API_KEY_LOCATION//gGaPi/}" > "${S}"/api-location.key || die
+	echo -n "${MOZ_API_KEY_MOZILLA//m0ap1/}" > "${S}"/api-mozilla.key || die
+
+	xdg_environment_reset
+}
+
+src_configure() {
+	# Show flags set at the beginning
+	einfo "Current BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Current CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Current CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Current LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Current RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	local have_switched_compiler=
+	if use clang; then
+		# Force clang
+		einfo "Enforcing the use of clang due to USE=clang ..."
+		if tc-is-gcc; then
+			have_switched_compiler=yes
+		fi
+		AR=llvm-ar
+		CC=${CHOST}-clang
+		CXX=${CHOST}-clang++
+		NM=llvm-nm
+		RANLIB=llvm-ranlib
+	elif ! use clang && ! tc-is-gcc ; then
+		# Force gcc
+		have_switched_compiler=yes
+		einfo "Enforcing the use of gcc due to USE=-clang ..."
+		AR=gcc-ar
+		CC=${CHOST}-gcc
+		CXX=${CHOST}-g++
+		NM=gcc-nm
+		RANLIB=gcc-ranlib
+	fi
+
+	if [[ -n "${have_switched_compiler}" ]] ; then
+		# Because we switched active compiler we have to ensure
+		# that no unsupported flags are set
+		strip-unsupported-flags
+	fi
+
+	# Ensure we use correct toolchain
+	export HOST_CC="$(tc-getBUILD_CC)"
+	export HOST_CXX="$(tc-getBUILD_CXX)"
+	export AS="$(tc-getCC) -c"
+	tc-export CC CXX LD AR AS NM OBJDUMP RANLIB PKG_CONFIG
+
+	# Pass the correct toolchain paths through cbindgen
+	if tc-is-cross-compiler ; then
+		export BINDGEN_CFLAGS="${SYSROOT:+--sysroot=${ESYSROOT}} --target=${CHOST} ${BINDGEN_CFLAGS-}"
+	fi
+
+	# Set MOZILLA_FIVE_HOME
+	export MOZILLA_FIVE_HOME="/usr/$(get_libdir)/${PN}"
+
+	# python/mach/mach/mixin/process.py fails to detect SHELL
+	export SHELL="${EPREFIX}/bin/bash"
+
+	# Set state path
+	export MOZBUILD_STATE_PATH="${BUILD_DIR}"
+
+	# Set MOZCONFIG
+	export MOZCONFIG="${S}/.mozconfig"
+
+	# Initialize MOZCONFIG
+	mozconfig_add_options_ac '' --enable-application=browser
+
+	# Set Gentoo defaults
+	export MOZILLA_OFFICIAL=1
+
+	mozconfig_add_options_ac 'Gentoo default' \
+		--allow-addon-sideload \
+		--disable-cargo-incremental \
+		--disable-crashreporter \
+		--disable-gpsd \
+		--disable-install-strip \
+		--disable-parental-controls \
+		--disable-strip \
+		--disable-updater \
+		--enable-negotiateauth \
+		--enable-new-pass-manager \
+		--enable-official-branding \
+		--enable-release \
+		--enable-system-ffi \
+		--enable-system-pixman \
+		--host="${CBUILD:-${CHOST}}" \
+		--libdir="${EPREFIX}/usr/$(get_libdir)" \
+		--prefix="${EPREFIX}/usr" \
+		--target="${CHOST}" \
+		--without-ccache \
+		--without-wasm-sandboxed-libraries \
+		--with-intl-api \
+		--with-libclang-path="$(llvm-config --libdir)" \
+		--with-system-nspr \
+		--with-system-nss \
+		--with-system-zlib \
+		--with-toolchain-prefix="${CHOST}-" \
+		--with-unsigned-addon-scopes=app,system \
+		--x-includes="${ESYSROOT}/usr/include" \
+		--x-libraries="${ESYSROOT}/usr/$(get_libdir)"
+
+	# Set update channel
+	local update_channel=release
+	[[ -n ${MOZ_ESR} ]] && update_channel=esr
+	mozconfig_add_options_ac '' --update-channel=${update_channel}
+
+	if ! use x86 && [[ ${CHOST} != armv*h* ]] ; then
+		mozconfig_add_options_ac '' --enable-rust-simd
+	fi
+
+	# For future keywording: This is currently (97.0) only supported on:
+	# amd64, arm, arm64 & x86.
+	# Might want to flip the logic around if Firefox is to support more arches.
+	if use ppc64; then
+		mozconfig_add_options_ac '' --disable-sandbox
+	else
+		mozconfig_add_options_ac '' --enable-sandbox
+	fi
+
+	if [[ -s "${S}/api-google.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-google.key" | md5sum | awk '{ print $1 }') != 709560c02f94b41f9ad2c49207be6c54 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-safebrowsing-api-keyfile="${S}/api-google.key"
+	else
+		einfo "Building without Google API key ..."
+	fi
+
+	if [[ -s "${S}/api-location.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-location.key" | md5sum | awk '{ print $1 }') != ffb7895e35dedf832eb1c5d420ac7420 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-google-location-service-api-keyfile="${S}/api-location.key"
+	else
+		einfo "Building without Location API key ..."
+	fi
+
+	if [[ -s "${S}/api-mozilla.key" ]] ; then
+		local key_origin="Gentoo default"
+		if [[ $(cat "${S}/api-mozilla.key" | md5sum | awk '{ print $1 }') != 3927726e9442a8e8fa0e46ccc39caa27 ]] ; then
+			key_origin="User value"
+		fi
+
+		mozconfig_add_options_ac "${key_origin}" \
+			--with-mozilla-api-keyfile="${S}/api-mozilla.key"
+	else
+		einfo "Building without Mozilla API key ..."
+	fi
+
+	mozconfig_use_with system-av1
+	mozconfig_use_with system-harfbuzz
+	mozconfig_use_with system-harfbuzz system-graphite2
+	mozconfig_use_with system-icu
+	mozconfig_use_with system-jpeg
+	mozconfig_use_with system-libevent
+	mozconfig_use_with system-libvpx
+	mozconfig_use_with system-png
+	mozconfig_use_with system-webp
+
+	mozconfig_use_enable dbus
+	mozconfig_use_enable libproxy
+
+	use eme-free && mozconfig_add_options_ac '+eme-free' --disable-eme
+
+	mozconfig_use_enable geckodriver
+
+	if use hardened ; then
+		mozconfig_add_options_ac "+hardened" --enable-hardening
+		append-ldflags "-Wl,-z,relro -Wl,-z,now"
+	fi
+
+	local myaudiobackends=""
+	use jack && myaudiobackends+="jack,"
+	use sndio && myaudiobackends+="sndio,"
+	use pulseaudio && myaudiobackends+="pulseaudio,"
+	! use pulseaudio && myaudiobackends+="alsa,"
+
+	mozconfig_add_options_ac '--enable-audio-backends' --enable-audio-backends="${myaudiobackends::-1}"
+
+	mozconfig_use_enable wifi necko-wifi
+
+	if use wayland ; then
+		mozconfig_add_options_ac '+x11+wayland' --enable-default-toolkit=cairo-gtk3-x11-wayland
+	else
+		mozconfig_add_options_ac '+x11' --enable-default-toolkit=cairo-gtk3
+	fi
+
+	if use lto ; then
+		if use clang ; then
+			# Upstream only supports lld when using clang
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang and USE=lto" --enable-linker=lld
+
+			mozconfig_add_options_ac '+lto' --enable-lto=cross
+
+		else
+			# ThinLTO is currently broken, see bmo#1644409
+			mozconfig_add_options_ac '+lto' --enable-lto=full
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+
+		if use pgo ; then
+			mozconfig_add_options_ac '+pgo' MOZ_PGO=1
+
+			if use clang ; then
+				# Used in build/pgo/profileserver.py
+				export LLVM_PROFDATA="llvm-profdata"
+			fi
+		fi
+	else
+		# Avoid auto-magic on linker
+		if use clang ; then
+			# This is upstream's default
+			mozconfig_add_options_ac "forcing ld=lld due to USE=clang" --enable-linker=lld
+		else
+			mozconfig_add_options_ac "linker is set to bfd" --enable-linker=bfd
+		fi
+	fi
+
+	# LTO flag was handled via configure
+	filter-flags '-flto*'
+
+	mozconfig_use_enable debug
+	if use debug ; then
+		mozconfig_add_options_ac '+debug' --disable-optimize
+	else
+		if is-flag '-g*' ; then
+			if use clang ; then
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols=$(get-flag '-g*')
+			else
+				mozconfig_add_options_ac 'from CFLAGS' --enable-debug-symbols
+			fi
+		else
+			mozconfig_add_options_ac 'Gentoo default' --disable-debug-symbols
+		fi
+
+		if is-flag '-O0' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O0
+		elif is-flag '-O4' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O4
+		elif is-flag '-O3' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O3
+		elif is-flag '-O1' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-O1
+		elif is-flag '-Os' ; then
+			mozconfig_add_options_ac "from CFLAGS" --enable-optimize=-Os
+		else
+			mozconfig_add_options_ac "Gentoo default" --enable-optimize=-O2
+		fi
+	fi
+
+	# Debug flag was handled via configure
+	filter-flags '-g*'
+
+	# Optimization flag was handled via configure
+	filter-flags '-O*'
+
+	# Modifications to better support ARM, bug #553364
+	if use cpu_flags_arm_neon ; then
+		mozconfig_add_options_ac '+cpu_flags_arm_neon' --with-fpu=neon
+
+		if ! tc-is-clang ; then
+			# thumb options aren't supported when using clang, bug 666966
+			mozconfig_add_options_ac '+cpu_flags_arm_neon' \
+				--with-thumb=yes \
+				--with-thumb-interwork=no
+		fi
+	fi
+
+	if [[ ${CHOST} == armv*h* ]] ; then
+		mozconfig_add_options_ac 'CHOST=armv*h*' --with-float-abi=hard
+
+		if ! use system-libvpx ; then
+			sed -i \
+				-e "s|softfp|hard|" \
+				"${S}"/media/libvpx/moz.build \
+				|| die
+		fi
+	fi
+
+	if use clang ; then
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1482204
+		# https://bugzilla.mozilla.org/show_bug.cgi?id=1483822
+		# toolkit/moz.configure Elfhack section: target.cpu in ('arm', 'x86', 'x86_64')
+		local disable_elf_hack=
+		if use amd64 ; then
+			disable_elf_hack=yes
+		elif use x86 ; then
+			disable_elf_hack=yes
+		elif use arm ; then
+			disable_elf_hack=yes
+		fi
+
+		if [[ -n ${disable_elf_hack} ]] ; then
+			mozconfig_add_options_ac 'elf-hack is broken when using Clang' --disable-elf-hack
+		fi
+	elif tc-is-gcc ; then
+		if ver_test $(gcc-fullversion) -ge 10 ; then
+			einfo "Forcing -fno-tree-loop-vectorize to workaround GCC bug, see bug 758446 ..."
+			append-cxxflags -fno-tree-loop-vectorize
+		fi
+	fi
+
+	# Additional ARCH support
+	case "${ARCH}" in
+		arm)
+			# Reduce the memory requirements for linking
+			if use clang ; then
+				# Nothing to do
+				:;
+			elif use lto ; then
+				append-ldflags -Wl,--no-keep-memory
+			else
+				append-ldflags -Wl,--no-keep-memory -Wl,--reduce-memory-overheads
+			fi
+			;;
+	esac
+
+	if ! use elibc_glibc ; then
+		mozconfig_add_options_ac '!elibc_glibc' --disable-jemalloc
+	fi
+
+	# Allow elfhack to work in combination with unstripped binaries
+	# when they would normally be larger than 2GiB.
+	append-ldflags "-Wl,--compress-debug-sections=zlib"
+
+	# Make revdep-rebuild.sh happy; Also required for musl
+	append-ldflags -Wl,-rpath="${MOZILLA_FIVE_HOME}",--enable-new-dtags
+
+	# Pass $MAKEOPTS to build system
+	export MOZ_MAKE_FLAGS="${MAKEOPTS}"
+
+	# Use system's Python environment
+	export PIP_NETWORK_INSTALL_RESTRICTED_VIRTUALENVS=mach
+
+	if use system-python-libs; then
+		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="system"
+	else
+		export MACH_BUILD_PYTHON_NATIVE_PACKAGE_SOURCE="none"
+	fi
+
+	# Disable notification when build system has finished
+	export MOZ_NOSPAM=1
+
+	# Portage sets XARGS environment variable to "xargs -r" by default which
+	# breaks build system's check_prog() function which doesn't support arguments
+	mozconfig_add_options_ac 'Gentoo default' "XARGS=${EPREFIX}/usr/bin/xargs"
+
+	# Set build dir
+	mozconfig_add_options_mk 'Gentoo default' "MOZ_OBJDIR=${BUILD_DIR}"
+
+	# Show flags we will use
+	einfo "Build BINDGEN_CFLAGS:\t${BINDGEN_CFLAGS:-no value set}"
+	einfo "Build CFLAGS:\t\t${CFLAGS:-no value set}"
+	einfo "Build CXXFLAGS:\t\t${CXXFLAGS:-no value set}"
+	einfo "Build LDFLAGS:\t\t${LDFLAGS:-no value set}"
+	einfo "Build RUSTFLAGS:\t\t${RUSTFLAGS:-no value set}"
+
+	# Handle EXTRA_CONF and show summary
+	local ac opt hash reason
+
+	# Apply EXTRA_ECONF entries to $MOZCONFIG
+	if [[ -n ${EXTRA_ECONF} ]] ; then
+		IFS=\! read -a ac <<<${EXTRA_ECONF// --/\!}
+		for opt in "${ac[@]}"; do
+			mozconfig_add_options_ac "EXTRA_ECONF" --${opt#--}
+		done
+	fi
+
+	echo
+	echo "=========================================================="
+	echo "Building ${PF} with the following configuration"
+	grep ^ac_add_options "${MOZCONFIG}" | while read ac opt hash reason; do
+		[[ -z ${hash} || ${hash} == \# ]] \
+			|| die "error reading mozconfig: ${ac} ${opt} ${hash} ${reason}"
+		printf "    %-30s  %s\n" "${opt}" "${reason:-mozilla.org default}"
+	done
+	echo "=========================================================="
+	echo
+
+	./mach configure || die
+}
+
+src_compile() {
+	local virtx_cmd=
+
+	if use pgo ; then
+		virtx_cmd=virtx
+
+		# Reset and cleanup environment variables used by GNOME/XDG
+		gnome2_environment_reset
+
+		addpredict /root
+	fi
+
+	local -x GDK_BACKEND=x11
+
+	${virtx_cmd} ./mach build --verbose \
+		|| die
+}
+
+src_install() {
+	# xpcshell is getting called during install
+	pax-mark m \
+		"${BUILD_DIR}"/dist/bin/xpcshell \
+		"${BUILD_DIR}"/dist/bin/${PN} \
+		"${BUILD_DIR}"/dist/bin/plugin-container
+
+	DESTDIR="${D}" ./mach install || die
+
+	# Upstream cannot ship symlink but we can (bmo#658850)
+	rm "${ED}${MOZILLA_FIVE_HOME}/${PN}-bin" || die
+	dosym ${PN} ${MOZILLA_FIVE_HOME}/${PN}-bin
+
+	# Don't install llvm-symbolizer from sys-devel/llvm package
+	if [[ -f "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" ]] ; then
+		rm -v "${ED}${MOZILLA_FIVE_HOME}/llvm-symbolizer" || die
+	fi
+
+	# Install policy (currently only used to disable application updates)
+	insinto "${MOZILLA_FIVE_HOME}/distribution"
+	newins "${FILESDIR}"/distribution.ini distribution.ini
+	newins "${FILESDIR}"/disable-auto-update.policy.json policies.json
+
+	# Install system-wide preferences
+	local PREFS_DIR="${MOZILLA_FIVE_HOME}/browser/defaults/preferences"
+	insinto "${PREFS_DIR}"
+	newins "${FILESDIR}"/gentoo-default-prefs.js gentoo-prefs.js
+
+	local GENTOO_PREFS="${ED}${PREFS_DIR}/gentoo-prefs.js"
+
+	# Set dictionary path to use system hunspell
+	cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set spellchecker.dictionary_path pref"
+	pref("spellchecker.dictionary_path",       "${EPREFIX}/usr/share/myspell");
+	EOF
+
+	# Force hwaccel prefs if USE=hwaccel is enabled
+	if use hwaccel ; then
+		cat "${FILESDIR}"/gentoo-hwaccel-prefs.js-r2 \
+		>>"${GENTOO_PREFS}" \
+		|| die "failed to add prefs to force hardware-accelerated rendering to all-gentoo.js"
+
+		if use wayland; then
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel wayland prefs"
+			pref("gfx.x11-egl.force-enabled",          false);
+			EOF
+		else
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set hwaccel x11 prefs"
+			pref("gfx.x11-egl.force-enabled",          true);
+			EOF
+		fi
+	fi
+
+	if ! use gmp-autoupdate ; then
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			einfo "Disabling auto-update for ${plugin} plugin ..."
+			cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to disable autoupdate for ${plugin} media plugin"
+			pref("media.${plugin}.autoupdate",   false);
+			EOF
+		done
+	fi
+
+	# Force the graphite pref if USE=system-harfbuzz is enabled, since the pref cannot disable it
+	if use system-harfbuzz ; then
+		cat >>"${GENTOO_PREFS}" <<-EOF || die "failed to set gfx.font_rendering.graphite.enabled pref"
+		sticky_pref("gfx.font_rendering.graphite.enabled", true);
+		EOF
+	fi
+
+	# Install language packs
+	local langpacks=( $(find "${WORKDIR}/language_packs" -type f -name '*.xpi') )
+	if [[ -n "${langpacks}" ]] ; then
+		moz_install_xpi "${MOZILLA_FIVE_HOME}/distribution/extensions" "${langpacks[@]}"
+	fi
+
+	# Install geckodriver
+	if use geckodriver ; then
+		einfo "Installing geckodriver into ${ED}${MOZILLA_FIVE_HOME} ..."
+		pax-mark m "${BUILD_DIR}"/dist/bin/geckodriver
+		exeinto "${MOZILLA_FIVE_HOME}"
+		doexe "${BUILD_DIR}"/dist/bin/geckodriver
+
+		dosym ${MOZILLA_FIVE_HOME}/geckodriver /usr/bin/geckodriver
+	fi
+
+	# Install icons
+	local icon_srcdir="${S}/browser/branding/official"
+	local icon_symbolic_file="${FILESDIR}/icon/firefox-symbolic.svg"
+
+	insinto /usr/share/icons/hicolor/symbolic/apps
+	newins "${icon_symbolic_file}" ${PN}-symbolic.svg
+
+	local icon size
+	for icon in "${icon_srcdir}"/default*.png ; do
+		size=${icon%.png}
+		size=${size##*/default}
+
+		if [[ ${size} -eq 48 ]] ; then
+			newicon "${icon}" ${PN}.png
+		fi
+
+		newicon -s ${size} "${icon}" ${PN}.png
+	done
+
+	# Install menu
+	local app_name="Mozilla ${MOZ_PN^}"
+	local desktop_file="${FILESDIR}/icon/${PN}-r3.desktop"
+	local desktop_filename="${PN}-esr.desktop"
+	local exec_command="${PN}"
+	local icon="${PN}"
+	local use_wayland="false"
+
+	if use wayland ; then
+		use_wayland="true"
+	fi
+
+	cp "${desktop_file}" "${WORKDIR}/${PN}.desktop-template" || die
+
+	sed -i \
+		-e "s:@NAME@:${app_name}:" \
+		-e "s:@EXEC@:${exec_command}:" \
+		-e "s:@ICON@:${icon}:" \
+		"${WORKDIR}/${PN}.desktop-template" \
+		|| die
+
+	newmenu "${WORKDIR}/${PN}.desktop-template" "${desktop_filename}"
+
+	rm "${WORKDIR}/${PN}.desktop-template" || die
+
+	# Install wrapper script
+	[[ -f "${ED}/usr/bin/${PN}" ]] && rm "${ED}/usr/bin/${PN}"
+	newbin "${FILESDIR}/${PN}-r1.sh" ${PN}
+
+	# Update wrapper
+	sed -i \
+		-e "s:@PREFIX@:${EPREFIX}/usr:" \
+		-e "s:@MOZ_FIVE_HOME@:${MOZILLA_FIVE_HOME}:" \
+		-e "s:@APULSELIB_DIR@:${apulselib}:" \
+		-e "s:@DEFAULT_WAYLAND@:${use_wayland}:" \
+		"${ED}/usr/bin/${PN}" \
+		|| die
+}
+
+pkg_preinst() {
+	xdg_pkg_preinst
+
+	# If the apulse libs are available in MOZILLA_FIVE_HOME then apulse
+	# does not need to be forced into the LD_LIBRARY_PATH
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		einfo "APULSE found; Generating library symlinks for sound support ..."
+		local lib
+		pushd "${ED}${MOZILLA_FIVE_HOME}" &>/dev/null || die
+		for lib in ../apulse/libpulse{.so{,.0},-simple.so{,.0}} ; do
+			# A quickpkg rolled by hand will grab symlinks as part of the package,
+			# so we need to avoid creating them if they already exist.
+			if [[ ! -L ${lib##*/} ]] ; then
+				ln -s "${lib}" ${lib##*/} || die
+			fi
+		done
+		popd &>/dev/null || die
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if ! use gmp-autoupdate ; then
+		elog "USE='-gmp-autoupdate' has disabled the following plugins from updating or"
+		elog "installing into new profiles:"
+		local plugin
+		for plugin in "${MOZ_GMP_PLUGIN_LIST[@]}" ; do
+			elog "\t ${plugin}"
+		done
+		elog
+	fi
+
+	if use pulseaudio && has_version ">=media-sound/apulse-0.1.12-r4" ; then
+		elog "Apulse was detected at merge time on this system and so it will always be"
+		elog "used for sound.  If you wish to use pulseaudio instead please unmerge"
+		elog "media-sound/apulse."
+		elog
+	fi
+
+	local show_doh_information
+	local show_normandy_information
+	local show_shortcut_information
+
+	if [[ -z "${REPLACING_VERSIONS}" ]] ; then
+		# New install; Tell user that DoH is disabled by default
+		show_doh_information=yes
+		show_normandy_information=yes
+		show_shortcut_information=no
+	else
+		local replacing_version
+		for replacing_version in ${REPLACING_VERSIONS} ; do
+			if ver_test "${replacing_version}" -lt 91.0 ; then
+				# Tell user that we no longer install a shortcut
+				# per supported display protocol
+				show_shortcut_information=yes
+			fi
+		done
+	fi
+
+	if [[ -n "${show_doh_information}" ]] ; then
+		elog
+		elog "Note regarding Trusted Recursive Resolver aka DNS-over-HTTPS (DoH):"
+		elog "Due to privacy concerns (encrypting DNS might be a good thing, sending all"
+		elog "DNS traffic to Cloudflare by default is not a good idea and applications"
+		elog "should respect OS configured settings), \"network.trr.mode\" was set to 5"
+		elog "(\"Off by choice\") by default."
+		elog "You can enable DNS-over-HTTPS in ${PN^}'s preferences."
+	fi
+
+	# bug 713782
+	if [[ -n "${show_normandy_information}" ]] ; then
+		elog
+		elog "Upstream operates a service named Normandy which allows Mozilla to"
+		elog "push changes for default settings or even install new add-ons remotely."
+		elog "While this can be useful to address problems like 'Armagadd-on 2.0' or"
+		elog "revert previous decisions to disable TLS 1.0/1.1, privacy and security"
+		elog "concerns prevail, which is why we have switched off the use of this"
+		elog "service by default."
+		elog
+		elog "To re-enable this service set"
+		elog
+		elog "    app.normandy.enabled=true"
+		elog
+		elog "in about:config."
+	fi
+
+	if [[ -n "${show_shortcut_information}" ]] ; then
+		elog
+		elog "Since ${PN}-91.0 we no longer install multiple shortcuts for"
+		elog "each supported display protocol.  Instead we will only install"
+		elog "one generic Mozilla ${PN^} shortcut."
+		elog "If you still want to be able to select between running Mozilla ${PN^}"
+		elog "on X11 or Wayland, you have to re-create these shortcuts on your own."
+	fi
+
+	# bug 835078
+	if use hwaccel && has_version "x11-drivers/xf86-video-nouveau"; then
+		ewarn "You have nouveau drivers installed in your system and 'hwaccel' "
+		ewarn "enabled for Firefox. Nouveau / your GPU might not support the "
+		ewarn "required EGL, so either disable 'hwaccel' or try the workaround "
+		ewarn "explained in https://bugs.gentoo.org/835078#c5 if Firefox crashes."
+	fi
+
+	elog
+	elog "Unfortunately Firefox-100.0 breaks compatibility with some sites using "
+	elog "useragent checks. To temporarily fix this, enter about:config and modify "
+	elog "network.http.useragent.forceVersion preference to \"99\"."
+	elog "Or install an addon to change your useragent."
+	elog "See: https://support.mozilla.org/en-US/kb/difficulties-opening-or-using-website-firefox-100"
+	elog
+}
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index b34fba27b177..e31ed07909ee 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index ce880d5fbe6b..b0b4d4fe7821 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -10,12 +10,18 @@ AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b44
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-10.0.27-src.tar.gz 6154411 BLAKE2B 87a66acacf5443189620af3c8f306e1ae7d8572f9d6ba657379f8a9691c01530e2f1cb17bb1daef5504459480395f4eabdbb626b6da3a879c5a11910029e002b SHA512 ab7c2ae4134ec9652dc0d19343be7d3bf298b1c7a367b51bcceb88f1aaf70ecb45b3a7b9682e2deac70a1e9b00aca974b77110d3363bc5d1c88dc3ae95015e15
 DIST apache-tomcat-10.1.1-src.tar.gz 6061845 BLAKE2B c0069d47dd51b35ed6817576a4d4c888c478708c9788d625e1344579076fb448434b8f5a350bbb63b284cd145275da5a0badd839b4e83fcd32de7710efa3066f SHA512 417415001ff5d20c5c9fbc70c90df492f04d4b86c594da190202c439fd9e75d4cd4a51c5dcc57e525026363a8cbb89826219509ee41a4f05f8ef58a469bfe14c
+DIST apache-tomcat-10.1.2-src.tar.gz 6063352 BLAKE2B 960feb80afd12249301414786d7e502c5f87f78f609dd1335fee4cd8767b7600062ebdd34e6e09735e6c28e1c3eb99d49098917ea720a92bac5f67901f509026 SHA512 446acee71c4a0588cf0d004a35ff107dcbcd7f2e2675cf59bd487aad16768e7e06a41ee56fe58448dde7f518bd9d44cfc70136d1b25dba2fcee6e60b3b191655
+DIST apache-tomcat-10.1.2-src.tar.gz.asc 849 BLAKE2B bb90cb53af6c5725f2bacbdd1e9a35c859803ccba5dc9355d61b02b6b2b4c41593b43f95fff878f295ec8dcd652b36d9245e710b6976ac3157a2fa02cbebef05 SHA512 d1dbd81d2df81430c4fbdfb57e2c1b37295004d89a77542d7cde51eaa3149835941859573d523e9803be7e6aa3a1bb4c008bfdeed45429a76d1b19d6700cbc10
 DIST apache-tomcat-8.5.83-src.tar.gz 6025934 BLAKE2B 29df8c53819d90abf1b1bda3f5c3e6013c354ee847760849d83a5e7ec4a39688f25cc5f8226fe37c235e717761de123e4e480ae834e8f9f37a5c6b5819b9823d SHA512 26dcb71025ab714a4fc78379aeb026e88d1de1b5c268a4a3f753a122127aa738a9b40b2d743799db70c0364d8eb786f0fe3ec9733e8ccf1f22f88ea34d68318f
 DIST apache-tomcat-9.0.68-src.tar.gz 6212265 BLAKE2B 21a7772c0473c016486b4b90c005b65613e79739cf68eaa0c0a0e83c30016f49921816893f8babe42b462538c47bc776630812526c330e7c6360f02a719574cd SHA512 63bb2c42f683c4c5e362b19bda046de172382714e80298106c61cc728feea9681b568450f04cb95d6cae08e5a71933c7755b9b81b706c46d63f4683c2a3a96be
+DIST apache-tomcat-9.0.69-src.tar.gz 6214949 BLAKE2B 21387c7dbc830c5292d5ea315bf93c2faac2160dd21e8524184495e34cee0739ef57ce77ba46c99a64f7389047da431cffe000da9a5db2aabd481e84f149153f SHA512 8178ef757d8a8a04b87a08e0a5d45e2d244fe0c0fd11b8f6b50182da1811758b7e4b1ea52188e4b241278c32737c0f61ed93d53b5a95075ebabb9209fe57a3b1
+DIST apache-tomcat-9.0.69-src.tar.gz.asc 833 BLAKE2B e4002185d7054ff963d0ecb1373afb2affb4795281bd344fa5b707e45dac4c6168cc2365853923a0cca1b5c21806554987513177ed64e01d7905f5d46ee9c581 SHA512 7d9ea8ac9986303bf649781524dd93db22c9ab1101a50be9aad7b4b65f902640b24462117047ddeba99b3652d63e980deaa232f6b93aff2266887a183059ff8f
 DIST biz.aQute.bnd-6.3.1.jar 16703723 BLAKE2B 97cc171a926be326abe95695e795ccb575bc6ca770b4c4df7764bdedbd6dfcf5643673484f50cc34f845f27d03ddf8a971c1c502b3b63db2541266c2b35e8e23 SHA512 59d3a50575ea8fcfc5f5c2178f7d40248c987c77ae8afeb0a8c9ec397ce9e4ceae277ba3b26dafc245bd2185bbafeaef219dd1af0988921631b6a8fe0cbd0abf
 DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672ed9cb0aa5d9dfca3361033a7f37646bb65bbea8be4ef1fb425518e85ec8a9cc63032815671ece5f956b754ecf555dc174 SHA512 7c3f7bc0280beb1b15182c558ef23f431719c046da8473545efe9aeec935776ebf6682cabbb7e7f53dcf2ccca168d8df35859be77121dab04340a5ec7e993608
 EBUILD tomcat-10.0.27.ebuild 6470 BLAKE2B 14ca531ac0064810e68fe873a176d0a2fd64e411c2ff06f5c7195d8b6b80a61698fbf4c2bfd1bb5ff1f92784f2ddd89eb55f88eb40dbd33b2dd188e71c518c31 SHA512 08f574e72d42b649335dbf06d392d98e0070cc32776cbb5bd92c4449c0d62dc8db0d9f57fd485aa994a1ceacaf10fb5e136c4e9ff06e753a19ce93ac2a0b0213
 EBUILD tomcat-10.1.1.ebuild 6137 BLAKE2B 64b61e8f50da6825231660c690abe13117445ad0203d2487732f51b8a01dbd3d67709f81b0dfc36d067b4082f2c70b463daf7932793e5f34fea1a0e52764c646 SHA512 85bf9f1f084fb57fc0a276412f25fdec428c7fe41923c5261cb57abfd50ae79a489b01fd5565fa1b851f398b3b50f779c163bc6c548bf3a9df2cf4ac30ad3c50
+EBUILD tomcat-10.1.2.ebuild 6536 BLAKE2B 60b4f1335795797298350554dae1c0bc68acaaf4c5af99fe2379cfce0a2b07aee8dc4d49f39c4d7fd2c2781acc31191d51a49211bf6615615c43929b0745414e SHA512 b239cac14c628bf9b493d7698be774bc82613d3d33fa4c2d396c0aa2081f79c8dbb95edb0a9fbc8fe43d3c68cc99db91d5494cc27bced58f7d23e35a15f8b8ca
 EBUILD tomcat-8.5.83.ebuild 5137 BLAKE2B c0bb842eb6e512c6c9d80bc9d923ebeceaeec1050e303bda3fccb2bec95ea91d161cc6acc8c56eac021b37afdaded605957c95c4c8fd69f1c1a004107ae9a722 SHA512 ec301c95e37dc392366f6fd709b6ebc20d13989a38c9347945045527a25ae45a76f7f041a9045b9be1f4febc7f3b90829f1d9ad54fe9efa759a5149d58985f0e
 EBUILD tomcat-9.0.68.ebuild 6034 BLAKE2B 0be969bd2004cfff3eef0b9b93e9d05a75e18af5458c9c3a13c88b16924b37580ed0450f491733096412262907d9b85d6a9751b1fed5278a06f32c76d98dadd0 SHA512 ed582425adb690fd5eb4c5df39b29c58cbf4219ff688c3154df368889218b8799efc145c871ebb3b1bf61199a67db24918b38ea86d2b63386ef230e2fa9437c1
+EBUILD tomcat-9.0.69.ebuild 6425 BLAKE2B bbc5902443576230cefde4bd47d11bef3b1bf75c7ff9cb9f6151f321bc09ff3b954083152dcb2d4e53ca2d4b3e3e5ae4b3d67d93a8267ebfd65ee2261b490bd2 SHA512 5249e462b7ee53a2438bfe8bbc82d52aa078cda5944e1ffdaba2eb1c7f034310a63b5f093d6ab211690a71c4cadc0f90c29170355ab7c174c79692ad62a508db
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-10.1.2.ebuild b/www-servers/tomcat/tomcat-10.1.2.ebuild
new file mode 100644
index 000000000000..9be9150ea919
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.2.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.3.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="10.1"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.25"
+SERVLET_API_SLOT="6.0"
+JSP_API_SLOT="3.1"
+EL_API_SLOT="5.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/glassfish-xmlrpc-api:0
+	>=dev-java/jakartaee-migration-1.0.5:0
+	~dev-java/tomcat-el-api-${PV}:${EL_API_SLOT}
+	~dev-java/tomcat-jsp-api-${PV}:${JSP_API_SLOT}
+	~dev-java/tomcat-servlet-api-${PV}:${SERVLET_API_SLOT}
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/jakarta/{el,servlet} || die
+
+	eapply "${FILESDIR}/${PN}-10.1.0-build.xml.patch"
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SERVLET_API_SLOT},tomcat-jsp-api-${JSP_API_SLOT},tomcat-el-api-${EL_API_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "Please note that since version 10 the primary package for all implemented APIs"
+	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-9.0.69.ebuild b/www-servers/tomcat/tomcat-9.0.69.ebuild
new file mode 100644
index 000000000000..6a59dd70b4ee
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.69.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.3.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+# though it could work with 4.22 and upstream uses 4.20,
+# we still use 4.15 because 4.20+ is currently built with java 11
+# and it would force Tomcat to use at least java 11 too
+ECJ_SLOT="4.15"
+SERVLET_API_SLOT="4.0"
+JSP_API_SLOT="2.3"
+EL_API_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/glassfish-xmlrpc-api:0
+	~dev-java/tomcat-el-api-${PV}:${EL_API_SLOT}
+	~dev-java/tomcat-jsp-api-${PV}:${JSP_API_SLOT}
+	~dev-java/tomcat-servlet-api-${PV}:${SERVLET_API_SLOT}
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=dev-java/ant-core-1.9.13
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	eapply "${FILESDIR}/${PN}-9.0.62-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SERVLET_API_SLOT},tomcat-jsp-api-${JSP_API_SLOT},tomcat-el-api-${EL_API_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
author	V3n3RiX <venerix@koprulu.sector>	2022-11-15 18:53:15 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2022-11-15 18:53:15 +0000
commit	57e62db33bb33adb6593a2be7b3a5990aaf01f56 (patch)
tree	704b2b7ce3d7048511ed7400b090f035b81fbbb1
parent	8b256c06858dd62dc5a70f801c732e9ab8226123 (diff)