gentoo auto-resync : 05:09:2022 - 10:24:06

189 files changed, 2946 insertions, 1812 deletions

diff --git a/Manifest b/Manifest
index cb6c73cbe0c0..b5160cef661a 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29577 BLAKE2B 9681a7130b42e804e5523e157bb2220c241e4be03477008d0402b1e09f8bf5d3c95bab3fb3b1829eff165021c5307f269ff5c84e3f50c79785cd5ea411531d7d SHA512 932bd8519171250993ae3c5029d6c14ffc989c49a3257b5384a6269e98caffa4c8029693abbd8406f37edbc695edf09a0afcbeb25e2df70ea5788670dc651358
-TIMESTAMP 2022-09-05T02:39:56Z
+MANIFEST Manifest.files.gz 29584 BLAKE2B b436795406b5cc5bbc1b53ea09a2ea74a2f09a252a83d5a99cc448d368ac8ecf41c3e66758725593e5005a6a30cd4f3943f28da1aa1cffa495508114ed951b58 SHA512 771cc65189bb2073cf0af6b92d7f4d4555c4ee15d1849290fd1bd6b2011f94fd4bfede871359e9b782d251a5dd377b4542a5f39282ff6353f5c7c80e1a6ddd19
+TIMESTAMP 2022-09-05T08:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMVYXxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMVtdlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBdBQ/+OedEl13hByh3FMXN1cfUgO5Yxz2sEnHL7T6qm3rAwQG5SVR06BPeMn0C
-6MGJ8F7XfRCmJmqnXKGcZtXwDZ5WOYLb2snwncrV4PChQFYiFjUuzlwnmict7mwG
-zETmQuvsmIwHddbN8M19TUIfciy1IuwcHhUalAS0cnsZ89jkuRLn7UF6LRqijqbZ
-0ZsoJIYmzzmmrEYzZM2o98B4Y9h68Db0aBYADCQHTDlGQgrDEHT8syVIlY8XOsBd
-/CgVxN6X7nMd0otPMdcx92x2lMmfjvWXLVpt1ZOCo7EwJezp8mIvT6rC+/p6MjF/
-P6ObsEXYg1CqwgNcj4Myegg5Jw+RhCjLYEedOsWzYwDpV4FngjybB0kpTi4DHDCW
-8TpMEzpA+PEYt1zpOnBDZFcoZ+zO7QPcU8PJmYusl04brdIA1OxjT4r3U2BoXBYz
-JN5eDDagqswuLoevnsYuF5OrKZOEImd1/eLMRUeJQV+3fHFzIuKH4RdPUQqjDVwA
-Zx+QCKHyyEHI2vWHSOgG8cPsHX6F8z/oQC/TsPRUh/9YKu3mGCaKhdCZupG3dSiM
-AzH68mu5xPVZ0t8fEtEmddZi8n6j1a9v+r1I93lAPzTT5gALGNgmoZCU/ptHsyR3
-A92EmrohYAvf4or0HUMEUJ/+SyRNdva9Dm8Mcl8MV+C8+T0UXO0=
-=VVu5
+klD5SA/+L5/t704qHA+hZqMaOei95HOb4u7/pZHbESroEqqYU5ysn3hEoLOO5LOI
++l8BnJBN4ngHyQZIUkJYQVAB9TB6ioE5qHLr+sNZhc0TdNiUtVszmw1158P/qz6s
+KinUtvmPu1m7BG/Oj7ftnQbl4UqxPnC1jJK0nmcKMEwOVMCDtvXA8vHA4XcpYp8o
+7j+GhiKmp475OrE7UJAdLnrIwmYR0vwrTBAm1lkPrU2qSC10VljtCNEw+g4h0WkT
+GP9rrCdKdv8IQTUkfSPppC72+4hOiwSI+2G9Lt+HL28PWFpnCDgosVUEmuJCOZOk
+1aFtl6VOy4arNhr+LDE5FOos2F1B0CD5FHmag4jZcr9jgfysd+FySEZTf219dbYO
+Jieo8tOZtVxRs+0IawneFWhpE0cVo6wn6A8XH8T5ORYCg8vXiT3jCekvUf/LViEH
+Iuj7b+iCgEwXTNo6J395Ct0zLfhRs+6+6lIGz5WjXrbSzPEoht7lcTlnbJnQgCKe
+tBMkNM+rq2Z91C209Xyv4M5Szf5Q4es2wpnxDZRR0BmTJkUAd+tQADgp9wEVEQmQ
+2mG9qgQZnhnEdjPihGk62WwfImagByNQCPn+EmJDqctY66lRQRMd2pblbiS0r958
+QrktIuyHA3bVaMhaMP9b4J6OExP46e88KGuHd9KdbhB2HxmcKa8=
+=lfpF
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 046e3ce61b6e..eacdac94a2c1 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-crypt/Manifest.gz b/app-crypt/Manifest.gz
index ee4166205e11..8249c1cca88b 100644
--- a/app-crypt/Manifest.gz
+++ b/app-crypt/Manifest.gz
diff --git a/app-crypt/signify/Manifest b/app-crypt/signify/Manifest
index 80b000642954..371dfcb3e5d9 100644
--- a/app-crypt/signify/Manifest
+++ b/app-crypt/signify/Manifest
@@ -1,10 +1,5 @@
 AUX signify-30-man_compress.patch 576 BLAKE2B b6c82f0737dcfd569bc781d84eaecad2c0130ce3397b12adc043cd65f8ff709b2a9021e2f0ed962d6a92e24e59fd04376fd55d38376e5bfa8caefd329fe23ee3 SHA512 23f01a3509912aa8a3ec8e77ec85cfa9f78df2ef11f15b9422fc1e8a93f13da800e333005e4e053ad8e586606eb151efd71983aca50834e89181a7b7b2862c07
-DIST signify-30.sha.sig 246 BLAKE2B b5c26ad1d90ce562a5e6e8cb0a26c031da6bcc9d04cdd668f7b81410ba38ef1777db8f1a4b38fc515c251c840baf38e3df6b3f730a59a0921180ccb88f457fe5 SHA512 b0aea8736b4508ce5a45a296e11150218d694351b15d87478cad235869a6b0150d1893247d1600ea1679d47e71e87e629f5cf4932ecafa2ad4f05aa962f1743d
-DIST signify-30.tar.gz 94593 BLAKE2B 2d432cef9990a8ce23d0f05449ef02dcf7a00f4328a25dcab98cd25c2c74875fd8ea7ed7a67b7e4ac6c9f432a91564edcc1fc9260627c37352c19cc17581aea3 SHA512 4a1ebcdbf7aa74865b97cadbf5380460702306b6d0a77306e6c943bb0c3419ca929ecd3455522da4448d780a56c8eddeb26fb4d7fb006fc3bf23f69693c39e87
-DIST signify-30.tar.xz 73824 BLAKE2B 27de72ac82d9b66346185292cad71e57af0767111123ba0c618a7d5d4add2e5502b546ffd53ffa2956c66b8f00d2b1a96d21958125d5649d6efb23254c0f56ac SHA512 e760fd89de8a3fea76bd0aa52c683e1d331968620190f4ac487bbca30da00f8d6e2636bbe3c59b0e6fa925b1bbcf81516f50c0bc37707ae7e7465b61fee5c372
 DIST signify-31.sha.sig 246 BLAKE2B bb2dc91aeaa6dde10a1cc43f26385479509ade9d02ea6839b3305ae51623f60c281ca881097b66839b6e3297bdf25d4b2daa1e49b82ea0cdfbf628c7e21f7f28 SHA512 c83453a81382b8841054c749fdaef8d122edc9a96a0a92cead8f7141dcb57cfe18770e7777e7dcd1908ddc7d4c747088d5979537a3484b0859ce8d530db6d65c
 DIST signify-31.tar.xz 83480 BLAKE2B 090d0b326d549cd89f6f8fd86063455670d1d3915a8ab31ddc732cabb0b72b6ba8e00b3354b61369bde7caeec67eef41c012be66dd2e3212112f9a97cc63afbf SHA512 f39597ea278a7eb10b786909752fde59e16405f0bc76c9906f8014e9e7f6801b4733479eec765fb960b6062359954caf54a3460ff67258a9cff93fa978951962
-EBUILD signify-30-r2.ebuild 1181 BLAKE2B 2879a19c8cf90ff0fa5e3d076edab26c686af9c368e6beeef77cb039ae5ea7f32b4a7115b04d7650d16cbf695b6a1f198d7b070ad0e790f19c255e835ee19707 SHA512 3b5f3ab4508e9d7e3bf4e7521aaecf37ebafe6e00f0b86c03f0acd9f998f7d32d392b9c5dbd47f10d83d85764cde033d4bd3ed7dac8f80b61169342536ae02c4
-EBUILD signify-30.ebuild 616 BLAKE2B 970eeb3f56883853c77608f81af3f712d8057bb71cd5c99565a551a5e1a267358cf21e52c9e020461c8cfff09b18170cb3fb26645e8c811f9694e3169494de89 SHA512 3973c9115bf57c8582575a3791dae541bd3125241b0bfee2c046c795e627d818db8910fba83acb997fc8c27525df172908c136435006bc3fd4da571d5611f0b1
-EBUILD signify-31.ebuild 1185 BLAKE2B 9da9cf76c84c85ef47558394e771f1b2eea343e2f652838db99c2d16aedc4a0114964cab8c1f1b774af71ca3eb96f9b1c634ed0cb36eb1f6254e2bf9fcebfb01 SHA512 8efc3dfeb8a328e8ff7839e32714cef63e75e840854800487cb3a02fc405872f2623d9e302e4becb0e188da2682bdffef411c53b05c5bd0d0192fb36e8bff117
+EBUILD signify-31.ebuild 1191 BLAKE2B 4d4c082642702cd30aeb8e77c587551a062603578be5382faaf8a02a24bfa1c4257b871aa747a000bad4b737e42fc8a50faa5d98ed1e6ee3afbb4bbf719f395f SHA512 a156daf506e87c92684ee78478e45ab6ada593740914bd3a55ee1433056f9d3fec53f72326956d88c67eb59eee5699d711ee20154963f5da812f986da906425e
 MISC metadata.xml 437 BLAKE2B 75f7f8a4b2475b052a41134e41ab274386c5f59847bad67ad3d8bd447984a2b42a119bbc60b13df0ebed9988f98ea5382c4aff4fa093cf44c7c8d2907d0db26a SHA512 ce3b623779a2b51556bb440df1b08f386f9fcdca641d1c0b06b3c2f0d1e98649ca8b45d8b32406f7b2b53a6f781c58121da09802c1fedb76e0c604c0a3627f44
diff --git a/app-crypt/signify/signify-30-r2.ebuild b/app-crypt/signify/signify-30-r2.ebuild
deleted file mode 100644
index 242864f55575..000000000000
--- a/app-crypt/signify/signify-30-r2.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-VERIFY_SIG_METHOD="signify"
-inherit toolchain-funcs verify-sig
-
-DESCRIPTION="Cryptographically sign and verify files"
-HOMEPAGE="http://www.openbsd.org/ https://github.com/aperezdc/signify"
-SRC_URI="
-	https://github.com/aperezdc/${PN}/releases/download/v${PV}/${P}.tar.xz
-	verify-sig? (
-		https://github.com/aperezdc/${PN}/releases/download/v${PV}/SHA256.sig
-			-> ${P}.sha.sig
-	)"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86"
-
-RDEPEND="!net-mail/signify
-	>=dev-libs/libbsd-0.7"
-DEPEND="${RDEPEND}"
-BDEPEND="verify-sig? ( sec-keys/signify-keys-signify )"
-
-PATCHES=( "${FILESDIR}"/${PN}-30-man_compress.patch )
-
-VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/signify-keys/${P}.pub"
-
-src_unpack() {
-	if use verify-sig; then
-		# Too many levels of symbolic links
-		cp "${DISTDIR}"/${P}.{sha.sig,tar.xz} "${WORKDIR}" || die
-		verify-sig_verify_signed_checksums \
-			${P}.sha.sig sha256 ${P}.tar.xz
-	fi
-	default
-}
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX="/usr" install
-	einstalldocs
-}
diff --git a/app-crypt/signify/signify-30.ebuild b/app-crypt/signify/signify-30.ebuild
deleted file mode 100644
index 01339391bfa5..000000000000
--- a/app-crypt/signify/signify-30.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs
-
-DESCRIPTION="Cryptographically sign and verify files"
-HOMEPAGE="http://www.openbsd.org/ https://github.com/aperezdc/signify"
-SRC_URI="https://github.com/aperezdc/signify/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="BSD-1"
-SLOT="0"
-KEYWORDS="~amd64 ~x86"
-
-RDEPEND=">=dev-libs/libbsd-0.7"
-DEPEND="${RDEPEND}"
-
-PATCHES=( "${FILESDIR}"/${PN}-30-man_compress.patch )
-
-src_configure() {
-	tc-export CC
-}
-
-src_install() {
-	emake DESTDIR="${ED}" PREFIX="/usr" install
-	einstalldocs
-}
diff --git a/app-crypt/signify/signify-31.ebuild b/app-crypt/signify/signify-31.ebuild
index 9b491af44b8d..7f3e660468a9 100644
--- a/app-crypt/signify/signify-31.ebuild
+++ b/app-crypt/signify/signify-31.ebuild
@@ -7,7 +7,10 @@ VERIFY_SIG_METHOD="signify"
 inherit toolchain-funcs verify-sig
 
 DESCRIPTION="Cryptographically sign and verify files"
-HOMEPAGE="http://www.openbsd.org/ https://github.com/aperezdc/signify"
+HOMEPAGE="
+	https://www.openbsd.org/
+	https://github.com/aperezdc/signify/
+"
 SRC_URI="
 	https://github.com/aperezdc/${PN}/releases/download/v${PV}/${P}.tar.xz
 	verify-sig? (
diff --git a/app-editors/Manifest.gz b/app-editors/Manifest.gz
index 6d0830f1be2a..8029fb206c79 100644
--- a/app-editors/Manifest.gz
+++ b/app-editors/Manifest.gz
diff --git a/app-editors/mousepad/Manifest b/app-editors/mousepad/Manifest
index 27ef25dcc76f..e96755939a8a 100644
--- a/app-editors/mousepad/Manifest
+++ b/app-editors/mousepad/Manifest
@@ -1,5 +1,3 @@
 DIST mousepad-0.5.10.tar.bz2 959696 BLAKE2B bd21145f23f1e92d67489a3ffcdca0afd977aa639706dece5aefd2f5417d2b2122accc1a5c727ec13a4c2f311ec479612953006d78b5509e836f360566d0d320 SHA512 144e72abce8e5fb66a345fb59efe48f136dd9cf9cdcd72496dcee05b08781bdbba036f4ab5af04dbccd38dc52a8e8dd67b5b7434867881a1114de692a012b076
-DIST mousepad-0.5.9.tar.bz2 953685 BLAKE2B f8db50048964c789600ce6d310f6b6a893d7d4406d55f0666b7e78bf3e54446d3ec56eb70a059da6fac367d7c3f3fc5861fb29dadf28aa9b0d5e2f62056f3dfb SHA512 915fa1c89d66f793c4dba7826b4934e286e940dbdd9c933bddeeaf76be79d2140cd0feb1dea2946989879ec354d57af36fd61517309ebd4915f18be4b9cf621f
 EBUILD mousepad-0.5.10.ebuild 947 BLAKE2B c793877ea4e4e4c328e8634ff4ea536c79380e6885a8379650a627ea6a89cb06361283d3e550889547f5ebc74e306e4008601bd861c7bf724ccb5bf5eb952241 SHA512 f5888cf8f1291f328e004309ff10a94f9ebad522a56bb4aded0b260ca3ce6f1a473e7734a01b9824c3f5588f87154aed529cfd2269810dfb2fd3f843b2b8974e
-EBUILD mousepad-0.5.9.ebuild 946 BLAKE2B 3ea45bef3fde8b9e30342276e0ae7c10f6d42c6a6b3d4a5c5fa6b047eb8f765782ff7c26afbc799c4ae2ae4805046df0db3a0acc970ba6b8444a43ed284adad6 SHA512 711b0e18c58a879021f423e7ef714761720b285e377522fa33fc8b25ba2f1eb58e66c2a243a3a1287e0eb1720900e4a269c0752283930d225a4ce0a5790075c0
 MISC metadata.xml 242 BLAKE2B e489d8bd8fc709502185e0439171cde4402146bc1ec7340bbe41550c06410a49faec8777cb7e79c3ba482feee774350beec5741ed8fe93a85ebed7b746f9200e SHA512 1bcfaf0482a1e7b5a7182d853dafaa2d47687bbc1c9d38b69ba35ce97cdeeff9bd2137a086c5af2a27b730a295e7cbd73d0b43fbe5af331bb7a3113d2117dff3
diff --git a/app-editors/mousepad/mousepad-0.5.9.ebuild b/app-editors/mousepad/mousepad-0.5.9.ebuild
deleted file mode 100644
index 5cca94e36155..000000000000
--- a/app-editors/mousepad/mousepad-0.5.9.ebuild
+++ /dev/null
@@ -1,52 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit gnome2-utils xdg-utils
-
-DESCRIPTION="GTK+-based editor for the Xfce Desktop Environment"
-HOMEPAGE="https://git.xfce.org/apps/mousepad/about/"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ~riscv x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.52
-	>=x11-libs/gtk+-3.22:3
-	>=x11-libs/gtksourceview-4.0.0:4
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-lang/perl
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		--enable-gtksourceview4
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	gnome2_schemas_update
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index a1bfa7eea274..2eda73f5f7b6 100644
--- a/app-emulation/Manifest.gz
+++ b/app-emulation/Manifest.gz
diff --git a/app-emulation/xen-tools/Manifest b/app-emulation/xen-tools/Manifest
index a42a299205ae..9a2aa2dd63e5 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -25,7 +25,7 @@ DIST xen-4.16.2.tar.gz 44995249 BLAKE2B a221d1e4578ab6eb3250754b3b0f36fb30133c1c
 DIST xen-gentoo-patches-4.15.3-gentoo-patchset-2.tar.bz2 4681 BLAKE2B 59fe5c2d5f3b975f281778ee96f8771debde7ae738636fc8294e7e2578dffc40938d8c48e4e94f0341762b2ba8e1b6769f71b7783322fb3b2a0a187bbf2b5104 SHA512 8540aa3631277fb652f90c53f6f5b4e9d119a7ed267dec96d7aecca4eac2c465ec3be32b0b82057e79f858cc8115bfdfbf2af5c4879a0be3f98ed68cbe64fdae
 DIST xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2 5403 BLAKE2B 7fa3b4aa123b2deed260d02b8d34a35dd205207038edb92569278b25c6fe32e0f0e3857c07755553e047f0eb0d9fe7f8b0816e0f3d7f68aee7929afaf6611dfd SHA512 9e7d25640b24235acf756b031b8b7cee582dded65fe7b94a706c990232e9704d574036c3a9605f285e8e9534578d100a3f38719b27b22775f17ef8f68287997e
 DIST xen-upstream-patches-4.15.4-pre-patchset-0.1.tar.bz2 28980 BLAKE2B 5bdabed3bce4306fe5f656a965d1e537608c03b4706dc801a0b0b9649d001b875b1a2543c68c6b459483991570f0fbf2490a97ea1776761c9f61e9876f240fdf SHA512 4f6bbf0dab57ad58292f32fab55294b2eedd0442be7f62341a2df922a1d21880fe33cc29956ccbbb8b4aee4c10b38d4aa090e4db9496d6e0f5256e60999cad7d
-EBUILD xen-tools-4.15.3.ebuild 16673 BLAKE2B 5564ae42258c6eb413b4b29730d6fa5823f4479dd8b483d2ef093ab1d1ae9e234d3b42bcfd1fdb1667f0584604cc54fcef76be6f2bb03e862fc8302053e89999 SHA512 9c774445827cca9995f488e1bd5ae37a6a3402774e45c62a984fc3331ba53f5546f664504fb487474e4dd856f541263dc1de1ffbd909b6a1318db24916e0dc65
-EBUILD xen-tools-4.15.4_pre.ebuild 16707 BLAKE2B abed0efd8aeafa933f1a94edefa27dcb0b0e4ff9537639742a4d492174ab14dd612329b125cdd561c5ff0b72d710c6d553ef8f1dde39824d24840271c9197bd1 SHA512 8c90c61f52e76b8d4ad2db5eb43a98f61868cf8dbb49bfb5bef3148368166191066c1874c7889ab5db6c92520b99fb7ac7fbe604592cd5025c08cf2677933ad7
+EBUILD xen-tools-4.15.3.ebuild 16676 BLAKE2B c29d32c15877a708566b0482700c856ca39f2607767880c725e623357298847aca14f0b112e51c455821bfc2c090fdc6b47b170cfa95b03598fe6c820964677b SHA512 8b20304ee4a260e0d41bbf651271c315c6529a3ff61daf5c160adb1126423ee80abb93adad22b2d62bcd6c27994de3dc219630c4f385f2b1e2e9c6100e44a2d0
+EBUILD xen-tools-4.15.4_pre.ebuild 16710 BLAKE2B d6be1bdabbdffb3526328ecdcde48deb5ee9e1a3af79dec74d5de167598d08f25cfe047a68ac2f9695b06aba7a0d5c4374b95e3dbe6b668ddf7b40e3a6ad74a6 SHA512 887a46957b03ae5ab1e9e8897eaec3e368d3c6841bb7aa005e46b0a0ff2ea9b4a6ba0768d89f6d507920c6d02c0951225d66ceaa27ebe55a6c45f1ceef0d0da2
 EBUILD xen-tools-4.16.2.ebuild 16190 BLAKE2B 834bdebc9fa33ff472f464f43fcdcd5d79702d0dd2763198e3edcfdb365f91c9cba4fae40f7a7dcefded1cc5f878b86b970d028859d5172bc07c6a495a3b91a5 SHA512 703947a7722cd40f8cbb7e9fffdca6f08c9042302aa179c78360cce7a39a47e118c5c4400a60f3b135f9a1c12922022524b07ecfa4b015507843e5cf2c99484d
 MISC metadata.xml 1562 BLAKE2B a619e34e6fec4c6ffc00fd098dc040c5bb464ed7f2032db2e933fada0614e82c21269175f37720a123404551474e2aeeb2728b405ff93f9b4d9d092d027e0839 SHA512 f45c793a4b4819f0e50501ddc85acdaf99e4d675530712f8dccfb5166d071ae8ed07917a61d56037d6ba3a54123f72f4512d8c11643ea8c6e507feb9d29594e7
diff --git a/app-emulation/xen-tools/xen-tools-4.15.3.ebuild b/app-emulation/xen-tools/xen-tools-4.15.3.ebuild
index 6c9c7c9fec49..51f8fe6fefe4 100644
--- a/app-emulation/xen-tools/xen-tools-4.15.3.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.3.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='ncurses,xml,threads(+)'
+PYTHON_REQ_USE='ncurses,xml(+),threads(+)'
 
 inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
 
diff --git a/app-emulation/xen-tools/xen-tools-4.15.4_pre.ebuild b/app-emulation/xen-tools/xen-tools-4.15.4_pre.ebuild
index 6e8b7325cf79..222cfab5381e 100644
--- a/app-emulation/xen-tools/xen-tools-4.15.4_pre.ebuild
+++ b/app-emulation/xen-tools/xen-tools-4.15.4_pre.ebuild
@@ -4,7 +4,7 @@
 EAPI=7
 
 PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='ncurses,xml,threads(+)'
+PYTHON_REQ_USE='ncurses,xml(+),threads(+)'
 
 inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
 
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index a1fde60b896d..5e9bf6d12aac 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/jffi/Manifest b/dev-java/jffi/Manifest
index f198d0f9e445..168085968725 100644
--- a/dev-java/jffi/Manifest
+++ b/dev-java/jffi/Manifest
@@ -1,12 +1,5 @@
-AUX jffi-1.2.8-junit-4.11.patch 700 BLAKE2B 4533e3a8d6a5921b1e39ea20c9b4dcbbc66d08a3d0ce2494ed22e5af753f0cbfbc5fa064f19877816e2cc44c666c48aa5a1f8be44fe8dcc7a9368f033acf8828 SHA512 9cc2d41665ec3c2271d6c1c2e66dbfb506922a290e906df51fa66c61c918e1835dcb93313077fac92a8a622f132dfee08cf3b79ebce0be3a4b104c1cbcda5ea9
-AUX jffi-1.2.8-makefile.patch 1451 BLAKE2B bd6ae6ba8f509880e33e603eb98d8a8dca2786c2440bea6cc27c736caaf26170cfb4cd17af83d72d2c09c8ec70e65ef820bc990e9617c14fa5979e9e571e7d19 SHA512 b31031f4039cbd5ff7083321c17e8d5459c56b01c6cc2be3a45b81b2a3ee8f40b1ac0a2bd5df390887fae2026b4c87c1be060d0b01a3b2acf28950f1a06cd253
-AUX jffi-1.3.6-GNUmakefile.patch 740 BLAKE2B baeea64e4fadd0d76aa9d4a38fe48115365a3dd1bb9aecbf4e5c9f676de2e8928896e6423437190ccd01e38fd1a32c254ebd1f6a8965215e957b3b8f973628fb SHA512 315272b6a4762d5df76f5dbaef1a542c6a1808166883b245b85c9813ad665d9e30298693ddf079c10770f7757c75bb7ecd7c6ca73c3bb6444d2597a8a06124e3
 AUX jffi-1.3.8-GNUmakefile.patch 805 BLAKE2B 9c9c1f8daeca9527dd364c303311554004ed6f0b7964bfa68f004bfd6f3aa39fb817d88afc82c4710226c25d752c55c2e43002fe7557d6c7c705a60bf4903543 SHA512 f1ff970c7dd8630a8fcadb1689034a28dd407f3c7efc4df4b6dad2c458da55e71f8b646bed4e11dab089c28c7af0e6eacc067ab68c0ddd856a1102b235cd02b7
 AUX jffi_maven-build.xml 11287 BLAKE2B 01ef4db6fef9d963bd52e0c15317ae836b629d9b22987c2d69a393d5513ab60bf2b062a083bb5b1a04301493c982f3926d5c9225972f7861e4ad668c9fc7a1f1 SHA512 56ebbb915d359f3eacf170d08fc1cf30f6efe900c91df0259a1fb69c6873ae839df829227b55e1538b4435387a82ec3e774180cfb531eb747e05a562aa7b97c7
-DIST jffi-1.2.9.tar.gz 1952668 BLAKE2B 320329b02ee9e93153fc334b73a6216da74ac2d924a64c8a1569f1f1507e1196d0b922f7d158ea91f6bc7164979b2ac12de239adbe98664a3708dd29c8d40f96 SHA512 2fd9a95cce9a3406a09856761d1318d4c6b976b1f9b66c7c5b0b5e95d44b19ba654ab8288f396782c7bb53e6d9949e7cfa9c46763f2a0761c6e86f102cd202e4
-DIST jffi-1.3.6.tar.gz 3187269 BLAKE2B 87a98c752440e336948923e73e2756cb0f88cbb111775f7fcc176152c60a050dad2b8d312bf0e6cda9e499b06fa64f6eda0659a6635010cb2da6ade4471225b9 SHA512 0259e59daa438572e94737efc126ab631be5f92e9ac2bf2bfdcdf92bcf9709ef930d68250b7fcaee3126a97c705c112d02bdfb0a800e8eb3b3f2fde6381f7a9f
 DIST jffi-1.3.9.tar.gz 3193992 BLAKE2B bcd2dba3f9528c293aebb13a8fbd0b2fd7afcbae0cc5fa231f7e8ab190b834adc9e3f40bfc1211d0019a34a9edbaf8810f44b88f3c44b1e3b8065b2b80ccc6dc SHA512 21bf6997c64c0764c1fe86c9ab9b854037241489789f443a3337253ecc95100c94723a57165c85eed7a6c3837b8c04751af4a1fb5873a9c9fcd9a4535b68fc10
-EBUILD jffi-1.2.9-r1.ebuild 3008 BLAKE2B 1a6a1edc45678bdc3f8593a09fe1083988248f1b254b420bc1bed913b49626d6fff2023dbbe3481d7ac572b7bd73132593b9b3e0ef714821f2aaa22de537a0a6 SHA512 b7921f24dec2f0b18a44dbd57eef94deb4cd55d759d62b45f6d3a42004b3e7b82d4531f3a98a983936738d8576451a21ea4f849bcdaf46d945d6bf0747786a41
-EBUILD jffi-1.3.6.ebuild 2454 BLAKE2B 0e988a67b31d18e96b6c0d8f550770c14bcefe22732ad989e567fa39bfc96e06f07d00771fc6228f3d3f0e122c1c06a4ea3d2a5ec45b74ab0b79ba3800ea24f0 SHA512 5314575e00a311389ccd290b20fe73852dd46769777de3278c748d2ec39c79ded428f157b36339273220d503e7ca810c15dfa3661b9ef778550c747a549847fb
 EBUILD jffi-1.3.9-r1.ebuild 3285 BLAKE2B df02b9374bbc00966b973dc761d28f6f635a92d0c619c2777559e299c2bc30cec58ff2813d92cce13c950685dd05bee3de9be8b0058363b3ebf65b3c1cf1c948 SHA512 d02a840a1182cb3de7a0a82a9dd804d6f7237e61fa50f4cd2055aaf43aa945dcce74a2e9e7a315a5c2e51ff85b6cabe0ad7236665865fef0880235fd64c70e37
 MISC metadata.xml 320 BLAKE2B 4b1ac90322eb9faf01b397b7b4eea9167648abf3a89693a3bb28b27f5015b03c20c3b1b7843509686c8a827be8d4ea37f40fdf6ddaae418eec2dfa3b1797ffae SHA512 0daa4f9c85c906fdbd2fb652257c4d8ff52d88738e8e37e6bed49fdee6bb8aecefcd06e39fbe1262a3a0af73d2e1f4cfc8d0fc56b109bc686975ed41e54a68c9
diff --git a/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch b/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch
deleted file mode 100644
index ac3843a0053a..000000000000
--- a/dev-java/jffi/files/jffi-1.2.8-junit-4.11.patch
+++ /dev/null
@@ -1,14 +0,0 @@
---- a/src/test/java/com/kenai/jffi/NumberTest.java
-+++ b/src/test/java/com/kenai/jffi/NumberTest.java
-@@ -234,9 +234,8 @@
-     private void returnF32(InvokerType type) {
-         LibNumberTest lib = UnitHelper.loadTestLibrary(LibNumberTest.class, type);
-         float[] values = { 0f, 1.0f, -2.0f };
--        for (int i = 0; i < values.length; ++i) {
--            assertEquals("Value not returned correctly", values[i], lib.ret_float(values[i]), 0.1f);
--        }
-+        float[] lib_values = { lib.ret_float(0f), lib.ret_float(1.0f), lib.ret_float(-2.0f) };
-+        assertArrayEquals("Value not returned correctly", values, lib_values, 0.1f);
-     }
- 
-     @Test public void returnDefaultF64() {
diff --git a/dev-java/jffi/files/jffi-1.2.8-makefile.patch b/dev-java/jffi/files/jffi-1.2.8-makefile.patch
deleted file mode 100644
index cdc28a662b51..000000000000
--- a/dev-java/jffi/files/jffi-1.2.8-makefile.patch
+++ /dev/null
@@ -1,52 +0,0 @@
---- a/jni/GNUmakefile
-+++ b/jni/GNUmakefile
-@@ -41,6 +41,7 @@
- JFFI_BUILD_DIR = $(BUILD_DIR)/jffi
- 
- ifeq ($(USE_SYSTEM_LIBFFI),1)
-+  LIBFFI =
-   LIBFFI_LIBS ?= $(shell pkg-config --libs libffi)
-   LIBFFI_CFLAGS ?= $(shell pkg-config --cflags libffi)
- else
-@@ -64,9 +65,8 @@
- OFLAGS = -O2 $(JFLAGS)
- 
- # MacOS headers aren't completely warning free, so turn them off
--WERROR = -Werror
- ifneq ($(OS),darwin)
--  WFLAGS += -Wundef $(WERROR)
-+  WFLAGS += -Wundef
- endif
- WFLAGS += -W -Wall -Wno-unused -Wno-parentheses -Wno-unused-parameter
- PICFLAGS = -fPIC
-@@ -279,7 +279,7 @@
- 	@echo "JFFI_BUILD_DIR=$(JFFI_BUILD_DIR)"
- 	@echo "OBJS=$(OBJS)"
- 
--$(LIBJFFI):  $(OBJS) $(LIBFFI_LIBS)
-+$(LIBJFFI):  $(OBJS) $(LIBFFI)
- 	$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI_LIBS) $(LIBS)
- 	$(STRIP) $@
- 
-@@ -291,7 +291,7 @@
- 	@mkdir -p $(@D)
- 	@$(CC) $(CFLAGS) -o $@ -c $<
- 
--$(OBJS) : $(LIBFFI_LIBS)
-+$(OBJS) : $(LIBFFI)
- 
- ifeq ($(OS), darwin)
- build_ffi = \
---- a/libtest/GNUmakefile
-+++ b/libtest/GNUmakefile
-@@ -44,8 +44,8 @@
- # Compiler/linker flags from:
- #   http://weblogs.java.net/blog/kellyohair/archive/2006/01/compilation_of_1.html
- JFLAGS = -fno-omit-frame-pointer -fno-strict-aliasing
--OFLAGS = -O2 $(JFLAGS)
--WFLAGS = -W -Werror -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
-+OFLAGS = $(JFLAGS)
-+WFLAGS = -W -Wall -Wno-unused -Wno-unused-parameter -Wno-parentheses
- PICFLAGS = -fPIC
- SOFLAGS = -shared -Wl,-O1
- LDFLAGS += $(SOFLAGS)
diff --git a/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch b/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch
deleted file mode 100644
index 2dd5e9d8791a..000000000000
--- a/dev-java/jffi/files/jffi-1.3.6-GNUmakefile.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-diff --git a/jni/GNUmakefile b/jni/GNUmakefile
-index c0f298c..457626f 100755
---- a/jni/GNUmakefile
-+++ b/jni/GNUmakefile
-@@ -278,16 +278,16 @@ debug:
- 	@echo "OBJS=$(OBJS)"
- 
- $(LIBJFFI):  $(OBJS) $(LIBFFI_LIBS)
--	$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS)
-+	$(CC) -o $@ $(LDFLAGS) $(SOFLAGS) $(OBJS) $(LIBFFI) $(LIBS) $(LIBFFI_LIBS)
- 	$(STRIP) $@
- 
- $(BUILD_DIR)/%.o : $(SRC_DIR)/%.c $(wildcard $(JFFI_SRC_DIR)/*.h)
--	@mkdir -p $(@D)
--	@$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
-+	mkdir -p $(@D)
-+	$(CCACHE) $(CC) $(CFLAGS) -c $< -o $@
- 
- $(BUILD_DIR)/%.o : $(SRC_DIR)/%.S $(wildcard $(JFFI_SRC_DIR)/*.h)
--	@mkdir -p $(@D)
--	@$(CC) $(CFLAGS) -o $@ -c $<
-+	mkdir -p $(@D)
-+	$(CC) $(CFLAGS) -o $@ -c $<
- 
- $(OBJS) : $(LIBFFI)
- 
diff --git a/dev-java/jffi/jffi-1.2.9-r1.ebuild b/dev-java/jffi/jffi-1.2.9-r1.ebuild
deleted file mode 100644
index ef103551c7d9..000000000000
--- a/dev-java/jffi/jffi-1.2.9-r1.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-
-inherit java-pkg-2 java-ant-2
-
-DESCRIPTION="An optimized Java interface to libffi"
-HOMEPAGE="https://github.com/jnr/jffi"
-SRC_URI="https://github.com/jnr/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
-
-LICENSE="|| ( Apache-2.0 LGPL-3 )"
-SLOT="1.2"
-KEYWORDS="amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos"
-
-CDEPEND="dev-libs/libffi:0="
-
-RDEPEND="${CDEPEND}
-	>=virtual/jre-1.8:*"
-
-# java 1.8 is needed because javah is called which is not in newer jdks
-DEPEND="${CDEPEND}
-	virtual/jdk:1.8
-	test? (
-		dev-java/ant-junit4:0
-		dev-java/junit:4
-	)"
-
-BDEPEND="virtual/pkgconfig"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-1.2.8-makefile.patch
-	"${FILESDIR}"/${PN}-1.2.8-junit-4.11.patch
-)
-
-RESTRICT="test"
-
-src_prepare() {
-	default
-
-	cp "${FILESDIR}"/${PN}_maven-build.xml build.xml || die
-
-	# misc fixes for Darwin
-	if [[ ${CHOST} == *-darwin* ]] ; then
-		local uarch
-		# don't do multiarch
-		# avoid using Xcode stuff
-		# use Prefix' headers
-		# don't mess with deployment target
-		# set install_name
-		use x64-macos && uarch=x86_64
-		use ppc-macos && uarch=ppc
-		sed -i \
-			-e "/ARCHES +=/s/=.*$/= ${uarch}/" \
-			-e "/XCODE=/s:=.*$:=${EPREFIX}:" \
-			-e "/MACSDK/s/^/#/" \
-			-e "/MACOSX_DEPLOYMENT_TARGET=/s/MAC/NOMAC/" \
-			-e "/SOFLAGS =/s:=.*:= -install_name ${EPREFIX}/usr/lib/jffi-${SLOT}/libjffi-${SLOT}.jnilib:" \
-			jni/GNUmakefile || die
-	fi
-
-	java-pkg_clean
-}
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-EANT_EXTRA_ARGS="-Dmaven.build.finalName=${PN}"
-
-src_compile() {
-	# generate Version.java
-	cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
-		package com.kenai.jffi;
-		public final class Version {
-			private Version() {}
-			public static final int MAJOR = $(ver_cut 1);
-			public static final int MINOR = $(ver_cut 2);
-			public static final int MICRO = $(ver_cut 3);
-		}
-	EOF
-
-	java-pkg-2_src_compile
-
-	# generate headers
-	mkdir -p build/jni
-	javah -d build/jni -classpath target/classes \
-		com.kenai.jffi.Foreign \
-		com.kenai.jffi.ObjectBuffer \
-		com.kenai.jffi.Version \
-		|| die
-
-	#build native library.
-	local args=(
-		SRC_DIR=jni
-		JNI_DIR=jni
-		BUILD_DIR=build/jni
-		VERSION=$(ver_cut 1-2)
-		USE_SYSTEM_LIBFFI=1
-		CCACHE=
-		-f jni/GNUmakefile
-	)
-	emake "${args[@]}"
-}
-
-EANT_TEST_GENTOO_CLASSPATH="ant-junit4,junit-4"
-
-src_test() {
-	# build native test library
-	emake BUILD_DIR=build -f libtest/GNUmakefile
-
-	_JAVA_OPTIONS="-Djffi.boot.library.path=${S}/build/jni" \
-		java-pkg-2_src_test
-}
-
-src_install() {
-	local libname=".so"
-
-	[[ ${CHOST} == *-darwin* ]] && libname=.jnilib
-	java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname}
-
-	# must by after _doso to have JAVA_PKG_LIBDEST set
-	cat > boot.properties <<-EOF
-		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
-	EOF
-	jar -uf target/${PN}.jar boot.properties || die
-
-	java-pkg_dojar target/${PN}.jar
-
-	use doc && java-pkg_dojavadoc target/site/apidocs
-	use source && java-pkg_dosrc src/main/java/*
-}
diff --git a/dev-java/jffi/jffi-1.3.6.ebuild b/dev-java/jffi/jffi-1.3.6.ebuild
deleted file mode 100644
index f34b51d92cc2..000000000000
--- a/dev-java/jffi/jffi-1.3.6.ebuild
+++ /dev/null
@@ -1,98 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-# Skeleton command:
-# java-ebuilder --generate-ebuild --workdir . --pom pom.xml --download-uri https://github.com/jnr/jffi/archive/refs/tags/jffi-1.3.6.tar.gz --slot 1.3 --keywords "~amd64 ~arm64 ~ppc64 ~x86" --ebuild jffi-1.3.6.ebuild
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source test"
-MAVEN_ID="com.github.jnr:jffi:1.3.6"
-JAVA_TESTING_FRAMEWORKS="junit-4"
-
-inherit java-pkg-2 java-pkg-simple
-
-DESCRIPTION="Java Foreign Function Interface"
-HOMEPAGE="https://github.com/jnr/jffi"
-SRC_URI="https://github.com/jnr/${PN}/archive/refs/tags/${P}.tar.gz"
-
-LICENSE="Apache-2.0"
-SLOT="1.2"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-
-DEPEND=">=virtual/jdk-1.8:*"
-RDEPEND=">=virtual/jre-1.8:*"
-
-PATCHES=( "${FILESDIR}"/jffi-1.3.6-GNUmakefile.patch )
-DOCS=( LICENSE README.md )
-
-S="${WORKDIR}/${PN}-${P}"
-
-JAVA_SRC_DIR="src/main/java"
-
-# https://github.com/jnr/jffi/blob/eabdf09c3ec4fc8a54b684ff326e36b36b74e0da/build.xml#L26
-JAVA_TEST_EXTRA_ARGS="-Djffi.library.path=${S}/build/jni -Djffi.boot.library.path=${S}/build/jni"
-JAVA_TEST_GENTOO_CLASSPATH="junit-4"
-JAVA_TEST_SRC_DIR="src/test/java"
-
-src_prepare() {
-	default
-	cat > src/main/java/com/kenai/jffi/Version.java <<-EOF
-		package com.kenai.jffi;
-		import java.lang.annotation.Native;
-		public final class Version {
-			private Version() {}
-			@Native
-			public static final int MAJOR = $(ver_cut 1);
-			@Native
-			public static final int MINOR = $(ver_cut 2);
-			@Native
-			public static final int MICRO = $(ver_cut 3);
-		}
-	EOF
-}
-
-src_compile() {
-	java-pkg-simple_src_compile
-
-	# generate headers
-	mkdir -p build/jni
-	javac -h build/jni -classpath target/classes \
-		${JAVA_SRC_DIR}/com/kenai/jffi/{Foreign,ObjectBuffer,Version}.java \
-		|| die
-
-	#build native library.
-	local args=(
-		SRC_DIR=jni
-		JNI_DIR=jni
-		BUILD_DIR=build/jni
-		VERSION=$(ver_cut 1-2)
-		USE_SYSTEM_LIBFFI=1
-		CCACHE=
-		-f jni/GNUmakefile
-	)
-	emake "${args[@]}"
-}
-
-src_test() {
-	# build native test library
-	emake BUILD_DIR=build -f libtest/GNUmakefile
-
-	# https://github.com/jnr/jffi/issues/60
-	LC_ALL=C java-pkg-simple_src_test
-}
-
-src_install() {
-	default
-
-	local libname=".so"
-	java-pkg_doso build/jni/lib${PN}-$(ver_cut 1-2)${libname}
-
-	# must be after _doso to have JAVA_PKG_LIBDEST set
-	cat > boot.properties <<-EOF
-		jffi.boot.library.path = ${JAVA_PKG_LIBDEST}
-	EOF
-	jar -uf ${PN}.jar boot.properties || die
-
-	java-pkg-simple_src_install
-}
diff --git a/dev-java/jython/Manifest b/dev-java/jython/Manifest
index 5529cf0e3769..f7aa4e5a205b 100644
--- a/dev-java/jython/Manifest
+++ b/dev-java/jython/Manifest
@@ -6,6 +6,5 @@ AUX jython-2.7_beta1-ant.patch 996 BLAKE2B ea81e5c330e1e2b45378d91baed45b7d60cdd
 AUX jython-2.7_beta1-dont-always-recompile-classes.patch 309 BLAKE2B 72fe6e0afe6346ed4af714485aa70cccc202aa9b8f4587df380697b54d55ce278a89685144620c4695acf212e3e4654b476865d54643b88dbfc2468b2c33fb98 SHA512 75b25d98d8df13d0b9947cbc70a7da59097b89731210504cc26ab18680b93d9ce2cd177480870f985a87d3634d9034b8d9f1bac2c431f4cfe09ab0b54db78b18
 AUX jython-2.7_beta2-maxrepeat-import.patch 457 BLAKE2B a55f47a16264544608ba9916d3f2ced081a4f47d260bab2eeeb5959ad1aaf1074a69bea4d8083383d039f541f6b379a141c81c4376a7f7cf324ce06ddeb84ab1 SHA512 e06ddb36805e2545f351d9d5df651fa90b0b39d340e4772cbb24910f1e1c999463a21fbe4a62c9cc73f9ccdc0047f8900e6300602cb8d5b70cef7cacf1bd46d0
 DIST jython-2.7.0-sources.jar 15371691 BLAKE2B 7e1c29f2a2c03b034e89bb9c3a8fdddbaef6a0191a7320c82b76e31b41336f3d99c1995b2e9864c033ec53629d45669ad460fb4a1433ea7bc6b0390919500a24 SHA512 7583810245d694fd1d99a57ad504fcefdfbc1183def2cbb93ae3660f341104205c73041d846bdcf2b564b3cf4b770b481703c1dcdb1458396812c92d30ee9fa6
-EBUILD jython-2.7.0-r6.ebuild 4449 BLAKE2B 0bd29ed489b2132082f09bb91077092ed158eb0ca85d592b0e336a1ea56393f4f6001f4a4cc04627e816e65866fdd593ed0f5c0c967a87bbd1053f33be1b83d1 SHA512 d7f5e41ef217b5b56570fb1188f48e636a73b86216ac8d7472c9c9fe120d6fb9b3ff361aad09c66848ba1c34668102279f012823d2c5ab8f9ff351b27d313c15
 EBUILD jython-2.7.0-r7.ebuild 4449 BLAKE2B 693cd28b66fdc95153c2b9197f3228598bd4176d5425d20fcb119990db039d6ce7751020fc09ddb9e27de05b8f2b505feb57bae14227f09849b7ec32d6e6c338 SHA512 ea98dad5c25a6f27a1ad0d9f9aaeb68a8a681fbec05e7a92a7ccdb5f9978b0b6df72b00d6c446d5c595416e9ee37f2438d4991993a0b61a46cab980d26b57525
 MISC metadata.xml 323 BLAKE2B 4c2b07b6a519fb3f1e4f7d0662e2488705d8ba2239a6cbd25b42aebd1bff1ca368105e1c5eee604915428c5b909ecc2547f6be4dfad126139a7f496bb276ae02 SHA512 de33eb0b1518ca8c0c9f8a44880946f491620bbcbfe0d5ebcb68dca71eba3965f0cf0ccd8c67128022c33845699222bd8b899c061cb5f7d7c0e09a4783fa3464
diff --git a/dev-java/jython/jython-2.7.0-r6.ebuild b/dev-java/jython/jython-2.7.0-r6.ebuild
deleted file mode 100644
index d2b1a1703775..000000000000
--- a/dev-java/jython/jython-2.7.0-r6.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-JAVA_PKG_IUSE="doc source"
-MAVEN_ID="org.python:jython:2.7.0"
-
-inherit java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
-
-MY_PV=${PV/_beta/-b}
-MY_P=${PN}-${MY_PV}
-
-DESCRIPTION="An implementation of Python written in Java"
-HOMEPAGE="https://www.jython.org"
-SRC_URI="https://search.maven.org/remotecontent?filepath=org/python/${PN}/${MY_PV}/${MY_P}-sources.jar"
-
-LICENSE="PSF-2"
-SLOT="2.7"
-KEYWORDS="amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux"
-IUSE="examples test"
-
-CP_DEPEND="dev-java/antlr:3
-	dev-java/netty:0
-	dev-java/asm:9
-	dev-java/commons-compress:0
-	dev-java/guava:0
-	dev-java/jffi:1.2
-	dev-java/jline:2
-	dev-java/icu4j:70
-	dev-java/jnr-constants:0
-	dev-java/jnr-posix:3.0
-	dev-java/jnr-netdb:1.0
-	dev-java/stringtemplate:0
-	dev-java/xerces:2
-	java-virtuals/servlet-api:3.0"
-RDEPEND="${CP_DEPEND}
-	>=virtual/jre-1.8:*"
-DEPEND="${CP_DEPEND}
-	>=virtual/jdk-1.8:*
-	dev-java/ant-core:0
-	test? (
-		dev-java/junit:4
-		dev-java/ant-junit:0
-	)"
-BDEPEND="app-arch/unzip"
-
-S=${WORKDIR}
-
-RESTRICT="test"
-
-JAVA_ANT_REWRITE_CLASSPATH="yes"
-JAVA_ANT_CLASSPATH_TAGS+=" java"
-
-EANT_BUILD_TARGET="developer-build"
-EANT_TEST_EXTRA_ARGS="-Dpython.home=dist"
-
-# jdbc-informix and jdbc-oracle-bin (requires registration) aren't exposed.
-# Uncomment and add to CDEPEND if you want either of them
-#EANT_GENTOO_CLASSPATH+=",jdbc-informix"   EANT_EXTRA_ARGS+=" -Dinformix.present"
-#EANT_GENTOO_CLASSPATH+=",jdbc-oracle-bin" EANT_EXTRA_ARGS+=" -Doracle.present"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2.5.2-distutils_scripts_location.patch
-	"${FILESDIR}"/${PN}-2.5.2-respect_PYTHONPATH.patch
-	"${FILESDIR}"/${PN}-2.7_beta1-ant.patch
-	"${FILESDIR}"/${PN}-2.7_beta1-dont-always-recompile-classes.patch
-	"${FILESDIR}"/${PN}-2.7_beta2-maxrepeat-import.patch
-	"${FILESDIR}"/${PN}-2.7.0-build.xml.patch
-	"${FILESDIR}"/CVE-2016-4000.patch
-)
-
-src_prepare() {
-	default
-
-	find \( -name '*.jar' -o -name '*.class' \
-		-o -name '*.pyc' -o -name '*.exe' \) -delete
-
-	# needed for launchertest
-	chmod +x tests/shell/test-jython.sh || die
-
-	# https://bugs.gentoo.org/show_bug.cgi?id=833785
-	sed -e 's:\(CharMatcher.\)ASCII:\1ascii():' \
-		-i src/org/python/core/Py{,BaseCode,Unicode}.java || die
-
-	java-pkg-2_src_prepare
-}
-
-src_configure() {
-	# apparently this can cause problems
-	append-flags -fno-stack-protector
-
-	EANT_GENTOO_CLASSPATH_EXTRA="$(java-pkg_getjars --with-dependencies antlr-3,jnr-posix-3.0)"
-	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjars --build-only ant-core)"
-}
-
-src_test() {
-	java-pkg-2_src_test
-}
-
-src_install() {
-	local instdir=/usr/share/${PN}-${SLOT}
-
-	java-pkg_newjar dist/${PN}-dev.jar
-
-	java-pkg_register-optional-dependency jdbc-mysql
-	java-pkg_register-optional-dependency jdbc-postgresql
-
-	insinto ${instdir}
-	doins -r dist/{Lib,registry}
-
-	dodoc ACKNOWLEDGMENTS NEWS README.txt
-
-	use doc && java-pkg_dohtml -r dist/Doc/javadoc
-	use source && java-pkg_dosrc src/*
-	use examples && java-pkg_doexamples Demo/*
-
-	local java_args=(
-		-Dpython.home="${EPREFIX}"/usr/share/${PN}-${SLOT}
-		-Dpython.executable="${EPREFIX}"/usr/bin/jython${SLOT}
-		-Dpython.cachedir="\${HOME}/.jythoncachedir"
-	)
-
-	java-pkg_dolauncher jython${SLOT} \
-		--main org.python.util.jython \
-		--java_args "${java_args[*]}"
-
-	# we need a wrapper to help python_optimize
-	cat <<-EOF > "${T}"/jython
-		exec java -cp "$(java-pkg_getjars "${EANT_GENTOO_CLASSPATH}"):${EANT_GENTOO_CLASSPATH_EXTRA}:dist/${PN}-dev.jar" \
-			-Dpython.home="${ED}${instdir}" \
-			-Dpython.cachedir="${T}/.jythoncachedir" \
-			-Duser.home="${T}" \
-			org.python.util.jython "\${@}"
-	EOF
-	chmod +x "${T}"/jython || die
-
-	local -x PYTHON="${T}"/jython
-	# we can't get the path from the interpreter since it does some
-	# magic that fails on non-installed copy...
-	_python_export jython${SLOT} EPYTHON
-
-	# compile tests (everything else is compiled already)
-	# we're keeping it quiet since jython reports errors verbosely
-	# and some of the tests are supposed to trigger compile errors
-	python_optimize "${ED}${instdir}"/Lib/test &>/dev/null
-
-	# for python-exec
-	echo "EPYTHON='${EPYTHON}'" > epython.py || die
-	python_moduleinto "/usr/share/jython-${SLOT}/Lib/site-packages"
-	python_domodule epython.py
-
-	# some of the class files end up with newer timestamps than the files they
-	# were generated from, make sure this doesn't happen
-	find "${ED}${instdir}"/Lib/ -name '*.class' | xargs touch
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index 1c1652a998ec..ca7daf1fcec9 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/lua/Manifest b/dev-lang/lua/Manifest
index fe8395aa1256..4a45f92550af 100644
--- a/dev-lang/lua/Manifest
+++ b/dev-lang/lua/Manifest
@@ -1,3 +1,5 @@
+AUX 5.1/0001-extern_C.patch 375 BLAKE2B 0895a21a49accbcba7efad34aa4fae6648085962eff533f11eb15f14c1dacf4ab6d7be9a09e50e1ff723aa362d7002f6bfb88166fd3ce1d55ecb21da5328f6a4 SHA512 c9a2e541fc29dfb4b88611a1a19ffca8c61d0ac603429925782178bf605c66befa79a8381c7972adaa84c685f02f2731b4273cc1b346cacf510e2d3c0b150d84
+AUX 5.1/0002-Fix-stack-overflow-in-vararg-functions.patch 634 BLAKE2B c12eed83847943b765ba969d6ddab7fcf5372c06c81349a0b5839be6d8d96ee8ef6429bbce1a4f9f5dded8ca4821d5acbd74d985868970c4f38b8f5226afe3ec SHA512 038625d4f041db57a5d4b208cd80c40c3a146a353b8eb17ee21a207d3a409617afedef287b431beac6471ea42ae0af0ae45aa7988ab3ef1c51f9f2c42715e4d1
 AUX configure.in 66 BLAKE2B 60319ac9b6bf60c84941673c4949e590e99c5e77b1309e25df797a8deef85d0d8ad0339e8b4fcfa5fc721545ceee62475f2284ea8f930687682265b1d03e4144 SHA512 b61041151ad4be2bb4a62f6659850fcf4179553103c421694ce739b84a57408fc59d09f5ad3f6dd8513be78ffa472689dc729031e3ef42b99f11ecc8e0053ffc
 AUX lua-5.1-module_paths.patch 1078 BLAKE2B c8c6def6f3099f61cc750657df1609a0a26b9201db7ae9d07b792a1eebb50be8a7bbb3a6ef6201ec4927a199c116304edaef0b9c9ab0fc833df4d7e56e92332a SHA512 123b115389d01d383af8698d2ed66c75bb7c3e2d33de57b8539ae56a9478930a0a72fa5657e78cc1c5b6bef00d07ec3a51e19ec0e419647e84eb158fb5c4795a
 AUX lua-5.1-readline.patch 360 BLAKE2B b528a3566aa59fb1cccb22417b01e86ee0cd3b77a3e278a20d5b476949daf47f0a656c7493a137594f1cf3136d327530ac97833cf584956b35b6a88a808535b9 SHA512 a99154258419dc2e582804eae97517687e5b8b5f731dc91722193d1ff470b8522af6ff4e7142c9258afe4734cd52e6987d3c2108ac52b1487a262f1e89f2f332
@@ -9,11 +11,17 @@ AUX lua-5.4.2-make.patch 3179 BLAKE2B 68e9af77c2f5931234eefbe953ff127c3b32bdfa67
 AUX lua-5.4.2-r2-make.patch 3161 BLAKE2B b9b87229c2098bdcd4a1c2622417176fa21b0fc8e35223f5f753f384c028ba30a74049c05d05828357102cc9a07674bf1c881506593f54adb75aeb1e669c8005 SHA512 b75564f98254ab76b3d278210fd112d8a7949e208d15c58d6134b5331d498638662cead48c873a1d202bb83eaf05580b3a18efe8a03f08d657e4005ed3f8dee2
 AUX lua.pc 658 BLAKE2B 580504c8162c9cbde35b4a817c688b955cad1a35b1c21ed527488eda6e7cf78dfa81fa8b100737cf9ad620d34d94eceec01ba09e4fab0b121c5e4c673677cd3f SHA512 cb476ea6dd004a9aa0094cfc219d1888c5f578b44968a960acf1f2f32783a8e4d770bb033fb1ab4851f225188bbdd434b5d239718cae2c2c35f5b5f124a722ca
 DIST lua-5.1.5.tar.gz 221213 BLAKE2B 915eb8e8c9d7e460eacf1d7a59309c60dfc0f5d9d3d76fbc9764e7cae85920b95096db1c27b69ac53378a145c29efde403e88166a1332a67150d9d3a897aba02 SHA512 0142fefcbd13afcd9b201403592aa60620011cc8e8559d4d2db2f92739d18186860989f48caa45830ff4f99bfc7483287fd3ff3a16d4dec928e2767ce4d542a9
+DIST lua-5.1.6.tar.xz 397312 BLAKE2B 3555cd8ae8756205935af26399586719c5ab22da75036e553cf935df6463219f33896d72b91271a2bb9244238bef894d469817c8a7c0c8312ac05ec875b0ecbb SHA512 33365c29b6c3bf7c3b6fe764b1525c806cb41b9391f99ca267ccc2deda163afd76fe3f62719ff7f248467f09de11789dffab3c464f7fee108ab9ccfd38df104c
 DIST lua-5.3.4-tests.tar.gz 103438 BLAKE2B ac82708022e7729039111c3df4fe24302c8d0efb224afb4828871ac085a3d64c41d674a6f9369035de01ed1f7f75a3d2ce16917f37e774e923216aac0be03e09 SHA512 79575d100a2efabc8243f55b55d912443e09ef7e8b0219cb93541d85c2ba802fb9538015e1228703f09ca57bdb28a640a8f1fa0735716ba1e4bca2179c712dfb
 DIST lua-5.3.6.tar.gz 303770 BLAKE2B 07c37c56f43095a4f6ca8eb8b3adf19afd53107c02b62b2bcb3619565cb2100d5f823493eef93092d5e312b30fc28885a6d9e8f0ba5a23b5bed86dc4515a5d61 SHA512 ccc380d5e114d54504de0bfb0321ca25ec325d6ff1bfee44b11870b660762d1a9bf120490c027a0088128b58bb6b5271bbc648400cab84d2dc22b512c4841681
+DIST lua-5.3.6.tar.xz 541300 BLAKE2B cc2536581f038524fd32cccfbbc4807d0ff0da99d738432e4a89fa837fa2c0036c9465da635e477385316983bcd76040bad32de4cec37a0112fc40c26f64e459 SHA512 e4699c5aede7e54d24830b33ab25a0cf9a278962009beee1b98552501c00285b8bf865b4c9f2020ca299244ee24d087938d079ccd13449b288290142de9b8ba4
 DIST lua-5.4.4-tests.tar.gz 134094 BLAKE2B 63f5888a506f504f849fb2000cf551960df8eca3107601dcc8243e8ea5a1b13a70bff7dea4aebe3ab35b7e9df58c2ca44a7a27aa4de82240877eb8d7a017642e SHA512 08b3d764b3f362a2cddf5a23e71b16eea96a234a970fa0048bab358ebbd77f99d9bd132af12254383c5bb5426516e1ce2107e529e88d3963869255f5a41198ef
 DIST lua-5.4.4.tar.gz 360876 BLAKE2B 8747ef5c83bd4c54b73eeaad6991ab5fccc54ee000973afd9cf3367b8945f03c54e843ec88c48043003cd9d3b42281c593cb485b7165add2744cfea06d8b7668 SHA512 af0c35d5ba00fecbb2dd617bd7b825edf7418a16a73076e04f2a0df58cdbf098dc3ff4402e974afd789eb5d86d2e12ec6df9c84b99b23656ea694a85f83bcd21
+DIST lua-5.4.4.tar.xz 606400 BLAKE2B 3865704cf23d31715017130ee7c841b98dc0abd35434a14e587c79c9ec0e466351cb64541d40f26d06178950a7180436a7a6d43349ff297e9b3e144451098a88 SHA512 4627d31c16d9048dc1236bb9a6694d7f62de8c8da908f6452c2f1230c0f44326ce3c7f05953af4ee50fd8d593647f69a2ec47f743a3cc081967803dda9b2471a
 EBUILD lua-5.1.5-r109.ebuild 3914 BLAKE2B 383d47a68be976dc6f8209ac97950121e6addba34fab4963bfd19524e23f492e8f9603b515e45361c30d38c1ec283ed694959a126dc4d0e072d982cdf13e644b SHA512 3792e38944c5c43f7113bb0e45886a3bef01dfedd3a42c0fd513e5069a707d480922a110945d932d9978ddb7d8e0d5afd13c499e400a7542199c96ba601d105a
+EBUILD lua-5.1.6.ebuild 1222 BLAKE2B 03df051642039b6a3cb58bc1245a34424631e9a39d0b9935691c5dfaf4efe01ea6d2b07826d09ab0ebd27e74d528f23ab0436771e4d17c823593b35dc2ea7132 SHA512 854fe8280d090d445bd62825a90bd7462c37843b1badfaded21cc0271066a901e2b429c16c19bbc40dd5a30fb1547640ece2d7c591190369fb5571814b3d4a96
+EBUILD lua-5.3.6-r100.ebuild 1134 BLAKE2B 0b8674c1df3d2e9657351ef98ede14f41f7ab881e5035f0b35c72121b9e9385a0bf6b05140818062c4c3210b5bbfbfe02f49c4c0af1f8aef3aced6dd9f9d2672 SHA512 2a7f68c8512847f47d4cd7307fb271c4bbf42348e019effa102df20229665c529d78414f2f7cf97e579318e0ef9448b505c96f5d824741b758ed2d893a50cf15
 EBUILD lua-5.3.6-r5.ebuild 5435 BLAKE2B 676951874703c07a081e7051dc0b5b8b9474005546a94793bacfbe35d7fdaea1a19d00cae1e857704c587c295454e87708c0651200b14ce6b10f30d7bc84265f SHA512 058413e7b87c0b3c20c80f4e843430b50a8534352969eaa0612e7b8c2e90529967fe6991a57f7016d42aae72f887e30b8ec3e9a183c16c5cff3f3eae55c03596
+EBUILD lua-5.4.4-r100.ebuild 1117 BLAKE2B 17a1c460bfd900961018a96c1b88ccf5e259b2e59679752a1c8c6dd1fe91aee13c09317dd2f89c35c054bb199cc787bad4b104e247fab93d1bf204260b667b6a SHA512 e8beeeed57d2ed55a0e70e41d9b494b9d146b02305aa3bab256ba47914f9ca7a9a6de5f8ede509c7d3cc30b0484d3ffbdbb52111d1424a5ec2ac5b2d16d0d8fb
 EBUILD lua-5.4.4-r2.ebuild 5386 BLAKE2B 59e698059fc1fa98e74d9b1d01b6f14ad109725ff361d06a2215905c2030f7326bfa8c1aeb84af384377127bd04b1e05c4e8ae4eefaa319f997850b2c5f82ef5 SHA512 aad663628355e4911fbfd5a7db367e69d6d7529c5c70832e6f666dc3a361e3536a930b74cc36c5796444265412b694d8610b8f9a2a876dfd4dbf637fe865ae3d
 MISC metadata.xml 525 BLAKE2B cd450b981b7ae039f32a0c6484548c59eff8d9c032975c84ef9b5530219413f7ff7a95d66593da6252c08808189cc61f02fbef88efe36f71dc64d9aec3c0e90e SHA512 4f127caf48df93a75b562f516e3a522ae3edcc601f434b2d034d76b106cbfd96848e6898bdc850acf757101843696e44da9ab1f42292e96bd294c30b631ccaa8
diff --git a/dev-lang/lua/files/5.1/0001-extern_C.patch b/dev-lang/lua/files/5.1/0001-extern_C.patch
new file mode 100644
index 000000000000..6e4f711f0ecd
--- /dev/null
+++ b/dev-lang/lua/files/5.1/0001-extern_C.patch
@@ -0,0 +1,20 @@
+https://salsa.debian.org/lua-team/lua5.1/-/blob/master/debian/patches/0003-extern_C.patch
+
+From: "John V. Belmonte" <jbelmonte@debian.org>
+Date: Tue, 26 Aug 2014 16:20:49 +0200
+Subject: extern_C
+
+--- a/src/luaconf.h.in
++++ b/src/luaconf.h.in
+@@ -168,7 +168,11 @@
+ 
+ #else
+ 
++#ifdef __cplusplus
++#define LUA_API		extern "C"
++#else
+ #define LUA_API		extern
++#endif
+ 
+ #endif
+ 
diff --git a/dev-lang/lua/files/5.1/0002-Fix-stack-overflow-in-vararg-functions.patch b/dev-lang/lua/files/5.1/0002-Fix-stack-overflow-in-vararg-functions.patch
new file mode 100644
index 000000000000..a3e4019a4596
--- /dev/null
+++ b/dev-lang/lua/files/5.1/0002-Fix-stack-overflow-in-vararg-functions.patch
@@ -0,0 +1,17 @@
+https://salsa.debian.org/lua-team/lua5.1/-/blob/master/debian/patches/0004-Fix-stack-overflow-in-vararg-functions.patch
+
+From: Enrico Tassi <gareuselesinge@debian.org>
+Date: Tue, 26 Aug 2014 16:20:55 +0200
+Subject: Fix stack overflow in vararg functions
+
+--- a/src/ldo.c
++++ b/src/ldo.c
+@@ -274,7 +274,7 @@ int luaD_precall (lua_State *L, StkId func, int nresults) {
+     CallInfo *ci;
+     StkId st, base;
+     Proto *p = cl->p;
+-    luaD_checkstack(L, p->maxstacksize);
++    luaD_checkstack(L, p->maxstacksize + p->numparams);
+     func = restorestack(L, funcr);
+     if (!p->is_vararg) {  /* no varargs? */
+       base = func + 1;
diff --git a/dev-lang/lua/lua-5.1.6.ebuild b/dev-lang/lua/lua-5.1.6.ebuild
new file mode 100644
index 000000000000..663b24b5579f
--- /dev/null
+++ b/dev-lang/lua/lua-5.1.6.ebuild
@@ -0,0 +1,49 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit optfeature
+
+DESCRIPTION="A powerful light-weight programming language designed for extending applications"
+HOMEPAGE="https://www.lua.org/"
+# tarballs produced from ${PV} branches in https://gitweb.gentoo.org/proj/lua-patches.git
+SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="5.1"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+deprecated readline"
+
+DEPEND="
+	>=app-eselect/eselect-lua-3
+	readline? ( sys-libs/readline:= )
+	!dev-lang/lua:0"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+PATCHES=( "${FILESDIR}"/${SLOT} )
+
+src_prepare() {
+	! use deprecated && PATCHES+=(
+		"${FILESDIR}"/${PN}-5.1.4-test.patch
+	)
+	default
+}
+
+src_configure() {
+	econf \
+		$(use_enable deprecated) \
+		$(use_with readline)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect lua set --if-unset "${PN}${SLOT}"
+
+	optfeature "Lua support for Emacs" app-emacs/lua-mode
+}
diff --git a/dev-lang/lua/lua-5.3.6-r100.ebuild b/dev-lang/lua/lua-5.3.6-r100.ebuild
new file mode 100644
index 000000000000..a31377bb535a
--- /dev/null
+++ b/dev-lang/lua/lua-5.3.6-r100.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic optfeature
+
+DESCRIPTION="A powerful light-weight programming language designed for extending applications"
+HOMEPAGE="https://www.lua.org/"
+# tarballs produced from ${PV} branches in https://gitweb.gentoo.org/proj/lua-patches.git
+SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="5.3"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+deprecated readline"
+
+DEPEND="
+	>=app-eselect/eselect-lua-3
+	readline? ( sys-libs/readline:= )
+	!dev-lang/lua:0"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	use deprecated && append-cppflags -DLUA_COMPAT_5_1 -DLUA_COMPAT_5_2
+	econf $(use_with readline)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect lua set --if-unset "${PN}${SLOT}"
+
+	optfeature "Lua support for Emacs" app-emacs/lua-mode
+}
diff --git a/dev-lang/lua/lua-5.4.4-r100.ebuild b/dev-lang/lua/lua-5.4.4-r100.ebuild
new file mode 100644
index 000000000000..bf4b915abf75
--- /dev/null
+++ b/dev-lang/lua/lua-5.4.4-r100.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit flag-o-matic optfeature
+
+DESCRIPTION="A powerful light-weight programming language designed for extending applications"
+HOMEPAGE="https://www.lua.org/"
+# tarballs produced from ${PV} branches in https://gitweb.gentoo.org/proj/lua-patches.git
+SRC_URI="https://dev.gentoo.org/~soap/distfiles/${P}.tar.xz"
+
+LICENSE="MIT"
+SLOT="5.4"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="+deprecated readline"
+
+DEPEND="
+	>=app-eselect/eselect-lua-3
+	readline? ( sys-libs/readline:= )
+	!dev-lang/lua:0"
+RDEPEND="${DEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+src_configure() {
+	use deprecated && append-cppflags -DLUA_COMPAT_5_3
+	econf $(use_with readline)
+}
+
+src_install() {
+	default
+	find "${ED}" -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	eselect lua set --if-unset "${PN}${SLOT}"
+
+	optfeature "Lua support for Emacs" app-emacs/lua-mode
+}
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 745a414acb28..dedb91cf6e0f 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -13,20 +13,28 @@ DIST Python-3.9.13.tar.xz.asc 833 BLAKE2B db01c01be9d56cd15f9ab4a9e2cfa800faf4eb
 DIST python-gentoo-patches-2.7.18_p15.tar.xz 34956 BLAKE2B d173f276dd9c0ce31004dcc55a0d18e9ce25a47683c2df3c4dd62e967dfbbb35be59a2f08cf20f30a19475a8a2344dd95b17400eafa88b5fdbe9270a12ccbf32 SHA512 d9386808265f978808e5c0ffd384cefe54fb0e05aeccfd394167d5227d9cd66e25c8e93c54914762b2cfc3c2dd851b26a7a84d62634c6aa8a0798aacbb7ac25f
 DIST python-gentoo-patches-3.10.6_p2.tar.xz 12040 BLAKE2B 75c93fab19137a966b3775308bc20142f4d3648bbb9364e82c4eaffae93beda54011192881c52b85d2e2493a06cfe2a90f50675609908c3d5ebdb0103fe41644 SHA512 7e451a8a18a62592c2cd7b2db71065b77256960f43e172a0d7856b22b69138dcb1552f53b39bec14585a761cfe729c81613551c1b616fe1ec8d2b59856b11453
 DIST python-gentoo-patches-3.10.6_p3.tar.xz 26712 BLAKE2B 701a7a4da1a09f71dee8fdf924a45e030b8ae93e469a2789b28b904d2fd6b011589fb940eb0c262e8b19005af523a2f66075d053fb60892d6ebd473159fce718 SHA512 ed43ba18735ddf72c434bfe905894d156a144a77f9fb8266378d384e840b376c6220859d8d1af83f304293368bf1dd45881316c1797ba25d618a064daaacab17
+DIST python-gentoo-patches-3.10.6_p4.tar.xz 28612 BLAKE2B 197ef33c3086cb9efaf09868145826e2889f61d6fb207df8b60ac6cfc4ca637c8a87fd10afa2d8a7a47ae81bcf0ae589085c694523e1ca6f85acdc4e517b7d07 SHA512 8bd0aa8f7a775d12914d542dbb04c7b555055228002dd826a815255d4a35392e09c44d560cc5da7df1feae98e2f73e8fbf476e2811ae5269f91120c11cbb6291
 DIST python-gentoo-patches-3.11.0rc1.tar.xz 4384 BLAKE2B 31bcdc055bfaf3434dbb02543aaf66910eaccd01808d9a0e57bf7cb3b097fc0046c00ac44737d9c37e3b6d074c524f4dd3ab439a741e66d74a0425889ecaead5 SHA512 05b044e2d8f881c471528600ee300bfd9cf5160609dfb3d7cbdb8e43f47b681542582a85de97e28e6a3b89a3fb6c8d7398e029d31e20cea9c5a2a71700382d4e
 DIST python-gentoo-patches-3.11.0rc1_p1.tar.xz 19584 BLAKE2B 33c87e2e7141fa5cdf343df8cf30e8e0bd37fdfc7b4d84564b1131c57db27b5886184fd1291b2a898efafec60da5c01d16dce8b3c8792df7df15793d767d74cd SHA512 dc5547622a17bc899dfa7f55a4705f780fd3b731ccdb2c0a87e3d71b4490a32b54683ff862f412e2ac3480f0e84acf2e88176ecf89a8d62b97454e51258696ea
+DIST python-gentoo-patches-3.11.0rc1_p2.tar.xz 21580 BLAKE2B 188a3b2e5bc0d067dac20a7d5bfe3149eeac062bdb29972b0d0a8b24238aa21eb2f2a797b57f6ded80cb85d255f6cc1e6336d57c3e5f43d2b8aa890e7d35ef50 SHA512 fbc740b7e8161d4878cc91d9ee66026ae51082f2b18d77dc40167bfab4891e7b811fa4920ddf5c5a27d8ddc84a0220ccb1b3612744818084da321188ada09563
 DIST python-gentoo-patches-3.8.13_p6.tar.xz 27968 BLAKE2B 0cafbdfed47e0d58a9798c1e090abb17428472f769ebe4125cf1210218b90bcfd2ad8790fafbfdc1daccc51078a6bf5e068157f05151c2283eb80d5fe128d85c SHA512 b23d51478cc126a6f7f3d1d6d2302a13f3e873a3fac19c7b2b86b79f4b25bd421b60e5ecbe9bb606ee0eedc0e6871d20c0befd1b6596b525bf6ef79a19230ae2
 DIST python-gentoo-patches-3.8.13_p7.tar.xz 41332 BLAKE2B e61fe83b1260fbdc3086384834914625ae361c3ab2365f5f86c454423f4738b1aa20f46cf95b8a64b54b7cc000761964d5db65383bba9bdcc2a86894aacbdd5b SHA512 e71fff8291c4dfec43d3609e84de2fe6afc29ee6087410f047e972294e555e5a17b7f8d19778a79e67bad66855fd7a163b5a047aee99ee357d5306d7cd01f989
+DIST python-gentoo-patches-3.8.13_p8.tar.xz 43204 BLAKE2B 6fb162bfcd2ab8c1fb4208716382aa144bf21b1bd8c2f00a2bd60e7cd0b0d8e034803e8f4129cf49cf6e594467aa2e4a45eb4cb72ddd8516ffd8f797570d59cd SHA512 41ec04e3257021fdcc848587c2275b241d0b31d1d6c10162e30b86920109286c92171d6143bb8be6d1f1c9070d43d31dc0290bdffac50d09d32c2493e631637c
 DIST python-gentoo-patches-3.9.13_p4.tar.xz 22072 BLAKE2B a0e084eff35d075d2255b139d0db114d282cb6c9c0c2ea51a8ecb7f5f1dc8096d6578ae5f804b7583a2b7842152b5723ad802ca816d46813c40aaa756118afc8 SHA512 cdf8d43fd5263c4956be234f36c0767215ab2495705d4f2a060b32ecbfbe159e618e31693b0538a1b970f7b27ebe4953063f585930d074dcaf59f2f61486e6b6
 DIST python-gentoo-patches-3.9.13_p5.tar.xz 35660 BLAKE2B be3fe3a4db5e94a06c6bcb36eee71fd7e33cf27a4f3a259e5d0bd332b4765e77d5753247ddf5bbc3cbf10647f55e1897c943a7149afc76a9649d634fbfaff682 SHA512 7d6f1d215df0e50b1b4837f62c160d3262c6d9a29dad1a3f82590f5f84245defcd9b3de500ec78f01a3308275647b7a5e72a16c7425aec1edb841ba079100e1b
+DIST python-gentoo-patches-3.9.13_p6.tar.xz 37508 BLAKE2B 6d55aec9ae139cbe6d35b84335174d5fba5784bf52eb665e2d3a27693a2abb843bce1f190c92bfd173359c3782cae06a6b3520932b08aec678332928c5a27277 SHA512 1b1dec45d959849bf72b0646329e8cf74301e0f5373d6e2dbefb63d60fdddbe9fc33abda7d2312af8c52feadf3bacd04b627626d876acecc8984d3192a2d029d
 EBUILD python-2.7.18_p15-r1.ebuild 8315 BLAKE2B cc31d031262c95e2e8a187017e05bc90cc7c75b240efbd3c565d0fa686ee14dcf8cd9d83e533a479edb95901dbb92a9d2ff924cbebe148e9b54caa3ce635e350 SHA512 32ae3d2eab2105fd83bd23467dd1cc3e2527d8c06fbdd8bc08b48542e4ee06388c1d93db4d99e80aa7a6a5e6c8f6089e2dffb18dce1155b7a8d6bd7555389a0d
 EBUILD python-2.7.18_p15.ebuild 9827 BLAKE2B 77ebeacfa236e518ec0c0a791e0da60f8158d369e870c88ce69d1eef25cdc99e658903abf313452b849254e97b4c9f583e0edb75ec845faf5b47fb2fc3173ce4 SHA512 19219cd43391d8d53838c9b0e15b30f8ccb5d5a23503a213cc961ff2fa545cd17a5ecc6ce253e2a01534db3bc931be212969c40885c2e99f203c23a5ecb689a1
 EBUILD python-3.10.6_p2.ebuild 11181 BLAKE2B f8180bd07e43dffedafd7d912bcb9a002e93c1514c72055b24c65f36b7ef477e748bb777fa02da4c6d2c6391a1eaa9f59266b09fafb2e7ca8a67a96efd6f423c SHA512 4613ab1e7336e38a91877d4b1c5558e5221a770d8171d92fff319c6a4f64127bd9cb6dd8c56d84e70558de8ac647a315d740336834cdfa1ad3b86b184408c54b
 EBUILD python-3.10.6_p3.ebuild 11161 BLAKE2B b1d379be929e3a5ef8eb45beff1581e99085fdfc3af2aad29c9202284b73c225b82ba8ae81fe1db6191bc97f45d59ad9de2bcf664407269e890bb658da4072e5 SHA512 724f964f56c8c8e7859719eaf3b009f84371b5c70c509147f2a010959e93455daf469399c4159a3cba61de80ab08c327e908d8ffdbbbdb2e9893e88172969a41
+EBUILD python-3.10.6_p4.ebuild 11162 BLAKE2B c8ac4f31a628990997d8b30e903d677770eda055c7d7296bf28543814a7d05e4be65791e355e43feccda58a60952428cc05abb01de5814463614c34486235da1 SHA512 82922d217eefe559fbddde7c628a087167262070e451f4fe6dce98491781a0f9d4a403c6e6d799e112fd4fecf60e9652a92958b5966c3849b17f29130ee2ef49
 EBUILD python-3.11.0_rc1.ebuild 13384 BLAKE2B 7ac3f74190fafd1321f2ae9b478cb1b7381f13ce88d1839bbe2eea12a9abb0f14286f3e6036ca65c2d37ca6b07b62c14f557a7af080f6f05f119e7bbd77764cc SHA512 3b94a9e45017c0ec3d2bb2ca346d423a0e31d3b1f2c1fa098aa2c4f0af58e49f3626688dacde9740b2c1f44c63f143bf43ec305d0ce69c3e68de3ff6ae0a88c3
 EBUILD python-3.11.0_rc1_p1.ebuild 13357 BLAKE2B fac65a9fba93a49af0ed0dd91f532e6cd729b815ae71b06dcdc40391dbf5252c56067be5a8085576cee41bf96d011fe9264ec0c390bb22db2265579d8b696092 SHA512 faa9b3067f81e57d8969825fa7851ac74690fdaab8b380f963f8567a09ce69a250592ee23df42f584c25261a49e93bafcecd23ab9d392d90ad4794e2c532d7e7
+EBUILD python-3.11.0_rc1_p2.ebuild 13357 BLAKE2B fac65a9fba93a49af0ed0dd91f532e6cd729b815ae71b06dcdc40391dbf5252c56067be5a8085576cee41bf96d011fe9264ec0c390bb22db2265579d8b696092 SHA512 faa9b3067f81e57d8969825fa7851ac74690fdaab8b380f963f8567a09ce69a250592ee23df42f584c25261a49e93bafcecd23ab9d392d90ad4794e2c532d7e7
 EBUILD python-3.8.13_p6.ebuild 9731 BLAKE2B 0660743997da89023e3192c16bee0c1a14289ddc2f3fa43e19f105d208359eed8155a8345f29c214322ada0aa5c7e5eb50a564546f506abc3ea2204f44d1217c SHA512 b47a01911ed23390ef2091b1f09edf16d2398178ba0d9ec792f8afd06fcf1fb472c020a908af3a6b7c20396f8c6049767d2f11cfe9d15afa4df135b2cc0ee046
 EBUILD python-3.8.13_p7.ebuild 9708 BLAKE2B d622c26fbc1791c567ea5db09e1f85e7b3c50f9894e7734c4f50de99142f029a47ffb2ce81808ab773958f44ea34d2dc110318589c950f4ee70144702d2ca20c SHA512 76b37e2a085df15d02ca285fa3f0980a043067591e70ab47d44bd010b609c34a521f0a2f7cebf34d349c9e4275f3a9b8bd09439eb16e5e7ea84b55d4d3b01ef1
+EBUILD python-3.8.13_p8.ebuild 9712 BLAKE2B 1fc6b71d1bfc7f508fe722c2370ce0d841bcc9c9248143b90ea5cdd6ac5db52fcecf19d213b7b79a4fe0aa2964814bc99674838a5de682d814351d6b390c2688 SHA512 89de4861a64051de93b226aa61cc4afc39db0207692455b5772556885f33904f129b48e3be3f919b704225a680c49791169e4ff97c197c3a37c450dd83080b59
 EBUILD python-3.9.13_p4.ebuild 10984 BLAKE2B 8743da1a832eb69289727f94f19a9ca7c9e42156847d25168adb1bee66cbc980d28f2969260baf5ddca124c01498f085bb9fd50c5e80083609a5d987337429b4 SHA512 d8cf0aae2e36445efb4a0d0df4a028ab7d990f017196a18127973b7d88dc4979585901102106c32d8281f640334b079a8efedea8f45fca75a13c2453cff4b64c
 EBUILD python-3.9.13_p5.ebuild 10964 BLAKE2B 367eff5f5f1fde3114ae2c6e215291911b90575d5705e144694d365d76e1a0ee95ce08e984125b6b0e769c17075da5cf4314d82f0f97d2845708df5fe0e49263 SHA512 042cd5aa72265de612c45e1c457f72e027e3752e31ecf7ff1bfee685115b2512aee43b4e65145ec482bb0ec31229d9b4855fe4d420f0aa9fd7d29a0251d00690
+EBUILD python-3.9.13_p6.ebuild 10965 BLAKE2B 971e8c4cffb53ce7b45971b171bb9552b7187f81e88322e774931b9d0e3619fbc6508cb9f847656bfdb227702aca298bf1b42715696692dd4ea5b37dd7a91d2d SHA512 7ea76b2370612035ea5f95059f7314aca8b7c3c8c128b86d0e42f55ab3dd350e132e020ae629d05e493fba16384cdf0e5a68028f0c2d9aaa1f1c04941afb06ce
 MISC metadata.xml 1068 BLAKE2B 3c3511739ae8251d11bde32aa3a21225fd3468f2b1f31c459de956c5bb7dbc2de4103a288dd29b26d1023e40bac62631fa953d1515513e934f5c3962d9c715a7 SHA512 0f7d3f9305cc539619568aea7e54cdb9a3319579e811108cf03d7c66290e4f21080a87ca02f1a62264d4ecd41a243c91f0a639e6c064ccf2b24b460508c848b8
diff --git a/dev-lang/python/python-3.10.6_p4.ebuild b/dev-lang/python/python-3.10.6_p4.ebuild
new file mode 100644
index 000000000000..b919f0692412
--- /dev/null
+++ b/dev-lang/python/python-3.10.6_p4.ebuild
@@ -0,0 +1,407 @@
+# 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
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	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=
+	# 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=
+
+	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/python3.10/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
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.10/site-packages
+
+	emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || 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_rc1_p2.ebuild b/dev-lang/python/python-3.11.0_rc1_p2.ebuild
new file mode 100644
index 000000000000..bba860f7875a
--- /dev/null
+++ b/dev-lang/python/python-3.11.0_rc1_p2.ebuild
@@ -0,0 +1,481 @@
+# 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
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	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=
+	# 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=
+
+	if tc-is-cross-compiler ; then
+		# 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
+
+	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/python3.11/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
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+	# workaround https://bugs.gentoo.org/775416
+	addwrite /usr/lib/python3.11/site-packages
+
+	emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || 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.8.13_p8.ebuild b/dev-lang/python/python-3.8.13_p8.ebuild
new file mode 100644
index 000000000000..add41cfe710b
--- /dev/null
+++ b/dev-lang/python/python-3.8.13_p8.ebuild
@@ -0,0 +1,348 @@
+# 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
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	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=
+	# 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=
+
+	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
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || 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.9.13_p6.ebuild b/dev-lang/python/python-3.9.13_p6.ebuild
new file mode 100644
index 000000000000..57aa423c9b08
--- /dev/null
+++ b/dev-lang/python/python-3.9.13_p6.ebuild
@@ -0,0 +1,402 @@
+# 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
+
+	# Fix implicit declarations on cross and prefix builds. Bug #674070.
+	if use ncurses; then
+		append-cppflags -I"${ESYSROOT}"/usr/include/ncursesw
+	fi
+
+	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=
+	# 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=
+
+	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/python3.9/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
+
+	# bug 660358
+	local -x COLUMNS=80
+	local -x PYTHONDONTWRITEBYTECODE=
+
+	emake test EXTRATESTOPTS="${test_opts[*]}" \
+		CPPFLAGS= CFLAGS= LDFLAGS= < /dev/tty || 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-libs/Manifest.gz b/dev-libs/Manifest.gz
index 42c4411c2878..7738e4445474 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/pugixml/Manifest b/dev-libs/pugixml/Manifest
index a18554084e75..09196ba9fe3b 100644
--- a/dev-libs/pugixml/Manifest
+++ b/dev-libs/pugixml/Manifest
@@ -1,6 +1,6 @@
 DIST pugixml-1.11.4.tar.gz 386229 BLAKE2B 93d9c537f10e3a12297e4d6a39f2866bd5c9678c6aff83e20fb79b6587191b6586b1fe4d9dd995a7be05cc9281cd9910fae3eddf6b2eac216873e918a5cf3231 SHA512 c83f57ef2492eee359d979597fb5089b8eca547bb9d41cfbb6bcf43d59fe75e6780b0f31dd593145ec9888c065153aba52702667e2de213fa080cd51e9e13a38
 DIST pugixml-1.12.tar.gz 389685 BLAKE2B 190ebd1e7ac298a4ef6bc35769151f4d606a88185d29cfad7acb813990e3c9b2bf5b17c461f321942a3af0688c2244a896eb0129df8def5aff63b1d65aa3f6dc SHA512 1d23fc8b0aa643b932d34012be6d545734f5177d7db711fe1f0b82e318d72b5850a8c3d8513393b86b5a1e83ee7bfd825877f9efbf801369adfcb88041b52a93
 EBUILD pugixml-1.11.4.ebuild 570 BLAKE2B d48ab88ac4014ac2a5fa31e2a9adc1c3ea93100f06c97275e9c7442aef426c5d87e47ad19710e17486d87fa714cfd0bac266ec48b8ec7571b91e9b872c5a5fea SHA512 198d20b624cde5812c82b6d18d1e5b8d573712f9cf758ec21c72b99d0d024d4cfb570e5a1fede5afccdaface8a912b8bfcdecc4f6a0b2a72121f34fa0c778e3a
-EBUILD pugixml-1.12.ebuild 580 BLAKE2B 9b4df07184ef8c55ddd7711d9b9a145390f68e3956cfd06dcca5ec07edbde5db6e672b72a767038966380c9ac80fb0186b0f1c3f3a0643043a1eac0e580928ee SHA512 c9fbaf541eb2541aa54aadedeb2a6fcf8786e322febd8505d3bbcfb40139ed60cc8dbbecf8cc9357c1d29cd82e2fb35832ff26891ba0496350f8bd826f5218e1
+EBUILD pugixml-1.12.ebuild 579 BLAKE2B 64aeae1423224ce5e2ff8fd94f0e6e7790707e7c37c5984c9edc3a442f9da4fb64c2da7a54aca9c82480a47db890d49856db70b730e818f2e73fc03177dff94f SHA512 e6567842f8ce7b4d993f9ea1a3574f97f4ca045fa17f0b4abac1fd2648ec4e68d26b23ae43e8155828b9f59e594d08f070516e70ce4c3479405d2b6b4b88ea28
 EBUILD pugixml-9999.ebuild 575 BLAKE2B a0d46d8a41900827ff9dd1e837fd17af8a07287443e2f96fcaf50069941433d0d1d8b6479fee2ce211d0e5789a3b186a5a6a987565da58271b3d35acac56837d SHA512 063b603e7620e285822bc6b90880c345690b438dc317a728fe52e7778b2eaac43a5931ab61c5278d53390e7f5884ee843c2c2ed7b12b77822a93690c46e8e5b6
 MISC metadata.xml 347 BLAKE2B d86121989c61d616a24c02c5a7455be56522faed7d6d025a43b3035e9225fad555222106114800e37b765c6c4b73f3db90ac7afad2289c08269392429b413586 SHA512 fded6654794919a99715f373c129bf51b4f21d931f7ac696a8ec078310585128aae7dd7a76f7ad0227d5de3aac8ab2bef129a3ca5b73054293ca55b8561364bc
diff --git a/dev-libs/pugixml/pugixml-1.12.ebuild b/dev-libs/pugixml/pugixml-1.12.ebuild
index 2e894ea5e6e9..ebcd674be6c0 100644
--- a/dev-libs/pugixml/pugixml-1.12.ebuild
+++ b/dev-libs/pugixml/pugixml-1.12.ebuild
@@ -10,7 +10,7 @@ if [[ ${PV} == *9999 ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/zeux/${PN}/releases/download/v${PV}/${P}.tar.gz"
-	KEYWORDS="amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
+	KEYWORDS="amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
 fi
 
 DESCRIPTION="Light-weight, simple, and fast XML parser for C++ with XPath support"
diff --git a/dev-libs/spdlog/Manifest b/dev-libs/spdlog/Manifest
index 2ee0332dd138..ab38bb5f87f2 100644
--- a/dev-libs/spdlog/Manifest
+++ b/dev-libs/spdlog/Manifest
@@ -3,7 +3,7 @@ AUX spdlog-force_external_fmt.patch 539 BLAKE2B 326f40d3d496e7373a77476d5aba237d
 DIST spdlog-1.10.0.tar.gz 368651 BLAKE2B e40afa9fd1dd791e1f703392f0f54fc798ed70537a9f1ee9c8598dd449f4cd4dd03bc4ce95e416cbbe224711a17e70708a106f0432384542d6316cf232cf8757 SHA512 e82ec0a0c813ed2f1c8a31a0f21dbb733d0a7bd8d05284feae3bd66040bc53ad47a93b26c3e389c7e5623cfdeba1854d690992c842748e072aab3e6e6ecc5666
 DIST spdlog-1.9.2-update-catch-glibc-2.34.patch.bz2 54615 BLAKE2B 62b707fef02c7876692f7cc67119ea2b1a712d005d5367e5afdc50f42d6762f370a463ca3194e6850c059c679aef0e908471e0362afa2dc44a8bf7aaf19af2b0 SHA512 5d9868de7968ecf2c17b5fbb1199e70b064551bc2474fe563770d1e8d4b5f6d46d371091284c3bd10b47b3c7e94b134252e16f26b1834eff4390896acd773ecb
 DIST spdlog-1.9.2.tar.gz 327799 BLAKE2B 8e4cce17887509512c0d3a63485f9271098bdf7f853c2a07adb8d46459c1039d93d16d05cb60963c1bbc754f6af6ba3af1a66c69bc421bf234f676231c8c1315 SHA512 87b12a792cf2d740ef29db4b6055788a487b6d474662b878711b8a5534efea5f0d97b6ac357834500b66cc65e1ba8934446a695e9691fd5d4b95397b6871555c
-EBUILD spdlog-1.10.0.ebuild 1057 BLAKE2B 9a26575e2794e02203b9485cad56ed8fd56fe2edc8c49c818d84e05229afd24df7fd9bf8360e9e836a0ef5d3a22b68b233b21192affa40ae1dd49b7ddcbbc323 SHA512 41cd8168085b48b6693961f6e6368cb109df7ad153b81c5f0edb400578cd9a1f9c03a6d149a5c9e9096e59403979925fbac2fefc17259992ef841a94c8a912f8
+EBUILD spdlog-1.10.0.ebuild 1055 BLAKE2B 464c3d75b3909519573684b92c3e6d563669f31134374b6d6383e21ac9bca6ea373a55fb5f5bab258922d316bd975d575163aa4f4903c2d7451dced7041ced52 SHA512 25fc8e204fc5b0c515a86c9812c58e1530255ac8b9a81ab422dd8e7d69e048277467bbb2aa6f874c92d56e08aea56ad6f24da180e00ac0f34af1db2df2df5e8e
 EBUILD spdlog-1.9.2-r1.ebuild 1259 BLAKE2B 6e7ba878d9ee9423170a9c2d3b97a279bb9717937fc1df6d0c7f1ed7a4591cb8c05b829a8da6e97b00b68d82252a9ab459e87fa0205ff99c8d08cfc7895d77a8 SHA512 c4c4bc1f648cb6ca7a716f9d88324cd38e753a1d006cc59483f541531be0ce2b5b83cea0b0f447d4c43ffae01472c673ced43f71043cf21c9633ae1965fbfdb3
 EBUILD spdlog-1.9.2.ebuild 1154 BLAKE2B c9d1a6441a46b9d945e5036734e2efab4551ab7712b6df7faf82c470b18db538eeb16067e186a351c9ba48480cfa9a8455cc5b333922f875567db633be04ef35 SHA512 4234dd4b5319e7932c4a17484411dd5104da67190d6a67cfadfa1b6d30d669d74f7f61b3358f19c1e1312634948715b548869e55f85667368263846c9563167d
 EBUILD spdlog-9999.ebuild 943 BLAKE2B 2648bd5446a12ed2e55af185461a42ce4a02ce83c6dcc97470fb2a4bf4a8fc20526a34773ae8499efb3886e974444e6e1e39785a5f200ce7611432d2ac82fb60 SHA512 e960e95684bcc5c8d73d9fdfd2d45348362fca6c4d991453a7ee64b6dd5014c158bdc3bef11d26ab4e8c68437f9ecd5d53b3e809765a5687a749330f516378fa
diff --git a/dev-libs/spdlog/spdlog-1.10.0.ebuild b/dev-libs/spdlog/spdlog-1.10.0.ebuild
index 0f7e7d7d17f0..836240c02949 100644
--- a/dev-libs/spdlog/spdlog-1.10.0.ebuild
+++ b/dev-libs/spdlog/spdlog-1.10.0.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == *9999 ]]; then
 	EGIT_REPO_URI="https://github.com/gabime/${PN}"
 else
 	SRC_URI="https://github.com/gabime/${PN}/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+	KEYWORDS="amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86"
 fi
 
 LICENSE="MIT"
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d30117cc963a..d96b1b7c51fa 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/aiofiles/Manifest b/dev-python/aiofiles/Manifest
index 928e1b9e1b46..8b71856ad490 100644
--- a/dev-python/aiofiles/Manifest
+++ b/dev-python/aiofiles/Manifest
@@ -1,3 +1,5 @@
 DIST aiofiles-0.8.0.tar.gz 24139 BLAKE2B 0f113b75832219e63c0894e70ec613138db7e243ad032bc6d7bf715aab505b5246ab7a0add64b46a9b981801cf05885f7affa965cb625941dc57b805280f0ff1 SHA512 4f590baa0369d465a6139c0d4f50beeec60f8f213b607e0e41598f45f507a12edc67b29c77718b03eee7532f10ead8599f55aac3fcb78d0429435c25a58f6d2e
+DIST aiofiles-22.1.0.gh.tar.gz 21630 BLAKE2B 8f068046fc143388debc93b657f8b4715cd48eac7e7b8a031ccdc6d2f5764ddcafb2ad1fab713ca55366cad951b570e1c2a120932bf5545482e1a3f086a76bf9 SHA512 6706fb7b6fd32df415ece64f35b8ccc2f263301c43292612b2b6173fb66c77bc88fd08ed0b0bb30fa3dd49571be8fc733a3d4f3611228fdbb368743588336357
 EBUILD aiofiles-0.8.0-r1.ebuild 518 BLAKE2B eafbbfeb5eba6e3df53c017a55b81e8a1b7f2eba528d43a196db80628ad136aae56bbaf9f3105bb9b30e4c36dd18d56865f23166a0aca2176ab3402e8fa1cb0c SHA512 c4657748f11995d7ba42721cf8e12d81f2b48af6a8a334d96699d0c2abb293d726f1a365727af9fdcebdb1857aef340202cd2242567f336c743fd8e3c4d89f98
+EBUILD aiofiles-22.1.0.ebuild 569 BLAKE2B 1c21d3ccbe909a6f2d608f9b01cfeb1bc8ab141f9e73905db621a62e446d89ef26f9a2d0ecd57d339f5e977e19d62cd6a345a1d056c8ddf2cbddbc53437d5573 SHA512 de0b4c455b017d0065a41a08c758fecaad09752bfd036a9ddb1af2a090983ebfceaa24c82f4e234f374c79ab1e10b3c1b6dcefe677ddf4f91b6e35833f2eead6
 MISC metadata.xml 712 BLAKE2B 99425400a12f16885a65f3ec1b2bfa068d5fa2a20a075dbdd2e5a98543c25b2ff4c46ed435c3f6594d47e4265e5ebaab87e97c7f76f127b112fb883bcf26942a SHA512 235749ee35f86ee062ccaa682a3fb3872c1903f8c38e9bf8a9ed5be60d24526fe6007bf84764ca20347c87736549870b7f40d701f3a7c1936a9be1503e299b67
diff --git a/dev-python/aiofiles/aiofiles-22.1.0.ebuild b/dev-python/aiofiles/aiofiles-22.1.0.ebuild
new file mode 100644
index 000000000000..6b02b37e3b7e
--- /dev/null
+++ b/dev-python/aiofiles/aiofiles-22.1.0.ebuild
@@ -0,0 +1,31 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="File support for asyncio"
+HOMEPAGE="
+	https://github.com/Tinche/aiofiles/
+	https://pypi.org/project/aiofiles/
+"
+SRC_URI="
+	https://github.com/Tinche/aiofiles/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	test? (
+		dev-python/pytest-asyncio[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
diff --git a/dev-python/antlr4-python3-runtime/Manifest b/dev-python/antlr4-python3-runtime/Manifest
index 7bd4821e9395..e289a794e581 100644
--- a/dev-python/antlr4-python3-runtime/Manifest
+++ b/dev-python/antlr4-python3-runtime/Manifest
@@ -1,3 +1,5 @@
 DIST antlr-4.10.1.tar.gz 4599964 BLAKE2B 72688b3835350da11c015558a2840428fe69332a7b48992e118cb410005efce6ca5e02e8e5b1cf5edbf2cea506ec30fe516cce5061c52febbdb71f735c1c2cd1 SHA512 d950171d279b57b0fa977c77dd33e56848ca0aaf7f6ba40e5d49d69d5963e4c2e36fde5ee89e98c594064a909396d6fed9cc20129c3a1895d864eb889581e982
+DIST antlr-4.11.1.gh.tar.gz 4383139 BLAKE2B ac6e49ae8d4d44923e40eba98fa2c850cb594929ae1a29223678377aabe6f35d57f95e125393aa6b7145828c876442608883356b594ab43346c891ca932d9fd5 SHA512 a81f2ebcbcb6e63eb651731ceafab55f66401a3da0a6b2688cfe96d3bda299542dab5b05aaf4c8a8520ba32891b23adbf912011a4e45afae492a2a350d333ae9
 EBUILD antlr4-python3-runtime-4.10.1.ebuild 627 BLAKE2B 3379bd958c63490aff7c337b457401558c7e60ab5cc1959098b7b717c78bfd36712abba605b68c994bdb18eb334e5730204bc91c7fb355e3c66285d764b2e398 SHA512 04507c76a6de8f9dada63adada870c30344d742376eeeb1fe5a77464fffc1111942502e21e0f4c22265bba2f7c3a333410b71e10ad5a8aab5348c9baf1ba0e6e
+EBUILD antlr4-python3-runtime-4.11.1.ebuild 630 BLAKE2B c1de6fd98c5111810c385b357c80e69548f268936d8b944a0827ec777f99cde9b8ef3f3ae9f8e220d0a31e1252a24e4dd1d44e8655571cf8577638b8ef05a496 SHA512 41aac84e4362e1af1497514182ab7bc96a4e4c8be9477c25756d7a7a1e3688a11e51758efba1950cff6e3075de493ccdaed73ef874ae12a91f42e8c17107be16
 MISC metadata.xml 475 BLAKE2B 12dd34c09572017544a99c3985f6a7ad6c163f999f43fbc7ef4903456fe2d7fc59a8571fa3337ebe5a49eb6efab0a657a1b82b484b55887c799af11c0e64e716 SHA512 44ddd959d9f77d7beb97f84888db46ca468ed79ca844f89bbcac57366f42e1c2a1689497e2c25a659d2a63026b3c85f8348a43ee0213573d4a85cbf77fdfb993
diff --git a/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.11.1.ebuild b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.11.1.ebuild
new file mode 100644
index 000000000000..13f1fbcbd807
--- /dev/null
+++ b/dev-python/antlr4-python3-runtime/antlr4-python3-runtime-4.11.1.ebuild
@@ -0,0 +1,29 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Python 3 runtime for ANTLR"
+HOMEPAGE="
+	https://www.antlr.org/
+	https://github.com/antlr/antlr4/
+	https://pypi.org/project/antlr4-python3-runtime/
+"
+SRC_URI="
+	https://github.com/antlr/antlr4/archive/${PV}.tar.gz
+		-> antlr-${PV}.gh.tar.gz
+"
+S="${WORKDIR}/antlr4-${PV}/runtime/Python3"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+python_test() {
+	"${EPYTHON}" tests/run.py -v || die "Tests failed with ${EPYTHON}"
+}
diff --git a/dev-python/django/Manifest b/dev-python/django/Manifest
index 55f287b86ddc..1f56c8442484 100644
--- a/dev-python/django/Manifest
+++ b/dev-python/django/Manifest
@@ -6,9 +6,12 @@ DIST Django-3.2.15.checksum.txt 2560 BLAKE2B 35a4f28005a07cee0b667ec55838d846cb7
 DIST Django-3.2.15.tar.gz 9833828 BLAKE2B 4b914b1e3c192340d9a1bbd68b7d3bf3d1c1b3f41da6e4a67149e811a2312f646e2ced83af23ae035cf590e526dad00537aa5b4aee14a657f6952675eca94b30 SHA512 fccdad52d39c8757972d5e987b94b13d8ce5ce08ad480ef79407b0d9b88cff69336770409cbe18ce9529bf10966ad63105a0b0f1ffe39b681a41be3718ec886b
 DIST Django-4.0.7.checksum.txt 2551 BLAKE2B 6fa44707d33af485d3c55096dcc650b4e2384421c57c30cedee9f9577488783836a3ad8261dceaf5c718c1a5fcbe5852b081596525b22639c310c9aa6e86c639 SHA512 4b2453be8090c2a9d48bbe34f6e5dd55859b9debc3a116519c69da39d04ecca202e6da62ae9114790a9da8c55cfcfe176a972bb25576305a8e23736e2e063e3e
 DIST Django-4.0.7.tar.gz 10407810 BLAKE2B 77c994d042ace329699aa33e14098cbcd4f24fa4db880dd78ed87828b02c25298a1c1664511547de53eb80ebade7bdfb16412a615027e512ded437ae7de79b54 SHA512 51574ab7423a3948318a5985f74bd781269bf1c95dc77838c11e8f9d5e9233f0a3be5dfa4798d523473b9f1fd3196d4c10284e3a28d9543084b2a63179167731
+DIST Django-4.1.1.checksum.txt 2548 BLAKE2B aee8b104cf680645aabef0f2a18c029414435093b40eaf8f61dfecda3745b364a64e340136cc35c416708b150074d7fa18d65ab9619ed7e477d94dbfcb3d769c SHA512 62c542e4f6574ef82563ba8b5389d1408506cc4f48eb3781109d00ddaeb92f93d28536e913c120171bdbe979834baf4c28a14bc934b0540a75d1a5b7dba97d5e
+DIST Django-4.1.1.tar.gz 10474304 BLAKE2B 5349e095824db2aadfd8962932916ec2d01fa5f25287cc3b2184d921b9dd6c8d1e52a4648dc8f4cd87da03a261a0406fe7ef521667513a734bd1dae0754ed18f SHA512 49d0003b1a582cb27163df4bb30eda21d4e3bb101eb5ca0dab3ec1d5b4d99b6481b2edb4fd0e89ba8a06d0266d24ca70c92cd51b9e4c4eab818d68098e8ef4d8
 DIST Django-4.1.checksum.txt 2533 BLAKE2B 263c3719c572347cb5d2087b960a47f0e6ac409a94499cd5ee8ec619c3388d29354c10813d4b3d2a0d6bd73ca52f562a6ae89a3d9340d5ea478a80cc30284467 SHA512 96d0a66c40261530d65bdde34ba1fc2e650690821b0f52900d60ab85162debc64e33e089f90e2b106235fc47581a54dc6432968534837c1a71a887b40fdd4f36
 DIST Django-4.1.tar.gz 10484595 BLAKE2B 29a833330862abcf69bf082af6df08986443d34abfe821bd307fba6ddd73dd00be7ae8d3e809fe97db0b22f9062daa760cbe01da8d773e1528f583938959f775 SHA512 f0f7e627b3c474c886cb2476f900222d2623e1ed1da1ac6b23ac618ff49e330edc2efd47b275cb02b8bcb254126bf3c926462c616bb0abee1cd433715f5184da
 EBUILD django-3.2.15.ebuild 3050 BLAKE2B da552703a81abf12dc9f104268237438fcc8b9003a9d4789706ee2c812799aef24e4476039cd64bb65c7821f844138e22220006ea14c1475cf3d1705babc6298 SHA512 59e9aa4a66d7b804578fab30b0db04ad2f07d482c07260bfdec986c921d321e4a79b03c046b877a2ffb7d0bc204f0799d4f2557abdc01560879db2c75d68f536
 EBUILD django-4.0.7.ebuild 3014 BLAKE2B b7cf6af18b777fe0953f5b8d86f973052f91deebb13b4098389501492fa0154a219a92f73f4c7d4f7837f213b3d577dc8019adc45f166c7168d35e7c86d8263b SHA512 4fadb585365955d6d3e9fabbc0657b35435266bb27fd1515712f91844e21fd5adf6a24c42b02ec6e58c031c40fc9909cb4f25f610acdc752b6046cc19d9840ad
+EBUILD django-4.1.1.ebuild 2899 BLAKE2B c84e9f3ba8a7be4ed558618906e052af0e9024e938ac3fa4f9006ec54b2c9e6ca79f6f8f2e2181a5e2c1b94ae96fb3a4cd7b3d71efd802324d456ec958ef0162 SHA512 bce76087cc21969a468794bd19dd84a5150d995c0d264bb0350db4467a1b8e4a7b3f04f70dbcddccef36b90de76ffc7fb7c8546ccc9576d59c110f893ae6693c
 EBUILD django-4.1.ebuild 3014 BLAKE2B 2e1a238d9c1e3d3256111d2153f9bc4ec6e4ffc5d084f87d7fc699290999dfb8ef870ab94607ba8777753be053b888230be3a31d820e53be522edb32a352c698 SHA512 fae3486b9008e457b4b65bee3fc919e82a81786cf79b54cfc6a4823f1c2f9d9f7e551ab3e8db6b4d9c8c3bca217278a165d49dd5648bc591ec4096d34fbf811e
 MISC metadata.xml 400 BLAKE2B 6b3414ac734f078d90c82b44edd2f9f70e494e98da8a3d874d18006ae5e0eb5f7060b98b402094d6045e800bf525586f2566e6f554a8b2999cce37bdcc5472a0 SHA512 1cf0bb6ef93da3abbd1a66878462b1b8672a9b8fccd7f968b427e429caa6ecf30cb703a6060d621ccad1ba77b927d2b0e632b04b0a47975918ccbfcc5f2b85f7
diff --git a/dev-python/django/django-4.1.1.ebuild b/dev-python/django/django-4.1.1.ebuild
new file mode 100644
index 000000000000..eb13ac84e4d2
--- /dev/null
+++ b/dev-python/django/django-4.1.1.ebuild
@@ -0,0 +1,104 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+PYTHON_REQ_USE='sqlite?,threads(+)'
+
+inherit bash-completion-r1 distutils-r1 optfeature verify-sig
+
+MY_P=${P^}
+DESCRIPTION="High-level Python web framework"
+HOMEPAGE="
+	https://www.djangoproject.com/
+	https://github.com/django/django/
+	https://pypi.org/project/Django/
+"
+SRC_URI="
+	https://media.djangoproject.com/releases/$(ver_cut 1-2)/${MY_P}.tar.gz
+	verify-sig? ( https://media.djangoproject.com/pgp/${MY_P}.checksum.txt )
+"
+S="${WORKDIR}/${MY_P}"
+
+LICENSE="BSD"
+# admin fonts: Roboto (media-fonts/roboto)
+LICENSE+=" Apache-2.0"
+# admin icons, jquery, xregexp.js
+LICENSE+=" MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos"
+IUSE="doc sqlite test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	<dev-python/asgiref-4[${PYTHON_USEDEP}]
+	>=dev-python/asgiref-3.5.2[${PYTHON_USEDEP}]
+	>=dev-python/sqlparse-0.2.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	test? (
+		$(python_gen_impl_dep sqlite)
+		${RDEPEND}
+		dev-python/docutils[${PYTHON_USEDEP}]
+		dev-python/jinja[${PYTHON_USEDEP}]
+		dev-python/numpy[${PYTHON_USEDEP}]
+		dev-python/pillow[webp,${PYTHON_USEDEP}]
+		dev-python/pyyaml[${PYTHON_USEDEP}]
+		dev-python/selenium[${PYTHON_USEDEP}]
+		dev-python/tblib[${PYTHON_USEDEP}]
+		sys-devel/gettext
+		!!<dev-python/ipython-7.21.0-r1
+		!!=dev-python/ipython-7.22.0-r0
+	)
+	verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-4.0-bashcomp.patch
+)
+
+distutils_enable_sphinx docs --no-autodoc
+
+VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/django.asc
+
+src_unpack() {
+	if use verify-sig; then
+		cd "${DISTDIR}" || die
+		verify-sig_verify_signed_checksums \
+			"${MY_P}.checksum.txt" sha256 "${MY_P}.tar.gz"
+		cd "${WORKDIR}" || die
+	fi
+
+	default
+}
+
+python_test() {
+	# Tests have non-standard assumptions about PYTHONPATH,
+	# and don't work with ${BUILD_DIR}/lib.
+	PYTHONPATH=. "${EPYTHON}" tests/runtests.py --settings=test_sqlite -v2 ||
+		die "Tests fail with ${EPYTHON}"
+}
+
+python_install_all() {
+	newbashcomp extras/django_bash_completion ${PN}-admin
+	bashcomp_alias ${PN}-admin django-admin.py
+
+	distutils-r1_python_install_all
+}
+
+pkg_postinst() {
+	optfeature_header "Additional Backend support can be enabled via:"
+	optfeature "MySQL backend support" dev-python/mysqlclient
+	optfeature "PostgreSQL backend support" dev-python/psycopg:2
+	optfeature_header
+	optfeature "GEO Django" "sci-libs/gdal[geos]"
+	optfeature "Memcached support" dev-python/pylibmc dev-python/python-memcached
+	optfeature "ImageField Support" dev-python/pillow
+	optfeature "Password encryption" dev-python/bcrypt
+	optfeature "High-level abstractions for Django forms" dev-python/django-formtools
+}
diff --git a/dev-python/flufl-lock/Manifest b/dev-python/flufl-lock/Manifest
index 8e5c3bcf1f3b..550a9cd15071 100644
--- a/dev-python/flufl-lock/Manifest
+++ b/dev-python/flufl-lock/Manifest
@@ -1,5 +1,7 @@
 DIST flufl.lock-7.0.tar.gz 33169 BLAKE2B 72c763e50e0a28f02fe6d9a8d88b1c64626a60310b203f9bbcc82e950f8ac494640748dece4c63542d4b89512a1f98bb1d92bda145028ebd18a8f254c2e2c1eb SHA512 b1c5151d30aa3e9afc12fe0dbd9be05ad1f9133b32f5e3bacf98532fefb08fbf354bf4b9a4b9fc90e448861941eba358e8f67218daf9797eb031b487cc717181
+DIST flufl.lock-7.1.1.tar.gz 33017 BLAKE2B 813b4b77fe2b7c9d7125e9d4a5530a77aa4205e1eb0a90852419f29669db97c683fe1d73d221bc7490a7a827da24e23bfac38002c1e6a179289b56b59e2d4dfa SHA512 eb9d8a80013ca07cc3eaab30ced596c0362cfc59d5a1f7cf17aacbf4068d9989b443df7e2d5f5e09d6f60e0ebc784ab1897ca7379fde7eeb57246cb6b5dfef3f
 DIST flufl.lock-7.1.tar.gz 33315 BLAKE2B e6a93c4bba8edf65cad505b52d8f57731410b4b3d8e293407123468820d9eba585f09c1683f191c035f5b97d59b8e45a921218107a32e3c49a1acaf20890b997 SHA512 6f073ffd7ec825b9483b70e68b86e6f8842056334126bd54778e8182489df5f659afcdfdec103fdc516d7a4a3cf8ba918d337f01816b6b688ef8706d52627314
 EBUILD flufl-lock-7.0-r1.ebuild 732 BLAKE2B 97f17bfb5e427f41d1f83af040acf4daec4d2f293150d87545a53df7aa7172331bd525416d9f3a24ff94e42c358b7ae8e45cf349a597fc99978618699bd462ac SHA512 4ba442f4a6e45ecb5457f9156ec44817cfb37a4450a0c078665e95c0e2190469a8844c68d34cf1352fd71073450ac30069af80107724d8bed05c10bad2391f00
+EBUILD flufl-lock-7.1.1.ebuild 736 BLAKE2B 11b4f53e4027a24b5facfe6859a690c181a43f9bf2f9dd16f7524ba7d3a6b5f854f1c177fa1086e1b487e43c1068ce1438cfe61d9e0b4605c10dec21cb7fd49a SHA512 adf1d431c98c2f3547629991199a14d63b7f0a7d2fa764c7eb0826105056b44d11df23c1af943fd872d79207b444d28f5ef694042dbdcb6c899ccf38e9c16315
 EBUILD flufl-lock-7.1.ebuild 736 BLAKE2B 11b4f53e4027a24b5facfe6859a690c181a43f9bf2f9dd16f7524ba7d3a6b5f854f1c177fa1086e1b487e43c1068ce1438cfe61d9e0b4605c10dec21cb7fd49a SHA512 adf1d431c98c2f3547629991199a14d63b7f0a7d2fa764c7eb0826105056b44d11df23c1af943fd872d79207b444d28f5ef694042dbdcb6c899ccf38e9c16315
 MISC metadata.xml 407 BLAKE2B 351ee456a6b36c54e42f4be026d3fad2aa49e4f2be746b43934e4402f594a2fd4eed5a29eb4a1bd22192a141e220523dad77218ac1b1e8a2db10190df97b83a0 SHA512 aa8fa297cc7b996c495542c23628ece8139117ec1da6b2cd0cf7c72bb90258618f8e2368aa1e5e48689540b11a7df7e16fab4da502f5058c1b6cf6e058c309a8
diff --git a/dev-python/flufl-lock/flufl-lock-7.1.1.ebuild b/dev-python/flufl-lock/flufl-lock-7.1.1.ebuild
new file mode 100644
index 000000000000..1c3d999df72d
--- /dev/null
+++ b/dev-python/flufl-lock/flufl-lock-7.1.1.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=pdm
+PYTHON_COMPAT=( python3_{8..10} )
+inherit distutils-r1
+
+MY_P=${P/-/.}
+DESCRIPTION="NFS-safe file locking with timeouts for POSIX systems"
+HOMEPAGE="https://gitlab.com/warsaw/flufl.lock"
+SRC_URI="mirror://pypi/${PN::1}/${PN/-/.}/${MY_P}.tar.gz"
+S=${WORKDIR}/${MY_P}
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/atpublic[${PYTHON_USEDEP}]
+	>=dev-python/psutil-5.9.0[${PYTHON_USEDEP}]"
+BDEPEND="
+	test? (
+		dev-python/sybil[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e '/addopts/d' -i pyproject.toml || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/fritzconnection/Manifest b/dev-python/fritzconnection/Manifest
index 16013fb1305f..d92360ce5310 100644
--- a/dev-python/fritzconnection/Manifest
+++ b/dev-python/fritzconnection/Manifest
@@ -1,7 +1,9 @@
 DIST fritzconnection-1.10.0.gh.tar.gz 146309 BLAKE2B 64b01a561a015fae10dc3aced2576afce5d27555aba019028de32d5dc0ee9099f4248d900ac1de0f18321d52537dd7b77ff010ce44ca863ef9b5c5e228c61071 SHA512 86acce864624f67fdbd407157565cec434d029907b4d295a3e5e1bb41d8856ca1eae99681fd3c44033c6bcef8ecc594483f734e08c4fb733e685c01147dd3c29
 DIST fritzconnection-1.10.1.gh.tar.gz 146297 BLAKE2B bbb8601d3c5f9f379275dae8e293385f9c4dca44eb9e74b22f12cd4e89a50a3dd2c8220aa0e28408f3f136192c43a5d4bc37347e047caed42f889cc303b02f52 SHA512 fd860a563eeefba374ccc8d2ab8319dd07b6c02c12fd9b7ff00353d86b041757fded308f5a0859cee8d190c5c51b5308290eb656e77ed8e3882ee482568cd677
+DIST fritzconnection-1.10.2.gh.tar.gz 146414 BLAKE2B 2a3a478ded0897c7ce703ebb34abdd54f54d286a82dfe761703b7ec8b3615891797815c0fb3a7a08f70d2713f530f31fd6ca8093b634a09a6d10cce95ad97d6b SHA512 b7073f5cc558ac9b43bf8e53aac5bdee1b9d4f164d72c766f63a62f88d38635da40202b48cba36356a9871f4f9f9ecda7020424491f419d534e3cb1c9067cb28
 DIST fritzconnection-1.9.1.gh.tar.gz 79580 BLAKE2B 6972c92aabb9c516e2b4d3d18bea2daf8002a12c9939a5badd1ceb8f7539a243f99778a3ded0cd057850b54e9cb2a0ca9d2c31be688eaf81f4b279b74d10fc55 SHA512 55642cf1db581c62091d63fdfa9bf4fe36c545df686eae7d0f886b4ef8c186668e6f8fb7bc7786e13936764ea771e0dba79e62b57f19348dd562bf23a27d6369
 EBUILD fritzconnection-1.10.0.ebuild 720 BLAKE2B 8266d36789f99c3b87a6fc4961accfb41a0d7047100da007d7279b3f385d0be6b9f718865d6841b757fb10b3f6d6a6fc4d36a130e9e11e2374acabcfbd607028 SHA512 277ebc11c36d4d48aa5f59076725bc5fa3349aeb8ce5aaac37011b6d7b9826fc7025e759416642f47f632fb7024151d68e214d7b03eea63d1746d9a8c76ff99e
 EBUILD fritzconnection-1.10.1.ebuild 752 BLAKE2B 5c1a575fd8dba33f013d48f34e299969d214bc5f8a538051380b48928196b31027d6fdf194ec2c53ef4b85233909a2d5653a160ef7d22ae54a303502cd5dd384 SHA512 3fdd1acf0bc0c12b690a423e1cebf6150836c4047b219c0bb129531440093951d414ef3b18e1ec26b7e0076103573a675ed0cfca69d3ae3248e9b5b3793820d9
+EBUILD fritzconnection-1.10.2.ebuild 1113 BLAKE2B 3888c900d810725125ed204e5ed665ecce8c24b1f03833ecc5bc892047e83717b99bd99bb462a64f3cd88684090b5d61c5586b0f592b751e2d9d06db9c0c0668 SHA512 2a5c46214a594bb8bcc2aa93ec05dd607c530465e34db71edd4f792a51a5eb6bef66e62a1442299799a3c842bdf99dc3f82a0d412d906dd3e2bdbf8d229c901d
 EBUILD fritzconnection-1.9.1.ebuild 720 BLAKE2B e99e847560c7bb83b7baab4d6c77bc5c8a454029df5a21edab8098fa7f5130515f6b68c84656981ceb8742d2ba12064fdc128d06169b4763bd76948bd5018e3f SHA512 45c8c729655481eac8b87cdec1a98c2b6f8ff5fcab1824abf74df3f563192112af4280d2872620a40011fb5920b262b88b11862eb2db272af6e03fe1a063300a
 MISC metadata.xml 469 BLAKE2B f180fca33d0ab2fc81dc87fd39db87cf8c8ff51777062968a3ace592c9ac63af311273fda2db88c6772204ae24c21b4f195d1b7bacbb3c23f677dc7e8e309f1d SHA512 9ab24725dc0bb5b0e40ce79520d19c0348b08c7d779b53064111aa53fefefadc164b6140310df0a367d460d2fbb46345bdb2b7b6a9cf1beba3bbab1f7d7e2697
diff --git a/dev-python/fritzconnection/fritzconnection-1.10.2.ebuild b/dev-python/fritzconnection/fritzconnection-1.10.2.ebuild
new file mode 100644
index 000000000000..f901bc98be0c
--- /dev/null
+++ b/dev-python/fritzconnection/fritzconnection-1.10.2.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP"
+HOMEPAGE="
+	https://github.com/kbr/fritzconnection/
+	https://pypi.org/project/fritzconnection/
+"
+
+LICENSE="MIT"
+SLOT="0"
+
+if [[ "${PV}" == "9999" ]]; then
+	EGIT_REPO_URI="https://github.com/kbr/fritzconnection"
+	inherit git-r3
+else
+	SRC_URI="
+		https://github.com/kbr/fritzconnection/archive/${PV}.tar.gz
+			-> ${P}.gh.tar.gz
+	"
+	KEYWORDS="~amd64 ~x86"
+fi
+
+RDEPEND="
+	>=dev-python/requests-2.22[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# flaky (relies on time.sleep(0.01) magically being sufficient)
+	fritzconnection/tests/test_fritzmonitor.py::test_terminate_thread_on_failed_reconnection
+)
+
+src_prepare() {
+	# upstream is pinning for py3.6 compat x_x
+	sed -i -e 's:,<[0-9.]*::' setup.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index 4541004c9b64..e6657dd00921 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -3,9 +3,11 @@ DIST hypothesis-6.54.1.gh.tar.gz 9324403 BLAKE2B 897fa4901a5c5c0e32c4197020702db
 DIST hypothesis-6.54.2.gh.tar.gz 9324746 BLAKE2B 25e3effa9667e8b6c57dff0ed00c14cc36385678475a1a1ac9fd30d2e293ea3a49d76ad34e391b33bad7214ce97b5d23aebedcb5d7f74686f3182a72e133416f SHA512 f53d589426b2340f6d747763cc4228f632474bc833e53e2d67fd6545437fc46cf976055dd0f1a55c4cb6377667ce0b0d8bc7dae33454157fbb91af7a5b009b62
 DIST hypothesis-6.54.3.gh.tar.gz 9325211 BLAKE2B e0d6bc21057b50676ef98d1c9721b82c30986670758b2a7bfd1b101cc8d42258bf0d61887867445aafe13b8064c47d64583ab492e21b6fea510ef0c26fe01782 SHA512 288c5ea9c1dd8ee0839c11385f52ba8b8122f408aa11c6d2416460233ef78890e3014e659ef4312da4822da3abe2dd9163f68d2711556800e805ae41280aa132
 DIST hypothesis-6.54.4.gh.tar.gz 9325437 BLAKE2B 2000c806a0c791d1eb353a829e5e96d53e935d360fd450b3807186121fec4dfd171b8821e08b6c23b0cbea8d24b0d88c32126281173a0de2f12b29d09ec2d62b SHA512 7e5b70cc2df874163205e3d35f3f5e6a71319e779b35f1596c69222373e9b766a143ccf37aa1699de6b98827978e44ccbca0b1e30e6ffe29c8b68c83bb3af869
+DIST hypothesis-6.54.5.gh.tar.gz 9325448 BLAKE2B b4cb8a413ad96f11f4dbf4a1a529e389dbca45561264cf0922721a25009d1065fdce21064faf53bd7aad2f589c159b52d899aa7b12c12da68beae8c9186c0505 SHA512 37205ea28b44537409a94592e466376e9612f84a8501ad2ff5504fc648e062555ffb600416bdd1f9a74f39ba39729defd581025e0611c501839721721f7cf6e3
 EBUILD hypothesis-6.53.0.ebuild 2078 BLAKE2B 11eee6781b06ca0da65094d20403b7783d83799a1f0e3684fb450784faabd97cc624caa681d1b89974dae552d98ea8c98f8a2de3dfa57c97b4246afe9370f621 SHA512 972d703e77d7403ca70447f2b27617874be3a0eff802c79ee05d7c0991acb931bb2a91967055c27f244568049d86879ec1a77153a7a48aaa4305132b0b537eb4
 EBUILD hypothesis-6.54.1.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.54.2.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.54.3.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 EBUILD hypothesis-6.54.4.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
+EBUILD hypothesis-6.54.5.ebuild 2086 BLAKE2B bcb3fca12e4ca3e6595ad6db87d0efa7b7029471da4ecf98ec59ac4597ded88f4996a97966996544d76af871c08a56d43333b269ba15a34b6198fa7f359df2f6 SHA512 958ec21680ae6029bb5adb1711631b5352631899bb25084fb35d28bbffc44bc0054456fc3711a828f0e224af322c4499df7a5c2bc39bb6158728842a6d76f5a4
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.54.5.ebuild b/dev-python/hypothesis/hypothesis-6.54.5.ebuild
new file mode 100644
index 000000000000..1065b755121f
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.54.5.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{8..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/keyring/Manifest b/dev-python/keyring/Manifest
index beb732e52c3d..8c39c0c9ef35 100644
--- a/dev-python/keyring/Manifest
+++ b/dev-python/keyring/Manifest
@@ -2,8 +2,10 @@ DIST keyring-23.7.0.gh.tar.gz 45352 BLAKE2B 8cad2f2c7443adf710220d546a080c4ca106
 DIST keyring-23.8.0.gh.tar.gz 45941 BLAKE2B db78b53e2d2964c65d850df4226954db696037fa220f003d91e94603ce12b4d3668b7b53a91b71244d8555ba9c9195309a2e8a9aafd88d12da0f1a916b469857 SHA512 daa0b88b9f7c6e94eb589c15f364ff2a0fb83cead50b4fcafa6214072681d4346c8abe7ee8ab76f0ab93b7c7bccc551f65912dbfa749256e226f1e84793676dc
 DIST keyring-23.8.2.gh.tar.gz 45987 BLAKE2B 3a8faf6487c2d4dd76e549585a236e4744e5a4d23a778515425e7e78c7161717c2d16b8f268fbc8b8c59d6fb3fb39fc789b0dd92363b6d61073047af8d99b804 SHA512 af5c764d355c548d1f1364006dbaf6ee366a7dbbda9649145dafa5d610a4691ab4488151c054359e26a467312653601ddf722bddf35deae309067355337eddec
 DIST keyring-23.9.0.gh.tar.gz 46610 BLAKE2B 31581974d40d4fd0febd576db3967f29a09e9d9251c59fa2d0198cb80f3ec49d043fdde4002f3893cffce6936f4e9e2186457f870ba97e65a22c70a2741e17d3 SHA512 c8432d61ef94a56cd3aafa3f766cc1488585cadbea757eb63ba3d73a0b373ac949a27edba4b282ffb8629fcd9a3a6c0b0acea90dd377bf3f2fe5a290b82e4b44
+DIST keyring-23.9.1.gh.tar.gz 46768 BLAKE2B 4b1acd33f53244a8932efbd54a8edc065071cf2ce2049d590a7804b171b90719fb18d982aa7bea217f76beab80e2cce5d4ff4f5440d23342879aed5ee79d7c82 SHA512 e384c4e592b2c4b9b6505c1fe22d9192c6d577add52e874490833dadaf1aba9dfc708593762471de0f5995bc6bb35f61ba541590a152528b489128fca629c623
 EBUILD keyring-23.7.0.ebuild 1196 BLAKE2B 7d2f2f2a4882d589ab30a8f790400ce677967ff48e9c6943ed5a5f8eab48c140756fe6f8bc7f9bb068d76ebdbf9eed8593c3ef1e5f0ce14938d5a42518226c21 SHA512 5a884c745d5a228d19a175d8fad76fb749a04fc5fccceec4c068719ffebb9e0455a8904c0ea28c435780389986eae0cc5f44fce1c40286bcd48d39e021b9363f
 EBUILD keyring-23.8.0.ebuild 1203 BLAKE2B 1782811352663db6d7532c2d2a949878f19c1073ad25a2958a2a43b590b77b7b25c5b3a82cd215077b00132c2f41fd2248223c1a9864f3f5ca1ecf6dfebeeb60 SHA512 b304bbdaadbe3c101d51d9fbd94d29396a3d4e9d16f20f3ac630d696cdf0f5773257cfe8869f119ccfdbf29bb23682989021a26c683d5c821cdd2b67eb7d04e6
 EBUILD keyring-23.8.2.ebuild 1203 BLAKE2B 1782811352663db6d7532c2d2a949878f19c1073ad25a2958a2a43b590b77b7b25c5b3a82cd215077b00132c2f41fd2248223c1a9864f3f5ca1ecf6dfebeeb60 SHA512 b304bbdaadbe3c101d51d9fbd94d29396a3d4e9d16f20f3ac630d696cdf0f5773257cfe8869f119ccfdbf29bb23682989021a26c683d5c821cdd2b67eb7d04e6
 EBUILD keyring-23.9.0.ebuild 1203 BLAKE2B 1782811352663db6d7532c2d2a949878f19c1073ad25a2958a2a43b590b77b7b25c5b3a82cd215077b00132c2f41fd2248223c1a9864f3f5ca1ecf6dfebeeb60 SHA512 b304bbdaadbe3c101d51d9fbd94d29396a3d4e9d16f20f3ac630d696cdf0f5773257cfe8869f119ccfdbf29bb23682989021a26c683d5c821cdd2b67eb7d04e6
+EBUILD keyring-23.9.1.ebuild 1203 BLAKE2B 1782811352663db6d7532c2d2a949878f19c1073ad25a2958a2a43b590b77b7b25c5b3a82cd215077b00132c2f41fd2248223c1a9864f3f5ca1ecf6dfebeeb60 SHA512 b304bbdaadbe3c101d51d9fbd94d29396a3d4e9d16f20f3ac630d696cdf0f5773257cfe8869f119ccfdbf29bb23682989021a26c683d5c821cdd2b67eb7d04e6
 MISC metadata.xml 611 BLAKE2B 7f938075d992467e01da200f0c859e9bc6a6128296151b3529b2168b68364605bd7dbadf69f7820d459d5db6950908e0b0acb09a636f1fc45862093df6d08334 SHA512 a0ad1729c53b18fedf227053648b04541f5adcf56bfaa73218e214f8c2409ebe2574a5917442c5218084b38da34691b6566f2c65390ef6487985a123f62f9efb
diff --git a/dev-python/keyring/keyring-23.9.1.ebuild b/dev-python/keyring/keyring-23.9.1.ebuild
new file mode 100644
index 000000000000..a90ebe22521a
--- /dev/null
+++ b/dev-python/keyring/keyring-23.9.1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Provides access to the system keyring service"
+HOMEPAGE="
+	https://github.com/jaraco/keyring/
+	https://pypi.org/project/keyring/
+"
+SRC_URI="
+	https://github.com/jaraco/keyring/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="PSF-2"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos"
+
+RDEPEND="
+	>=dev-python/secretstorage-3.2[${PYTHON_USEDEP}]
+	>=dev-python/jeepney-0.4.2[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/importlib_metadata-3.6[${PYTHON_USEDEP}]
+	' 3.8 3.9)
+"
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+export SETUPTOOLS_SCM_PRETEND_VERSION=${PV}
+
+EPYTEST_DESELECT=(
+	# this test fails if importlib-metadata returns more than one
+	# entry, i.e. when keyring is installed already
+	tests/test_packaging.py::test_entry_point
+)
+
+EPYTEST_IGNORE=(
+	# apparently does not unlock the keyring properly
+	tests/backends/test_libsecret.py
+	# hangs
+	tests/backends/test_kwallet.py
+)
diff --git a/dev-python/websocket-client/Manifest b/dev-python/websocket-client/Manifest
index 5d07111f1390..e12e01b98138 100644
--- a/dev-python/websocket-client/Manifest
+++ b/dev-python/websocket-client/Manifest
@@ -1,5 +1,7 @@
 DIST websocket-client-1.3.3.tar.gz 48250 BLAKE2B 1d6027d7ad2f45ad774da8c4d5ad9c19c084998429cbd0ad5ade89700bcc21dc7c2ac452d0f4238432c0af16ca82d01442d002f988204c96e655d810906730b7 SHA512 e70b6c074cbcac1e97dc11b0ccf60dc67fc066f8394b6cbd20349c1d41d625966c03645da5ccd0a81198c80e2e40fdc267ac599bc5dfacadad4c511a83e06de1
 DIST websocket-client-1.4.0.tar.gz 48470 BLAKE2B fb61ab005099cb213361c3b7ac0ac824a4780aad97d4fdad72dff71a06f626179e6416ad0fe9ed87112a2714db90eb06616584de7331466f62d2e8864689c62b SHA512 3f746f2ecdd4694e4d7c62eeea193015d6a082b149ca5db16e3cbd305955c99e126bbfd62513dab0037a8bc06999c67b016461137bf271a8578bcd6388e637fb
+DIST websocket-client-1.4.1.tar.gz 50883 BLAKE2B 4d80b5d5f407fdd81b5468f37b66759970cf96395738b67271388c55d13c30c36c9f7a5a89b10fb78bde4870e25bea5761c297b3fc85b0b8d62eda24443421d9 SHA512 a2804421e97ccbfb61cb2e8a2be6ecd5d5d60210971e27ca4e00a4854fb49df2e3c87ec87c0ec11565d7ce03f419dc3cbd8c2402843a8fced49d75d65d07b502
 EBUILD websocket-client-1.3.3.ebuild 760 BLAKE2B 045744d48d8e7e6919b4be5f1484cd8f3449bdc732e2a4202d114f009d4f0eec6e5e97e7611a11c44be6c4bc1cd928b23b842ed71340ca2723fb6bde64b3ec7e SHA512 0b59ca720529f82ba4fd6cf6b615d7936ae9ce56f2bfa1377820a3b19684768cbaa5c5faef9afa81afd5d27c79b10d84fd8263214e78374dc9f05f60aa71c612
 EBUILD websocket-client-1.4.0.ebuild 768 BLAKE2B 847d9a3ef01883de1346f3bbf9b8d9d02b6d32bf7e68c34c58c49ec85743634a027d12380bd09ef5ac2a6740af5dfaea7cf94cb33110cf9761a00fab5960f9b2 SHA512 cb3cf8c86ad48a3171871e870ab7bb1365f05d8e220533f90a12581ef231b0b12fdee8eb2d54d44b8d0932db5a1c9c147a6f301e7de743d5eb2e2584a1cbf8f2
+EBUILD websocket-client-1.4.1.ebuild 816 BLAKE2B 52d55ac6237a6ce0b5de36c3e5d5cdae69b2ec5401c09c8b5512663c327655d269c87793e743d83d072bab4c65107ce248b1a41b7f430611f33e41dfd24097f4 SHA512 baba222bfc2b038fa835a4d636c736ef3e6c6800150bdf30b507f74eca3c25645ca4c9354d11792ad92fc78c387418829ea648022fcde66b9a687e5daf9fe6ec
 MISC metadata.xml 498 BLAKE2B de7c287e513c7e64b4bec29693e6eb9104ff963e0d4d942ed37402bf341739fb17b2ebdb1bf0aaa0081934bae34e16f025d0549f94c1a863be95d64a338eede4 SHA512 13dd8cf0f3e363a3fbf2b246bcc1ccd78a898d5ca830e30fb1606947ce129d99f2d8065c3668dc2c7749bbd4e24e39e5a7c483065737a580246a89dd4d41eaa7
diff --git a/dev-python/websocket-client/websocket-client-1.4.1.ebuild b/dev-python/websocket-client/websocket-client-1.4.1.ebuild
new file mode 100644
index 000000000000..78665da331ef
--- /dev/null
+++ b/dev-python/websocket-client/websocket-client-1.4.1.ebuild
@@ -0,0 +1,37 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="WebSocket client for python with hybi13 support"
+HOMEPAGE="
+	https://github.com/websocket-client/websocket-client/
+	https://pypi.org/project/websocket-client/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="Apache-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="examples"
+
+BDEPEND="
+	test? (
+		dev-python/python-socks[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests unittest
+
+python_install_all() {
+	if use examples; then
+		docompress -x "/usr/share/doc/${PF}/examples"
+		dodoc -r examples
+	fi
+	distutils-r1_python_install_all
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 57b4c562cae9..a9d3ebc6c990 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/pahole/Manifest b/dev-util/pahole/Manifest
index 24c0494022f2..27856bf17ff2 100644
--- a/dev-util/pahole/Manifest
+++ b/dev-util/pahole/Manifest
@@ -1,5 +1,7 @@
 AUX pahole-1.10-python-import.patch 399 BLAKE2B 7abd98ec5711ec4ce9230a2d0bb06328174a4a67b62ba14b2413b83b6d44676d372930d4796b9ece230c4de9185d35cb31a086ca340871e50e29d584ab9a7487 SHA512 c2f5c1e99ef2ffeaf0e7962cbdf28817f6896b27ff6894571823c81ba08b9e9440af1a5b6ad82770b8e8d6ec99ec2ef8f46a98b67fea7cd4ed7e8c22e716e314
 DIST dwarves-1.23.tar.xz 815076 BLAKE2B 2d89ac2d8cacb70a322b1c946356c0b18a2276f7a549efc2cf530c087dd718c7d01f5bcf8b9208965e066770064b6d8db7a9f6ab9a3f3a4612f6fcc8d146c1e8 SHA512 5255930d6898ce35a41e3e553363964663d2b686d12732ff6140fa1d06fcc3806adf28e24ec35ab0712eec0562c52c3943afe9ecce468b0053b852ffeb04c3dc
+DIST dwarves-1.24.tar.xz 875744 BLAKE2B 6766b5a5ecbf64013227e7cd459af662fc213f230b5b1279354fcaaccebfa3d74f9a2254542dc4f3f1bb4a5def1d4c77e2445fa8b531fa8b9e331cdfc23155fe SHA512 3cdca183cf68ec46fd9a0301ae4a8a30b23a8139c65ffba64ae11f85f9e942f7341dca6f88a4a3b49f32bfd880927193a80fa011726e4a33d3e5a1a146326c06
 EBUILD pahole-1.23.ebuild 1093 BLAKE2B 48f44ff23836b2628bfa5e6373e158085378118fa3bd0df679ce44413d8862ca68d5acd7cfc28b41c47206077710e20c32f92f90c8577027447b88114633bdeb SHA512 1481e745929fd222ea9dfd1380d958b5f51dfcf3eaaccec48df06bb450ab2c457374782c5243bc59682fa9050b081ac0de5dc85a6f345d7bcf500391d9407a50
+EBUILD pahole-1.24.ebuild 1089 BLAKE2B d859aa5814432cf6d9d82eadd4937c4c2f902fc819f7c81c1912cd2e31786bb7a7719bcdf4c71b5072422a12b1c86e65c24f7074888b885bf206c9607c877950 SHA512 92c20395a0d931c8733b81ab7439c77769a0b7bc7f57595420ca510646d489bbede522032731bcd6a2100978ad7fd3497693a48ec2085007aa88847ef643400e
 EBUILD pahole-9999.ebuild 902 BLAKE2B 6abea41a6615828e2eb61ca91fa51acfa0dc5b43edb259b03517e0996606b29489b239d54c893941e387b4fdf7d43ff728841bdd349988db30c0390854920ca6 SHA512 149dfd475fc6a7be81da26c370b7b3b733ce74613cf579dbd57d06d3f7d0341661866a9fc8a8630e86193b959689e39169f31a392ec2c1481c1d911f317778d0
 MISC metadata.xml 672 BLAKE2B 2178381434a5293df5a6a07a8c84c20a4f98d011c90ed2db911085639689224509445e16197ff88e0ab6fb7e6357bc96291feff21a44f350f51b1031e1882477 SHA512 2cd1f865e42bd845bb3831a1f6c8060e469e0afb3acbaaec2989018481a6f93e0fdae9afb74413c00db6967069cc6d0447548c3b4c238a70db07ee8786fe1e99
diff --git a/dev-util/pahole/pahole-1.24.ebuild b/dev-util/pahole/pahole-1.24.ebuild
new file mode 100644
index 000000000000..8a8a28a9f3a2
--- /dev/null
+++ b/dev-util/pahole/pahole-1.24.ebuild
@@ -0,0 +1,52 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+PYTHON_COMPAT=( python3_{8..11} )
+inherit cmake python-single-r1
+
+DESCRIPTION="pahole (Poke-a-Hole) and other DWARF2 utilities"
+HOMEPAGE="https://git.kernel.org/cgit/devel/pahole/pahole.git/"
+
+LICENSE="GPL-2" # only
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+IUSE="debug"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="${PYTHON_DEPS}
+	>=dev-libs/elfutils-0.178
+	sys-libs/zlib"
+DEPEND="${RDEPEND}"
+
+MY_PN=dwarves
+MY_P=${MY_PN}-${PV}
+S=${WORKDIR}/${MY_P}
+if [[ ${PV//_p} == ${PV} ]]; then
+	SRC_URI="http://fedorapeople.org/~acme/${MY_PN}/${MY_P}.tar.xz"
+else
+	SRC_URI="https://dev.gentoo.org/~zzam/${PN}/${P}.tar.xz"
+fi
+
+DOCS=( README README.ctracer NEWS )
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-1.10-python-import.patch
+)
+
+src_prepare() {
+	cmake_src_prepare
+	python_fix_shebang ostra/ostra-cg ostra/python/ostra.py
+}
+
+src_configure() {
+	local mycmakeargs=( "-D__LIB=$(get_libdir)" )
+	cmake_src_configure
+}
+
+src_test() { :; }
+
+src_install() {
+	cmake_src_install
+}
diff --git a/dev-util/pkgcheck/Manifest b/dev-util/pkgcheck/Manifest
index 30c60876502e..78e93a2484d5 100644
--- a/dev-util/pkgcheck/Manifest
+++ b/dev-util/pkgcheck/Manifest
@@ -3,7 +3,7 @@ DIST pkgcheck-0.10.11.tar.gz 474106 BLAKE2B 2a3e330d54e421a48e5cd89044b9af37334b
 DIST pkgcheck-0.10.12.tar.gz 477880 BLAKE2B 9d71e6d3312f2c11a722f12c854a14523174b91ca1cf8ea89f6da3463e8aeab1744b083a31eca675e40069b57f4b2b24a83efa0d692d90cd00b9e9c4ec452a02 SHA512 e146dd0533b769078102ff27f90120c459ceb614aed4365a43a36e1a24d1230890c9da7a756b3fcce528806ca1fca10d8d8c283dcc464a7c98368bac0d98a26f
 DIST pkgcheck-0.10.14.tar.gz 490827 BLAKE2B cf45c66e8cbe11f65840eb98de7e4c8359396f6271dc7d728daeb54704e53c1480198bc1451b4d50510d00029243a0d6dd91201f4bd7b3b5860df27b66792ee7 SHA512 c792a7dfe4f49e6c2008a44f6afb10a2db2067e8e6b9fc6bfe27010e62a6341328f62f3f2e87c4025997392f3883431d4a66c97beb3eeb690cef63e697754ec3
 EBUILD pkgcheck-0.10.11.ebuild 1661 BLAKE2B 7b7f84f3c944a517a3dcc7f18bc12856f97df92a90be68f3b3b59fb574e382ac55f6e52f684e6e49db36a9b40fc7ce7b0d9860a39c13ac48215fef31fa06f733 SHA512 1a88f0f25b4584f3b84c5a04e43695ff8af6ed609e2e85cba141ad2cd43dd7cd40cf0bbec172804e361e4aae21409b424e5aad37e540d1cdef8664c7e0e85463
-EBUILD pkgcheck-0.10.12.ebuild 1664 BLAKE2B 19b1c8513f7d0977f94ce5af2686dd7e284a318c3c2c9af6b74f11f1d95e519453d3117b2d69db33801888e7583b3cd0fdeccf98a612ce9c044ef87d682e753c SHA512 50f69778dc12b22ac1cc04001f2d97a9efd48fb9f7cde33b9eaead20332b79232d8d93012af59328ca67ee6dd21689218143f557a7587ed154ac110ba65894e7
+EBUILD pkgcheck-0.10.12.ebuild 1663 BLAKE2B f0f8732488948c168e00d1a0871d165bf8862cf0e516fde40158f56b09071d9828bcb114e916d1f4db0228fdceb02d3c5259f377342b13f79a55fd0186610527 SHA512 244c3ed8d1a8363b518252a99e2cb869e367e98995894052f52127077cf571210957bd42a6cbd177de0056f188d89e9b29e6f19edc47419f3660d29731646c38
 EBUILD pkgcheck-0.10.14.ebuild 2205 BLAKE2B 7713a52128cbf038209461aac056bffb666f4ee75cbff1d04b9fa1d98d6de38459273a2cac4eca9883b410dd4da8cea69c6e6d41089eda0cbfd5ba993a8c0378 SHA512 4a6ac693f2dab601f503ea175c807dec0039c87b77fa2753cde0578948e62b2dce13bc9853d0cb93ec4d1219ed2e6f676db684f83326e24fe8630525c0d50038
 EBUILD pkgcheck-9999.ebuild 2205 BLAKE2B 7713a52128cbf038209461aac056bffb666f4ee75cbff1d04b9fa1d98d6de38459273a2cac4eca9883b410dd4da8cea69c6e6d41089eda0cbfd5ba993a8c0378 SHA512 4a6ac693f2dab601f503ea175c807dec0039c87b77fa2753cde0578948e62b2dce13bc9853d0cb93ec4d1219ed2e6f676db684f83326e24fe8630525c0d50038
 MISC metadata.xml 486 BLAKE2B 3fbd43c40601e7edccf11e4335b82d90bd42c9144436529dd6a0c2ffaccbf5febf018c55a336d07c2a86271b43e8da4dafa228a6d2afa7dfd8215eeda5e415e8 SHA512 98c0803dd08976c0f1be543c052a49647d3ec3dbb02667053fee22baec3a05723350cc02d3c0090ff128ba795ed4802b8b73161148f2b790519bbcb881b31105
diff --git a/dev-util/pkgcheck/pkgcheck-0.10.12.ebuild b/dev-util/pkgcheck/pkgcheck-0.10.12.ebuild
index beaed3253fdc..ffa913c487bd 100644
--- a/dev-util/pkgcheck/pkgcheck-0.10.12.ebuild
+++ b/dev-util/pkgcheck/pkgcheck-0.10.12.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999 ]] ; then
 	EGIT_REPO_URI="https://github.com/pkgcore/pkgcheck.git"
 	inherit git-r3
 else
-	KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
+	KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos"
 	SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 fi
 
diff --git a/games-emulation/Manifest.gz b/games-emulation/Manifest.gz
index 9d47e2ecc608..717392c77c85 100644
--- a/games-emulation/Manifest.gz
+++ b/games-emulation/Manifest.gz
diff --git a/games-emulation/dolphin/Manifest b/games-emulation/dolphin/Manifest
index 669100c8ddca..3e5a1ea6fe67 100644
--- a/games-emulation/dolphin/Manifest
+++ b/games-emulation/dolphin/Manifest
@@ -1,9 +1,6 @@
-AUX dolphin-5.0_p20210506-musl.patch 779 BLAKE2B 5f962082cf58377801a266ec987417b731332e31ce6d79bb8e66204f6299dc1912aea760a9545ac671b090e6a3625c54b9e00583695790bd5c51ba54d524e0d7 SHA512 7a611de89b84e0f706c37d2aacdfb62cb4115098ad1b31daa4e40bd47e3793ab59f626fced184965361ba776891a63d02d66a54f8b69f675b6b88047a283bd9e
 AUX dolphin-5.0_p20220520-libfmt-9.0.0-fix-build.patch 1473 BLAKE2B ce7d9aaf62fc71262600d72442251241353c6280c84d1d08d2986a99330ae22b786983ba3b99484983adf7e7367c094d3f5a7ce1184e94686516c093d3c9957a SHA512 7bbd120fecf9ad18a2fb242d3568da4c013081dbe39045007e82f4ed56a52800d2afeca7263abf785ff023432f0d60cb36b629fb41555b7b39ef56b12fa16aa6
-DIST dolphin-5.0_p20210506.tar.gz 42098693 BLAKE2B bb9e5b5eb344bd944753c0198d5835109399fdfae46e6858833e5f279ff1979d39e0c512bedb96a91a1241fff525c6f945d16ce1a6b6cc22798490d73b853862 SHA512 5d23e9356995011a0e7b07622d58c8dddc5134a4ec83b3d9343b9eca8d0d2c200ea8c9a299c6aa2550ca74d8e28e258531368f7c167fe620053eb2a0f73b1f2f
 DIST dolphin-5.0_p20220520.tar.gz 34880474 BLAKE2B 925cddfe8a5d6febced5721bea6ced7c8d2855619f74ca8940b95dc78ea523b4a1083b9ef6efe3561d833b8e9ecb742cb2adf5a1864c06b629b3ecd9e92cc871 SHA512 4993cb10061b142f6627c96493885a5f9d88857d8949c2e8e8d5df5ba6e19b4f98d199da5e641d3d61294884e1cbbe8191bc5b4445c60bf80723046b2524aad5
 DIST mgba-40d4c430fc36caeb7ea32fd39624947ed487d2f2.tar.gz 12921593 BLAKE2B 8c5cf7b9b53f897f6248ad6bc51efafaa8a9d5df137d42d30f4b042b6d1527049644595938626c8cae1385d329bc45bf42db8dcc4424b963a3899e0df53246eb SHA512 26d7b60cbc7415652bb9ca2a42ccd532856867db57bf6dd91d8204551970109b6b9f4a96c42d643ea96b9d071d6aec924d3c1bb79c251c95183b7fb8536456c9
-EBUILD dolphin-5.0_p20210506-r3.ebuild 4614 BLAKE2B fe1619d9f638d298f544b41bb66cf9689ed24e0080e3846833d56c38eaeb3ec33519f7383b203815217fa48bd17e922e265dec0adf5c0ed6c851a343b4bf1925 SHA512 9bb65d6cebe6dad57b0663d1a3fada29c433f6967b562565c7d1cda00c66e3476ffb33bed263d94eb0aa1ea999cf4afb3854ba82a192ee74af634c77c316371f
 EBUILD dolphin-5.0_p20220520-r1.ebuild 4779 BLAKE2B f75796f6c909951766ca7b49e9d8f9a7a82410ca8e3d7205892c7303933d2371cfb7645e9b6f47dcd8c04746172f8391a106335338da3891d7051581d0f72f28 SHA512 cc127369075d7cb64fa2836463ab646ed292cfd36b19284c7092d60ed213b43c05d5e4acf1207cc4314f2d719a937a26c6ffef18d57454320381eda6b5994412
 EBUILD dolphin-9999.ebuild 4721 BLAKE2B 74f43b6ad2452b10f1fc8cd5887fe31cbbe151121c5b8aaf8cf4d1c855653d407de0c4b13a1413a76d2e9980d7d95542ad24cbeaae29d5c14f3ca10dfceebf77 SHA512 a5b5b2d67da8b12e2bd1c1519df00aaa7776dd694c2596b0b7a12d07005699723e34d5500392e40e16250a22a8d21e2376d5160782346298f26aba808d6b64f2
 MISC metadata.xml 1014 BLAKE2B dd84038010d16d37449491e1df7236b95a7dc30097264a9f9d1a542b59feffe3b1e6a6dba318fe856eaac7b7470a1c316c5378dabcccd8ef6f7f101f5ee683c5 SHA512 87b4cb7475697d7fad526c3dcae604aa9d4f8facf68b0bcdbb1c931a839c998a34977acdd1aec9cacfa7f9a8b7d3f9e33d6f1253a0f1899fa2e3439f1ebc08a6
diff --git a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild b/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
deleted file mode 100644
index 6ff4a8dd29b9..000000000000
--- a/games-emulation/dolphin/dolphin-5.0_p20210506-r3.ebuild
+++ /dev/null
@@ -1,196 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit cmake desktop xdg-utils pax-utils
-
-if [[ ${PV} == *9999 ]]
-then
-	EGIT_REPO_URI="https://github.com/dolphin-emu/dolphin"
-	inherit git-r3
-else
-	EGIT_COMMIT=eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68
-	SRC_URI="
-		https://github.com/dolphin-emu/dolphin/archive/${EGIT_COMMIT}.tar.gz
-			-> ${P}.tar.gz"
-	S=${WORKDIR}/${PN}-${EGIT_COMMIT}
-	KEYWORDS="amd64 ~arm64"
-fi
-
-DESCRIPTION="Gamecube and Wii game emulator"
-HOMEPAGE="https://dolphin-emu.org/"
-
-LICENSE="GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT ZLIB"
-SLOT="0"
-IUSE="alsa bluetooth discord-presence doc +evdev ffmpeg +gui log
-	profile pulseaudio systemd upnp vulkan"
-
-RDEPEND="
-	dev-libs/hidapi:0=
-	<dev-libs/libfmt-8.1:0=
-	dev-libs/lzo:2=
-	dev-libs/pugixml:0=
-	media-libs/libpng:0=
-	media-libs/libsfml
-	media-libs/mesa[egl(+)]
-	net-libs/enet:1.3
-	net-libs/mbedtls:0=
-	net-misc/curl:0=
-	sys-libs/readline:0=
-	sys-libs/zlib:0=
-	x11-libs/libXext
-	x11-libs/libXi
-	x11-libs/libXrandr
-	virtual/libusb:1
-	virtual/opengl
-	alsa? ( media-libs/alsa-lib )
-	bluetooth? ( net-wireless/bluez )
-	evdev? (
-		dev-libs/libevdev
-		virtual/udev
-	)
-	ffmpeg? ( media-video/ffmpeg:= )
-	gui? (
-		dev-qt/qtcore:5
-		dev-qt/qtgui:5
-		dev-qt/qtwidgets:5
-	)
-	profile? ( dev-util/oprofile )
-	pulseaudio? ( media-sound/pulseaudio )
-	systemd? ( sys-apps/systemd:0= )
-	upnp? ( net-libs/miniupnpc )
-"
-DEPEND="${RDEPEND}"
-BDEPEND="
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-# vulkan-loader required for vulkan backend which can be selected
-# at runtime.
-RDEPEND="${RDEPEND}
-	vulkan? ( media-libs/vulkan-loader )"
-
-PATCHES=("${FILESDIR}"/${P}-musl.patch)
-
-# [directory]=license
-declare -A KEEP_BUNDLED=(
-	[Bochs_disasm]=LGPL-2.1+
-	[FreeSurround]=GPL-2+
-
-	# vulkan's API is not backwards-compatible:
-	# new release dropped VK_PRESENT_MODE_RANGE_SIZE_KHR
-	# but dolphin still relies on it, bug #729832
-	[Vulkan]=Apache-2.0
-
-	[cpp-optparse]=MIT
-	# no support for for using system library
-	[glslang]=BSD
-	[imgui]=MIT
-
-	# not packaged, tiny header library
-	[rangeset]=ZLIB
-
-	# FIXME: xxhash can't be found by cmake
-	[xxhash]=BSD-2
-	# no support for for using system library
-	[minizip]=ZLIB
-	# soundtouch uses shorts, not floats
-	[soundtouch]=LGPL-2.1+
-	[cubeb]=ISC
-	[discord-rpc]=MIT
-	# Their build set up solely relies on the build in gtest.
-	[gtest]= # (build-time only)
-	# gentoo's version requires exception support.
-	# dolphin disables exceptions and fails the build.
-	[picojson]=BSD-2
-	# No code to detect shared library.
-	[zstd]=BSD
-)
-
-src_prepare() {
-	cmake_src_prepare
-
-	local s remove=()
-	for s in Externals/*; do
-		[[ -f ${s} ]] && continue
-		if ! has "${s#Externals/}" "${!KEEP_BUNDLED[@]}"; then
-			remove+=( "${s}" )
-		fi
-	done
-
-	einfo "removing sources: ${remove[*]}"
-	rm -r "${remove[@]}" || die
-
-	# About 50% compile-time speedup
-	if ! use vulkan; then
-		sed -i -e '/Externals\/glslang/d' CMakeLists.txt || die
-	fi
-
-	# Remove dirty suffix: needed for netplay
-	sed -i -e 's/--dirty/&=""/' CMakeLists.txt || die
-
-	# Force Qt5 rather than automagic until support is properly handled here
-	sed -i -e '/NAMES Qt6 COMP/d' Source/Core/DolphinQt/CMakeLists.txt || die
-}
-
-src_configure() {
-	local mycmakeargs=(
-		# Use ccache only when user did set FEATURES=ccache (or similar)
-		# not when ccache binary is present in system (automagic).
-		-DCCACHE_BIN=CCACHE_BIN-NOTFOUND
-		-DENABLE_ALSA=$(usex alsa)
-		-DENABLE_BLUEZ=$(usex bluetooth)
-		-DENABLE_EVDEV=$(usex evdev)
-		-DENCODE_FRAMEDUMPS=$(usex ffmpeg)
-		-DENABLE_LLVM=OFF
-		# just adds -flto, user can do that via flags
-		-DENABLE_LTO=OFF
-		-DENABLE_PULSEAUDIO=$(usex pulseaudio)
-		-DENABLE_QT=$(usex gui)
-		-DENABLE_SDL=OFF # not supported: #666558
-		-DENABLE_VULKAN=$(usex vulkan)
-		-DFASTLOG=$(usex log)
-		-DOPROFILING=$(usex profile)
-		-DUSE_DISCORD_PRESENCE=$(usex discord-presence)
-		-DUSE_SHARED_ENET=ON
-		-DUSE_UPNP=$(usex upnp)
-
-		# Undo cmake.eclass's defaults.
-		# All dolphin's libraries are private
-		# and rely on circular dependency resolution.
-		-DBUILD_SHARED_LIBS=OFF
-
-		# Avoid warning spam around unset variables.
-		-Wno-dev
-	)
-
-	cmake_src_configure
-}
-
-src_test() {
-	cmake_build unittests
-}
-
-src_install() {
-	cmake_src_install
-
-	dodoc Readme.md
-	if use doc; then
-		dodoc -r docs/ActionReplay docs/DSP docs/WiiMote
-	fi
-
-	doicon -s 48 Data/dolphin-emu.png
-	doicon -s scalable Data/dolphin-emu.svg
-	doicon Data/dolphin-emu.svg
-}
-
-pkg_postinst() {
-	# Add pax markings for hardened systems
-	pax-mark -m "${EPREFIX}"/usr/games/bin/"${PN}"-emu
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch b/games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch
deleted file mode 100644
index 51570151c112..000000000000
--- a/games-emulation/dolphin/files/dolphin-5.0_p20210506-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-https://bugs.gentoo.org/799281
-https://github.com/dolphin-emu/dolphin/commit/7a1922fd8f0f6686188d179732c9757faf2d1b4f.patch
-
-From 7a1922fd8f0f6686188d179732c9757faf2d1b4f Mon Sep 17 00:00:00 2001
-From: thyrc <thyrc@users.noreply.github.com>
-Date: Mon, 14 Jun 2021 10:18:34 +0200
-Subject: [PATCH] Fix includes for musl libc
-
----
- Source/Core/Core/MemoryWatcher.cpp | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/Source/Core/Core/MemoryWatcher.cpp b/Source/Core/Core/MemoryWatcher.cpp
-index 491ecd83150a..13843e2021ca 100644
---- a/Source/Core/Core/MemoryWatcher.cpp
-+++ b/Source/Core/Core/MemoryWatcher.cpp
-@@ -2,6 +2,7 @@
- // Licensed under GPLv2+
- // Refer to the license.txt file included.
- 
-+#include <cstring>
- #include <fstream>
- #include <iostream>
- #include <sstream>
diff --git a/media-gfx/Manifest.gz b/media-gfx/Manifest.gz
index 462f1b23db6b..03c9364d67d3 100644
--- a/media-gfx/Manifest.gz
+++ b/media-gfx/Manifest.gz
diff --git a/media-gfx/ristretto/Manifest b/media-gfx/ristretto/Manifest
index f0e728172a43..fc04f30b3ed0 100644
--- a/media-gfx/ristretto/Manifest
+++ b/media-gfx/ristretto/Manifest
@@ -1,5 +1,3 @@
-DIST ristretto-0.12.2.tar.bz2 612128 BLAKE2B d845da75f5139ca73702b2ea2154026ecadacc72587d81a22564d0c0ae84e605303a368ee42a9c915c3d00a0b8471f6a6e1a6c6c2f7d7626f766602a29022ee0 SHA512 39fc5868c3858e3667660b6411b3d39c19a2306be3d169e499aa11aff34a24e0ee8e745e15dfe301be48e1c6adce30129ed76270b025f5160cfa773467764379
 DIST ristretto-0.12.3.tar.bz2 616251 BLAKE2B 0f64918bae8511259acc90ce8851be0067ce635416fa908fde5a1e1fe9ae895b18cda06505c82cfae0aaf89fce41a56f80d5c2bcd4ad6cd3e93a95ef5cfb9037 SHA512 c78ec55196fbf3bcb843b240faea1f7eb532bfdc519c125337ebb61d20ab8e01c818920c9ec1bdd97035f8b5ce9bcd2ffb338a91b8919ca48ab1010828a8d49d
-EBUILD ristretto-0.12.2.ebuild 891 BLAKE2B 0a1ad5b7e052921e9f49504488e42ed4db81d275d1186df39c8717fc92cd57d3bcb875dd15a952d231f0d9b03fa70d7153c6b6a339d1c433ff01046167862b53 SHA512 7148b68f84c0a9c9c07605cc3763b13940eaaa56e703445ef179e2280fb340afec7343884987779e40a4c4f42ce4b38a50cc6d520d24e1f2408784000050eeb2
 EBUILD ristretto-0.12.3.ebuild 899 BLAKE2B 22909ebbf5a641d6b26ccc1e3595a388086bb0dfd981d565cf042868a96c2e816dee6f5420b2549ed06401e6e5822b5070ea6e30f595e66c61e97c0ec4c81fb4 SHA512 e171f72e986df77de173def2b98fad78bd7c8f504a82ff956eea1da6dd849ea2add21d073e12ffdbc460570c0939c4b594d249bbfe98da9ba306c81786c1e8c0
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/media-gfx/ristretto/ristretto-0.12.2.ebuild b/media-gfx/ristretto/ristretto-0.12.2.ebuild
deleted file mode 100644
index 04a8214f5471..000000000000
--- a/media-gfx/ristretto/ristretto-0.12.2.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit xdg-utils
-
-DESCRIPTION="A fast and lightweight picture viewer for Xfce"
-HOMEPAGE="https://docs.xfce.org/apps/ristretto/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.44:2
-	media-libs/libexif:0=
-	sys-apps/file
-	x11-libs/cairo:0
-	>=x11-libs/gtk+-3.22:3
-	x11-libs/libX11:0=
-	>=xfce-base/libxfce4ui-4.16:0=
-	>=xfce-base/libxfce4util-4.16:0=
-	>=xfce-base/xfconf-4.12.1:0="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-	sys-devel/gettext"
-
-pkg_postinst() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_desktop_database_update
-	xdg_icon_cache_update
-}
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 8c87c73fbd6e..4b4f94a81aa0 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/kvazaar/Manifest b/media-libs/kvazaar/Manifest
index 83a6ea4b3533..501f272d39e1 100644
--- a/media-libs/kvazaar/Manifest
+++ b/media-libs/kvazaar/Manifest
@@ -4,6 +4,6 @@ DIST kvazaar-2.0.0.tar.gz 589661 BLAKE2B 253085784bb3481b578206d5a406d0c25c00290
 DIST kvazaar-2.1.0.tar.gz 605962 BLAKE2B 0d61af55ab0caef2247524e8c564f9c24cfb479fcbd721f43e4409899e1a187a0e6de0b08a052cfb144ea31da906ba1c2160d6712828d6e55f0826d87f5c96ba SHA512 14b29f48908e004cf1b4f1f0c338b7b134a34140edcd58a645b4529c506cd567ebe3d56aa66e469dc417e1baa29bb8a476825b78825e810ac68a029191ad32ec
 EBUILD kvazaar-1.2.0-r1.ebuild 1834 BLAKE2B 80e47155391be5fccd67ccde5f2ab8865a23ef63b03e4d4695314f27cde4e4b613637b646831ff0c0b4166b8dd623ca0a846bf256c899936d31f45bbde7c431a SHA512 f8b0b8842293e298092852c9ffdadaf34263a850c5f7a170f52ef8af8f514a0b87a65a317f4580e97ae358e9cd8c2399f3b2c9e9b4807c418bf8ef029637d9dc
 EBUILD kvazaar-2.0.0.ebuild 1841 BLAKE2B a4c3319f5e05a32bf1e50530b5402812f81984cfcfdff5093be402d3795cdd3d989d014876f9f431eff7ae3c45497a2dd5197c52feecc0609216b0dfcdcdbe79 SHA512 ab82cb5d378bcc45f1ccdf1429a3bf121a3050b9cdd36794440fc292f4ff7e573d8d58951743e5c886b1d3441ebe98411707f490fcc800aeb1ca67255c050d6e
-EBUILD kvazaar-2.1.0.ebuild 1846 BLAKE2B ccfb290b7ec6ec339cecb49fbbc6c41d4732011479a4d2659f22036eec4e692d27295f0b9e56617a4c798411897c057e41652d646b2978a4ce7612e898a25a02 SHA512 f1697b80dc616fc589d1f0827be62f475eda2e12d23452021e4c7596fac6451a01a9e608f907039108916db6fae65fdb19c05ceb8d22b5550807931d0f3965b0
+EBUILD kvazaar-2.1.0.ebuild 1845 BLAKE2B 30e1f03646ebb5cb8254aa0af5ea9d53956b703eb15fccab42f0e93ad61cbd08b78f7e4eb602ea40e757fe83b77a875c22cc4a80c4f69355f75571f7416875d9 SHA512 75cca16f17f89dc1f20718001f2eda4600eef46e4ae8394c196de43ef456afc40cf4eca2d9736f7ef44a569cb38d5ede6fcef66a24f947bd285438b309bcd2d6
 EBUILD kvazaar-9999.ebuild 1848 BLAKE2B 9ea0e877e0df6e622a45a5521e6d485318fcc9f0ae7290fea05503352b04b7eb14bd796ee8a21cfc8464ea58453328829803addd713684a7159624b30128c2ba SHA512 91f6f2306cf5704e2012c001591f06cb0bacca453d44f0595f75e87936429d39a24e6d24dd1d69ad60b696c341267464f95908d57578ec2898eaf162c5526c9b
 MISC metadata.xml 307 BLAKE2B 712a78cc3cbe9bee1e770452448efd933eb76c6de75e8302e8f61b22aec35a2f43ceb7c3014bf88b81ecf4ff27da4b115ab24605a53fbbba18100896fff12ff8 SHA512 29403efb372cc2ddb9e428be05bb7bf57b0a51a3ab66a0b0bfbdfbcdf6db1b5d357ddafc1b3a77d00109840ea4c610a088e7c8f97a3c0b9cd330a6edd2651ae6
diff --git a/media-libs/kvazaar/kvazaar-2.1.0.ebuild b/media-libs/kvazaar/kvazaar-2.1.0.ebuild
index 99b6aef98f52..a7e7e1cd5a73 100644
--- a/media-libs/kvazaar/kvazaar-2.1.0.ebuild
+++ b/media-libs/kvazaar/kvazaar-2.1.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} = *9999 ]] ; then
 else
 	SRC_URI="https://github.com/ultravideo/kvazaar/archive/v${PV}.tar.gz -> ${P}.tar.gz
 		test? ( https://github.com/silentbicycle/greatest/archive/v${GREATEST_PV}.tar.gz -> greatest-${GREATEST_PV}.tar.gz )"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 inherit autotools flag-o-matic multilib-minimal toolchain-funcs
 
diff --git a/media-libs/libaom/Manifest b/media-libs/libaom/Manifest
index 09ecf11a0324..c976f9bec9fe 100644
--- a/media-libs/libaom/Manifest
+++ b/media-libs/libaom/Manifest
@@ -1,6 +1,6 @@
 DIST libaom-3.3.0.tar.gz 4768475 BLAKE2B 22060694019bcd925cb38c365063b8f2be60aed4cc6f9b0aa95cf8b4c4c5b40f5c603359d8c0728c5650fe9f7eea7573b8fd4a93975481c67409b201b4c48428 SHA512 9bd118bf46d777da4e85f348fed95510ce583d16d005d062d33e2899f16f24bdb8b120792a7c77ccb64b4e1ff5b3d934342fb1b356bb426693ef69220f138c5f
 DIST libaom-3.4.0.tar.gz 5175838 BLAKE2B 7a38cc1a1871f044018a8ebf5022810b753b099ad61e0c6e2625a0480946e8b5e066fd1e1abc5523e817025c8a59d6f1092c12d632c5b602cf3a80f6ef8daa0e SHA512 8de5e7eae96b182ceb33ce2c66fde784349a7a117371177102c358cc9b2cad75bebe2849fdf8ce57ae149a38b43419b51e54e5475cb781ed3d5953081127b478
 EBUILD libaom-3.3.0.ebuild 3231 BLAKE2B 3ad7ddf62b2aad9be9401ac792241cc162be618d8f1c4a35e015479f5736a6970ae48b99ab2e950a890f5bddb6f44ee50edf421e46f8c072ccd82a0bf6d5dbb3 SHA512 aba993a08e60d01e6d904ba4103a761d6dcaf9290f6af726c4c0dc98eeb0644a1cd2167ade6357b0382f5629b7065d595b5bd634705fec89bf7330f364132f0e
-EBUILD libaom-3.4.0.ebuild 3250 BLAKE2B b99ed40501654ba15bb6bcaadeb61a1c2940255055109f5c42369f25dee5044630b7c47b8966f786d2690d8e0b22342d967c8fb62a07f1f9607024d7ca773b85 SHA512 3bc6524564f09d1163691e04b497a2c0f24b0e82cf5cb15cea3f63dec9e61115243edda4ec7bec2318ac99185baaa832f986a0361f7bba4d33147b2407210551
+EBUILD libaom-3.4.0.ebuild 3249 BLAKE2B f4f278e68c492fb87625ddff065cfe0096dc60473069fcb164a824eaaa07fc0d20e2256d5a5fafc3abad17fdef2ce2b08a956cc4e5d8c97d1b29e6f137f56356 SHA512 f96e63a0c1d0521d43bd41a850d4decb9ffb71c562baf6ad0e8159b24330c979a638b52c6ee5100e99acca2df96e15c8c0cc6c3f8252fbc2ffe3964ea284cc18
 EBUILD libaom-9999.ebuild 2454 BLAKE2B a886edfc976e058ac5c05aad0371771d4fe9417fa16126c19627885e0df84ab22d8b76304e43e6b70d13031dd54dd28d2da5c0576fa6fbef2b9f61755c7b8ca6 SHA512 0733ee09d7c66aa7c1ca09f9c2c91dfb840cdfe12a461cd2f23dff6977493c628133bea3ead2055c1551808490c6bcf00ef4853404f164e2f23ecfd693a45eb2
 MISC metadata.xml 224 BLAKE2B a8fa831654345ddf74b54f53fdc27d128ff6896378c8aa2dcb27139a4382f63efd0cac17f94ee420932e2855042c94e32fe534c99a977698953aaab4c51c31d0 SHA512 0b59f17151d352f25e3b073a3ee388d0189e1caddf0d97142851a19df433d082e3eead9f5aae07f4beb247861d90f02ae217514d02445703b95ee6ff62d967b8
diff --git a/media-libs/libaom/libaom-3.4.0.ebuild b/media-libs/libaom/libaom-3.4.0.ebuild
index 0f644caedcff..cefd516e80a6 100644
--- a/media-libs/libaom/libaom-3.4.0.ebuild
+++ b/media-libs/libaom/libaom-3.4.0.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == *9999* ]]; then
 	EGIT_REPO_URI="https://aomedia.googlesource.com/aom"
 else
 	SRC_URI="https://storage.googleapis.com/aom-releases/${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
 fi
 
 DESCRIPTION="Alliance for Open Media AV1 Codec SDK"
diff --git a/media-libs/libass/Manifest b/media-libs/libass/Manifest
index cce79f34a0b5..ed78d8204170 100644
--- a/media-libs/libass/Manifest
+++ b/media-libs/libass/Manifest
@@ -2,5 +2,5 @@ DIST libass-0.15.2.tar.xz 382036 BLAKE2B 6448bbb152787e813c2f32544694b4854723d97
 DIST libass-0.16.0.tar.xz 396304 BLAKE2B d5d1a2492faaff671182b1ebdbdbab230529897575a485113a1025e73b3bdee1d5136f1dde9f5ded2bed3ad27fab78601d8f586499b5c7c3160f5d94a6357bea SHA512 ada605f5887da06aa1d072a52f8baaba64b62008ccb377560d71d5a030c1f5434d6c60fe39a156e063f553b8a07b4dfe954e4d035036888a629c6e663ce60ba9
 DIST libass-0.16.0.tar.xz.asc 228 BLAKE2B 78596aa961939f16ab0de76a040038bb299591be329808ad662bb3bf91fe59b2b78557ec6837a99bd232d986fd06953fc40b03a110122627af33a8877dc51d6a SHA512 2696214e9d3f3d5ace7946dc37b8103fe5cfb6d0b86b19620e7bd2aaff5a701b244edae892c7a673d8ba6e93ff324dfde9c7ba75ef19a9710dcdef42fffafa6b
 EBUILD libass-0.15.2.ebuild 1195 BLAKE2B 32c63c8e9c0d12e742f1e43571f715c804082dfec08eabadd4bee2b1f80db62eb28f59878249c689bc7718f997892bd43f2bc10d2f8195fe3fd3d456d0a61c05 SHA512 0491131050348caeacd6633d754fb234ef29c8d35e634109df068cb9f2f8fe9212885622afc3c1ea1291fd832bfa437bbec0f197f3e2cd63ca38af83d1e78504
-EBUILD libass-0.16.0.ebuild 1411 BLAKE2B 357572c78a5147253833f3227afa0a78b0d3e6546c8d74e47ed71154d390308219bfa4da2f60a1c06b7c694c1f91c2178ac9a2a54451ebbfc1f0e4b3d1f820a3 SHA512 2a8522690cdd60f1b319cc2c050f8d08316fd2804b499715df593a5820bd74e0c950719410aba7adf323da700446e8a37b5a25f6bf3fe6cba358c2324bc8be66
+EBUILD libass-0.16.0.ebuild 1410 BLAKE2B 6a07cb686bf707e98776e6054cd677856f313e1362b99ee07d9e542acadf0d648937c17a66527932d006c9454326f107c771cedc340523dba945de7642a9d57a SHA512 8fa7a005f9b73892bf407477312501d2a100559ffb3a3f344f1322df6e689e13cc981de7a0df8d014c0a7a0a8cbb3acd0e603295f83d733b258c75f88549d5d4
 MISC metadata.xml 310 BLAKE2B 32f2b0eb7f05223e3d092b3d75b7b1095afdac6dc322bd21fc8d32b6089cfccdc46300801e9d7566269fc0fb54780b6c1efff6e41be8de0aa31b26bdc52a44fd SHA512 97c76a4e387bbf43b14bf7799fe889c27e74e8e0b18c2027fc0c365e25ec5186ead530afe6d8e4d6b95440f0cb781d7ebc46e1eae1cc7b2161a199d38bd2a186
diff --git a/media-libs/libass/libass-0.16.0.ebuild b/media-libs/libass/libass-0.16.0.ebuild
index ba626213bc41..e413ae78c58a 100644
--- a/media-libs/libass/libass-0.16.0.ebuild
+++ b/media-libs/libass/libass-0.16.0.ebuild
@@ -13,7 +13,7 @@ SRC_URI+=" verify-sig? ( https://github.com/libass/libass/releases/download/${PV
 
 LICENSE="ISC"
 SLOT="0/9" # subslot = libass soname version
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris"
 IUSE="+fontconfig"
 
 BDEPEND="virtual/pkgconfig
diff --git a/media-libs/x264/Manifest b/media-libs/x264/Manifest
index 6abf6477f223..ced5f816b466 100644
--- a/media-libs/x264/Manifest
+++ b/media-libs/x264/Manifest
@@ -2,6 +2,6 @@ AUX x264-0.0.20190903-STRINGS.patch 1531 BLAKE2B 293a9efebca3914e9f03f5e6a9e8c22
 DIST x264-0.0.20220222.tar.bz2 777236 BLAKE2B 45e57c48b4b889f5c7b4ce87d1442d26d907aac47fb7c586b34239317a8b74bb93eac3058eed766728fbca6370656d9a6f070e8992643984a89560e28edf206d SHA512 1cf864059f83731ac47008c1af1d9ac06d06283439cf883a020f8a76e0c7efc3b525791d11efe8784d0e39ded68dd03794f0502fa64cc07df2f2de064a55e1d9
 DIST x264-snapshot-20190903-2245.tar.bz2 774515 BLAKE2B 0b19fc1d3cedea32bfac9c5247bce7b3c04dead35458d61f3b5c0694040dc852b0110b620faf4118ed265a5605aafce3c49d468d38fb91e4c515b2860c486920 SHA512 c357c9025ffdf653c974eb7ccc2e9a4de86c02881372a6a8270ae59ce948c284da48a2aba37763bd29359d2a6dfc76ea56a52fed6082f8483912c8f948488a2d
 EBUILD x264-0.0.20190903-r1.ebuild 1983 BLAKE2B dfb3da21ebb5bfb045deb86815c589978a05197fb3de3c7f8cd2580a6a10c6856b061aaa8288c62e69149b67e9073b972842008c9edbfe87860c3ab0fc0a7469 SHA512 74a660838e027c3128784c7a5c7e74cc267910f20290c487aaaee88089e2b908cbc41946db374b9f236dafb352011981c242e52d94e907439f0a430b24507c1f
-EBUILD x264-0.0.20220222.ebuild 1980 BLAKE2B cfaafa505335d7a8857bb14b6714cc0e9f4853210ca0010f76dc46b5518fd8f614c2495bb2cc53bebfd8414dfe7b8869b92a72c18d496ceee6698ca68c5f208b SHA512 d0f1c270a3ccb1ab6aa12aa1eb7ea7c1adcf72396f2606bf89ff4c0c8ec4147a36b50be227b655e651f8a84c678a3dd00c0883541cb05ef337864612842a597e
+EBUILD x264-0.0.20220222.ebuild 1979 BLAKE2B 3ddb0d982c14470b28e41c56c8a26d10cb56107fa680f67d96a77fe6629d5de61dfc3423c0c9f9b18b8250c9b72b973253d6284cef12f31f75be8ae197e732ee SHA512 799d505490671103c0943347b2a13e2f54ae3b30b7cc321b50cf6e4fb909061922244ab926b15522db3eb56b643f1b99186cebd147301f3f5b494684e16521dc
 EBUILD x264-9999.ebuild 1982 BLAKE2B 337e0971e364d86cc9cd07fce36679f8d634bfecbd52c17a3fd0ed03f64bbe5ce04ade018e3d467883043bfa0e6a2ddd61f3878c4ddca5db44b3b6fa5214db55 SHA512 f7ff8f77f7b2ebae6743b5a5faf7e90b4640a3d3b2e2b2c09226149331527e4b7b92393f36e2e210a7feaa4c11217dcb131dc27465e016e1b17786ee22124c6b
 MISC metadata.xml 489 BLAKE2B b9c1e67f7b3bce14a0d3330717204b25bfccc55d77343dba21b8a4d01b915dd690627a7affea0de0e7940c42ac2378e2e06dff243099b70b5c6a1805095d5fd1 SHA512 1416496833de2a3e28ad0f407701c0a08b6d3435a3ba65c159beac19c7a64d0f5f04d5200cbaf9217846cef0a101827bf50824eedc2b6ae7414a7fc6fc10b250
diff --git a/media-libs/x264/x264-0.0.20220222.ebuild b/media-libs/x264/x264-0.0.20220222.ebuild
index d16e91708349..2cabbe34325d 100644
--- a/media-libs/x264/x264-0.0.20220222.ebuild
+++ b/media-libs/x264/x264-0.0.20220222.ebuild
@@ -13,7 +13,7 @@ if [[ ${PV} == 9999 ]]; then
 else
 	# Download https://code.videolan.org/videolan/x264/-/archive/master/x264-master.tar.bz2
 	SRC_URI="https://dev.gentoo.org/~aballier/distfiles/${P}.tar.bz2"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos"
 	S="${WORKDIR}/${PN}-master"
 fi
 
diff --git a/media-libs/xine-lib/Manifest b/media-libs/xine-lib/Manifest
index fcdd6d7e26be..79f7c8cfae71 100644
--- a/media-libs/xine-lib/Manifest
+++ b/media-libs/xine-lib/Manifest
@@ -3,6 +3,6 @@ AUX xine-lib-1.2.12-fix-mmap-crash.patch 535 BLAKE2B 6b6782a7923754c29daf8263bc2
 DIST xine-lib-1.2.11.tar.xz 5282204 BLAKE2B c61bec690f662e01372b1c068b0681ac4435925ca90a767c590d5d3b968163280c11210dc9e3aeb4cc6bb6b3520349ba22e18b17f34bd9139af02280d3a37ee3 SHA512 8208e4699819465ec9e820530f27b6129ee954ea17ab474eb9eda12137af1417ed5260830c1006ce32266a3913d22ba9957689bb5552464908038a1b8a8efbcf
 DIST xine-lib-1.2.12.tar.xz 5341212 BLAKE2B e975be2e7cf013e218001631c6b27a0d5e291605cb236c075e4b7463b30d23f3ee14aa7e18473d52efaf124f6ab0346b93591b613c6d9339f8f28e6a719b1ef8 SHA512 cdc913d0c78a3a34bd6e4060040fd844f22dbc673330e30769c83e9682a46f3369af8f59bd0c759ddc601de979b13d53e7ed10c54f3b78bdc63afceb484826be
 EBUILD xine-lib-1.2.11-r1.ebuild 5279 BLAKE2B e633122ea0b8054e6bf31243c3aa21d62fe237b2d3215b81869a79688cf7d59aa9718ded6fdb45af4dc9b10b7a3cc6ac58af82f980beb81c9cbf258a756c68ed SHA512 bb7ac4c59028a55ce70650ea6d346a56e5df4b785be9a7b20f1e2f413fb6a88df928d4aa3124ab3a6776be166f75a97cb45e1235be0be6a42d442a93ecf83620
-EBUILD xine-lib-1.2.12-r3.ebuild 5481 BLAKE2B dbe8eedeed5eee1c3ff20951a100568c643203d1ff4de75e9ff6b3a4fda1c28173d0c053e03d663561d060820308405ea5b818a156af2e03b803e92675e006d0 SHA512 76f062bb758711cda30a832a100bd16e5331dfecdc6aa4530c6b7afb5bdd39006d691c8d2fdd46055071d5a8e394303fb8050c12dfe8410ac1057deabd83e4f2
+EBUILD xine-lib-1.2.12-r3.ebuild 5480 BLAKE2B 90e2e42f79bd29fe988b7e15b7efae75e3f810f36c7acf1d20d7c93c7908f90120f45e42d8085aed28403a9a406b6039550c607078863b4a0987772373ce4024 SHA512 e84cd2a4f0f1d66bb45b0c77c0179a358b56fbe5ee65aea1d62a90714f844e630970a1bea7acf391809f3db55aaf960b3629357dae98d79b4b4c55b452956fee
 EBUILD xine-lib-1.2.9999.ebuild 5375 BLAKE2B 3fa27f23bdcf5e5a9d66cc177088d4e381a1ea253e9941e64dabda91362ddae73a2b11520a3443e869578755cabda5fef6fe680da1dea4fd7defdbfb9bdbfbcc SHA512 35c9b0e12f193458d8f9620a22645e5037beb7a9adf73480bc3d0bd976ef108d7981f670379c59b7f9bb5120c77d53afb604f9730bac35eb350cbc9509bd0bc2
 MISC metadata.xml 2784 BLAKE2B 636cdb7ad93aa8941a36a23b9bc70cde66878f7628cab7e697582733b8ce85d58c09a5c63fcfbc009f098001399407055c449412dabd52178548c0c41d572c5a SHA512 5b644f501953bbc34020f0955991363d558a23a9610eb37f46499bd2d5415849a10a3306625e50d5cfdf094e67a38da5175bb981387841bae63c33ae74e17757
diff --git a/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild b/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
index 8ae90f978600..aa0cbc19cc29 100644
--- a/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
+++ b/media-libs/xine-lib/xine-lib-1.2.12-r3.ebuild
@@ -12,7 +12,7 @@ if [[ ${PV} == *9999* ]]; then
 	NLS_DEPEND="sys-devel/gettext"
 	NLS_RDEPEND="virtual/libintl"
 else
-	KEYWORDS="amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
+	KEYWORDS="amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86"
 	SRC_URI="mirror://sourceforge/xine/${P}.tar.xz"
 	NLS_IUSE="nls"
 	NLS_DEPEND="nls? ( sys-devel/gettext )"
diff --git a/media-libs/zimg/Manifest b/media-libs/zimg/Manifest
index 5f832955406f..f21f55e6eb36 100644
--- a/media-libs/zimg/Manifest
+++ b/media-libs/zimg/Manifest
@@ -8,6 +8,6 @@ EBUILD zimg-2.9.2.ebuild 888 BLAKE2B 434361e85ebb7e8c03baddc5e8d1a9b165f239fa7d6
 EBUILD zimg-3.0.1.ebuild 777 BLAKE2B 3ff6bb65c43a747b0fdd6638f4dbd847d805d3d1ced7f877205d88809b501d59c27c6427de3116e3bca4b80e82020d3b348479c768d4986eca56c4997a3207c8 SHA512 214b3ee47ab0cdf5dab93a94708e6fc49258e92338da2445b3889d65ef83709413d1af5cce9474df8874c7ab95f2654eb594bda3d546c9cc09cd753c0e698547
 EBUILD zimg-3.0.2.ebuild 790 BLAKE2B 82bb65dae94ebcb7297fcf7cd7d008a422948f1a8d5fb823e2ebd8e0f208822d6047a93df42a7060af67dacdbcaa685cf19ef105e6248577a7cf0b6993e1c397 SHA512 f99abe15acd9d55ab345b73a6e2e6ba2b1ece7b3fbb2b293d0a249c371d3f6d8a4b85b18563a6ff07de155289507d613b01bed6b16d3fdbed7936f1d7e9d39d0
 EBUILD zimg-3.0.3.ebuild 790 BLAKE2B 134fe89f4b4ce53353b67388e2dca74f18dce7cd28c3061c3ed8c0310d7e54b07157fb9e3f4e547b4541192b1b6054239c524117a6856cc81e2c083c8349e640 SHA512 ee669bffff67304cd5c2d112af1162f9d7d689f413c3c160de3c18a8623d71e77c738733e9bf34503a57ab575ca00f5c561753e95d541bd12c3b56c18e73eac3
-EBUILD zimg-3.0.4.ebuild 788 BLAKE2B ef148951632c3341a00ef90383b5b5fde5b7a76c35164b972f0a4dd8cafad44d81aa5d589bf0245a212e6b8973cba278cc803b38242010a0f1085f5377534e02 SHA512 7620819393956fbbd1ffd3d69b32c6f33ab07555acc83995b5d2b76091fba7f1ed36b4e40090c1c2e2d10d2697ff5593e6bd38b53742cd580bca514cb0e7f0a8
+EBUILD zimg-3.0.4.ebuild 787 BLAKE2B 858a33785579046b6ba4ee83df2979ab736df51c20fab64141658dd8939b9bbc30c61adf216421400004e832cec550cd133e6fd4952640972f601c04f029340e SHA512 356722951435873bd1415bc44d3fbd760b48f93396043588af5f176e1827f28466b126f90e4050ae9f8b8adef687102d03560a2298c8ba09c365c6a96f9aea9e
 EBUILD zimg-9999.ebuild 790 BLAKE2B 134fe89f4b4ce53353b67388e2dca74f18dce7cd28c3061c3ed8c0310d7e54b07157fb9e3f4e547b4541192b1b6054239c524117a6856cc81e2c083c8349e640 SHA512 ee669bffff67304cd5c2d112af1162f9d7d689f413c3c160de3c18a8623d71e77c738733e9bf34503a57ab575ca00f5c561753e95d541bd12c3b56c18e73eac3
 MISC metadata.xml 312 BLAKE2B 278c7bce7361e1cb96725595df0c35f0e227db2e6732d3cf1b53c960ad4a319a831a0e7cbf51702b24785f0f8d7bc73d3443a17e88595509a62a476caec5c5f4 SHA512 c070a6ea9f0a64532f6aa33b12ad04b293e8a6e014245936a71d5ab6facdec8ffd2665a49cdf3562a3dbc60406b6a24261aa9e65f7b7b63ef0d005927967cac2
diff --git a/media-libs/zimg/zimg-3.0.4.ebuild b/media-libs/zimg/zimg-3.0.4.ebuild
index 8bf4f6346f55..5198226202f1 100644
--- a/media-libs/zimg/zimg-3.0.4.ebuild
+++ b/media-libs/zimg/zimg-3.0.4.ebuild
@@ -8,7 +8,7 @@ if [[ ${PV} = *9999* ]] ; then
 	inherit git-r3
 else
 	SRC_URI="https://github.com/sekrit-twc/zimg/archive/release-${PV}.tar.gz -> ${P}.tar.gz"
-	KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
+	KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86"
 	S="${WORKDIR}/${PN}-release-${PV}/"
 fi
 inherit autotools multilib-minimal
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index dc6bf60764a0..e1fc7bbe5289 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index b42e7cdd5f15..708d1f998ca6 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Mon, 05 Sep 2022 02:39:51 +0000
+Mon, 05 Sep 2022 08:39:49 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 17fb527d2b57..4f7fafe7248c 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 524963 BLAKE2B 63a134310988775e80829f8df76e35bc7a36e500f38a02043ac51f423c095de0df8392b4c21b862e8aa1190811e33352db519f38ea643efbc71bfe95d975b6e6 SHA512 bc7c3b57f8c76fb5c8bdb7acf957ff1b9ee261e5de3501606b4991af3973817d95ec173a706003dbfebc5f22f084a39d16aa1dc3ca8f09463ac655d04f93d120
-TIMESTAMP 2022-09-05T02:39:56Z
+TIMESTAMP 2022-09-05T08:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMVYXxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMVtdlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klAh2w//fAMpwoI6GoMfQi0IeFYel7eEmhI/h4et7UhCVov1+v5i6urln5toeVgx
-U1eM/WRnXYcaqzpcY4o5qW/1NCkvCDJcW7IvSLsjku607NsGc7V/0ddDQk/mgKmT
-1S5UTbZ69YAIsGCUobk1z04d9R6DCuicWXFHdhUvM1X27LUtUqEu0+/tNAKcgbVG
-xjCn9mD6nqFm0TuvNGskEfKBSA2PIUFX5lip27I2nAWxIgp42l/fnnpEaH8cmSgt
-GJKEdy+k6pwgyVCLnKdRhk8T4bsczsp4fRgcbSMWNFG5cwDJNDwqUUZnP+ZHYn15
-M6aPr3FkWKNARnDeuVyycXUA0zja4/fbshKS1k67nod7NIF9LDwpr1x1dipVzmXS
-x+uys49Sd+4Vop7es/kWXIofNZ2tcJcs1CzpHwQix70ZMS7Qp0mHefUpHnwAEf16
-IBqz64FkmeoOJys46VYv1M+WktFTHLcDMZVgsoed1lOCeSxdl8qGcN2jf0/0747q
-kt5fqRSv6h7AqACge55+L0BNM76GMEgUh8xw3ZG2mMUJrOXDHuTZJsgb/HsVDfxv
-/YbX7LmTpCqieBCwssRfSVPbKqOAROLj+vXl4V0hEgE14e00XDffrozTOTVzAEps
-gTymKuh+HJwg61hF9gSyi/3Q+d66kBHT23zeLESwTWR+8SwchX0=
-=uklL
+klCX7Q//R6ClLwNK0UTuf/9d2Dv6X1uFsvxstiYjAdweeanovT/lfWZCqknMcd8m
+6KqvQG8hL/hnvf/A4Dn4d7uVXG3K/DJwuzXP7MuDOSsU1DygAs/6eLnRIf5MvUgG
+xZkicilivLWG1wV4SBiTQKiJbGVKZoRMy2BI47cA4srX1JSaWgH/C0xgtuVZ6tvv
+uHiX2PQUfEAN6U8J7hxH8fSgfHhm7iyJoTnnJtfnyfmF1Q2B/UrQCdVTYvM++9Lz
+rbAqTyjlfsch5gY5lPAbg7xcLonzM9v83eMjeFWwYcP4q4HtluX36857a2EBgsEu
+VOvcefQDaKauhBnonhgQiCvK7A/vyTCd0zjM3AkOS8v0cz0sCwWJ5utebHmq9YnR
+3A+RVnGD6vqOwwOH0WDJvRmmzE4h+buGsvv0oxV5UNuGxsqyX4JOto4E4Vjk79lF
+zJnZWvPNMDso3LNaQsGnI1LB5x23GQ2RGhvEv7u5LQGD71pRWJXPDHT+f4XRMOmC
+1EgbVVYkTNwOuLuo6TkSvza95S+t3C2LgP1XaJwi8dfRoq4KlTnyOXa2auEDwblS
+ID6tWfzk5gpG/TdQzsvMRp8DTnU2vnLR1Erhq4+ASC0XMiy8elXRXUANYlogDVUn
+c3eKU1ik9xGo78IFR+maDylY90p5+Uzp2AJyglOzldGsEA05VVg=
+=5HUh
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index b42e7cdd5f15..b63b29a9847c 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Mon, 05 Sep 2022 02:39:51 +0000
+Mon, 05 Sep 2022 08:39:50 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index eb1bd4b9c070..ed990eb97f3b 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/Manifest.gz b/metadata/md5-cache/app-crypt/Manifest.gz
index 958cdc4b0b1b..e58455ac2450 100644
--- a/metadata/md5-cache/app-crypt/Manifest.gz
+++ b/metadata/md5-cache/app-crypt/Manifest.gz
diff --git a/metadata/md5-cache/app-crypt/signify-30 b/metadata/md5-cache/app-crypt/signify-30
deleted file mode 100644
index fabbe0c7d7f2..000000000000
--- a/metadata/md5-cache/app-crypt/signify-30
+++ /dev/null
@@ -1,13 +0,0 @@
-DEFINED_PHASES=configure install
-DEPEND=>=dev-libs/libbsd-0.7
-DESCRIPTION=Cryptographically sign and verify files
-EAPI=7
-HOMEPAGE=http://www.openbsd.org/ https://github.com/aperezdc/signify
-INHERIT=toolchain-funcs
-KEYWORDS=~amd64 ~x86
-LICENSE=BSD-1
-RDEPEND=>=dev-libs/libbsd-0.7
-SLOT=0
-SRC_URI=https://github.com/aperezdc/signify/archive/v30.tar.gz -> signify-30.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=43f0389cb4764623ed26ea319a67b0c0
diff --git a/metadata/md5-cache/app-crypt/signify-30-r2 b/metadata/md5-cache/app-crypt/signify-30-r2
deleted file mode 100644
index fb34845f37ff..000000000000
--- a/metadata/md5-cache/app-crypt/signify-30-r2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=verify-sig? ( sec-keys/signify-keys-signify ) verify-sig? ( app-crypt/signify )
-DEFINED_PHASES=configure install unpack
-DEPEND=!net-mail/signify >=dev-libs/libbsd-0.7
-DESCRIPTION=Cryptographically sign and verify files
-EAPI=8
-HOMEPAGE=http://www.openbsd.org/ https://github.com/aperezdc/signify
-INHERIT=toolchain-funcs verify-sig
-IUSE=verify-sig
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=BSD-1
-RDEPEND=!net-mail/signify >=dev-libs/libbsd-0.7
-SLOT=0
-SRC_URI=https://github.com/aperezdc/signify/releases/download/v30/signify-30.tar.xz verify-sig? ( https://github.com/aperezdc/signify/releases/download/v30/SHA256.sig -> signify-30.sha.sig )
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=7113215c192a5c2c3a41626ac6841260
diff --git a/metadata/md5-cache/app-crypt/signify-31 b/metadata/md5-cache/app-crypt/signify-31
index 416516b54882..69761392b53d 100644
--- a/metadata/md5-cache/app-crypt/signify-31
+++ b/metadata/md5-cache/app-crypt/signify-31
@@ -3,7 +3,7 @@ DEFINED_PHASES=configure install unpack
 DEPEND=!net-mail/signify >=dev-libs/libbsd-0.7
 DESCRIPTION=Cryptographically sign and verify files
 EAPI=8
-HOMEPAGE=http://www.openbsd.org/ https://github.com/aperezdc/signify
+HOMEPAGE=https://www.openbsd.org/ https://github.com/aperezdc/signify/
 INHERIT=toolchain-funcs verify-sig
 IUSE=verify-sig
 KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~sparc x86
@@ -12,4 +12,4 @@ RDEPEND=!net-mail/signify >=dev-libs/libbsd-0.7
 SLOT=0
 SRC_URI=https://github.com/aperezdc/signify/releases/download/v31/signify-31.tar.xz verify-sig? ( https://github.com/aperezdc/signify/releases/download/v31/SHA256.sig -> signify-31.sha.sig )
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=816d4700cfd14a19e99cdb4cd9774a07
+_md5_=50441e26ca06d7d47fe8a7d5fb8dacd2
diff --git a/metadata/md5-cache/app-editors/Manifest.gz b/metadata/md5-cache/app-editors/Manifest.gz
index 22d775db0433..a78ab5f9cdb0 100644
--- a/metadata/md5-cache/app-editors/Manifest.gz
+++ b/metadata/md5-cache/app-editors/Manifest.gz
diff --git a/metadata/md5-cache/app-editors/mousepad-0.5.9 b/metadata/md5-cache/app-editors/mousepad-0.5.9
deleted file mode 100644
index 725791c51d7a..000000000000
--- a/metadata/md5-cache/app-editors/mousepad-0.5.9
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-lang/perl dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.52 >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0.0:4
-DESCRIPTION=GTK+-based editor for the Xfce Desktop Environment
-EAPI=8
-HOMEPAGE=https://git.xfce.org/apps/mousepad/about/
-INHERIT=gnome2-utils xdg-utils
-KEYWORDS=amd64 ~arm ~arm64 ~riscv x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.52 >=x11-libs/gtk+-3.22:3 >=x11-libs/gtksourceview-4.0.0:4
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/mousepad/0.5/mousepad-0.5.9.tar.bz2
-_eclasses_=gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=5901f2ed42cdc1a7ba49e0684768e99f
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index 2812a989e681..20527af5ffc8 100644
--- a/metadata/md5-cache/app-emulation/Manifest.gz
+++ b/metadata/md5-cache/app-emulation/Manifest.gz
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.15.3 b/metadata/md5-cache/app-emulation/xen-tools-4.15.3
index 31520474cbf0..8e89940fba0c 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.15.3
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.15.3
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl sys-devel/bison sys-devel/gettext
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) app-arch/bzip2 dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,xml,threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,xml,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,xml,threads(+)] ) app-misc/pax-utils >=sys-kernel/linux-headers-4.11 x11-libs/pixman python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) arm64? ( sys-power/iasl rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/markdown[python_targets_python3_10(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= dev-util/meson sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib dev-lang/ocaml[ocamlopt] ) python? ( >=dev-lang/swig-4.0.0 )
+DEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) app-arch/bzip2 dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,xml(+),threads(+)] ) app-misc/pax-utils >=sys-kernel/linux-headers-4.11 x11-libs/pixman python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) arm64? ( sys-power/iasl rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/markdown[python_targets_python3_10(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= dev-util/meson sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib dev-lang/ocaml[ocamlopt] ) python? ( >=dev-lang/swig-4.0.0 )
 DESCRIPTION=Xen tools including QEMU and xl
 EAPI=7
 HOMEPAGE=https://xenproject.org
@@ -8,10 +8,10 @@ INHERIT=bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-func
 IUSE=api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
-RDEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) app-arch/bzip2 dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,xml,threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,xml,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,xml,threads(+)] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) selinux? ( sec-policy/selinux-xen )
+RDEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) app-arch/bzip2 dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,xml(+),threads(+)] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) selinux? ( sec-policy/selinux-xen )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
 RESTRICT=test
 SLOT=0/4.15
 SRC_URI=https://downloads.xenproject.org/release/xen/4.15.3/xen-4.15.3.tar.gz https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz -> edk2-7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.15.3-gentoo-patchset-2.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=304709e843b7f5c12bca43824291ae44
+_md5_=ad7e4a98f73da5b9930f7b6dc6ed91cd
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.15.4_pre b/metadata/md5-cache/app-emulation/xen-tools-4.15.4_pre
index 6c37cce7f9d2..202dc29adb01 100644
--- a/metadata/md5-cache/app-emulation/xen-tools-4.15.4_pre
+++ b/metadata/md5-cache/app-emulation/xen-tools-4.15.4_pre
@@ -1,6 +1,6 @@
 BDEPEND=dev-lang/perl sys-devel/bison sys-devel/gettext
 DEFINED_PHASES=compile configure install postinst prepare setup
-DEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) app-arch/bzip2 dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,xml,threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,xml,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,xml,threads(+)] ) app-misc/pax-utils >=sys-kernel/linux-headers-4.11 x11-libs/pixman python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) arm64? ( sys-power/iasl rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/markdown[python_targets_python3_10(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= dev-util/meson sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib dev-lang/ocaml[ocamlopt] ) python? ( >=dev-lang/swig-4.0.0 )
+DEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) app-arch/bzip2 dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,xml(+),threads(+)] ) app-misc/pax-utils >=sys-kernel/linux-headers-4.11 x11-libs/pixman python_single_target_python3_8? ( dev-python/lxml[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/lxml[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/lxml[python_targets_python3_10(-)] ) x86? ( sys-devel/dev86 system-ipxe? ( sys-firmware/ipxe[qemu] ) sys-power/iasl ) api? ( dev-libs/libxml2 net-misc/curl ) ovmf? ( !arm? ( !arm64? ( dev-lang/nasm ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) ) !amd64? ( >=sys-apps/dtc-1.4.0 ) amd64? ( sys-power/iasl system-seabios? ( sys-firmware/seabios ) system-ipxe? ( sys-firmware/ipxe[qemu] ) rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) arm64? ( sys-power/iasl rombios? ( sys-devel/bin86 sys-devel/dev86 ) ) doc? ( app-text/ghostscript-gpl app-text/pandoc python_single_target_python3_8? ( dev-python/markdown[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/markdown[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/markdown[python_targets_python3_10(-)] ) dev-texlive/texlive-latexextra media-gfx/transfig ) hvm? ( x11-base/xorg-proto ) qemu? ( app-arch/snappy:= dev-util/meson sdl? ( media-libs/libsdl[X] media-libs/libsdl2[X] ) ) system-qemu? ( app-emulation/qemu[xen] ) ocaml? ( dev-ml/findlib dev-lang/ocaml[ocamlopt] ) python? ( >=dev-lang/swig-4.0.0 )
 DESCRIPTION=Xen tools including QEMU and xl
 EAPI=7
 HOMEPAGE=https://xenproject.org
@@ -8,10 +8,10 @@ INHERIT=bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-func
 IUSE=api debug doc +hvm +ipxe lzma ocaml ovmf pygrub python +qemu +qemu-traditional +rombios screen selinux sdl static-libs system-ipxe system-qemu system-seabios python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=~amd64 ~arm ~arm64 x86
 LICENSE=GPL-2
-RDEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) app-arch/bzip2 dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,xml,threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,xml,threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,xml,threads(+)] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) selinux? ( sec-policy/selinux-xen )
+RDEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) app-arch/bzip2 dev-libs/libnl:3 dev-libs/lzo:2 dev-libs/yajl sys-apps/util-linux sys-fs/e2fsprogs sys-libs/ncurses sys-libs/zlib python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[ncurses,xml(+),threads(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[ncurses,xml(+),threads(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[ncurses,xml(+),threads(+)] ) sys-apps/iproute2[-minimal] net-misc/bridge-utils screen? ( app-misc/screen app-admin/logrotate ) selinux? ( sec-policy/selinux-xen )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
 RESTRICT=test
 SLOT=0/4.15
 SRC_URI=https://downloads.xenproject.org/release/xen/4.15.3/xen-4.15.3.tar.gz https://www.seabios.org/downloads/seabios-1.14.0.tar.gz ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-3c040ad387099483102708bb1839110bc788cefb.tar.gz ) ovmf? ( https://github.com/tianocore/edk2/archive/7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz -> edk2-7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5.tar.gz https://github.com/openssl/openssl/archive/OpenSSL_1_1_1j.tar.gz https://github.com/ucb-bar/berkeley-softfloat-3/archive/b64af41c3276f97f0e181920400ee056b9c88037.tar.gz -> berkeley-softfloat-b64af41c3276f97f0e181920400ee056b9c88037.tar.gz https://github.com/google/brotli/archive/666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz -> brotli-666c3280cc11dc433c303d79a83d4ffbdd12cc8d.tar.gz ) https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/xen-upstream-patches-4.15.4-pre-patchset-0.1.tar.bz2 https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.15.3-gentoo-patchset-2.tar.bz2
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3ba87c68fec7887064e81310d219c92d
+_md5_=b80dd0017368612b3888a9cb2fa2268f
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 9c0ffdffbaa0..fa63872e894f 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/jffi-1.2.9-r1 b/metadata/md5-cache/dev-java/jffi-1.2.9-r1
deleted file mode 100644
index 02d7c7e1dc7d..000000000000
--- a/metadata/md5-cache/dev-java/jffi-1.2.9-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-libs/libffi:0= virtual/jdk:1.8 test? ( dev-java/ant-junit4:0 dev-java/junit:4 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An optimized Java interface to libffi
-EAPI=7
-HOMEPAGE=https://github.com/jnr/jffi
-INHERIT=java-pkg-2 java-ant-2
-IUSE=doc source test
-KEYWORDS=amd64 ~arm ~arm64 ppc64 x86 ~ppc-macos ~x64-macos
-LICENSE=|| ( Apache-2.0 LGPL-3 )
-RDEPEND=dev-libs/libffi:0= >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=1.2
-SRC_URI=https://github.com/jnr/jffi/archive/1.2.9.tar.gz -> jffi-1.2.9.tar.gz
-_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=1b346ef078509f32a134a9e810fa5bba
diff --git a/metadata/md5-cache/dev-java/jffi-1.3.6 b/metadata/md5-cache/dev-java/jffi-1.3.6
deleted file mode 100644
index e7b9ee179df3..000000000000
--- a/metadata/md5-cache/dev-java/jffi-1.3.6
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install preinst prepare setup test
-DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) test? ( dev-java/junit:4 )
-DESCRIPTION=Java Foreign Function Interface
-EAPI=7
-HOMEPAGE=https://github.com/jnr/jffi
-INHERIT=java-pkg-2 java-pkg-simple
-IUSE=doc source test
-KEYWORDS=amd64 arm64 ~ppc64 x86
-LICENSE=Apache-2.0
-RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=!test? ( test )
-SLOT=1.2
-SRC_URI=https://github.com/jnr/jffi/archive/refs/tags/jffi-1.3.6.tar.gz
-_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	343e153526b31b64f7efec0fdfa0f33b	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
-_md5_=0451cde6ee3ccf7dabf97d64848a5a35
diff --git a/metadata/md5-cache/dev-java/jython-2.7.0-r6 b/metadata/md5-cache/dev-java/jython-2.7.0-r6
deleted file mode 100644
index bbecb87d08f6..000000000000
--- a/metadata/md5-cache/dev-java/jython-2.7.0-r6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile configure install preinst prepare setup test
-DEPEND=dev-java/antlr:3 dev-java/netty:0 dev-java/asm:9 dev-java/commons-compress:0 dev-java/guava:0 dev-java/jffi:1.2 dev-java/jline:2 dev-java/icu4j:70 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/servlet-api:3.0 >=virtual/jdk-1.8:* dev-java/ant-core:0 test? ( dev-java/junit:4 dev-java/ant-junit:0 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
-DESCRIPTION=An implementation of Python written in Java
-EAPI=7
-HOMEPAGE=https://www.jython.org
-INHERIT=java-pkg-2 java-ant-2 python-utils-r1 flag-o-matic
-IUSE=examples test doc source
-KEYWORDS=amd64 ~arm arm64 ppc64 x86 ~amd64-linux ~x86-linux
-LICENSE=PSF-2
-RDEPEND=dev-java/antlr:3 dev-java/netty:0 dev-java/asm:9 dev-java/commons-compress:0 dev-java/guava:0 dev-java/jffi:1.2 dev-java/jline:2 dev-java/icu4j:70 dev-java/jnr-constants:0 dev-java/jnr-posix:3.0 dev-java/jnr-netdb:1.0 dev-java/stringtemplate:0 dev-java/xerces:2 java-virtuals/servlet-api:3.0 >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
-RESTRICT=test
-SLOT=2.7
-SRC_URI=https://search.maven.org/remotecontent?filepath=org/python/jython/2.7.0/jython-2.7.0-sources.jar
-_eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ca04b6ab8ceac0bacd40d7e86ab66a81
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index a2ebe0b661c7..ba860ee0234a 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/lua-5.1.6 b/metadata/md5-cache/dev-lang/lua-5.1.6
new file mode 100644
index 000000000000..ddf43deae516
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/lua-5.1.6
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst prepare
+DEPEND=>=app-eselect/eselect-lua-3 readline? ( sys-libs/readline:= ) !dev-lang/lua:0
+DESCRIPTION=A powerful light-weight programming language designed for extending applications
+EAPI=8
+HOMEPAGE=https://www.lua.org/
+INHERIT=optfeature
+IUSE=+deprecated readline
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=app-eselect/eselect-lua-3 readline? ( sys-libs/readline:= ) !dev-lang/lua:0
+SLOT=5.1
+SRC_URI=https://dev.gentoo.org/~soap/distfiles/lua-5.1.6.tar.xz
+_eclasses_=optfeature	1a2157392a869265b2afcb63a26c12ac
+_md5_=2fa00cc13c784737093ed6e94a25c0e3
diff --git a/metadata/md5-cache/dev-lang/lua-5.3.6-r100 b/metadata/md5-cache/dev-lang/lua-5.3.6-r100
new file mode 100644
index 000000000000..25a39bd167f5
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/lua-5.3.6-r100
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=>=app-eselect/eselect-lua-3 readline? ( sys-libs/readline:= ) !dev-lang/lua:0
+DESCRIPTION=A powerful light-weight programming language designed for extending applications
+EAPI=8
+HOMEPAGE=https://www.lua.org/
+INHERIT=flag-o-matic optfeature
+IUSE=+deprecated readline
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=app-eselect/eselect-lua-3 readline? ( sys-libs/readline:= ) !dev-lang/lua:0
+SLOT=5.3
+SRC_URI=https://dev.gentoo.org/~soap/distfiles/lua-5.3.6.tar.xz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=474c00fd725756995f9f78a06189973a
diff --git a/metadata/md5-cache/dev-lang/lua-5.4.4-r100 b/metadata/md5-cache/dev-lang/lua-5.4.4-r100
new file mode 100644
index 000000000000..f3780895aae9
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/lua-5.4.4-r100
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig
+DEFINED_PHASES=configure install postinst
+DEPEND=>=app-eselect/eselect-lua-3 readline? ( sys-libs/readline:= ) !dev-lang/lua:0
+DESCRIPTION=A powerful light-weight programming language designed for extending applications
+EAPI=8
+HOMEPAGE=https://www.lua.org/
+INHERIT=flag-o-matic optfeature
+IUSE=+deprecated readline
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=app-eselect/eselect-lua-3 readline? ( sys-libs/readline:= ) !dev-lang/lua:0
+SLOT=5.4
+SRC_URI=https://dev.gentoo.org/~soap/distfiles/lua-5.4.4.tar.xz
+_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=db10693508b3237e50276d2b486a4d8b
diff --git a/metadata/md5-cache/dev-lang/python-3.10.6_p4 b/metadata/md5-cache/dev-lang/python-3.10.6_p4
new file mode 100644
index 000000000000..b8ec1d930afa
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.10.6_p4
@@ -0,0 +1,16 @@
+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.6/Python-3.10.6.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.6_p4.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.6/Python-3.10.6.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	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=4032d5fcf8508c9946fd10c40d19b77d
diff --git a/metadata/md5-cache/dev-lang/python-3.11.0_rc1_p2 b/metadata/md5-cache/dev-lang/python-3.11.0_rc1_p2
new file mode 100644
index 000000000000..e08c755a30d1
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.11.0_rc1_p2
@@ -0,0 +1,16 @@
+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.0rc1.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.11.0rc1_p2.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.11.0/Python-3.11.0rc1.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	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=0ca13eafa109603ce724914b4d4a9423
diff --git a/metadata/md5-cache/dev-lang/python-3.8.13_p8 b/metadata/md5-cache/dev-lang/python-3.8.13_p8
new file mode 100644
index 000000000000..4577e5fb5668
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.8.13_p8
@@ -0,0 +1,16 @@
+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.13/Python-3.8.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.13_p8.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.13/Python-3.8.13.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	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=15ee9f0685658ab5631f5318fee468a6
diff --git a/metadata/md5-cache/dev-lang/python-3.9.13_p6 b/metadata/md5-cache/dev-lang/python-3.9.13_p6
new file mode 100644
index 000000000000..38712e7686ff
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.9.13_p6
@@ -0,0 +1,16 @@
+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.13/Python-3.9.13.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.13_p6.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.13/Python-3.9.13.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	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=2b94c72a5b88d1b94e06cbe2b62203b9
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index 44bf964cfe12..649af8774072 100644
--- a/metadata/md5-cache/dev-libs/Manifest.gz
+++ b/metadata/md5-cache/dev-libs/Manifest.gz
diff --git a/metadata/md5-cache/dev-libs/pugixml-1.12 b/metadata/md5-cache/dev-libs/pugixml-1.12
index c5a81b4b4f75..6ba0301e2b4f 100644
--- a/metadata/md5-cache/dev-libs/pugixml-1.12
+++ b/metadata/md5-cache/dev-libs/pugixml-1.12
@@ -4,9 +4,9 @@ DESCRIPTION=Light-weight, simple, and fast XML parser for C++ with XPath support
 EAPI=8
 HOMEPAGE=https://pugixml.org/ https://github.com/zeux/pugixml
 INHERIT=cmake
-KEYWORDS=amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
+KEYWORDS=amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
 LICENSE=MIT
 SLOT=0
 SRC_URI=https://github.com/zeux/pugixml/releases/download/v1.12/pugixml-1.12.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=75e099783817844d3d970ac59c557dd2
+_md5_=bc2e1eda986849b69d61c487a4f90f4b
diff --git a/metadata/md5-cache/dev-libs/spdlog-1.10.0 b/metadata/md5-cache/dev-libs/spdlog-1.10.0
index f9c8710f7029..f5d7fe6eebab 100644
--- a/metadata/md5-cache/dev-libs/spdlog-1.10.0
+++ b/metadata/md5-cache/dev-libs/spdlog-1.10.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=https://github.com/gabime/spdlog
 INHERIT=cmake
 IUSE=test
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv x86
 LICENSE=MIT
 RDEPEND=>=dev-libs/libfmt-8.0.0:=
 RESTRICT=!test? ( test )
 SLOT=0/1
 SRC_URI=https://github.com/gabime/spdlog/archive/v1.10.0.tar.gz -> spdlog-1.10.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=6e2e9c9464151ca930ac8e5c609fc496
+_md5_=58b5383eedc4d3a1c7f69676313910f9
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 8987d4bf3b02..101076639ad5 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/aiofiles-22.1.0 b/metadata/md5-cache/dev-python/aiofiles-22.1.0
new file mode 100644
index 000000000000..e30730908f8d
--- /dev/null
+++ b/metadata/md5-cache/dev-python/aiofiles-22.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-asyncio[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.0.8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=File support for asyncio
+EAPI=8
+HOMEPAGE=https://github.com/Tinche/aiofiles/ https://pypi.org/project/aiofiles/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Tinche/aiofiles/archive/v22.1.0.tar.gz -> aiofiles-22.1.0.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=abf3978935bcbc14b1c4d7acf5967a70
diff --git a/metadata/md5-cache/dev-python/antlr4-python3-runtime-4.11.1 b/metadata/md5-cache/dev-python/antlr4-python3-runtime-4.11.1
new file mode 100644
index 000000000000..1c7bc6473664
--- /dev/null
+++ b/metadata/md5-cache/dev-python/antlr4-python3-runtime-4.11.1
@@ -0,0 +1,15 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Python 3 runtime for ANTLR
+EAPI=8
+HOMEPAGE=https://www.antlr.org/ https://github.com/antlr/antlr4/ https://pypi.org/project/antlr4-python3-runtime/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/antlr/antlr4/archive/4.11.1.tar.gz -> antlr-4.11.1.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=9dfafe57ea38177850a09826e5a5d83f
diff --git a/metadata/md5-cache/dev-python/django-4.1.1 b/metadata/md5-cache/dev-python/django-4.1.1
new file mode 100644
index 000000000000..5fbe92ff4def
--- /dev/null
+++ b/metadata/md5-cache/dev-python/django-4.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite] ) <dev-python/asgiref-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/asgiref-3.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) dev-python/docutils[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/jinja[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pillow[webp,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/selenium[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/tblib[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] sys-devel/gettext !!<dev-python/ipython-7.21.0-r1 !!=dev-python/ipython-7.22.0-r0 ) verify-sig? ( >=sec-keys/openpgp-keys-django-20201201 ) doc? ( >=dev-python/sphinx-4.5.0-r1 ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite?,threads(+)] ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst prepare test unpack
+DESCRIPTION=High-level Python web framework
+EAPI=8
+HOMEPAGE=https://www.djangoproject.com/ https://github.com/django/django/ https://pypi.org/project/Django/
+INHERIT=bash-completion-r1 distutils-r1 optfeature verify-sig
+IUSE=doc sqlite test doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~sparc ~x86 ~x64-macos
+LICENSE=BSD Apache-2.0 MIT
+RDEPEND=<dev-python/asgiref-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/asgiref-3.5.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sqlparse-0.2.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[sqlite?,threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[sqlite?,threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[sqlite?,threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[sqlite?,threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://media.djangoproject.com/releases/4.1/Django-4.1.1.tar.gz verify-sig? ( https://media.djangoproject.com/pgp/Django-4.1.1.checksum.txt )
+_eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
+_md5_=ff673c1866a9eb71f90ddeebbe9e9fa5
diff --git a/metadata/md5-cache/dev-python/flufl-lock-7.1.1 b/metadata/md5-cache/dev-python/flufl-lock-7.1.1
new file mode 100644
index 000000000000..23fa3f9f6d39
--- /dev/null
+++ b/metadata/md5-cache/dev-python/flufl-lock-7.1.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/sybil[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/atpublic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/psutil-5.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pdm-pep517-1.0.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=NFS-safe file locking with timeouts for POSIX systems
+EAPI=8
+HOMEPAGE=https://gitlab.com/warsaw/flufl.lock
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=Apache-2.0
+RDEPEND=dev-python/atpublic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/psutil-5.9.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/f/flufl.lock/flufl.lock-7.1.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=8387c43c0a3ffc8371957b20c643f245
diff --git a/metadata/md5-cache/dev-python/fritzconnection-1.10.2 b/metadata/md5-cache/dev-python/fritzconnection-1.10.2
new file mode 100644
index 000000000000..8ee04e2bef33
--- /dev/null
+++ b/metadata/md5-cache/dev-python/fritzconnection-1.10.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/requests-2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.2[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Lib/tool to communicate with AVM FRITZ! devices using TR-064 protocol over UPnP
+EAPI=8
+HOMEPAGE=https://github.com/kbr/fritzconnection/ https://pypi.org/project/fritzconnection/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/requests-2.22[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/kbr/fritzconnection/archive/1.10.2.tar.gz -> fritzconnection-1.10.2.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=10eda51f27298829c2e3d428d376dd6b
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.54.5 b/metadata/md5-cache/dev-python/hypothesis-6.54.5
new file mode 100644
index 000000000000..da87dae4f14e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.54.5
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite] ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_8? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0=[threads(+),sqlite] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.54.5.tar.gz -> hypothesis-6.54.5.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=f2ad4a02a4a15b7c57e327b8c93b6043
diff --git a/metadata/md5-cache/dev-python/keyring-23.9.1 b/metadata/md5-cache/dev-python/keyring-23.9.1
new file mode 100644
index 000000000000..f2ca0ec86d0f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/keyring-23.9.1
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/secretstorage-3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jeepney-0.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) >=dev-python/pytest-7.1.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Provides access to the system keyring service
+EAPI=8
+HOMEPAGE=https://github.com/jaraco/keyring/ https://pypi.org/project/keyring/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~x64-macos
+LICENSE=PSF-2
+RDEPEND=>=dev-python/secretstorage-3.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/jeepney-0.4.2[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_8? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_python3_9? ( >=dev-python/importlib_metadata-3.6[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jaraco/keyring/archive/v23.9.1.tar.gz -> keyring-23.9.1.gh.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=1b13c0fbed3f1122980c2d7a7a8ba640
diff --git a/metadata/md5-cache/dev-python/websocket-client-1.4.1 b/metadata/md5-cache/dev-python/websocket-client-1.4.1
new file mode 100644
index 000000000000..dd5bbe8f2df3
--- /dev/null
+++ b/metadata/md5-cache/dev-python/websocket-client-1.4.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/python-socks[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-python/gpep517-8[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-62.6.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=WebSocket client for python with hybi13 support
+EAPI=8
+HOMEPAGE=https://github.com/websocket-client/websocket-client/ https://pypi.org/project/websocket-client/
+INHERIT=distutils-r1
+IUSE=examples test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=Apache-2.0
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/w/websocket-client/websocket-client-1.4.1.tar.gz
+_eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
+_md5_=683698d1777fc953db78d04e59249b63
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index c54458d15594..82821c41e25d 100644
--- a/metadata/md5-cache/dev-util/Manifest.gz
+++ b/metadata/md5-cache/dev-util/Manifest.gz
diff --git a/metadata/md5-cache/dev-util/pahole-1.24 b/metadata/md5-cache/dev-util/pahole-1.24
new file mode 100644
index 000000000000..dead4b933105
--- /dev/null
+++ b/metadata/md5-cache/dev-util/pahole-1.24
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install prepare setup test
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-libs/elfutils-0.178 sys-libs/zlib
+DESCRIPTION=pahole (Poke-a-Hole) and other DWARF2 utilities
+EAPI=7
+HOMEPAGE=https://git.kernel.org/cgit/devel/pahole/pahole.git/
+INHERIT=cmake python-single-r1
+IUSE=debug python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+LICENSE=GPL-2
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) >=dev-libs/elfutils-0.178 sys-libs/zlib
+REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0
+SRC_URI=http://fedorapeople.org/~acme/dwarves/dwarves-1.24.tar.xz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=73ef04f435c06011da74276d9cc44631
diff --git a/metadata/md5-cache/dev-util/pkgcheck-0.10.12 b/metadata/md5-cache/dev-util/pkgcheck-0.10.12
index e93d09d44b75..a7fd6882beaf 100644
--- a/metadata/md5-cache/dev-util/pkgcheck-0.10.12
+++ b/metadata/md5-cache/dev-util/pkgcheck-0.10.12
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/pkgcore/pkgcheck
 INHERIT=distutils-r1 optfeature
 IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ppc ppc64 ~riscv ~s390 ~sparc x86 ~x64-macos
 LICENSE=BSD MIT
 RDEPEND=>=dev-python/snakeoil-0.9.11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=sys-apps/pkgcore-0.12.12[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-libs/tree-sitter dev-libs/tree-sitter-bash dev-python/chardet[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lazy-object-proxy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/lxml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pathspec[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tree-sitter-0.19.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/p/pkgcheck/pkgcheck-0.10.12.tar.gz
 _eclasses_=distutils-r1	e3b0f72d558eb613ff83262d22cbf887	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=a3f7212694415acd0bc9600107c22f09
+_md5_=15abfd387cee8f29e1574154a4a8a231
diff --git a/metadata/md5-cache/games-emulation/Manifest.gz b/metadata/md5-cache/games-emulation/Manifest.gz
index c3db11d3087f..df286b0071fb 100644
--- a/metadata/md5-cache/games-emulation/Manifest.gz
+++ b/metadata/md5-cache/games-emulation/Manifest.gz
diff --git a/metadata/md5-cache/games-emulation/dolphin-5.0_p20210506-r3 b/metadata/md5-cache/games-emulation/dolphin-5.0_p20210506-r3
deleted file mode 100644
index 9b2a88db7b20..000000000000
--- a/metadata/md5-cache/games-emulation/dolphin-5.0_p20210506-r3
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install postinst postrm prepare test
-DEPEND=dev-libs/hidapi:0= <dev-libs/libfmt-8.1:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl(+)] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc )
-DESCRIPTION=Gamecube and Wii game emulator
-EAPI=7
-HOMEPAGE=https://dolphin-emu.org/
-INHERIT=cmake desktop xdg-utils pax-utils
-IUSE=alsa bluetooth discord-presence doc +evdev ffmpeg +gui log profile pulseaudio systemd upnp vulkan
-KEYWORDS=amd64 ~arm64
-LICENSE=GPL-2+ Apache-2.0 BSD BSD-2 ISC LGPL-2.1+ MIT ZLIB
-RDEPEND=dev-libs/hidapi:0= <dev-libs/libfmt-8.1:0= dev-libs/lzo:2= dev-libs/pugixml:0= media-libs/libpng:0= media-libs/libsfml media-libs/mesa[egl(+)] net-libs/enet:1.3 net-libs/mbedtls:0= net-misc/curl:0= sys-libs/readline:0= sys-libs/zlib:0= x11-libs/libXext x11-libs/libXi x11-libs/libXrandr virtual/libusb:1 virtual/opengl alsa? ( media-libs/alsa-lib ) bluetooth? ( net-wireless/bluez ) evdev? ( dev-libs/libevdev virtual/udev ) ffmpeg? ( media-video/ffmpeg:= ) gui? ( dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtwidgets:5 ) profile? ( dev-util/oprofile ) pulseaudio? ( media-sound/pulseaudio ) systemd? ( sys-apps/systemd:0= ) upnp? ( net-libs/miniupnpc ) vulkan? ( media-libs/vulkan-loader )
-SLOT=0
-SRC_URI=https://github.com/dolphin-emu/dolphin/archive/eb5cd9be78c76b9ccbab9e5fbd1721ef6876cd68.tar.gz -> dolphin-5.0_p20210506.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	desktop	22952d8f27cac191d75529d4c38e6bfa	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=dfdb71ad27a1ab9ce87a3da1df05eead
diff --git a/metadata/md5-cache/media-gfx/Manifest.gz b/metadata/md5-cache/media-gfx/Manifest.gz
index b0bd3bb16d57..259e79d938cc 100644
--- a/metadata/md5-cache/media-gfx/Manifest.gz
+++ b/metadata/md5-cache/media-gfx/Manifest.gz
diff --git a/metadata/md5-cache/media-gfx/ristretto-0.12.2 b/metadata/md5-cache/media-gfx/ristretto-0.12.2
deleted file mode 100644
index e3168e63c3a2..000000000000
--- a/metadata/md5-cache/media-gfx/ristretto-0.12.2
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig sys-devel/gettext
-DEFINED_PHASES=postinst postrm
-DEPEND=>=dev-libs/glib-2.44:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
-DESCRIPTION=A fast and lightweight picture viewer for Xfce
-EAPI=8
-HOMEPAGE=https://docs.xfce.org/apps/ristretto/start
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.44:2 media-libs/libexif:0= sys-apps/file x11-libs/cairo:0 >=x11-libs/gtk+-3.22:3 x11-libs/libX11:0= >=xfce-base/libxfce4ui-4.16:0= >=xfce-base/libxfce4util-4.16:0= >=xfce-base/xfconf-4.12.1:0=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/ristretto/0.12/ristretto-0.12.2.tar.bz2
-_eclasses_=xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=c2586b5982a4679c550287d58a2276d8
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index d66dc7a7e710..3d2ca7e85b4e 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/kvazaar-2.1.0 b/metadata/md5-cache/media-libs/kvazaar-2.1.0
index 779597b363b3..e712b36f67a8 100644
--- a/metadata/md5-cache/media-libs/kvazaar-2.1.0
+++ b/metadata/md5-cache/media-libs/kvazaar-2.1.0
@@ -6,11 +6,11 @@ EAPI=7
 HOMEPAGE=http://ultravideo.cs.tut.fi/ https://github.com/ultravideo/kvazaar
 INHERIT=autotools flag-o-matic multilib-minimal toolchain-funcs
 IUSE=static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=LGPL-2.1
 REQUIRED_USE=test? ( static-libs )
 RESTRICT=!test? ( test )
 SLOT=0/6
 SRC_URI=https://github.com/ultravideo/kvazaar/archive/v2.1.0.tar.gz -> kvazaar-2.1.0.tar.gz test? ( https://github.com/silentbicycle/greatest/archive/v1.2.1.tar.gz -> greatest-1.2.1.tar.gz )
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ce730705a8770a19bd07c1532f228f28
+_md5_=6d7e8570d979c5bda872f2a70e41c7e4
diff --git a/metadata/md5-cache/media-libs/libaom-3.4.0 b/metadata/md5-cache/media-libs/libaom-3.4.0
index 37cee31d5725..f5136877e295 100644
--- a/metadata/md5-cache/media-libs/libaom-3.4.0
+++ b/metadata/md5-cache/media-libs/libaom-3.4.0
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://aomedia.org https://aomedia.googlesource.com/aom/
 INHERIT=cmake-multilib python-any-r1
 IUSE=doc +examples test cpu_flags_x86_mmx cpu_flags_x86_sse cpu_flags_x86_sse2 cpu_flags_x86_sse3 cpu_flags_x86_ssse3 cpu_flags_x86_sse4_1 cpu_flags_x86_sse4_2 cpu_flags_x86_avx cpu_flags_x86_avx2 cpu_flags_arm_neon abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=BSD-2
 REQUIRED_USE=cpu_flags_x86_sse2? ( cpu_flags_x86_mmx ) cpu_flags_x86_ssse3? ( cpu_flags_x86_sse2 )
 RESTRICT=!test? ( test ) test
 SLOT=0/3
 SRC_URI=https://storage.googleapis.com/aom-releases/libaom-3.4.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fc8230ce95de847faa31b0726e92af18
+_md5_=3d06c057d370be7218654cb23a47815a
diff --git a/metadata/md5-cache/media-libs/libass-0.16.0 b/metadata/md5-cache/media-libs/libass-0.16.0
index 43f0b1bd1628..3850b92a1432 100644
--- a/metadata/md5-cache/media-libs/libass-0.16.0
+++ b/metadata/md5-cache/media-libs/libass-0.16.0
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/libass/libass
 INHERIT=multilib-minimal verify-sig
 IUSE=+fontconfig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~sparc-solaris ~x86-solaris
 LICENSE=ISC
 RDEPEND=>=dev-libs/fribidi-0.19.5-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/freetype-2.5.0.1:2[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=virtual/libiconv-0-r1[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] >=media-libs/harfbuzz-1.2.3:=[truetype,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] fontconfig? ( >=media-libs/fontconfig-2.10.92[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/9
 SRC_URI=https://github.com/libass/libass/releases/download/0.16.0/libass-0.16.0.tar.xz verify-sig? ( https://github.com/libass/libass/releases/download/0.16.0/libass-0.16.0.tar.xz.asc )
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=75ae9d7ed2116a46b5b4b547cbf6ffe9
+_md5_=9ad3bef4216883b2482c6e7b35caf24b
diff --git a/metadata/md5-cache/media-libs/x264-0.0.20220222 b/metadata/md5-cache/media-libs/x264-0.0.20220222
index cd7f79378688..1d1d35179600 100644
--- a/metadata/md5-cache/media-libs/x264-0.0.20220222
+++ b/metadata/md5-cache/media-libs/x264-0.0.20220222
@@ -5,10 +5,10 @@ EAPI=7
 HOMEPAGE=https://www.videolan.org/developers/x264.html
 INHERIT=flag-o-matic multilib-minimal toolchain-funcs
 IUSE=cpu_flags_ppc_altivec +interlaced opencl pic static-libs cpu_flags_x86_sse +threads abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~ppc-macos
 LICENSE=GPL-2
 RDEPEND=opencl? ( >=virtual/opencl-0-r3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 SLOT=0/164
 SRC_URI=https://dev.gentoo.org/~aballier/distfiles/x264-0.0.20220222.tar.bz2
 _eclasses_=edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	1542e649be915f43f6908a9e93909961	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=fb6a3f038885a6ceb3ab7ec877bc8603
+_md5_=be67b87fa9d5e6c32c8526ef23d08ed6
diff --git a/metadata/md5-cache/media-libs/xine-lib-1.2.12-r3 b/metadata/md5-cache/media-libs/xine-lib-1.2.12-r3
index 96145edc5eef..31307f9c4d54 100644
--- a/metadata/md5-cache/media-libs/xine-lib-1.2.12-r3
+++ b/metadata/md5-cache/media-libs/xine-lib-1.2.12-r3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=http://xine.sourceforge.net/
 INHERIT=flag-o-matic libtool
 IUSE=a52 aac aalib +alsa bluray cpu_flags_ppc_altivec +css dav1d dts dvb dxr3 fbcon flac gtk imagemagick ipv6 jack jpeg libcaca mad +mmap mng modplug musepack nfs opengl oss pulseaudio samba sftp sdl speex theora truetype v4l vaapi vcd vdpau vdr vidix +vis vorbis vpx wavpack wayland +X xinerama +xv xvmc nls
-KEYWORDS=amd64 ~arm64 ~hppa ~ppc ~ppc64 ~riscv x86
+KEYWORDS=amd64 arm64 ~hppa ~ppc ~ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=dev-libs/libxdg-basedir media-libs/libdvdnav media-video/ffmpeg:0= sys-libs/zlib:= virtual/libiconv a52? ( media-libs/a52dec ) aac? ( media-libs/faad2 ) aalib? ( media-libs/aalib ) alsa? ( media-libs/alsa-lib ) bluray? ( >=media-libs/libbluray-0.2.1:= ) css? ( >=media-libs/libdvdcss-1.2.10 ) dav1d? ( media-libs/dav1d:= ) dts? ( media-libs/libdca ) dxr3? ( media-libs/libfame ) flac? ( media-libs/flac ) gtk? ( x11-libs/gdk-pixbuf:2 ) imagemagick? ( virtual/imagemagick-tools ) jack? ( virtual/jack ) jpeg? ( media-libs/libjpeg-turbo:= ) libcaca? ( media-libs/libcaca ) mad? ( media-libs/libmad ) mng? ( media-libs/libmng:= ) modplug? ( >=media-libs/libmodplug-0.8.8.1 ) musepack? ( >=media-sound/musepack-tools-444 ) nfs? ( net-fs/libnfs:= ) opengl? ( virtual/glu virtual/opengl ) pulseaudio? ( media-sound/pulseaudio ) samba? ( net-fs/samba ) sftp? ( net-libs/libssh2 ) sdl? ( media-libs/libsdl ) speex? ( media-libs/libogg media-libs/speex ) theora? ( media-libs/libogg media-libs/libtheora ) truetype? ( media-libs/fontconfig media-libs/freetype:2 ) v4l? ( media-libs/libv4l ) vaapi? ( x11-libs/libva:0=[X] ) vcd? ( >=media-video/vcdimager-0.7.23 dev-libs/libcdio:0=[-minimal] ) vdpau? ( x11-libs/libvdpau ) vorbis? ( media-libs/libogg media-libs/libvorbis ) vpx? ( media-libs/libvpx:0= ) wavpack? ( media-sound/wavpack ) wayland? ( dev-libs/wayland ) X? ( x11-libs/libX11 x11-libs/libXext x11-libs/libxcb ) xinerama? ( x11-libs/libXinerama ) xv? ( x11-libs/libXv ) xvmc? ( x11-libs/libXvMC )
 REQUIRED_USE=vidix? ( || ( X fbcon ) ) xv? ( X ) xinerama? ( X )
 SLOT=1
 SRC_URI=mirror://sourceforge/xine/xine-lib-1.2.12.tar.xz
 _eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=5e00d80fb729ffa9a595220f9d02b155
+_md5_=1bdcc6e176eac087c078b35da3256818
diff --git a/metadata/md5-cache/media-libs/zimg-3.0.4 b/metadata/md5-cache/media-libs/zimg-3.0.4
index d22dbe4a0253..b876cda79dda 100644
--- a/metadata/md5-cache/media-libs/zimg-3.0.4
+++ b/metadata/md5-cache/media-libs/zimg-3.0.4
@@ -5,9 +5,9 @@ EAPI=7
 HOMEPAGE=https://github.com/sekrit-twc/zimg
 INHERIT=autotools multilib-minimal
 IUSE=debug static-libs abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=WTFPL-2
 SLOT=0
 SRC_URI=https://github.com/sekrit-twc/zimg/archive/release-3.0.4.tar.gz -> zimg-3.0.4.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	toolchain-funcs	1542e649be915f43f6908a9e93909961
-_md5_=ae00ed3c9da3580d4d331aa07c7ee161
+_md5_=ae2c08c3c0a33390b4f3765c8dc01438
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index c8c5aa5133d3..7a933e63fbfd 100644
--- a/metadata/md5-cache/net-wireless/Manifest.gz
+++ b/metadata/md5-cache/net-wireless/Manifest.gz
diff --git a/metadata/md5-cache/net-wireless/blueman-2.2.5 b/metadata/md5-cache/net-wireless/blueman-2.2.5
deleted file mode 100644
index bc973251e5fe..000000000000
--- a/metadata/md5-cache/net-wireless/blueman-2.2.5
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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(-)] ) python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] ) virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm prepare pretend setup
-DEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-DESCRIPTION=Simple and intuitive GTK+ Bluetooth Manager
-EAPI=8
-HOMEPAGE=https://github.com/blueman-project/blueman/
-INHERIT=autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
-IUSE=appindicator network nls policykit pulseaudio python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=amd64 arm arm64 ppc ppc64 ~riscv x86
-LICENSE=GPL-3+ GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) appindicator? ( dev-libs/libappindicator:3[introspection] ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio-daemon[bluetooth] media-video/pipewire[bluetooth] <media-sound/pulseaudio-15.99.1[bluetooth] media-sound/pulseaudio-modules-bt ) )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.2.5/blueman-2.2.5.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=08280eefcc5d26aa9cadab8292f611ea
diff --git a/metadata/md5-cache/net-wireless/blueman-2.3.1 b/metadata/md5-cache/net-wireless/blueman-2.3.1
deleted file mode 100644
index 6727f52caf78..000000000000
--- a/metadata/md5-cache/net-wireless/blueman-2.3.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=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(-)] ) python_single_target_python3_11? ( dev-python/cython[python_targets_python3_11(-)] ) virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test
-DEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=net-wireless/bluez-5:=
-DESCRIPTION=Simple and intuitive GTK+ Bluetooth Manager
-EAPI=8
-HOMEPAGE=https://github.com/blueman-project/blueman/
-INHERIT=autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
-IUSE=network nls policykit pulseaudio python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-3+ GPL-2
-RDEPEND=python_single_target_python3_8? ( dev-python/pygobject:3[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pygobject:3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pygobject:3[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pygobject:3[python_targets_python3_11(-)] ) >=net-wireless/bluez-5:= python_single_target_python3_8? ( dev-python/pycairo[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pycairo[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pycairo[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/pycairo[python_targets_python3_11(-)] ) sys-apps/dbus x11-libs/gtk+:3[introspection] x11-libs/libnotify[introspection] || ( x11-themes/adwaita-icon-theme x11-themes/faenza-icon-theme x11-themes/mate-icon-theme ) network? ( net-firewall/iptables || ( sys-apps/net-tools sys-apps/iproute2 ) || ( net-dns/dnsmasq net-misc/dhcp >=net-misc/networkmanager-0.8 ) ) policykit? ( sys-auth/polkit ) pulseaudio? ( || ( media-sound/pulseaudio-daemon[bluetooth] media-video/pipewire[bluetooth] <media-sound/pulseaudio-15.99.1[bluetooth] media-sound/pulseaudio-modules-bt ) ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
-REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-SLOT=0
-SRC_URI=https://github.com/blueman-project/blueman/releases/download/2.3.1/blueman-2.3.1.tar.xz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	distutils-r1	e3b0f72d558eb613ff83262d22cbf887	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	systemd	2736b403a83f194b59b767f3b344c2c1	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=37293dd5ddfd534af13058094153f6ff
diff --git a/metadata/md5-cache/sci-libs/Manifest.gz b/metadata/md5-cache/sci-libs/Manifest.gz
index a32b7e0fe950..a423b93dd6a5 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/caffe2-1.12.0 b/metadata/md5-cache/sci-libs/caffe2-1.12.0
index f838d7aeca69..584835c1ce35 100644
--- a/metadata/md5-cache/sci-libs/caffe2-1.12.0
+++ b/metadata/md5-cache/sci-libs/caffe2-1.12.0
@@ -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=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-cpp/gflags:= <dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 dev-util/nvidia-cuda-toolkit:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) nnpack? ( sci-libs/NNPACK ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) xnnpack? ( sci-libs/XNNPACK ) dev-cpp/eigen dev-libs/psimd dev-libs/FP16 dev-libs/FXdiv dev-libs/pocketfft dev-libs/flatbuffers dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 dev-util/nvidia-cuda-toolkit:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) nnpack? ( sci-libs/NNPACK ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) xnnpack? ( sci-libs/XNNPACK ) dev-cpp/eigen dev-libs/psimd dev-libs/FP16 dev-libs/FXdiv dev-libs/pocketfft dev-libs/flatbuffers dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pybind11[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
 DESCRIPTION=A deep learning framework
 EAPI=8
 HOMEPAGE=https://pytorch.org/
@@ -8,10 +8,10 @@ INHERIT=python-r1 cmake flag-o-matic
 IUSE=cuda ffmpeg nnpack +numpy opencl opencv openmp qnnpack xnnpack python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
 KEYWORDS=~amd64
 LICENSE=BSD
-RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-cpp/gflags:= <dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 dev-util/nvidia-cuda-toolkit:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) nnpack? ( sci-libs/NNPACK ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) xnnpack? ( sci-libs/XNNPACK )
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-cpp/gflags:= >=dev-cpp/glog-0.5.0 dev-libs/cpuinfo dev-libs/libfmt dev-libs/protobuf dev-libs/pthreadpool dev-libs/sleef sci-libs/lapack sci-libs/onnx sci-libs/foxi cuda? ( =dev-libs/cudnn-8* dev-libs/cudnn-frontend:0/8 dev-util/nvidia-cuda-toolkit:=[profiler] ) ffmpeg? ( media-video/ffmpeg:= ) nnpack? ( sci-libs/NNPACK ) numpy? ( dev-python/numpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) opencl? ( virtual/opencl ) opencv? ( media-libs/opencv:= ) qnnpack? ( sci-libs/QNNPACK ) xnnpack? ( sci-libs/XNNPACK )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 ) ffmpeg? ( opencv )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/pytorch/pytorch/archive/refs/tags/v1.12.0.tar.gz -> pytorch-1.12.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=fcd1f19d34b31716a2bd33d3fa60792b
+_md5_=a41ebeb65bd4ff150454984feba20828
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 8de6a351c901..9fbbceb2277e 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/kitty-0.26.2 b/metadata/md5-cache/x11-terms/kitty-0.26.2
new file mode 100644
index 000000000000..d6308a904cb6
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-0.26.2
@@ -0,0 +1,17 @@
+BDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) sys-libs/ncurses virtual/pkgconfig test? ( python_single_target_python3_8? ( dev-python/pillow[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/pillow[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/pillow[python_targets_python3_10(-)] ) ) wayland? ( dev-util/wayland-scanner ) verify-sig? ( sec-keys/openpgp-keys-kovidgoyal ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test unpack
+DEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/openssl:= media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-0.26.2 ~x11-terms/kitty-terminfo-0.26.2 X? ( x11-libs/libX11 ) transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland ) X? ( x11-base/xorg-proto x11-libs/libXcursor x11-libs/libXi x11-libs/libXinerama x11-libs/libXrandr ) wayland? ( dev-libs/wayland-protocols )
+DESCRIPTION=Fast, feature-rich, GPU-based terminal
+EAPI=8
+HOMEPAGE=https://sw.kovidgoyal.net/kitty/
+INHERIT=edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg verify-sig
+IUSE=+X test transfer wayland python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 verify-sig
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) dev-libs/openssl:= media-libs/fontconfig media-libs/harfbuzz:= media-libs/lcms:2 media-libs/libglvnd[X?] media-libs/libpng:= sys-apps/dbus sys-libs/zlib:= x11-libs/libxkbcommon[X?] x11-misc/xkeyboard-config ~x11-terms/kitty-shell-integration-0.26.2 ~x11-terms/kitty-terminfo-0.26.2 X? ( x11-libs/libX11 ) transfer? ( net-libs/librsync:= ) wayland? ( dev-libs/wayland )
+REQUIRED_USE=|| ( X wayland ) ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
+RESTRICT=!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.2/kitty-0.26.2.tar.xz verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v0.26.2/kitty-0.26.2.tar.xz.sig )
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	dd5e1098e305ad508d21f496e9e37046	toolchain-funcs	1542e649be915f43f6908a9e93909961	verify-sig	0748d665fa664a87add00152ed046e16	xdg	6024fbc93167fad782e2032933654857	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
+_md5_=d2ead6637d7c3c790abbb35c49d3b77c
diff --git a/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.2 b/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.2
new file mode 100644
index 000000000000..fbb4d756383b
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-shell-integration-0.26.2
@@ -0,0 +1,10 @@
+DEFINED_PHASES=compile install
+DESCRIPTION=Shell integration scripts for kitty, a GPU-based terminal emulator
+EAPI=8
+HOMEPAGE=https://sw.kovidgoyal.net/kitty/
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.2/kitty-0.26.2.tar.xz
+_md5_=469ce3d113ca8a046e780aa7f7d5ba3d
diff --git a/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.2 b/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.2
new file mode 100644
index 000000000000..51f3f9f97c55
--- /dev/null
+++ b/metadata/md5-cache/x11-terms/kitty-terminfo-0.26.2
@@ -0,0 +1,11 @@
+BDEPEND=sys-libs/ncurses
+DEFINED_PHASES=compile install
+DESCRIPTION=Terminfo for kitty, a GPU-based terminal emulator
+EAPI=8
+HOMEPAGE=https://sw.kovidgoyal.net/kitty/
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RESTRICT=test
+SLOT=0
+SRC_URI=https://github.com/kovidgoyal/kitty/releases/download/v0.26.2/kitty-0.26.2.tar.xz
+_md5_=96d958882b65a1b8fae9dfaa54af8e62
diff --git a/metadata/md5-cache/xfce-base/Manifest.gz b/metadata/md5-cache/xfce-base/Manifest.gz
index e4506501e395..eeb8fd67f896 100644
--- a/metadata/md5-cache/xfce-base/Manifest.gz
+++ b/metadata/md5-cache/xfce-base/Manifest.gz
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.16.4 b/metadata/md5-cache/xfce-base/xfce4-panel-4.16.4
deleted file mode 100644
index 6b3d5bab1d7c..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.16.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) ) dev-lang/perl dev-util/gdbus-codegen dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.50 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.15.8:= >=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
-DESCRIPTION=Panel for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://www.xfce.org/projects/
-INHERIT=vala xdg-utils
-IUSE=+dbusmenu introspection vala
-KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.15.8:= >=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.16/xfce4-panel-4.16.4.tar.bz2
-_eclasses_=vala	1c07e7167d9ef851ad187f5f3f02d34d	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=98e27ac60f0fe3c02f3a49e1b364ab45
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.16.5 b/metadata/md5-cache/xfce-base/xfce4-panel-4.16.5
index e760192d6baf..abb66e3bc980 100644
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.16.5
+++ b/metadata/md5-cache/xfce-base/xfce4-panel-4.16.5
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://www.xfce.org/projects/
 INHERIT=vala xdg-utils
 IUSE=+dbusmenu introspection vala
-KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
+KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris
 LICENSE=GPL-2+ LGPL-2.1+
 RDEPEND=>=dev-libs/glib-2.50 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-0.5:= >=xfce-base/libxfce4ui-4.15.8:= >=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
 REQUIRED_USE=vala? ( introspection )
 SLOT=0
 SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.16/xfce4-panel-4.16.5.tar.bz2
 _eclasses_=vala	1c07e7167d9ef851ad187f5f3f02d34d	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=91c0ff9702ba08d8bded8e81e84c1cbe
+_md5_=98e27ac60f0fe3c02f3a49e1b364ab45
diff --git a/metadata/md5-cache/xfce-base/xfce4-panel-4.17.2 b/metadata/md5-cache/xfce-base/xfce4-panel-4.17.2
deleted file mode 100644
index 0f492917018a..000000000000
--- a/metadata/md5-cache/xfce-base/xfce4-panel-4.17.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=vala? ( || ( dev-lang/vala:0.56 dev-lang/vala:0.54 dev-lang/vala:0.52 dev-lang/vala:0.50 ) ) dev-lang/perl dev-util/gdbus-codegen dev-util/gtk-doc-am dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install postinst postrm
-DEPEND=>=dev-libs/glib-2.66 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
-DESCRIPTION=Panel for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://www.xfce.org/projects/
-INHERIT=vala xdg-utils
-IUSE=+dbusmenu introspection vala
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris
-LICENSE=GPL-2+ LGPL-2.1+
-RDEPEND=>=dev-libs/glib-2.66 >=x11-libs/cairo-1 >=x11-libs/gtk+-3.22:3[introspection?] x11-libs/libX11 x11-libs/libwnck:3 >=xfce-base/exo-0.11.2:= >=xfce-base/garcon-4.17.0:= >=xfce-base/libxfce4ui-4.17.1:= >=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?] >=xfce-base/xfconf-4.13:= dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] ) introspection? ( dev-libs/gobject-introspection:= )
-REQUIRED_USE=vala? ( introspection )
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/xfce/xfce4-panel/4.17/xfce4-panel-4.17.2.tar.bz2
-_eclasses_=vala	1c07e7167d9ef851ad187f5f3f02d34d	xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=bc79a8fe93c6e15d796d269054608f59
diff --git a/metadata/md5-cache/xfce-extra/Manifest.gz b/metadata/md5-cache/xfce-extra/Manifest.gz
index 9add45564c69..1b347bb63236 100644
--- a/metadata/md5-cache/xfce-extra/Manifest.gz
+++ b/metadata/md5-cache/xfce-extra/Manifest.gz
diff --git a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.2 b/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.2
deleted file mode 100644
index 2a9280b646fb..000000000000
--- a/metadata/md5-cache/xfce-extra/xfce4-xkb-plugin-0.8.2
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=dev-util/intltool sys-devel/gettext virtual/pkgconfig
-DEFINED_PHASES=configure install
-DEPEND=gnome-base/librsvg:= x11-libs/gtk+:3= x11-libs/libwnck:3= x11-libs/libX11:= >=x11-libs/libxklavier-5.3:= xfce-base/garcon:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12.1:=
-DESCRIPTION=XKB layout switching panel plug-in for the Xfce desktop environment
-EAPI=7
-HOMEPAGE=https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux
-LICENSE=BSD-2 GPL-2+
-RDEPEND=gnome-base/librsvg:= x11-libs/gtk+:3= x11-libs/libwnck:3= x11-libs/libX11:= >=x11-libs/libxklavier-5.3:= xfce-base/garcon:= >=xfce-base/libxfce4ui-4.12:= >=xfce-base/libxfce4util-4.12:= >=xfce-base/xfce4-panel-4.12:= >=xfce-base/xfconf-4.12.1:= x11-apps/setxkbmap >=xfce-base/xfce4-settings-4.11
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/panel-plugins/xfce4-xkb-plugin/0.8/xfce4-xkb-plugin-0.8.2.tar.bz2
-_md5_=e55556f20072bc4139fcf2bd59d46174
diff --git a/metadata/md5-cache/xfce-extra/xfdashboard-0.9.5 b/metadata/md5-cache/xfce-extra/xfdashboard-0.9.5
deleted file mode 100644
index f32dbe3ba07a..000000000000
--- a/metadata/md5-cache/xfce-extra/xfdashboard-0.9.5
+++ /dev/null
@@ -1,13 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0=[gtk] >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.14:=
-DESCRIPTION=Maybe a GNOME shell like dashboard for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfdashboard/start
-KEYWORDS=amd64 x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0=[gtk] >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.14:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfdashboard/0.9/xfdashboard-0.9.5.tar.bz2
-_eclasses_=xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=39249ffb444989c7bd2f968b791075e0
diff --git a/metadata/md5-cache/xfce-extra/xfdashboard-0.9.91 b/metadata/md5-cache/xfce-extra/xfdashboard-0.9.91
deleted file mode 100644
index 64fba41ec653..000000000000
--- a/metadata/md5-cache/xfce-extra/xfdashboard-0.9.91
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=dev-util/intltool virtual/pkgconfig
-DEFINED_PHASES=install postinst postrm
-DEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0=[gtk] >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.14:=
-DESCRIPTION=Maybe a GNOME shell like dashboard for the Xfce desktop environment
-EAPI=8
-HOMEPAGE=https://goodies.xfce.org/projects/applications/xfdashboard/start
-INHERIT=xdg-utils
-KEYWORDS=~amd64 ~riscv ~x86
-LICENSE=GPL-2+
-RDEPEND=>=dev-libs/glib-2.38:2 >=x11-libs/gtk+-3.2:3 >=media-libs/clutter-1.12:1.0=[gtk] >=x11-libs/libwnck-3:3= x11-libs/libX11:= x11-libs/libXcomposite:= x11-libs/libXdamage:= x11-libs/libXinerama:= >=xfce-base/garcon-0.2.0:= >=xfce-base/libxfce4ui-4.10:= >=xfce-base/libxfce4util-4.10:= >=xfce-base/xfconf-4.14:=
-SLOT=0
-SRC_URI=https://archive.xfce.org/src/apps/xfdashboard/0.9/xfdashboard-0.9.91.tar.bz2
-_eclasses_=xdg-utils	fffb53a53cf17c9c0c998a3c0a590c7e
-_md5_=23343154aa450ecc7e74ca17a8b14a5a
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index 9c817856548c..9600bf0325f3 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-09-05T02:39:56Z
+TIMESTAMP 2022-09-05T08:39:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMVYXxfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmMVtdlfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klBc8Q//U+KVB6laFqEiBuIiwigSMeeGLDt5rbtnX/Hb8su/zfvBPgrzoGu5Mj4+
-DS49O0cpgWnbSVFZkbHjL8zx1SI0zii5/n6Wl67EBT5szomtNg+u+nFeg7YzmJ06
-fHmFSpJWMaY3d9y8Izg59LKcwz8k1+iAXON7IFM8eQJrxK2RRUTB1nt8Ee6I66du
-kAPRl4asnT1FthjKe0U7TYpY7/pa6LYvvuFccd541TvsmgfVnr3EgEElHcMUYfdM
-DNPn4bd8sGNwZJ5VjEwjyzkUKp1G5Q4OxdVC6uZDn9ruIxo4NY3EGQiurYaDAv5b
-dzfXEd9v8jqOQ22fKcr1p90LDimtgmur8jgW7PhZI0a898ocMkdesvdqi60ungov
-EPoXihnUwmFi0KLkXl7BzKowulEr1A7NBGZtcd0xUYXJz8YsN1nznI6riiyRiVxm
-brsOGlfS0jmBEhuDY3CsZx45TmoN1HpqMwDYwPmoGXdMW1O3c135CN/IHiodMwi+
-95BzGXPIxCih6piEtZzo/6fmCTcELP86ljzChBwkc23xd83PRuTCVdLt9DtWRBXy
-DNav+LKo2P1s9HAhgbRotxH3amcWm61pXOybRuTh5Jx3v6vHcOAiTaqAfb5lHqtJ
-31nBV+78HpUWxpuDITsh2RV7MIxgq5UGctF7bgRdH5SK+alywvk=
-=Fz9Q
+klBDkw//RmHjI+QvB1SLhGM97x7mnVHF6muThqXrWLVeyb4DjG86K/Rm1rulbeRg
+IG3NKQPmZVE1dMTVcYSbK87sb2/q8RhYIAWVcThuYBfWY8ItdV4vgjkZH/NogHCH
+KR/jQEhT0rUw061ttAkJSLpbfK4V9W5EX9ZE4XD0ZhX2gAIiPokVd0mL64NiTKC2
+soJBN96YydFSOeWgaMpVXwXlpsHOnAczDtAymJVwT1Brbyu/Ad7C+RBvWIf9y9RJ
+LyFOnla18urHlP/kHl9rMwG4oB6l/qMbyRf0jAkYNCY7DdI9YvY70GqZLYPDLZb8
+QWwEvWYfaZkODPkEwJlFENMSkiwxLiUr3BTh7nwZjV72+H5PujFiwxBKBynpe9nH
+DHCXW+JSDl47i0HE5+Mxwv31UMeK1ZBjVwJ/suuMGDTNG6/QvVFAcz3jgyQV344/
+faQmaiH7UwXjWT4tHJJuLjqBNZPkwmJQMYRiyMM+Vty+SxeVW0/8VLVerz+nNiAw
+5JRDBqMEZzGIZOMx/kqKqfcpDxFscB+i2R0NS01ud9pe6M+6j0ty0BPjjY2Bafqf
+l6woHb5My/uLMBMNmk5mRjHFl2eylP8txsgRFUKRfTJ9KlSlTmx0VZZZXldX2pFc
+Q4e+/vHfkDWNpQyWru14K6ytdmP+PpVIbfucDsf6jLkF05FHUTM=
+=pu3+
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index b42e7cdd5f15..b63b29a9847c 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Mon, 05 Sep 2022 02:39:51 +0000
+Mon, 05 Sep 2022 08:39:50 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 01f263e1234a..bce3c3b7f8af 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Mon Sep  5 02:39:51 AM UTC 2022
+Mon Sep  5 08:39:49 AM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 0e4afc1d3a65..8ca03dc4a295 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Mon, 05 Sep 2022 02:45:01 +0000
+Mon, 05 Sep 2022 08:45:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 5061c38955f7..590e2d29eed0 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d9a5223420c777c1edde14239f812d788d8848e7 1662344556 2022-09-05T02:22:36+00:00
+a395438a219617c130c42d909058e244a145ad9c 1662366929 2022-09-05T08:35:29+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 549e01ae63ec..d0d2984a7ae0 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1662345601 Mon 05 Sep 2022 02:40:01 AM UTC
+1662367201 Mon 05 Sep 2022 08:40:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index b42e7cdd5f15..708d1f998ca6 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Mon, 05 Sep 2022 02:39:51 +0000
+Mon, 05 Sep 2022 08:39:49 +0000
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index e095c29a5dab..67b5e177acef 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/blueman/Manifest b/net-wireless/blueman/Manifest
index da512e74fd09..c160727e872f 100644
--- a/net-wireless/blueman/Manifest
+++ b/net-wireless/blueman/Manifest
@@ -1,9 +1,5 @@
 AUX 01-org.blueman.rules 432 BLAKE2B c81ec47bc68be911b44056e4f0f4dd4e2939d8d5db78fbca9f4ddceb7c8ed0108bff1bc12d83ebfa9ed67f8939fdd0aea712aec4ae964f10d84a4a6077479a37 SHA512 5cea5f5e9f43e9778dd671ecfdf59e79d740abf278cd9a7250efcf790f632d9ff6b08bf82dff96292c45c3424be9dc290bb39c3bf329c853e02e0ae3f7bb213b
-DIST blueman-2.2.5.tar.xz 1575260 BLAKE2B 9e26b3406114b1dd3257bcfd0850bf16385ac3eb2fcd89097e3a0464099b7c64eb4cf1f5cd7630a8387fd258b4b0bf8bc52f01c5da480e543bd11346995392c2 SHA512 265a9286ac943a41f78b587a93e8759ca87b49fcda5a7b34ce520d9e0aee8e6335a1219f46d1c3d9bd3f07be15913b5c4bc101daaa5e9e5b380703733c021a35
-DIST blueman-2.3.1.tar.xz 1606200 BLAKE2B 6f4528e827824884c763da81aff9642e442c3b8e465f9c2dfae9e63de409956e946ba3f939a64ae68f0d05df11e49927daab2af189e8605ccc5e4897ca8fb7ab SHA512 04adbb3eff4571cf105cad2769d7ad8e4055112a7e1b3c1152b300e72534621647cc6a0f284915cc2d3c642b8c1acf825c8c9a0227dbb617fa9071a534f0562c
 DIST blueman-2.3.2.tar.xz 1575412 BLAKE2B 25fbed432e103a46840dc10d73bce4e8e7a5e7ea623dbb3a50c420d166af7eb0eff046d0fd9986869055fbb4c3f8563920fb840f8f74f37a05b6680434f13dc5 SHA512 13760def19951bcb4582dbe142259256826a0f50e6c34e56c61c6f890f4e2e08085733f2480ad4c95ee52ec616cbb7ddd3a946634f042d80692cd37b57207cc0
-EBUILD blueman-2.2.5.ebuild 2950 BLAKE2B 8071f39d07ae5cdaadb1ad6816f59b1ba7edf44ba948c6e7023e9ff1dc1a9142599f8444e030d7ea2a6f9b09040d4183a80c03cb80f227e63efdeb6a51537a12 SHA512 f1944cae88a696507860c57208e13a1fb4c08c635136748d746cabd3b9779a5adb887db2d1df4e976e94ae0b474de05eecaca5c775d83c96e4a77218eaf75aad
-EBUILD blueman-2.3.1.ebuild 2880 BLAKE2B d1611763012c14689ebf21e71a331d05c0caf5c16cd952bce8392e9129f3ee98605d0a756a9b77bdc7b075824f4e3c35ba235bf9f0a9ec837b6369d22fdae60a SHA512 037cd93fdd1ac6f9db9421ec0632d1f4c746cc23a42e9ea868e7d217928cff809b25553f719d984e10c4a5d15cdcccc5f2d0266d6b93499c1ad47a4b14a6e706
 EBUILD blueman-2.3.2.ebuild 3158 BLAKE2B 31d7141e0ab38c752b71dfab627a6a3f9f7a140eeee10a0462a98b5475ef5415762c6a3e6d1fb24c4f919297fb9307b32532577719d0dd41b8fbb5fc833bbf6a SHA512 f06c1cedeec2012d38e13bdf52afebc191254c4093910903b5821d7566e65dd0e1e20453cbe23fde483164c491765797a2e49bdc26efe4bacb376493faf5b85f
 EBUILD blueman-9999.ebuild 3164 BLAKE2B 84b9a5a5271142d683423e032d1558437320c132200274d4d6da9798f1d06631f9d8efd0c706e48ef55492b58b3c19c13f380adad54149ebe5a8f0d959432a39 SHA512 61616ae0a28902de96e263356e2861851845cb93c50380bfb4f3a3e553b3d65d75ced60974685c8401df96a2537fea96011718c47b7af78840742186fd6f0cf6
 MISC metadata.xml 499 BLAKE2B 54e6fc4cc7b9922abf5a8bae572c282bded5bce21add03e418effeb5009ce7700a3fbede5f132638aa934b71b0898310e1b8315c48a76216045d56e53c7cf1dc SHA512 30e120ce07c4b4bfc278dfcfcad987bf878ed1ebc0ec92d859cf943270c439cdf717b5a9f01ee36399a64743c98aa73f9cd91db4fc85e0c0cf6b73c75d62a817
diff --git a/net-wireless/blueman/blueman-2.2.5.ebuild b/net-wireless/blueman/blueman-2.2.5.ebuild
deleted file mode 100644
index 3ea5b21469db..000000000000
--- a/net-wireless/blueman/blueman-2.2.5.ebuild
+++ /dev/null
@@ -1,142 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit autotools gnome2-utils linux-info python-single-r1 systemd xdg-utils
-
-DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
-HOMEPAGE="https://github.com/blueman-project/blueman/"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-else
-	SRC_URI="
-		https://github.com/blueman-project/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz
-	"
-	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="amd64 arm arm64 ppc ppc64 ~riscv x86"
-fi
-
-# icons are GPL-2
-# source files are mixed GPL-3+ and GPL-2+
-LICENSE="GPL-3+ GPL-2"
-SLOT="0"
-IUSE="appindicator network nls policykit pulseaudio"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=net-wireless/bluez-5:=
-	${PYTHON_DEPS}"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_USEDEP}]
-	')
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )"
-RDEPEND="${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_USEDEP}]
-	')
-	sys-apps/dbus
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	|| (
-		x11-themes/adwaita-icon-theme
-		x11-themes/faenza-icon-theme
-		x11-themes/mate-icon-theme
-	)
-	appindicator? (
-		dev-libs/libappindicator:3[introspection]
-	)
-	network? (
-		net-firewall/iptables
-		|| (
-			sys-apps/net-tools
-			sys-apps/iproute2
-		)
-		|| (
-			net-dns/dnsmasq
-			net-misc/dhcp
-			>=net-misc/networkmanager-0.8
-		)
-	)
-	policykit? (
-		sys-auth/polkit
-	)
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio-daemon[bluetooth]
-			media-video/pipewire[bluetooth]
-			<media-sound/pulseaudio-15.99.1[bluetooth]
-			media-sound/pulseaudio-modules-bt
-		)
-	)
-"
-
-pkg_pretend() {
-	if use network; then
-		local CONFIG_CHECK="
-			~BRIDGE
-			~IP_NF_IPTABLES
-			~IP_NF_NAT
-			~IP_NF_TARGET_MASQUERADE
-		"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	default
-	[[ ${PV} == 9999 ]] && eautoreconf
-}
-
-src_configure() {
-	local myconf=(
-		--disable-runtime-deps-check
-		--disable-static
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
-		$(use_enable appindicator)
-		$(use_enable policykit polkit)
-		$(use_enable nls)
-		$(use_enable pulseaudio)
-		# thunar integration is a single data file with no extra deps
-		# so install it unconditionally
-		--enable-thunar-sendto
-	)
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-
-	if use policykit; then
-		# Allow users in plugdev group to modify connections
-		insinto /usr/share/polkit-1/rules.d
-		doins "${FILESDIR}/01-org.blueman.rules"
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/net-wireless/blueman/blueman-2.3.1.ebuild b/net-wireless/blueman/blueman-2.3.1.ebuild
deleted file mode 100644
index 997963609ec2..000000000000
--- a/net-wireless/blueman/blueman-2.3.1.ebuild
+++ /dev/null
@@ -1,141 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_SINGLE_IMPL=1
-DISTUTILS_USE_PEP517=no
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit autotools distutils-r1 gnome2-utils linux-info systemd xdg-utils
-
-DESCRIPTION="Simple and intuitive GTK+ Bluetooth Manager"
-HOMEPAGE="https://github.com/blueman-project/blueman/"
-
-if [[ ${PV} == "9999" ]] ; then
-	inherit git-r3
-	EGIT_REPO_URI="https://github.com/blueman-project/blueman.git"
-else
-	SRC_URI="
-		https://github.com/blueman-project/blueman/releases/download/${PV/_/.}/${P/_/.}.tar.xz
-	"
-	S=${WORKDIR}/${P/_/.}
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
-fi
-
-# icons are GPL-2
-# source files are mixed GPL-3+ and GPL-2+
-LICENSE="GPL-3+ GPL-2"
-SLOT="0"
-IUSE="network nls policykit pulseaudio"
-
-DEPEND="
-	$(python_gen_cond_dep '
-		dev-python/pygobject:3[${PYTHON_USEDEP}]
-	')
-	>=net-wireless/bluez-5:=
-"
-BDEPEND="
-	$(python_gen_cond_dep '
-		dev-python/cython[${PYTHON_USEDEP}]
-	')
-	virtual/pkgconfig
-	nls? ( sys-devel/gettext )
-"
-RDEPEND="
-	${DEPEND}
-	$(python_gen_cond_dep '
-		dev-python/pycairo[${PYTHON_USEDEP}]
-	')
-	sys-apps/dbus
-	x11-libs/gtk+:3[introspection]
-	x11-libs/libnotify[introspection]
-	|| (
-		x11-themes/adwaita-icon-theme
-		x11-themes/faenza-icon-theme
-		x11-themes/mate-icon-theme
-	)
-	network? (
-		net-firewall/iptables
-		|| (
-			sys-apps/net-tools
-			sys-apps/iproute2
-		)
-		|| (
-			net-dns/dnsmasq
-			net-misc/dhcp
-			>=net-misc/networkmanager-0.8
-		)
-	)
-	policykit? (
-		sys-auth/polkit
-	)
-	pulseaudio? (
-		|| (
-			media-sound/pulseaudio-daemon[bluetooth]
-			media-video/pipewire[bluetooth]
-			<media-sound/pulseaudio-15.99.1[bluetooth]
-			media-sound/pulseaudio-modules-bt
-		)
-	)
-"
-
-pkg_pretend() {
-	if use network; then
-		local CONFIG_CHECK="
-			~BRIDGE
-			~IP_NF_IPTABLES
-			~IP_NF_NAT
-			~IP_NF_TARGET_MASQUERADE
-		"
-		check_extra_config
-	fi
-}
-
-pkg_setup() {
-	python-single-r1_pkg_setup
-}
-
-src_prepare() {
-	[[ ${PV} == 9999 ]] && eautoreconf || eautomake
-	distutils-r1_src_prepare
-}
-
-python_configure() {
-	local myconf=(
-		--disable-runtime-deps-check
-		--disable-static
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		--with-systemduserunitdir="$(systemd_get_userunitdir)"
-		--with-dhcp-config="/etc/dhcp/dhcpd.conf"
-		$(use_enable policykit polkit)
-		$(use_enable nls)
-		$(use_enable pulseaudio)
-		# thunar integration is a single data file with no extra deps
-		# so install it unconditionally
-		--enable-thunar-sendto
-	)
-	econf "${myconf[@]}"
-}
-
-python_install() {
-	default
-
-	if use policykit; then
-		# Allow users in plugdev group to modify connections
-		insinto /usr/share/polkit-1/rules.d
-		doins "${FILESDIR}/01-org.blueman.rules"
-	fi
-
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	gnome2_schemas_update
-}
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index 9473c523657a..5957f0af771d 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index a52e66b3f224..fde6c582e2ce 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -7919,7 +7919,7 @@ sys-apps/pciutils:zlib - Support compressed pci.ids database
 sys-apps/pcmciautils:staticsocket - Add support for static sockets
 sys-apps/pcsc-lite:embedded - limit RAM and CPU ressources by disabling features
 sys-apps/pcsc-lite:libusb - Use dev-libs/libusb detection to hotplug new smartcard readers. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use sys-fs/udev.
-sys-apps/pcsc-lite:policykit - Uses sys-auth/polkit to restrict access to smartcard readers or smartcars to given users.
+sys-apps/pcsc-lite:policykit - Uses sys-auth/polkit to restrict access to smartcard readers or smartcards to given users.
 sys-apps/pcsc-lite:udev - Use virtual/libudev rules to handle devices' permissions and hotplug support. Unless you know what you're doing do not disable this flag on Linux kernels. This is provided as an option for completeness.
 sys-apps/pcsc-tools:network-cron - Monthly cronjob the update-smartcard_list script
 sys-apps/plocate:io-uring - Enable efficient I/O via sys-libs/liburing.
diff --git a/sci-libs/Manifest.gz b/sci-libs/Manifest.gz
index ebf7df5e2c78..3b77434ccb59 100644
--- a/sci-libs/Manifest.gz
+++ b/sci-libs/Manifest.gz
diff --git a/sci-libs/caffe2/Manifest b/sci-libs/caffe2/Manifest
index 67845501bc2e..018dbc0b25a0 100644
--- a/sci-libs/caffe2/Manifest
+++ b/sci-libs/caffe2/Manifest
@@ -1,7 +1,8 @@
 AUX caffe2-1.11.0-gentoo.patch 4842 BLAKE2B aab88c5abb64aad74d5c6119dbf6a1e72c3221d9b05e6b8e164f816c2798590f001b6cb3155b5e3bccc03a6a68c4ec9be0dd235de08127959b9adbbc7590a1b5 SHA512 b9498623aead8d5a3096e42adf896f0533903544cde4a1bb9fbb41c83a7921ff25c6c7ef458a280a506bc1555c0519b530a844cd4e537dcf778a2fe50bff50e6
+AUX caffe2-1.12.0-glog-0.6.0.patch 957 BLAKE2B f795e75fd889b888f48e3c7187ba96afb34c6c1bdad3a1726b538b04642e836afef5c0906ba606b6c1966d3c8ab1efc11ff093457b91e403b0b53c91dc962c0f SHA512 7189e27cff8a472a55599a7d26b5bdb64e58b07faa03e9a729c8fa643e4d5a45d43bc8b3b38bd230205c56a3c7c56d8e2d509fa10efc8377615d0d358d00b263
 AUX caffe2-1.12.0-install-dirs.patch 7214 BLAKE2B 16571277e481d71ed63e71793b0aa3179de1ab9fe86483f5af3f6b13cb1eef188925b92579a84989429315edffc9189b25603fb478e505b76bf2923f7aa00566 SHA512 3c247897d0c2471d7c79b0ba05a8786807ff466f3e9c3388175df29c49b5498b0a0e6f3aefea68a8dd36b3fdec3e561799f5d664f8125b6846d00e5f05ced16d
 DIST pytorch-1.11.0.tar.gz 20719323 BLAKE2B 24e7aaa2c26821d36f8092542de9d8d5ac85a619fb9fffb5131987958842afb1cad395780662d15f3411a7cc6ff83a445871960eca1e469fcbf0b9895d83d6e0 SHA512 2342eb7a1a241f5855a7cf12e11f62bc4baaa78d1d0864e53bfc946e783eb4addd05ca154a814d2376cd602098b5547e61c158d6eddb7cad5a9f3b0c1357adca
 DIST pytorch-1.12.0.tar.gz 106286765 BLAKE2B ff9bafedb35f859f7dccb9b606299cf9c345bdaa0deb87ecfe0c0c30c3c828414d989e1d9a243d9b7cd3f376d56a2f81c241ca2e3c9a8a2b30cddcdeddd3a5c7 SHA512 c9c748a2e0047daaaf199a1ba3198d2d1aee47f664170a9b34ccacd3deeb95f2070e4035eeb900012ef48dc62cf6fb6806f1a1dfe22de8c94892963076e593b7
 EBUILD caffe2-1.11.0-r2.ebuild 4129 BLAKE2B c6c24a81a6ac13e4d0b3601bcdb15656ca4f522fedb9f2c04d2e00fc0639043dc84c7a60a336bf3929e75fb2844e0a6fe632e67d70507ac622b32381b3b3a5dc SHA512 3fa1271831a3d8207e2bb2c1bea79bd16a5590981c0e9d81cee4ce8cb09dbe7bbdf21cc3b88030a04df3025a7de5b6413af81043b888c8b2511d396b0f484e7d
-EBUILD caffe2-1.12.0.ebuild 4138 BLAKE2B adfcd1f830c28990784e56bfc45212cb9dabb0ef56f6c614ace9e2a4de480fe1abacee7a9d295b52f2d8c1ab55e07f1a137f630be0ba050507783c3228291329 SHA512 23d0c33dc58780639f547d31ca5a56bc587a4b95d26e871c8ba77c7690a5e9ede76f43ad203b05094b6a5a658e1b233e9597a9e329b01df6dc013b14addf86b7
+EBUILD caffe2-1.12.0.ebuild 4176 BLAKE2B e898cd93b5b034497d67458ce12238d7bb3192958ba21c1d1a95e76ce4f1c3a5278b355b094ea7d791666f681bd110bb67d08fc55cfae033cdd226f84d95b6b2 SHA512 ec7da2fd7b86f375c14d6ed27b770e0cb2c3e53c5e17fef846d01833344a0216b79d027badb02429488bb8c126df428588d3bb1cb192b769b885529c3c59394d
 MISC metadata.xml 961 BLAKE2B 7e0924bce6c952cf8b5e997a50e11aad18d572060087ab877d9600399712a6e46f7bee9938aef6b7af142de21046c1cbe541302a68a20072d1040e7b084b202c SHA512 9ff387a4d11eb83799665e38690f0c668ea6147ab92cc8fd68d4fb60590e51863d4530b885f71bd660429c6d38e573a2a7d8fca5e0139b82111ab05cb61b67d9
diff --git a/sci-libs/caffe2/caffe2-1.12.0.ebuild b/sci-libs/caffe2/caffe2-1.12.0.ebuild
index 08e81ce1c8ab..0a44b6824c3c 100644
--- a/sci-libs/caffe2/caffe2-1.12.0.ebuild
+++ b/sci-libs/caffe2/caffe2-1.12.0.ebuild
@@ -27,7 +27,7 @@ REQUIRED_USE="
 RDEPEND="
 	${PYTHON_DEPS}
 	dev-cpp/gflags:=
-	<dev-cpp/glog-0.5.0
+	>=dev-cpp/glog-0.5.0
 	dev-libs/cpuinfo
 	dev-libs/libfmt
 	dev-libs/protobuf
@@ -66,6 +66,7 @@ S="${WORKDIR}"/${MYP}
 PATCHES=(
 	"${FILESDIR}"/${PN}-1.11.0-gentoo.patch
 	"${FILESDIR}"/${PN}-1.12.0-install-dirs.patch
+	"${FILESDIR}"/${P}-glog-0.6.0.patch
 )
 
 src_prepare() {
diff --git a/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch b/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch
new file mode 100644
index 000000000000..a821ebedf7b7
--- /dev/null
+++ b/sci-libs/caffe2/files/caffe2-1.12.0-glog-0.6.0.patch
@@ -0,0 +1,29 @@
+https://github.com/pytorch/pytorch/issues/58054
+
+--- /c10/util/Logging.cpp
++++ /c10/util/Logging.cpp
+@@ -192,23 +192,13 @@
+     google::GLOG_WARNING,
+     "The minimum log level that caffe2 will output.");
+ 
+-// Google glog's api does not have an external function that allows one to check
+-// if glog is initialized or not. It does have an internal function - so we are
+-// declaring it here. This is a hack but has been used by a bunch of others too
+-// (e.g. Torch).
+-namespace google {
+-namespace glog_internal_namespace_ {
+-bool IsGoogleLoggingInitialized();
+-} // namespace glog_internal_namespace_
+-} // namespace google
+-
+ namespace c10 {
+ namespace {
+ 
+ void initGoogleLogging(char const* name) {
+ #if !defined(_MSC_VER)
+   // This trick can only be used on UNIX platforms
+-  if (!::google::glog_internal_namespace_::IsGoogleLoggingInitialized())
++  if (!::google::IsGoogleLoggingInitialized())
+ #endif
+   {
+     ::google::InitGoogleLogging(name);
diff --git a/sys-apps/Manifest.gz b/sys-apps/Manifest.gz
index ac65912deaf3..326c076b721f 100644
--- a/sys-apps/Manifest.gz
+++ b/sys-apps/Manifest.gz
diff --git a/sys-apps/pcsc-lite/Manifest b/sys-apps/pcsc-lite/Manifest
index 90f559f89f63..7091c230bfbd 100644
--- a/sys-apps/pcsc-lite/Manifest
+++ b/sys-apps/pcsc-lite/Manifest
@@ -8,4 +8,4 @@ DIST pcsc-lite-1.9.7.tar.bz2 784685 BLAKE2B 74848b06ce9e497287cc4a8f307a194d7660
 DIST pcsc-lite-1.9.8.tar.bz2 787198 BLAKE2B ba7297e567e5ad7fdb8041d6cddd61e772795d725d91be7f041493a2404a42acf51b41a4e0e82765f4d2a93517d8d9345abd7520dc03eeb48d2eb83bb6082390 SHA512 6275eee849c5572264f5a1ef1ea2a2db5fec9c4129b348bd6e2c1d4444c46c945b8ecab682c003913e9d06da7034b383199b6e392ae178ffae296017e7c61812
 EBUILD pcsc-lite-1.9.7.ebuild 3189 BLAKE2B 08e57b481cd8219db76426a7a147a4394f7f51cc78a590db1bdcc163fda46f82d0af43dabfad5e013f6862f83beb5a7ec1e47d8247a36bd8bcf0f6b47b440ea7 SHA512 274c12d4a46365abe5cf8e971b5c8d5e439fbaaf622d5431491e6c4058d9fcd577928da8e30282a6ca7086e3140dd54b991344a7989bde625d3cb0d833960f41
 EBUILD pcsc-lite-1.9.8-r2.ebuild 3342 BLAKE2B c780d5297f180ed52338238bfc6a21ec678ee72217f7b1339b6cb5604b989434f0c875ac56f911ccfe6ad3645e8374c85b6cc9b5c015e55f29cf879d0c3d143b SHA512 876846379bca56a1e4f6d44c3715102876f9aade1c66cbd737647011eb0f32600572a16b2b1b44e77165c57e62eb414e670386ad58d64cdc110125e0bcb788fe
-MISC metadata.xml 1083 BLAKE2B 8dc3fe1bbd660b4ea9db99fb8f82b905843d96005928f42aa4007e13aa6e0a75af83f1552b434136c8584b98ddae6a0c68776fbb1096da29433864536405fdf3 SHA512 da7d9e3842429795970dd73ffab39e031188e6fd585d144e6348007c55eeb67dcb8e5e04aea1115796f73ff1d455887e0c00301da2b9e689551fef8144c2f388
+MISC metadata.xml 994 BLAKE2B 93862f4aa5c8309085ee36de6a3193318e7df44ab6f49f747078c6ffba264852398d104bb88a417b6323cfc43d3237f7ae49e618454b9472ae400c3d40c6e3a1 SHA512 903810535c610f16747f4b834f465de0bfba7f46ebde972b0ece8346a9e597403bd096804d0a6fdb233cd8ad1315495cbaf4761605501753eaffc55768bfcf46
diff --git a/sys-apps/pcsc-lite/metadata.xml b/sys-apps/pcsc-lite/metadata.xml
index 89c249b983a5..3b021870daba 100644
--- a/sys-apps/pcsc-lite/metadata.xml
+++ b/sys-apps/pcsc-lite/metadata.xml
@@ -1,29 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-<maintainer type="person">
-        <email>zlogene@gentoo.org</email>
-        <name>Mikle Kolyada</name>
-</maintainer>
-  <use>
-    <flag name="embedded">limit RAM and CPU ressources by disabling features</flag>
-    <flag name="libusb" restrict="&gt;=sys-apps/pcsc-lite-1.8.0">
-      Use <pkg>dev-libs/libusb</pkg> detection to hotplug new
-      smartcard readers. This flag should only be enabled if you're
-      running a non-Linux kernel or you don't want to use
-      <pkg>sys-fs/udev</pkg>.
-    </flag>
-
-    <flag name="udev">
-      Use <pkg>virtual/libudev</pkg> rules to handle devices' permissions
-      and hotplug support. Unless you know what you're doing do not
-      disable this flag on Linux kernels. This is provided as an
-      option for completeness.
-    </flag>
-
-    <flag name="policykit">
-      Uses <pkg>sys-auth/polkit</pkg> to restrict access to smartcard readers or
-      smartcars to given users.
-    </flag>
-  </use>
+	<maintainer type="project">
+		<email>base-system@gentoo.org</email>
+		<name>Gentoo Base System</name>
+	</maintainer>
+	<use>
+		<flag name="embedded">limit RAM and CPU ressources by disabling features</flag>
+		<flag name="libusb" restrict="&gt;=sys-apps/pcsc-lite-1.8.0">Use <pkg>dev-libs/libusb</pkg> detection to hotplug new smartcard readers. This flag should only be enabled if you're running a non-Linux kernel or you don't want to use <pkg>sys-fs/udev</pkg>.</flag>
+		<flag name="udev">Use <pkg>virtual/libudev</pkg> rules to handle devices' permissions and hotplug support. Unless you know what you're doing do not disable this flag on Linux kernels. This is provided as an option for completeness.</flag>
+		<flag name="policykit">Uses <pkg>sys-auth/polkit</pkg> to restrict access to smartcard readers or smartcards to given users.</flag>
+	</use>
 </pkgmetadata>
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 8516bf8bd43d..5314cc4f219c 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty-shell-integration/Manifest b/x11-terms/kitty-shell-integration/Manifest
index 8b29653f414b..89cd1ff051e1 100644
--- a/x11-terms/kitty-shell-integration/Manifest
+++ b/x11-terms/kitty-shell-integration/Manifest
@@ -1,6 +1,8 @@
 DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6
 DIST kitty-0.26.1.tar.xz 4716836 BLAKE2B 1369fe3bb13fc5fb134c5b45f179ddd60b4edb61243d88aa08d8b414b4153b17e5c739859c9ed2db366e096db1b07e207cbef715d95787722037ddf5854582e1 SHA512 ed270c84078acb33921506296c476ada5f19fb33344047c7dad5b2d7b697c2111e2925dc391eb4927a05ef82ae583b35db5eee53e148e3e4d71ce942a1deade2
+DIST kitty-0.26.2.tar.xz 4716932 BLAKE2B fbbd1bbeb42bfb5be1348ead4605d45f93a90e31e707444c901b9f4c20b42d470c1e3cec9e0f135f04ad49bb472824fb7445932403127e8cbc639b5dac6ee982 SHA512 4bfb3d9438bb018dc10503be610df4e6e8bb1f9459b5131f46fde6279ba5423e44dbbcb86a2dc2602ee208266edc78074f6496e99761cf43f7081ea9e88175f7
 EBUILD kitty-shell-integration-0.25.2.ebuild 1476 BLAKE2B d07578dfe48ab8aa3ff01b4ed91e0e9e1d357f00d0931d2a4beaa8659c843b130108ce925bb37fdb4679048e1d9bd90a64aaa95150eabb3e6c9b195e504a1bc3 SHA512 0f74797060755fdf9430efbbe5e7d56182b38dafd1d9c8bbf25d01e932e1bc95fb5e774064667b66f8beb8ab1e0772174746506bb9b156b88131dd23a14d82c4
 EBUILD kitty-shell-integration-0.26.1.ebuild 1478 BLAKE2B c9751a6a82bf10a629f06b6099dec2b6d08c0e4d961e6c8105ce7e975e849161bb09a8990a0ed971f96e4ea0787b87e64074d705e807fba6dbef3c3494ea495b SHA512 7f5f6d48619adeb300727cc9b30ef97403a2f6da00a45661cb8cec489ea9ccab02a48ba502d8099175342d832ec9ad98f82aff87bf5ef5d1df50ab7971d8fcea
+EBUILD kitty-shell-integration-0.26.2.ebuild 1478 BLAKE2B c9751a6a82bf10a629f06b6099dec2b6d08c0e4d961e6c8105ce7e975e849161bb09a8990a0ed971f96e4ea0787b87e64074d705e807fba6dbef3c3494ea495b SHA512 7f5f6d48619adeb300727cc9b30ef97403a2f6da00a45661cb8cec489ea9ccab02a48ba502d8099175342d832ec9ad98f82aff87bf5ef5d1df50ab7971d8fcea
 EBUILD kitty-shell-integration-9999.ebuild 1403 BLAKE2B 9f1e4aebc1103678d42ba5809c41848b2ace36e2ed0137bdb0f30048cb4372c61f80e509a8087a52b149fe25115ca8aaa511d4697459e1087bee65788055dd85 SHA512 d7674435c3d3d9cfd04d47889f9e0f1cb4e60a6dc3506529829b3782e958fc3cb18fe8b0a25463725128106d6ca8308a17ae961b184e13682a1b05852e22ce4e
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.2.ebuild b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.2.ebuild
new file mode 100644
index 000000000000..4c3e987c411b
--- /dev/null
+++ b/x11-terms/kitty-shell-integration/kitty-shell-integration-0.26.2.ebuild
@@ -0,0 +1,37 @@
+# Copyright 2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Shell integration scripts for kitty, a GPU-based terminal emulator"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
+S="${WORKDIR}/kitty-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+RESTRICT="test" # intended to be ran on the full kitty package
+
+src_compile() { :; }
+
+src_install() {
+	# install the whole directory in the upstream suggested location
+	# for consistency (i.e. less variation between distros if someone
+	# ssh into Gentoo), then set symlinks to autoload where possible
+	# (these exit immediately if KITTY_SHELL_INTEGRATION is unset)
+	insinto /usr/share/kitty
+	doins -r shell-integration
+
+	dosym -r {/usr/share/kitty/shell-integration/bash,/etc/bash/bashrc.d}/kitty.bash
+
+	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_completions.d/kitty.fish
+	dosym -r /usr/share/{kitty/shell-integration/fish,fish}/vendor_conf.d/kitty-shell-integration.fish
+
+	dosym -r /usr/share/{kitty/shell-integration/zsh/completions,zsh/site-functions}/_kitty
+	# zsh integration is handled automatically without needing to modify rc files,
+	# but may require user intervention depending on zsh invocation or if remote
+
+	# this is used internally by the ssh kitten and is not useful there
+	rm -r "${ED}"/usr/share/kitty/shell-integration/ssh || die
+}
diff --git a/x11-terms/kitty-terminfo/Manifest b/x11-terms/kitty-terminfo/Manifest
index 1de853f586e9..dcca232822cc 100644
--- a/x11-terms/kitty-terminfo/Manifest
+++ b/x11-terms/kitty-terminfo/Manifest
@@ -1,6 +1,8 @@
 DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59d5777634a5f193cc0544743295a772de85c64b4657e2cbca3d88f77019b0fe26b25c8b0908c1cc108b480ecf6 SHA512 ac858b525abbdeb137989a7971c51651d46bffedde048ed572bbb4c31119a4e0f9f424edbdbfd14fe2e043b4a7c8a1a1f8ee6591906e40a655d9f783b21f31a6
 DIST kitty-0.26.1.tar.xz 4716836 BLAKE2B 1369fe3bb13fc5fb134c5b45f179ddd60b4edb61243d88aa08d8b414b4153b17e5c739859c9ed2db366e096db1b07e207cbef715d95787722037ddf5854582e1 SHA512 ed270c84078acb33921506296c476ada5f19fb33344047c7dad5b2d7b697c2111e2925dc391eb4927a05ef82ae583b35db5eee53e148e3e4d71ce942a1deade2
+DIST kitty-0.26.2.tar.xz 4716932 BLAKE2B fbbd1bbeb42bfb5be1348ead4605d45f93a90e31e707444c901b9f4c20b42d470c1e3cec9e0f135f04ad49bb472824fb7445932403127e8cbc639b5dac6ee982 SHA512 4bfb3d9438bb018dc10503be610df4e6e8bb1f9459b5131f46fde6279ba5423e44dbbcb86a2dc2602ee208266edc78074f6496e99761cf43f7081ea9e88175f7
 EBUILD kitty-terminfo-0.25.2.ebuild 618 BLAKE2B f28c7bc4aff671b8f2df8094f8abd881b9bfe0580fd84e302fea050235f5932c34636e407d87afb34ee1fe2e7006e1dc1a1902d9a914cfe4aa7372fb7d18d368 SHA512 971734b7d326df234fff57c14a17ce6da9e9f97dc86ea412b9521c76e0c06fceadffcb708db781d85d5529a6ec9c829dcd5f8210c36c06b73f6ce05b9be729b3
 EBUILD kitty-terminfo-0.26.1.ebuild 620 BLAKE2B 84d17d934610d200dd4d556462255c9f6ee5fa90553b81db4dc764a9bb4026d74b874f19ef92e3aeaaaf2856021870199518b66e633212896aa5b9d4f5255b8a SHA512 a9dca5ba4c276df302fb5df4507294bdac4609398ed441b242dba8459d2d58306c29a49373278f428c1d86a3e9e426f3605153252aebe9bfac5af00e088fac18
+EBUILD kitty-terminfo-0.26.2.ebuild 620 BLAKE2B 84d17d934610d200dd4d556462255c9f6ee5fa90553b81db4dc764a9bb4026d74b874f19ef92e3aeaaaf2856021870199518b66e633212896aa5b9d4f5255b8a SHA512 a9dca5ba4c276df302fb5df4507294bdac4609398ed441b242dba8459d2d58306c29a49373278f428c1d86a3e9e426f3605153252aebe9bfac5af00e088fac18
 EBUILD kitty-terminfo-9999.ebuild 545 BLAKE2B 50bf783694580b016f3291640d6c4ab3e8ee335f78d13b75cb7ebe6628ddd2f244fab2e7c465a3964ed6b5e0ebbdb144c739a01ffa7239c8518503ea107a52f2 SHA512 267b8b4a526ee22159f7c1c0d9a089e183308e1e7f61d775834e4ed5d4f25be7aac8cc3db4afa3c3f1e933159f27abff25c31989dd6478c1727eec590bf0a3c8
 MISC metadata.xml 610 BLAKE2B 29a121e206c4a21965f03cac1b01314dc32384eb617e9c188814f2c9a8896d10cb299aa4ef7fec74c5a74c966069355d291fe23d9f37b2cbb3d34ebb24850f81 SHA512 867c3bfc752f53287bea2f027a949bb433cd069f5480a5197986371db6dac4524577bf1503259a4fb4f6832ec7c860a5f2b4ac495a17c6a19fee5c62a70e6892
diff --git a/x11-terms/kitty-terminfo/kitty-terminfo-0.26.2.ebuild b/x11-terms/kitty-terminfo/kitty-terminfo-0.26.2.ebuild
new file mode 100644
index 000000000000..35ff98034a87
--- /dev/null
+++ b/x11-terms/kitty-terminfo/kitty-terminfo-0.26.2.ebuild
@@ -0,0 +1,23 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="Terminfo for kitty, a GPU-based terminal emulator"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+SRC_URI="https://github.com/kovidgoyal/kitty/releases/download/v${PV}/kitty-${PV}.tar.xz"
+S="${WORKDIR}/kitty-${PV}"
+
+LICENSE="GPL-3"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64 ~x86"
+RESTRICT="test" # intended to be ran on the full kitty package
+
+BDEPEND="sys-libs/ncurses"
+
+src_compile() { :; }
+
+src_install() {
+	dodir /usr/share/terminfo
+	tic -xo "${ED}"/usr/share/terminfo terminfo/kitty.terminfo || die
+}
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index 566922cad1ca..2f2e2bc1b16a 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -3,7 +3,10 @@ DIST kitty-0.25.2.tar.xz 4681940 BLAKE2B 9aa43711c833541f364100465dfd1c13251ed59
 DIST kitty-0.25.2.tar.xz.sig 566 BLAKE2B 38435c7c418b421321ad29e1935f2280b1df215cb95b1025b3c85a0cc7e3279f1a0f79b05af9c698d4121a4f2e23a81774406a3ba77d0b5e669a36e1e58621b6 SHA512 cc16d4d22c043a30d9712cee211b4560873aa3e6ddc799881c791c72c6a4bfb7822a01683c62afcf67814889dfbc312d9f8b1f2200ab7f89a937addbf76c99b9
 DIST kitty-0.26.1.tar.xz 4716836 BLAKE2B 1369fe3bb13fc5fb134c5b45f179ddd60b4edb61243d88aa08d8b414b4153b17e5c739859c9ed2db366e096db1b07e207cbef715d95787722037ddf5854582e1 SHA512 ed270c84078acb33921506296c476ada5f19fb33344047c7dad5b2d7b697c2111e2925dc391eb4927a05ef82ae583b35db5eee53e148e3e4d71ce942a1deade2
 DIST kitty-0.26.1.tar.xz.sig 566 BLAKE2B 9cc653d0bb5fb2d46b82d1320a4273402af371783cc6469bd2a8f472dd03a25fa3d6cd0e9b47fedbd733713f422b73106069c66368a4b4a8c07c848050cc4e31 SHA512 2cb03e74e7c8a02a8aca8006662a174bff9ef511140340988dd0a079504e1ca665c927a78f5ddc59c243e92df9cf68d0a531b388ecf148901a855bdef2489ded
+DIST kitty-0.26.2.tar.xz 4716932 BLAKE2B fbbd1bbeb42bfb5be1348ead4605d45f93a90e31e707444c901b9f4c20b42d470c1e3cec9e0f135f04ad49bb472824fb7445932403127e8cbc639b5dac6ee982 SHA512 4bfb3d9438bb018dc10503be610df4e6e8bb1f9459b5131f46fde6279ba5423e44dbbcb86a2dc2602ee208266edc78074f6496e99761cf43f7081ea9e88175f7
+DIST kitty-0.26.2.tar.xz.sig 566 BLAKE2B 4f36d131143ad4c1ea3dbdd7b094cbfd7ece133e573ec95714d5b778a80cb58b3b89ab02f575442aaf1618985e37528285009bb724721e5d48b1ffc611175672 SHA512 8ec0f237eb0b9f868ea703ab8b5cb85405f9360ad8e7402a0e5a3c4f3268a5a127359a9444c0e7cf05f364ea5dfeb31f9657a110fadc34bb6ed870ef939a4ada
 EBUILD kitty-0.25.2.ebuild 3564 BLAKE2B a1399f7f37f98dff758acdb95099abea500b529dff0be0b7a2d37f40b1f3373c4a5b4527a846b89cd194cf01eb52122e3487446066bdcae317f1ae399cfea167 SHA512 b37438a48ae27c198a9e7be0f8d8b3f3735b77329939630122601013d57fea8e9e4d7d821601ca3444bb15526c2afdc7ae0b3aace48a1305d78df7a0a0b4e909
 EBUILD kitty-0.26.1.ebuild 3605 BLAKE2B ffb55f025d3b07b00a2c3a4991dfb2f0263dae8f141c24d4d62430e67c22ad09c58f67c23315ae1bd2f1c212ae813ba21e63615f351187a01f7a8c2dce4a2011 SHA512 f85eab66363333c06a7977a99bd282b24183890f9ace2b677c72cb6b3e1a77a2509954d94e077f0ef4797344ea472d94fe2e4fc9770de3d05ded09ea87a340d0
+EBUILD kitty-0.26.2.ebuild 3605 BLAKE2B ffb55f025d3b07b00a2c3a4991dfb2f0263dae8f141c24d4d62430e67c22ad09c58f67c23315ae1bd2f1c212ae813ba21e63615f351187a01f7a8c2dce4a2011 SHA512 f85eab66363333c06a7977a99bd282b24183890f9ace2b677c72cb6b3e1a77a2509954d94e077f0ef4797344ea472d94fe2e4fc9770de3d05ded09ea87a340d0
 EBUILD kitty-9999.ebuild 3605 BLAKE2B ffb55f025d3b07b00a2c3a4991dfb2f0263dae8f141c24d4d62430e67c22ad09c58f67c23315ae1bd2f1c212ae813ba21e63615f351187a01f7a8c2dce4a2011 SHA512 f85eab66363333c06a7977a99bd282b24183890f9ace2b677c72cb6b3e1a77a2509954d94e077f0ef4797344ea472d94fe2e4fc9770de3d05ded09ea87a340d0
 MISC metadata.xml 757 BLAKE2B 5b7786583ac3a7742c1345fb86287e3309eedf7e7110025730c9153dd893bdbd8e340b3a70f99a650d60f3a405c73346fbb2f0465ba2dad820e9fe2506f9963f SHA512 96c3583ce9713803d9892270f9e41cce2cdb75931065637196c002f66e9638f87db52f32a69d37cc6bef5302cb0cd5212178659b217b1df63e253f4bdf759c77
diff --git a/x11-terms/kitty/kitty-0.26.2.ebuild b/x11-terms/kitty/kitty-0.26.2.ebuild
new file mode 100644
index 000000000000..3ee9cbb30121
--- /dev/null
+++ b/x11-terms/kitty/kitty-0.26.2.ebuild
@@ -0,0 +1,131 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..10} )
+inherit edo optfeature multiprocessing python-single-r1 toolchain-funcs xdg
+
+if [[ ${PV} == 9999 ]] ; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/kovidgoyal/kitty.git"
+else
+	inherit verify-sig
+	SRC_URI="
+		https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz
+		verify-sig? ( https://github.com/kovidgoyal/kitty/releases/download/v${PV}/${P}.tar.xz.sig )"
+	VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/kovidgoyal.gpg"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+DESCRIPTION="Fast, feature-rich, GPU-based terminal"
+HOMEPAGE="https://sw.kovidgoyal.net/kitty/"
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="+X test transfer wayland"
+REQUIRED_USE="
+	|| ( X wayland )
+	${PYTHON_REQUIRED_USE}"
+RESTRICT="!X? ( test ) !test? ( test ) !transfer? ( test ) !wayland? ( test )"
+
+# dlopen: fontconfig,libglvnd
+RDEPEND="
+	${PYTHON_DEPS}
+	dev-libs/openssl:=
+	media-libs/fontconfig
+	media-libs/harfbuzz:=
+	media-libs/lcms:2
+	media-libs/libglvnd[X?]
+	media-libs/libpng:=
+	sys-apps/dbus
+	sys-libs/zlib:=
+	x11-libs/libxkbcommon[X?]
+	x11-misc/xkeyboard-config
+	~x11-terms/kitty-shell-integration-${PV}
+	~x11-terms/kitty-terminfo-${PV}
+	X? ( x11-libs/libX11 )
+	transfer? ( net-libs/librsync:= )
+	wayland? ( dev-libs/wayland )"
+DEPEND="
+	${RDEPEND}
+	X? (
+		x11-base/xorg-proto
+		x11-libs/libXcursor
+		x11-libs/libXi
+		x11-libs/libXinerama
+		x11-libs/libXrandr
+	)
+	wayland? ( dev-libs/wayland-protocols )"
+BDEPEND="
+	${PYTHON_DEPS}
+	sys-libs/ncurses
+	virtual/pkgconfig
+	test? ( $(python_gen_cond_dep 'dev-python/pillow[${PYTHON_USEDEP}]') )
+	wayland? ( dev-util/wayland-scanner )"
+[[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
+
+src_prepare() {
+	default
+
+	# seds unfortunately feel easier on maintainenance than patches here
+	sed -e "s/'x11 wayland'/'$(usev X x11) $(usev wayland)'/" \
+		-e "$(usev !X '/gl_libs =/s/=.*/= []/')" \
+		-e "/num_workers =/s/=.*/= $(makeopts_jobs)/" \
+		-e "s/cflags.append.*-O3.*/pass/" -e 's/-O3//' \
+		-i setup.py || die
+
+	if use !transfer; then
+		sed -i 's/rs_cflag =/& []#/;/files.*rsync/d' setup.py || die
+		rm -r kittens/transfer || die
+	fi
+
+	# test relies on 'who' command which doesn't detect users with pid-sandbox
+	rm kitty_tests/utmp.py || die
+
+	# test may fail/hang depending on environment and shell initialization scripts
+	rm kitty_tests/{shell_integration,ssh}.py || die
+
+	# skip docs for live version
+	[[ ${PV} != 9999 ]] || sed -i '/exists.*_build/,/docs(ddir)/d' setup.py || die
+}
+
+src_compile() {
+	tc-export CC
+	export PKGCONFIG_EXE=$(tc-getPKG_CONFIG)
+
+	local conf=(
+		--disable-link-time-optimization
+		--ignore-compiler-warnings
+		--libdir-name=$(get_libdir)
+		--shell-integration="enabled no-rc"
+		--update-check-interval=0
+		--verbose
+	)
+
+	edo ${EPYTHON} setup.py linux-package "${conf[@]}"
+	use test && edo ${EPYTHON} setup.py build-launcher "${conf[@]}"
+
+	[[ ${PV} == 9999 ]] || mv linux-package/share/doc/{${PN},${PF}} || die
+	rm -r linux-package/share/terminfo || die
+}
+
+src_test() {
+	KITTY_CONFIG_DIRECTORY=${T} ./test.py || die # shebang is kitty
+}
+
+src_install() {
+	insinto /usr
+	doins -r linux-package/.
+
+	fperms +x /usr/bin/kitty \
+		/usr/$(get_libdir)/kitty/shell-integration/ssh/{askpass.py,kitty}
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	optfeature "in-terminal image display with kitty icat" media-gfx/imagemagick
+	optfeature "audio-based terminal bell support" media-libs/libcanberra
+	optfeature "opening links from the terminal" x11-misc/xdg-utils
+}
diff --git a/xfce-base/Manifest.gz b/xfce-base/Manifest.gz
index 775f612efaff..ee03aae2eea2 100644
--- a/xfce-base/Manifest.gz
+++ b/xfce-base/Manifest.gz
diff --git a/xfce-base/xfce4-panel/Manifest b/xfce-base/xfce4-panel/Manifest
index 78708117eaa7..9ef39a784500 100644
--- a/xfce-base/xfce4-panel/Manifest
+++ b/xfce-base/xfce4-panel/Manifest
@@ -1,9 +1,5 @@
-DIST xfce4-panel-4.16.4.tar.bz2 1383630 BLAKE2B e370fc286f5b035671e059e81a5c890842949c60a8aa1ae4cb06ded7f1e538d90bf633efd7e3e2b7642eb1b490a48eda3cabd1a967930cb63cd423fb5b807e22 SHA512 a1ad5a528968c4b1a5d2fb1537f7774aeeb525d7cb2f77e261b187b94e9de22f018bbd47d462ce4ad09b360126548d5848e46643df40549f9f8a3c44a4a14564
 DIST xfce4-panel-4.16.5.tar.bz2 1386556 BLAKE2B e0543e2c2259a03b09ddaef951434127a76f176626b5355497c1f27748c83857cb34ed1ddecf694c36e3422ca9e55fa4e7eae728b0b50e06feb40ca6e867ebdc SHA512 d72220fa2812ae3b420350dab4c9d33e01d26d27ba33e4c16ad848ed1915c3c4aaf41fef24e2e7271e31171536148ad32b55aabc3e1facd4bf8a411990fd27bb
-DIST xfce4-panel-4.17.2.tar.bz2 1408821 BLAKE2B db607dc1d35e746608ffe1484f2484589ae81d5d58387c8ae8c9fde9d9fdf0747f6746838290dcf1f6c9f6d1bb3efc130ec14445e6d48ac014bc114afe001f71 SHA512 a1d34d7ecdb196ba7095e613010e576daa809f0a94d48546a27731dc617a26318e7cc72204a26d9f788e744498ba58bc0f2f374260aca9bd2ad697ceddf36bbd
 DIST xfce4-panel-4.17.3.tar.bz2 1428565 BLAKE2B a5a1f44eecd53f3ad5419dfe33aa444318d4808e14b68dcc9c986efc75eb7e9e9da613855ca3b1ec6bd02676ad0707b607911c8fccde5f9b843b8e3c8d991601 SHA512 43b9f258fa0938007e4583130b7498ae01b44ab6631f453cef05f7c2970d71e9adb34cd13ce35eb095d6b3fc5097c604c07881a1e78a9173ec6e6733cfd58cbd
-EBUILD xfce4-panel-4.16.4.ebuild 1505 BLAKE2B 53dccf21ec9f185be56fac924ef8c2746728f154eb93535d4a91bf70a07929ffc6998e0f3765c472a2e2d36d5f8fd981a565ed9837909776ad1e30cb923eefba SHA512 cc50480cd4b67dc69e8b7a84f7a4710c53b2dac803b38130317fa732e0cfc06db7d0a50802ded311768a99c7d67271baa0a33dc09446a9d513be820b3368d764
-EBUILD xfce4-panel-4.16.5.ebuild 1506 BLAKE2B 1daa3c4f44a3e90012ed83d9767044381f5b99eb73afcdf0354092cf146529b3cb17260733930d27d9b01ae5dfc62198c923a0df0dc1e8cf09d4f3c026d59060 SHA512 3bc79b3ca7bec121553cbabb5fb3cc3e561336542d9eabcf6a586680622401ade8ee26afd77bfb1df71d3d75a804c8114958a73b3c3c7c072bf2cb407772af00
-EBUILD xfce4-panel-4.17.2.ebuild 1514 BLAKE2B 43335a4a947059c056c68f26b87ad94fa8e6a5220ba8d0d41cb047a082688259c09b4309bdce07f1824b5d23f891019ee6d738c390720994e0337656cc7e8072 SHA512 bfc75e2dd5b868a880d7a859bf3e66f5e2f2595e09258b8f06f8aad5d2509f88b2ae50cb0ef843d7eff3a8f8219daa9fdbd2f4638a5ad4b94bf3655f4f6397b6
+EBUILD xfce4-panel-4.16.5.ebuild 1505 BLAKE2B 53dccf21ec9f185be56fac924ef8c2746728f154eb93535d4a91bf70a07929ffc6998e0f3765c472a2e2d36d5f8fd981a565ed9837909776ad1e30cb923eefba SHA512 cc50480cd4b67dc69e8b7a84f7a4710c53b2dac803b38130317fa732e0cfc06db7d0a50802ded311768a99c7d67271baa0a33dc09446a9d513be820b3368d764
 EBUILD xfce4-panel-4.17.3.ebuild 1521 BLAKE2B c70a75f36da4e3dd9a72baaf68f6e6b150a6d261fae5489c52dadf50a2631600af91fabcead91ce7cfc789b0f789d9fd618d8ab5d0506a3ae0fd6c03875000b1 SHA512 d29d47d0607fae2ec8747d39ad63666fb46921c961be7707bf866c532df21041cb96f79049fa6a929309a65a7c1ee11a20205e729427302a9e6616a2b0aafda6
 MISC metadata.xml 377 BLAKE2B a9ab246bf0acb1731905d6f7aaa6d558204ca06138e0f531b76570f1477353a636b504ccab11ed861044faa5d02fefa43c5cc08f8d6c742851f1e8976e08f3d6 SHA512 9269670fb22fc1179cbc6f4a3f7f160bd1164ab470f6bbfa4875d85d7c0fb29ac7ae05d46daaaba097a418890961e568ce249e60329ed0325ba3f5dc976946f8
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.16.4.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.4.ebuild
deleted file mode 100644
index b73513d14978..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.16.4.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit vala xdg-utils
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbusmenu introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.50
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	x11-libs/libwnck:3
-	>=xfce-base/exo-0.11.2:=
-	>=xfce-base/garcon-0.5:=
-	>=xfce-base/libxfce4ui-4.15.8:=
-	>=xfce-base/libxfce4util-4.15.6:=[introspection?,vala?]
-	>=xfce-base/xfconf-4.13:=
-	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-lang/perl
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable dbusmenu dbusmenu-gtk3)
-		$(use_enable vala)
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.16.5.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.16.5.ebuild
index f3f98e47de5a..b73513d14978 100644
--- a/xfce-base/xfce4-panel/xfce4-panel-4.16.5.ebuild
+++ b/xfce-base/xfce4-panel/xfce4-panel-4.16.5.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
 
 LICENSE="GPL-2+ LGPL-2.1+"
 SLOT="0"
-KEYWORDS="~alpha amd64 arm ~arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
+KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~mips ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux ~x86-solaris"
 IUSE="+dbusmenu introspection vala"
 REQUIRED_USE="vala? ( introspection )"
 
diff --git a/xfce-base/xfce4-panel/xfce4-panel-4.17.2.ebuild b/xfce-base/xfce4-panel/xfce4-panel-4.17.2.ebuild
deleted file mode 100644
index 1779f20fe84f..000000000000
--- a/xfce-base/xfce4-panel/xfce4-panel-4.17.2.ebuild
+++ /dev/null
@@ -1,69 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit vala xdg-utils
-
-DESCRIPTION="Panel for the Xfce desktop environment"
-HOMEPAGE="https://www.xfce.org/projects/"
-SRC_URI="https://archive.xfce.org/src/xfce/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+ LGPL-2.1+"
-SLOT="0"
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
-IUSE="+dbusmenu introspection vala"
-REQUIRED_USE="vala? ( introspection )"
-
-RDEPEND="
-	>=dev-libs/glib-2.66
-	>=x11-libs/cairo-1
-	>=x11-libs/gtk+-3.22:3[introspection?]
-	x11-libs/libX11
-	x11-libs/libwnck:3
-	>=xfce-base/exo-0.11.2:=
-	>=xfce-base/garcon-4.17.0:=
-	>=xfce-base/libxfce4ui-4.17.1:=
-	>=xfce-base/libxfce4util-4.17.2:=[introspection?,vala?]
-	>=xfce-base/xfconf-4.13:=
-	dbusmenu? ( >=dev-libs/libdbusmenu-16.04.0[gtk3] )
-	introspection? ( dev-libs/gobject-introspection:= )
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	vala? ( $(vala_depend) )
-	dev-lang/perl
-	dev-util/gdbus-codegen
-	dev-util/gtk-doc-am
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig
-"
-
-src_configure() {
-	local myconf=(
-		$(use_enable introspection)
-		$(use_enable dbusmenu dbusmenu-gtk3)
-		$(use_enable vala)
-	)
-
-	use vala && vala_setup
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-	xdg_desktop_database_update
-}
diff --git a/xfce-extra/Manifest.gz b/xfce-extra/Manifest.gz
index 7442a99c2c62..bd7d210b857d 100644
--- a/xfce-extra/Manifest.gz
+++ b/xfce-extra/Manifest.gz
diff --git a/xfce-extra/xfce4-xkb-plugin/Manifest b/xfce-extra/xfce4-xkb-plugin/Manifest
index 9129fc5451d9..d27baf15d343 100644
--- a/xfce-extra/xfce4-xkb-plugin/Manifest
+++ b/xfce-extra/xfce4-xkb-plugin/Manifest
@@ -1,5 +1,3 @@
-DIST xfce4-xkb-plugin-0.8.2.tar.bz2 868539 BLAKE2B 20a7a27903be434490b3328f04d57a4ceb505dc1b63e4c98d584c72e6ad0dbc742251c0d9f43ba1da869caa2924627b6cfddd969874a3f5fae8fbf90ef577da6 SHA512 3078c11e1c10195480251c455995e4342c27b06949fc754396824f03bed885f32078f4c1436d86782de031cf4f4f806b530ca53116d4bedb54dda19b68ec7062
 DIST xfce4-xkb-plugin-0.8.3.tar.bz2 864177 BLAKE2B 4c4c5ab781265e50ddb14210566f608e2798f881d4b06e7e8f121c466ea0eebb694cf394b0bec747b7a5f1f99962ee1d014f29f077ef877e8063c23934eff1b4 SHA512 02ae82a1e01b7cc54154545c6ff42a450a81ba44697620ebb716a663300ea08fbf6ccafc5fd4d710791f142e1c249f17b613d90ffd99025ad97dfa0230ee55b2
-EBUILD xfce4-xkb-plugin-0.8.2.ebuild 1068 BLAKE2B 95d10631992cf8d76916361951007278460f4d7e41efcd785a08f000227826970f123b25575b8d5243a7af47bdf1200392bab90c5559fab06acd373f2eebc69d SHA512 991ff7adfb8937b723015f8e1338c6d69982f3da8e7c42349f84be6240f0a5345284100f8fe2c3936fcba9f4bdb147f002be436465de2576aab7835410aa1d4b
 EBUILD xfce4-xkb-plugin-0.8.3.ebuild 1248 BLAKE2B 51111a7ce429b373b53f6256ddf137b230070e745f7a1edb9452ebfc1e26563ff2d0e20be8721814f12326434c34ad9d8a8cdf6b1c491167f84e8021835ce5b6 SHA512 45b4ccc25d29125369acc8821837aca0b88920c281d59e55d6494d2e0a2ae1392b8f13cf432ffd763f883d2aa4b75cdf8fe035bc0285b01e5dacda4c7b02eb5c
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.2.ebuild b/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.2.ebuild
deleted file mode 100644
index 8d60d5cc8324..000000000000
--- a/xfce-extra/xfce4-xkb-plugin/xfce4-xkb-plugin-0.8.2.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="XKB layout switching panel plug-in for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/panel-plugins/xfce4-xkb-plugin"
-SRC_URI="https://archive.xfce.org/src/panel-plugins/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="BSD-2 GPL-2+"
-SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ppc ppc64 ~riscv ~sparc x86 ~amd64-linux ~x86-linux"
-
-DEPEND="gnome-base/librsvg:=
-	x11-libs/gtk+:3=
-	x11-libs/libwnck:3=
-	x11-libs/libX11:=
-	>=x11-libs/libxklavier-5.3:=
-	xfce-base/garcon:=
-	>=xfce-base/libxfce4ui-4.12:=
-	>=xfce-base/libxfce4util-4.12:=
-	>=xfce-base/xfce4-panel-4.12:=
-	>=xfce-base/xfconf-4.12.1:="
-RDEPEND="${DEPEND}
-	x11-apps/setxkbmap
-	>=xfce-base/xfce4-settings-4.11"
-BDEPEND="
-	dev-util/intltool
-	sys-devel/gettext
-	virtual/pkgconfig"
-
-src_configure() {
-	local myconf=(
-		--libexecdir="${EPREFIX}"/usr/$(get_libdir)
-	)
-
-	econf "${myconf[@]}"
-}
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
diff --git a/xfce-extra/xfdashboard/Manifest b/xfce-extra/xfdashboard/Manifest
index 8887a9647399..1d22be43a5b8 100644
--- a/xfce-extra/xfdashboard/Manifest
+++ b/xfce-extra/xfdashboard/Manifest
@@ -1,7 +1,3 @@
-DIST xfdashboard-0.9.5.tar.bz2 3397335 BLAKE2B 5e65206c73f85ce9d4305e459ca837c287c43f95bbb16df632109eee998524d5858c5de8a6c390713d118ed3f7bb7f184d88650cec78e7bc03a6859fe7e44a39 SHA512 9929bdcef6a9766799b900b61e009b43ef901f1aebd6dbe9291c3342edebfa1d599340222da25bbac17810f4ef7b001743b4daec0c25f585203f0b69f2bc17d6
-DIST xfdashboard-0.9.91.tar.bz2 3421906 BLAKE2B 10b5bb09fa4d4bbbe242d1d36ad073e08384845e67331994c9ae622d70de27e873ce2f476d8baebde4bd4ae55db77cb35336a1a1725b4e40b1c814066ab4e72c SHA512 56e18c70a1282ff8f45df8304993fdd5e9097429f7edd6b9c7fc5c20681d1043b57251b5ce327346e612bc1069823ba4c76a5665529eeb2807e106c8fa747ba6
 DIST xfdashboard-1.0.0.tar.bz2 3423708 BLAKE2B b6ac90de137d85f9503372648444100561368498ac93173e60b3d0938cd5c1a95a4c0a668b4b2078821b234ca8e074e0fbc9a0c6b5785de23561465a3cfafe62 SHA512 7c7da3d544de4eabe9f31c2744d7b862ed71a7e7bcadd40b61d64ce7d480e627c86992979718110d65d1534f50fd87d8241f509b26e0603b93443b4cca873d1c
-EBUILD xfdashboard-0.9.5.ebuild 969 BLAKE2B c89d968e6269f0baf97e63580a5326aaa3265701877fea85955299c1875f1ffa8c9412037f2910a8e337d0849820eeacc0aff76632360da6dea031e5030bf147 SHA512 3ea9960a40752ef6ac736784808c3551dc974cd000bb4e50a295c4cd28c79db297e59191870f444976e295703b0263c18bbd305fb2badc6bc7b8426c05d45bfb
-EBUILD xfdashboard-0.9.91.ebuild 978 BLAKE2B 1e8d9416c321d0db5f0f6baac34a1bbed6f5e29514a7b18dbff5997f277b84bdce7911a916c11bf4154564b36bc2d2eb557a3edede80c685b160519de3c8ef5e SHA512 ce197e49b70d8b4273bf9e0f02b7dd7bad549755f463d60d57be061435347ed80b54d3321d5ff685b6d0246365c5267fa708056bbe27e022404b9ec954c05190
 EBUILD xfdashboard-1.0.0.ebuild 976 BLAKE2B 74bf821e96c4cd858fd01192159361e665528bba70049c7bf85743c4ba4d3ff683087c8475c817152ba61cb20f9abe3855603bdda4334deebdb0a0cc44a8d71b SHA512 38366bec2ccbee47bb2a884b3b5c566fb22702252706ea98a95f09f5513f36bcb1d23aa05a1e8136f3d0b617d895594a4677c9cc4934135c54a0ebea49ef8339
 MISC metadata.xml 248 BLAKE2B 83bf47dc3dbedea8a88932e922075f0ba8fd841433c4ab750e2ab61c22e8cbfaa1acb04a903d89ef5140a75dfc4c4899354623e0160df5b7c178c190f8494515 SHA512 b5200cfe30adef8e869fada87f1b4171210b2427cd3ac12edef70948f305d5e612ca5f24d377f9823a6022c8867db635db50ddd3d6cb362d6b0137c299fe07e5
diff --git a/xfce-extra/xfdashboard/xfdashboard-0.9.5.ebuild b/xfce-extra/xfdashboard/xfdashboard-0.9.5.ebuild
deleted file mode 100644
index c4497f091ecf..000000000000
--- a/xfce-extra/xfdashboard/xfdashboard-0.9.5.ebuild
+++ /dev/null
@@ -1,44 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-inherit xdg-utils
-
-DESCRIPTION="Maybe a GNOME shell like dashboard for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfdashboard/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND=">=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.2:3
-	>=media-libs/clutter-1.12:1.0=[gtk]
-	>=x11-libs/libwnck-3:3=
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXdamage:=
-	x11-libs/libXinerama:=
-	>=xfce-base/garcon-0.2.0:=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfconf-4.14:="
-DEPEND="${RDEPEND}"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}
diff --git a/xfce-extra/xfdashboard/xfdashboard-0.9.91.ebuild b/xfce-extra/xfdashboard/xfdashboard-0.9.91.ebuild
deleted file mode 100644
index f725a7560151..000000000000
--- a/xfce-extra/xfdashboard/xfdashboard-0.9.91.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit xdg-utils
-
-DESCRIPTION="Maybe a GNOME shell like dashboard for the Xfce desktop environment"
-HOMEPAGE="https://goodies.xfce.org/projects/applications/xfdashboard/start"
-SRC_URI="https://archive.xfce.org/src/apps/${PN}/${PV%.*}/${P}.tar.bz2"
-
-LICENSE="GPL-2+"
-SLOT="0"
-KEYWORDS="~amd64 ~riscv ~x86"
-
-RDEPEND="
-	>=dev-libs/glib-2.38:2
-	>=x11-libs/gtk+-3.2:3
-	>=media-libs/clutter-1.12:1.0=[gtk]
-	>=x11-libs/libwnck-3:3=
-	x11-libs/libX11:=
-	x11-libs/libXcomposite:=
-	x11-libs/libXdamage:=
-	x11-libs/libXinerama:=
-	>=xfce-base/garcon-0.2.0:=
-	>=xfce-base/libxfce4ui-4.10:=
-	>=xfce-base/libxfce4util-4.10:=
-	>=xfce-base/xfconf-4.14:=
-"
-DEPEND="
-	${RDEPEND}
-"
-BDEPEND="
-	dev-util/intltool
-	virtual/pkgconfig
-"
-
-src_install() {
-	default
-	find "${D}" -name '*.la' -delete || die
-}
-
-pkg_postinst() {
-	xdg_icon_cache_update
-}
-
-pkg_postrm() {
-	xdg_icon_cache_update
-}