gentoo auto-resync : 26:10:2022 - 21:56:23

339 files changed, 2888 insertions, 4847 deletions

diff --git a/Manifest b/Manifest
index b61944c80032..2df1c70c97d7 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29568 BLAKE2B a4d05dc2cc166300c69f0a9c738fa6fad2b0b6647b693a240f7457e4b3835317a388e79dee466ae726ff7760bf761e8ba34cd76ef7a98c93bee8c8fe31897657 SHA512 6ee32e5fc01ea87d0662cbdcec18121e10f09aa5d1a2c70e50fc967057138a5b9cdb8f5f937c92de02e520955d6a00faa53462abd85e8c4d0ab4f1ffd0703eff
-TIMESTAMP 2022-10-26T14:09:49Z
+MANIFEST Manifest.files.gz 29623 BLAKE2B 67638d17b4a647c8ea832352c573d1473cb6ee369fca0c7245c83bbe0bb22119fd56da9517ed4980053c06a61129af1dcd10cebe281e5678c2bb8ea7caef7320 SHA512 cf0bb52c4784c3028e6a319a1b15e0817c2b38b916f281aff219892407db3bf2bfc053fbf07e64ce689df87e928916c91cc04c7c42ed2d292e9c58d5f895a9fe
+TIMESTAMP 2022-10-26T20:09:54Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNZP61fFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNZlBJfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDLeBAApqBUC+aXihJt73Ia8zaX5lIslAUnpIIuVLcNKhw+SGokLrrJAUnE+d4z
-7bT6s59MksvqRKCSj8S0lGzuKTJ+PpYRlDtAxIQ8muYsY6KdK8ZgZ/AZi+lEOfuJ
-HGBaL8AFz4Iqntty5j1DhPqqSqmfBCXiWjlJnxo7pklgOA4biZhrcsgLqqzxWddp
-XfL7IqDHzPeGXiaj0FEcX9RX1EzqRj98bBq0P+HMgt2TLhEk9QU0Mq7cLjfPbJye
-t+b6akKEqDsg3bUFdsZ7tvNdpL56upBIYX20UZT+AfMAfLrJzS7amiVHuaXfUWN5
-X3fye6aX5dG23wk6WjIuPS4+RznHZXPsxc3aU6Wkmo/84/VodutfiX0TwSqDVETI
-TtBXYCHRvhknT725eZ/fjELqSlD2FJJsFtyszZM/FKJU0fxnVaZ3H4/uc14FTxkA
-KGl0hWHLLcLg/dOV06fDXr2kUGbSrH7dWpB/0dxMArWBp0Lh5lcT7ZqaZoHgRRxm
-ou+7UlL08n1tyrMYFLFdKjIWAgMz5ZwrZlH4hKBuw31eMgVx7hdRWp5D5SloNii1
-SUbDcC5uQe40G+72AHj3BeXs2u46nOCMRXvErQQAEQo7ok00W9B+/SpgkkNbHcPL
-FT8Gn9IGvWt1AQ5LMV8LNbSngGfYgHo7KOjDX3Uim8Rweo+ewY4=
-=qRVs
+klArBA//RR4qijdx1QgFqM+u8b2tp8V4MeF89dPeDJw0QrygrCfGSU65e6tDqATE
+sr3UXkkkiqp+jlOd7OEZy3Hu7ZxCdKQXR+ghyWk209vJwxNJVhH7KUaXilgjQilr
+v/XfTqls5Wk8dox3QjZIkYbndr+X/7Ep4gLlnbQyVR0olQEYYAnWPb7Zm+Jfe4DH
+mNPcujSANOdXCKl8JeisQwJK+fIvTFoyNng2kGj3GRmhUHyf3Btnz/uPsVmKrTMo
+nryVrYQB+yPfalAw7pNhmwrvj/dJeZyOuTRXZuAELVJvz8vwJ2V6F5YuKz3EyGRT
+Zsa3FEILTSLC+FWespGxUD7iy1D7N0jXobioGFMEZqb65SZeS3JwEtLy1Qnd2vmr
+vqtmWUocKWsfIfEMGwINXEuaRO2+yOtnRo4LRy4/RLOXriwScC7rfnLJqqjAhO4A
+EtN478oj1SDjfSFpVJTv2WvRuZG8y8BvukijBI1J+5dvUZoTVV26HBifZRGV1KP9
+kxka63t+eMqVJTVKaKtisUNj8imLZM1wNmAZfs+iqpv565czvOKyYRygbLw7ZwIS
+JNuCZRA3AuDN0h4XblBdmt1cSWv2LZsOU5UU6/SkCxP2ZJ6JS8QnjWtdOpwkUgDV
+Jc9ULQHoLbilEb9745DJQ4t4u/6WGi+7L4VN5INdq214Zr0Ec6I=
+=csyP
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index 2db607834b14..d72389530cee 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index d87e2f7ee457..c8ae84e041d2 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/conky/Manifest b/app-admin/conky/Manifest
index 0485e927eb19..dc5e6d4bb02c 100644
--- a/app-admin/conky/Manifest
+++ b/app-admin/conky/Manifest
@@ -3,5 +3,5 @@ DIST conky-1.13.1.tar.gz 2443276 BLAKE2B e51610172e830d0368e8c9a48ea056285efe482
 DIST conky-1.15.0.tar.gz 1800684 BLAKE2B e3b8c682e99be42cd28ed9507c346f16afefb525269c31bf9731169fa2c52bcaac4f523ecd0ec8c722fb4e269226254f8579876e68a2b27c3a3f5685dd50b423 SHA512 d317b0a141355ce56c9dce5ba6e4b9dbe73b05b9b0b85d93d491f6d6da4194c1aceefbbc7e1b10e5fc233a9732933949e273630845194f6c16dce34a77ee5841
 EBUILD conky-1.12.2.ebuild 4790 BLAKE2B 233fd89ef019a015d1ebad697126bd2417410241cc377a81d5bdebd85cbe1ee664ca61db8b5a83d39a8dea05c63b8dbbf7b4bf7fed3ac0b76c7ae349d477b625 SHA512 36f90f9eae1c783a02dfca917ffcdc48694f8ec9175832c95b6867bbc94def480be40abeca1d172a2a7f4cb944ec827c3dd1766b5ae8310a2aa4ef700283a4e5
 EBUILD conky-1.13.1.ebuild 4794 BLAKE2B 34c39bd8ba19b88db1b70d79f50ca71eb9329b7abedd2dd1268d9eaf2bf671a5c7ffdd76793ac5b43bc968cc853e54471df3c4a74cb66cd43fed17fe22644212 SHA512 fbb21ea3bef9cde56bce4d47517550df02ab8a8879dda7ce7127f412852dcaffaaab2a61794e9f3a9ff78ec4a197be209413a56b0f8f3a19255a0955c224a63d
-EBUILD conky-1.15.0.ebuild 4483 BLAKE2B 14069f7478e7555bf1f139c5ecfcf1612591d6edec55c14d96b4484286a7ca6a68f59220ba734423cb9409201e7de7dda047ddffcdcd22d9623e9b9b5354d5b7 SHA512 c2c54ff512fbf714d7f6681ba7ed998ac9317e819c44b69b859588929afb3a9d1cc62907890f708eeb79fcf8b89fa5573aade87420d26020ec6a6d5866458021
+EBUILD conky-1.15.0.ebuild 4520 BLAKE2B 4fdb448db2b1f7c8236be63f094f80b09c786a0466c2eaec511b6b7f452c714fe0ee5e56f01235e58e6998f81ff72954b4cd387c87f58b1894bdeae405cab058 SHA512 0a8acea091b5eab390a4afb0ef2e83cef6c735fd9680045e8f6419a0e9f33f23867b4a8af1f71830e08c182281360c2e959cd4afcfc1328fd3b8219c6da29897
 MISC metadata.xml 2576 BLAKE2B 428d10d3666770317f470e6898d103180370866abdfcc55c81450c3df58a7c0eef5a2cf4d4980a36d22803479af7f10aaf3a4245041f729fefe26ccb0a29a516 SHA512 6db4ad92cf3d3afc81b7047c8f23d157d1efc6cf02aa5e4ab435c8785355445d6929e314fcadb007b2d084560c0f1afeff8889ff390852846fad8f52c29d8e48
diff --git a/app-admin/conky/conky-1.15.0.ebuild b/app-admin/conky/conky-1.15.0.ebuild
index e52453f698b0..8803596b5d27 100644
--- a/app-admin/conky/conky-1.15.0.ebuild
+++ b/app-admin/conky/conky-1.15.0.ebuild
@@ -60,8 +60,8 @@ RDEPEND="
 "
 DEPEND="
 	${COMMON_DEPEND}
-	doc? ( virtual/pandoc dev-python/pyyaml )
-	extras? ( virtual/pandoc )
+	doc? ( virtual/pandoc dev-python/pyyaml dev-python/jinja )
+	extras? ( dev-python/pyyaml dev-python/jinja )
 "
 
 REQUIRED_USE="
diff --git a/app-emulation/Manifest.gz b/app-emulation/Manifest.gz
index c3e5c2cfa0ce..64acbf28dd13 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 885525fc9e1f..290254cfe481 100644
--- a/app-emulation/xen-tools/Manifest
+++ b/app-emulation/xen-tools/Manifest
@@ -26,8 +26,6 @@ DIST xen-gentoo-patches-4.15.3-gentoo-patchset-2.tar.bz2 4681 BLAKE2B 59fe5c2d5f
 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-1.tar.bz2 68066 BLAKE2B ee6aac9aa8988423fd1594fa09c54678ee8d089abfff27913fdbe4f60c1f2a038e06cca5d03924595036bd9ca9be8a7f61ed5d7662e6534b05a45da24c88babd SHA512 65c7c900ca91f7444cdc03fa0902e8d58d68cd755cfa2d16cf1df76b657328e374fec0da3ceb734aefa10cfa874a46de5f731c3827ab4f815b4eabc305ed497f
 DIST xen-upstream-patches-4.16.3-pre-patchset-0.tar.bz2 36580 BLAKE2B 7a16b452fda7cf00321c70c239f30fbff72204d5b021aba23e1e08b2d8dee0f1180a18301b5935f4d35dc54533e2e253f047681b837de187a2a174191a168c3c SHA512 5e7328c8cd7ce98cdff47033a76705395419c1322d5212206aa1255d19aeb2fd3d097e71d39137ab97aeab0b9f991e1660b92a6ddb08f02c9407ceaa24aa9ec0
-EBUILD xen-tools-4.15.3.ebuild 16676 BLAKE2B c29d32c15877a708566b0482700c856ca39f2607767880c725e623357298847aca14f0b112e51c455821bfc2c090fdc6b47b170cfa95b03598fe6c820964677b SHA512 8b20304ee4a260e0d41bbf651271c315c6529a3ff61daf5c160adb1126423ee80abb93adad22b2d62bcd6c27994de3dc219630c4f385f2b1e2e9c6100e44a2d0
 EBUILD xen-tools-4.15.4_pre1.ebuild 16707 BLAKE2B c845719ce59d634f16092f64d2aeaa42021cfd4e0acaf66dd4523ce41c519b88c759cbea2dcbb74fe550d30b210dd1813b541e4b019c6c3b4dcf1b92997dbe4b SHA512 c1ec819b8499b60c34fc071644f10575421b6fe871e5b443a519ec1c94da261073d9dff8449d9aea46831b4b1163e75a9faf4b4f3f697bf0cd9631c75ea1fc3a
-EBUILD xen-tools-4.16.2.ebuild 16190 BLAKE2B 834bdebc9fa33ff472f464f43fcdcd5d79702d0dd2763198e3edcfdb365f91c9cba4fae40f7a7dcefded1cc5f878b86b970d028859d5172bc07c6a495a3b91a5 SHA512 703947a7722cd40f8cbb7e9fffdca6f08c9042302aa179c78360cce7a39a47e118c5c4400a60f3b135f9a1c12922022524b07ecfa4b015507843e5cf2c99484d
 EBUILD xen-tools-4.16.3_pre.ebuild 16197 BLAKE2B 719e5e700675698f26f341960ff3c85e9b9fd6f47d297f3a5ba2eb0f4d465f7cb80fca81b3ac769ee455628efa1b38e860e2046d2b72e29d799480796046ed47 SHA512 2cc290effb5789d470fe1a17571a2bc332414a02aae2c99bfc8ab219555d67f3ffdca85e770b8afb9d2a98c38b5620bba34fa37946da3d37a71e6d7d87224a98
 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
deleted file mode 100644
index 51f8fe6fefe4..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.15.3.ebuild
+++ /dev/null
@@ -1,532 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..10} )
-PYTHON_REQ_USE='ncurses,xml(+),threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="amd64 ~arm ~arm64 x86"
-
-	SEABIOS_VER="1.14.0"
-	EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
-	EDK2_OPENSSL_VERSION="1_1_1j"
-	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
-	IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
-
-	XEN_PRE_PATCHSET_NUM=
-	XEN_GENTOO_PATCHSET_NUM=2
-	XEN_PRE_VERSION_BASE=
-
-	XEN_BASE_PV="${PV}"
-	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
-		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
-	fi
-
-	SRC_URI="
-	https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz
-	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
-	ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
-	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
-		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
-		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
-		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
-	)
-	"
-
-	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
-		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
-		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
-		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
-		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
-	fi
-	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
-		XEN_GENTOO_PATCHES_TAG="${PV}-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
-		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
-		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
-		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
-	fi
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://xenproject.org"
-DOCS=( README )
-
-S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-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"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ipxe? ( rombios )
-	ovmf? ( hvm )
-	pygrub? ( python )
-	rombios? ( hvm )
-	system-ipxe? ( rombios )
-	?? ( ipxe system-ipxe )
-	?? ( qemu system-qemu )"
-
-COMMON_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_DEPS}
-"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	selinux? ( sec-policy/selinux-xen )"
-
-DEPEND="${COMMON_DEPEND}
-	app-misc/pax-utils
-	>=sys-kernel/linux-headers-4.11
-	x11-libs/pixman
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_USEDEP}]
-	')
-	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_gen_impl_dep 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_gen_cond_dep '
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-		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 )"
-
-BDEPEND="dev-lang/perl
-	sys-devel/bison
-	sys-devel/gettext"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/libexec/xen/boot/ovmf.bin
-	usr/libexec/xen/boot/xen-shim
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-	usr/share/qemu-xen/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-	usr/share/qemu-xen/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_EXECSTACK="
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/elf2dmp
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-edid
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-keymap
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-pr-helper
-	usr/libexec/xen/bin/qemu-storage-daemon
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/boot/ovmf.bin
-	usr/libexec/xen/boot/xen-shim
-	usr/libexec/xen/libexec/qemu-pr-helper
-	usr/libexec/xen/libexec/virtfs-proxy-helper
-	usr/libexec/xen/libexec/virtiofsd
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/s390-netboot.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
-		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
-	fi
-
-	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
-		eapply "${XEN_GENTOO_PATCHES_DIR}"
-	fi
-
-	# Rename qemu-bridge-helper to xen-bridge-helper to avoid file
-	# collisions with app-emulation/qemu.
-	sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \
-		tools/qemu-xen/include/net/net.h \
-		tools/qemu-xen/Makefile \
-		tools/qemu-xen/qemu-bridge-helper.c \
-		tools/qemu-xen/qemu-options.hx \
-		|| die
-
-	if use ovmf; then
-		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-
-		# Bug #816987
-		pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null
-			eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
-
-		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
-			eapply "${FILESDIR}/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
-	fi
-
-	# ipxe
-	if use ipxe; then
-		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/ipxe.tar.gz || die
-
-		# gcc 11
-		cp "${XEN_GENTOO_PATCHES_DIR}/ipxe/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
-		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
-	fi
-
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# drop flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-	unset CPPFLAGS
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s;^BASH_COMPLETION_DIR      :=.*;BASH_COMPLETION_DIR := $(get_bashcompdir);" \
-		-i config/Paths.mk.in || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	# disable capstone (Bug #673474)
-	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-		-i tools/Makefile || die
-
-	# disable glusterfs
-	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-		-i tools/Makefile || die
-
-	# disable jpeg automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
-		-i tools/Makefile || die
-
-	# disable png automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
-		-i tools/Makefile || die
-
-	# disable docker (Bug #732970)
-	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
-		-i tools/Makefile || die
-
-	# disable abi-dumper (Bug #791172)
-	sed -e 's/$(ABI_DUMPER) /echo /g' \
-		-i tools/libs/libs.mk || die
-
-	# Remove -Werror
-	find . -type f \( -name Makefile -o -name "*.mk" \) \
-		 -exec sed -i \
-		 -e 's/-Werror //g' \
-		 -e '/^CFLAGS *+= -Werror$/d' \
-		 -e 's/, "-Werror"//' \
-		 {} + || die
-
-	default
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--libexecdir="${EPREFIX}/usr/libexec"
-		--localstatedir="${EPREFIX}/var"
-		--disable-golang
-		--disable-werror
-		--disable-xen
-		--enable-tools
-		--enable-docs
-		$(use_enable api xenapi)
-		$(use_enable ipxe)
-		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '')
-		$(use_enable ocaml ocamltools)
-		$(use_enable ovmf)
-		$(use_enable rombios)
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored')
-	)
-
-	use system-seabios && myconf+=( --with-system-seabios=/usr/share/seabios/bios.bin )
-	use system-qemu && myconf+=( --with-system-qemu=/usr/bin/qemu-system-x86_64 )
-	use amd64 && myconf+=( $(use_enable qemu-traditional) )
-	tc-ld-disable-gold # Bug 669570
-	econf ${myconf[@]}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	# bug #845099
-	if use ipxe; then
-		local -x NO_WERROR=1
-	fi
-
-	emake CC="$(tc-getCC)" LD="$(tc-getLD)" AR="$(tc-getAR)" RANLIB="$(tc-getRANLIB)" build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"/tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-		dodoc -r docs/{pdf,txt}
-	else
-		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
-	fi
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
-	keepdir /var/lib/xen/dump
-	keepdir /var/lib/xen/xenpaging
-	keepdir /var/lib/xenstored
-	keepdir /var/log/xen
-
-	if use python; then
-		python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
-		python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
-	fi
-
-	python_optimize
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide and the offical wiki page:"
-	elog "https://wiki.gentoo.org/wiki/Xen"
-	elog "https://wiki.xen.org/wiki/Main_Page"
-	elog ""
-	elog "Recommended to utilise the xencommons script to config system at boot"
-	elog "Add by use of rc-update on completion of the install"
-
-	if ! use hvm; then
-		echo
-		elog "HVM (VT-x and AMD-V) support has been disabled. If you need hvm"
-		elog "support enable the hvm use flag."
-		elog "An x86 or amd64 system is required to build HVM support."
-	fi
-
-	if use qemu; then
-		elog "The qemu-bridge-helper is renamed to the xen-bridge-helper in the in source"
-		elog "build of qemu.  This allows for app-emulation/qemu to be emerged concurrently"
-		elog "with the qemu capable xen.  It is up to the user to distinguish between and utilise"
-		elog "the qemu-bridge-helper and the xen-bridge-helper. File bugs of any issues that arise"
-	fi
-}
diff --git a/app-emulation/xen-tools/xen-tools-4.16.2.ebuild b/app-emulation/xen-tools/xen-tools-4.16.2.ebuild
deleted file mode 100644
index d11d5925ee1d..000000000000
--- a/app-emulation/xen-tools/xen-tools-4.16.2.ebuild
+++ /dev/null
@@ -1,527 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-PYTHON_COMPAT=( python3_{8..11} )
-PYTHON_REQ_USE='ncurses,xml(+),threads(+)'
-
-inherit bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	REPO="xen.git"
-	EGIT_REPO_URI="git://xenbits.xen.org/${REPO}"
-	S="${WORKDIR}/${REPO}"
-else
-	KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-
-	SEABIOS_VER="1.14.0"
-	EDK2_COMMIT="7b4a99be8a39c12d3a7fc4b8db9f0eab4ac688d5"
-	EDK2_OPENSSL_VERSION="1_1_1j"
-	EDK2_SOFTFLOAT_COMMIT="b64af41c3276f97f0e181920400ee056b9c88037"
-	EDK2_BROTLI_COMMIT="666c3280cc11dc433c303d79a83d4ffbdd12cc8d"
-	IPXE_COMMIT="3c040ad387099483102708bb1839110bc788cefb"
-
-	XEN_GENTOO_PATCHSET_NUM=2
-	XEN_GENTOO_PATCHSET_BASE=4.16.1
-	XEN_PRE_PATCHSET_NUM=
-	XEN_PRE_VERSION_BASE=
-
-	XEN_BASE_PV="${PV}"
-	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
-		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
-	fi
-
-	SRC_URI="
-	https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz
-	https://www.seabios.org/downloads/seabios-${SEABIOS_VER}.tar.gz
-	ipxe? ( https://xenbits.xen.org/xen-extfiles/ipxe-git-${IPXE_COMMIT}.tar.gz )
-	ovmf? ( https://github.com/tianocore/edk2/archive/${EDK2_COMMIT}.tar.gz -> edk2-${EDK2_COMMIT}.tar.gz
-		https://github.com/openssl/openssl/archive/OpenSSL_${EDK2_OPENSSL_VERSION}.tar.gz
-		https://github.com/ucb-bar/berkeley-softfloat-3/archive/${EDK2_SOFTFLOAT_COMMIT}.tar.gz -> berkeley-softfloat-${EDK2_SOFTFLOAT_COMMIT}.tar.gz
-		https://github.com/google/brotli/archive/${EDK2_BROTLI_COMMIT}.tar.gz -> brotli-${EDK2_BROTLI_COMMIT}.tar.gz
-	)
-	"
-
-	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
-		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
-		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
-		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
-		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
-	fi
-	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
-		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_GENTOO_PATCHSET_BASE})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
-		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
-		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
-		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
-	fi
-fi
-
-DESCRIPTION="Xen tools including QEMU and xl"
-HOMEPAGE="https://xenproject.org"
-DOCS=( README )
-
-S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
-
-LICENSE="GPL-2"
-SLOT="0/$(ver_cut 1-2)"
-# Inclusion of IUSE ocaml on stabalizing requires maintainer of ocaml to (get off his hands and) make
-# >=dev-lang/ocaml-4 stable
-# Masked in profiles/eapi-5-files instead
-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 systemd zstd"
-
-REQUIRED_USE="
-	${PYTHON_REQUIRED_USE}
-	ipxe? ( rombios )
-	ovmf? ( hvm )
-	pygrub? ( python )
-	rombios? ( hvm )
-	system-ipxe? ( rombios )
-	?? ( ipxe system-ipxe )
-	?? ( qemu system-qemu )"
-
-COMMON_DEPEND="
-	lzma? ( app-arch/xz-utils )
-	qemu? (
-		dev-libs/glib:2
-		sys-libs/pam
-	)
-	zstd? ( app-arch/zstd )
-	app-arch/bzip2
-	app-arch/zstd
-	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_DEPS}
-"
-
-RDEPEND="${COMMON_DEPEND}
-	sys-apps/iproute2[-minimal]
-	net-misc/bridge-utils
-	screen? (
-		app-misc/screen
-		app-admin/logrotate
-	)
-	selinux? ( sec-policy/selinux-xen )"
-
-DEPEND="${COMMON_DEPEND}
-	app-misc/pax-utils
-	>=sys-kernel/linux-headers-4.11
-	x11-libs/pixman
-	$(python_gen_cond_dep '
-		dev-python/lxml[${PYTHON_USEDEP}]
-	')
-	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_gen_impl_dep 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_gen_cond_dep '
-			dev-python/markdown[${PYTHON_USEDEP}]
-		')
-		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 )"
-
-BDEPEND="dev-lang/perl
-	sys-devel/bison
-	sys-devel/gettext"
-
-# hvmloader is used to bootstrap a fully virtualized kernel
-# Approved by QA team in bug #144032
-QA_WX_LOAD="
-	usr/libexec/xen/boot/hvmloader
-	usr/libexec/xen/boot/ovmf.bin
-	usr/libexec/xen/boot/xen-shim
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-	usr/share/qemu-xen/qemu/opensbi-riscv32-generic-fw_dynamic.elf
-	usr/share/qemu-xen/qemu/opensbi-riscv64-generic-fw_dynamic.elf
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-QA_EXECSTACK="
-	usr/share/qemu-xen/qemu/hppa-firmware.img
-"
-
-QA_PREBUILT="
-	usr/libexec/xen/bin/elf2dmp
-	usr/libexec/xen/bin/ivshmem-client
-	usr/libexec/xen/bin/ivshmem-server
-	usr/libexec/xen/bin/qemu-edid
-	usr/libexec/xen/bin/qemu-img
-	usr/libexec/xen/bin/qemu-io
-	usr/libexec/xen/bin/qemu-keymap
-	usr/libexec/xen/bin/qemu-nbd
-	usr/libexec/xen/bin/qemu-pr-helper
-	usr/libexec/xen/bin/qemu-storage-daemon
-	usr/libexec/xen/bin/qemu-system-i386
-	usr/libexec/xen/bin/virtfs-proxy-helper
-	usr/libexec/xen/boot/ovmf.bin
-	usr/libexec/xen/boot/xen-shim
-	usr/libexec/xen/libexec/qemu-pr-helper
-	usr/libexec/xen/libexec/virtfs-proxy-helper
-	usr/libexec/xen/libexec/virtiofsd
-	usr/libexec/xen/libexec/xen-bridge-helper
-	usr/share/qemu-xen/qemu/s390-ccw.img
-	usr/share/qemu-xen/qemu/s390-netboot.img
-	usr/share/qemu-xen/qemu/u-boot.e500
-"
-
-RESTRICT="test"
-
-pkg_setup() {
-	python_setup
-	export "CONFIG_LOMOUNT=y"
-
-	#bug 522642, disable compile tools/tests
-	export "CONFIG_TESTS=n"
-
-	if [[ -z ${XEN_TARGET_ARCH} ]] ; then
-		if use x86 && use amd64; then
-			die "Confusion! Both x86 and amd64 are set in your use flags!"
-		elif use x86; then
-			export XEN_TARGET_ARCH="x86_32"
-		elif use amd64 ; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	# move before Gentoo patch, one patch should apply to seabios, to fix gcc-4.5.x build err
-	mv ../seabios-${SEABIOS_VER} tools/firmware/seabios-dir-remote || die
-	pushd tools/firmware/ > /dev/null
-	ln -s seabios-dir-remote seabios-dir || die
-	popd > /dev/null
-
-	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
-		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
-	fi
-
-	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
-		eapply "${XEN_GENTOO_PATCHES_DIR}"
-	fi
-
-	# Rename qemu-bridge-helper to xen-bridge-helper to avoid file
-	# collisions with app-emulation/qemu.
-	sed -i 's/qemu-bridge-helper/xen-bridge-helper/g' \
-		tools/qemu-xen/include/net/net.h \
-		tools/qemu-xen/meson.build \
-		tools/qemu-xen/qemu-bridge-helper.c \
-		tools/qemu-xen/qemu-options.hx \
-		|| die
-	mv tools/qemu-xen/qemu-bridge-helper.c tools/qemu-xen/xen-bridge-helper.c || die
-
-	if use ovmf; then
-		mv ../edk2-${EDK2_COMMIT} tools/firmware/ovmf-dir-remote || die
-		rm -r tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		rm -r tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		rm -r tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		rm -r tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		mv ../openssl-OpenSSL_${EDK2_OPENSSL_VERSION} tools/firmware/ovmf-dir-remote/CryptoPkg/Library/OpensslLib/openssl || die
-		mv ../berkeley-softfloat-3-${EDK2_SOFTFLOAT_COMMIT} tools/firmware/ovmf-dir-remote/ArmPkg/Library/ArmSoftFloatLib/berkeley-softfloat-3 || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli || die
-		cp -r ../brotli-${EDK2_BROTLI_COMMIT} tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli || die
-		cp tools/firmware/ovmf-makefile tools/firmware/ovmf-dir-remote/Makefile || die
-
-		# Bug #816987
-		pushd tools/firmware/ovmf-dir-remote/BaseTools/Source/C/BrotliCompress/brotli > /dev/null
-			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
-
-		pushd tools/firmware/ovmf-dir-remote/MdeModulePkg/Library/BrotliCustomDecompressLib/brotli > /dev/null
-			eapply "${XEN_GENTOO_PATCHES_DIR}/ovmf/${PN}-4.15.1-brotli-gcc11.patch"
-		popd > /dev/null
-	fi
-
-	# ipxe
-	if use ipxe; then
-		cp "${DISTDIR}/ipxe-git-${IPXE_COMMIT}.tar.gz" tools/firmware/etherboot/ipxe.tar.gz || die
-
-		# gcc 11
-		cp "${XEN_GENTOO_PATCHES_DIR}/ipxe/${PN}-4.15.0-ipxe-gcc11.patch" tools/firmware/etherboot/patches/ipxe-gcc11.patch || die
-		echo ipxe-gcc11.patch >> tools/firmware/etherboot/patches/series || die
-	fi
-
-	# Fix texi2html build error with new texi2html, qemu.doc.html
-	sed -i -e "/texi2html -monolithic/s/-number//" tools/qemu-xen-traditional/Makefile || die
-
-	# Drop .config, fixes to gcc-4.6
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	# drop flags
-	unset CFLAGS
-	unset LDFLAGS
-	unset ASFLAGS
-	unset CPPFLAGS
-
-	if ! use pygrub; then
-		sed -e '/^SUBDIRS-y += pygrub/d' -i tools/Makefile || die
-	fi
-
-	if ! use python; then
-		sed -e '/^SUBDIRS-y += python$/d' -i tools/Makefile || die
-	fi
-
-	if ! use hvm; then
-		sed -e '/SUBDIRS-$(CONFIG_X86) += firmware/d' -i tools/Makefile || die
-	# Bug 351648
-	elif ! use x86 && ! has x86 $(get_all_abis); then
-		mkdir -p "${WORKDIR}"/extra-headers/gnu || die
-		touch "${WORKDIR}"/extra-headers/gnu/stubs-32.h || die
-		export CPATH="${WORKDIR}"/extra-headers
-	fi
-
-	if use qemu; then
-		if use sdl; then
-			sed -i -e "s:\$\$source/configure:\0 --enable-sdl:" \
-				tools/Makefile || die
-		else
-			sed -i -e "s:\${QEMU_ROOT\:\-\.}/configure:\0 --disable-sdl:" \
-				tools/qemu-xen-traditional/xen-setup || die
-			sed -i -e "s:\$\$source/configure:\0 --disable-sdl:" \
-				tools/Makefile || die
-		fi
-	else
-		# Don't bother with qemu, only needed for fully virtualised guests
-		sed -i '/SUBDIRS-$(CONFIG_QEMU_XEN)/s/^/#/g' tools/Makefile || die
-	fi
-
-	# Reset bash completion dir; Bug 472438
-	sed -e "s;^BASH_COMPLETION_DIR      :=.*;BASH_COMPLETION_DIR := $(get_bashcompdir);" \
-		-i config/Paths.mk.in || die
-
-	# xencommons, Bug #492332, sed lighter weight than patching
-	sed -e 's:\$QEMU_XEN -xen-domid:test -e "\$QEMU_XEN" \&\& &:' \
-		-i tools/hotplug/Linux/init.d/xencommons.in || die
-
-	# fix bashishm
-	sed -e '/Usage/s/\$//g' \
-		-i tools/hotplug/Linux/init.d/xendriverdomain.in || die
-
-	# respect multilib, usr/lib/libcacard.so.0.0.0
-	sed -e "/^libdir=/s/\/lib/\/$(get_libdir)/" \
-		-i tools/qemu-xen/configure || die
-
-	#bug 518136, don't build 32bit exactuable for nomultilib profile
-	if [[ "${ARCH}" == 'amd64' ]] && ! has_multilib_profile; then
-		sed -i -e "/x86_emulator/d" tools/tests/Makefile || die
-	fi
-
-	# uncomment lines in xl.conf
-	sed -e 's:^#autoballoon=:autoballoon=:' \
-		-e 's:^#lockfile=:lockfile=:' \
-		-e 's:^#vif.default.script=:vif.default.script=:' \
-		-i tools/examples/xl.conf  || die
-
-	# disable capstone (Bug #673474)
-	sed -e "s:\$\$source/configure:\0 --disable-capstone:" \
-		-i tools/Makefile || die
-
-	# disable glusterfs
-	sed -e "s:\$\$source/configure:\0 --disable-glusterfs:" \
-		-i tools/Makefile || die
-
-	# disable jpeg automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-jpeg:" \
-		-i tools/Makefile || die
-
-	# disable png automagic
-	sed -e "s:\$\$source/configure:\0 --disable-vnc-png:" \
-		-i tools/Makefile || die
-
-	# disable docker (Bug #732970)
-	sed -e "s:\$\$source/configure:\0 --disable-containers:" \
-		-i tools/Makefile || die
-
-	# disable abi-dumper (Bug #791172)
-	sed -e 's/$(ABI_DUMPER) /echo /g' \
-		-i tools/libs/libs.mk || die
-
-	# Remove -Werror
-	find . -type f \( -name Makefile -o -name "*.mk" \) \
-		 -exec sed -i \
-		 -e 's/-Werror //g' \
-		 -e '/^CFLAGS *+= -Werror$/d' \
-		 -e 's/, "-Werror"//' \
-		 {} + || die
-
-	default
-}
-
-src_configure() {
-	local myconf=(
-		--libdir="${EPREFIX}/usr/$(get_libdir)"
-		--libexecdir="${EPREFIX}/usr/libexec"
-		--localstatedir="${EPREFIX}/var"
-		--disable-golang
-		--disable-werror
-		--disable-xen
-		--enable-tools
-		--enable-docs
-		$(use_enable api xenapi)
-		$(use_enable ipxe)
-		$(usex system-ipxe '--with-system-ipxe=/usr/share/ipxe' '')
-		$(use_enable ocaml ocamltools)
-		$(use_enable ovmf)
-		$(use_enable rombios)
-		$(use_enable systemd)
-		--with-xenstored=$(usex ocaml 'oxenstored' 'xenstored')
-	)
-
-	use system-seabios && myconf+=( --with-system-seabios=/usr/share/seabios/bios.bin )
-	use system-qemu && myconf+=( --with-system-qemu=/usr/bin/qemu-system-x86_64 )
-	use amd64 && myconf+=( $(use_enable qemu-traditional) )
-	tc-ld-disable-gold # Bug 669570
-	econf ${myconf[@]}
-}
-
-src_compile() {
-	local myopt
-	use debug && myopt="${myopt} debug=y"
-	use python && myopt="${myopt} XENSTAT_PYTHON_BINDINGS=y"
-
-	if test-flag-CC -fno-strict-overflow; then
-		append-flags -fno-strict-overflow
-	fi
-
-	# bug #845099
-	if use ipxe; then
-		local -x NO_WERROR=1
-	fi
-
-	emake \
-		HOSTCC="$(tc-getBUILD_CC)" \
-		HOSTCXX="$(tc-getBUILD_CXX)" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		OBJDUMP="$(tc-getOBJDUMP)" \
-		RANLIB="$(tc-getRANLIB)" \
-		build-tools ${myopt}
-
-	if use doc; then
-		emake -C docs build
-	else
-		emake -C docs man-pages
-	fi
-}
-
-src_install() {
-	# Override auto-detection in the build system, bug #382573
-	export INITD_DIR=/tmp/init.d
-	export CONFIG_LEAF_DIR=../tmp/default
-
-	# Let the build system compile installed Python modules.
-	local PYTHONDONTWRITEBYTECODE
-	export PYTHONDONTWRITEBYTECODE
-
-	emake DESTDIR="${ED}" DOCDIR="/usr/share/doc/${PF}" \
-		XEN_PYTHON_NATIVE_INSTALL=y install-tools
-
-	# Created at runtime
-	rm -rv "${ED}/var/run" || die
-
-	# Fix the remaining Python shebangs.
-	python_fix_shebang "${D}"
-
-	# Remove RedHat-specific stuff
-	rm -rf "${D}"/tmp || die
-
-	if use doc; then
-		emake DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-docs
-		dodoc -r docs/{pdf,txt}
-	else
-		emake -C docs DESTDIR="${D}" DOCDIR="/usr/share/doc/${PF}" install-man-pages # Bug 668032
-	fi
-	dodoc ${DOCS[@]}
-
-	newconfd "${FILESDIR}"/xendomains.confd xendomains
-	newconfd "${FILESDIR}"/xenstored.confd xenstored
-	newconfd "${FILESDIR}"/xenconsoled.confd xenconsoled
-	newinitd "${FILESDIR}"/xendomains.initd-r2 xendomains
-	newinitd "${FILESDIR}"/xenstored.initd-r1 xenstored
-	newinitd "${FILESDIR}"/xenconsoled.initd xenconsoled
-	newinitd "${FILESDIR}"/xencommons.initd xencommons
-	newconfd "${FILESDIR}"/xencommons.confd xencommons
-	newinitd "${FILESDIR}"/xenqemudev.initd xenqemudev
-	newconfd "${FILESDIR}"/xenqemudev.confd xenqemudev
-	newinitd "${FILESDIR}"/xen-watchdog.initd xen-watchdog
-
-	if use screen; then
-		cat "${FILESDIR}"/xendomains-screen.confd >> "${D}"/etc/conf.d/xendomains || die
-		cp "${FILESDIR}"/xen-consoles.logrotate "${D}"/etc/xen/ || die
-		keepdir /var/log/xen-consoles
-	fi
-
-	# For -static-libs wrt Bug 384355
-	if ! use static-libs; then
-		rm -f "${D}"/usr/$(get_libdir)/*.a "${D}"/usr/$(get_libdir)/ocaml/*/*.a
-	fi
-
-	# for xendomains
-	keepdir /etc/xen/auto
-
-	# Remove files failing QA AFTER emake installs them, avoiding seeking absent files
-	find "${D}" \( -name openbios-sparc32 -o -name openbios-sparc64 \
-		-o -name openbios-ppc -o -name palcode-clipper \) -delete || die
-
-	keepdir /var/lib/xen/dump
-	keepdir /var/lib/xen/xenpaging
-	keepdir /var/lib/xenstored
-	keepdir /var/log/xen
-
-	if use python; then
-		python_domodule "${S}/tools/libs/stat/bindings/swig/python/xenstat.py"
-		python_domodule "${S}/tools/libs/stat/bindings/swig/python/_xenstat.so"
-	fi
-
-	python_optimize
-
-	readme.gentoo_create_doc
-}
-
-pkg_postinst() {
-	readme.gentoo_print_elog
-}
diff --git a/app-emulation/xen/Manifest b/app-emulation/xen/Manifest
index 1f66430e7b4a..725af2145736 100644
--- a/app-emulation/xen/Manifest
+++ b/app-emulation/xen/Manifest
@@ -5,8 +5,6 @@ DIST xen-4.16.2.tar.gz 44995249 BLAKE2B a221d1e4578ab6eb3250754b3b0f36fb30133c1c
 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-1.tar.bz2 68066 BLAKE2B ee6aac9aa8988423fd1594fa09c54678ee8d089abfff27913fdbe4f60c1f2a038e06cca5d03924595036bd9ca9be8a7f61ed5d7662e6534b05a45da24c88babd SHA512 65c7c900ca91f7444cdc03fa0902e8d58d68cd755cfa2d16cf1df76b657328e374fec0da3ceb734aefa10cfa874a46de5f731c3827ab4f815b4eabc305ed497f
 DIST xen-upstream-patches-4.16.3-pre-patchset-0.tar.bz2 36580 BLAKE2B 7a16b452fda7cf00321c70c239f30fbff72204d5b021aba23e1e08b2d8dee0f1180a18301b5935f4d35dc54533e2e253f047681b837de187a2a174191a168c3c SHA512 5e7328c8cd7ce98cdff47033a76705395419c1322d5212206aa1255d19aeb2fd3d097e71d39137ab97aeab0b9f991e1660b92a6ddb08f02c9407ceaa24aa9ec0
-EBUILD xen-4.15.3.ebuild 4724 BLAKE2B d8cea46c30edb523780e7e6bcd2bfa0d45e5c3cd025341228aeaa24b8d5f26587f48a18372f3794f1bc635363391c793d77b63c14de574b239e19f74a4f3a17e SHA512 5167e60d83e9765391d6281cef6dab12145e71ed96a3f6f48139ae9e6d823dd1af0c0becd95d80e84a50a3e978416862232996b34213eaeec55544e0c21b57f3
 EBUILD xen-4.15.4_pre1.ebuild 4676 BLAKE2B bca4039fc0ded4ed79f3fc4a24a261c73f321ec1d765d5afc8014d5fbfc613342fcb2e74572d47f44ad64eeee459206479cc67a842f7727ca9ad6279eca140b7 SHA512 3ca49c40488d02ad81e1f18390967e1f87bb27269f44799cf74851d600aaf069daf9bbbabb5eb52feca6efb3e87b4b19f410e81e7342ec3edf455655c2f15f5e
-EBUILD xen-4.16.2.ebuild 4413 BLAKE2B b9603ec01227513d2c281cebe0e5bc645a3b420490b509ef55e6ce8c3b33296405e32ca6db3b575bdc613554eaca97a2f226f0a63bf9ee60c3df8fb114f474f8 SHA512 25c4c54bfe07f913c3b33b22ea58bb415b6dcb7729c823e649f3a6870caa3268059630554a26bb31de5ab7c47155491aaf96bf39b216822d362c3486caf6a012
 EBUILD xen-4.16.3_pre.ebuild 4420 BLAKE2B c14da1ebcc56c5d0321adfb27dee3a17d20757f89f79326821ed7868862c759937dea2615efc4b26c27158dc2038dc6ce5bd08d2f34855a2934607842f5c27fb SHA512 d2549676e2c4b9afa8dbe61b0f70bde0107e4bf86f33843c993c9f342122d46c62c02b2e8f4fc8f2ee15256e4198c9e100a840b0b580bfbdce14c20885ee929a
 MISC metadata.xml 773 BLAKE2B 3d0c64f8bfaf753ee92681f9da2dfabd6196952b5694244b806cb6cdac02fedd10d8c8defb4f4211664e135cce38c671f543faab58575ae2d603efcb9b2a48b8 SHA512 16993794d7f578562112533f97bb76d1a2fafd0dce038dbd879a4a65d5fc893251f1d188cdc1a2b9f955a27581f76a26409cc0c90706c86514c05e81501966b9
diff --git a/app-emulation/xen/xen-4.15.3.ebuild b/app-emulation/xen/xen-4.15.3.ebuild
deleted file mode 100644
index ff611b2ed315..000000000000
--- a/app-emulation/xen/xen-4.15.3.ebuild
+++ /dev/null
@@ -1,183 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-PYTHON_COMPAT=( python3_{8..10} )
-
-inherit flag-o-matic mount-boot python-any-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="amd64 ~arm -x86"
-
-	XEN_PRE_PATCHSET_NUM=
-	XEN_GENTOO_PATCHSET_NUM=
-	XEN_PRE_VERSION_BASE=
-
-	XEN_BASE_PV="${PV}"
-	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
-		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
-	fi
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz"
-
-	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
-		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
-		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
-		SRC_URI+=" https://github.com/Flowdalic/xen-upstream-patches/archive/refs/tags/${XEN_UPSTREAM_PATCHES_TAG}.tar.gz -> ${XEN_UPSTREAM_PATCHES_NAME}.tar.gz"
-		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
-	fi
-	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
-		XEN_GENTOO_PATCHES_TAG="4.16.1-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
-		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
-		SRC_URI+=" https://github.com/Flowdalic/xen-gentoo-patches/archive/refs/tags/${XEN_GENTOO_PATCHES_TAG}.tar.gz -> ${XEN_GENTOO_PATCHES_NAME}.tar.gz"
-		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
-	fi
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://xenproject.org"
-
-S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="debug efi flask"
-REQUIRED_USE="arm? ( debug )"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )
-	flask? ( sys-apps/checkpolicy )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
-		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
-	fi
-
-	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
-		eapply "${XEN_GENTOO_PATCHES_DIR}"
-	fi
-
-	eapply "${FILESDIR}"/${PN}-4.15-efi.patch
-
-	# Enable XSM-FLASK
-	use flask && eapply "${FILESDIR}"/${PN}-4.15-flask.patch
-
-	# Workaround new gcc-11 options
-	sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="/boot"
-	fi
-
-	default
-}
-
-xen_make() {
-	# Setting clang to either 'y' or 'n' tells Xen's build system
-	# whether or not clang is used.
-	local clang=n
-	if tc-is-clang; then
-		clang=y
-	fi
-
-	# Send raw LDFLAGS so that --as-needed works
-	emake \
-		V=1 \
-		LDFLAGS="$(raw-ldflags)" \
-		HOSTCC="$(tc-getBUILD_CC)" \
-		HOSTCXX="$(tc-getBUILD_CXX)" \
-		clang="${clang}" \
-		"$@"
-}
-
-src_configure() {
-	cd xen || die
-
-	touch gentoo-config || die
-	if use arm; then
-	   echo "CONFIG_EARLY_PRINTK=sun7i" >> gentoo-config || die
-	fi
-	if use debug; then
-		cat <<-EOF >> gentoo-config || die
-		CONFIG_DEBUG=y
-		CONFIG_CRASH_DEBUG=y
-EOF
-	fi
-	if use flask; then
-		echo "CONFIG_XSM=y" >> gentoo-config || die
-	fi
-
-	# remove flags
-	unset CFLAGS
-
-	tc-ld-disable-gold # Bug 700374
-
-	xen_make KCONFIG_ALLCONFIG=gentoo-config alldefconfig
-}
-
-src_compile() {
-	xen_make -C xen
-}
-
-src_install() {
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	xen_make DESTDIR="${D}" -C xen install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
-
-pkg_postinst() {
-	elog "Official Xen Guide:"
-	elog " https://wiki.gentoo.org/wiki/Xen"
-
-	use efi && einfo "The efi executable is installed in /boot/efi/gentoo"
-
-	ewarn
-	ewarn "Xen 4.12+ changed the default scheduler to credit2 which can cause"
-	ewarn "domU lockups on multi-cpu systems. The legacy credit scheduler seems"
-	ewarn "to work fine."
-	ewarn
-	ewarn "Add sched=credit to xen command line options to use the legacy scheduler."
-	ewarn
-	ewarn "https://wiki.gentoo.org/wiki/Xen#Xen_domU_hanging_with_Xen_4.12.2B"
-}
diff --git a/app-emulation/xen/xen-4.16.2.ebuild b/app-emulation/xen/xen-4.16.2.ebuild
deleted file mode 100644
index 108e94c663c3..000000000000
--- a/app-emulation/xen/xen-4.16.2.ebuild
+++ /dev/null
@@ -1,174 +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 flag-o-matic mount-boot python-any-r1 toolchain-funcs
-
-if [[ ${PV} == *9999 ]]; then
-	inherit git-r3
-	EGIT_REPO_URI="git://xenbits.xen.org/xen.git"
-	SRC_URI=""
-else
-	KEYWORDS="~amd64 ~arm -x86"
-
-	XEN_GENTOO_PATCHSET_NUM=2
-	XEN_GENTOO_PATCHSET_BASE=4.16.1
-	XEN_PRE_PATCHSET_NUM=
-	XEN_PRE_VERSION_BASE=
-
-	XEN_BASE_PV="${PV}"
-	if [[ -n "${XEN_PRE_VERSION_BASE}" ]]; then
-		XEN_BASE_PV="${XEN_PRE_VERSION_BASE}"
-	fi
-
-	SRC_URI="https://downloads.xenproject.org/release/xen/${XEN_BASE_PV}/xen-${XEN_BASE_PV}.tar.gz"
-
-	if [[ -n "${XEN_PRE_PATCHSET_NUM}" ]]; then
-		XEN_UPSTREAM_PATCHES_TAG="$(ver_cut 1-3)-pre-patchset-${XEN_PRE_PATCHSET_NUM}"
-		XEN_UPSTREAM_PATCHES_NAME="xen-upstream-patches-${XEN_UPSTREAM_PATCHES_TAG}"
-		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-upstream-patches.git/snapshot/${XEN_UPSTREAM_PATCHES_NAME}.tar.bz2"
-		XEN_UPSTREAM_PATCHES_DIR="${WORKDIR}/${XEN_UPSTREAM_PATCHES_NAME}"
-	fi
-	if [[ -n "${XEN_GENTOO_PATCHSET_NUM}" ]]; then
-		XEN_GENTOO_PATCHES_TAG="$(ver_cut 1-3 ${XEN_GENTOO_PATCHSET_BASE})-gentoo-patchset-${XEN_GENTOO_PATCHSET_NUM}"
-		XEN_GENTOO_PATCHES_NAME="xen-gentoo-patches-${XEN_GENTOO_PATCHES_TAG}"
-		SRC_URI+=" https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/${XEN_GENTOO_PATCHES_NAME}.tar.bz2"
-		XEN_GENTOO_PATCHES_DIR="${WORKDIR}/${XEN_GENTOO_PATCHES_NAME}"
-	fi
-fi
-
-DESCRIPTION="The Xen virtual machine monitor"
-HOMEPAGE="https://xenproject.org"
-
-S="${WORKDIR}/xen-$(ver_cut 1-3 ${XEN_BASE_PV})"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="+boot-symlinks debug efi flask"
-REQUIRED_USE="arm? ( debug )"
-
-DEPEND="${PYTHON_DEPS}
-	efi? ( >=sys-devel/binutils-2.22[multitarget] )
-	!efi? ( >=sys-devel/binutils-2.22 )
-	flask? ( sys-apps/checkpolicy )"
-RDEPEND=""
-PDEPEND="~app-emulation/xen-tools-${PV}"
-
-# no tests are available for the hypervisor
-# prevent the silliness of /usr/lib/debug/usr/lib/debug files
-# prevent stripping of the debug info from the /usr/lib/debug/xen-syms
-RESTRICT="test splitdebug strip"
-
-# Approved by QA team in bug #144032
-QA_WX_LOAD="boot/xen-syms-${PV}"
-
-pkg_setup() {
-	python-any-r1_pkg_setup
-	if [[ -z ${XEN_TARGET_ARCH} ]]; then
-		if use amd64; then
-			export XEN_TARGET_ARCH="x86_64"
-		elif use arm; then
-			export XEN_TARGET_ARCH="arm32"
-		elif use arm64; then
-			export XEN_TARGET_ARCH="arm64"
-		else
-			die "Unsupported architecture!"
-		fi
-	fi
-}
-
-src_prepare() {
-	if [[ -v XEN_UPSTREAM_PATCHES_DIR ]]; then
-		eapply "${XEN_UPSTREAM_PATCHES_DIR}"
-	fi
-
-	if [[ -v XEN_GENTOO_PATCHES_DIR ]]; then
-		eapply "${XEN_GENTOO_PATCHES_DIR}"
-	fi
-
-	# Symlinks do not work on fat32 volumes # 829765
-	if ! use boot-symlinks || use efi; then
-		eapply "${XEN_GENTOO_PATCHES_DIR}"/no-boot-symlinks/${PN}-4.16-no-symlinks.patch
-	fi
-
-	# Workaround new gcc-11 options
-	sed -e '/^CFLAGS/s/-Werror//g' -i xen/Makefile || die
-
-	# Drop .config
-	sed -e '/-include $(XEN_ROOT)\/.config/d' -i Config.mk || die "Couldn't	drop"
-
-	if use efi; then
-		export EFI_VENDOR="gentoo"
-		export EFI_MOUNTPOINT="/boot"
-	fi
-
-	default
-}
-
-xen_make() {
-	# Setting clang to either 'y' or 'n' tells Xen's build system
-	# whether or not clang is used.
-	local clang=n
-	if tc-is-clang; then
-		clang=y
-	fi
-
-	# Send raw LDFLAGS so that --as-needed works
-	emake \
-		V=1 \
-		LDFLAGS="$(raw-ldflags)" \
-		HOSTCC="$(tc-getBUILD_CC)" \
-		HOSTCXX="$(tc-getBUILD_CXX)" \
-		CC="$(tc-getCC)" \
-		CXX="$(tc-getCXX)" \
-		LD="$(tc-getLD)" \
-		AR="$(tc-getAR)" \
-		OBJDUMP="$(tc-getOBJDUMP)" \
-		RANLIB="$(tc-getRANLIB)" \
-		clang="${clang}" \
-		"$@"
-}
-
-src_configure() {
-	cd xen || die
-
-	touch gentoo-config || die
-	if use arm; then
-	   echo "CONFIG_EARLY_PRINTK=sun7i" >> gentoo-config || die
-	fi
-	if use debug; then
-		cat <<-EOF >> gentoo-config || die
-		CONFIG_DEBUG=y
-		CONFIG_CRASH_DEBUG=y
-EOF
-	fi
-	if use flask; then
-		echo "CONFIG_XSM=y" >> gentoo-config || die
-	fi
-
-	# remove flags
-	unset CFLAGS
-
-	tc-ld-disable-gold # Bug 700374
-
-	xen_make KCONFIG_ALLCONFIG=gentoo-config alldefconfig
-}
-
-src_compile() {
-	xen_make -C xen
-}
-
-src_install() {
-	# The 'make install' doesn't 'mkdir -p' the subdirs
-	if use efi; then
-		mkdir -p "${D}"${EFI_MOUNTPOINT}/efi/${EFI_VENDOR} || die
-	fi
-
-	xen_make DESTDIR="${D}" -C xen install
-
-	# make install likes to throw in some extra EFI bits if it built
-	use efi || rm -rf "${D}/usr/$(get_libdir)/efi"
-}
diff --git a/dev-lang/Manifest.gz b/dev-lang/Manifest.gz
index ed1d12c88966..1fb7e7262ac2 100644
--- a/dev-lang/Manifest.gz
+++ b/dev-lang/Manifest.gz
diff --git a/dev-lang/python/Manifest b/dev-lang/python/Manifest
index 8c8a1e8655e6..bf45db4b44fc 100644
--- a/dev-lang/python/Manifest
+++ b/dev-lang/python/Manifest
@@ -16,16 +16,22 @@ DIST Python-3.9.15.tar.xz 19712208 BLAKE2B a8490c998c89ed4e3e87ef48e3b5d622e5d06
 DIST Python-3.9.15.tar.xz.asc 833 BLAKE2B c325fb52fae254153456c24c1039b07c9ccf8734df3665640215d35219ccacb705f99d94c9f8b644d15d4ea4612f5ac0da599814f68f7d3b6fc1fdc175db9002 SHA512 722625091731536757b9db447590c31620665133d45076367a3281f2ee3add23a781b10ce5cea582d65caabb18814583c1a347689d2b396214e36a6771182f38
 DIST python-gentoo-patches-2.7.18_p15.tar.xz 34956 BLAKE2B d173f276dd9c0ce31004dcc55a0d18e9ce25a47683c2df3c4dd62e967dfbbb35be59a2f08cf20f30a19475a8a2344dd95b17400eafa88b5fdbe9270a12ccbf32 SHA512 d9386808265f978808e5c0ffd384cefe54fb0e05aeccfd394167d5227d9cd66e25c8e93c54914762b2cfc3c2dd851b26a7a84d62634c6aa8a0798aacbb7ac25f
 DIST python-gentoo-patches-3.10.8.tar.xz 10104 BLAKE2B a2e5fa956652fda1464c65ba4f648da2d77a545d53bf8d2429bce745c93e82eaea40bf6da3289f4216fe4b029b97ccf6ac0c3cfbdcc179f3c5f9e64e89cd5fe4 SHA512 e506c7fc3f6ebff340f090b462716c745f1acfa95c00a39a58367941efb356b8dcd72a3fa46d6760422733c0d6b65b79f0e8bedc77b93289c51ca4dc2ea0db2a
+DIST python-gentoo-patches-3.10.8_p1.tar.xz 12712 BLAKE2B 54370dc973fedfab4dda33a20733f483f1592fede407541b90d8389bf03f9697bf755e35a39d1d45ea99b42edaa434a0901a35b7058c73fbc4e9ca8472fce35e SHA512 093a9a532713eea68b18a0681db782cf38176f4582473e4fb45c45ce6d27f9a4a7f8fd37141ae44492283bbe9eda698c7190cfd8b4cddaf4f945124b908f3cf2
 DIST python-gentoo-patches-3.11.0.tar.xz 5404 BLAKE2B 7109040bd27e77b4a17e94d24060644ae9b42f618768beb4ae0659c65b33a943e6158ccf8724432ff0f97d7b3a86e2efb99795fbeed801723049a99d2dcc96c3 SHA512 94f3f7f3262f5c064fec4977230bbde09ca8f77e92739aa230f73ef9e1012049a2d9cefc7774a2538f732e0e7ba170214956578d64c19124bd964d4915982bb0
 DIST python-gentoo-patches-3.11.0rc2_p1.tar.xz 6292 BLAKE2B e52e0066ca3f53e2efd2d71c035849cd619d3a8cdeb9767cc28369f4b7f04ffd74419e7c02913d4b10958937dc8960fa4287862e8db627e5f421472a18efeb73 SHA512 a6ae37288e7621275b46ab1a813dfbbbf24ee511d644b4027e396f5cba56fccf94e19cb354468ea4c35cd86db2040b165c87c8e24cc2c9e598e91946a1f80863
 DIST python-gentoo-patches-3.12.0a1.tar.xz 4896 BLAKE2B 2c1582f37372eedd3fddae0a07db718cb9bd2ae41e1b9c5807ee400c554bb9aa928445ea8043fe8d12dc64c6d23766875b5957e10aa8414658cc9e037ad87244 SHA512 d6f6f522ee8c9c616bea4237449417f585b0dd3606307fe80e0a3f719856ea5691c90a6ea5bf8b330d71d88477a5411f66146dc2aebb697edcfa04112bad4e2c
 DIST python-gentoo-patches-3.8.15.tar.xz 25700 BLAKE2B 1f13964caed36f70f5d5d2637ce39ac06efd52b744c353463486844dfaa411d38c37e3e50921a97183315bf44aa36557bd071dbfd8b2a69e8f1a05de5f11bba8 SHA512 39326cd1cff1794ca607c769750525a77cb0a4e6435d0fab141cff82cb05d68a6269014f8a30d7143b57b51170b3efcf43bfa6b41a079f588880e5562a63d54f
+DIST python-gentoo-patches-3.8.15_p1.tar.xz 26988 BLAKE2B c289b6c17052187b0c8ea012c6c283c3513f7465bc14f58be22d4d38447390a6f334f60a2f5aa7b1a3393dcdb175adf6c8cc659148ea2742046fba26ad8a65b4 SHA512 6d20d2329b4bd9cbd147cf12211ad14d071be7434571c45a4ab4535af16ae865a09a924bf2960281e716cd0f57c7b290a7786c607995c996d2211d41fb8c7a14
 DIST python-gentoo-patches-3.9.15.tar.xz 20200 BLAKE2B 4367cdeb0d9c27110f52f5061717e37da6b9d8a167de24417fdf2b88b4cf6d512fba2c81df90a19f02e929baaf755e70ede305b5ebbb0be94bd5ab3dc3f1bdfa SHA512 9c3a20b49a29d83d2c55d7432f606ebdcaf6210c6bf6d891084d0b2161502002c6f6738cee6e05eceb8ffd6b6a40d4c6ea42f6e07634388644aaeb8f87dbdf8e
+DIST python-gentoo-patches-3.9.15_p1.tar.xz 22716 BLAKE2B 8bfe3ed3642a6734d7662c68be50c050112c1f2ae5bc10742b47e2b2943336df3bc6b0b5e6f0c1a1180dffc0590bbdd7341e84bafbfcfaf5977cde3184de6278 SHA512 f68b88a296a5ba6cf352c20345abe8c1dcaf9fbcaf6e48c2d7390e5d3ca57f786bfcefb912962d6642272f00dde832595bb73b48b03f3300bc11e3417e0f5fa6
 EBUILD python-2.7.18_p15-r1.ebuild 8307 BLAKE2B 4be343c831fc645acc31432978f0ddb6da538abadc55238b5907a7b7c822c2e308455d1bb0d27d53c887be89fca742088932c2d4ba570293097113f6b5c0c2a6 SHA512 5fb05c1a8f045fd3eb3e24fafef2063fc51db7cfd13fcb3475a1c0e54c458db76c5667f9e164bd9ec084ba9965b7745bbf3c6bc7070db228b32c934a19722ecf
 EBUILD python-3.10.8.ebuild 12688 BLAKE2B 389b8c4090310a79e3f8b35606f92e965aef5811726d3b81588dbd3d87597031d857ca1e1492149baa23c59d79ce8f98c03e41077a51deae441e4917b5a9a2e3 SHA512 4d2206754e2a00fb32bf16e71d639323cf209f097fb6d88ef9c8f4191fe56a5f5605b66755e95e286a1da7f6f37984651b9f15d706a8383bc5e5034d48a5c81b
+EBUILD python-3.10.8_p1.ebuild 12690 BLAKE2B bfcaa92b76652bac59400ba2ff5a7dc61b0d96457288a0b69c95881576062785cc9e24a666e2ab4a4aff30eff39c20fbfe0f0e64ae20ac99b83a3b5f282feed5 SHA512 83539402051d094a4b63e9811e8464e4e12f7be98b079fb30843f42abf455bf09923092b4b61f2c7e264d7aa6c41656825bb5e63d3c609cf89c44e0dfcb421f2
 EBUILD python-3.11.0.ebuild 13796 BLAKE2B 68a3298bf892bcb49b231d55e5bdc4795860324f4be5c128cb322871f6f851c3a82e955229d5e44aa01f18d38c95a44c967ad4aa4117d1aeb5e368353838fb80 SHA512 355d220ecc17ae85ee0c8c1bf5140bce8014c7c60bb6965c6d09493fe3e98cd25f78e4611cadbb40b6e35d8ce90f67eb77b03d13e129fe2373d663a745f778d6
 EBUILD python-3.11.0_rc2_p1.ebuild 13357 BLAKE2B fac65a9fba93a49af0ed0dd91f532e6cd729b815ae71b06dcdc40391dbf5252c56067be5a8085576cee41bf96d011fe9264ec0c390bb22db2265579d8b696092 SHA512 faa9b3067f81e57d8969825fa7851ac74690fdaab8b380f963f8567a09ce69a250592ee23df42f584c25261a49e93bafcecd23ab9d392d90ad4794e2c532d7e7
 EBUILD python-3.12.0_alpha1.ebuild 13351 BLAKE2B 1ac4335670654fc62854502cdc86505afa55710aa26cc5f6c4660bbdcea26b5977996b02a552786d4e644d4347223c6faab01b21ae595e8417ffd5b93ae80a3e SHA512 4e2a27dd7582470774b8e523320ee13ca24087ef4bcc71f7c1098d6fa9a49533d2d284dbc25a2cb25238e88c88e89259e292ea2b3760bb196aa00aca0431bf8e
 EBUILD python-3.8.15.ebuild 11238 BLAKE2B 8299e6660df9f222e3e1ba22f2baa30686f5be412294f3266db0431c0cb28a530b957bbba8170581f095c7bdb8ea25e3374aad831a52df936e4ffe748eb20837 SHA512 991a3fdf9f69a39600542b5a70ffba5113213689f7a1efe0d3307ce63fd00a31c046bc7c114c126c0fec1b9bd74e27b0dce52f7d4d9863211c9e5eb04b2682d3
+EBUILD python-3.8.15_p1.ebuild 11240 BLAKE2B 2c9f3b15ee76877b4132f7393dde16d4c85d0b657c674afd83c6278ed0af57f5ddada7bd33443c032b877b919c3442cbd03326dd99bd1b618e82dd9042ba2242 SHA512 cc86a2ac322c48b85f8a6c307ee0d82a13e6336c9389bd12557f0b818349b02483c5a313f0ab5e64a392b32b31374990a753be6ed30d58227824873db170bf79
 EBUILD python-3.9.15.ebuild 12491 BLAKE2B ea7e3f7bf9d06e6c995ee7f4ce62179ced7a2791a42e4d53013b8f6fbb363992f3547c2dc844669f92bf27ee880bd69bfa7af366124cd83bfb36a9d5214112ae SHA512 c3b701a2d63ca021f948df9b23426c938b3c005a2fe6570cb543a997fffd289ebce58815460d930265b0ad124cfab0ebf378cf2c6e42ee9ac7f0a139bdea9ab6
+EBUILD python-3.9.15_p1.ebuild 12493 BLAKE2B 0fe83749a303851449f9138227af2d3e7d966a705207eafe33c012984aad7e3e8bee6049587ed2ee661da331be1c8cf0e6062992373ee67c251d7fb7d63cf69b SHA512 a6ce3d8dd7ac9faead9e9fed04fed5691aa1fdfcf9c7994da3d6021b90fd16c0f12c67b0ea564c91796726540c2642eafc79d2ea529bd89b3cc2730fe87f049f
 MISC metadata.xml 1068 BLAKE2B 3c3511739ae8251d11bde32aa3a21225fd3468f2b1f31c459de956c5bb7dbc2de4103a288dd29b26d1023e40bac62631fa953d1515513e934f5c3962d9c715a7 SHA512 0f7d3f9305cc539619568aea7e54cdb9a3319579e811108cf03d7c66290e4f21080a87ca02f1a62264d4ecd41a243c91f0a639e6c064ccf2b24b460508c848b8
diff --git a/dev-lang/python/python-3.10.8_p1.ebuild b/dev-lang/python/python-3.10.8_p1.ebuild
new file mode 100644
index 000000000000..f2ab6be80ca3
--- /dev/null
+++ b/dev-lang/python/python-3.10.8_p1.ebuild
@@ -0,0 +1,459 @@
+# 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=
+
+	if tc-is-cross-compiler ; then
+		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+		# propagated to sysconfig for built extensions
+		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
+		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
+		local -x CFLAGS= LDFLAGS=
+
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910 and bug #864911.
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross.
+			--without-lto
+			--disable-optimizations
+		)
+
+		# Point the imminent CHOST build to the Python we just
+		# built for CBUILD.
+		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
+
+		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+		# Avoid as many dependencies as possible for the cross build.
+		cat >> Makefile <<-EOF || die
+			MODULE_NIS=disabled
+			MODULE__DBM=disabled
+			MODULE__GDBM=disabled
+			MODULE__DBM=disabled
+			MODULE__SQLITE3=disabled
+			MODULE__HASHLIB=disabled
+			MODULE__SSL=disabled
+			MODULE__CURSES=disabled
+			MODULE__CURSES_PANEL=disabled
+			MODULE_READLINE=disabled
+			MODULE__TKINTER=disabled
+			MODULE_PYEXPAT=disabled
+			MODULE_ZLIB=disabled
+		EOF
+
+		# Unfortunately, we do have to build this immediately, and
+		# not in src_compile, because CHOST configure for Python
+		# will check the existence of the Python it was pointed to
+		# immediately.
+		emake
+		popd &> /dev/null || die
+	fi
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	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.8.15_p1.ebuild b/dev-lang/python/python-3.8.15_p1.ebuild
new file mode 100644
index 000000000000..a15da0ebfd0d
--- /dev/null
+++ b/dev-lang/python/python-3.8.15_p1.ebuild
@@ -0,0 +1,400 @@
+# 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=
+
+	if tc-is-cross-compiler ; then
+		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+		# propagated to sysconfig for built extensions
+		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
+		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
+		local -x CFLAGS= LDFLAGS=
+
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910 and bug #864911.
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross.
+			--without-lto
+			--disable-optimizations
+		)
+
+		# Point the imminent CHOST build to the Python we just
+		# built for CBUILD.
+		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
+
+		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+		# Avoid as many dependencies as possible for the cross build.
+		cat >> Makefile <<-EOF || die
+			MODULE_NIS=disabled
+			MODULE__DBM=disabled
+			MODULE__GDBM=disabled
+			MODULE__DBM=disabled
+			MODULE__SQLITE3=disabled
+			MODULE__HASHLIB=disabled
+			MODULE__SSL=disabled
+			MODULE__CURSES=disabled
+			MODULE__CURSES_PANEL=disabled
+			MODULE_READLINE=disabled
+			MODULE__TKINTER=disabled
+			MODULE_PYEXPAT=disabled
+			MODULE_ZLIB=disabled
+		EOF
+
+		# Unfortunately, we do have to build this immediately, and
+		# not in src_compile, because CHOST configure for Python
+		# will check the existence of the Python it was pointed to
+		# immediately.
+		emake
+		popd &> /dev/null || die
+	fi
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	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.15_p1.ebuild b/dev-lang/python/python-3.9.15_p1.ebuild
new file mode 100644
index 000000000000..b0f92b136118
--- /dev/null
+++ b/dev-lang/python/python-3.9.15_p1.ebuild
@@ -0,0 +1,454 @@
+# 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=
+
+	if tc-is-cross-compiler ; then
+		# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+		# propagated to sysconfig for built extensions
+		local -x CFLAGS_NODIST=${CFLAGS_FOR_BUILD}
+		local -x LDFLAGS_NODIST=${LDFLAGS_FOR_BUILD}
+		local -x CFLAGS= LDFLAGS=
+
+		# We need to build our own Python on CBUILD first, and feed it in.
+		# bug #847910 and bug #864911.
+		local myeconfargs_cbuild=(
+			"${myeconfargs[@]}"
+
+			# As minimal as possible for the mini CBUILD Python
+			# we build just for cross.
+			--without-lto
+			--disable-optimizations
+		)
+
+		# Point the imminent CHOST build to the Python we just
+		# built for CBUILD.
+		export PATH="${WORKDIR}/${P}-${CBUILD}:${PATH}"
+
+		mkdir "${WORKDIR}"/${P}-${CBUILD} || die
+		pushd "${WORKDIR}"/${P}-${CBUILD} &> /dev/null || die
+		ECONF_SOURCE="${S}" econf_build "${myeconfargs_cbuild[@]}"
+
+		# Avoid as many dependencies as possible for the cross build.
+		cat >> Makefile <<-EOF || die
+			MODULE_NIS=disabled
+			MODULE__DBM=disabled
+			MODULE__GDBM=disabled
+			MODULE__DBM=disabled
+			MODULE__SQLITE3=disabled
+			MODULE__HASHLIB=disabled
+			MODULE__SSL=disabled
+			MODULE__CURSES=disabled
+			MODULE__CURSES_PANEL=disabled
+			MODULE_READLINE=disabled
+			MODULE__TKINTER=disabled
+			MODULE_PYEXPAT=disabled
+			MODULE_ZLIB=disabled
+		EOF
+
+		# Unfortunately, we do have to build this immediately, and
+		# not in src_compile, because CHOST configure for Python
+		# will check the existence of the Python it was pointed to
+		# immediately.
+		emake
+		popd &> /dev/null || die
+	fi
+
+	# pass system CFLAGS & LDFLAGS as _NODIST, otherwise they'll get
+	# propagated to sysconfig for built extensions
+	local -x CFLAGS_NODIST=${CFLAGS}
+	local -x LDFLAGS_NODIST=${LDFLAGS}
+	local -x CFLAGS= LDFLAGS=
+
+	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 be9ac9025bed..4e83749f0b2a 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/opencl-clang/Manifest b/dev-libs/opencl-clang/Manifest
index 2c1f379ae9d7..70f45984bdc2 100644
--- a/dev-libs/opencl-clang/Manifest
+++ b/dev-libs/opencl-clang/Manifest
@@ -6,5 +6,5 @@ DIST opencl-clang-14.0.0.tar.gz 26109 BLAKE2B 2ae5e6d69e2f13b867712d03b52fce893a
 DIST opencl-clang-15.0.0.tar.gz 26212 BLAKE2B 02d3a8eb3964b6882bd94b676b4459412c753ac38e1e3012662021e98a8219225eaf6af4f62f4e0e97de428f55b0b698374dc39babff09a0fcc73213d5daacfe SHA512 a2ffce43493793524e9512be2e7bd46c0183b86b35a6f79018d355d07a83303a944e6dacebfb768e88ce75a7020a44939be872a2d4e754544198a9829f4febd4
 EBUILD opencl-clang-13.0.0-r1.ebuild 921 BLAKE2B 27c6192ef832933135aab894574c064f2406ec37992cae78366d6a0f5225b5e1479d9bab6c24182e9d2614cb997ce2682c4f75632347c58e1c947e5d733d95fc SHA512 577e0403af1962813e0f854a81ac830410e40b89be981c6e4811e9f6f4e71959b08c145e51fab88ac95f7049e41b7c0426e91e62a581e2e2b1ba3d6c665eead2
 EBUILD opencl-clang-14.0.0.ebuild 879 BLAKE2B c8e67dc6c53a91e153bec1b9c22849ae0a56aa009ee3b317b8332858fc19cc2d28afbf4fe312dfed35bd0b0614e2e64498dc68c8cadcad83aa417b0948b7a34a SHA512 41e32bdafaf1a956120b0bce9ba5f792335a68145e7665d22d153398cee8923bb62b8c3777005bb34d9df9fde331e416b360ae9231e2e7dd53392e38e0e8c991
-EBUILD opencl-clang-15.0.0.ebuild 836 BLAKE2B f10032f1918c4056b9b340491911ab98149539b10ef9751a6652bcac257a60ecf413cd8ae524d0705265a8218c47db3836e11e05470ec96d5957345683226556 SHA512 dd620cb89dd0742a6745c14c4e73485f523996968bcba43c428ff702cdab2ac0eccd2e84e2392f94528a1db38c8d5529b6b27d2d20cf6ecb4c9b7be80e95c39c
+EBUILD opencl-clang-15.0.0.ebuild 835 BLAKE2B aa29444f0c4b231ab0eba8edc770422afb3bb0e8ad6cda8b7b9af18952140141ca698cb98faeb6d336f3a9030dfebb5d9740a517eafbe8fd710f0f63e963fe67 SHA512 c3b042d4b7c70299cd2e83aa411c4d72ba2fe3f40bfc58997a57914c9e4bce8419e94fc2f8d9f6385b968092b6c57c251914523bedbd7e5108173e85a6cc0108
 MISC metadata.xml 583 BLAKE2B a16519cc07cd2add030b90218d3cdcf9473c684e0a1a0149e7dd352881213c8579c3ed7ceee69db479264fca10561ac023c01be7451ce689fa6408b81cf8b032 SHA512 d3c3f41c5c5fdb4b6b85c737071540ef8d53e148d5f7e69367eeaa6cbe7cb84563d2381de851cc4da41b5300856dd7e6b1e67454a4fc9a9d890590e3a17526b5
diff --git a/dev-libs/opencl-clang/opencl-clang-15.0.0.ebuild b/dev-libs/opencl-clang/opencl-clang-15.0.0.ebuild
index d9682f8e0030..658057bcc863 100644
--- a/dev-libs/opencl-clang/opencl-clang-15.0.0.ebuild
+++ b/dev-libs/opencl-clang/opencl-clang-15.0.0.ebuild
@@ -14,7 +14,7 @@ S="${WORKDIR}/${PN}-${PV}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-util/spirv-llvm-translator:${SLOT}=
diff --git a/dev-php/Manifest.gz b/dev-php/Manifest.gz
index fe71ac21a349..7df956222e2b 100644
--- a/dev-php/Manifest.gz
+++ b/dev-php/Manifest.gz
diff --git a/dev-php/igbinary/Manifest b/dev-php/igbinary/Manifest
index 7239e747677e..6f61744d7a48 100644
--- a/dev-php/igbinary/Manifest
+++ b/dev-php/igbinary/Manifest
@@ -1,3 +1,5 @@
 DIST igbinary-3.2.7.tar.gz 248481 BLAKE2B 40936fb78b9f01d717daac78f8b707f902d78714e5202fbb1344042c2d30a3b723f9c5b6fd982f7a5002aab65e414ba7f9bda354fec4db82ba3f03fc09663a43 SHA512 1bdb60fa4ac76ef405b55b4a7e7f07c73ccc945a3fad8635934cf83a05ae554ac1a0b64c4b55229f0bd2a3269189d3266a492b064a0338fdb2bf4dfe5c3733e4
-EBUILD igbinary-3.2.7.ebuild 562 BLAKE2B 1ff5c7f0e86bb6ba895bffe2ffd5e798b93f2fc1764aba33b30569195b62128022820d7855a4db5bdf16571bbf1488a5cf5c5bf80c911e99562468faafd12e9f SHA512 fe3053117ba45fe64840b638c5b1376b200da61f44533e8f6a54127adb244da2299d3d81a6963c3149d29aae6a2ce53851530ed399abad64ea61977a320dfbf0
+DIST igbinary-3.2.9.tar.gz 251747 BLAKE2B d44711ffc195572a83a000f225776191e7b421e4be3065a668287f356d46fd11536af0a0969a0fc219c38d027f13aec16cfe41f15ea778ef087f7082daa9b8dc SHA512 2789f8517aaefa4e4e736592944361e8bad1ce50687aed161bb4e17bcdfbfec2320df8069c7b39704fa96c614727bd66fb65185b15f72f8c96bb5fda88f2e66f
+EBUILD igbinary-3.2.7.ebuild 555 BLAKE2B 55ce93a92c908b1a3838cf8742be5135d35ecb8b3678fb20f21066930e0109c6a5ac584d5855b28d3cd66905de855915abd58b4929c3c7b15c7cff81f1b6c3a5 SHA512 39ae60c959d011cd92940fe786a5aee3fa58f47a9fe1b84fb228f5c02fb7b98b86f075db7cec657265fc9a55a0282e9cf0d2d0b652a1964a0046cecc524a34f6
+EBUILD igbinary-3.2.9.ebuild 533 BLAKE2B f2607e4e997411054865d64959bddfdf2b568bc995f5b93c963969d08bb4deb95346f2a5316ad446b511683a59c55bbbb07d102be775c894edf04bd39cb593d2 SHA512 707f54a46367e56dbb71385e9c878c7fcdf5f331266783043307c2d70c8df87f2816f72597f239c9c4585bbda7765c5d80b3db036511f6df2828ef7f3dce0564
 MISC metadata.xml 332 BLAKE2B dd842052dec2b48669fb7d85ee2637132f64d64d56ac9ece1394222211f3cc1a698e0d5e4dda6d4d5289a4debfe7a44c0c776ec2399d3384874be03278995af2 SHA512 0e2d8ac966bb0f3e40fcf96e0ff93ebd9353a0629129e14f9be2186fe7fc3db8cb5fafc3af795b59005332d66085f1636df62b5454998cb9bd09bfacc1ced0a6
diff --git a/dev-php/igbinary/igbinary-3.2.7.ebuild b/dev-php/igbinary/igbinary-3.2.7.ebuild
index 76c951c51966..e675bb47e592 100644
--- a/dev-php/igbinary/igbinary-3.2.7.ebuild
+++ b/dev-php/igbinary/igbinary-3.2.7.ebuild
@@ -8,7 +8,7 @@ PHP_EXT_ZENDEXT="no"
 DOCS=( CREDITS NEWS README.md )
 PHP_EXT_ECONF_ARGS=( --enable-${PN} )
 
-USE_PHP="php7-3 php7-4 php8-0 php8-1"
+USE_PHP="php7-4 php8-0 php8-1"
 
 inherit php-ext-source-r3
 
diff --git a/dev-php/igbinary/igbinary-3.2.9.ebuild b/dev-php/igbinary/igbinary-3.2.9.ebuild
new file mode 100644
index 000000000000..b2f81fe8a0fa
--- /dev/null
+++ b/dev-php/igbinary/igbinary-3.2.9.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PHP_EXT_ECONF_ARGS=( --enable-${PN} )
+PHP_EXT_INI="yes"
+PHP_EXT_NAME="${PN}"
+PHP_EXT_ZENDEXT="no"
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
+
+inherit php-ext-source-r3
+
+DESCRIPTION="A fast drop-in replacement for the standard PHP serialize"
+HOMEPAGE="https://github.com/igbinary/igbinary"
+SRC_URI="https://github.com/${PN}/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~x86"
diff --git a/dev-php/pecl-apcu/Manifest b/dev-php/pecl-apcu/Manifest
index d6d54005cfcb..9f4abd46a09e 100644
--- a/dev-php/pecl-apcu/Manifest
+++ b/dev-php/pecl-apcu/Manifest
@@ -1,3 +1,5 @@
 DIST apcu-5.1.21.tgz 92516 BLAKE2B 32d73b89bde9ef4eb01c9ad766930e87300b86776c95929607a8aaefba5043e3a7947d064416ac083ff38876fdb41bb03dab1552ac000082e54f809269b4c925 SHA512 a6ffe8349760d27cde0d86017a59a68e9639bf385e606622d807094f4e5fb305bb25b9ce00077d0856f4d223d44329f7a6314c229b62c78d8e2b085593c92bb3
+DIST apcu-5.1.22.tgz 93926 BLAKE2B abc3b27c4224da14b6438df9243f6b7b8245102f7eee0208daf1317bead5463d8f454e33536b8c949a2825140487faf9bb79745180a26e1f0015494e0986acb9 SHA512 8f2f4292679bc359ea680ecaf397d69de32bf67d57d719a4839a026ab1b96d5ec4725e92c5c0d1972a117a7cd3d3c456a1f4ec03192fda4657e685de60b9e93e
 EBUILD pecl-apcu-5.1.21.ebuild 1377 BLAKE2B 8cf95367e4f9026d8b74cdb72858b0973dfef273aa96e6e829fff094d1bb1b3fa2d488f8e8ba27be371d98f1bd280f683a42b8150eb6415563bd8f154bf75f4e SHA512 6af888ef45a5b5623a7238c9b132477d2a439ec91b2892655be95c149524ac2dce688de3547c80786b61c85797aeee601da5056ce03b03c49acfc79c38159f32
+EBUILD pecl-apcu-5.1.22.ebuild 1385 BLAKE2B e196caa62b381e1176faf47406656e0b24ff70623978d5d06da1391f9b7e294f5af3e9159d2b9b31b61aafdfb84cbe61069a5aa525d414632562264aead12459 SHA512 739c76e865c694d33c57e920a5c46742e423f077b754d79cf1080232ca99daefda75acc81511fa2279aa8d92f7b080a54a851e8fbbfebc273f9c402cef6693d8
 MISC metadata.xml 541 BLAKE2B 533f563e606b35d23c766aa177ea80b56b17ff352e907f2aed65c82be8bb6b01bcb61d69c6be6560b8e975ac279cf3a00ba5976d4a50c0f3ae68677ae7557cd8 SHA512 5dde6ecb39edb11fc4222cf869449f43fe3923623cea2a8ee4d4a4b8d7bf11bcc6d40f135cb5dc4cc81b161ed50489230bba443274c914d0015046ea44c868d8
diff --git a/dev-php/pecl-apcu/pecl-apcu-5.1.22.ebuild b/dev-php/pecl-apcu/pecl-apcu-5.1.22.ebuild
new file mode 100644
index 000000000000..ee48a184ed83
--- /dev/null
+++ b/dev-php/pecl-apcu/pecl-apcu-5.1.22.ebuild
@@ -0,0 +1,62 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PHP_EXT_INI="yes"
+PHP_EXT_NAME="apcu"
+PHP_EXT_ZENDEXT="no"
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="Stripped down version of APC supporting only user cache"
+
+LICENSE="PHP-3.01"
+SLOT="7"
+KEYWORDS="amd64 ~arm ~arm64 ~x86"
+
+LOCKS="pthreadmutex pthreadrw spinlock semaphore"
+LUSE=""
+for l in ${LOCKS}; do
+	LUSE+="lock-${l} "
+done
+IUSE="+mmap ${LUSE/lock-pthreadrw/+lock-pthreadrw}"
+REQUIRED_USE="^^ ( $LUSE )"
+
+DOCS=( NOTICE README.md TECHNOTES.txt )
+
+src_prepare() {
+	php-ext-source-r3_src_prepare
+
+	# Remove broken tests from php 7.4 due to trivial output differences
+	if use php_targets_php7-4 ; then
+		php_init_slot_env "php7.4"
+		rm "${PHP_EXT_S}"/tests/apc_entry_00{2,3}.phpt || die
+	fi
+}
+
+src_configure() {
+	local PHP_EXT_ECONF_ARGS=(
+		--enable-apcu
+		$(use_enable mmap apcu-mmap)
+		$(use_enable lock-spinlock apcu-spinlocks)
+	)
+
+	# Broken upstream autoconf test disables if present at all
+	use lock-pthreadrw || PHP_EXT_ECONF_ARGS+=( --disable-apcu-rwlocks )
+
+	php-ext-source-r3_src_configure
+}
+
+src_install() {
+	php-ext-pecl-r3_src_install
+
+	insinto /usr/share/php7/apcu
+	doins apc.php
+}
+
+pkg_postinst() {
+	elog "The apc.php file shipped with this release of pecl-apcu"
+	elog "was installed to ${EPREFIX}/usr/share/php7/apcu/."
+}
diff --git a/dev-php/pecl-imagick/Manifest b/dev-php/pecl-imagick/Manifest
index 7caa850f3815..82913a1d1637 100644
--- a/dev-php/pecl-imagick/Manifest
+++ b/dev-php/pecl-imagick/Manifest
@@ -1,7 +1,7 @@
 DIST imagick-3.5.1.tgz 301411 BLAKE2B 551c8a0aa07b18938fce3e39ee503ed053efb261fab712d1c1ba2fb941a911307b8d9e88257dddde19dfa77886688b5b704eb7e1cd65bba734e10b5391661374 SHA512 b922c4fad994a4bf26f4d92b6e81bb761bd8d4d1b52f4b7099cf944cdaed4e44d0318beccfb2cf3bee2605ce33b0ad764d9e3d2ba99c9a6f624ca569a4ac73ad
 DIST imagick-3.6.0.tgz 351361 BLAKE2B 9e62332e93e380d362f9eb9cba108f7fa7a4442ac7d87a367e6a5dc3bfef253aa83168131def9bd5c84fc85a8f6088cf77e9db5b5270d84d0908b102aa6a971a SHA512 ea5ae1fe35cd90fb83cf4b752675b75716e79973f3f24ae2bcf2723528f3ef7137363e6537d386d20bdfaad42065d5de04410701bd04f412ca6d36e31b9f15d4
 DIST imagick-3.7.0.tgz 360138 BLAKE2B 2c149f2ec771df92789d67e88c6f7180d3da7c9182561432bdd4e0a83f96982cc8fc95bc1a003e05e37a54fabe6ab0fe693a6b9208d2e481d36e6c334aeee023 SHA512 c84408e4e4a0c46d979240e06d58d264c6bb21f3b95e3d434c8a21cd808f6c495fd453ef9c07b5c44dac81c6f205b6697f8ecaf1a65a86ce4e9052328a389ebe
-EBUILD pecl-imagick-3.5.1.ebuild 861 BLAKE2B 31072a907b40812bb1a970aadfb637bfc89409a980fe788020d3a94f717967f7d9df9556aff63539a8702084bb154ddf03757874311900a2b662c8c9544b5486 SHA512 382263c9b9175c1dae501729142d950006e402fd72f3fbbfdc671bd89ee33731b4e3257ba86998296936afd323e10553edad30f3fc3574091a325c659b4b1db7
-EBUILD pecl-imagick-3.6.0.ebuild 870 BLAKE2B aaffd50217dc5d48f071fd9721b88643fa4c88f97a4e7b4f8a84d04d4d184cfe057b1391f839235cc7bf8a56e931eb74ec98581d337776ecefee4dcdb2a8f851 SHA512 89302c9b90447804363f817298a9db21ca05f78e668fae6a4ffb38ac8fa704e38b2c6809c1cd09a15abb7a7de0bd21afc681ce16886a585e030bbfde72a5021e
-EBUILD pecl-imagick-3.7.0.ebuild 870 BLAKE2B aaffd50217dc5d48f071fd9721b88643fa4c88f97a4e7b4f8a84d04d4d184cfe057b1391f839235cc7bf8a56e931eb74ec98581d337776ecefee4dcdb2a8f851 SHA512 89302c9b90447804363f817298a9db21ca05f78e668fae6a4ffb38ac8fa704e38b2c6809c1cd09a15abb7a7de0bd21afc681ce16886a585e030bbfde72a5021e
+EBUILD pecl-imagick-3.5.1.ebuild 854 BLAKE2B 9ced193bc9e686dba1ff9faad0e6aab2a2c7f4826ab5e4f2e2386606577397a9865e442039ac6f1b8be1a7779c87405c5a40c312c65d81937ff0559cdd941b3c SHA512 1f092c1e0eaf97fda9872b99956c4a8f79fe87c927a4272e7d49c36ffc704e38dad3da50135333a87e0f2a364cf528ec933f8395c1a83514e4b84640de2d168b
+EBUILD pecl-imagick-3.6.0.ebuild 863 BLAKE2B 69ee554c2971f210f65cfe835f2f9744efa958f1cbe2577338c346291a9df3abe2f88801a60440da9408def2552ad8cc6c11118fa01559585c21e72e6eada94a SHA512 e8f398cd879ee999a72d8c1984f832e3b294e7c30cbfad8b5cf4d1d05be8649c4765f4ef78de25bac8d894de07a449f918837acec71c1a717d37664098d1d10f
+EBUILD pecl-imagick-3.7.0-r1.ebuild 870 BLAKE2B 770347a3932c8b4dffca0e14d8a5042e4539f6702157641c6e698f5337c2bb3254a18058815c89381ae2b9f5973b2a029d04a56af25fa3d3e8cb5cb3e9db4586 SHA512 3ec408a0b7f52c74680cf77e3b0c9566a0939cad77d21fa75f054e31d51ea069bd513372f3b236a1b532936a392c47b8c02a960169baf2bfee51b4536b2a1499
 MISC metadata.xml 359 BLAKE2B d4097f49cede8e9756516f72966ca0eb1a3dae8655db21065fe2196442aa0e23b63f070b8510f031ce189620efc8b293de00266e14c120d3efe84312da737019 SHA512 c5eeeb6eb11fce27a705cd4d75719af7557a5c11cf391f7191dc482b8518a19211e114dfd82cf897a7891affbd6ff6ab4aebd00fe78e79a7d53305517664face
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.5.1.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.5.1.ebuild
index bc3b95efa6d7..7c5171846123 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.5.1.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.5.1.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI="7"
 
 PHP_EXT_NAME="imagick"
-USE_PHP="php7-3 php7-4 php8-0"
+USE_PHP="php7-4 php8-0"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.6.0.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.6.0.ebuild
index c561a81cc660..cec99a0b783d 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.6.0.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.6.0.ebuild
@@ -4,7 +4,7 @@
 EAPI="7"
 
 PHP_EXT_NAME="imagick"
-USE_PHP="php7-3 php7-4 php8-0 php8-1"
+USE_PHP="php7-4 php8-0 php8-1"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-imagick/pecl-imagick-3.7.0.ebuild b/dev-php/pecl-imagick/pecl-imagick-3.7.0-r1.ebuild
index c561a81cc660..8f23fe654a7b 100644
--- a/dev-php/pecl-imagick/pecl-imagick-3.7.0.ebuild
+++ b/dev-php/pecl-imagick/pecl-imagick-3.7.0-r1.ebuild
@@ -1,10 +1,10 @@
 # Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
 PHP_EXT_NAME="imagick"
-USE_PHP="php7-3 php7-4 php8-0 php8-1"
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-php/pecl-memcached/Manifest b/dev-php/pecl-memcached/Manifest
index cabf3cb9dd41..daeb22d42e2a 100644
--- a/dev-php/pecl-memcached/Manifest
+++ b/dev-php/pecl-memcached/Manifest
@@ -1,6 +1,3 @@
-DIST memcached-3.1.5.tgz 83015 BLAKE2B 80f5cbed8e34f867962792d95d242015690f64ab3b462e09813a11b8b86234b0b05b0f6a78f7c6184482b66ba8015064b37f77bbb816a3aee2edd0ce97ab0cbc SHA512 87d5fd079fcaad81139785d6766da71b23a1a0fe907d4b22f3a787af148a20412c11df11c4d98c165241658baf0d87c8a6b29de15db07a0f9d1fabc8aec8f0e9
 DIST memcached-3.2.0.tgz 90722 BLAKE2B 5bc3ce40803004f45ad397684277862dbaffce467b3026e33d9737d4d93a82f2c89e32a256ebf6db3117a462ff8f81a517ed9950773cb4a0e927aa8af4e834be SHA512 ece5759a9d6d52afd46beb0821811e5d4830e75ad8564af395e2107fd349e271c6e6cf20eeacd9ad15ee2e99ccf0118ccc83c5810e2f3fa7c61f1984b0b26514
-EBUILD pecl-memcached-3.1.5-r1.ebuild 1582 BLAKE2B 7cb8c180c14bf80a1e4447bfde1c1087f483c582b3f748c819b2e1d9393e5eb5c8a3ac7c4c0cd99d8dd62ecfd2eb302cf83224fdf7de370d21e9a2520b6990cf SHA512 b9aa92fafe9a68a647e3e76212b40c36b65ebcfed423d82a22fe3aad146149a1d915a895cf77c06830b9a0bb589d992d4470e640365f3beb7f46d5c5b3e70662
 EBUILD pecl-memcached-3.2.0-r1.ebuild 1570 BLAKE2B f4ff4997fdec5cd231e24f6a84f6dbcc089674d55f82581eff4edf16581f44a4132bc63186c38b36e96d4e627c7cd75f870a528ac0f10caa73c2a330a244a7fb SHA512 d907e85e0891702c7b1f96879fdded271ec044f7cbaf89bf110d407b2065e24e522cfc142799943a507519bdb1efa54dbbceff56aef6a02bfef4fb72531c4a44
-EBUILD pecl-memcached-3.2.0.ebuild 1527 BLAKE2B 00b017f2620871b04c87b0da4d2754ab8680a071e9687899dbdda0229c7f137344b1d471750f8079ee9194267113e4107cc75cc72e35387683de358f4dc36f8f SHA512 300580410c2e5e07fca52c4d0c4035650e59e81bb0b31d6320fedbcb61da7cf8875c20cade2c8a4530fae570d6bfb4305247c85281a22d6209a68b1bb9f9a89f
 MISC metadata.xml 569 BLAKE2B 686b6c91f4d91fb82bd90b08af6627a8211e9676139417551e8a8425da410c15a77b79ff51760c2a16815c84c55c1e81ff462af17282ffa198db0829b20566c6 SHA512 8f3154fc7f3c9d1707b121ddc8d94d8d5570f7ca0cc93c0f732cda3ba6a756ed421a6facd96000ade0c22af9a78efbdd69ec118bd195c4c83fc523f2cd7e1cc7
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild
deleted file mode 100644
index 281bbb0a15f7..000000000000
--- a/dev-php/pecl-memcached/pecl-memcached-3.1.5-r1.ebuild
+++ /dev/null
@@ -1,59 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-PHP_EXT_NAME="memcached"
-DOCS=( ChangeLog README.markdown )
-
-USE_PHP="php7-2 php7-3 php7-4"
-inherit php-ext-pecl-r3
-
-DESCRIPTION="Interface PHP with memcached via libmemcached library"
-LICENSE="PHP-3.01"
-SLOT="7"
-KEYWORDS="amd64 arm arm64 x86"
-IUSE="igbinary json sasl +session test"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl(-)?]
-	sys-libs/zlib
-"
-
-RDEPEND="
-	php_targets_php7-2? (
-		${COMMON_DEPEND} dev-lang/php:7.2[session(-)?,json(-)?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-2(-)] )
-	)
-	php_targets_php7-3? (
-		${COMMON_DEPEND} dev-lang/php:7.3[session(-)?,json(-)?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] )
-	)
-	php_targets_php7-4? (
-		${COMMON_DEPEND} dev-lang/php:7.4[session(-)?,json(-)?]
-		igbinary? ( dev-php/igbinary[php_targets_php7-4(-)] )
-	)"
-DEPEND="${RDEPEND} test? ( net-misc/memcached )"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS="--enable-memcached
-		$(use_enable session memcached-session)
-		$(use_enable sasl memcached-sasl)
-		$(use_enable json memcached-json)
-		$(use_enable igbinary memcached-igbinary)"
-
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 )
-	[[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
-	memcached "${memcached_opts[@]}" || die "Can't start memcached test server"
-
-	local exit_status
-	php-ext-source-r3_src_test
-	exit_status=$?
-
-	kill "$(<"${T}/memcached.pid")"
-	return ${exit_status}
-}
diff --git a/dev-php/pecl-memcached/pecl-memcached-3.2.0.ebuild b/dev-php/pecl-memcached/pecl-memcached-3.2.0.ebuild
deleted file mode 100644
index 09b3c0ce9508..000000000000
--- a/dev-php/pecl-memcached/pecl-memcached-3.2.0.ebuild
+++ /dev/null
@@ -1,56 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-PHP_EXT_NAME="memcached"
-DOCS=( ChangeLog README.markdown )
-
-USE_PHP="php7-4 php8-0 php8-1"
-PHP_EXT_NEEDED_USE="json(+)?,session(-)?"
-MY_P="${PN/pecl-/}-${PV/_rc/RC}"
-PHP_EXT_PECL_FILENAME="${MY_P}.tgz"
-PHP_EXT_S="${WORKDIR}/${MY_P}"
-
-inherit php-ext-pecl-r3
-
-DESCRIPTION="Interface PHP with memcached via libmemcached library"
-LICENSE="PHP-3.01"
-SLOT="7"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
-IUSE="igbinary json sasl +session test"
-
-RESTRICT="!test? ( test )"
-
-COMMON_DEPEND=">=dev-libs/libmemcached-1.0.14[sasl(-)?]
-	sys-libs/zlib
-	igbinary? ( dev-php/igbinary[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] )
-"
-DEPEND="${COMMON_DEPEND}"
-RDEPEND="${COMMON_DEPEND}"
-BDEPEND="${COMMON_DEPEND} test? ( net-misc/memcached )"
-
-S="${WORKDIR}/${MY_P}"
-
-src_configure() {
-	local PHP_EXT_ECONF_ARGS="--enable-memcached
-		$(use_enable session memcached-session)
-		$(use_enable sasl memcached-sasl)
-		$(use_enable json memcached-json)
-		$(use_enable igbinary memcached-igbinary)"
-
-	php-ext-source-r3_src_configure
-}
-
-src_test() {
-	touch "${T}/memcached.pid" || die
-	local memcached_opts=( -d -P "${T}/memcached.pid" -p 11211 -l 127.0.0.1 -U 11211 )
-	[[ ${EUID} == 0 ]] && memcached_opts+=( -u portage )
-	memcached "${memcached_opts[@]}" || die "Can't start memcached test server"
-
-	local exit_status
-	php-ext-source-r3_src_test
-	exit_status=$?
-
-	kill "$(<"${T}/memcached.pid")"
-	return ${exit_status}
-}
diff --git a/dev-php/pecl-parallel/Manifest b/dev-php/pecl-parallel/Manifest
index c4024c4fc711..98c4c59a9c15 100644
--- a/dev-php/pecl-parallel/Manifest
+++ b/dev-php/pecl-parallel/Manifest
@@ -1,4 +1,5 @@
 DIST pecl-parallel-1.1.4.tgz 58783 BLAKE2B 942c767ff4838c13e70829d6ac6599cee3185afaf71e9dc430064835102d31a3e50b99694e1632be652c6a019934a13ba0f5139041bba39d486a20615478b910 SHA512 6693f01b0d43de5153aa0953f90580717e519cfbe8ca5b0ba6abd9cc681e0efe9d7c6fcc601da98f74b570b5810dffdbf5100bedc8ab86c1f4bc61d48955ae77
-EBUILD pecl-parallel-1.1.4.ebuild 556 BLAKE2B 261c1a02c6e8a5c083e080aabe25505b5732002c8114b106a9b35bbe26a91179cf623d19c087eca412fd80ac7c94cb0b038fb341d43287e781b4164d3ab48077 SHA512 ba5f1726fef372707fd7fdaa72ec88c5162810ba709fdf5ef77f56a301733293b728b29b2a7c8f3701b2c5c2c0529a66e5ff89c0eafca3335ed9bf812750817e
-EBUILD pecl-parallel-9999.ebuild 643 BLAKE2B 5492e573a78ec073781706138c1f144f992afc17f7c148c76b73b6de118b3c3c12e8d937d0a480981060196af92e22acb25fce21bf255206e547c43ba54e3375 SHA512 f4fa0aa82e87ab4a10a1da088203e0f855ec17bcafa41cb57b49a18a8c3f11d14d2f1a3f1c56552309dabf869f08050d989e62a42a71d5d86985a426ff21d960
+DIST pecl-parallel-1.2.0.tgz 61019 BLAKE2B 84b127e7c10f083bead7d12648b312b07d036fdd63239881ad299f4a111d98d1a62d781754c8a11614848ecb0042a3d403b40167072722261bc3734091920665 SHA512 a96e61c94fe5fb2e00f6c9007df553bb59d95a96c76a47fcd74e26d1c48b1ac0bd5359174035c6f534808367e7e0c74c9f0e74f8128de38126a008d26be2efa0
+EBUILD pecl-parallel-1.1.4-r1.ebuild 392 BLAKE2B fe3c4b6bebd9bb1fedbda6457446387e4ba7b648846152fc290fff2ec52dee4314a766a8839627499c67cb5d0336e92ef59f631da114b3b1c51d54d9279a0e82 SHA512 3a518b433ba2c5779c0cc25e04dcb2331f2111ce8b365e542cf28cef013cfbd2f523521e19960013297e4503bfd8033c5845d7b85e4f98a1c373a05d6849f68f
+EBUILD pecl-parallel-1.2.0.ebuild 406 BLAKE2B 7682e4d1fbdf733dc563117c47a57bb98587bcf7995974d1b2baf2b45bbf1430eadaab6f316869066b4dbd12ee0919e581c7925ce2d8eb9cb8587d75b465aec5 SHA512 e13b407e34eb7619228e8ac045679b3fc5a02c544812d22ab912da281af02eef3f86afb5d89d3015e3abbc198e0c862ba6f38f24cc5084574be175e2ffb4bc12
 MISC metadata.xml 388 BLAKE2B 8627eaf1867246255f9cf5e886749300fe854b6fc4add00c1fb7395a41349a42aeaf9bcd1866b1ef8a6b3ecd04416cd6ebb7dcebd266ae341af4aaa144de510d SHA512 238ec6ad37a6fcb588eeb6f5f00befa9e9f483cbd012d7e98b9627a3bf3f401ea74aee560a1909458a471e6c44b3ea13eb3a7d30e5f5a1f5c5464c9775d5614d
diff --git a/dev-php/pecl-parallel/pecl-parallel-1.1.4.ebuild b/dev-php/pecl-parallel/pecl-parallel-1.1.4-r1.ebuild
index 5d0e7fc04b47..941d335ccb68 100644
--- a/dev-php/pecl-parallel/pecl-parallel-1.1.4.ebuild
+++ b/dev-php/pecl-parallel/pecl-parallel-1.1.4-r1.ebuild
@@ -1,28 +1,19 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI="7"
+EAPI="8"
 
-PHP_EXT_NAME="parallel"
 PHP_EXT_INI="yes"
+PHP_EXT_NAME="parallel"
+PHP_EXT_NEEDED_USE="threads"
 PHP_EXT_ZENDEXT="no"
-
-USE_PHP="php7-3 php7-4"
+USE_PHP="php7-4"
 
 inherit php-ext-pecl-r3
 
+DESCRIPTION="A succint parallel concurrency API for PHP"
 SRC_URI="${SRC_URI} -> ${P}.tgz"
 
-KEYWORDS="~amd64 ~x86"
-
-DESCRIPTION="A succint parallel concurrency API for PHP"
 LICENSE="PHP-3.01"
-SLOT="0"
-IUSE="test"
-RESTRICT="!test? ( test )"
-
-RDEPEND="
-	php_targets_php7-3? ( dev-lang/php:7.3[threads] )
-	php_targets_php7-4? ( dev-lang/php:7.4[threads] )
-"
-DEPEND="test? ( ${RDEPEND} )"
+SLOT="7"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-php/pecl-parallel/pecl-parallel-1.2.0.ebuild b/dev-php/pecl-parallel/pecl-parallel-1.2.0.ebuild
new file mode 100644
index 000000000000..fdd0ad0de190
--- /dev/null
+++ b/dev-php/pecl-parallel/pecl-parallel-1.2.0.ebuild
@@ -0,0 +1,19 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="8"
+
+PHP_EXT_INI="yes"
+PHP_EXT_NAME="parallel"
+PHP_EXT_NEEDED_USE="threads"
+PHP_EXT_ZENDEXT="no"
+USE_PHP="php8-0 php8-1 php8-2"
+
+inherit php-ext-pecl-r3
+
+DESCRIPTION="A succint parallel concurrency API for PHP"
+SRC_URI="${SRC_URI} -> ${P}.tgz"
+
+LICENSE="PHP-3.01"
+SLOT="8"
+KEYWORDS="~amd64 ~x86"
diff --git a/dev-php/pecl-parallel/pecl-parallel-9999.ebuild b/dev-php/pecl-parallel/pecl-parallel-9999.ebuild
deleted file mode 100644
index f89155872481..000000000000
--- a/dev-php/pecl-parallel/pecl-parallel-9999.ebuild
+++ /dev/null
@@ -1,28 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PHP_EXT_NAME="parallel"
-USE_PHP="php8-0 php8-1"
-PHP_EXT_NEEDED_USE="threads"
-PHP_EXT_ECONF_ARGS=()
-
-inherit php-ext-source-r3 git-r3
-
-DESCRIPTION="A succint parallel concurrency API for PHP"
-HOMEPAGE="https://pecl.php.net/package/parallel"
-EGIT_REPO_URI="https://github.com/krakjoe/parallel.git"
-
-LICENSE="PHP-3.01"
-SLOT="0"
-KEYWORDS=""
-IUSE="doc"
-
-src_unpack() {
-	git-r3_src_unpack
-
-	# create the default modules directory to be able
-	# to use the php-ext-source-r3 eclass to configure/build
-	ln -s src "${S}/modules" || die
-}
diff --git a/dev-php/pecl-redis/Manifest b/dev-php/pecl-redis/Manifest
index a4dc1e9d7eb7..443d5d78cdbf 100644
--- a/dev-php/pecl-redis/Manifest
+++ b/dev-php/pecl-redis/Manifest
@@ -1,5 +1,5 @@
 DIST redis-5.3.6.tgz 274235 BLAKE2B 8479b3060abb99f765b27fd8937cb4c7ef92c55c0581ae6a69dd06113367547d546a9f96a8418df928f258520cb0fed6f5d39f6d88972c74b8446134be08edc4 SHA512 e5047ba9974ff6065be0fe8614aea8bf7d7c77b3a4ca08b19d0bb53069dd164614ffd19bf09bda458511abddce438fd816c28a169536388c8c4cd923596aadf0
 DIST redis-5.3.7.tgz 275200 BLAKE2B 50cff3d36e189593a741ed3fe05c3558e6a0621e7ff906e4902ba39e3f7d3ae5b9bfa554480a131e32bcc0334bccbd3aa5507dc714b6d4b20ac808139c525a95 SHA512 b945d5aa86d3f58e75094369b0f324e987202f104aca7d7b46ba23cfaed54d186bb66931e200dd16d2dbeea11732dd0311da4e3d7485c3b725027f7924652832
-EBUILD pecl-redis-5.3.6.ebuild 1530 BLAKE2B 0a3a03b2089fa90564fa0e88deb1cc985f075f2cea6e9ba24384e5cafd4b44c769db78c7f03724d7e8d7569f358c70ffc249f9177cee05cf758a11939a94c97b SHA512 0a5d17ac5010a68635e551e1d1202a76cf1d656ed94ebcf12b01ae1fb44eb93f042d278ba2dc14c198bbcec8b43468264071e627e5b3963fd1598fb0b9b3f461
-EBUILD pecl-redis-5.3.7.ebuild 1508 BLAKE2B 83833ea972811c1f8932c72d129eb8afce4577f638a65c6da4e4270bdbd15738af23e71003a2f48c08d2001bfb17d1954c37141991e3ddb82f02b9bb9f14a94d SHA512 842cf19bf21796b15eb90d2e37cabe1996aa6bbb8aa9c8655c526ea3cb5904e0789363c8efbfb0809a1fac2e57bdd75302ad3eef0434c895840b78334a47e5a0
+EBUILD pecl-redis-5.3.6.ebuild 1500 BLAKE2B 5af701a366b66f638126426a0427644e1447634a4d780e97a4da49fd81d64877eff47c549646819de849141adce1266c8fa1cc877ec16d576bd5a50981b5292a SHA512 ff2835af9ab04e3be3be13b55f5f0122dd3cd641365074af8228ff05c8a7c124b0129e6937319a4fa71f2a0a7807933affbdd65fde806cb2c75108c383e7c80b
+EBUILD pecl-redis-5.3.7-r1.ebuild 1538 BLAKE2B 1366f92af7a563534c336d0695a9e6580669c9db4e3c0a550e0a84456edf6fdb5f363b564cc040011914bd329f6d1572e936248dd27b444b18fa213ace63a3d2 SHA512 9fab2cc3ded02c01238ddb4a0bf0bb47aad3a7004bba8f9d1324a5148de4ed26672deedfc90624ed9b8c76b4a6d2cc53b8912c0c366242c82fa79447bfbe129a
 MISC metadata.xml 384 BLAKE2B 4a1a6b326526bb3f5b9d9d57158d6abbfe3c65b1cfc11980ce849d5f7278558ee0daf580aefc521939aae175cd8e2cb990e046fce8faf6774348b24fa6465ef8 SHA512 851e1fb9f6612105640028262a4821f0da5b1ee5949fdd99067e821ce1d22c41888ee53e102becc93c918a605c2b8dbb2d493cd7cad516530912fec652011364
diff --git a/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild
index 8b0fdebbfc3d..d2e0f4804db5 100644
--- a/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-5.3.6.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PHP_EXT_NAME="redis"
-USE_PHP="php7-3 php7-4 php8-0 php8-1"
+USE_PHP="php7-4 php8-0 php8-1"
 PHP_EXT_NEEDED_USE="json(+)?,session(-)?"
 DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
 MY_P="${PN/pecl-/}-${PV/_rc/RC}"
@@ -20,7 +20,7 @@ KEYWORDS="amd64 ~arm"
 IUSE="igbinary +json lz4 +session zstd"
 
 DEPEND="
-	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-3(-)?,php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] )
+	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] )
 	lz4? ( app-arch/lz4:= )
 	zstd? ( app-arch/zstd:= )
 "
diff --git a/dev-php/pecl-redis/pecl-redis-5.3.7.ebuild b/dev-php/pecl-redis/pecl-redis-5.3.7-r1.ebuild
index 437cd906213e..3c1ac592ec02 100644
--- a/dev-php/pecl-redis/pecl-redis-5.3.7.ebuild
+++ b/dev-php/pecl-redis/pecl-redis-5.3.7-r1.ebuild
@@ -4,7 +4,7 @@
 EAPI=8
 
 PHP_EXT_NAME="redis"
-USE_PHP="php7-4 php8-0 php8-1"
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
 PHP_EXT_NEEDED_USE="json(+)?,session(-)?"
 DOCS=( arrays.markdown cluster.markdown README.markdown CREDITS )
 MY_P="${PN/pecl-/}-${PV/_rc/RC}"
@@ -20,7 +20,7 @@ KEYWORDS="~amd64 ~arm ~arm64"
 IUSE="igbinary +json lz4 +session zstd"
 
 DEPEND="
-	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] )
+	igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] )
 	lz4? ( app-arch/lz4:= )
 	zstd? ( app-arch/zstd:= )
 "
diff --git a/dev-php/pecl-yaml/Manifest b/dev-php/pecl-yaml/Manifest
index f169a2a6fbea..5a2b23ae6890 100644
--- a/dev-php/pecl-yaml/Manifest
+++ b/dev-php/pecl-yaml/Manifest
@@ -1,5 +1,3 @@
-DIST yaml-2.2.1.tgz 40977 BLAKE2B 110f77058ac2b1c26dcfb7df024bb37ee58c902fc2fe6ff1ba14d981a17591d6cfda157c79d8d991e8edda95818978b83a98ba7b873367788a64f6c1abd78196 SHA512 b171ca9ca108dc093fb0dda3bc9de821fdd8ddcf79d386baba02f367e331f42e6500f26e73577864cd5f8d12f8c9bfe01962fb8d1bb56fa26d6f0a1208ac5441
 DIST yaml-2.2.2.tgz 41063 BLAKE2B 9fc85be5cb1eb86bc052b86d6292601babee0eb6fa790c0f5a77b307c2bd5a7a6ff66ea9efa21fa958a3c4f415f1850525454566b5a4303182d12a778fb2ed93 SHA512 4c1d3012623154b8d74908fb319a637d7bff178d02d0732d1a3d19d24df2c612d62948eb7dcd9ead9fd31f2da7af0cec54657b8cce128968a04079dd0002117d
-EBUILD pecl-yaml-2.2.1.ebuild 577 BLAKE2B 8f6ee8dfc9cca36543541586217e56c9f6784c88f27bb3d1d77acf76e9c21b5df7ac427b3304d6964665118f10c19aa14ea2509666639ed2c39f75bee4eae6bd SHA512 806b7da09702f802d48447a9dd5f9af7f354b65a10507720b222cd4f22c38156efd50ade7bb19fe4d7e63cfcb490aba5c274c5ae8a7ed44eb57a60ab589f333d
-EBUILD pecl-yaml-2.2.2.ebuild 411 BLAKE2B c5a6e38a96ff2262c3823572e43871845975356b8daa61491fbbfb354caa68f97a8b84ea11c067a9cbe0b2aada2ad6ff6c7dac78e12c3678608624953ce5f64f SHA512 455ec11379b0fcf9996db95183c8aef6e2f12128773b011ef059c382fabca639b163f2a868c9fa006d841b6e5b4e01f68501a3a28e4192b2e94b18f07dddd8d6
+EBUILD pecl-yaml-2.2.2.ebuild 411 BLAKE2B 760299e11a4b2605a418a086bfa9ad3a57d407d2931287378314ca37ff6c16afda7cdee8bc1706229ffe01cc667d6bf078175c3bf4de6f4a46007663e26d1c16 SHA512 1549404ce75e26f078fe5a36013cb24e588a0aa0d279062eb53ba8ab19a050c46526acbea6381db0d19e0f77667e1b6bdb615043355707820ec98fa0c4cbd1ae
 MISC metadata.xml 239 BLAKE2B c25c5a46bb59def6d564473a743d1c351a5fbeea2168a71478952bc219392c40f6e86a6e510589d9b70b834f58967a8d647f4cf2f1d4de1e37e2828f70035b44 SHA512 6f0cde14a96ea085b4d2e48538a956d62dbb4ee847096cebed5ad02e35f0f183a22aa19282ed4f59bf8f6d6ef935e6c7def3f7a5b4b24ee227601b6f8974e781
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.2.1.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.2.1.ebuild
deleted file mode 100644
index f05593acf494..000000000000
--- a/dev-php/pecl-yaml/pecl-yaml-2.2.1.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-MY_PV="${PV/_rc/RC}"
-PHP_EXT_PECL_FILENAME="yaml-${MY_PV}.tgz"
-PHP_EXT_NAME="yaml"
-PHP_EXT_INI="yes"
-PHP_EXT_ZENDEXT="no"
-DOCS=( CREDITS README )
-
-USE_PHP="php7-3 php7-4 php8-0"
-
-inherit php-ext-pecl-r3
-
-S="${WORKDIR}/yaml-${MY_PV}"
-PHP_EXT_S="${S}"
-
-KEYWORDS="~amd64 ~arm64 ~x86"
-
-DESCRIPTION="YAML 1.1 (YAML Ain't Markup Language) serialization for PHP"
-LICENSE="MIT"
-SLOT="7"
-IUSE=""
-
-DEPEND=">=dev-libs/libyaml-0.1.0"
-RDEPEND="${DEPEND}"
-PHP_EXT_ECONF_ARGS=()
diff --git a/dev-php/pecl-yaml/pecl-yaml-2.2.2.ebuild b/dev-php/pecl-yaml/pecl-yaml-2.2.2.ebuild
index 8f9139b326f2..8bc40bd2fa2c 100644
--- a/dev-php/pecl-yaml/pecl-yaml-2.2.2.ebuild
+++ b/dev-php/pecl-yaml/pecl-yaml-2.2.2.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 PHP_EXT_NAME="yaml"
 PHP_EXT_INI="yes"
 PHP_EXT_ZENDEXT="no"
-USE_PHP="php7-3 php7-4 php8-0 php8-1"
+USE_PHP="php7-4 php8-0 php8-1 php8-2"
 
 inherit php-ext-pecl-r3
 
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index d214a16f933a..db474128c784 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/clang-python/Manifest b/dev-python/clang-python/Manifest
index ce74e0d3de31..7599dd2765b4 100644
--- a/dev-python/clang-python/Manifest
+++ b/dev-python/clang-python/Manifest
@@ -7,7 +7,7 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-python-13.0.1.ebuild 925 BLAKE2B 1dab0cbb672643072e7d824a262c81505d19e555f24f97f82156473affc2f5ba6fc34ec493ffeedbc82feb1245fc6a39126e1b81fcdc8f8b4ddd0b7fe108e4bb SHA512 11eaf5c7a484d756f01986eacce19c912666518892f3213ff42367c126c2d8474abf6608cca24e6250c64e7423464e7cb3e58c2b069c7febf4893b249f2ee304
 EBUILD clang-python-14.0.6.ebuild 956 BLAKE2B 491c8335c64484034663fd84ca2397e13afdd8cab6d3b4adfcc9317379e7a3620372ffe5996d4a0029a7d412f11a0d598f741a6893803ebadba85d330e49682a SHA512 4ef0d1ab2cbc3d277d4cced33fa87de7c3d43295a60a3b418ad4a95399e8de8c2e1e5c594681bf7ce1bfc465732d34b2db3a9e8636c0ed124ddf79c8ed7a5750
-EBUILD clang-python-15.0.3.ebuild 1168 BLAKE2B b393d5cbb5e01f46da90232e0dd5b265e01643a33085108fe6ada27b6407742814d6c61d37d23cbb93ed1cbe47bd2b4301d37d8e03ae5243e13fe0b92df4b492 SHA512 1337fb232189df580021eaa06c732bf5f2e5f59a506cc28e674913c048e81053d440eff05332510ecb4ab3596fb88ffae6d6eb9fecf9732424d83865b853c6c4
+EBUILD clang-python-15.0.3.ebuild 1167 BLAKE2B 5a32b05a4e7c8b41511a2652be3d1a3832d8ebeba2ecc138566e8ac0ed7c78eb7edba431af20ef475d2a52b3219a9880c65c7df001410173d4d305e1bd823b44 SHA512 173ee4a9f597c2b09219086a6cf5a4e9034f5c9509e313f01947c2936525eb335aecb124dceb75ff0c09a84ffd6274e4b595457c4b35f94a96f5b4bae248c227
 EBUILD clang-python-15.0.4.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-16.0.0.9999.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
 EBUILD clang-python-16.0.0_pre20221016.ebuild 1145 BLAKE2B 2c0006ee4c9c1d509374c1ec3673c162736786cf5d869ea7611fe5f34ac781a0e955b1da61576e40f945a1b8965142954ee2b30a30f496c94965af52c3202674 SHA512 9380040980974d397c5a38be33bbc932826b2adcbfd89abb95e67c26027459ee160b59a5b47466816fdda44cca3d89fa8177642a30404c6c4dcd695c20a81156
diff --git a/dev-python/clang-python/clang-python-15.0.3.ebuild b/dev-python/clang-python/clang-python-15.0.3.ebuild
index 93cd19a2acec..20e711a06f41 100644
--- a/dev-python/clang-python/clang-python-15.0.3.ebuild
+++ b/dev-python/clang-python/clang-python-15.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/dev-python/cx_Freeze/Manifest b/dev-python/cx_Freeze/Manifest
index ac8aa0ffe120..eb1cad21d5fd 100644
--- a/dev-python/cx_Freeze/Manifest
+++ b/dev-python/cx_Freeze/Manifest
@@ -1,6 +1,8 @@
 AUX cx_Freeze-6.8.2-buildsystem.patch 534 BLAKE2B 2ac116374717090f7316b434fd36f77b6693f92b8e236d71663a297f6d6d8629ab9c247b35dc80b3b455d643a25a4aec97c586a6c4580947e8edaa529721aed8 SHA512 accef4bdb6b7a986998cf13b356faa4825e19542e38623570c7f6fb1cdc60f6aca41ee03e84dd543a352bfd77eba227be29cacee60117aad54cd802b4309d169
 DIST cx_Freeze-6.11.1.gh.tar.gz 1307368 BLAKE2B 7bfbe61274b29890ba35fda133d4c18708d3a04bc33c96633f6651fb9712fec4628f92e2044284ad1bfb992a76e4772669a29ada2f12f16741378d636701e4ad SHA512 37586365a901800fcd18ab6e3b0de9e3e9980c8d8b8b61aa1eddf0d01dc50b53cb1ffc77070f5a5ad40c9b7a020b09ced51d38f53688129b2444abe020a75237
 DIST cx_Freeze-6.12.0.gh.tar.gz 1483040 BLAKE2B 78faa77b7bd12344f601bcc5811dff43d6e9440f7cf96167b438557f93bc8d26c59c375930090389946005984245ff93232ddb6d7340ca28012ccb356d0ca630 SHA512 a3fdd94b33985b3bb0fbee2fc7438e20f3ddb31f0d71322eed1c06a15954be5845a0b1dfbc55537fe16022db95b446d3fa0b3e8418cd250e653f42a180b8c586
+DIST cx_Freeze-6.13.0.gh.tar.gz 1486127 BLAKE2B f0f54db5ce6f0d8d70efc3321741a70d496773742505cf316646051c41154f9f11dba2fc964f6e16d01e2aa54ed2c9988ec006c3bbbf70b1e37f623aee0a061a SHA512 ed6a9607dd93bfe608036beae6f52a535c240fed222d5ae5da43037ef135cd9423e815066539f975facced221d466db5393bb207eadaec3654ed409c664c2f83
 EBUILD cx_Freeze-6.11.1.ebuild 1179 BLAKE2B 63fd22bdd45f3dab448c516205d16222cbadf7b4144c87800c8ab540cd6e132d8ef8e5f3c001c216c17f06caf18e4e20e74ca01a40533dfd4136434dcdbd2b3d SHA512 25ba7339735397d32d1c96c499826893ca661ae49daa544a28195038b82a43239789854e606a7cfe4795242b3204c943cca39f715010f1e0e264a8b4f5905e1f
 EBUILD cx_Freeze-6.12.0.ebuild 1274 BLAKE2B f89de13356f9b3bd6a48863b5a3927fb07f7e4cf1bdcae5d7a5b42d402b642f36cab779a42c1dcf16f8444a611278722ace3f596781bf95df3f5d0b1070d279b SHA512 6cc113a26520e6880898bd7b37cd9d59be14811cc62470e6f0c672b436b9253cac1669476bd7aeea3da94e8572c6326b899e1ec7ae78e7e9a54e20d52c1919fd
+EBUILD cx_Freeze-6.13.0.ebuild 1274 BLAKE2B f89de13356f9b3bd6a48863b5a3927fb07f7e4cf1bdcae5d7a5b42d402b642f36cab779a42c1dcf16f8444a611278722ace3f596781bf95df3f5d0b1070d279b SHA512 6cc113a26520e6880898bd7b37cd9d59be14811cc62470e6f0c672b436b9253cac1669476bd7aeea3da94e8572c6326b899e1ec7ae78e7e9a54e20d52c1919fd
 MISC metadata.xml 485 BLAKE2B 622c1dd3d46998fd3d1efa840e0f3b9af105d889b77d7ed779d5caacb384238a54e94c262ff15f4e09db710a44590cee03de6b2a749c24584060acad6925c445 SHA512 b5e45e9a331ffdfd888d5c5daed5658fb156f00a6974466c1b7a865ec7f0a8b839e1d7e4ffdc39903bea68eb9375a608c0094081f62097a7b3f92a7d2e8e370c
diff --git a/dev-python/cx_Freeze/cx_Freeze-6.13.0.ebuild b/dev-python/cx_Freeze/cx_Freeze-6.13.0.ebuild
new file mode 100644
index 000000000000..ee713d33b641
--- /dev/null
+++ b/dev-python/cx_Freeze/cx_Freeze-6.13.0.ebuild
@@ -0,0 +1,57 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..10} )
+
+inherit distutils-r1
+
+DESCRIPTION="Create standalone executables from Python scripts"
+HOMEPAGE="
+	https://cx-freeze.readthedocs.io/
+	https://github.com/marcelotduarte/cx_Freeze/
+	https://pypi.org/project/cx-Freeze/
+"
+SRC_URI="
+	https://github.com/marcelotduarte/cx_Freeze/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="PYTHON"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/importlib_metadata[${PYTHON_USEDEP}]
+	dev-util/patchelf
+	virtual/libcrypt:=
+	$(python_gen_cond_dep '
+		dev-python/backports-zoneinfo[${PYTHON_USEDEP}]
+	' 3.8)
+"
+BDEPEND="
+	test? (
+		dev-python/bcrypt[${PYTHON_USEDEP}]
+		dev-python/cryptography[${PYTHON_USEDEP}]
+		dev-python/openpyxl[${PYTHON_USEDEP}]
+		dev-python/pandas[${PYTHON_USEDEP}]
+		dev-python/pillow[${PYTHON_USEDEP}]
+		dev-python/pydantic[${PYTHON_USEDEP}]
+		dev-python/pytest-mock[${PYTHON_USEDEP}]
+		dev-python/pytest-timeout[${PYTHON_USEDEP}]
+	)
+"
+
+PATCHES=(
+	# bug #491602
+	"${FILESDIR}/${PN}-6.8.2-buildsystem.patch"
+)
+
+distutils_enable_tests pytest
+
+EPYTEST_DESELECT=(
+	# new setuptools?
+	tests/test_command_bdist_rpm.py::test_bdist_rpm
+)
diff --git a/dev-python/dns-lexicon/Manifest b/dev-python/dns-lexicon/Manifest
index 2be98606d87e..0fbf38e95a89 100644
--- a/dev-python/dns-lexicon/Manifest
+++ b/dev-python/dns-lexicon/Manifest
@@ -1,7 +1,9 @@
 DIST dns-lexicon-3.11.4.gh.tar.gz 8429864 BLAKE2B 552c87427fc04683e3e6b540fa3e62f88628f833b8229d52dde9f53d77c1cc32968aa9b0c3d04876145067950752c8fb68c1540cee82cf5687bc16d26d7ebd63 SHA512 d7c1f085ffcb4589430f744970bbc6793779fb19d4cc29b071937d768cb271330794fccf38b60a82ed6362dda4101ac6643704bb703df242c8f2a17273dc6fbe
 DIST dns-lexicon-3.11.5.gh.tar.gz 8428184 BLAKE2B 061786f9a198e078b07a6c57db36310f71043509aa5fb640a4733373ab874091805d51eea2dd543b77e7f6c3f05239bfe0a6ff0cd4753ab6f1342ebe204059e3 SHA512 c7db28587aefe05fd0704556852240a8e9c79668bcadf873adfe9ff81666bff2c9ebebc56730fa767d91c9b58de44da8834e0b2af93aeaff53ef55d3b3439105
 DIST dns-lexicon-3.11.6.gh.tar.gz 8428294 BLAKE2B dcbf2cc22d09c9f54378c4b1a29dcfa4d3b4d4c157b1f90ec9b78c62b4a0ea03c82484ed2825e5f6e9988dcc18da3be1a89458734ef2c7e90077c3139e44179f SHA512 086aa7daeef176960e058d60495f748c6c2acaf065801e41fe4b77c1bb44c8fd98b13805d9dc393d9be20d4e2d12ebc0967a0e07ec561fa4c33666a8f6e7ab18
+DIST dns-lexicon-3.11.7.gh.tar.gz 6677647 BLAKE2B 9330bcc81e053e9cf8b2171b444e5d20e86922da15df7121a5957f8e6932528ba1f9099cc4dff08b2825d8fa253369b8b2da026a0846e64896bf491c59f2bdc9 SHA512 7d3becea6b9d60a4589e9d7e8de010d0b7e6a2c127d1ccc6981d1bff88d09f5a708fd3e9e22f66b8a0a77a331784340662de73607dd25d69c0342795c6afc765
 EBUILD dns-lexicon-3.11.4.ebuild 1782 BLAKE2B 11f3ea6b3a037c6a8ed45b0094a474335b0ef860f5096ee6159534b154237e190cfab56e604c1814b56944ba1954c9d8ff0349d39817036158f8e1991a0d6b0e SHA512 2a201b3edcc30c3efe7c11aef127d66cc571ac70176c4206e186999a98644fb28caaffc68724c191dbde17556bf3771563286028480e1e716d88e80b3ce8ac6c
 EBUILD dns-lexicon-3.11.5.ebuild 1782 BLAKE2B 11f3ea6b3a037c6a8ed45b0094a474335b0ef860f5096ee6159534b154237e190cfab56e604c1814b56944ba1954c9d8ff0349d39817036158f8e1991a0d6b0e SHA512 2a201b3edcc30c3efe7c11aef127d66cc571ac70176c4206e186999a98644fb28caaffc68724c191dbde17556bf3771563286028480e1e716d88e80b3ce8ac6c
 EBUILD dns-lexicon-3.11.6.ebuild 1782 BLAKE2B 11f3ea6b3a037c6a8ed45b0094a474335b0ef860f5096ee6159534b154237e190cfab56e604c1814b56944ba1954c9d8ff0349d39817036158f8e1991a0d6b0e SHA512 2a201b3edcc30c3efe7c11aef127d66cc571ac70176c4206e186999a98644fb28caaffc68724c191dbde17556bf3771563286028480e1e716d88e80b3ce8ac6c
+EBUILD dns-lexicon-3.11.7.ebuild 1782 BLAKE2B 11f3ea6b3a037c6a8ed45b0094a474335b0ef860f5096ee6159534b154237e190cfab56e604c1814b56944ba1954c9d8ff0349d39817036158f8e1991a0d6b0e SHA512 2a201b3edcc30c3efe7c11aef127d66cc571ac70176c4206e186999a98644fb28caaffc68724c191dbde17556bf3771563286028480e1e716d88e80b3ce8ac6c
 MISC metadata.xml 541 BLAKE2B a22266eac0bc7b4c22d9552cf64cbf88bbc1c2953e3ef0daaf059b81519909e0f8808e0d74cec6db3296e43f98082d57b8ae3779d694432e8578112ac18c3ea6 SHA512 79e2b43a685bfcc8dace1faa1c1a08cc648b39a3fef2834a57b6e801f72e7309276604253089db7a2fbe1d5d776b2ba1427c90a9cb9c44a0c1b2812d4e1901db
diff --git a/dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild b/dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild
new file mode 100644
index 000000000000..c6c99ff85a56
--- /dev/null
+++ b/dev-python/dns-lexicon/dns-lexicon-3.11.7.ebuild
@@ -0,0 +1,67 @@
+# 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..10} )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Manipulate DNS records on various DNS providers in a standardized/agnostic way"
+HOMEPAGE="
+	https://github.com/AnalogJ/lexicon/
+	https://pypi.org/project/dns-lexicon/
+"
+SRC_URI="
+	https://github.com/AnalogJ/lexicon/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/lexicon-${PV}"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-python/beautifulsoup4[${PYTHON_USEDEP}]
+	dev-python/cryptography[${PYTHON_USEDEP}]
+	>=dev-python/importlib_metadata-4[${PYTHON_USEDEP}]
+	dev-python/pyyaml[${PYTHON_USEDEP}]
+	dev-python/requests[${PYTHON_USEDEP}]
+	dev-python/tldextract[${PYTHON_USEDEP}]
+"
+BDEPEND="
+	test? (
+		dev-python/boto3[${PYTHON_USEDEP}]
+		dev-python/zeep[${PYTHON_USEDEP}]
+		dev-python/vcrpy[${PYTHON_USEDEP}]
+	)
+"
+
+distutils_enable_tests pytest
+
+EPYTEST_IGNORE=(
+	# Requires the "localzone" module
+	lexicon/tests/providers/test_localzone.py
+	# Requires the "softlayer" module
+	lexicon/tests/providers/test_softlayer.py
+	# Requires the "transip" module
+	lexicon/tests/providers/test_transip.py
+	# Requires the "oci" module
+	lexicon/tests/providers/test_oci.py
+	# Uses tldextract which needs Internet access to download its database
+	lexicon/tests/providers/test_auto.py
+	# All recordings seem to be broken
+	lexicon/tests/providers/test_namecheap.py
+)
+
+pkg_postinst() {
+	if [[ -z ${REPLACING_VERSIONS} ]]; then
+		optfeature_header \
+			"Install the following packages to enable support for additional DNS providers:"
+		optfeature Gransy dev-python/zeep
+		optfeature Route53 dev-python/boto3
+		optfeature DDNS dev-python/dnspython
+	fi
+}
diff --git a/dev-python/k5test/Manifest b/dev-python/k5test/Manifest
index aa7c5dbe65a7..798e02ce902b 100644
--- a/dev-python/k5test/Manifest
+++ b/dev-python/k5test/Manifest
@@ -1,4 +1,6 @@
 AUX k5test-0.10.1-which.patch 1399 BLAKE2B 0ddd4f99103c94c4e73eb3be54c1844206b366e99bcc1a026ee6981fb1a02f09e98061ee79a03dff91f8fba16945141cb64025b1416f4ded03c1d672768d4b88 SHA512 fd699ffe140a90a961a18b1df30eec08b7fb4d4ade24a23d5d6586bd76dbc15e4c2b5a9b342346d81eab0d7d3bcbae9a62489423de641c26414cc964c9586009
 DIST k5test-0.10.1.tar.gz 13664 BLAKE2B 4be24a8c9b154f5ec7b83b6743d0f756cb813bdfe4496c6f8ed873a2fc5a725c17b34f7b243d106d7a985aa53351f9bdc354fabba6a8c5fa3d25927513441cb4 SHA512 eaf451f0a932fdb8758f23e17ec52b2c1617074f186dddfba1d9c6844291fb2f4b003e05f4a0e02ce1bae37ee4251ea8295d2ebc8d9002c83d3179000fa4785e
+DIST k5test-0.10.2.tar.gz 13579 BLAKE2B 74ee10525a091bb67685ee765e74542f87935843f2693d579907f6f95f2fbd1b9ad1e485e5360d1b3c7ac6cdb7fce4b1515b93eba99008c43c857c6133d7d7f2 SHA512 4f01297179a8ededcde7d2f4128fe68a48567fff5cffd6e8f8fc1e8e0717acd5c6a05b7b5944baf5189bb58e67eaa553ca014d00e53ccdc834dca364d460520f
 EBUILD k5test-0.10.1-r2.ebuild 530 BLAKE2B a4c87827876715a4135958971a8c5dd6c572cfaa9dea1a2e38023602d5840a5977ff7311f37300f367651d486d507331383f7bb92c2b214e1b31f8cac500a81d SHA512 fcc787ef30afae89d07e4fe4776b36bb641ce4e2e3e88decd48db4890221862021f4038862f71d10c04e96f6ff150e9f5c778a439ab178563567f37524c0bb62
+EBUILD k5test-0.10.2.ebuild 488 BLAKE2B 9b8e6ea483368195d154585a4c0db9b04b43f82b1520dbe68afa271371f705547f81f333bd26921e8b77830a0dfc5ba2c6ee757a9ac77acc1b194598c35cc3ef SHA512 66cb15696e1a271bd69d7bca34049c90a68fd42cc6ccec31cf2955117677fe8ddebf091b60e6ea0671b4b34347d08337985cae5fbadf933f0007784fe3a31b84
 MISC metadata.xml 393 BLAKE2B dc1fec37db82ae2baa97fe324533b9105879142442ac6072b20721dc5233981d726fa56dbefaa0d51b85917ba64110395c2f7c57a9d8e88cb8ecb5bd9d116996 SHA512 b8dd2d38e1d2d95d9fac8a77be33973457a64afc771f3122f161db721b2b1ed71a9e569e498bd85494e498dba340e9a7d3137ea1c239d9ba8d8c19332ebfb1be
diff --git a/dev-python/k5test/k5test-0.10.2.ebuild b/dev-python/k5test/k5test-0.10.2.ebuild
new file mode 100644
index 000000000000..c8ee7bd62dd7
--- /dev/null
+++ b/dev-python/k5test/k5test-0.10.2.ebuild
@@ -0,0 +1,20 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Library for testing Python applications in Kerberos 5 environments"
+HOMEPAGE="
+	https://github.com/pythongssapi/k5test/
+	https://pypi.org/project/k5test/
+"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86"
diff --git a/dev-python/lazy-object-proxy/Manifest b/dev-python/lazy-object-proxy/Manifest
index 896f43efea27..1953033f5e6b 100644
--- a/dev-python/lazy-object-proxy/Manifest
+++ b/dev-python/lazy-object-proxy/Manifest
@@ -1,3 +1,5 @@
 DIST lazy-object-proxy-1.7.1.tar.gz 41995 BLAKE2B f3945b3ddc8335be184542e23eb823effe83262a80f048e92441d60bee2ace2f0c9b09fc00a7d356e91a66676361979bc10555dc24ac65e2fdbdfa9ba0cf9e02 SHA512 cf80f2e43795cef09c0a6dde32276d54f5d66a2cf017d3e815868ec9925d989f7256bbf3e416c4445d13e0c9241733029d9a99f2556258f59c2c5267b3c35391
+DIST lazy-object-proxy-1.8.0.tar.gz 41884 BLAKE2B a2869137ccedc2971bd341dea954fecf87ab1829c85fadb3128abc296df000d4015e6a210067327a7f5606b9e4c56c6ff3a1110e2a2ae998951f9d141be1c556 SHA512 a682e7d1ef405939f5f75f598618d6c7de482decf8027abcf4c7c2b684b3442ca3b1a666d1913e9c7f63c086753e0d79b8c1b03c0cafe8cbea3d7c70893be57f
 EBUILD lazy-object-proxy-1.7.1-r1.ebuild 917 BLAKE2B a5d7d7a3b70920d3341d38f72d5f70717042fec8e95ed7fc216d59a55881fd550e3fcaa75d6d7f4a94f5ef11c759eff8c6a90401715215ce9548de92129d2f41 SHA512 39e561b930fe378b9f8f2ee166b0821ff8bfeb6b0aaedc1d1f4637dbae22c221d846b6dccdd837aaf4770190f25924423f9da0da21c1b5e9cf8b16b5f5139254
+EBUILD lazy-object-proxy-1.8.0.ebuild 925 BLAKE2B c2f5d6f08cf8d89ef8d45b14fbb24a84016502cd09b52faee9d7db6f62199f3180e9d9847f5079ad57e2e992047325141a82b29e8e11d6d976a208e96b7f90fe SHA512 953f5d0b94698e354c2322242e967c1fb4072aae832a9c2eecc53f0d0638e0f666c3ff75e36439b1962ef50d7ff5f14d39ca04fe297268f533ccc5c15d4d0caa
 MISC metadata.xml 540 BLAKE2B daf53065c3af28ec7316bab786a7ebfa6890de83bd6434d39052797a1d08d9e7e05fc437fd9994bc437ba0d38dc6ab1cb2e073c2c053fdf55817302800e97b19 SHA512 e66e27df4757f7d13912934551b7fb346d734789f1b0b17e5c875dd5261babf65188bd31966f502be19e953fd9bfd87a64d49ce8e1849b2122a30905d3639e9d
diff --git a/dev-python/lazy-object-proxy/lazy-object-proxy-1.8.0.ebuild b/dev-python/lazy-object-proxy/lazy-object-proxy-1.8.0.ebuild
new file mode 100644
index 000000000000..e8e31d184f05
--- /dev/null
+++ b/dev-python/lazy-object-proxy/lazy-object-proxy-1.8.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="A fast and thorough lazy object proxy"
+HOMEPAGE="
+	https://github.com/ionelmc/python-lazy-object-proxy/
+	https://pypi.org/project/lazy-object-proxy/
+	https://python-lazy-object-proxy.readthedocs.io/"
+SRC_URI="mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos"
+
+BDEPEND="
+	dev-python/setuptools_scm[${PYTHON_USEDEP}]
+"
+
+distutils_enable_tests pytest
+
+python_prepare_all() {
+	# No need to benchmark
+	sed \
+		-e '/benchmark/s:test_:_&:g' \
+		-e '/pytest.mark.benchmark/d' \
+		-i tests/test_lazy_object_proxy.py || die
+	distutils-r1_python_prepare_all
+}
diff --git a/dev-python/lit/Manifest b/dev-python/lit/Manifest
index 00aaa33c5b1d..abe7ec6c7086 100644
--- a/dev-python/lit/Manifest
+++ b/dev-python/lit/Manifest
@@ -7,7 +7,7 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lit-13.0.1.ebuild 907 BLAKE2B 786bc45254014c19e47997b263eba9245fc44459a6f12d46e69803fdf57c1b8f3d07d7e0354ea23ab17471771f57af8e792ca942b9f195462a26629d8d6bfb8b SHA512 ca254f8d0d3af0e01b24e73de8e15b77d687fd0f23a4848dd4e85522426e7dbdcd8ae77e25d8f88e637e390131fe78362ae7ba4ecd192a4c970cc3311b371dfa
 EBUILD lit-14.0.6.ebuild 914 BLAKE2B 80f1bb1010f71ff835aef8e87cc0bca5de0dd97e74debaee4e26d698e530468b755bc632884c11616a0ae082befa75a7b6c11043c70c3bb5679b0dae1c985d0a SHA512 77eafef2378be28fdcaa87f07fec8b1907f8c491b4a600b47d9f5970148f6684e6b4733ad6dafb753aa7a56ed1834b10ff30afc5995812c895749ea0c7294e47
-EBUILD lit-15.0.3.ebuild 919 BLAKE2B adf8eb983f08a1ba6b3ec432c8ce75579649562d7786c6614f07919c5742274e4fe028eae5faea0d9b3b83e9ab3d0b2f9c8cc8c0b1c811dcedf3d9fecdec1223 SHA512 4f34c0519214f9d4e69e9a034b17d24562f66fe7138b3c7628eaf15652f2b56c5bfcabe9fb2d37fc204b28790f2629283a733a9ce2bf413f154c6e7a2afa733d
+EBUILD lit-15.0.3.ebuild 917 BLAKE2B e73f116257a040e306c83f51afd7d5ce88d2853d6ce875732fe5fd38c709939703501cf630662bfe4e236a9b3e481b7d557ab4186f6a778e96554e2a7b61d0e1 SHA512 f4c4d571094f0fa7245fc5b4430079ebe27e571ef9d06368c44e2da7c201fc667cd9e0ae9dfc72e5e6f4cacaf12e69ec07d0ab2a1c9cd0c2b91e90ef43055ebc
 EBUILD lit-15.0.4.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-16.0.0.9999.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
 EBUILD lit-16.0.0_pre20221016.ebuild 871 BLAKE2B 5ab6cc094e95685501304ebac41e07a919505fb6ce9b2db04e0c671e6a494df35ba81f6a43d8448cb2f94e982e32850658085daa98ca60e652da887dffc400a6 SHA512 d4cf8c7c2bc71376c998ff0d9796c6713b20e972014f13369d7658667f23cd97ec237df2818aa96add88cb4e2c36d1f272494fbab8d6b15014d5529d95616186
diff --git a/dev-python/lit/lit-15.0.3.ebuild b/dev-python/lit/lit-15.0.3.ebuild
index 1573302cb8be..11e813f3d9be 100644
--- a/dev-python/lit/lit-15.0.3.ebuild
+++ b/dev-python/lit/lit-15.0.3.ebuild
@@ -13,7 +13,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-python/numexpr/Manifest b/dev-python/numexpr/Manifest
index 43cb1ab53ecc..6c629bf98a25 100644
--- a/dev-python/numexpr/Manifest
+++ b/dev-python/numexpr/Manifest
@@ -1,3 +1,5 @@
 DIST numexpr-2.8.3.gh.tar.gz 112551 BLAKE2B c433e27dafe14e0760cd825992a4dcf3e35ae7a32c1bb768c6f5632e8505be5b10dc08a89c97836f019e53d77cf4aa811cc0822832d605934e35ae93e1cbb661 SHA512 4753159f8247ed18dba01d4db21e8e0a149a253cfc064719c9ccdcdd779d109aca64d2306820d912c274b5b6037a9dc849285ef015fec1e1dc9f0c8bad246393
+DIST numexpr-2.8.4.gh.tar.gz 113594 BLAKE2B 65756e3a0755cd69b8586501d5026dc355f5263f852fedc4f59ecd1854576929bff702cc603c53c7230a5a0ad034a56c50db0bf2fbc2174b3f5272d3a03ffdc0 SHA512 e0a4eacb1a8721b9c2b4331f21e460fc3a1740a6a156eb43b31c495b17e191508f6d72375b8bd286a9be66ceaa1353f64f894deda0b4b29c3ac48c5b7c67cfa1
 EBUILD numexpr-2.8.3.ebuild 949 BLAKE2B ac2f6b98c3aa2bc5a2e2268dd38402691efaec2f3d504d09b9c9baff382bb94e50aee8146895f51dc86d72cd2f526f158a690c247124020b0ef9bda90d237c4d SHA512 9cff7223146d085728b63bb04bf0550c02d4481695f3674eda8595c1b5c2e37477a36162101fed746f579ddf24d31d5157e6bd4610327cf0255a156289024f84
+EBUILD numexpr-2.8.4.ebuild 955 BLAKE2B a2b1f390de3d09bc4111e3a43d7ae46b57ac6c19f8d5bea78d3750b91bf8221bc3f333d2cbd7a50708b9ab8a6819ebea7659b852a4ff525fa89251aeafb343c3 SHA512 98b7d4f34bdea9cb2352a83973627c974c9aeeb2c3418b43453b7dc4f2a1c22bb56431757348cb78a1b2b6090a152e42d64bfdf08573290cab464b64689bd50c
 MISC metadata.xml 963 BLAKE2B 054bf0762161cf275c8898c5ceb15af773f9843bad7ca9624880c9376cbb5e34104dee891287c113dc1762b1e3d642b9b7a39a200fda55211158af30c57521b7 SHA512 9f5d054d0f7f1a7eb1f10f638d9992c72652d5fe8b94664ed189630e9516374bb9fd28db2972212c350b8804aa79bfaed09e12ea4d3bc7836140e805c2fb3ac7
diff --git a/dev-python/numexpr/numexpr-2.8.4.ebuild b/dev-python/numexpr/numexpr-2.8.4.ebuild
new file mode 100644
index 000000000000..cbfed545e678
--- /dev/null
+++ b/dev-python/numexpr/numexpr-2.8.4.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{8..11} )
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="Fast numerical array expression evaluator for Python and NumPy"
+HOMEPAGE="https://github.com/pydata/numexpr"
+SRC_URI="https://github.com/pydata/numexpr/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	>=dev-python/numpy-1.13.3[${PYTHON_USEDEP}]
+"
+RDEPEND="${DEPEND}
+	dev-python/packaging[${PYTHON_USEDEP}]
+"
+
+python_test() {
+	pushd "${BUILD_DIR}/install/usr/lib/${EPYTHON}/site-packages" >/dev/null || die
+	"${EPYTHON}" - <<-EOF || die "Tests failed with ${EPYTHON}"
+		import sys,numexpr
+		sys.exit(0 if numexpr.test().wasSuccessful() else 1)
+	EOF
+	pushd >/dev/null || die
+}
diff --git a/dev-python/patiencediff/Manifest b/dev-python/patiencediff/Manifest
index fd025eefd272..fcf196c1c4e2 100644
--- a/dev-python/patiencediff/Manifest
+++ b/dev-python/patiencediff/Manifest
@@ -1,7 +1,9 @@
 AUX patiencediff-0.2.3-wint-conversion.patch 3219 BLAKE2B ba42b299c6ec3f7546d9fa077a904ad51b3c467cd40d4f686a6fa5e9b950e00560a3970cd16b53ae50593b98c7a4947dc0a95672023193319a4a9f7c6d0a2c3c SHA512 f10b4814bf4509bd3e67b751b93d9aa11871a599830f115f263521c1ec95f9d133d5039f5e8298f6a2602832e6f23e8528bce3080c10d67faf0c3d3983e5ac0e
 DIST patiencediff-0.2.3.tar.gz 28903 BLAKE2B 83a5dffc11e02b759e8fda540453055d3f2fa03db098c2b323c965b39b121e5bc7e9b3fb0a7f5f1eff76aba81223350def2823469d2a3ceedb54824ae22a32c0 SHA512 4211aa824a8f0e4e5c9fa788ab532bc163684381fc143a089250b16ae70229efabdd1b2e4e50fdd8d36f3363526b80cf687030c435bd9b87e12624fc1fc6b786
 DIST patiencediff-0.2.6.tar.gz 29124 BLAKE2B f43e7fbbdef316f9ededb680f9c3c20eaab7e988489ba6dfc6038deb91cced5727b9461dbfd30f11b81a12aa238e27df1697abe84d323461da3029daf9fbfce1 SHA512 033c4da38a12cfcd180535635dc84ce6da14fe4f8ae9fc7665fc0b711759fe5a5440d73ed2c7f8f4edf967c9dea9046163b5b48d32ee59d0f4cc01256c7c9055
+DIST patiencediff-0.2.7.tar.gz 26831 BLAKE2B 297af6a465ef3fc060a00df9882f85fbf9f807c6d6e8fbfa1d531ed16a60d86f3081d9c0c9698bf3b6d02ba45fbb1d58fead6430f73c04b4439076d0a05a8864 SHA512 8711d28ddc67cdebab5677c1120b1c7270b7509083b797371abcecd61ba71555a1c79c580a5615fe30e1e3bd088b2f4c28a68aa761a61ce55b93690ceb38d8c3
 EBUILD patiencediff-0.2.3-r1.ebuild 648 BLAKE2B afbafb876a025581eeb95fd0cb2182f8ec48695f04b7e3f97ea39dbe0fd6536b08883abb3a1bb503f04243120ff3971293870a00f78c3e302552fd5afe4af912 SHA512 9e52fdabb2d7aeac21ed516169f4a70b2fe04a2111a877cdaaebbe2ba3bd701a27d04fc1e99d63d5fd8c8684dfb1c6a971dc5451583ca3ff093b3a23422bde05
 EBUILD patiencediff-0.2.3.ebuild 593 BLAKE2B 535c5b56248ad9f04450690786345efb97e45f65a9bfd62b64f13b1baf0210a7144f3483a940a27a13c5d61882f69807b0586879e57f26a72e503551ef3c64ee SHA512 2399fdfd05bce1ebd9d6bb2741c88a456f4bfbfdc43fd98d4d54de1d6e76ae60b63df67d385d37270e434870d5f6a51b9a3973329b60029c97d30760ed8ef0f5
 EBUILD patiencediff-0.2.6.ebuild 593 BLAKE2B 535c5b56248ad9f04450690786345efb97e45f65a9bfd62b64f13b1baf0210a7144f3483a940a27a13c5d61882f69807b0586879e57f26a72e503551ef3c64ee SHA512 2399fdfd05bce1ebd9d6bb2741c88a456f4bfbfdc43fd98d4d54de1d6e76ae60b63df67d385d37270e434870d5f6a51b9a3973329b60029c97d30760ed8ef0f5
+EBUILD patiencediff-0.2.7.ebuild 593 BLAKE2B 535c5b56248ad9f04450690786345efb97e45f65a9bfd62b64f13b1baf0210a7144f3483a940a27a13c5d61882f69807b0586879e57f26a72e503551ef3c64ee SHA512 2399fdfd05bce1ebd9d6bb2741c88a456f4bfbfdc43fd98d4d54de1d6e76ae60b63df67d385d37270e434870d5f6a51b9a3973329b60029c97d30760ed8ef0f5
 MISC metadata.xml 380 BLAKE2B ecdc31572c230eb18696e567a55d49f8f49b9ac254b6deaff93d403fc399ace4b9d284b0cd3ef749cbd68eb0e21af284e1d088690df896b2133da7144aaa7cd5 SHA512 4ca7b8cb364b2e6a75a7720836d63933f281e3927c6f2b41eb6a27aeb11f338fed1f70eedd3c46156ee80d8469e271e381e4b43eb0bf704601270d578e99b63e
diff --git a/dev-python/patiencediff/patiencediff-0.2.7.ebuild b/dev-python/patiencediff/patiencediff-0.2.7.ebuild
new file mode 100644
index 000000000000..0fed7fa1f361
--- /dev/null
+++ b/dev-python/patiencediff/patiencediff-0.2.7.ebuild
@@ -0,0 +1,27 @@
+# Copyright 2021-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Python implementation of the patiencediff algorithm"
+HOMEPAGE="
+	https://github.com/breezy-team/patiencediff/
+	https://pypi.org/project/patiencediff/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+distutils_enable_tests unittest
+
+python_test() {
+	cd "${BUILD_DIR}/install$(python_get_sitedir)" || die
+	eunittest
+}
diff --git a/dev-python/progressbar2/Manifest b/dev-python/progressbar2/Manifest
index abb895a6b803..5b53e2e065f9 100644
--- a/dev-python/progressbar2/Manifest
+++ b/dev-python/progressbar2/Manifest
@@ -1,5 +1,7 @@
 DIST progressbar2-4.0.0.tar.gz 663046 BLAKE2B 1616f1b9c5f720f370dc9eb02ba37cf83391c853a525fca523fb33af1b580f38647b835a83558674a78dacc33bf7652cb9af8799ad13763f62d33417abaa35cf SHA512 b9b9dabb3093e42bc6f40c0e284caae2d29ebfa450db379c214a5ae39e7ccb8c690655da21a44882d0b68f24d83f55a3342671087a25ada168bce9d236685666
 DIST progressbar2-4.1.1.tar.gz 638622 BLAKE2B f9e73c29aac68f3f12c978e29990382dd2a31f668159f9198c162901b2e4ae1e52943fb0a3259fadb8aa62e45e57c0f867923e064953c6f9ddc5ff2c62a5dea1 SHA512 4df7652584c867589448ea8765ba2da99ce5e4c9cfc27268ff850dfe41efa6342a6a44f19384c5c54ef8c79432db35a755958ed9561cf2d37f98fc661a42099f
+DIST progressbar2-4.2.0.tar.gz 650564 BLAKE2B 7b4d9604626d0944040e59af1b52bf1cf2c045b6a256c7fd4233fa2ee22491484ecb721fe680ad326f7ef383c7070cebad38729c45e91ca2d3b6fcc6c51127a1 SHA512 d49c154e48bd730c2a7916ed53272ff20cb6fac8c9752734cf645d4701ffcdf25309bf493d03fdc5b6072a85b5f758332fa7448f307d4acc001ad4ab36303a68
 EBUILD progressbar2-4.0.0.ebuild 718 BLAKE2B 33eb46ad683cd82547a6a21b0cf472bacf4c44738c559b743c1d3b1d79f6f3573d8079b0ddde84932aab07330e6821185f05a9bf8113aba15c2f18b063bf6187 SHA512 7edb45896151f0c343b306b4a81c4c4a89a632b2685c5ee8bca6cdae1ffdd92e7b2bfd83b48cf61d0c600c2aaa2a571a1e5f420b80a87a72decaf1fece0d5691
 EBUILD progressbar2-4.1.1.ebuild 751 BLAKE2B 6f249406eda7acb0cd8fe6f49b7e82f90e476239aefc4e08ab4e2ef8ce81331a8d90943877c8a3eca5812f3c48cecf2182eeb45a57a43425d8aa86fc8d323bdd SHA512 cfc7c76006756b39fcebbaddc08c15066c7ff22df64bb5a485f4385e0e90b8d8458a6407a922f98c06e122064764819df7f3becefc650c16eae98343661ef7dd
+EBUILD progressbar2-4.2.0.ebuild 751 BLAKE2B 6f249406eda7acb0cd8fe6f49b7e82f90e476239aefc4e08ab4e2ef8ce81331a8d90943877c8a3eca5812f3c48cecf2182eeb45a57a43425d8aa86fc8d323bdd SHA512 cfc7c76006756b39fcebbaddc08c15066c7ff22df64bb5a485f4385e0e90b8d8458a6407a922f98c06e122064764819df7f3becefc650c16eae98343661ef7dd
 MISC metadata.xml 404 BLAKE2B 774a579e397ff18f4196eaf238847e52062742b1ff00999e6b970c4a0f5e032d6caf57e2f64903882269738bdeefa3b3533711d36c68694989ffe6b508c9c467 SHA512 95bd7c3ad0f1addc6d6dd57aa89f04b20ad7019b35468aa44cb5077a819c4658cf64196c5443a671d8beb339f5bdbf40e544807b21c7e2bc11b39da5e0e8dc99
diff --git a/dev-python/progressbar2/progressbar2-4.2.0.ebuild b/dev-python/progressbar2/progressbar2-4.2.0.ebuild
new file mode 100644
index 000000000000..cdd74919e01e
--- /dev/null
+++ b/dev-python/progressbar2/progressbar2-4.2.0.ebuild
@@ -0,0 +1,34 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} pypy3 )
+inherit distutils-r1
+
+DESCRIPTION="Text progressbar library for python"
+HOMEPAGE="https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	>=dev-python/python-utils-3.0.0[${PYTHON_USEDEP}]
+	!dev-python/progressbar
+"
+BDEPEND="
+	test? ( dev-python/freezegun[${PYTHON_USEDEP}] )"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -i -e '/cov/d' pytest.ini || die
+	default
+}
+
+python_test() {
+	PYTHONDONTWRITEBYTECODE=1 epytest tests
+}
diff --git a/dev-python/reportlab/Manifest b/dev-python/reportlab/Manifest
index 274f6ed0c369..bdf6f2a367f3 100644
--- a/dev-python/reportlab/Manifest
+++ b/dev-python/reportlab/Manifest
@@ -2,5 +2,7 @@ AUX reportlab-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch 1502 BLAKE2B
 AUX reportlab-3.6.9-paths.patch 996 BLAKE2B a003ce69d7aff12e04fac914d44a0af58555da9858d96f23be26455836ee1105d76136cdfbe52b888f9779f1b8463fda9a04587b3ef045c8354d840f3f92caac SHA512 f71ebfdb07c87a7bd39a5578355a2a800654204e38f722106dcfbe848332eb1ef6ce8b6ffebe08fd0a07214c0fcfade69e0eee1f47b1055c877efc64e70e0bfc
 DIST pfbfer-20070710.zip 677333 BLAKE2B 100214476a361a5e5d1f3da0999591345f6e3a3f8c6bc3f6a3e9eca734190c6259758a43302c6e41254d33491fe535eb7d5dd07aa9727c912424bebc31fc18df SHA512 6fd4a5d955464b10d13a7b748703450c1fe120d5ed09e8cfa1b4dfa9c183c59fe001df29433af551796b0df62544b7ddc364f9bb1bdcc2cd300434340ffcc4f2
 DIST reportlab-3.6.11.tar.gz 4519404 BLAKE2B a099a4adcaf7186cbb558ba708abf47019cff33c6a5335b27bb1eb1377c3276ae9ecdf33e66f614880de2f72e195333f3a7839ce776b8946431e2d23872fb13b SHA512 2ef81850f4e30e78ef9e923d3aea7efac6c98dce83f90c0edd47384febd68eb6ac81e05c7038e7d67458bdae16d1b19b75e9aeb8da6a5283e9173e27e4369251
+DIST reportlab-3.6.12.tar.gz 4519536 BLAKE2B 106e0ede2b3c039152ae5a39e0aa5b3bf0239789ba08630f751260b75305973bff13730e3f7419340514a4f0174223dddf522cd9408b8dd04fbe39b84979b152 SHA512 99e6ab1cf27cc9e661b3bfd8c71290d94189db6de5e71b2429cccd48bfee5659d5fb46dfc5709e6616877b48bc17241c74282e0d2ecddda2ead16df4c1b6818f
 EBUILD reportlab-3.6.11-r1.ebuild 1314 BLAKE2B 40e4415e3888b561f1f8c895941885ecdfa43d42c5bac2d89e451e3b8cc0b530ba8b9bd40dba73c92727360cb7f3408369592b63f3fc29cca6a49b5bee1a846f SHA512 fe1cc33765f198fa0e66a049833b844493d4dab7bacfc9ed2ccda62655b255e4cf6264cccaf45b2cb6f9dc2eb8fe73ce5d58f34736e9ac174a050eb0774f99f9
+EBUILD reportlab-3.6.12.ebuild 1321 BLAKE2B 802b81d0f876ff4462a28f5db5cc290a777af0a4b99e0d7fdad1c6e3cbf8ea790fd6f28022e585ccb8f79f97efc4b6d7cacc64cba553311bfc858b7396b333c6 SHA512 b0ae90e750114013994805c3c8ce84623c09bf1271d23131dcc592e0554999eb7f91d461460d7f9002925dd557d33dbdd114132724f4520bb6ae927094f43df8
 MISC metadata.xml 1974 BLAKE2B bfccbbc451ae8cc0a7eae60e9b6134e01a8eb9be40506c51b2b8fc23845daaf4bf6e0c97d854b5e58f1ede8ee32a97280f526949e772e06288f0a237bd32baf6 SHA512 0c46c2bb1021b7b098446fb4005b524104f3a28e0a8a497c0f60e3f89668e9198eb57be2d2b01aef36896a519244ba32ebd1a63f3840161390fc901dac6d9daf
diff --git a/dev-python/reportlab/reportlab-3.6.12.ebuild b/dev-python/reportlab/reportlab-3.6.12.ebuild
new file mode 100644
index 000000000000..990ad409b8ab
--- /dev/null
+++ b/dev-python/reportlab/reportlab-3.6.12.ebuild
@@ -0,0 +1,63 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{8..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Tools for generating printable PDF documents from any data source"
+HOMEPAGE="
+	https://www.reportlab.com/
+	https://pypi.org/project/reportlab/
+"
+SRC_URI="
+	mirror://pypi/${P:0:1}/${PN}/${P}.tar.gz
+	https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
+"
+
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+DEPEND="
+	media-libs/freetype
+	media-libs/libart_lgpl
+	sys-libs/zlib:=
+"
+RDEPEND="
+	${DEPEND}
+	dev-python/pillow[tiff,truetype,jpeg(+),${PYTHON_USEDEP}]
+"
+BDEPEND="
+	app-arch/unzip
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.6.9-paths.patch
+	"${FILESDIR}"/${PN}-3.6.11-correct-srclen-type-in-gstate__aapixbuf.patch
+)
+
+distutils_enable_sphinx docs/source
+
+src_unpack() {
+	unpack ${P}.tar.gz
+	cd ${P}/src/reportlab/fonts || die
+	unpack pfbfer-20070710.zip
+}
+
+src_configure() {
+	cat > local-setup.cfg <<-EOF || die
+		[OPTIONS]
+		no-download-t1-files = 1
+		use-system-libart = 1
+	EOF
+}
+
+python_test() {
+	pushd tests >/dev/null || die
+	"${EPYTHON}" runAll.py -v || die "Testing failed with ${EPYTHON}"
+	popd >/dev/null || die
+}
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index aff1c50ef95d..a26e4b5f3be6 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/gitlab-runner/Manifest b/dev-util/gitlab-runner/Manifest
index 3fab24d67ab2..72099a5d30b3 100644
--- a/dev-util/gitlab-runner/Manifest
+++ b/dev-util/gitlab-runner/Manifest
@@ -9,10 +9,13 @@ DIST gitlab-runner-15.2.1-deps.tar.xz 141242072 BLAKE2B 598850f3614772cad485a994
 DIST gitlab-runner-15.2.1.tar.gz 1291638 BLAKE2B 7f2c7100ab5a7e670f8d50ea9dccd5f96b23b4e7ba60f928d732edc3a5f50b10afcfe9ffb052c4242ee401a21a0ddfad14e398a6a133ac093f3bbab84b620b0e SHA512 ed165fd95094dd00450bd2ffbbe876235849fdd98ff0ffc6ce635a103f426d4380573ef8c71f5a40d115fa6fe7ec9416b1c7b780f1563e8b3d4c4a09c02519f7
 DIST gitlab-runner-15.3.1-deps.tar.xz 141247556 BLAKE2B 8ea8e519efabfe54ff2a70477e713285a80889e6f001adae7263626db4086112964dcde328662a96c3c92d251e294fed6cd8023772f74be650a63f7d7fd2bd58 SHA512 047b4b3ac5e4fb6d493b5ae51219bcd60b056265a146d4001299ccaee491e5b6b0da8a3f1f84d4d44ae0e726b732c69d59851735283c78ddd6456ab9a7a87d49
 DIST gitlab-runner-15.3.1.tar.gz 1306831 BLAKE2B 032115edb7b0ae23d4f4083e542aa645e4f76fea04a63c5d3018080314081c82b2250d292b26b507101b627314d9142b0109f33fa8289a583010a5d692a6c1cd SHA512 62e543983e184c2e57189042f8281696e0428841890aef8779fce125041dbbd0626807491e5ae589e367f6b725fb93e663d94da3a051e2a9ec681b959c4bd85f
-DIST gitlab-runner-15.4.0-deps.tar.xz 141260140 BLAKE2B 876b71eb424bd5d65624718a666f7ff376b7d548056932e5f190974aa54bb7df5453b6fd6cb7a683a528035a8ddc0cec4a4a0f5481c491a6daac2e47edcba061 SHA512 1e940a8ac199b37d305d046f8f93d474e58881f76ee1e569d905cdc02f219dd5730ea7a4efc7ba297d5492996777daf2ec783788da9de6c5873528e0ed0d7c91
-DIST gitlab-runner-15.4.0.tar.gz 1309792 BLAKE2B 54b4c94a79c86097116aa1bd4fe9e70da648ec379de606f36a3abbd15b7e9a2e3fc2174d9c8190bfc4925fd9c2ff1658440760ce9360db1a24319c50f506973f SHA512 85d4efb63a6bad62b3ca0a5fae365a7bf33d14e94e9b0ee24b71a87983bef7c92f83ecce78918024aee1bc8375e1910b731238b5f3f5b77e798d34f08283dd63
+DIST gitlab-runner-15.4.1-deps.tar.xz 138998168 BLAKE2B cee390b7955ee98eccffca6e878492f8c2de39d0ed4f4366ee9f0cc3fd016c625153dbe3b79d2cc6cf1e3a301f6ba8c2ad6a40b29d71408494a36788f07ba601 SHA512 c143883330b7a03ed4b77d49bded4423a44ef53ef8597294c99f067401c1ebe92ae69f8c8820181634b76e070d76304212ae1bcd957a7cbbee2167cca4dcfd64
+DIST gitlab-runner-15.4.1.tar.gz 1310885 BLAKE2B 9ba470444f7ba2db8be6044548dc9d7ee1ef8f50e63b0bc1ec2ba65ab9b5d035c5bc3a3bb50c4bf0d5acfa1329fe06fe9769f847aaa73c61ff116123f637e3f9 SHA512 1334c1d3fc830f49a0977cd43045105d013658361d55c807a99a2b36bd2b9dc4f3410185f13264a50a7cc13ab97d2191ec4a4daf45c10b24b42375dd6a2f6d13
+DIST gitlab-runner-15.5.0-deps.tar.xz 151900052 BLAKE2B cebea3c3a78030063e6fe551734bb22b80bd3200779195a5790ed3dfbe9519d81ce95dab912f62d84838026a8c7f2c7e9b89e16d7add598d1484bb5f5f182334 SHA512 a65c123dd6e53d663ed411ad0a95be0b0d9f7fafd36d73f893d3b55bf845df8b6048fca6ebda7210d87a43ab8868d7c41ba36d5f663d91050239d448b2719357
+DIST gitlab-runner-15.5.0.tar.gz 1327027 BLAKE2B edbf9db814ee3790decec9e14342fa6bff12433c3d20a45905dca294c655e09600af8adcf6da96635c8b65e7c7656aac61deec135dd153463e34b1bc198a5c10 SHA512 5452dce98144d9994221937c8ef8428fe6f23a8421fbf42479b9bf02244263cf42c1007349313076f3a003c2528c3d3b2e170a36523180889f2da61b2a52bd36
 EBUILD gitlab-runner-15.1.1.ebuild 1784 BLAKE2B c17c2a1c0f0e1be690b8a431fb7390b924c5867f8f4943a308975bef90f0b9a393062ab4229c39af026e34271d4792c015ec4ae201a4298b0de3e3c844e688e5 SHA512 f9150a22106f18eccff02ccb5681cb08364c93f6dd3988c7ac9a546711a29728db7cdc2cf611a0763cceaa72078adc12bfd42ddeaf383aa9869562f9874afafd
 EBUILD gitlab-runner-15.2.1.ebuild 1785 BLAKE2B 7a81c3581d9493c95b5de44cd2de104774453a979388279fff756071d05470baad90211295c612a7b2713d64979a156e09d38e639be206af7f6e841a2dde5b09 SHA512 2838a97c26110d148c7b9303b310d4b803a5602cb14024c7284292f5b5c8760a8796598434c67ee8f51dee8add672e396441319a6ddfc587061def8061bf2414
 EBUILD gitlab-runner-15.3.1.ebuild 1791 BLAKE2B f29e8ddb0b6a1cb9269ff72713910b2902e0f32e396d00b244d2399ae112152a4f8104deb3c98df39b2ce49b0f76f4e81afbad65e8b7a0284c00a1fecbaa8f47 SHA512 f6a4d2e2b7ba57160165db0e226aca61a86d7315f794bea3da7296c16f0d0fd47a723b1bf23deb54f6a7062d651668f2ed70ed14f288bf26f6c63e5bbb0b3aa4
-EBUILD gitlab-runner-15.4.0.ebuild 1791 BLAKE2B 8481a547758ed1f26fa8bc5e31c0cde29c00644e72a6b780ce08297209cbfbec3c4955ad702c787072f9729b6a795f425af4af0416deaae26db02f5d0180b248 SHA512 df5802a2f53790d3b28213606b786aa1ffc8daeb779317af42b73a0a299a56a2d67f5088fd2331a1c6e074698e2d90af56f95e3588f41e4f350fa9e9ecf36549
+EBUILD gitlab-runner-15.4.1.ebuild 1791 BLAKE2B 4c8463e7bd8beae8f3be39d3e6e44c3b4d11fbec7b4a316746dc13c11643bba4dfa2488422dbe7e9eb919275ba74ca05288bc9fb6d804b0cd2881d887e73397c SHA512 cbdd601c82d99bcf06cc56bfc2705f26c676d03086fdee187cc850b7eaced1b23677cff7c666e0096f40c396fa8e7a3e34d44da8bd4815f64451bc92d46dcc14
+EBUILD gitlab-runner-15.5.0.ebuild 1791 BLAKE2B d08a6118154ae9d13d20fa62c5c9e2abf9f3f1eda6e52425759d0e3051ec8ca99f2bdfb7928ac4487006744e5dfd34a999e3f8a2cfa88fde35eef0877e738658 SHA512 a4aa956328fff1219ed08fd3f9ee4a383cc68be5e54a7be754fb782c8015e4479a24f1cbe306edf8ea93d38a48422c4860229271977ea8d19778e4da70cfbecc
 MISC metadata.xml 249 BLAKE2B 08603bf9d754b59bae12620988552abc7f76b87a1390d02038789eba034c22412a3593d10f443794a5171ff3905c2b5c822368b2eb9f53a528097b7b6c80ffe9 SHA512 338d72efbd040697be98aad4229b81c9694eb27ecbc39f3a18332f4cc766a46b4a0a92f32612203259bf58f5838d0aff7f0b1abec7766f6cd2394c73f7f0b251
diff --git a/dev-util/gitlab-runner/gitlab-runner-15.4.0.ebuild b/dev-util/gitlab-runner/gitlab-runner-15.4.1.ebuild
index 07f23f03aeee..454e48ab945c 100644
--- a/dev-util/gitlab-runner/gitlab-runner-15.4.0.ebuild
+++ b/dev-util/gitlab-runner/gitlab-runner-15.4.1.ebuild
@@ -5,7 +5,7 @@ EAPI=8
 inherit go-module systemd tmpfiles
 
 # make sure this gets updated for every bump
-GIT_COMMIT=43b2dc3d
+GIT_COMMIT=526d939d
 
 DESCRIPTION="The official GitLab Runner, written in Go"
 HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
diff --git a/dev-util/gitlab-runner/gitlab-runner-15.5.0.ebuild b/dev-util/gitlab-runner/gitlab-runner-15.5.0.ebuild
new file mode 100644
index 000000000000..1a581387db33
--- /dev/null
+++ b/dev-util/gitlab-runner/gitlab-runner-15.5.0.ebuild
@@ -0,0 +1,67 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd tmpfiles
+
+# make sure this gets updated for every bump
+GIT_COMMIT=0d4137b8
+
+DESCRIPTION="The official GitLab Runner, written in Go"
+HOMEPAGE="https://gitlab.com/gitlab-org/gitlab-runner"
+SRC_URI="https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v${PV}/${PN}-v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc64"
+
+COMMON_DEPEND="acct-group/gitlab-runner
+	acct-user/gitlab-runner"
+DEPEND="${COMMON_DEPEND}"
+RDEPEND="${COMMON_DEPEND}"
+BDEPEND="dev-go/gox"
+
+DOCS=( docs CHANGELOG.md README.md config.toml.example )
+
+PATCHES=(
+	# https://gitlab.com/gitlab-org/gitlab-runner/-/merge_requests/3498
+	"${FILESDIR}"/build-for-arm64.patch
+	)
+
+S="${WORKDIR}/${PN}-v${PV}"
+
+src_compile() {
+	emake \
+		BUILT="$(date -u '+%Y-%m-%dT%H:%M:%S%:z')" \
+		GOX="${EPREFIX}/usr/bin/gox" \
+		REVISION=${GIT_COMMIT} \
+		VERSION=${PV} \
+		runner-bin-host
+}
+
+src_test() {
+	CI=0 ego test
+}
+
+src_install() {
+	dobin out/binaries/gitlab-runner
+	einstalldocs
+
+	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
+	newinitd "${FILESDIR}/${PN}.initd" "${PN}"
+	systemd_dounit "${FILESDIR}/${PN}.service"
+	newtmpfiles "${FILESDIR}"/${PN}.tmpfile ${PN}.conf
+	keepdir /{etc,var/log}/${PN}
+	fperms 0700 /{etc,var/log}/gitlab-runner
+	fowners gitlab-runner:gitlab-runner /{etc,var/log}/${PN}
+}
+
+pkg_postinst() {
+	tmpfiles_process gitlab-runner.conf
+	[[ -f ${EROOT}/etc/gitlab-runner/config.toml ]] && return
+	elog
+	elog "To use the runner, you need to register it with this command:"
+	elog "# gitlab-runner register"
+	elog "This will also create the configuration file in /etc/gitlab-runner/config.toml"
+}
diff --git a/dev-util/intel-graphics-compiler/Manifest b/dev-util/intel-graphics-compiler/Manifest
index 656c949f45a1..5cf200e9e872 100644
--- a/dev-util/intel-graphics-compiler/Manifest
+++ b/dev-util/intel-graphics-compiler/Manifest
@@ -2,10 +2,8 @@ AUX intel-graphics-compiler-1.0.11485-include-opencl-c.patch 507 BLAKE2B 1a77797
 AUX intel-graphics-compiler-1.0.8173-opencl-clang_version.patch 1807 BLAKE2B ec6aac8c78d7584e043a258585cbae6218fd8aa167d853e1eea96313298df7347ab7652ec2bf83199129e07e534d52fcd200858036e3d0af2c4f79ff249104f2 SHA512 1a0db341aab280aa205965dfc82d17b29f681bde76932f8291243afad985523f601c7279b1fb772ebc4d9197e5016941a1ad07cea2b6d7199710a7ee22fd81dc
 AUX intel-graphics-compiler-1.0.8365-disable-git.patch 1140 BLAKE2B f870def1128c30c3e50a71e9eac39eccbcc9bc798be574324016c6c31ed3a3f82e1499f1aada5a2c475bd6b6c467b1b236635fdd6b5145904bc63dc53f8d75e5 SHA512 d1d53a6f4a47031ec4cdcf3f57c059536ccf571a72929da3d9070487686f91f4202d20c4d626da616250f66b31815b61fafa82b903b1f5157a226ee748097bda
 AUX intel-graphics-compiler-1.0.9-no_Werror.patch 272 BLAKE2B 079fe334413dfddb7681940f2a8920a365e8e72526cfc09ea1c7d218e8b19468f80ea9a215be125b441ee5238d7856b8dec02ebfc4bfd76b1850aa9917da35ef SHA512 d3d27943e84e228b480172b4fe91ba9aed8bb1c98700eb8c8beebafb7f1cc6265279031f56181e67eff74f55e1bbc8ee24bdc4d14fc1200c5aff670ef019410d
-DIST intel-graphics-compiler-1.0.11702.1.tar.gz 8734601 BLAKE2B 7cc8a4f9fc820d822c3b435d172ca27145d916fd25fedf20d13b2d7041cba36fc4416e17307ab0cbf6b9785f5958a53c58486fb6fb4776025b696f5dfb195161 SHA512 cd7d27a3a13462517c3e75c43d7d951afa53ef77875f479304da43b93fd40ae19680c11dc5bcf2ec3fecf6dbe56daa954ccb88b9f99f3af4c53d3141ef0b93f5
 DIST intel-graphics-compiler-1.0.12149.1.tar.gz 8874232 BLAKE2B b6195741282290561ee669574b19a9d96dd9695ea6358932f4c54946ff7b2a0315f905e9445419349131c2a424b630b8197a944bbd46a3232bd841be50f4f2e8 SHA512 1c9f2a6e119713173db527d8dc891269606db2a57a9c0043c82556e79a77d83bab31b732557e8130f36b99a54b551e8ff6d6104b3d75ef081d9f16811abbe8db
 DIST intel-graphics-compiler-1.0.12260.1.tar.gz 8887984 BLAKE2B 626b5f2bd189ba9b2933b9d65227ca1552484f73f7398b2a763744d21a4ea189987e4eb08e9e7f09898fb49568b59a2c45298363495c1759fec9927a95cf4478 SHA512 4223e9c8213c7e6cf3539d955394a0a4a39cb8d2114ce18ccaeeb0b36a91ca6fc6a314fa9d9db24929fa7cd6b86ff8b82f369f35dd80e5df49b23ac9cd3a519b
-EBUILD intel-graphics-compiler-1.0.11702.1.ebuild 2460 BLAKE2B f1455841699d2979a7aa495dcaff5eae4db141d04120a003d621fe28288afeba4f42401feb0001abc5c510981dd6e7250c448b062aef4045c97ead0905431a08 SHA512 3714dc24f1535e9d6b3a37cafec8e43a3c411dda037ca485aae48b07f3abcdf3d5769cd8c592c26de990cb2bf0aef301e463e872af30534b3c90b23a64010cb4
-EBUILD intel-graphics-compiler-1.0.12149.1.ebuild 2461 BLAKE2B fb2245758e2a5e0e86fbcabe1f4deaa3c0fb6997bb657ab5d88cd8b2b424e10287b960397bd63f5efe8bbcbb89aa7de07c3970205566e9d9e01d3ca20ffb0771 SHA512 03b3c9ce763c91ed7d8e455b3d911d1ebc8a5a91e80e8632527fe8705d6fb362e219b7aa7a6f6e219e01db765dd572d91206251c8043940c4aab2cdc2fe6c802
+EBUILD intel-graphics-compiler-1.0.12149.1.ebuild 2460 BLAKE2B f1455841699d2979a7aa495dcaff5eae4db141d04120a003d621fe28288afeba4f42401feb0001abc5c510981dd6e7250c448b062aef4045c97ead0905431a08 SHA512 3714dc24f1535e9d6b3a37cafec8e43a3c411dda037ca485aae48b07f3abcdf3d5769cd8c592c26de990cb2bf0aef301e463e872af30534b3c90b23a64010cb4
 EBUILD intel-graphics-compiler-1.0.12260.1-r1.ebuild 2503 BLAKE2B a12ab9934b62bdbde59f421544e9b9f6e01e72a19a6819048745419beaf6269a4e343ee27da1fe1474620ad1669fd2f86d9a9691c414a270ae36fe118d8640d2 SHA512 c0d4d5b5579dac3909bf97c8af495346c5e5dd902a5e5e47e9409f5155082ad1450874417a015731b2354fc4879408ac1e445bd2fff4aa0c79ddf56268c28693
 MISC metadata.xml 594 BLAKE2B de9f434fc853417b9d1c6199c7501c9fe702aa68b0eaa0f88d298563431de126fbdc259f0d541e85674b0205444f5d1febf0433b292a6ac40661d62af23457d8 SHA512 b939b315122a5fe3252242ccab8fbf049d9234ee67c6910969c178bcb56fc835bc954380f8c15bab23905ac852fa0fe0640f6ef2ee9d48502ae0e3379d7f7460
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11702.1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11702.1.ebuild
deleted file mode 100644
index 63b90728f8c7..000000000000
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.11702.1.ebuild
+++ /dev/null
@@ -1,85 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-CMAKE_BUILD_TYPE="Release"
-LLVM_MAX_SLOT="13"
-MY_PN="igc"
-MY_P="${MY_PN}-${PV}"
-PYTHON_COMPAT=( python3_{8..11} )
-
-inherit cmake flag-o-matic llvm python-any-r1
-
-DESCRIPTION="LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware"
-HOMEPAGE="https://github.com/intel/intel-graphics-compiler"
-SRC_URI="https://github.com/intel/${PN}/archive/${MY_P}.tar.gz -> ${P}.tar.gz"
-S="${WORKDIR}/${PN}-${MY_P}"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="debug"
-
-DEPEND="
-	dev-libs/opencl-clang:${LLVM_MAX_SLOT}=
-	dev-util/spirv-tools
-	=sys-devel/lld-${LLVM_MAX_SLOT}*
-	sys-devel/llvm:${LLVM_MAX_SLOT}=
-"
-
-RDEPEND="${DEPEND}"
-
-BDEPEND="
-	=sys-devel/lld-${LLVM_MAX_SLOT}*
-	${PYTHON_DEPS}
-"
-
-PATCHES=(
-	"${FILESDIR}/${PN}-1.0.9-no_Werror.patch"
-	"${FILESDIR}/${PN}-1.0.8173-opencl-clang_version.patch"
-	"${FILESDIR}/${PN}-1.0.8365-disable-git.patch"
-	"${FILESDIR}/${PN}-1.0.11485-include-opencl-c.patch"
-)
-
-pkg_setup() {
-	llvm_pkg_setup
-	python-any-r1_pkg_setup
-}
-
-src_configure() {
-	# Get LLVM version
-	local llvm_version="$(best_version -d sys-devel/llvm:${LLVM_MAX_SLOT})"
-
-	# See https://github.com/intel/intel-graphics-compiler/issues/212
-	append-ldflags -Wl,-z,undefs
-
-	# See https://bugs.gentoo.org/718824
-	! use debug && append-cppflags -DNDEBUG
-
-	local mycmakeargs=(
-		-DCCLANG_INCLUDE_PREBUILDS_DIR="/usr/lib/clang/${llvm_version##*-}/include"
-		-DCCLANG_SONAME_VERSION="${LLVM_MAX_SLOT}"
-		-DCMAKE_LIBRARY_PATH="$(get_llvm_prefix ${LLVM_MAX_SLOT})/$(get_libdir)"
-		-DIGC_OPTION__ARCHITECTURE_TARGET="Linux64"
-		-DIGC_OPTION__CLANG_MODE="Prebuilds"
-		-DIGC_OPTION__LINK_KHRONOS_SPIRV_TRANSLATOR="ON"
-		-DIGC_OPTION__LLD_MODE="Prebuilds"
-		-DIGC_OPTION__LLDELF_H_DIR="${EPREFIX}/usr/include/lld/Common"
-		-DIGC_OPTION__LLVM_MODE="Prebuilds"
-		-DIGC_OPTION__LLVM_PREFERRED_VERSION="${llvm_version##*-}"
-		-DIGC_OPTION__SPIRV_TOOLS_MODE="Prebuilds"
-		-DIGC_OPTION__SPIRV_TRANSLATOR_MODE="Prebuilds"
-		-DIGC_OPTION__USE_PREINSTALLED_SPRIV_HEADERS="ON"
-		-DINSTALL_GENX_IR="ON"
-		-DSPIRVLLVMTranslator_INCLUDE_DIR="${EPREFIX}/usr/lib/llvm/${LLVM_MAX_SLOT}/include/LLVMSPIRVLib"
-		-Wno-dev
-
-		# Compilation with VectorCompiler causes currently a segfault.
-		# See https://github.com/intel/intel-graphics-compiler/issues/236
-		-DIGC_BUILD__VC_ENABLED="OFF"
-		# -DIGC_OPTION__VC_INTRINSICS_MODE="Prebuilds"
-	)
-
-	cmake_src_configure
-}
diff --git a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12149.1.ebuild b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12149.1.ebuild
index 40b31434451c..63b90728f8c7 100644
--- a/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12149.1.ebuild
+++ b/dev-util/intel-graphics-compiler/intel-graphics-compiler-1.0.12149.1.ebuild
@@ -18,7 +18,7 @@ S="${WORKDIR}/${PN}-${MY_P}"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="debug"
 
 DEPEND="
diff --git a/dev-util/lldb/Manifest b/dev-util/lldb/Manifest
index 91f697d598a9..e367c4d24012 100644
--- a/dev-util/lldb/Manifest
+++ b/dev-util/lldb/Manifest
@@ -8,7 +8,7 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lldb-13.0.1.ebuild 2587 BLAKE2B 1e017726c7d7f9879c96c744c63f950ff2837d3082e5e5f81202b9b6259d71d013285fb48e81a25d8cbdb81b1db8b2f6807f897ea83b9742a24c3c35ac9761c0 SHA512 6e626b26f6ed4c51e9b2c732de21a60d3a5db90ee57c890b40dd8a6c82f738d6e8bd7a02f8f7fe7cdb9cb067ead82513b3ce7d35e20210f10f4d525cb3baed77
 EBUILD lldb-14.0.6.ebuild 2661 BLAKE2B 272053742b016bf234e75bb6b05e4b113b1f8b34249e8a601842412216665cf00df1b93bf590815d1dd1a709ce5006671bddb92cda7d42a5d099f3cfc3968368 SHA512 91a303661ae706bde45a7d12da928735690fdbb48901a31d6477c2d8595a42a59d4e07dc0ffe4eeb64e0775c61c329b05c0f12ccdece7bed1d5a9093db690f34
-EBUILD lldb-15.0.3.ebuild 2696 BLAKE2B 7eda6ca848fdf9053e99363263cf54df4f658971b7201fdce7b789a43caaec2beea0ace930c86ff303d128305b578c13657e404023ffc06f9c964acd212f4b6f SHA512 a47c1c7cca3c7ba33d7517f059f0a983f1cb23a489f15d0ad13c4b95057b99faf982dcd6c85c6562e3c99b3004d69d6e6710d9077266bd95f2fd50a6566fa08a
+EBUILD lldb-15.0.3.ebuild 2695 BLAKE2B 17e38676e3ecf8e04bc5a6ee874568e1f700da29aa547191a0c358965e82fc22f5d4565830620cd67c2801c429b1fbaaeb9d511a2791c8c28504affeb03c6492 SHA512 d894725c4e27d0c3ae0453c32406dda5a85fa4f6e6bdce734e6faaccf0883a8ea5dd37fc5b8392446ed9e2b8c4ed6e84f98821f10dc43df369d98f0be1dd8e67
 EBUILD lldb-15.0.4.9999.ebuild 2673 BLAKE2B 0c01470e8916e102a0478bf11e8d37b7ccf7e5582917c57da47aa740b1b67788ecd21e264fe9e69bb922faf731df046e0db77305aabd7beed3332d0c2a51063c SHA512 4b6ce3d052910dd175795ff62184fbbf3efd297d43ff5bd45718728103fd0811eace71a9b5415503e242f7d97fe3e96dc1811444a459b1a52669218ad494e0b8
 EBUILD lldb-16.0.0.9999.ebuild 2630 BLAKE2B 2c603a9c2de88501977cf49958858eda09c30dc04a5e7345b081c8597eefb1a6a568a0e285eff1cf4dff106e1efd98abc5a3c2ed6d233180c86a3e6564a78f9e SHA512 288528aa3b4c9aecd8a79f9e69265d719111ddf065fba9df34b2629c4cf1ad4164658410c9830feb1a157494126253f2e6c8778c88e3433e30eaede6faa518c1
 EBUILD lldb-16.0.0_pre20221016.ebuild 2673 BLAKE2B 0c01470e8916e102a0478bf11e8d37b7ccf7e5582917c57da47aa740b1b67788ecd21e264fe9e69bb922faf731df046e0db77305aabd7beed3332d0c2a51063c SHA512 4b6ce3d052910dd175795ff62184fbbf3efd297d43ff5bd45718728103fd0811eace71a9b5415503e242f7d97fe3e96dc1811444a459b1a52669218ad494e0b8
diff --git a/dev-util/lldb/lldb-15.0.3.ebuild b/dev-util/lldb/lldb-15.0.3.ebuild
index e8cfc843d1a3..8bb201f10a9e 100644
--- a/dev-util/lldb/lldb-15.0.3.ebuild
+++ b/dev-util/lldb/lldb-15.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~x86"
 IUSE="debug +libedit lzma ncurses +python test +xml"
 RESTRICT="test"
 REQUIRED_USE=${PYTHON_REQUIRED_USE}
diff --git a/dev-util/spirv-llvm-translator/Manifest b/dev-util/spirv-llvm-translator/Manifest
index fffb8758dc4e..917bd026c542 100644
--- a/dev-util/spirv-llvm-translator/Manifest
+++ b/dev-util/spirv-llvm-translator/Manifest
@@ -4,5 +4,5 @@ DIST spirv-llvm-translator-14.0.0.tar.gz 1482704 BLAKE2B f88eb8f4cd652c448e46560
 DIST spirv-llvm-translator-15.0.0.tar.gz 1515145 BLAKE2B 1f93b55f8934ce7dbc9416b82f7bd544d16e95be795047e914d0c303ec90965eae03ab3522b3c92d6cffb1fe00bed78a4bb74085d3da21c14b68ad3fbe53113c SHA512 8a6ddddf326dad96c1c5749ebf03e63e6be60592dccd307f7a35be668cec2b4f58c2f089854aeefa37398c3a97dad6bf92a6ceb892da27b5cf9d4ae1aa41dd06
 EBUILD spirv-llvm-translator-13.0.0-r2.ebuild 1393 BLAKE2B 05cd645ace5d0e889e8199f74d2ff6f342cfc7c60091fcd339f99ace5c80f78a2be38db366ebc46dffb4527f25415e322df5e4ba175a622d39feb6431828c1fe SHA512 1275e9bcece435865e6ac9050426470f7f7c934023cabc30b1b0065e6401294943201f0df7b70553f6a3f3cd3039d7c8c39776bab15b936e3d9dca8f4eefc804
 EBUILD spirv-llvm-translator-14.0.0-r1.ebuild 1203 BLAKE2B 0bf581cbfcda0ae078bbcbb4792a19415b326d3bc14cac4c2e616ff2a16f8d15f3b98d852a6d40df4ce0121ae4a331ee49733c676eff862ef0fea270d1fa3b43 SHA512 db59082eb283cf789cbb9ed9604890bc4079932e45e4f3dcb98fd106dc9757b7f496eac1c2c0aaba7184bef2900efd12ce4c4d3609ce84b3c792c5174d6ae8d5
-EBUILD spirv-llvm-translator-15.0.0.ebuild 1204 BLAKE2B 56f1e6f1e5feb1940cc0f3ef0da1aacca9ffa4131a91492e4b0add2b45660441585fadefa67ad9aabd9d6939730ce7eaa0122247dc5b453ddb8e6240e01838bf SHA512 46f61d6e52ef057e29e6b3b8ad04c121740fb4f98ffd7dad71bc8c675ed3bf4ecf3f580f47b25766c2a5b76fd216b1ca915cc368e44e48f041a16590c5b1d277
+EBUILD spirv-llvm-translator-15.0.0.ebuild 1203 BLAKE2B 02f0648703d683c2514ab92c57da4ddc479b4bc12c23f4293320dc50d9fbc8fb25479e2b5dbfe5a7740a4a375354f6a3e84c2bdc2a500fa991a1fde806d698b6 SHA512 fe2f5ad1480597fbdda293b7c650571039dbfee896f4d97e948669a69d8faee82729f6360a6ea578360792ab72a5a0a27de8b16560f23a2485fbe3d3124d740a
 MISC metadata.xml 696 BLAKE2B 8d5fd20aa6ce0ed9c7660ac356f9c2274c8262680faf04aa647890044e8c48703366aa59a6c9b638105a5269ae2bcc7d1ccdb01fbb268b2054d6dce7a9cb875b SHA512 c0ce5f3a5eefced8c2a3fe8988009f4ae2dab5c1a93d5f908d24e2445696799dc937cde7f1ec29237ce44a653d496a74b246ac9d65ab132c33c5334990a6238e
diff --git a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0.ebuild b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0.ebuild
index d46120e8f99d..ab5c882049c9 100644
--- a/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0.ebuild
+++ b/dev-util/spirv-llvm-translator/spirv-llvm-translator-15.0.0.ebuild
@@ -16,7 +16,7 @@ S="${WORKDIR}/${MY_P}"
 
 LICENSE="UoI-NCSA"
 SLOT="$(ver_cut 1)"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test +tools"
 REQUIRED_USE="test? ( tools )"
 RESTRICT="!test? ( test )"
diff --git a/games-action/Manifest.gz b/games-action/Manifest.gz
index 1744fc9b3d6a..31488db19e99 100644
--- a/games-action/Manifest.gz
+++ b/games-action/Manifest.gz
diff --git a/games-action/extreme-tuxracer/Manifest b/games-action/extreme-tuxracer/Manifest
index 068cb3cd2813..eef5e9b865b4 100644
--- a/games-action/extreme-tuxracer/Manifest
+++ b/games-action/extreme-tuxracer/Manifest
@@ -1,3 +1,5 @@
 DIST extreme-tuxracer-0.8.0.tar.xz 40817900 BLAKE2B 79462dddfc531d1c17f2b9ce8e5bc4a250cb7ea48ff6f37ceb9eb7f0bcbf97f3a0ae9b09a8c09fa36bc71f8982dbeb2b1e67cddd967252fe0c9af013781546c7 SHA512 ff1e4dab4d2e72960eb8dd9643f0150255fe4196c2b25e67dd0d266a89f0b247ce76f818927cda35bbd669972f31f79b1461ccb1b2c7aeeb8d70aa39ed7bfd6d
+DIST extreme-tuxracer-0.8.2.tar.xz 40828312 BLAKE2B dfc550457ac37f4aa0c649e1368610eb417e450eea454ed20dd57d7799f376714531861da69683ea1437f222ebd18acd8ccb14c5ce97c9225185d5bf6c8ef49d SHA512 572b494e82f00853b38b3913f0ef34d0a5c0b6655626fa6c72c76f7a41f723ff6fc3c20ca54d835ed5dba462f22896882e9c37ddf5b3e840ea14af3d336addb8
 EBUILD extreme-tuxracer-0.8.0.ebuild 1012 BLAKE2B c5cacec7446f36723ddf745a66271564ed7c571fb309dbd569b6d1cf95536e71fe585caae40553853dfb6c973b0ee401ae35d64caa6e1a9a1fdff58bfd8591e4 SHA512 cf00cf1fc9f25a2ab361e7105c7acc8dda40c223f0c38f7ef35d7a378c62dcbce4160968b83dddd82bd864782fef14fd01ca0042820ca8add49a36ea9d9c781e
+EBUILD extreme-tuxracer-0.8.2.ebuild 922 BLAKE2B 3d8b6975f707cb6e28396de6bdc3fbe16b56326ea48ab9cbc02f0cea8dd241fc71fe1db5cb68335f2d3a07380b396bc4fec1d2e30eaaa38fda588ec86b8a4326 SHA512 0772bbe125c66a9685d59a3bd8e6d4d3c52bcc4d7e4ee0b466046ab8f96f00e260bac84f34e8b415b4eee148da249d9e946a12140abc7082356f2f9d741969b3
 MISC metadata.xml 531 BLAKE2B 4e847de0a2cd5b98d1ce466f105b477a7c0dd84660c7f208c46253fb66a9d320d5eedb9cf8f98a44f23e2b9285c005e4baf5479d5361697818718208a10a00c7 SHA512 31f55592d0693cc57726b668419bb8c370873bcfc770ad7054c3527510ad5203bb861ee81c0429ccc203a4b24bfb13996803b6428b5eafb77587a33a4bf348f3
diff --git a/games-action/extreme-tuxracer/extreme-tuxracer-0.8.2.ebuild b/games-action/extreme-tuxracer/extreme-tuxracer-0.8.2.ebuild
new file mode 100644
index 000000000000..9e45df3444fd
--- /dev/null
+++ b/games-action/extreme-tuxracer/extreme-tuxracer-0.8.2.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit autotools desktop xdg
+
+DESCRIPTION="High speed arctic racing game based on Tux Racer"
+HOMEPAGE="https://sourceforge.net/p/extremetuxracer/wiki/Home/"
+SRC_URI="https://download.sourceforge.net/extremetuxracer/etr-${PV}.tar.xz -> ${P}.tar.xz"
+
+LICENSE="GPL-2+"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
+IUSE=""
+
+RDEPEND="
+	>=media-libs/libsfml-2.4:0=
+	virtual/glu
+	virtual/opengl
+"
+DEPEND="${RDEPEND}"
+BDEPEND="virtual/pkgconfig"
+
+S="${WORKDIR}/etr-${PV/_/}"
+
+src_prepare() {
+	default
+	# kind of ugly in there so we'll do it ourselves
+	sed -i -e '/SUBDIRS/s/resources doc//' Makefile.am || die
+	eautoreconf
+}
+
+src_install() {
+	default
+	dodoc doc/{code,courses_events,guide,score_algorithm}
+	doicon -s 64 resources/etr.png
+	doicon -s scalable resources/etr.svg
+	domenu resources/etr.desktop
+}
diff --git a/games-server/Manifest.gz b/games-server/Manifest.gz
index 0e60726fb426..96fe23f2d523 100644
--- a/games-server/Manifest.gz
+++ b/games-server/Manifest.gz
diff --git a/games-server/bedrock-server/Manifest b/games-server/bedrock-server/Manifest
index f1105f8b9380..de6c994ab52f 100644
--- a/games-server/bedrock-server/Manifest
+++ b/games-server/bedrock-server/Manifest
@@ -1,9 +1,5 @@
 AUX bedrock-server.confd 317 BLAKE2B 47308c295519e0c92653a738aafd3044120c8f86d70050d639a0a1b05cf3cc1c8858bab713cc3b63cabb61c821d8292e95c9011c7af6593a4d8070722733f49d SHA512 9f6300b46680663b5a58a9b873fbbfd912c04fb3272a5528b64b6a32e5492ff1b66e9eafea65d17ff36defa006727b307ac130461846cd6742512bad3061db58
 AUX bedrock-server.initd-r4 1944 BLAKE2B 9870b09a447588ed0dbfe49bdeee928d54e8ea788a50dc834ea761ef8dcbf21696214ff3370f43de3218e202a5ad786b972c77a679a7cd0d2d1ef38f43db67de SHA512 3281e15bf7a4b87cd1b53b755c1695d77f2de0b7ea23ebdedf0bea60013c5d79f563fdbab3de421bfa50c3d2f24e93c39f49525d8157ca9e649d206a1cb80dfd
-DIST bedrock-server-1.19.20.02.zip 75658923 BLAKE2B f137320f5785ddbdd1f4ff550f99448ad70455c0ab70bc8d9ec48c15487503313dd0e887cd8b9a4a1a73b5af82af0b548a6cd13180fdbbd3fb53291f3c5c6ee7 SHA512 f82e50e9180dadab76152bc7860c0306d3ee68091f39345749e4c4268b5c6d53692188373bb366a053abc352b50b1508eab8d662b10fe7ce96cf91485596c1d2
-DIST bedrock-server-1.19.30.04.zip 77883277 BLAKE2B e92ecca1b3118e4045c4369b9d468566ed807c989851d30d546629652ffa83f52ebc48f1a4d47061b1073ba0672e4432c7f2ae71b07b27e5bf8260f91cbcaf02 SHA512 b1431d52b193c8198aa6d3ff015d4de8df551fc6d96210aa8745fc14021dcf655c7cada0e218a9b803ed1142ec952224751bea3acd9a778f7775992c80f1ddc9
 DIST bedrock-server-1.19.31.01.zip 77882899 BLAKE2B eef22247045fb6b15a1a1b6a73d53dcdfda096adddd798875f1b1ff7fd8b5af1179f0f4b5e05dd5f51a098d896633bc7e2e2c3edd713e21fb2da84801ab9c66a SHA512 ec43e491ed946cfc7da12e9f46f00b3e06aa0f72970abfd8d63bbc7c3c875c933651e1d6f332a201d2bbf4c0cded2f8b2e69f971aa55a74d2721ab953ea9dfd1
-EBUILD bedrock-server-1.19.20.02.ebuild 1086 BLAKE2B 6febd87ffdf800926bc5232e8b99ac06dc6bc07f9e1ec597e2bef3852b8f422dcebc0d229f6c2e7a6a190475b82227dcc0f860b9b04f53c1fea9cbe6dea5ba43 SHA512 4c8cc6accca6c7ed66737ce01f4f5c5acb583ef2ddd26c1f0563f98bd500f7c3d762cccdef000a4ba70d3ff9783ca5d777e3927ca100e55d0d09984a553e3f6b
-EBUILD bedrock-server-1.19.30.04.ebuild 1087 BLAKE2B 9eaedd798a626d59330e6002c3b85c352825314b4d6f86ef4e8f1cfb06e6585e13731e20e37dd87311f3a00ddfcf28993f767b9e6b5ad043c44e2d0bcbb31bfc SHA512 dbc2691ccb190433c75a1cf5632e2fbeb158b9c8719b496c36134a8bafe53bd27c38701c68d5304994b45e071973143be1dfaa4dd9b007774100f32a03513d1f
-EBUILD bedrock-server-1.19.31.01.ebuild 1087 BLAKE2B 9eaedd798a626d59330e6002c3b85c352825314b4d6f86ef4e8f1cfb06e6585e13731e20e37dd87311f3a00ddfcf28993f767b9e6b5ad043c44e2d0bcbb31bfc SHA512 dbc2691ccb190433c75a1cf5632e2fbeb158b9c8719b496c36134a8bafe53bd27c38701c68d5304994b45e071973143be1dfaa4dd9b007774100f32a03513d1f
+EBUILD bedrock-server-1.19.31.01.ebuild 1086 BLAKE2B 6febd87ffdf800926bc5232e8b99ac06dc6bc07f9e1ec597e2bef3852b8f422dcebc0d229f6c2e7a6a190475b82227dcc0f860b9b04f53c1fea9cbe6dea5ba43 SHA512 4c8cc6accca6c7ed66737ce01f4f5c5acb583ef2ddd26c1f0563f98bd500f7c3d762cccdef000a4ba70d3ff9783ca5d777e3927ca100e55d0d09984a553e3f6b
 MISC metadata.xml 676 BLAKE2B ae3d24e16c5da237df029cc571c6f7099c0e292524633990f92a16075a901191b0aade76429014bb02c95d8032b08436d79599eaafa4fea16345e63dd9180b94 SHA512 df3a66bb13e34ed64a3c5a7974a1aa6b5b4d8b9589a4f9bc08ac74a6cf6f7f8886373963b4d5532a3ca86a2ca48bd7a6f58500622741109273e8ec670ca290f7
diff --git a/games-server/bedrock-server/bedrock-server-1.19.20.02.ebuild b/games-server/bedrock-server/bedrock-server-1.19.20.02.ebuild
deleted file mode 100644
index 520bc15c7abd..000000000000
--- a/games-server/bedrock-server/bedrock-server-1.19.20.02.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
-S="${WORKDIR}"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="-* amd64"
-
-RDEPEND="
-	acct-group/bedrock
-	acct-user/bedrock
-	app-misc/dtach
-	dev-libs/openssl:0/1.1
-	sys-libs/zlib
-"
-
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-DOCS=(
-	"bedrock_server_how_to.html"
-	"release-notes.txt"
-)
-
-QA_PREBUILT="opt/bedrock-server/bedrock_server"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	exeinto /opt/bedrock-server
-	doexe bedrock_server
-
-	insinto /opt/bedrock-server
-	doins {allowlist,permissions}.json server.properties
-	doins -r {behavior,resource}_packs definitions structures
-
-	dodir /opt/bin
-	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
-
-	newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server
-	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
-
-	einstalldocs
-}
diff --git a/games-server/bedrock-server/bedrock-server-1.19.30.04.ebuild b/games-server/bedrock-server/bedrock-server-1.19.30.04.ebuild
deleted file mode 100644
index 16dd14a8e660..000000000000
--- a/games-server/bedrock-server/bedrock-server-1.19.30.04.ebuild
+++ /dev/null
@@ -1,53 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DESCRIPTION="The official bedrock (non-java) based server for the sandbox video game"
-HOMEPAGE="https://www.minecraft.net/"
-SRC_URI="https://minecraft.azureedge.net/bin-linux/${P}.zip"
-S="${WORKDIR}"
-
-LICENSE="Mojang"
-SLOT="0"
-KEYWORDS="-* ~amd64"
-
-RDEPEND="
-	acct-group/bedrock
-	acct-user/bedrock
-	app-misc/dtach
-	dev-libs/openssl:0/1.1
-	sys-libs/zlib
-"
-
-BDEPEND="app-arch/unzip"
-
-RESTRICT="bindist mirror"
-
-DOCS=(
-	"bedrock_server_how_to.html"
-	"release-notes.txt"
-)
-
-QA_PREBUILT="opt/bedrock-server/bedrock_server"
-
-src_compile() {
-	:;
-}
-
-src_install() {
-	exeinto /opt/bedrock-server
-	doexe bedrock_server
-
-	insinto /opt/bedrock-server
-	doins {allowlist,permissions}.json server.properties
-	doins -r {behavior,resource}_packs definitions structures
-
-	dodir /opt/bin
-	dosym ../bedrock-server/bedrock_server /opt/bin/bedrock-server
-
-	newinitd "${FILESDIR}"/bedrock-server.initd-r4 bedrock-server
-	newconfd "${FILESDIR}"/bedrock-server.confd bedrock-server
-
-	einstalldocs
-}
diff --git a/games-server/bedrock-server/bedrock-server-1.19.31.01.ebuild b/games-server/bedrock-server/bedrock-server-1.19.31.01.ebuild
index 16dd14a8e660..520bc15c7abd 100644
--- a/games-server/bedrock-server/bedrock-server-1.19.31.01.ebuild
+++ b/games-server/bedrock-server/bedrock-server-1.19.31.01.ebuild
@@ -10,7 +10,7 @@ S="${WORKDIR}"
 
 LICENSE="Mojang"
 SLOT="0"
-KEYWORDS="-* ~amd64"
+KEYWORDS="-* amd64"
 
 RDEPEND="
 	acct-group/bedrock
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 3b29670faf62..6e917aaac11d 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/libopenshot/Manifest b/media-libs/libopenshot/Manifest
index 4843e9030ab1..ff217249c91b 100644
--- a/media-libs/libopenshot/Manifest
+++ b/media-libs/libopenshot/Manifest
@@ -5,5 +5,5 @@ DIST libopenshot-0.2.6.tar.gz 22472140 BLAKE2B 7ad35cfb927e637c4ded38de751f3f484
 DIST libopenshot-0.2.7.tar.gz 22472544 BLAKE2B 511ed214f0ecc43294a787e1c0119f036e274a1e8d051cb6e926bf7a9b5cea416325a2e051fca758d1f80ec2b9d746a4dd268e5ac5322fe8539fa2041a8c4d9d SHA512 71cb0e4010d8f3ff453486c3da3c7019c6569066845dcc58f438049a08b1c8663f31c29a728ce5461e9d3a1ca550038b757d4528e62a26eeb45ecbe600353988
 EBUILD libopenshot-0.2.5-r1.ebuild 2093 BLAKE2B ea194e811e7695bb0693dc4d596855b94b31154fa10a262eeb06c09a417dbb6f79485238f2582f0393344aa2c75fa8fa32c15517b6f6b22b9090bbe0ce5d15e4 SHA512 f070385aa981d298dba10ca14a6678c0013661a3033cd263531d8c5d951b57e98fb47e40a2a61b9e703e7fe51bcb198f89a2f3f8556989d152264478aacc38d2
 EBUILD libopenshot-0.2.6.ebuild 2214 BLAKE2B 694dfe6befa9af5cf0be420982e9512cf2f62a024471cd642c33a99082b06aca9e3c7a9a0cfdd37867a9076f2416d1e1f0992d42028c31488a492f68f35ea3f7 SHA512 26518253ebcc9e49eca4fc8f46174470d45cca9e0c86c80c31dd956b3a10c31eff7e96cabc920223e7328eae7af5b7885a599989b6990df55ce603cf40048951
-EBUILD libopenshot-0.2.7.ebuild 2212 BLAKE2B 75671d6c25e690021d655917092217ba6d360302be59b46562c3c389d421db499606497588d42e2f4f9aee046602d788077db752fab813a2a9d3f8b304739073 SHA512 4988fa428973f79badd09b1f86393611765bf2690d97a1c154bbac075542cb8034c0477cfefe7abbb0e0a675eeae7619029f60c5be737f2a5b8515a510b7ad9c
+EBUILD libopenshot-0.2.7.ebuild 2233 BLAKE2B 1a63594b8931438d02b5fc692bdff06c4052a623f99a6278b677af16d0bef18396967b5155266fbbd2275421183f1410886bdb37e09cec058d461b65439f71b5 SHA512 82d5ca6fbc5e73f6ca19366b5e0181d6caf54c6437a2081821f1cdc4ea6fde6adb904cdcb7a6413ae47337b157eb905cb2442dafd7c4c8f34e1cafee21e8c395
 MISC metadata.xml 616 BLAKE2B de66c4287ffe372cf76e3b48be340b0c981595f2381f8b248de88586cf9cad05b0a9cfc6465b55832db2bc76a5755ad5692494f5f2dc1dc9ee8a569887d50b34 SHA512 b2569b3545ef8a08ae3bc4b1307ee4414c82d488dea41efd4c3c977f2bcde65df273dc8f9aa44ba09abfc3a2fc19c8d83a3dd61faabddabe07bdb8c37f963c46
diff --git a/media-libs/libopenshot/libopenshot-0.2.7.ebuild b/media-libs/libopenshot/libopenshot-0.2.7.ebuild
index bd3a3381e83f..2b8a04af8424 100644
--- a/media-libs/libopenshot/libopenshot-0.2.7.ebuild
+++ b/media-libs/libopenshot/libopenshot-0.2.7.ebuild
@@ -20,6 +20,7 @@ REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
 RESTRICT="!test? ( test )"
 
 RDEPEND="dev-libs/jsoncpp:0=
+	dev-libs/protobuf:=
 	dev-qt/qtcore:5
 	dev-qt/qtgui:5
 	dev-qt/qtmultimedia:5[widgets]
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 94e1e43eebdd..500c5eea816c 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/deadbeef/Manifest b/media-sound/deadbeef/Manifest
index 70c2b5cb75ab..f862075a6ca6 100644
--- a/media-sound/deadbeef/Manifest
+++ b/media-sound/deadbeef/Manifest
@@ -1,4 +1,5 @@
 AUX deadbeef-1.9.1-ffmpeg-5.0-fixes.patch 1298 BLAKE2B 5ff65bf6208ad7e75c56db0a47ff6a70e7d014140355dcdce902e3d443752b058f1abc4b4dfb5f99bc0ac28de38401f3ada135404c02ccfe072c106ae6fd1cd7 SHA512 f8617108d2720a033ec072433f076921f5150775c345767a658d474e8d9eccf7dec3d1fbac509f0629e8ac28c3edef1426cef3dc38458dce6df5d11e1b7f2156
+AUX deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch 1122 BLAKE2B 7693cb8fa0c5951eae240ff2d1ea7ca68c151dfcacab27dcb1cb293ae84e8ec11b94d49017f8a942b7443a9d80fcbda3a87eff84bf71d19ea1bb92fc64baf832 SHA512 ae7bddf970898d2e07ade6752b09f26782529186d880bceba93777380b103b2de8c67fbae784841904515e7a8c16e4bc34a6d1f390e1f6633ecff0bd3100dc58
 AUX deadbeef-1.9.2-drop-Werror.patch 4955 BLAKE2B 0435971de41528e20909623ff485a202e1260cb542b4b65d3cec3ec8d2f3fce097646a6bcbbd2204e39c246500b13096714d99426c4f3d468dbf0115c5907a5f SHA512 101e7316165fc28b2a300245c0fa9d86a5c1fdf2823b638fb8c3698df03a559b4dde07ac2aabd1b08ae498a42a7b298e4fc9330d2da9fec80cce6418bd504b9b
 AUX deadbeef-musl.patch 829 BLAKE2B 91294830e50ff996438563ab2b4ac4bd943d3f2c072ff5982ff810671389994b57d27d73dd61ca76ca4563974fc91254403cc946d95643941f23a808fa2f5c90 SHA512 5a7be29335f9b8a6a85dc233856346a216b1c7a0ade17f483d8c1144099e7b0ebb5a5ba531f96fa4fe6737f0971ff2bf1772edaf3739e81c54bebbdea11e6eeb
 AUX deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch 492 BLAKE2B d6ed36829d7ed139c43b6aa65c940f07e3f023d0554c258a2557c528d75e85c7dd2ca57eecef56088383a3b7b0b4f12109eb899f2847b86953421e826777c954 SHA512 0cec1ae38cf48b3f2ea53f74a6348d0217b1b3f017b836489d5b520f09ad76b6526cd3add48ed23871bc86feb7f7ed697cf6a62164a202be1ecabfd947e895f6
@@ -9,5 +10,5 @@ EBUILD deadbeef-1.8.8-r3.ebuild 4014 BLAKE2B ea7c4dff97eddc3c2f0b4ad6449b3dc7cb5
 EBUILD deadbeef-1.8.8-r4.ebuild 4043 BLAKE2B 5008997377e53d221c24586054f9c541c3d36f6200b2e78d532d55704114a1d3d369144456fab685b5e5543510d7125a2db5e5fa9b55e6050ef78479ffa1a83a SHA512 c79472edef844bf8d6e8117f136ba660ec106994583c1652ee0e8936bcd993ab7d84bc36a22e515a3a77d865a667c6a254f4bc7a8e73dba374dcde437a76a41e
 EBUILD deadbeef-1.9.1-r2.ebuild 4015 BLAKE2B a0a3bb5266ce7e8d691f6a888be0e466b31fa9bbd4ce4fab77800ebd7d2c07f1fa8bb57d15e6542777d98f1dfd9ef1447774df471360fb5104ded398bd078aae SHA512 18f2ed71b40dc9c29273901b793628cccf0f8d2e54d7bc29b376d3702079d961020548d208347058cf9654e0f0d6c9ae7a547cef7f0f2194210ed5808a81bfe3
 EBUILD deadbeef-1.9.1-r3.ebuild 4071 BLAKE2B 0d33c9e8db1898d3a957dce8bbd0e8b67255f308b413cd223d07d07e702a760558414f47a19d4906a8f9136ee7feb9c537f654c5df992d29663c076b104696ff SHA512 a32d0846460d4b6ea3e5f028a3c494ebcba7ffffc91935997c9440dc539b99be574816dbc87a7719aa9583864b5ad927757770990c997d545203813ca54ca6e2
-EBUILD deadbeef-1.9.2.ebuild 4128 BLAKE2B 073510990b95f3bf61076b9640f7a3ed92531f4e4511467604f7c446c67685678944d89deea04f25b16cb7d3f4445e3c64638469184c062fdfb6f3405e546763 SHA512 27d408268e6f1ccf2bbd3510b471c9f454aafee752af6d2d942191cf392474f4f52c57d2eead882c75c49bcfb35afc32e512f9c248b47e0843567d0efa20c359
+EBUILD deadbeef-1.9.2-r1.ebuild 4191 BLAKE2B 42d24a0ceaf9867a1a7e8ba38fc500eb531ba0b865850bc4853d8fe317d337c3d6d28e9c601e0d82e73740a0643124d340c04dd27f95f7717bb00661067b1d27 SHA512 fffd91bdb425acd9ac55107f5f69f74947065332a89751154295c2d66b1b3cc4443cb0c8678242b731fd848d7e8f85ab3df3ce04a09fcb5b0d9b9adf103d2c66
 MISC metadata.xml 969 BLAKE2B 0f8c160dd8cf50b9d8ed80efe90575527ec0a732f1c0e3dc5c3bf8ad77cea61a81af60de3b49cb38e7fe89128db136a0e61537fdcb93a89745bd0e11b69e3e71 SHA512 4ab2ea957796b6cf15129365f10d876b794bab521861e23f0f166f413c723b34f8cac17799cfc18529498a462d7bac7f633ec33093627c4167c3f4471d43da3a
diff --git a/media-sound/deadbeef/deadbeef-1.9.2.ebuild b/media-sound/deadbeef/deadbeef-1.9.2-r1.ebuild
index 7208c1c907e2..669ba2ccf77e 100644
--- a/media-sound/deadbeef/deadbeef-1.9.2.ebuild
+++ b/media-sound/deadbeef/deadbeef-1.9.2-r1.ebuild
@@ -69,6 +69,7 @@ PATCHES=(
 	"${FILESDIR}/deadbeef-use-ffmpeg-plugin-for-ape-by-default.patch"
 	"${FILESDIR}/deadbeef-1.9.2-drop-Werror.patch"
 	"${FILESDIR}/deadbeef-1.9.1-ffmpeg-5.0-fixes.patch"
+	"${FILESDIR}/deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch"
 )
 
 src_prepare() {
diff --git a/media-sound/deadbeef/files/deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch b/media-sound/deadbeef/files/deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch
new file mode 100644
index 000000000000..cef941162b93
--- /dev/null
+++ b/media-sound/deadbeef/files/deadbeef-1.9.2-cdda-plugin-clang-16-fixes.patch
@@ -0,0 +1,34 @@
+From 779066a54aa8a1a92b92ebdabc8a93d6ef3fb3ba Mon Sep 17 00:00:00 2001
+From: Oleksiy Yakovenko <wakeroid@gmail.com>
+Date: Wed, 26 Oct 2022 11:50:02 +0200
+Subject: [PATCH] cdda: enum cast fix (fixes #2879)
+
+---
+ plugins/cdda/cdda.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/plugins/cdda/cdda.c b/plugins/cdda/cdda.c
+index 7229d9592..2fe3b5fda 100644
+--- a/plugins/cdda/cdda.c
++++ b/plugins/cdda/cdda.c
+@@ -846,7 +846,7 @@ get_param (const char *key, char *value, int len, const char *def)
+ "property \"CD drive to load\" select[%u] cdda.drive_device 0"
+ 
+ static int
+-cda_action_add_cd (DB_plugin_action_t *act, int ctx)
++cda_action_add_cd (DB_plugin_action_t *act, ddb_action_context_t ctx)
+ {
+     /* Get all devices containg CD audio media */
+     cdio_close_tray(NULL, NULL);
+@@ -982,7 +982,7 @@ load_cddb_data (ddb_playlist_t *plt, cddb_disc_t *disc, const size_t disc_num)
+ }
+ 
+ static int
+-action_disc_n (DB_plugin_action_t *act, int ctx)
++action_disc_n (DB_plugin_action_t *act, ddb_action_context_t ctx)
+ {
+     const int disc_num = atoi(act->name+11);
+     int res = -1;
+-- 
+2.38.1
+
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index c6f9e79a6b2a..9af480742775 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index d49f3c0a1484..9125020269d4 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Wed, 26 Oct 2022 14:09:45 +0000
+Wed, 26 Oct 2022 20:09:50 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 1bda49b11935..a1c37335b72f 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 530688 BLAKE2B 1384754019a41108cd5a577394c6aafe7ddaa1600e86ddd30f667b8ffcd2a271d1d63c110dd32bcc5d2cdf57213dc2ed2ad65288c00d7dd764fc88a2a5ad121f SHA512 08bf73bc99a66d9fbe7dcf764826772bf00488ab216fa1e39298dffc1fef683f7a82d65031193ede26cf629f7bb21ac7a709099a37a9c6772e7b4eacbf503986
-TIMESTAMP 2022-10-26T14:09:48Z
+TIMESTAMP 2022-10-26T20:09:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNZP6xfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNZlBFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCA0w/9HOEKNxXJ80nudHjx4PkD96KX8mA/G5n08u5eIuzmugppicpKCmv3dVbZ
-ztakEk14i5f67wKtX1we/EO8rzglBpWceDtMf0qNf5XGNpZsoc9LzFGzO2WxZpav
-7pTsQmqXSvBkxF2AKjtHDyWfUUi6YOXb4U64x86ylhxVKUY9I6EHPc1Acyhmikaq
-gI/Fw+K6UWcD8FK/nhosIk1ANrdmQN3MxEqZ08nReo3S0FCkarHIGisvPVaOrjEn
-UZUC/ezayQkaC7pF3O0l247SuISVP/nusF68dRruIr7gwIw7tS7SZzpPlQmFW8ay
-xOED9BQFL8LQlmieW0qu5/xk//fQveFJscb4M97VOvwhCZFcmnVMCIz8HCDeNUAp
-BR7fvQZJu3eVyVBepza+jGtenxmosyfg+t8ug5V4grtnijDAEw1gYhwyv9KAvHoq
-7Z2Y/8htj+uDpVfjQkcRm+XlsxXKPV41nrg1BF789/4CFOJulxhkr3aUmIyaXbOM
-NcuKKUwPm5D16CBV4dHMVX4ySiUXFU2W7h2ewH5O1a9CZQvl6DOPkwfER5wuloNw
-E8WPRDh3Z1yGILUSAy+58oqIyZBjvAAKqz9XZF1Vi2Q45DAj6mP3Mn6Hf3IQOAtL
-MuoVibGZRapaaKN72XrFNqfWMj3eCcEO4liGoQHSj1Sl75s/fWQ=
-=pFFM
+klChzxAAtU/ytJNtF0deCs5dRvnh3P3HWVLO+7rXcdAytyfLyHOHxi/yS2P7MxM2
+3nL+O0YhRZzmTgkxho9O+k/gxvT8MvF8LqJ2JWWuKulujHdTfNt3KkSqdZyr4pxX
+ctbq+KJStqFnq4ZM8Pt8lOY8hIHe7hwV/DWDtEYvoMXA/gMgGaeuO0QttXdrQ11Q
+7pjt7vZL96Z+CfhV3xXt4uISR88CGQQMsl8zLA4rpRl1SxwS6rW/Xv+aZ/rWLeny
+AvEWCn+W0y8v9J7QsYqYUsqZiKkleboxg+C/b+6XFJu3veSbm8gUDM4T1FoG8NdQ
+0zUi2pNkcX2MzjagLWgvqiRnBf8Io2e9hhrCtWh/wOJrGFxcstYG8qblcIkmpGVU
+wj6O7YGUbXJM8W2BZn8hHAtNOQUe2JMQCa7IDXPL9TNxdzlRrxEsOuoRY5tJnTAP
+UExXLoBD8PcNqoX+w2gosKy1HS8c8o0jkoCDtgvqp4ficBD7vQqePbT7XZ+1fhyZ
+okmiGQ7qIRyde9Zx0MojHnOwL6JmzcIKaCq+fpJZxF03DyGikOIK9ujaIGgnUPtt
+AAPFo/dG6ng1cqMczPy9egxUZEf02zldbYKQ0WErRD8oxrYnBDK7aW86JdGLnDms
+cKYTqiiIvR6ps6SqonjfqM4a6ahBqY9zm30O01x4r+a7mGUWjJE=
+=VpCb
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index d49f3c0a1484..9125020269d4 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Wed, 26 Oct 2022 14:09:45 +0000
+Wed, 26 Oct 2022 20:09:50 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 6c33e1db0f45..4c54dac30f7e 100644
--- a/metadata/md5-cache/Manifest.gz
+++ b/metadata/md5-cache/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/Manifest.gz b/metadata/md5-cache/app-admin/Manifest.gz
index 9156bd27a0f7..e81fcfcd72e4 100644
--- a/metadata/md5-cache/app-admin/Manifest.gz
+++ b/metadata/md5-cache/app-admin/Manifest.gz
diff --git a/metadata/md5-cache/app-admin/conky-1.15.0 b/metadata/md5-cache/app-admin/conky-1.15.0
index 10ac194151f2..043326d4ba2f 100644
--- a/metadata/md5-cache/app-admin/conky-1.15.0
+++ b/metadata/md5-cache/app-admin/conky-1.15.0
@@ -1,6 +1,6 @@
 BDEPEND=>=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
-DEPEND=cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-libs/libpulse ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wifi? ( net-wireless/wireless-tools ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) doc? ( virtual/pandoc dev-python/pyyaml ) extras? ( virtual/pandoc )
+DEPEND=cmus? ( media-sound/cmus ) curl? ( net-misc/curl ) ical? ( dev-libs/libical:= ) iconv? ( virtual/libiconv ) imlib? ( media-libs/imlib2[X] ) irc? ( net-libs/libircclient ) lua-cairo? ( x11-libs/cairo[X] ) lua-imlib? ( media-libs/imlib2[X] ) lua-rsvg? ( gnome-base/librsvg ) mysql? ( dev-db/mysql-connector-c ) ncurses? ( sys-libs/ncurses:= ) nvidia? ( x11-drivers/nvidia-drivers[tools,static-libs] ) pulseaudio? ( media-libs/libpulse ) rss? ( dev-libs/libxml2 net-misc/curl dev-libs/glib:2 ) systemd? ( sys-apps/systemd ) truetype? ( x11-libs/libXft >=media-libs/freetype-2 ) wifi? ( net-wireless/wireless-tools ) webserver? ( net-libs/libmicrohttpd ) X? ( x11-libs/libX11 x11-libs/libXdamage x11-libs/libXfixes x11-libs/libXext ) xinerama? ( x11-libs/libXinerama ) xmms2? ( media-sound/xmms2 ) lua_single_target_lua5-3? ( dev-lang/lua:5.3 ) doc? ( virtual/pandoc dev-python/pyyaml dev-python/jinja ) extras? ( dev-python/pyyaml dev-python/jinja )
 DESCRIPTION=An advanced, highly configurable system monitor for X
 EAPI=8
 HOMEPAGE=https://github.com/brndnmtthws/conky
@@ -14,4 +14,4 @@ REQUIRED_USE=imlib? ( X ) lua-cairo? ( X bundled-toluapp ) lua-imlib? ( X bundle
 SLOT=0
 SRC_URI=https://github.com/brndnmtthws/conky/archive/v1.15.0.tar.gz -> conky-1.15.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	lua-single	aee383a0de35701b9eb0b27077a1c143	lua-utils	e69ff116248d78546ae1a234c086fe80	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=f624efff7d5f6c0786c6847205c1333d
+_md5_=d9f87cfbb4e24a07ca07e67bf43545de
diff --git a/metadata/md5-cache/app-emulation/Manifest.gz b/metadata/md5-cache/app-emulation/Manifest.gz
index dd333a996499..6b9267ebcc8a 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-4.15.3 b/metadata/md5-cache/app-emulation/xen-4.15.3
deleted file mode 100644
index 30c9b15ab692..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.15.3
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 ) flask? ( sys-apps/checkpolicy )
-DESCRIPTION=The Xen virtual machine monitor
-EAPI=8
-HOMEPAGE=https://xenproject.org
-INHERIT=flag-o-matic mount-boot python-any-r1 toolchain-funcs
-IUSE=debug efi flask
-KEYWORDS=amd64 ~arm -x86
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.15.3
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.15.3/xen-4.15.3.tar.gz
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3e29fe1d9bddf026428dc88f61d2dbce
diff --git a/metadata/md5-cache/app-emulation/xen-4.16.2 b/metadata/md5-cache/app-emulation/xen-4.16.2
deleted file mode 100644
index d3198d8c311f..000000000000
--- a/metadata/md5-cache/app-emulation/xen-4.16.2
+++ /dev/null
@@ -1,16 +0,0 @@
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare prerm pretend setup
-DEPEND=|| ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) efi? ( >=sys-devel/binutils-2.22[multitarget] ) !efi? ( >=sys-devel/binutils-2.22 ) flask? ( sys-apps/checkpolicy )
-DESCRIPTION=The Xen virtual machine monitor
-EAPI=8
-HOMEPAGE=https://xenproject.org
-INHERIT=flag-o-matic mount-boot python-any-r1 toolchain-funcs
-IUSE=+boot-symlinks debug efi flask
-KEYWORDS=~amd64 ~arm -x86
-LICENSE=GPL-2
-PDEPEND=~app-emulation/xen-tools-4.16.2
-REQUIRED_USE=arm? ( debug )
-RESTRICT=test splitdebug strip
-SLOT=0
-SRC_URI=https://downloads.xenproject.org/release/xen/4.16.2/xen-4.16.2.tar.gz https://gitweb.gentoo.org/proj/xen-gentoo-patches.git/snapshot/xen-gentoo-patches-4.16.1-gentoo-patchset-2.tar.bz2
-_eclasses_=flag-o-matic	29a755b1291d64133634d80b0328f153	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c94562b8310827519a50116fd333b23a
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.15.3 b/metadata/md5-cache/app-emulation/xen-tools-4.15.3
deleted file mode 100644
index 1d56e9031a46..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.15.3
+++ /dev/null
@@ -1,17 +0,0 @@
-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 )
-DESCRIPTION=Xen tools including QEMU and xl
-EAPI=7
-HOMEPAGE=https://xenproject.org
-INHERIT=bash-completion-r1 flag-o-matic multilib python-single-r1 toolchain-funcs
-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 )
-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	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=ad7e4a98f73da5b9930f7b6dc6ed91cd
diff --git a/metadata/md5-cache/app-emulation/xen-tools-4.16.2 b/metadata/md5-cache/app-emulation/xen-tools-4.16.2
deleted file mode 100644
index ecf196919b74..000000000000
--- a/metadata/md5-cache/app-emulation/xen-tools-4.16.2
+++ /dev/null
@@ -1,17 +0,0 @@
-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 ) zstd? ( app-arch/zstd ) app-arch/bzip2 app-arch/zstd 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(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[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(-)] ) python_single_target_python3_11? ( dev-python/lxml[python_targets_python3_11(-)] ) 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] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[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(-)] ) python_single_target_python3_11? ( dev-python/markdown[python_targets_python3_11(-)] ) 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
-INHERIT=bash-completion-r1 flag-o-matic multilib python-single-r1 readme.gentoo-r1 toolchain-funcs
-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 systemd zstd python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=GPL-2
-RDEPEND=lzma? ( app-arch/xz-utils ) qemu? ( dev-libs/glib:2 sys-libs/pam ) zstd? ( app-arch/zstd ) app-arch/bzip2 app-arch/zstd 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(+)] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[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 python_single_target_python3_11 ) ipxe? ( rombios ) ovmf? ( hvm ) pygrub? ( python ) rombios? ( hvm ) system-ipxe? ( rombios ) ?? ( ipxe system-ipxe ) ?? ( qemu system-qemu )
-RESTRICT=test
-SLOT=0/4.16
-SRC_URI=https://downloads.xenproject.org/release/xen/4.16.2/xen-4.16.2.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.16.1-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	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=b7ebbb43cb3afe0e3c4859985211c071
diff --git a/metadata/md5-cache/dev-lang/Manifest.gz b/metadata/md5-cache/dev-lang/Manifest.gz
index f21089881d71..34d4188a0350 100644
--- a/metadata/md5-cache/dev-lang/Manifest.gz
+++ b/metadata/md5-cache/dev-lang/Manifest.gz
diff --git a/metadata/md5-cache/dev-lang/python-3.10.8_p1 b/metadata/md5-cache/dev-lang/python-3.10.8_p1
new file mode 100644
index 000000000000..ac7017cda794
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.10.8_p1
@@ -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.8/Python-3.10.8.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.10.8_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.10.8/Python-3.10.8.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=2c45e0ae52e83c4df1d3255bc40a6260
diff --git a/metadata/md5-cache/dev-lang/python-3.8.15_p1 b/metadata/md5-cache/dev-lang/python-3.8.15_p1
new file mode 100644
index 000000000000..367d0466f233
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.8.15_p1
@@ -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.15/Python-3.8.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.8.15_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.8.15/Python-3.8.15.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=07eb0e0e42d43a7a45ad7a7c62f5c5e3
diff --git a/metadata/md5-cache/dev-lang/python-3.9.15_p1 b/metadata/md5-cache/dev-lang/python-3.9.15_p1
new file mode 100644
index 000000000000..e14c2eebb1b4
--- /dev/null
+++ b/metadata/md5-cache/dev-lang/python-3.9.15_p1
@@ -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.15/Python-3.9.15.tar.xz https://dev.gentoo.org/~mgorny/dist/python/python-gentoo-patches-3.9.15_p1.tar.xz verify-sig? ( https://www.python.org/ftp/python/3.9.15/Python-3.9.15.tar.xz.asc )
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	wrapper	4a1902f969e5718126434fc35f3a0d9c
+_md5_=5f17cc1c02136045b476db0223858211
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index dd3434d92d8f..7283717e1edc 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/opencl-clang-15.0.0 b/metadata/md5-cache/dev-libs/opencl-clang-15.0.0
index 36e2cf618b22..3e0ec40a37a6 100644
--- a/metadata/md5-cache/dev-libs/opencl-clang-15.0.0
+++ b/metadata/md5-cache/dev-libs/opencl-clang-15.0.0
@@ -5,10 +5,10 @@ DESCRIPTION=OpenCL-oriented thin wrapper library around clang
 EAPI=8
 HOMEPAGE=https://github.com/intel/opencl-clang
 INHERIT=cmake llvm
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=UoI-NCSA
 RDEPEND=dev-util/spirv-llvm-translator:15= sys-devel/clang:15=[static-analyzer] sys-devel/llvm:15=
 SLOT=15
 SRC_URI=https://github.com/intel/opencl-clang/archive/refs/tags/v15.0.0.tar.gz -> opencl-clang-15.0.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=37fd820a6be8926a3f3b893c038ff348
+_md5_=2b7bef2e786ed18fc67712a5c7b9f9c5
diff --git a/metadata/md5-cache/dev-php/Manifest.gz b/metadata/md5-cache/dev-php/Manifest.gz
index 03a3010d5b6f..69565a63b2ca 100644
--- a/metadata/md5-cache/dev-php/Manifest.gz
+++ b/metadata/md5-cache/dev-php/Manifest.gz
diff --git a/metadata/md5-cache/dev-php/igbinary-3.2.7 b/metadata/md5-cache/dev-php/igbinary-3.2.7
index 00f403ffb7b1..4722ef240b62 100644
--- a/metadata/md5-cache/dev-php/igbinary-3.2.7
+++ b/metadata/md5-cache/dev-php/igbinary-3.2.7
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=A fast drop-in replacement for the standard PHP serialize
 EAPI=8
 HOMEPAGE=https://github.com/igbinary/igbinary
 INHERIT=php-ext-source-r3
-IUSE=php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
 KEYWORDS=amd64 arm arm64 x86
 LICENSE=BSD
-RDEPEND=php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
 SLOT=0
 SRC_URI=https://github.com/igbinary/igbinary/archive/3.2.7.tar.gz -> igbinary-3.2.7.tar.gz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b83bb8d01f61795843a519230828821c
+_md5_=b49784d47b5ece9dc818e386a72479e9
diff --git a/metadata/md5-cache/dev-php/igbinary-3.2.9 b/metadata/md5-cache/dev-php/igbinary-3.2.9
new file mode 100644
index 000000000000..6d353c016cb0
--- /dev/null
+++ b/metadata/md5-cache/dev-php/igbinary-3.2.9
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DESCRIPTION=A fast drop-in replacement for the standard PHP serialize
+EAPI=8
+HOMEPAGE=https://github.com/igbinary/igbinary
+INHERIT=php-ext-source-r3
+IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+KEYWORDS=~amd64 ~arm ~arm64 ~x86
+LICENSE=BSD
+RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+SLOT=0
+SRC_URI=https://github.com/igbinary/igbinary/archive/3.2.9.tar.gz -> igbinary-3.2.9.tar.gz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=078cebba72fa577bc683fbadc88fda40
diff --git a/metadata/md5-cache/dev-php/pecl-apcu-5.1.22 b/metadata/md5-cache/dev-php/pecl-apcu-5.1.22
new file mode 100644
index 000000000000..ace04b594b84
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-apcu-5.1.22
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DEFINED_PHASES=compile configure install postinst prepare test
+DEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+DESCRIPTION=Stripped down version of APC supporting only user cache
+EAPI=8
+HOMEPAGE=https://pecl.php.net/apcu
+INHERIT=php-ext-pecl-r3
+IUSE=+mmap lock-pthreadmutex +lock-pthreadrw lock-spinlock lock-semaphore php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+KEYWORDS=amd64 ~arm ~arm64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=^^ ( lock-pthreadmutex lock-pthreadrw lock-spinlock lock-semaphore ) || ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+SLOT=7
+SRC_URI=https://pecl.php.net/get/apcu-5.1.22.tgz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-pecl-r3	5db9384543980900b5ecbac76136b6a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=dbc00ed8c59d43313df583e09216233a
diff --git a/metadata/md5-cache/dev-php/pecl-imagick-3.5.1 b/metadata/md5-cache/dev-php/pecl-imagick-3.5.1
index b34083d14309..f4e665ad5389 100644
--- a/metadata/md5-cache/dev-php/pecl-imagick-3.5.1
+++ b/metadata/md5-cache/dev-php/pecl-imagick-3.5.1
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] test? ( >=media-gfx/imagemagick-6.2.4:=[hdri,jpeg,png,svg,truetype,xml] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+DEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] test? ( >=media-gfx/imagemagick-6.2.4:=[hdri,jpeg,png,svg,truetype,xml] ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
 DESCRIPTION=PHP wrapper for the ImageMagick library
 EAPI=7
 HOMEPAGE=https://pecl.php.net/package/imagick https://github.com/Imagick/imagick
 INHERIT=php-ext-pecl-r3
-IUSE=examples test php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
+IUSE=examples test php_targets_php7-4 php_targets_php8-0
 KEYWORDS=amd64 ~arm ~arm64 x86
 LICENSE=PHP-3.01
-RDEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
+RDEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
+REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/imagick-3.5.1.tgz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-pecl-r3	5db9384543980900b5ecbac76136b6a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=917bfb1edd5e39385d1af190c71c3926
+_md5_=2cee352f5ac3980390cb408982c88f03
diff --git a/metadata/md5-cache/dev-php/pecl-imagick-3.6.0 b/metadata/md5-cache/dev-php/pecl-imagick-3.6.0
index 2b3204adce81..d11e3d250d51 100644
--- a/metadata/md5-cache/dev-php/pecl-imagick-3.6.0
+++ b/metadata/md5-cache/dev-php/pecl-imagick-3.6.0
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] test? ( >=media-gfx/imagemagick-6.2.4:=[hdri,jpeg,png,svg,truetype,xml] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] test? ( >=media-gfx/imagemagick-6.2.4:=[hdri,jpeg,png,svg,truetype,xml] ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
 DESCRIPTION=PHP wrapper for the ImageMagick library
 EAPI=7
 HOMEPAGE=https://pecl.php.net/package/imagick https://github.com/Imagick/imagick
 INHERIT=php-ext-pecl-r3
-IUSE=examples test php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=examples test php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/imagick-3.6.0.tgz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-pecl-r3	5db9384543980900b5ecbac76136b6a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=36edeecbf64600ac3ab89447b76a617b
+_md5_=b0b606f86be7a2fd34d97752ad91b25b
diff --git a/metadata/md5-cache/dev-php/pecl-imagick-3.7.0 b/metadata/md5-cache/dev-php/pecl-imagick-3.7.0-r1
index e4b2a20e3a24..e875c9b6b3ce 100644
--- a/metadata/md5-cache/dev-php/pecl-imagick-3.7.0
+++ b/metadata/md5-cache/dev-php/pecl-imagick-3.7.0-r1
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] test? ( >=media-gfx/imagemagick-6.2.4:=[hdri,jpeg,png,svg,truetype,xml] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] test? ( >=media-gfx/imagemagick-6.2.4:=[hdri,jpeg,png,svg,truetype,xml] ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DESCRIPTION=PHP wrapper for the ImageMagick library
-EAPI=7
+EAPI=8
 HOMEPAGE=https://pecl.php.net/package/imagick https://github.com/Imagick/imagick
 INHERIT=php-ext-pecl-r3
-IUSE=examples test php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=examples test php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=~amd64 ~arm ~arm64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=>=media-gfx/imagemagick-6.2.4:=[-openmp] php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://pecl.php.net/get/imagick-3.7.0.tgz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-pecl-r3	5db9384543980900b5ecbac76136b6a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=36edeecbf64600ac3ab89447b76a617b
+_md5_=77ecdafe7f48e6c04d7d07abc286b6fb
diff --git a/metadata/md5-cache/dev-php/pecl-memcached-3.1.5-r1 b/metadata/md5-cache/dev-php/pecl-memcached-3.1.5-r1
deleted file mode 100644
index 1474fea491c2..000000000000
--- a/metadata/md5-cache/dev-php/pecl-memcached-3.1.5-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=php_targets_php7-2? ( >=dev-libs/libmemcached-1.0.14[sasl(-)?] sys-libs/zlib dev-lang/php:7.2[session(-)?,json(-)?] igbinary? ( dev-php/igbinary[php_targets_php7-2(-)] ) ) php_targets_php7-3? ( >=dev-libs/libmemcached-1.0.14[sasl(-)?] sys-libs/zlib dev-lang/php:7.3[session(-)?,json(-)?] igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] ) ) php_targets_php7-4? ( >=dev-libs/libmemcached-1.0.14[sasl(-)?] sys-libs/zlib dev-lang/php:7.4[session(-)?,json(-)?] igbinary? ( dev-php/igbinary[php_targets_php7-4(-)] ) ) test? ( net-misc/memcached ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-DESCRIPTION=Interface PHP with memcached via libmemcached library
-EAPI=7
-HOMEPAGE=https://pecl.php.net/memcached
-INHERIT=php-ext-pecl-r3
-IUSE=igbinary json sasl +session test php_targets_php7-2 php_targets_php7-3 php_targets_php7-4
-KEYWORDS=amd64 arm arm64 x86
-LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-2? ( >=dev-libs/libmemcached-1.0.14[sasl(-)?] sys-libs/zlib dev-lang/php:7.2[session(-)?,json(-)?] igbinary? ( dev-php/igbinary[php_targets_php7-2(-)] ) ) php_targets_php7-3? ( >=dev-libs/libmemcached-1.0.14[sasl(-)?] sys-libs/zlib dev-lang/php:7.3[session(-)?,json(-)?] igbinary? ( dev-php/igbinary[php_targets_php7-3(-)] ) ) php_targets_php7-4? ( >=dev-libs/libmemcached-1.0.14[sasl(-)?] sys-libs/zlib dev-lang/php:7.4[session(-)?,json(-)?] igbinary? ( dev-php/igbinary[php_targets_php7-4(-)] ) ) php_targets_php7-2? ( dev-lang/php:7.2 ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php7-2 php_targets_php7-3 php_targets_php7-4 )
-RESTRICT=!test? ( test )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/memcached-3.1.5.tgz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-pecl-r3	5db9384543980900b5ecbac76136b6a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c87219e8c43c9cbf4c5b3b67cce34b26
diff --git a/metadata/md5-cache/dev-php/pecl-memcached-3.2.0 b/metadata/md5-cache/dev-php/pecl-memcached-3.2.0
deleted file mode 100644
index 4f9255d8ae56..000000000000
--- a/metadata/md5-cache/dev-php/pecl-memcached-3.2.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=>=dev-libs/libmemcached-1.0.14[sasl(-)?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) test? ( net-misc/memcached ) 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 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libmemcached-1.0.14[sasl(-)?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
-DESCRIPTION=Interface PHP with memcached via libmemcached library
-EAPI=8
-HOMEPAGE=https://pecl.php.net/memcached
-INHERIT=php-ext-pecl-r3
-IUSE=igbinary json sasl +session test php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
-LICENSE=PHP-3.01
-RDEPEND=>=dev-libs/libmemcached-1.0.14[sasl(-)?] sys-libs/zlib igbinary? ( dev-php/igbinary[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
-RESTRICT=!test? ( test )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/memcached-3.2.0.tgz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-pecl-r3	5db9384543980900b5ecbac76136b6a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=201861ea8fe24df34e56a0aaa478627f
diff --git a/metadata/md5-cache/dev-php/pecl-parallel-1.1.4 b/metadata/md5-cache/dev-php/pecl-parallel-1.1.4-r1
index d51190f3b894..9fdbe49c24de 100644
--- a/metadata/md5-cache/dev-php/pecl-parallel-1.1.4
+++ b/metadata/md5-cache/dev-php/pecl-parallel-1.1.4-r1
@@ -1,17 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[threads] )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=test? ( php_targets_php7-3? ( dev-lang/php:7.3[threads] ) php_targets_php7-4? ( dev-lang/php:7.4[threads] ) ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
+DEPEND=php_targets_php7-4? ( dev-lang/php:7.4[threads] )
 DESCRIPTION=A succint parallel concurrency API for PHP
-EAPI=7
+EAPI=8
 HOMEPAGE=https://pecl.php.net/parallel
 INHERIT=php-ext-pecl-r3
-IUSE=test php_targets_php7-3 php_targets_php7-4
+IUSE=php_targets_php7-4
 KEYWORDS=~amd64 ~x86
 LICENSE=PHP-3.01
-RDEPEND=php_targets_php7-3? ( dev-lang/php:7.3[threads] ) php_targets_php7-4? ( dev-lang/php:7.4[threads] ) php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 )
-REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 )
-RESTRICT=!test? ( test )
-SLOT=0
+RDEPEND=php_targets_php7-4? ( dev-lang/php:7.4[threads] )
+REQUIRED_USE=|| ( php_targets_php7-4 )
+SLOT=7
 SRC_URI=https://pecl.php.net/get/parallel-1.1.4.tgz -> pecl-parallel-1.1.4.tgz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-pecl-r3	5db9384543980900b5ecbac76136b6a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f0b0f5906c8b9b6c828e8c064b5ef3e0
+_md5_=0aebfda47539ca1cf0a939e61bd1f292
diff --git a/metadata/md5-cache/dev-php/pecl-parallel-1.2.0 b/metadata/md5-cache/dev-php/pecl-parallel-1.2.0
new file mode 100644
index 000000000000..6a63a9f0584f
--- /dev/null
+++ b/metadata/md5-cache/dev-php/pecl-parallel-1.2.0
@@ -0,0 +1,16 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[threads] ) php_targets_php8-1? ( dev-lang/php:8.1[threads] ) php_targets_php8-2? ( dev-lang/php:8.2[threads] )
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=php_targets_php8-0? ( dev-lang/php:8.0[threads] ) php_targets_php8-1? ( dev-lang/php:8.1[threads] ) php_targets_php8-2? ( dev-lang/php:8.2[threads] )
+DESCRIPTION=A succint parallel concurrency API for PHP
+EAPI=8
+HOMEPAGE=https://pecl.php.net/parallel
+INHERIT=php-ext-pecl-r3
+IUSE=php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
+KEYWORDS=~amd64 ~x86
+LICENSE=PHP-3.01
+RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0[threads] ) php_targets_php8-1? ( dev-lang/php:8.1[threads] ) php_targets_php8-2? ( dev-lang/php:8.2[threads] )
+REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
+SLOT=8
+SRC_URI=https://pecl.php.net/get/parallel-1.2.0.tgz -> pecl-parallel-1.2.0.tgz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-pecl-r3	5db9384543980900b5ecbac76136b6a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=2c98ed2279dac6a2e0823c71a4ca65f3
diff --git a/metadata/md5-cache/dev-php/pecl-parallel-9999 b/metadata/md5-cache/dev-php/pecl-parallel-9999
deleted file mode 100644
index 0167db7d3954..000000000000
--- a/metadata/md5-cache/dev-php/pecl-parallel-9999
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php8-0? ( dev-lang/php:8.0[threads] ) php_targets_php8-1? ( dev-lang/php:8.1[threads] ) >=dev-vcs/git-1.8.2.1[curl]
-DEFINED_PHASES=compile configure install prepare test unpack
-DEPEND=php_targets_php8-0? ( dev-lang/php:8.0[threads] ) php_targets_php8-1? ( dev-lang/php:8.1[threads] )
-DESCRIPTION=A succint parallel concurrency API for PHP
-EAPI=8
-HOMEPAGE=https://pecl.php.net/package/parallel
-INHERIT=php-ext-source-r3 git-r3
-IUSE=doc php_targets_php8-0 php_targets_php8-1
-LICENSE=PHP-3.01
-PROPERTIES=live
-RDEPEND=php_targets_php8-0? ( dev-lang/php:8.0[threads] ) php_targets_php8-1? ( dev-lang/php:8.1[threads] )
-REQUIRED_USE=|| ( php_targets_php8-0 php_targets_php8-1 )
-SLOT=0
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	git-r3	b9ac6f96d2a88edb5b351df634dc5e53	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0624484b5021531f667ab9a933d90d8b
diff --git a/metadata/md5-cache/dev-php/pecl-redis-5.3.6 b/metadata/md5-cache/dev-php/pecl-redis-5.3.6
index edf126740819..914b00d1778b 100644
--- a/metadata/md5-cache/dev-php/pecl-redis-5.3.6
+++ b/metadata/md5-cache/dev-php/pecl-redis-5.3.6
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3[json(+)?,session(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-3(-)?,php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) php_targets_php7-3? ( dev-lang/php:7.3[json(+)?,session(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
+DEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
 DESCRIPTION=PHP extension for interfacing with Redis
 EAPI=8
 HOMEPAGE=https://pecl.php.net/redis
 INHERIT=php-ext-pecl-r3
-IUSE=igbinary +json lz4 +session zstd php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=igbinary +json lz4 +session zstd php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
 KEYWORDS=amd64 ~arm
 LICENSE=PHP-3.01
-RDEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-3(-)?,php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) !dev-php/pecl-redis:7 php_targets_php7-3? ( dev-lang/php:7.3[json(+)?,session(-)?] ) php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
-REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) !dev-php/pecl-redis:7 php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
+REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/redis-5.3.6.tgz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-pecl-r3	5db9384543980900b5ecbac76136b6a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=324884d9966269686630330d2109e99f
+_md5_=2bbd515a7cbd9344a1736b2e165b7a8f
diff --git a/metadata/md5-cache/dev-php/pecl-redis-5.3.7 b/metadata/md5-cache/dev-php/pecl-redis-5.3.7-r1
index 04d7fa9a2e79..c8c6aa52bccd 100644
--- a/metadata/md5-cache/dev-php/pecl-redis-5.3.7
+++ b/metadata/md5-cache/dev-php/pecl-redis-5.3.7-r1
@@ -1,17 +1,17 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[json(+)?,session(-)?] )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
+DEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[json(+)?,session(-)?] )
 DESCRIPTION=PHP extension for interfacing with Redis
 EAPI=8
 HOMEPAGE=https://pecl.php.net/redis
 INHERIT=php-ext-pecl-r3
-IUSE=igbinary +json lz4 +session zstd php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=igbinary +json lz4 +session zstd php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=~amd64 ~arm ~arm64
 LICENSE=PHP-3.01
-RDEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) !dev-php/pecl-redis:7 php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] )
-REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=igbinary? ( >=dev-php/igbinary-3.0.1-r1[php_targets_php7-4(-)?,php_targets_php8-0(-)?,php_targets_php8-1(-)?,php_targets_php8-2(-)?] ) lz4? ( app-arch/lz4:= ) zstd? ( app-arch/zstd:= ) !dev-php/pecl-redis:7 php_targets_php7-4? ( dev-lang/php:7.4[json(+)?,session(-)?] ) php_targets_php8-0? ( dev-lang/php:8.0[json(+)?,session(-)?] ) php_targets_php8-1? ( dev-lang/php:8.1[json(+)?,session(-)?] ) php_targets_php8-2? ( dev-lang/php:8.2[json(+)?,session(-)?] )
+REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 RESTRICT=test
 SLOT=0
 SRC_URI=https://pecl.php.net/get/redis-5.3.7.tgz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-pecl-r3	5db9384543980900b5ecbac76136b6a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=b996ecacc1daf1cc05629af85ecfe673
+_md5_=d561cfa530b3c7f52e65ae845e3fce4b
diff --git a/metadata/md5-cache/dev-php/pecl-yaml-2.2.1 b/metadata/md5-cache/dev-php/pecl-yaml-2.2.1
deleted file mode 100644
index c02192d7e9e8..000000000000
--- a/metadata/md5-cache/dev-php/pecl-yaml-2.2.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DEFINED_PHASES=compile configure install prepare test
-DEPEND=>=dev-libs/libyaml-0.1.0 php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-DESCRIPTION=YAML 1.1 (YAML Ain't Markup Language) serialization for PHP
-EAPI=7
-HOMEPAGE=https://pecl.php.net/yaml
-INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-3 php_targets_php7-4 php_targets_php8-0
-KEYWORDS=~amd64 ~arm64 ~x86
-LICENSE=MIT
-RDEPEND=>=dev-libs/libyaml-0.1.0 php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 )
-REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 )
-SLOT=7
-SRC_URI=https://pecl.php.net/get/yaml-2.2.1.tgz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-pecl-r3	5db9384543980900b5ecbac76136b6a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=0021a0e1c7a124bd461507fffd9a263e
diff --git a/metadata/md5-cache/dev-php/pecl-yaml-2.2.2 b/metadata/md5-cache/dev-php/pecl-yaml-2.2.2
index cc8ceee4f81b..12b779199326 100644
--- a/metadata/md5-cache/dev-php/pecl-yaml-2.2.2
+++ b/metadata/md5-cache/dev-php/pecl-yaml-2.2.2
@@ -1,16 +1,16 @@
-BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 sys-devel/m4 sys-devel/libtool php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DEFINED_PHASES=compile configure install prepare test
-DEPEND=dev-libs/libyaml php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
+DEPEND=dev-libs/libyaml php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
 DESCRIPTION=YAML 1.1 (YAML Ain't Markup Language) serialization for PHP
 EAPI=8
 HOMEPAGE=https://pecl.php.net/yaml
 INHERIT=php-ext-pecl-r3
-IUSE=php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1
+IUSE=php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2
 KEYWORDS=~amd64 ~arm64 ~x86
 LICENSE=MIT
-RDEPEND=dev-libs/libyaml php_targets_php7-3? ( dev-lang/php:7.3 ) php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 )
-REQUIRED_USE=|| ( php_targets_php7-3 php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 )
+RDEPEND=dev-libs/libyaml php_targets_php7-4? ( dev-lang/php:7.4 ) php_targets_php8-0? ( dev-lang/php:8.0 ) php_targets_php8-1? ( dev-lang/php:8.1 ) php_targets_php8-2? ( dev-lang/php:8.2 )
+REQUIRED_USE=|| ( php_targets_php7-4 php_targets_php8-0 php_targets_php8-1 php_targets_php8-2 )
 SLOT=7
 SRC_URI=https://pecl.php.net/get/yaml-2.2.2.tgz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	php-ext-pecl-r3	5db9384543980900b5ecbac76136b6a8	php-ext-source-r3	3c26d87acac034aedf8bf126f7010c8a	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=fc59ea0c949a8af229ccfcb22699a084
+_md5_=07a8c4dcb979d7cf3c237498ca5816f2
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index ce93bede457c..dcb6598dd9b8 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/clang-python-15.0.3 b/metadata/md5-cache/dev-python/clang-python-15.0.3
index 0b8cba20946e..5a77fbcbc5ba 100644
--- a/metadata/md5-cache/dev-python/clang-python-15.0.3
+++ b/metadata/md5-cache/dev-python/clang-python-15.0.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=llvm.org python-r1
 IUSE=test verify-sig python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=>=sys-devel/clang-15.0.3:* !sys-devel/llvm:0[clang(-),python(-)] !sys-devel/clang:0[python(-)] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=llvm.org	ab48c0803b67a958624f7600ef86081c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=ac01b9036d2e538b5f775839bea226bf
+_md5_=55b25b8d0a9112890816515063d5f565
diff --git a/metadata/md5-cache/dev-python/cx_Freeze-6.13.0 b/metadata/md5-cache/dev-python/cx_Freeze-6.13.0
new file mode 100644
index 000000000000..eeef124dbe20
--- /dev/null
+++ b/metadata/md5-cache/dev-python/cx_Freeze-6.13.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/bcrypt[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/openpyxl[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pandas[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pillow[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pydantic[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-mock[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pytest-timeout[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/patchelf virtual/libcrypt:= python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Create standalone executables from Python scripts
+EAPI=8
+HOMEPAGE=https://cx-freeze.readthedocs.io/ https://github.com/marcelotduarte/cx_Freeze/ https://pypi.org/project/cx-Freeze/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=PYTHON
+RDEPEND=dev-python/importlib_metadata[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-util/patchelf virtual/libcrypt:= python_targets_python3_8? ( dev-python/backports-zoneinfo[python_targets_python3_8(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/marcelotduarte/cx_Freeze/archive/6.13.0.tar.gz -> cx_Freeze-6.13.0.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=71be789c8427ba2a628511aa2e0dc360
diff --git a/metadata/md5-cache/dev-python/dns-lexicon-3.11.7 b/metadata/md5-cache/dev-python/dns-lexicon-3.11.7
new file mode 100644
index 000000000000..d325cb521975
--- /dev/null
+++ b/metadata/md5-cache/dev-python/dns-lexicon-3.11.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/boto3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/zeep[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/vcrpy[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) test? ( dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tldextract[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_8? ( >=dev-lang/python-3.8.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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/poetry-core-1.2.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Manipulate DNS records on various DNS providers in a standardized/agnostic way
+EAPI=8
+HOMEPAGE=https://github.com/AnalogJ/lexicon/ https://pypi.org/project/dns-lexicon/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_python3_8 python_targets_python3_9 python_targets_python3_10
+KEYWORDS=~amd64 ~x86
+LICENSE=MIT
+RDEPEND=dev-python/beautifulsoup4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/cryptography[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/importlib_metadata-4[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/pyyaml[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/requests[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/tldextract[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/AnalogJ/lexicon/archive/v3.11.7.tar.gz -> dns-lexicon-3.11.7.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=ab6173cbc6d9623aaad41cf71cc29a53
diff --git a/metadata/md5-cache/dev-python/k5test-0.10.2 b/metadata/md5-cache/dev-python/k5test-0.10.2
new file mode 100644
index 000000000000..15f8ca3c807c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/k5test-0.10.2
@@ -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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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=Library for testing Python applications in Kerberos 5 environments
+EAPI=8
+HOMEPAGE=https://github.com/pythongssapi/k5test/ https://pypi.org/project/k5test/
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/k/k5test/k5test-0.10.2.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=a98c731edc6b9756c2ad760e0c1786ff
diff --git a/metadata/md5-cache/dev-python/lazy-object-proxy-1.8.0 b/metadata/md5-cache/dev-python/lazy-object-proxy-1.8.0
new file mode 100644
index 000000000000..8f6ee119787e
--- /dev/null
+++ b/metadata/md5-cache/dev-python/lazy-object-proxy-1.8.0
@@ -0,0 +1,16 @@
+BDEPEND=dev-python/setuptools_scm[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_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-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A fast and thorough lazy object proxy
+EAPI=8
+HOMEPAGE=https://github.com/ionelmc/python-lazy-object-proxy/ https://pypi.org/project/lazy-object-proxy/ https://python-lazy-object-proxy.readthedocs.io/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos
+LICENSE=BSD
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_p1:0= ) python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/l/lazy-object-proxy/lazy-object-proxy-1.8.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=2696e6de1be41271bb79f46aaa1e590e
diff --git a/metadata/md5-cache/dev-python/lit-15.0.3 b/metadata/md5-cache/dev-python/lit-15.0.3
index 4b664132b88b..8fea03a7870e 100644
--- a/metadata/md5-cache/dev-python/lit-15.0.3
+++ b/metadata/md5-cache/dev-python/lit-15.0.3
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=distutils-r1 llvm.org
 IUSE=test 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
+KEYWORDS=~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	llvm.org	ab48c0803b67a958624f7600ef86081c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=d5bc97f05337a35e4b049963c9fb5135
+_md5_=11484aba3ea8ce23f4aa51e0e4df86d7
diff --git a/metadata/md5-cache/dev-python/numexpr-2.8.4 b/metadata/md5-cache/dev-python/numexpr-2.8.4
new file mode 100644
index 000000000000..8c89390c5a85
--- /dev/null
+++ b/metadata/md5-cache/dev-python/numexpr-2.8.4
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=>=dev-python/numpy-1.13.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DESCRIPTION=Fast numerical array expression evaluator for Python and NumPy
+EAPI=8
+HOMEPAGE=https://github.com/pydata/numexpr
+INHERIT=distutils-r1
+IUSE=python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=>=dev-python/numpy-1.13.3[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/pydata/numexpr/archive/v2.8.4.tar.gz -> numexpr-2.8.4.gh.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=2ae423b2255d6dfaa21e7ac60db75d7c
diff --git a/metadata/md5-cache/dev-python/patiencediff-0.2.7 b/metadata/md5-cache/dev-python/patiencediff-0.2.7
new file mode 100644
index 000000000000..2c5f630d8d2f
--- /dev/null
+++ b/metadata/md5-cache/dev-python/patiencediff-0.2.7
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/unittest-or-fail[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_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-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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=Python implementation of the patiencediff algorithm
+EAPI=8
+HOMEPAGE=https://github.com/breezy-team/patiencediff/ https://pypi.org/project/patiencediff/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-2+
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_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/p/patiencediff/patiencediff-0.2.7.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=ba6118247751766662e0f9cb7490cff8
diff --git a/metadata/md5-cache/dev-python/progressbar2-4.2.0 b/metadata/md5-cache/dev-python/progressbar2-4.2.0
new file mode 100644
index 000000000000..a8e6c269204a
--- /dev/null
+++ b/metadata/md5-cache/dev-python/progressbar2-4.2.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/freezegun[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/python-utils-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/progressbar >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.9_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-9[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.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=Text progressbar library for python
+EAPI=8
+HOMEPAGE=https://progressbar-2.readthedocs.io/ https://pypi.org/project/progressbar2/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~x86
+LICENSE=BSD
+RDEPEND=>=dev-python/python-utils-3.0.0[python_targets_pypy3(-)?,python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-python/progressbar 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/p/progressbar2/progressbar2-4.2.0.tar.gz
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=b57bd4686c62e168b0481f279d296c74
diff --git a/metadata/md5-cache/dev-python/reportlab-3.6.12 b/metadata/md5-cache/dev-python/reportlab-3.6.12
new file mode 100644
index 000000000000..0826ba6debaf
--- /dev/null
+++ b/metadata/md5-cache/dev-python/reportlab-3.6.12
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip doc? ( || ( ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.4:3.10 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.12:3.9 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_9(-)] ) ( >=dev-lang/python-3.8.13:3.8 >=dev-python/sphinx-4.5.0-r1[python_targets_python3_8(-)] ) ) ) 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-9[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.3.0[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/wheel[python_targets_python3_8(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test unpack
+DEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:=
+DESCRIPTION=Tools for generating printable PDF documents from any data source
+EAPI=8
+HOMEPAGE=https://www.reportlab.com/ https://pypi.org/project/reportlab/
+INHERIT=distutils-r1
+IUSE=doc python_targets_python3_8 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=BSD
+RDEPEND=media-libs/freetype media-libs/libart_lgpl sys-libs/zlib:= dev-python/pillow[tiff,truetype,jpeg(+),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 )
+SLOT=0
+SRC_URI=mirror://pypi/r/reportlab/reportlab-3.6.12.tar.gz https://www.reportlab.com/ftp/fonts/pfbfer-20070710.zip
+_eclasses_=distutils-r1	8c1ceb6b71a65547b0ea7bc901d906cb	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-r1	2d51fd03931e743811ce30d198e4dcfd	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=785b8d2f5bcd59444161428b920580d0
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index 1f1dde5d3b10..683f5345c3aa 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/gitlab-runner-15.4.0 b/metadata/md5-cache/dev-util/gitlab-runner-15.4.1
index 1f018feacd16..1e321db1a640 100644
--- a/metadata/md5-cache/dev-util/gitlab-runner-15.4.0
+++ b/metadata/md5-cache/dev-util/gitlab-runner-15.4.1
@@ -10,6 +10,6 @@ LICENSE=MIT
 RDEPEND=acct-group/gitlab-runner acct-user/gitlab-runner virtual/tmpfiles
 RESTRICT=strip
 SLOT=0
-SRC_URI=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v15.4.0/gitlab-runner-v15.4.0.tar.gz -> gitlab-runner-15.4.0.tar.gz https://dev.gentoo.org/~williamh/dist/gitlab-runner-15.4.0-deps.tar.xz
+SRC_URI=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v15.4.1/gitlab-runner-v15.4.1.tar.gz -> gitlab-runner-15.4.1.tar.gz https://dev.gentoo.org/~williamh/dist/gitlab-runner-15.4.1-deps.tar.xz
 _eclasses_=go-module	15312495dc4fd84f8c37bbe228ea2abd	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=3764e723e5947d9e4093aa84f8070b11
+_md5_=63878ff70fa30c1b679d8e125c05a8d3
diff --git a/metadata/md5-cache/dev-util/gitlab-runner-15.5.0 b/metadata/md5-cache/dev-util/gitlab-runner-15.5.0
new file mode 100644
index 000000000000..090b7a0d0901
--- /dev/null
+++ b/metadata/md5-cache/dev-util/gitlab-runner-15.5.0
@@ -0,0 +1,15 @@
+BDEPEND=dev-go/gox >=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst test unpack
+DEPEND=acct-group/gitlab-runner acct-user/gitlab-runner
+DESCRIPTION=The official GitLab Runner, written in Go
+EAPI=8
+HOMEPAGE=https://gitlab.com/gitlab-org/gitlab-runner
+INHERIT=go-module systemd tmpfiles
+KEYWORDS=~amd64 ~ppc64
+LICENSE=MIT
+RDEPEND=acct-group/gitlab-runner acct-user/gitlab-runner virtual/tmpfiles
+RESTRICT=strip
+SLOT=0
+SRC_URI=https://gitlab.com/gitlab-org/gitlab-runner/-/archive/v15.5.0/gitlab-runner-v15.5.0.tar.gz -> gitlab-runner-15.5.0.tar.gz https://dev.gentoo.org/~williamh/dist/gitlab-runner-15.5.0-deps.tar.xz
+_eclasses_=go-module	15312495dc4fd84f8c37bbe228ea2abd	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=62bdb17f86d85e9fa0e91f7d147ac021
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11702.1 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11702.1
deleted file mode 100644
index 17cc37a8f667..000000000000
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.11702.1
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND==sys-devel/lld-13* || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
-DEFINED_PHASES=compile configure install prepare setup test
-DEPEND=dev-libs/opencl-clang:13= dev-util/spirv-tools =sys-devel/lld-13* sys-devel/llvm:13= !!sys-devel/llvm:0
-DESCRIPTION=LLVM-based OpenCL compiler for OpenCL targetting Intel Gen graphics hardware
-EAPI=8
-HOMEPAGE=https://github.com/intel/intel-graphics-compiler
-INHERIT=cmake flag-o-matic llvm python-any-r1
-IUSE=debug
-KEYWORDS=amd64
-LICENSE=MIT
-RDEPEND=dev-libs/opencl-clang:13= dev-util/spirv-tools =sys-devel/lld-13* sys-devel/llvm:13=
-SLOT=0
-SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.11702.1.tar.gz -> intel-graphics-compiler-1.0.11702.1.tar.gz
-_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=d38a68014f040c812a1e6f307e6f20be
diff --git a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12149.1 b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12149.1
index f14371fa15c3..0be1ad814dfe 100644
--- a/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12149.1
+++ b/metadata/md5-cache/dev-util/intel-graphics-compiler-1.0.12149.1
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://github.com/intel/intel-graphics-compiler
 INHERIT=cmake flag-o-matic llvm python-any-r1
 IUSE=debug
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=dev-libs/opencl-clang:13= dev-util/spirv-tools =sys-devel/lld-13* sys-devel/llvm:13=
 SLOT=0
 SRC_URI=https://github.com/intel/intel-graphics-compiler/archive/igc-1.0.12149.1.tar.gz -> intel-graphics-compiler-1.0.12149.1.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=79377ecda13bcda32309bb83f49c532f
+_md5_=d38a68014f040c812a1e6f307e6f20be
diff --git a/metadata/md5-cache/dev-util/lldb-15.0.3 b/metadata/md5-cache/dev-util/lldb-15.0.3
index 55a28b932693..e6cad5040c23 100644
--- a/metadata/md5-cache/dev-util/lldb-15.0.3
+++ b/metadata/md5-cache/dev-util/lldb-15.0.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake llvm llvm.org python-single-r1
 IUSE=debug +libedit lzma ncurses +python test +xml test verify-sig python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~x86
+KEYWORDS=~amd64 ~arm arm64 ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=libedit? ( dev-libs/libedit:0= ) lzma? ( app-arch/xz-utils:= ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0= ) xml? ( dev-libs/libxml2:= ) ~sys-devel/clang-15.0.3 ~sys-devel/llvm-15.0.3 python? ( python_single_target_python3_8? ( dev-python/six[python_targets_python3_8(-)] ) python_single_target_python3_9? ( dev-python/six[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/six[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/six[python_targets_python3_11(-)] ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=test !test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=984a0d93e774d7a7313435a5b33132f5
+_md5_=f0a1123e2d0c7f4d3f371e99524763d1
diff --git a/metadata/md5-cache/dev-util/spirv-llvm-translator-15.0.0 b/metadata/md5-cache/dev-util/spirv-llvm-translator-15.0.0
index 84383b315d20..eb2407f4f550 100644
--- a/metadata/md5-cache/dev-util/spirv-llvm-translator-15.0.0
+++ b/metadata/md5-cache/dev-util/spirv-llvm-translator-15.0.0
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://github.com/KhronosGroup/SPIRV-LLVM-Translator
 INHERIT=cmake flag-o-matic llvm
 IUSE=test +tools
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=UoI-NCSA
 RDEPEND=dev-util/spirv-headers sys-devel/clang:15 sys-devel/llvm:15
 REQUIRED_USE=test? ( tools )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=15
 SRC_URI=https://github.com/KhronosGroup/SPIRV-LLVM-Translator/archive/v15.0.0.tar.gz -> spirv-llvm-translator-15.0.0.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=59edecf6beeb881fbf71d97fec537c23
+_md5_=33e681a6ff3bf5beabbd4d111954d614
diff --git a/metadata/md5-cache/games-action/Manifest.gz b/metadata/md5-cache/games-action/Manifest.gz
index bf6e7d883ea6..c0fb8faf5015 100644
--- a/metadata/md5-cache/games-action/Manifest.gz
+++ b/metadata/md5-cache/games-action/Manifest.gz
diff --git a/metadata/md5-cache/games-action/extreme-tuxracer-0.8.2 b/metadata/md5-cache/games-action/extreme-tuxracer-0.8.2
new file mode 100644
index 000000000000..73ab897fb28b
--- /dev/null
+++ b/metadata/md5-cache/games-action/extreme-tuxracer-0.8.2
@@ -0,0 +1,15 @@
+BDEPEND=virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4
+DEFINED_PHASES=install postinst postrm preinst prepare
+DEPEND=>=media-libs/libsfml-2.4:0= virtual/glu virtual/opengl
+DESCRIPTION=High speed arctic racing game based on Tux Racer
+EAPI=8
+HOMEPAGE=https://sourceforge.net/p/extremetuxracer/wiki/Home/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools desktop xdg
+KEYWORDS=~amd64 ~arm64 ~ppc64 ~riscv ~x86
+LICENSE=GPL-2+
+RDEPEND=>=media-libs/libsfml-2.4:0= virtual/glu virtual/opengl
+SLOT=0
+SRC_URI=https://download.sourceforge.net/extremetuxracer/etr-0.8.2.tar.xz -> extreme-tuxracer-0.8.2.tar.xz
+_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	desktop	7eb20ad915a0a318176d51bc2508ff5c	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=2e09b2f667a6bc1e0e19911a08156844
diff --git a/metadata/md5-cache/games-server/Manifest.gz b/metadata/md5-cache/games-server/Manifest.gz
index a36973670148..ca72b5da84bd 100644
--- a/metadata/md5-cache/games-server/Manifest.gz
+++ b/metadata/md5-cache/games-server/Manifest.gz
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.19.20.02 b/metadata/md5-cache/games-server/bedrock-server-1.19.20.02
deleted file mode 100644
index 978cb7e52293..000000000000
--- a/metadata/md5-cache/games-server/bedrock-server-1.19.20.02
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install
-DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
-EAPI=8
-HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* amd64
-LICENSE=Mojang
-RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.20.02.zip
-_md5_=cd327b7e06186d65483755305b81e813
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.19.30.04 b/metadata/md5-cache/games-server/bedrock-server-1.19.30.04
deleted file mode 100644
index 930cd96245d3..000000000000
--- a/metadata/md5-cache/games-server/bedrock-server-1.19.30.04
+++ /dev/null
@@ -1,12 +0,0 @@
-BDEPEND=app-arch/unzip
-DEFINED_PHASES=compile install
-DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
-EAPI=8
-HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* ~amd64
-LICENSE=Mojang
-RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
-RESTRICT=bindist mirror
-SLOT=0
-SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.30.04.zip
-_md5_=aaf5f776bcbb8fa9b6ce8732514ba237
diff --git a/metadata/md5-cache/games-server/bedrock-server-1.19.31.01 b/metadata/md5-cache/games-server/bedrock-server-1.19.31.01
index d2f2af7c0887..9c58bf9abaf2 100644
--- a/metadata/md5-cache/games-server/bedrock-server-1.19.31.01
+++ b/metadata/md5-cache/games-server/bedrock-server-1.19.31.01
@@ -3,10 +3,10 @@ DEFINED_PHASES=compile install
 DESCRIPTION=The official bedrock (non-java) based server for the sandbox video game
 EAPI=8
 HOMEPAGE=https://www.minecraft.net/
-KEYWORDS=-* ~amd64
+KEYWORDS=-* amd64
 LICENSE=Mojang
 RDEPEND=acct-group/bedrock acct-user/bedrock app-misc/dtach dev-libs/openssl:0/1.1 sys-libs/zlib
 RESTRICT=bindist mirror
 SLOT=0
 SRC_URI=https://minecraft.azureedge.net/bin-linux/bedrock-server-1.19.31.01.zip
-_md5_=aaf5f776bcbb8fa9b6ce8732514ba237
+_md5_=cd327b7e06186d65483755305b81e813
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 88317380a5c4..ebc2fccf7235 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/libopenshot-0.2.7 b/metadata/md5-cache/media-libs/libopenshot-0.2.7
index adc5c8f89227..9e624ec9175d 100644
--- a/metadata/md5-cache/media-libs/libopenshot-0.2.7
+++ b/metadata/md5-cache/media-libs/libopenshot-0.2.7
@@ -1,6 +1,6 @@
 BDEPEND=doc? ( app-doc/doxygen ) python? ( dev-lang/swig ) test? ( dev-cpp/catch:0 dev-libs/unittest++ ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
 DEFINED_PHASES=compile configure install prepare pretend setup test
-DEPEND=dev-libs/jsoncpp:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] >=media-libs/libopenshot-audio-0.2.1:0= media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora,vorbis] net-libs/cppzmq net-libs/zeromq imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] ) opencv? ( >=media-libs/opencv-4.5.2:=[contrib,contribdnn] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) )
+DEPEND=dev-libs/jsoncpp:0= dev-libs/protobuf:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] >=media-libs/libopenshot-audio-0.2.1:0= media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora,vorbis] net-libs/cppzmq net-libs/zeromq imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] ) opencv? ( >=media-libs/opencv-4.5.2:=[contrib,contribdnn] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) )
 DESCRIPTION=Video editing library used by OpenShot
 EAPI=8
 HOMEPAGE=https://www.openshot.org/
@@ -8,10 +8,10 @@ INHERIT=cmake python-single-r1 toolchain-funcs
 IUSE=doc examples +imagemagick +opencv +python test python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
 KEYWORDS=amd64 x86
 LICENSE=GPL-3+
-RDEPEND=dev-libs/jsoncpp:0= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] >=media-libs/libopenshot-audio-0.2.1:0= media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora,vorbis] net-libs/cppzmq net-libs/zeromq imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] ) opencv? ( >=media-libs/opencv-4.5.2:=[contrib,contribdnn] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) )
+RDEPEND=dev-libs/jsoncpp:0= dev-libs/protobuf:= dev-qt/qtcore:5 dev-qt/qtgui:5 dev-qt/qtmultimedia:5[widgets] >=media-libs/libopenshot-audio-0.2.1:0= media-video/ffmpeg:0=[encode,x264,xvid,vpx,mp3,theora,vorbis] net-libs/cppzmq net-libs/zeromq imagemagick? ( >=media-gfx/imagemagick-7:0=[cxx] ) opencv? ( >=media-libs/opencv-4.5.2:=[contrib,contribdnn] ) python? ( python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8 ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10 ) )
 REQUIRED_USE=python? ( ^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 ) )
 RESTRICT=!test? ( test )
 SLOT=0/21
 SRC_URI=https://github.com/OpenShot/libopenshot/archive/v0.2.7.tar.gz -> libopenshot-0.2.7.tar.gz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=02929502e284b5c792654952cef62cf2
+_md5_=3cca198d7622039d1921b039c3f16a50
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 38e315a5019f..dfe041415151 100644
--- a/metadata/md5-cache/media-sound/Manifest.gz
+++ b/metadata/md5-cache/media-sound/Manifest.gz
diff --git a/metadata/md5-cache/media-sound/deadbeef-1.9.2 b/metadata/md5-cache/media-sound/deadbeef-1.9.2-r1
index 64cf83a07d0c..874ca29815c1 100644
--- a/metadata/md5-cache/media-sound/deadbeef-1.9.2
+++ b/metadata/md5-cache/media-sound/deadbeef-1.9.2-r1
@@ -14,4 +14,4 @@ REQUIRED_USE=|| ( alsa oss pulseaudio nullout )
 SLOT=0
 SRC_URI=mirror://sourceforge/deadbeef/deadbeef-1.9.2.tar.bz2
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	plocale	7ce00136a77130df46fbbd5966f98a61	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=8edd782826dfe06315974283cad5bda8
+_md5_=9dc705619d4f53dacbec37fe46c2d061
diff --git a/metadata/md5-cache/net-mail/Manifest.gz b/metadata/md5-cache/net-mail/Manifest.gz
index 007513249bcd..ab2ba181cb3f 100644
--- a/metadata/md5-cache/net-mail/Manifest.gz
+++ b/metadata/md5-cache/net-mail/Manifest.gz
diff --git a/metadata/md5-cache/net-mail/mu-1.8.9 b/metadata/md5-cache/net-mail/mu-1.8.11
index 2701e29d0b00..6853bb097af0 100644
--- a/metadata/md5-cache/net-mail/mu-1.8.9
+++ b/metadata/md5-cache/net-mail/mu-1.8.11
@@ -10,6 +10,6 @@ KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
 LICENSE=GPL-3+
 RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
 SLOT=0
-SRC_URI=https://github.com/djcb/mu/releases/download/v1.8.9/mu-1.8.9.tar.xz
+SRC_URI=https://github.com/djcb/mu/releases/download/v1.8.11/mu-1.8.11.tar.xz
 _eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=483a95b897ad1759ae2ac6e4b85b8a5f
diff --git a/metadata/md5-cache/net-mail/mu-1.8.7 b/metadata/md5-cache/net-mail/mu-1.8.7
deleted file mode 100644
index 24bd7212731e..000000000000
--- a/metadata/md5-cache/net-mail/mu-1.8.7
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/texinfo virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
-DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
-EAPI=8
-HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
-INHERIT=elisp-common meson
-IUSE=emacs readline
-KEYWORDS=amd64 arm arm64 ~riscv x86 ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
-SLOT=0
-SRC_URI=https://github.com/djcb/mu/releases/download/v1.8.7/mu-1.8.7.tar.xz
-_eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=c79a9b4867770297eab6ab95b3c42c21
diff --git a/metadata/md5-cache/net-mail/mu-1.8.8 b/metadata/md5-cache/net-mail/mu-1.8.8
deleted file mode 100644
index 11063dd13b6d..000000000000
--- a/metadata/md5-cache/net-mail/mu-1.8.8
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=sys-apps/texinfo virtual/pkgconfig >=dev-util/meson-0.62.2 >=dev-util/ninja-1.8.2 dev-util/meson-format-array
-DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
-DEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
-DESCRIPTION=Set of tools to deal with Maildirs, in particular, searching and indexing
-EAPI=8
-HOMEPAGE=https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu
-INHERIT=elisp-common meson
-IUSE=emacs readline
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos
-LICENSE=GPL-3+
-RDEPEND=dev-libs/glib:2 dev-libs/gmime:3.0 >=dev-libs/xapian-1.4:= emacs? ( >=app-editors/emacs-25.3:* ) readline? ( sys-libs/readline:= )
-SLOT=0
-SRC_URI=https://github.com/djcb/mu/releases/download/v1.8.8/mu-1.8.8.tar.xz
-_eclasses_=elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=483a95b897ad1759ae2ac6e4b85b8a5f
diff --git a/metadata/md5-cache/net-print/Manifest.gz b/metadata/md5-cache/net-print/Manifest.gz
index 74390f5e5d69..131ed17517da 100644
--- a/metadata/md5-cache/net-print/Manifest.gz
+++ b/metadata/md5-cache/net-print/Manifest.gz
diff --git a/metadata/md5-cache/net-print/hplip-3.22.6 b/metadata/md5-cache/net-print/hplip-3.22.6
index 51e6b0bfd010..050e6daff314 100644
--- a/metadata/md5-cache/net-print/hplip-3.22.6
+++ b/metadata/md5-cache/net-print/hplip-3.22.6
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://developers.hp.com/hp-linux-imaging-and-printing
 INHERIT=autotools linux-info python-single-r1 readme.gentoo-r1 udev
 IUSE=doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86
+KEYWORDS=~amd64 arm arm64 ppc ppc64 ~x86
 LICENSE=GPL-2
 RDEPEND=net-print/cups sys-apps/dbus virtual/jpeg:0 hpijs? ( net-print/cups-filters[foomatic] ) !libusb0? ( virtual/libusb:1 ) libusb0? ( virtual/libusb:0 ) python_single_target_python3_8? ( >=dev-lang/python-3.8.13:3.8[threads(+),xml(+)] ) python_single_target_python3_9? ( >=dev-lang/python-3.9.12:3.9[threads(+),xml(+)] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.4:3.10[threads(+),xml(+)] ) !minimal? ( scanner? ( media-gfx/sane-backends ) snmp? ( dev-libs/openssl:0= net-analyzer/net-snmp:= net-dns/avahi[dbus,python,python_single_target_python3_8(-)?,python_single_target_python3_9(-)?,python_single_target_python3_10(-)?] ) ) app-text/ghostscript-gpl !minimal? ( 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(-)] ) kernel_linux? ( virtual/udev ) python_single_target_python3_8? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_8(-)] dev-python/distro[python_targets_python3_8(-)] fax? ( dev-python/reportlab[python_targets_python3_8(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_8(-)] libnotify? ( dev-python/notify2[python_targets_python3_8(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_8(-)] >=dev-python/pillow-3.1.1[python_targets_python3_8(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_9? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_9(-)] dev-python/distro[python_targets_python3_9(-)] fax? ( dev-python/reportlab[python_targets_python3_9(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_9(-)] libnotify? ( dev-python/notify2[python_targets_python3_9(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_9(-)] >=dev-python/pillow-3.1.1[python_targets_python3_9(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) python_single_target_python3_10? ( >=dev-python/dbus-python-1.2.0-r1[python_targets_python3_10(-)] dev-python/distro[python_targets_python3_10(-)] fax? ( dev-python/reportlab[python_targets_python3_10(-)] ) qt5? ( >=dev-python/PyQt5-5.5.1[dbus,gui,widgets,python_targets_python3_10(-)] libnotify? ( dev-python/notify2[python_targets_python3_10(-)] ) ) scanner? ( >=dev-python/reportlab-3.2[python_targets_python3_10(-)] >=dev-python/pillow-3.1.1[python_targets_python3_10(-)] X? ( || ( kde? ( kde-misc/skanlite ) media-gfx/xsane media-gfx/sane-frontends ) ) ) ) ) policykit? ( sys-auth/polkit )
 REQUIRED_USE=^^ ( python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 )
 SLOT=0
 SRC_URI=mirror://sourceforge/hplip/hplip-3.22.6.tar.gz https://dev.gentoo.org/~billie/distfiles/hplip-3.22.6-patches-1.tar.xz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152
-_md5_=59bfcf684f8c42f1d079f6ccbd60d2d6
+_md5_=2437033f81f342d0439c8d99cd1af9a9
diff --git a/metadata/md5-cache/net-wireless/Manifest.gz b/metadata/md5-cache/net-wireless/Manifest.gz
index b883c544be5f..716b9f167b15 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/unifi-7.2.95 b/metadata/md5-cache/net-wireless/unifi-7.2.95
new file mode 100644
index 000000000000..8d611c4765cf
--- /dev/null
+++ b/metadata/md5-cache/net-wireless/unifi-7.2.95
@@ -0,0 +1,16 @@
+BDEPEND=app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install postinst preinst prepare setup
+DEPEND=>=dev-java/java-config-2.2.0-r3
+DESCRIPTION=A Management Controller for Ubiquiti Networks UniFi APs
+EAPI=8
+HOMEPAGE=https://www.ubnt.com
+INHERIT=java-pkg-2 readme.gentoo-r1 systemd
+IUSE=systemd system-mongodb
+KEYWORDS=-* ~amd64 ~arm64
+LICENSE=Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti
+RDEPEND=acct-group/unifi acct-user/unifi dev-db/mongodb virtual/jre:1.8 >=dev-java/java-config-2.2.0-r3
+RESTRICT=bindist mirror
+SLOT=0/7.2
+SRC_URI=https://dl.ui.com/unifi/7.2.95-e5951ac73c/UniFi.unix.zip -> unifi-7.2.95.zip
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	readme.gentoo-r1	b776ad4b42f564c406a95c41ccb42c55	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=719641246c1f54caff90339e5bf04374
diff --git a/metadata/md5-cache/sys-auth/AusweisApp2-1.24.3 b/metadata/md5-cache/sys-auth/AusweisApp2-1.24.3
new file mode 100644
index 000000000000..62de0f7b8f9b
--- /dev/null
+++ b/metadata/md5-cache/sys-auth/AusweisApp2-1.24.3
@@ -0,0 +1,14 @@
+BDEPEND=dev-qt/linguist-tools:5 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/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
+DESCRIPTION=Official authentication app for German ID cards and residence permits
+EAPI=8
+HOMEPAGE=https://www.ausweisapp.bund.de/
+INHERIT=cmake xdg-utils
+KEYWORDS=~amd64 ~x86
+LICENSE=EUPL-1.2
+RDEPEND=dev-libs/openssl:0= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdeclarative:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtquickcontrols2:5 dev-qt/qtsvg:5 dev-qt/qtwebsockets:5[qml] dev-qt/qtwidgets:5 net-libs/http-parser:0= sys-apps/pcsc-lite virtual/udev
+SLOT=0
+SRC_URI=https://github.com/Governikus/AusweisApp2/archive/1.24.3.tar.gz -> AusweisApp2-1.24.3.tar.gz
+_eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=6a804b422472cf1ede7c6a3a72d4ca7c
diff --git a/metadata/md5-cache/sys-auth/Manifest.gz b/metadata/md5-cache/sys-auth/Manifest.gz
index 7c3c3e1a21c6..fab6acb34f7f 100644
--- a/metadata/md5-cache/sys-auth/Manifest.gz
+++ b/metadata/md5-cache/sys-auth/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/Manifest.gz b/metadata/md5-cache/sys-cluster/Manifest.gz
index 8fb4c9cfaab6..c00fccdd8301 100644
--- a/metadata/md5-cache/sys-cluster/Manifest.gz
+++ b/metadata/md5-cache/sys-cluster/Manifest.gz
diff --git a/metadata/md5-cache/sys-cluster/nomad-1.2.6 b/metadata/md5-cache/sys-cluster/nomad-1.2.13
index 68cf7f7965b8..05074e44b5c9 100644
--- a/metadata/md5-cache/sys-cluster/nomad-1.2.6
+++ b/metadata/md5-cache/sys-cluster/nomad-1.2.13
@@ -1,5 +1,5 @@
 BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
-DEFINED_PHASES=compile install prepare unpack
+DEFINED_PHASES=compile install unpack
 DESCRIPTION=A simple and flexible workload orchestrator
 EAPI=8
 HOMEPAGE=https://nomadproject.io
@@ -9,6 +9,6 @@ KEYWORDS=~amd64 ~arm64
 LICENSE=MPL-2.0
 RESTRICT=test strip
 SLOT=0
-SRC_URI=https://github.com/hashicorp/nomad/archive/v1.2.6.tar.gz -> nomad-1.2.6.tar.gz https://dev.gentoo.org/~williamh/dist/nomad-1.2.6-vendor.tar.xz
+SRC_URI=https://github.com/hashicorp/nomad/archive/v1.2.13.tar.gz -> nomad-1.2.13.tar.gz https://dev.gentoo.org/~williamh/dist/nomad-1.2.13-deps.tar.xz
 _eclasses_=go-module	15312495dc4fd84f8c37bbe228ea2abd	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=696be5ba5405bbd6d01753e1e609f8b4
+_md5_=7863c7bba8315a7b0ed7b27ad6413347
diff --git a/metadata/md5-cache/sys-cluster/nomad-1.4.1 b/metadata/md5-cache/sys-cluster/nomad-1.4.1
new file mode 100644
index 000000000000..5df5d4f30da3
--- /dev/null
+++ b/metadata/md5-cache/sys-cluster/nomad-1.4.1
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lang/go-1.18 app-arch/unzip virtual/pkgconfig
+DEFINED_PHASES=compile install unpack
+DESCRIPTION=A simple and flexible workload orchestrator
+EAPI=8
+HOMEPAGE=https://nomadproject.io
+INHERIT=go-module systemd
+IUSE=ui
+KEYWORDS=~amd64 ~arm64
+LICENSE=MPL-2.0
+RESTRICT=test strip
+SLOT=0
+SRC_URI=https://github.com/hashicorp/nomad/archive/v1.4.1.tar.gz -> nomad-1.4.1.tar.gz https://dev.gentoo.org/~williamh/dist/nomad-1.4.1-deps.tar.xz
+_eclasses_=go-module	15312495dc4fd84f8c37bbe228ea2abd	multilib	5ca4e49abed8e3a2f7b56920eadee157	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=129203c9e8feb790a97c075014ea018e
diff --git a/metadata/md5-cache/sys-devel/Manifest.gz b/metadata/md5-cache/sys-devel/Manifest.gz
index bec1e85d2c3d..e38b4c3da74d 100644
--- a/metadata/md5-cache/sys-devel/Manifest.gz
+++ b/metadata/md5-cache/sys-devel/Manifest.gz
diff --git a/metadata/md5-cache/sys-devel/clang-15.0.3 b/metadata/md5-cache/sys-devel/clang-15.0.3
index c4f20f2d99e3..46f61a51b0d0 100644
--- a/metadata/md5-cache/sys-devel/clang-15.0.3
+++ b/metadata/md5-cache/sys-devel/clang-15.0.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake llvm llvm.org multilib multilib-minimal prefix python-single-r1 toolchain-funcs
 IUSE=debug doc +extra +pie +static-analyzer test xml test doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 python_single_target_python3_8 python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT
 PDEPEND=sys-devel/clang-toolchain-symlinks:15 ~sys-devel/clang-runtime-15.0.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 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.0_beta4:3.11 ) ~sys-devel/llvm-15.0.3:15=[debug=,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] static-analyzer? ( dev-lang/perl:* ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) >=sys-devel/clang-common-15.0.3 llvm_targets_AArch64? ( ~sys-devel/llvm-15.0.3[llvm_targets_AArch64] ) llvm_targets_AMDGPU? ( ~sys-devel/llvm-15.0.3[llvm_targets_AMDGPU] ) llvm_targets_ARM? ( ~sys-devel/llvm-15.0.3[llvm_targets_ARM] ) llvm_targets_AVR? ( ~sys-devel/llvm-15.0.3[llvm_targets_AVR] ) llvm_targets_BPF? ( ~sys-devel/llvm-15.0.3[llvm_targets_BPF] ) llvm_targets_Hexagon? ( ~sys-devel/llvm-15.0.3[llvm_targets_Hexagon] ) llvm_targets_Lanai? ( ~sys-devel/llvm-15.0.3[llvm_targets_Lanai] ) llvm_targets_Mips? ( ~sys-devel/llvm-15.0.3[llvm_targets_Mips] ) llvm_targets_MSP430? ( ~sys-devel/llvm-15.0.3[llvm_targets_MSP430] ) llvm_targets_NVPTX? ( ~sys-devel/llvm-15.0.3[llvm_targets_NVPTX] ) llvm_targets_PowerPC? ( ~sys-devel/llvm-15.0.3[llvm_targets_PowerPC] ) llvm_targets_RISCV? ( ~sys-devel/llvm-15.0.3[llvm_targets_RISCV] ) llvm_targets_Sparc? ( ~sys-devel/llvm-15.0.3[llvm_targets_Sparc] ) llvm_targets_SystemZ? ( ~sys-devel/llvm-15.0.3[llvm_targets_SystemZ] ) llvm_targets_VE? ( ~sys-devel/llvm-15.0.3[llvm_targets_VE] ) llvm_targets_WebAssembly? ( ~sys-devel/llvm-15.0.3[llvm_targets_WebAssembly] ) llvm_targets_X86? ( ~sys-devel/llvm-15.0.3[llvm_targets_X86] ) llvm_targets_XCore? ( ~sys-devel/llvm-15.0.3[llvm_targets_XCore] ) llvm_targets_ARC? ( ~sys-devel/llvm-15.0.3[llvm_targets_ARC] ) llvm_targets_CSKY? ( ~sys-devel/llvm-15.0.3[llvm_targets_CSKY] ) llvm_targets_DirectX? ( ~sys-devel/llvm-15.0.3[llvm_targets_DirectX] ) llvm_targets_LoongArch? ( ~sys-devel/llvm-15.0.3[llvm_targets_LoongArch] ) llvm_targets_M68k? ( ~sys-devel/llvm-15.0.3[llvm_targets_M68k] ) llvm_targets_SPIRV? ( ~sys-devel/llvm-15.0.3[llvm_targets_SPIRV] )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.3-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.3.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	prefix	eab3c99d77fe00506c109c8a736186f7	python-single-r1	a5747fe6dc0651d95cb78eddd5e160a8	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=03d0301d4478f005e53b97c2554bbeee
+_md5_=5fe8f52717569be7ea2db6c8e8967d69
diff --git a/metadata/md5-cache/sys-devel/clang-common-15.0.3-r2 b/metadata/md5-cache/sys-devel/clang-common-15.0.3-r2
index bce55031190d..c72daa4add76 100644
--- a/metadata/md5-cache/sys-devel/clang-common-15.0.3-r2
+++ b/metadata/md5-cache/sys-devel/clang-common-15.0.3-r2
@@ -6,10 +6,10 @@ HOMEPAGE=https://llvm.org/
 IDEPEND=!default-compiler-rt? ( sys-devel/gcc-config ) !default-libcxx? ( sys-devel/gcc-config )
 INHERIT=bash-completion-r1 llvm.org
 IUSE=default-compiler-rt default-libcxx default-lld llvm-libunwind stricter verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=sys-devel/clang:* default-compiler-rt? ( sys-devel/clang-runtime[compiler-rt] llvm-libunwind? ( sys-libs/llvm-libunwind ) !llvm-libunwind? ( sys-libs/libunwind ) ) !default-compiler-rt? ( sys-devel/gcc ) default-libcxx? ( >=sys-libs/libcxx-15.0.3 ) !default-libcxx? ( sys-devel/gcc ) default-lld? ( sys-devel/lld ) !default-lld? ( sys-devel/binutils )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=bash-completion-r1	f5e7a020fd9c741740756aac61bf75ff	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=34c8270ab9e9076f082d7f9b6d6d0c9d
+_md5_=fc381c7e941ce95450e3fa6a2dc8ccd4
diff --git a/metadata/md5-cache/sys-devel/clang-runtime-15.0.3 b/metadata/md5-cache/sys-devel/clang-runtime-15.0.3
index 77a0a29d84bd..683f38edd315 100644
--- a/metadata/md5-cache/sys-devel/clang-runtime-15.0.3
+++ b/metadata/md5-cache/sys-devel/clang-runtime-15.0.3
@@ -4,10 +4,10 @@ EAPI=8
 HOMEPAGE=https://clang.llvm.org/
 INHERIT=multilib-build
 IUSE=+compiler-rt libcxx openmp +sanitize abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=metapackage
 RDEPEND=compiler-rt? ( ~sys-libs/compiler-rt-15.0.3:15.0.3[abi_x86_32(+)?,abi_x86_64(+)?] sanitize? ( ~sys-libs/compiler-rt-sanitizers-15.0.3:15.0.3[abi_x86_32(+)?,abi_x86_64(+)?] ) ) libcxx? ( >=sys-libs/libcxx-15.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) openmp? ( >=sys-libs/libomp-15.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 REQUIRED_USE=sanitize? ( compiler-rt )
 SLOT=15.0.3
 _eclasses_=multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e0ac99b287f014a70d89cf3e07b57dfd
+_md5_=0207b839e4268621e9074ffc2a9f062a
diff --git a/metadata/md5-cache/sys-devel/clang-toolchain-symlinks-15-r2 b/metadata/md5-cache/sys-devel/clang-toolchain-symlinks-15-r2
index 5d613bb82a38..f8bc2dba435a 100644
--- a/metadata/md5-cache/sys-devel/clang-toolchain-symlinks-15-r2
+++ b/metadata/md5-cache/sys-devel/clang-toolchain-symlinks-15-r2
@@ -4,9 +4,9 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:LLVM
 INHERIT=multilib
 IUSE=gcc-symlinks multilib-symlinks +native-symlinks
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos
 LICENSE=public-domain
 RDEPEND=!<sys-devel/gcc-config-2.6 sys-devel/clang:15
 SLOT=15
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f559eae3d1ed3fe8c807e262a2269523
+_md5_=776c693a18a4a4f7224a736f792a2119
diff --git a/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20221023 b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20221023
new file mode 100644
index 000000000000..f33fc5d013b8
--- /dev/null
+++ b/metadata/md5-cache/sys-devel/gcc-13.0.0_pre20221023
@@ -0,0 +1,17 @@
+BDEPEND=sys-devel/binutils[cet(-)?] sys-devel/gnuconfig >=app-portage/elt-patches-20170815 >=sys-devel/bison-1.875 >=sys-devel/flex-2.5.4 nls? ( sys-devel/gettext ) test? ( >=dev-util/dejagnu-1.4.4 >=sys-devel/autogen-5.5.4 ) sys-apps/texinfo valgrind? ( dev-util/valgrind )
+DEFINED_PHASES=compile configure install postinst postrm prepare pretend setup test unpack
+DEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) sanitize? ( virtual/libcrypt ) systemtap? ( dev-util/systemtap ) zstd? ( app-arch/zstd:= )
+DESCRIPTION=The GNU Compiler Collection
+EAPI=8
+HOMEPAGE=https://gcc.gnu.org/
+INHERIT=toolchain
+IUSE=test vanilla +nls debug +cxx +nptl +fortran doc hardened multilib objc pgo objc-gc libssp objc++ +openmp fixed-point go +sanitize graphite ada vtv jit +pie +ssp +pch systemtap d lto cet zstd valgrind custom-cflags
+KEYWORDS=~loong
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) FDL-1.3+
+PDEPEND=>=sys-devel/gcc-config-2.3
+RDEPEND=elibc_glibc? ( sys-libs/glibc[cet(-)?] ) sys-libs/zlib virtual/libiconv nls? ( virtual/libintl ) >=dev-libs/gmp-4.3.2:0= >=dev-libs/mpfr-2.4.2:0= >=dev-libs/mpc-0.8.1:0= objc-gc? ( >=dev-libs/boehm-gc-7.4.2 ) graphite? ( >=dev-libs/isl-0.14:0= ) zstd? ( app-arch/zstd:= )
+RESTRICT=!test? ( test )
+SLOT=13
+SRC_URI=https://gcc.gnu.org/pub/gcc/snapshots/13-20221023/gcc-13-20221023.tar.xz https://dev.gentoo.org/~xen0n/distfiles/sys-devel/gcc/gcc-13.0.0-patches-1.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain	10e9276df53714742535b4cd5ccf7b75	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
+_md5_=d4804665563c18b688f5fc23a110c531
diff --git a/metadata/md5-cache/sys-devel/lld-15.0.3 b/metadata/md5-cache/sys-devel/lld-15.0.3
index e0181ad6f737..e33b4e90faf9 100644
--- a/metadata/md5-cache/sys-devel/lld-15.0.3
+++ b/metadata/md5-cache/sys-devel/lld-15.0.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1
 IUSE=debug test test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 PDEPEND=>=sys-devel/lld-toolchain-symlinks-15-r2:15
 RDEPEND=~sys-devel/llvm-15.0.3 sys-libs/zlib:= !sys-devel/lld:0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=2bbe448746bde9397c5980d0ae42986d
+_md5_=f50803e41a744ae045513feaad634d35
diff --git a/metadata/md5-cache/sys-devel/lld-toolchain-symlinks-15-r2 b/metadata/md5-cache/sys-devel/lld-toolchain-symlinks-15-r2
index e8499a5b9517..97f31c69e67b 100644
--- a/metadata/md5-cache/sys-devel/lld-toolchain-symlinks-15-r2
+++ b/metadata/md5-cache/sys-devel/lld-toolchain-symlinks-15-r2
@@ -4,9 +4,9 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:LLVM
 INHERIT=multilib
 IUSE=multilib-symlinks +native-symlinks
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86
+KEYWORDS=~amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86
 LICENSE=public-domain
 RDEPEND=sys-devel/lld:15
 SLOT=15
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=65638e2514c835f014d26dcd7ea1873a
+_md5_=fd3d9a3351e4fec1ad72486d1bb74f5e
diff --git a/metadata/md5-cache/sys-devel/llvm-15.0.3 b/metadata/md5-cache/sys-devel/llvm-15.0.3
index b8e36406a631..43489654ce6c 100644
--- a/metadata/md5-cache/sys-devel/llvm-15.0.3
+++ b/metadata/md5-cache/sys-devel/llvm-15.0.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake llvm.org multilib-minimal pax-utils python-any-r1 toolchain-funcs
 IUSE=+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar xml z3 zstd doc llvm_targets_AArch64 llvm_targets_AMDGPU llvm_targets_ARM llvm_targets_AVR llvm_targets_BPF llvm_targets_Hexagon llvm_targets_Lanai llvm_targets_Mips llvm_targets_MSP430 llvm_targets_NVPTX llvm_targets_PowerPC llvm_targets_RISCV llvm_targets_Sparc llvm_targets_SystemZ llvm_targets_VE llvm_targets_WebAssembly llvm_targets_X86 llvm_targets_XCore llvm_targets_ARC llvm_targets_CSKY llvm_targets_DirectX llvm_targets_LoongArch llvm_targets_M68k llvm_targets_SPIRV verify-sig abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc
 PDEPEND=sys-devel/llvm-common sys-devel/llvm-toolchain-symlinks:15 binutils-plugin? ( >=sys-devel/llvmgold-15 )
 RDEPEND=sys-libs/zlib:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] binutils-plugin? ( >=sys-devel/binutils-2.31.1-r4:*[plugins] ) exegesis? ( dev-libs/libpfm:= ) libedit? ( dev-libs/libedit:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) libffi? ( >=dev-libs/libffi-3.0.13-r1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) ncurses? ( >=sys-libs/ncurses-5.9-r3:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) xar? ( app-arch/xar ) xml? ( dev-libs/libxml2:2=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) z3? ( >=sci-mathematics/z3-4.7.1:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) zstd? ( app-arch/zstd:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !sys-devel/llvm:0
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=15/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig ) !doc? ( https://dev.gentoo.org/~mgorny/dist/llvm/llvm-15.0.3-manpages.tar.bz2 ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.3.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm.org	ab48c0803b67a958624f7600ef86081c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	pax-utils	91d47e5d20627c717aa878b9167c62a8	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=b9a7e35d57dca4e790fe6d46c6380e8f
+_md5_=9351718f29ea0e11497b1835242e7d6e
diff --git a/metadata/md5-cache/sys-devel/llvm-common-15.0.3 b/metadata/md5-cache/sys-devel/llvm-common-15.0.3
index e1c5bcd4acf6..c042607cefd7 100644
--- a/metadata/md5-cache/sys-devel/llvm-common-15.0.3
+++ b/metadata/md5-cache/sys-devel/llvm-common-15.0.3
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=llvm.org
 IUSE=verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions UoI-NCSA
 RDEPEND=!sys-devel/llvm:0
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=llvm.org	ab48c0803b67a958624f7600ef86081c	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=af68b85f1105f1478d433582f59ba669
+_md5_=ce7519c4a353ffe3a82b4821fd040dd3
diff --git a/metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-15-r1 b/metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-15-r1
index 8765c4ed1661..bb4961e0a04f 100644
--- a/metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-15-r1
+++ b/metadata/md5-cache/sys-devel/llvm-toolchain-symlinks-15-r1
@@ -4,9 +4,9 @@ EAPI=8
 HOMEPAGE=https://wiki.gentoo.org/wiki/Project:LLVM
 INHERIT=multilib
 IUSE=multilib-symlinks +native-symlinks
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=public-domain
 RDEPEND=sys-devel/llvm:15
 SLOT=15
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=8dea4d25fa15af448091000159773342
+_md5_=ba17d60abc01bbb8d600e630c06d9311
diff --git a/metadata/md5-cache/sys-devel/llvmgold-15 b/metadata/md5-cache/sys-devel/llvmgold-15
index c5f08dd688ef..ae5fb0eff026 100644
--- a/metadata/md5-cache/sys-devel/llvmgold-15
+++ b/metadata/md5-cache/sys-devel/llvmgold-15
@@ -2,8 +2,8 @@ DEFINED_PHASES=install
 DESCRIPTION=LLVMgold plugin symlink for autoloading
 EAPI=8
 HOMEPAGE=https://llvm.org/
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux
+KEYWORDS=~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux
 LICENSE=public-domain
 RDEPEND=sys-devel/llvm:15[binutils-plugin] !sys-devel/llvm:0
 SLOT=0
-_md5_=e263a79917e2f8ffdcc49a454e034eb3
+_md5_=69ad7ab51f84613533645cc0a9aaea6f
diff --git a/metadata/md5-cache/sys-fs/Manifest.gz b/metadata/md5-cache/sys-fs/Manifest.gz
index 7a90df941dfd..44fe2dd24a5a 100644
--- a/metadata/md5-cache/sys-fs/Manifest.gz
+++ b/metadata/md5-cache/sys-fs/Manifest.gz
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.02.188-r3 b/metadata/md5-cache/sys-fs/lvm2-2.02.188-r3
deleted file mode 100644
index 9d36d630e911..000000000000
--- a/metadata/md5-cache/sys-fs/lvm2-2.02.188-r3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=sys-devel/autoconf-archive virtual/pkgconfig sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71 >=sys-devel/libtool-2.4 virtual/pkgconfig virtual/pkgconfig
-DEFINED_PHASES=compile configure install postinst postrm prepare setup test
-DEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:= ) static? ( selinux? ( sys-libs/libselinux[static-libs] ) >=sys-apps/util-linux-2.16[static-libs] )
-DESCRIPTION=User-land utilities for LVM2 (device-mapper) software
-EAPI=7
-HOMEPAGE=https://sourceware.org/lvm2/
-INHERIT=autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
-IUSE=readline static static-libs systemd lvm2create-initrd sanlock selinux +udev +thin device-mapper-only
-KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux
-LICENSE=GPL-2
-RDEPEND=dev-libs/libaio[static-libs?] static? ( dev-libs/libaio[static-libs] ) !static? ( dev-libs/libaio[static-libs?] ) readline? ( sys-libs/readline:0= ) sanlock? ( sys-cluster/sanlock ) systemd? ( >=sys-apps/systemd-205:0= ) udev? ( >=virtual/libudev-208:= ) >=sys-apps/baselayout-2.2 >=sys-apps/util-linux-2.16 lvm2create-initrd? ( sys-apps/makedev ) !device-mapper-only? ( virtual/tmpfiles ) thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )
-REQUIRED_USE=device-mapper-only? ( !lvm2create-initrd !sanlock !thin ) static? ( !systemd !udev ) static-libs? ( !udev ) systemd? ( udev )
-SLOT=0
-SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.02.188.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.02.188.tgz
-_eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=a00ca555418cfef40ecd50a1f53babc1
diff --git a/metadata/md5-cache/sys-fs/lvm2-2.03.14-r3 b/metadata/md5-cache/sys-fs/lvm2-2.03.14-r3
index 14e63c680d53..67e48b288177 100644
--- a/metadata/md5-cache/sys-fs/lvm2-2.03.14-r3
+++ b/metadata/md5-cache/sys-fs/lvm2-2.03.14-r3
@@ -13,4 +13,4 @@ REQUIRED_USE=device-mapper-only? ( !lvm2create-initrd !sanlock !thin ) static? (
 SLOT=0
 SRC_URI=ftp://sourceware.org/pub/lvm2/LVM2.2.03.14.tgz ftp://sourceware.org/pub/lvm2/old/LVM2.2.03.14.tgz
 _eclasses_=autotools	9e6965bfaa00f52cc61e0d4bc44c87b3	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	29a755b1291d64133634d80b0328f153	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	bbfa385d6907d7948d49a5e107bd654d	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	tmpfiles	216aa76c3a6fcb5d893c23a0de86048f	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	udev	eec0bbab06977f1cfc5597269c1fa152	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=3b6d23be71a636f066e5893bfa0b7fdf
+_md5_=53a728fafddc5c3201f271bf97ccdb9f
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index b28e2532d60a..376d8b45d9b5 100644
--- a/metadata/md5-cache/sys-kernel/Manifest.gz
+++ b/metadata/md5-cache/sys-kernel/Manifest.gz
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.149 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.149
deleted file mode 100644
index a5ece75fd471..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.149
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.149
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.149 virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.149
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-158.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-158.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=98b6b100a3b6e3e7457bf50748465b2b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.148 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.150
index a3226f84e1e8..d983f12ea0d7 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.148
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.150
@@ -8,11 +8,11 @@ INHERIT=kernel-build toolchain-funcs
 IUSE=debug hardened savedconfig +initramfs test
 KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.148
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.148 virtual/libelf
+PDEPEND=>=virtual/dist-kernel-5.10.150
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.150 virtual/libelf
 REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.148
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-157.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-157.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+SLOT=5.10.150
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-159.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-159.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=98b6b100a3b6e3e7457bf50748465b2b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.74 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.75
index 42bdeace02df..6af93d29044b 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.74
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.75
@@ -8,11 +8,11 @@ INHERIT=kernel-build toolchain-funcs
 IUSE=debug hardened savedconfig +initramfs test
 KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.15.74
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.74 virtual/libelf
+PDEPEND=>=virtual/dist-kernel-5.15.75
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.75 virtual/libelf
 REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.15.74
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-78.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-78.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+SLOT=5.15.75
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-79.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-79.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=3c0a9a345a7aba91c0d17740cb6d2435
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.19.16 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.19.16
deleted file mode 100644
index 0eecb405e81a..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.19.16
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.19.16
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.19.16 virtual/libelf
-REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.19.16
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-18.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-18.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.19.13-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.19.13-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.19.13-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.19.13-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=372181c62e2f5df5e9b2ac8b79ed483d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.219 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.219
deleted file mode 100644
index 4d6522af8f87..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.219
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build
-IUSE=debug savedconfig +initramfs test
-KEYWORDS=amd64 arm64 ~ppc ppc64 x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.219
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.219 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.219
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-224.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-224.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=9b928db3d49ba10fa170b9c5fdf74687
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.218 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.220
index a10f965a6306..d73e850efddc 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.218
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.4.220
@@ -8,10 +8,10 @@ INHERIT=kernel-build
 IUSE=debug savedconfig +initramfs test
 KEYWORDS=amd64 arm64 ~ppc ppc64 x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.218
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.218 virtual/libelf
+PDEPEND=>=virtual/dist-kernel-5.4.220
+RDEPEND=!sys-kernel/gentoo-kernel-bin:5.4.220 virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.218
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-223.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-223.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+SLOT=5.4.220
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-225.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-225.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
 _md5_=9b928db3d49ba10fa170b9c5fdf74687
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.5
index f98d5e4744e5..f0c31fc65bf5 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.3
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.5
@@ -8,11 +8,11 @@ INHERIT=kernel-build toolchain-funcs
 IUSE=debug hardened savedconfig +initramfs test
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.0.3
-RDEPEND=!sys-kernel/gentoo-kernel-bin:6.0.3 virtual/libelf
+PDEPEND=>=virtual/dist-kernel-6.0.5
+RDEPEND=!sys-kernel/gentoo-kernel-bin:6.0.5 virtual/libelf
 REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.0.3
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-4.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.3-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.3-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.3-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.3-gentoo )
+SLOT=6.0.5
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-5.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.3-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.3-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.3-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.3-gentoo )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=bf7f6a7140768d3177b6555b08378d5e
+_md5_=706fca2ae8f99f86d78bd0b111af5abf
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.148 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.148
deleted file mode 100644
index bfa488d403de..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.148
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-install toolchain-funcs unpacker
-IUSE=+initramfs test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.148
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.148 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.148
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-157.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-157.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.148-1.gpkg.tar -> gentoo-kernel-5.10.148-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.148-1.gpkg.tar -> gentoo-kernel-5.10.148-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.148-1.gpkg.tar -> gentoo-kernel-5.10.148-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.148-1.gpkg.tar -> gentoo-kernel-5.10.148-1.x86.gpkg.tar )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
-_md5_=56f41fe54f9ae4f924ac77e39f7a5b52
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.149 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.150
index d8d634f62103..bc445d5bc940 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.149
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.150
@@ -8,10 +8,10 @@ INHERIT=kernel-install toolchain-funcs unpacker
 IUSE=+initramfs test
 KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.149
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.149 virtual/libelf
+PDEPEND=>=virtual/dist-kernel-5.10.150
+RDEPEND=!sys-kernel/gentoo-kernel:5.10.150 virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.149
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-158.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-158.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.149-1.gpkg.tar -> gentoo-kernel-5.10.149-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.149-1.gpkg.tar -> gentoo-kernel-5.10.149-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.149-1.gpkg.tar -> gentoo-kernel-5.10.149-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.149-1.gpkg.tar -> gentoo-kernel-5.10.149-1.x86.gpkg.tar )
+SLOT=5.10.150
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-159.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-159.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.150-1.gpkg.tar -> gentoo-kernel-5.10.150-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.150-1.gpkg.tar -> gentoo-kernel-5.10.150-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.150-1.gpkg.tar -> gentoo-kernel-5.10.150-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.150-1.gpkg.tar -> gentoo-kernel-5.10.150-1.x86.gpkg.tar )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
 _md5_=56f41fe54f9ae4f924ac77e39f7a5b52
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.74 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.75
index 47bf0ce6e9b8..35fd728ef251 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.74
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.75
@@ -8,10 +8,10 @@ INHERIT=kernel-install toolchain-funcs unpacker
 IUSE=+initramfs test
 KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.15.74
-RDEPEND=!sys-kernel/gentoo-kernel:5.15.74 virtual/libelf
+PDEPEND=>=virtual/dist-kernel-5.15.75
+RDEPEND=!sys-kernel/gentoo-kernel:5.15.75 virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.15.74
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-78.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-78.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.74-1.gpkg.tar -> gentoo-kernel-5.15.74-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.74-1.gpkg.tar -> gentoo-kernel-5.15.74-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.74-1.gpkg.tar -> gentoo-kernel-5.15.74-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.74-1.gpkg.tar -> gentoo-kernel-5.15.74-1.x86.gpkg.tar )
+SLOT=5.15.75
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-79.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-79.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.75-1.gpkg.tar -> gentoo-kernel-5.15.75-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.75-1.gpkg.tar -> gentoo-kernel-5.15.75-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.75-1.gpkg.tar -> gentoo-kernel-5.15.75-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.75-1.gpkg.tar -> gentoo-kernel-5.15.75-1.x86.gpkg.tar )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
 _md5_=1d540954391b5c1b1c2f7f3d4254e315
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.19.16 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.19.16
deleted file mode 100644
index cd7467303ec4..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.19.16
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-install toolchain-funcs unpacker
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.19.16
-RDEPEND=!sys-kernel/gentoo-kernel:5.19.16 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.19.16
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.19.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-18.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.19-18.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.19.16-1.gpkg.tar -> gentoo-kernel-5.19.16-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.19.16-1.gpkg.tar -> gentoo-kernel-5.19.16-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.19.16-1.gpkg.tar -> gentoo-kernel-5.19.16-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.19.16-1.gpkg.tar -> gentoo-kernel-5.19.16-1.x86.gpkg.tar )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
-_md5_=b9fc349d438d5f0d230a0ba60c7a79bc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.218 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.218
deleted file mode 100644
index 87b5bebaba3b..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.218
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-install toolchain-funcs unpacker
-IUSE=+initramfs test
-KEYWORDS=amd64 arm64 ppc64 x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.218
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.218 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.218
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-223.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-223.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.218-1.gpkg.tar -> gentoo-kernel-5.4.218-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.218-1.gpkg.tar -> gentoo-kernel-5.4.218-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.218-1.gpkg.tar -> gentoo-kernel-5.4.218-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.218-1.gpkg.tar -> gentoo-kernel-5.4.218-1.x86.gpkg.tar )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
-_md5_=e2c98952f63273e21ceea95828a379a1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.219 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.220
index e04a87fc8e6d..f2fb245efbb3 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.219
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.4.220
@@ -8,10 +8,10 @@ INHERIT=kernel-install toolchain-funcs unpacker
 IUSE=+initramfs test
 KEYWORDS=amd64 arm64 ppc64 x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.219
-RDEPEND=!sys-kernel/gentoo-kernel:5.4.219 virtual/libelf
+PDEPEND=>=virtual/dist-kernel-5.4.220
+RDEPEND=!sys-kernel/gentoo-kernel:5.4.220 virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.219
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-224.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-224.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.219-1.gpkg.tar -> gentoo-kernel-5.4.219-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.219-1.gpkg.tar -> gentoo-kernel-5.4.219-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.219-1.gpkg.tar -> gentoo-kernel-5.4.219-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.219-1.gpkg.tar -> gentoo-kernel-5.4.219-1.x86.gpkg.tar )
+SLOT=5.4.220
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-225.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-225.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.220-1.gpkg.tar -> gentoo-kernel-5.4.220-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.220-1.gpkg.tar -> gentoo-kernel-5.4.220-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.220-1.gpkg.tar -> gentoo-kernel-5.4.220-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.220-1.gpkg.tar -> gentoo-kernel-5.4.220-1.x86.gpkg.tar )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
 _md5_=e2c98952f63273e21ceea95828a379a1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.5
index d2584e453f0f..5c7692130990 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.3
+++ b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.5
@@ -8,10 +8,10 @@ INHERIT=kernel-install toolchain-funcs unpacker
 IUSE=+initramfs test
 KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.0.3
-RDEPEND=!sys-kernel/gentoo-kernel:6.0.3 virtual/libelf
+PDEPEND=>=virtual/dist-kernel-6.0.5
+RDEPEND=!sys-kernel/gentoo-kernel:6.0.5 virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.0.3
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-4.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3-1.gpkg.tar -> gentoo-kernel-6.0.3-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3-1.gpkg.tar -> gentoo-kernel-6.0.3-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3-1.gpkg.tar -> gentoo-kernel-6.0.3-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3-1.gpkg.tar -> gentoo-kernel-6.0.3-1.x86.gpkg.tar )
+SLOT=6.0.5
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-5.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.5-1.gpkg.tar -> gentoo-kernel-6.0.5-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.5-1.gpkg.tar -> gentoo-kernel-6.0.5-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.5-1.gpkg.tar -> gentoo-kernel-6.0.5-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.5-1.gpkg.tar -> gentoo-kernel-6.0.5-1.x86.gpkg.tar )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	unpacker	bc57272a0491765c71d973c8cfd35063
-_md5_=b78ae1a39b2103332b5d8719ce9727ad
+_md5_=eb9fbacf88abe54387f9a9102bc75091
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.150 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.150
index a9b8992b389b..7cafa0db06c4 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.150
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.10.150
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.10.150
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.10.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-159.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-159.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-159.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-159.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-159.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-159.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.10-159.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-159.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.10-159.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=e7ac6786a8bf37c474f106763c9b6760
+_md5_=50c6730228934c666be23cceab461aac
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.75 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.75
index 492b390de6ca..41e036768bac 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.75
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.15.75
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.15.75
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.15.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-79.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-79.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-79.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-79.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-79.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-79.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.15-79.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-79.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.15-79.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=f4922bf6b337462bba185316a0fdc959
+_md5_=ca10e2d1b19231a753ec4e96d5cb2f16
diff --git a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.220 b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.220
index c173d6ceaf7b..d40ed1794ef8 100644
--- a/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.220
+++ b/metadata/md5-cache/sys-kernel/gentoo-sources-5.4.220
@@ -5,11 +5,11 @@ EAPI=8
 HOMEPAGE=https://dev.gentoo.org/~mpagano/genpatches
 INHERIT=kernel-2
 IUSE=experimental symlink build
-KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86
+KEYWORDS=~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86
 LICENSE=GPL-2
 RDEPEND=!build? ( app-arch/cpio dev-lang/perl sys-devel/bc sys-devel/bison sys-devel/flex sys-devel/make >=sys-libs/ncurses-5.2 virtual/libelf virtual/pkgconfig )
 RESTRICT=binchecks strip
 SLOT=5.4.220
 SRC_URI=https://www.kernel.org/pub/linux/kernel/v5.x/linux-5.4.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-225.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-225.base.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-225.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-225.extras.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-225.extras.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-225.extras.tar.xz experimental? ( https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-5.4-225.experimental.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.4-225.experimental.tar.xz https://dev.gentoo.org/~whissi/dist/genpatches/genpatches-5.4-225.experimental.tar.xz )
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	kernel-2	6058f6e6a6269e48cd88f4956944c8d5	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144
-_md5_=72cfde8a1fd35ac10a97f6cfb9ae5c8f
+_md5_=eee98ad8bc585f81e1b8f619f20f3c68
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.148 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.148
deleted file mode 100644
index 62d7dd3b57fe..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.148
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs verify-sig
-IUSE=debug hardened savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.148
-RDEPEND=virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.148
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.148.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.148.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=730bb5890cdabd4c99a71541ebcebb0d
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.149 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.150
index 6f2f2de20578..4c649546b47b 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.149
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.150
@@ -8,11 +8,11 @@ INHERIT=kernel-build toolchain-funcs verify-sig
 IUSE=debug hardened savedconfig +initramfs test verify-sig
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.149
+PDEPEND=>=virtual/dist-kernel-5.10.150
 RDEPEND=virtual/libelf
 REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.149
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.149.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.149.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
+SLOT=5.10.150
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.150.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.150.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=730bb5890cdabd4c99a71541ebcebb0d
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.74 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.75
index 897465df696a..09e444f342f7 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.74
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.75
@@ -8,11 +8,11 @@ INHERIT=kernel-build toolchain-funcs verify-sig
 IUSE=debug hardened savedconfig +initramfs test verify-sig
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.15.74
+PDEPEND=>=virtual/dist-kernel-5.15.75
 RDEPEND=virtual/libelf
 REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.15.74
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.74.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.74.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
+SLOT=5.15.75
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.75.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.75.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=3e4f9b1f2db82487ca5d21a388b5ee08
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.19.16 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.19.16
deleted file mode 100644
index ef6d4d932b00..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.19.16
+++ /dev/null
@@ -1,18 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs verify-sig
-IUSE=debug hardened savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.19.16
-RDEPEND=virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.19.16
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.19.16.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.19.16.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.19.13-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.19.13-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.19.13-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/5.19.13-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.19.13-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=e8868bc49dfad531ca20884c3bfa62f2
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.219 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.219
deleted file mode 100644
index 5243d1cba24c..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.219
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=debug? ( dev-util/pahole ) verify-sig? ( sec-keys/openpgp-keys-kernel ) test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) ) || ( >=dev-lang/python-3.11.0_beta4:3.11 >=dev-lang/python-3.10.4:3.10 >=dev-lang/python-3.9.12:3.9 >=dev-lang/python-3.8.13:3.8 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf virtual/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build verify-sig
-IUSE=debug savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm64 ~ppc ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.219
-RDEPEND=virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.219
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.219.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.219.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
-_md5_=5ec332f71bc9a665a347424e0d1e624c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.218 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.220
index b52972984cb3..46b64584d191 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.218
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.4.220
@@ -8,10 +8,10 @@ INHERIT=kernel-build verify-sig
 IUSE=debug savedconfig +initramfs test verify-sig
 KEYWORDS=~amd64 ~arm64 ~ppc ~x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.4.218
+PDEPEND=>=virtual/dist-kernel-5.4.220
 RDEPEND=virtual/libelf
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.4.218
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.218.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.218.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
+SLOT=5.4.220
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.220.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g1.tar.gz -> gentoo-kernel-config-g1.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.4.220.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-x86_64.config -> kernel-x86_64.config.5.4.21 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-aarch64.config -> kernel-aarch64.config.5.4.21 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-ppc64le.config -> kernel-ppc64le.config.5.4.21 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/2809b7faa6a8cb232cd825096c146b7bdc1e08ea/f/kernel-i686.config -> kernel-i686.config.5.4.21 )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=5ec332f71bc9a665a347424e0d1e624c
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.3 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.5
index 108971acd6c3..9b25fe309972 100644
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.3
+++ b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.5
@@ -8,11 +8,11 @@ INHERIT=kernel-build toolchain-funcs verify-sig
 IUSE=debug hardened savedconfig +initramfs test verify-sig
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
 LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.0.3
+PDEPEND=>=virtual/dist-kernel-6.0.5
 RDEPEND=virtual/libelf
 REQUIRED_USE=arm? ( savedconfig )
 RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.0.3
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.3.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.3.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.3-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.3-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.3-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.3-gentoo )
+SLOT=6.0.5
+SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.5.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g3.tar.gz -> gentoo-kernel-config-g3.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.5.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.3-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.3-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.3-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.3-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.3-gentoo )
 _eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	a65583ca022627a0388ef5d5567359c0	kernel-install	90e2236c06284613f83d6f40bfba8b47	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16
 _md5_=a56fb036abb203780bf66c279bc24490
diff --git a/metadata/md5-cache/sys-libs/Manifest.gz b/metadata/md5-cache/sys-libs/Manifest.gz
index 6ae557128465..44d4cff32a8a 100644
--- a/metadata/md5-cache/sys-libs/Manifest.gz
+++ b/metadata/md5-cache/sys-libs/Manifest.gz
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-15.0.3 b/metadata/md5-cache/sys-libs/compiler-rt-15.0.3
index fbabced99701..7f1b269df561 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-15.0.3
+++ b/metadata/md5-cache/sys-libs/compiler-rt-15.0.3
@@ -6,10 +6,10 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=cmake flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+abi_x86_32 abi_x86_64 +clang debug test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RESTRICT=!test? ( test ) !clang? ( test )
 SLOT=15.0.3
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.3.tar.xz
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=9d288c5252920b0fd0483651688a1cfb
+_md5_=06cec84c9669c74cd7ade4975ee02e1a
diff --git a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.3 b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.3
index 43d099060683..9bcfc0330174 100644
--- a/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.3
+++ b/metadata/md5-cache/sys-libs/compiler-rt-sanitizers-15.0.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://llvm.org/
 INHERIT=check-reqs cmake flag-o-matic llvm llvm.org python-any-r1
 IUSE=+abi_x86_32 abi_x86_64 +clang debug test +libfuzzer +memprof +orc +profile +xray +asan +dfsan +lsan +msan +hwasan +tsan +ubsan +safestack +cfi +scudo +shadowcallstack +gwp-asan test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 REQUIRED_USE=|| ( asan dfsan lsan msan hwasan tsan ubsan safestack cfi scudo shadowcallstack gwp-asan libfuzzer orc profile xray ) test? ( cfi? ( ubsan ) gwp-asan? ( scudo ) )
 RESTRICT=!clang? ( test ) !test? ( test ) !test? ( test )
 SLOT=15.0.3
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig ) https://dev.gentoo.org/~mgorny/dist/llvm/llvm-gentoo-patchset-15.0.3.tar.xz
 _eclasses_=check-reqs	5e6dfbd7a8d3238a79f009fae7ac469c	cmake	44afbf15c35884f7c840470f1cf05d0d	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e21db074881fbe9a1ec4148b2994241c
+_md5_=a95df2122fefabf0a11fe127ab4c139c
diff --git a/metadata/md5-cache/sys-libs/libcxx-15.0.3 b/metadata/md5-cache/sys-libs/libcxx-15.0.3
index 0a07780bbe1f..b8a863555f7b 100644
--- a/metadata/md5-cache/sys-libs/libcxx-15.0.3
+++ b/metadata/md5-cache/sys-libs/libcxx-15.0.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://libcxx.llvm.org/
 INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+clang +libcxxabi static-libs test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv sparc ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~riscv sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=libcxxabi? ( ~sys-libs/libcxxabi-15.0.3[static-libs?,abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) !libcxxabi? ( >=sys-devel/gcc-4.7:=[cxx] )
 REQUIRED_USE=test? ( clang )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=0592b5a3822a2da7635e84f618bd4177
+_md5_=227e10083a9a8df52e1e55541b995221
diff --git a/metadata/md5-cache/sys-libs/libcxxabi-15.0.3 b/metadata/md5-cache/sys-libs/libcxxabi-15.0.3
index 25b87c118e74..660d30d87dce 100644
--- a/metadata/md5-cache/sys-libs/libcxxabi-15.0.3
+++ b/metadata/md5-cache/sys-libs/libcxxabi-15.0.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://libcxxabi.llvm.org/
 INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+clang static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~riscv sparc ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~riscv sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=!<sys-libs/libcxx-15
 REQUIRED_USE=test? ( clang )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=cf3ffbe187e226ab03a045924eb179b9
+_md5_=1a71f42dd733f63f05f07b8a1bbfcbcb
diff --git a/metadata/md5-cache/sys-libs/libomp-15.0.3 b/metadata/md5-cache/sys-libs/libomp-15.0.3
index 7d863a2f9adb..a63be6084c62 100644
--- a/metadata/md5-cache/sys-libs/libomp-15.0.3
+++ b/metadata/md5-cache/sys-libs/libomp-15.0.3
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://openmp.llvm.org
 INHERIT=flag-o-matic cmake-multilib linux-info llvm llvm.org python-any-r1
 IUSE=debug hwloc offload ompt test llvm_targets_AMDGPU llvm_targets_NVPTX abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=hwloc? ( >=sys-apps/hwloc-2.5:0=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) offload? ( virtual/libelf:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] dev-libs/libffi:=[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ~sys-devel/llvm-15.0.3[abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] )
 RESTRICT=!test? ( test )
 SLOT=0/15
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	linux-info	bbfa385d6907d7948d49a5e107bd654d	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=71c0ab0d2f71bb32ba47e605a2088369
+_md5_=5aeb3b0a79aa23f66dcbff04adf8fea7
diff --git a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.3 b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.3
index 14f2a3f47e76..857116285e8a 100644
--- a/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.3
+++ b/metadata/md5-cache/sys-libs/llvm-libunwind-15.0.3
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://llvm.org/docs/ExceptionHandling.html
 INHERIT=cmake-multilib flag-o-matic llvm llvm.org python-any-r1 toolchain-funcs
 IUSE=+clang debug static-libs test test abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~x64-macos
+KEYWORDS=~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~x64-macos
 LICENSE=Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )
 RDEPEND=!sys-libs/libunwind
 REQUIRED_USE=test? ( clang )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test ) !test? ( test )
 SLOT=0
 SRC_URI=https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz verify-sig? ( https://github.com/llvm/llvm-project/releases/download/llvmorg-15.0.3/llvm-project-15.0.3.src.tar.xz.sig )
 _eclasses_=cmake	44afbf15c35884f7c840470f1cf05d0d	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	29a755b1291d64133634d80b0328f153	llvm	29d5332b8530fb760c2ca71ad6706858	llvm.org	ab48c0803b67a958624f7600ef86081c	multibuild	d26d81f242cb193d899a72bca423d0bd	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	87f1b83e21a473787b821ef3d0437bf3	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	58ec4e54962bf45d065fb95030701514	python-any-r1	f2f00fb79b5e888b5011d4c51240ae97	python-utils-r1	b9fc5e97e886514e5132f50465185401	toolchain-funcs	441f754fd75cd4fd1fa06fbc17da6144	verify-sig	0748d665fa664a87add00152ed046e16	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=35eb2e463dc673dfcd731d9b9222539f
+_md5_=778119f0d9266383496e4a8d1207741b
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index b0b626fe9ccc..de1b8c9f8fda 100644
--- a/metadata/md5-cache/virtual/Manifest.gz
+++ b/metadata/md5-cache/virtual/Manifest.gz
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.149 b/metadata/md5-cache/virtual/dist-kernel-5.10.149
deleted file mode 100644
index c6762da53cdc..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.149
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.149 ~sys-kernel/gentoo-kernel-bin-5.10.149 ~sys-kernel/vanilla-kernel-5.10.149 )
-SLOT=0/5.10.149
-_md5_=8e04478c89d67837ed02a4ebab2037e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.10.148 b/metadata/md5-cache/virtual/dist-kernel-5.10.150
index afc8f9085274..16c63f1787eb 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.148
+++ b/metadata/md5-cache/virtual/dist-kernel-5.10.150
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
 KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.148 ~sys-kernel/gentoo-kernel-bin-5.10.148 ~sys-kernel/vanilla-kernel-5.10.148 )
-SLOT=0/5.10.148
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.10.150 ~sys-kernel/gentoo-kernel-bin-5.10.150 ~sys-kernel/vanilla-kernel-5.10.150 )
+SLOT=0/5.10.150
 _md5_=8e04478c89d67837ed02a4ebab2037e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.74 b/metadata/md5-cache/virtual/dist-kernel-5.15.75
index ebfaed31af6e..bb2dc4bdbfc5 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.15.74
+++ b/metadata/md5-cache/virtual/dist-kernel-5.15.75
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
 KEYWORDS=amd64 ~arm arm64 ~hppa ~ppc ppc64 x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.74 ~sys-kernel/gentoo-kernel-bin-5.15.74 ~sys-kernel/vanilla-kernel-5.15.74 )
-SLOT=0/5.15.74
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.15.75 ~sys-kernel/gentoo-kernel-bin-5.15.75 ~sys-kernel/vanilla-kernel-5.15.75 )
+SLOT=0/5.15.75
 _md5_=8e04478c89d67837ed02a4ebab2037e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.19.16 b/metadata/md5-cache/virtual/dist-kernel-5.19.16
deleted file mode 100644
index 2920985e9673..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.19.16
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.19.16 ~sys-kernel/gentoo-kernel-bin-5.19.16 ~sys-kernel/vanilla-kernel-5.19.16 )
-SLOT=0/5.19.16
-_md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.219 b/metadata/md5-cache/virtual/dist-kernel-5.4.219
deleted file mode 100644
index 2e6520e7be0d..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.219
+++ /dev/null
@@ -1,7 +0,0 @@
-DEFINED_PHASES=-
-DESCRIPTION=Virtual to depend on any Distribution Kernel
-EAPI=7
-KEYWORDS=amd64 arm64 ~ppc ppc64 x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.219 ~sys-kernel/gentoo-kernel-bin-5.4.219 ~sys-kernel/vanilla-kernel-5.4.219 )
-SLOT=0/5.4.219
-_md5_=2efd2e23ef65c3ee0fb3f77c654bb35e
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.4.218 b/metadata/md5-cache/virtual/dist-kernel-5.4.220
index 1829f54d9359..d44344f079e4 100644
--- a/metadata/md5-cache/virtual/dist-kernel-5.4.218
+++ b/metadata/md5-cache/virtual/dist-kernel-5.4.220
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
 KEYWORDS=amd64 arm64 ~ppc ppc64 x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.218 ~sys-kernel/gentoo-kernel-bin-5.4.218 ~sys-kernel/vanilla-kernel-5.4.218 )
-SLOT=0/5.4.218
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-5.4.220 ~sys-kernel/gentoo-kernel-bin-5.4.220 ~sys-kernel/vanilla-kernel-5.4.220 )
+SLOT=0/5.4.220
 _md5_=2efd2e23ef65c3ee0fb3f77c654bb35e
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.0.3 b/metadata/md5-cache/virtual/dist-kernel-6.0.5
index 3a4cd3682ac7..c98fa99d8e7b 100644
--- a/metadata/md5-cache/virtual/dist-kernel-6.0.3
+++ b/metadata/md5-cache/virtual/dist-kernel-6.0.5
@@ -2,6 +2,6 @@ DEFINED_PHASES=-
 DESCRIPTION=Virtual to depend on any Distribution Kernel
 EAPI=7
 KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.0.3 ~sys-kernel/gentoo-kernel-bin-6.0.3 ~sys-kernel/vanilla-kernel-6.0.3 )
-SLOT=0/6.0.3
+RDEPEND=|| ( ~sys-kernel/gentoo-kernel-6.0.5 ~sys-kernel/gentoo-kernel-bin-6.0.5 ~sys-kernel/vanilla-kernel-6.0.5 )
+SLOT=0/6.0.5
 _md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index da2a5a352c52..795c501b26fb 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-10-26T14:09:48Z
+TIMESTAMP 2022-10-26T20:09:53Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNZP6xfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmNZlBFfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDYsBAAprJElR2+7Kk6sCG054S+5wBu/he9R5D5+LTs5nRINJ+vImKRzQpr4PY0
-i7GWRcBLDVWPnFIO+kXB0mAQvxS630KBZg2rmncvnBfpiraB2A5wPMbkdFukNLU+
-zlNM1o7G0/waVhpJrpcAQVwo4YBEilW9j2DhBJmRU/q6mHhToS6kUZCPrQWXlw2m
-yaqOhv5kj7fOxj+qKQ9hKbIMbUT5JspQofCAB2ILSUBXTWhgusOzuTTx6WxXVI4C
-5Lo+Yptjh7Ske6JdTpp3scQDgodkqKbkZoqbZeZP8n6jUk4encXH0Z7wGVsZ19Au
-dM4DvvqrTA4VfxviR8owtQBWsW9V5pWs+EGDCfw/AlIoMHr2SreMIqkhw7+nattO
-T/XCOIVevW5Z/ycD49ocYtKs1OkWIuOWujTAgy7jfZCUORY++zeL+7yU1IYmzJyW
-sCk0u6JLShoTD1z9qvPPxRzxyqDqJox34IB2KEHbGN7vUjCLIdjPd5JFsgvIF8kV
-ztoiZ5NOfvyvLldXhmC00pfi5v4Ij6d5yvYbIDFbhKfnbpo721IrJRXyBMBD3GZB
-ZKd9Z/7sh+rx6I4jxBFCfe42WHfEFkCvRdN6lhGZwniRWvx605LNt1aqCYp1XsqX
-Hhr1iQVHlZbasgcKi1qKx6HuTc1DF+ll+NZTdEeYdqpzVJxlAxI=
-=fJGa
+klAZ4BAAgjIRfh2ysDlx/7Z0xccz3iFIsEH9AnouZoCtGjP9/ljU0pgySzc2iU/s
+2RXEk+aXmvQMNDMYszlG3Dfje93hA2kVY0mLb2TWjBBtVS9jEVxVjaiohQijOyjc
+y9uJp2sgbRAnOC+mlztu0w6TM3N1gAWLNn4dRT2TTrP+JeCS8Y8H96+JPyAW9rMp
+n4b+3q2LpG/fiinAtwOIBcGmJukJs+Olev4vboA0YjTmxi11dbLWLkfr1h4v3Ke8
+rLjzis1q5eqwHttooiEoCpwqxBVax8uRX/JunvpgeDBAVhrzvVr606BfBFEbD9WU
+AU3bpB6fbMm4/Op9FXaAqO7UL7YxGZbe5rP3UG6b6ew5Wvnc7/b6i6uiIX4Hu/ms
+8r/AxtulCuPa2lozpBy0J/JwfZIHun1A+uQiinUoBNpurrolS6UTzU8Stfq+N7MT
+9/qG6jLuHsNlrknDEBai92+eCNWdObUoLlYit8FeBICo5HCgaEvzDXyzMY3rJqaK
+dgpRZ1/GmVtxKO758+SZJvwnNpse4C76ERhMl48NrDUivVtJn6E9dRiCSO8Qu7GT
++UFTNBauOqxag/YVWJzMYWHE4hp3F5zD/cNpxVS6oHd8VZ7D0zJ78Xv8955Zgxa2
+43zQEoQEtVVr/qaB7KX84Qsjnb9P30c+EsWWsArgbl9V1F5tuj0=
+=7RBO
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index d49f3c0a1484..9125020269d4 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Wed, 26 Oct 2022 14:09:45 +0000
+Wed, 26 Oct 2022 20:09:50 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 55b5cd8a94ec..7d91f503fb8d 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Wed Oct 26 02:09:45 PM UTC 2022
+Wed Oct 26 08:09:50 PM UTC 2022
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 6bdf07610226..bf5b5d02395d 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Wed, 26 Oct 2022 14:15:02 +0000
+Wed, 26 Oct 2022 20:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 814264b843cb..4b4863e05b40 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-f7964f7335bfdc4d38645d6212da80035b3ce7d5 1666792248 2022-10-26T13:50:48+00:00
+a8b0c15178065b78b2b1592eeb67b85b7cc986d6 1666813954 2022-10-26T19:52:34+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index f4c20d1d7fad..e11f51d8e15e 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1666793401 Wed 26 Oct 2022 02:10:01 PM UTC
+1666815001 Wed 26 Oct 2022 08:10:01 PM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index d49f3c0a1484..9125020269d4 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Wed, 26 Oct 2022 14:09:45 +0000
+Wed, 26 Oct 2022 20:09:50 +0000
diff --git a/net-analyzer/Manifest.gz b/net-analyzer/Manifest.gz
index 1a6ecbcce007..124a35bebfdf 100644
--- a/net-analyzer/Manifest.gz
+++ b/net-analyzer/Manifest.gz
diff --git a/net-analyzer/net-snmp/Manifest b/net-analyzer/net-snmp/Manifest
index d0849453e81e..ecc5c33977e9 100644
--- a/net-analyzer/net-snmp/Manifest
+++ b/net-analyzer/net-snmp/Manifest
@@ -1,5 +1,4 @@
 AUX net-snmp-5.1.2-snmpconf-selinux.patch 189 BLAKE2B ca3ac3cc5786226ca5ed73997df2b9ec5c75405f098ed8eb29a52f5187399a1a6fd357613ca10c8dad3a4a5c8f03e25771e785ec9673ae0d3da3970827b90afc SHA512 5859742fa90c297af17b1b1a4718af8d03edbb3a78f723c2cbde54576c68a5f562ed573cc0f8cfdd0bdee9d5accb769e6183dbd16d5e5aa66f0d43f174658f75
-AUX net-snmp-5.7.3-include-limits.patch 578 BLAKE2B ae19f67f0e06a5010d8399e51f716cf7f2148ed9ed0737c00f195892346c2ec56985e2de9a12dbc111c98a012f591e69f6bac3d74ff8d83e36c56a9d0a21036e SHA512 47c27ac62c97a0b3ecfcfe05adeedd55436cc9cfc094a71f00df06cb5dece5f297c40fc255ad73e72a0c468a3c5f62afc98b79c0adc7d31a67813f25f1ec9415
 AUX net-snmp-5.8-do-not-conflate-LDFLAGS-and-LIBS.patch 1257 BLAKE2B 2cdb98653d617e7c00a0ec2810d529e1b3e80668fdbbe771dd14a2dee3cf39dac069981bb2b8f8b9ae9fdaaef943a75662fc42cc8dd15000cdbf56ad6be6dc6c SHA512 3b5b48c1c1cad6953fe4687cca9a54161b6686bd887aa068f1ce61219d4772c839459eeecde8fde0863a75e65a9cfc0a8ec1a607e7e7aa47e2cfa19ef0dbcfab
 AUX net-snmp-5.8-pcap.patch 1030 BLAKE2B e082b3a9e889ee2f9abd3229ba09a7ac35ca61b5ef65b5fd3460b89ace7753d6bef55560b5c066705bbb1965625e9739f6ebfb78c3e5b5edee2607e3df0728ac SHA512 af60ee67f1407f846f2590008a7ee1d24777f1004547d6281d7bf21d79020e5ceb4b2d0502f08c7d9e25f0fd10b8c5a8e6309963f30f2e43167d1590194ce32e
 AUX net-snmp-5.8.1-mysqlclient.patch 785 BLAKE2B 932b635c9a86f5637be849713f18636c0fa01730141bcb6ec71c540053e0d5a50e7e3fd410b730e78b0bb3f8b1a856dcb7dc24eaece972fe00afa5f43ff3711f SHA512 40a61a4bebfd289f3474da483177c0031096aced23bbf69e1bf7b5d7b383710b1df05b074baf1ccb87035b4cdde3b8b70773455e457ad53f347781d7c5368a8a
diff --git a/net-analyzer/net-snmp/files/net-snmp-5.7.3-include-limits.patch b/net-analyzer/net-snmp/files/net-snmp-5.7.3-include-limits.patch
deleted file mode 100644
index 04eafbbe9c5d..000000000000
--- a/net-analyzer/net-snmp/files/net-snmp-5.7.3-include-limits.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-POSIX requires <limits.h> for PATH_MAX and NAME_MAX
-
-Author: Anthony G. Basile <blueness@gentoo.org>
-
-diff -Naur net-snmp-5.7.3.orig/agent/mibgroup/util_funcs/get_pid_from_inode.c net-snmp-5.7.3/agent/mibgroup/util_funcs/get_pid_from_inode.c
---- net-snmp-5.7.3.orig/agent/mibgroup/util_funcs/get_pid_from_inode.c	2014-12-08 15:23:22.000000000 -0500
-+++ net-snmp-5.7.3/agent/mibgroup/util_funcs/get_pid_from_inode.c	2018-02-21 15:34:06.237028136 -0500
-@@ -6,6 +6,7 @@
- 
- #include <ctype.h>
- #include <stdio.h>
-+#include <limits.h>
- #if HAVE_STDLIB_H
- #include <stdlib.h>
- #endif
diff --git a/net-mail/Manifest.gz b/net-mail/Manifest.gz
index ed944ffb6437..2be9abefc090 100644
--- a/net-mail/Manifest.gz
+++ b/net-mail/Manifest.gz
diff --git a/net-mail/mu/Manifest b/net-mail/mu/Manifest
index 633334b4a0ee..06dd85b03f18 100644
--- a/net-mail/mu/Manifest
+++ b/net-mail/mu/Manifest
@@ -1,10 +1,6 @@
 AUX 70mu-gentoo-autoload.el 68 BLAKE2B 518f6544d9b36a845e58fca8c4c9dc02c6855f48576508d47718afb1b08b4f83ce87f257e68756690f4ac70ed9770b7064f2613dc3c4077bbcf9b826512644d0 SHA512 ae50746ba93e3ac81a11d3c8746b72182fcdadc3e29966d65233debd8e6b8aa56f76f5e6a70fc68f7761e4dd55045d2b32e3765cedcced4813de3682187beeea
 DIST mu-1.8.10.tar.xz 541408 BLAKE2B e1533d5fb83df2913a6041526adc1efa15d7eca2933f21765d1b9f405d69043932dfc9a9a65eca81bb898bb7bb9d0213fca7025dfc4e8dd729fe46daccb9a5b8 SHA512 56e4d51b40b406b53857b883b60eda2499b6c07fa3bad7c2bfdfab472f1fe60aa33eeb2b24fdeef1cc2655c8a0e9d799e81dad96fba3d7152e66e80a1d7f0bce
-DIST mu-1.8.7.tar.xz 539664 BLAKE2B 2f0081f350c0d6da4b7920c0380a02aab42eda12062011bd03a46ceb925c179089b794b501df53b4fc84daa38e6e977a3510801685aa7c91c1c0be58c9c78929 SHA512 04c2027acec80c7569f055c8324f947862721aa36b093dba07ac80b9051229a51225e5371af7cd48fae71c9d5148bd3dc2081f591b9f733bccb5650b4853df67
-DIST mu-1.8.8.tar.xz 540092 BLAKE2B 3cd3d5f41aaf145dee66fc6d5e71256a650b16d0ee99da253d7ffc87df2e36b5fef6d19dd8831002d040c5d6ed13a53e9df69d18d7c002a05a64fb22fe32f5f5 SHA512 deb48ef7d12d76575f14e5313e9c94a40a04dc916943fa45d4281aa637b6549cbcee3cc0879b9daab51e0409cdfdc619acae12bf2ff3edaeb84fb77c3bee8982
-DIST mu-1.8.9.tar.xz 541308 BLAKE2B 418458f5e04d15cce9aa0ea650e06377c5eb2a3f08e47610ce8ac63b68f5e7914b3d70ec4e07c5b89399aaad8a6e340dd6943980e6de94b02ff299358d99d07f SHA512 534bf2c0889d436601638afa7f214492b927f1a3aa4f36509ac607132dcc17f2181e7b1d2113fdf00989bf5eb71cf7ad9b19411393fe1edbb8de162b7f7636bf
+DIST mu-1.8.11.tar.xz 543168 BLAKE2B 196007390b909057e27f9f864709c8dc9b20d6baa575938531a8d6aacb5d3244e55d50473771cb6e41a019b4d5013d9a51c6640d6274b53fad2e19dcafb5066d SHA512 24abc3499d3e6c9e55f7bf75d8c8fae68be5976b28edf3fa8c6e04e55acf8ad2356bdbc820fcd8cae327ed930f3f2164c4cd92108aafde6af1addac8f8411fe2
 EBUILD mu-1.8.10.ebuild 2106 BLAKE2B 7da6a51b1de0124d20aede38a1826eb75a91e92518518393cc0cfa8320f3c26f4a0f5fbe2e8e229eea38f58eb11b6dd09733965043bfd0bed3fee38ad250efbe SHA512 21f779ba0ca3b2f48724fc27c60cc243a501fb0d36a189246750f4d6c9913f7062fbabd8f206019d20417f0bd2913ba0789582a216f8db257bc304b3458806c0
-EBUILD mu-1.8.7.ebuild 2106 BLAKE2B 7da6a51b1de0124d20aede38a1826eb75a91e92518518393cc0cfa8320f3c26f4a0f5fbe2e8e229eea38f58eb11b6dd09733965043bfd0bed3fee38ad250efbe SHA512 21f779ba0ca3b2f48724fc27c60cc243a501fb0d36a189246750f4d6c9913f7062fbabd8f206019d20417f0bd2913ba0789582a216f8db257bc304b3458806c0
-EBUILD mu-1.8.8.ebuild 2110 BLAKE2B 2b8f8b9b743c791c4f478d9b845898424f124b1db1cbab5fa8a1f06c5084882772d7df0037aefca9a0c96e0ad85ca5a9b8aa1736a6d35b2b3fb8def46fdd8ef1 SHA512 b23ab25334362138678db0133ee7251159513f2753dcb22f119f074e63ef2d7060d4ed2f5cbf0ed04555b78327c9af30dd6458fd6e9d65ab4c5e7ab362b78e17
-EBUILD mu-1.8.9.ebuild 2110 BLAKE2B 2b8f8b9b743c791c4f478d9b845898424f124b1db1cbab5fa8a1f06c5084882772d7df0037aefca9a0c96e0ad85ca5a9b8aa1736a6d35b2b3fb8def46fdd8ef1 SHA512 b23ab25334362138678db0133ee7251159513f2753dcb22f119f074e63ef2d7060d4ed2f5cbf0ed04555b78327c9af30dd6458fd6e9d65ab4c5e7ab362b78e17
+EBUILD mu-1.8.11.ebuild 2110 BLAKE2B 2b8f8b9b743c791c4f478d9b845898424f124b1db1cbab5fa8a1f06c5084882772d7df0037aefca9a0c96e0ad85ca5a9b8aa1736a6d35b2b3fb8def46fdd8ef1 SHA512 b23ab25334362138678db0133ee7251159513f2753dcb22f119f074e63ef2d7060d4ed2f5cbf0ed04555b78327c9af30dd6458fd6e9d65ab4c5e7ab362b78e17
 MISC metadata.xml 893 BLAKE2B 4d21c0794fc184957939ebaab628b9a1abe0bbdb63915157e266ce0a773fe3acc52722d010d3b4e096f86257e945c0f9dd51cd0dbe54c37f717408ffe942bc06 SHA512 7f499e039820d12c9acd0affe2a402fc53ee6367684a3c2ba25669987f02b0fabb3db0de978e197876bd9e3af315734af398ba7c8305119c511d59c709b6e225
diff --git a/net-mail/mu/mu-1.8.8.ebuild b/net-mail/mu/mu-1.8.11.ebuild
index 2e8ad733ced5..2e8ad733ced5 100644
--- a/net-mail/mu/mu-1.8.8.ebuild
+++ b/net-mail/mu/mu-1.8.11.ebuild
diff --git a/net-mail/mu/mu-1.8.7.ebuild b/net-mail/mu/mu-1.8.7.ebuild
deleted file mode 100644
index 62b981bf5db6..000000000000
--- a/net-mail/mu/mu-1.8.7.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common meson
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="amd64 arm arm64 ~riscv x86 ~x64-macos"
-IUSE="emacs readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/texinfo
-	virtual/pkgconfig
-"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
-	default
-
-	# Don't install NEWS.org into /usr/share/doc.
-	sed -i '/NEWS.org/,+1 d' meson.build || die
-	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
-
-	# Don't compress the info file.
-	sed -i '/gzip/d' build-aux/meson-install-info.sh || die
-
-	# Instead, put it in /usr/share/doc/${PF}.
-	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature readline)
-		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
-		# NOTE: Guile interface is deprecated to be removed shortly.
-		-Dguile=disabled
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Since meson no longer installs NEWS.org, install it with dodoc.
-	# Also, it must be uncompressed so that it can be viewed with
-	# mu4e-info.
-	docompress -x /usr/share/doc/${PF}/NEWS.org
-	dodoc NEWS.org
-
-	# Same as above.
-	docompress -x /usr/share/doc/${PF}/mu4e-about.org
-	dodoc mu4e/mu4e-about.org
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-mail/mu/mu-1.8.9.ebuild b/net-mail/mu/mu-1.8.9.ebuild
deleted file mode 100644
index 2e8ad733ced5..000000000000
--- a/net-mail/mu/mu-1.8.9.ebuild
+++ /dev/null
@@ -1,88 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit elisp-common meson
-
-DESCRIPTION="Set of tools to deal with Maildirs, in particular, searching and indexing"
-HOMEPAGE="https://www.djcbsoftware.nl/code/mu/ https://github.com/djcb/mu"
-SRC_URI="https://github.com/djcb/mu/releases/download/v${PV}/${P}.tar.xz"
-
-LICENSE="GPL-3+"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv ~x86 ~x64-macos"
-IUSE="emacs readline"
-
-DEPEND="
-	dev-libs/glib:2
-	dev-libs/gmime:3.0
-	>=dev-libs/xapian-1.4:=
-	emacs? ( >=app-editors/emacs-25.3:* )
-	readline? ( sys-libs/readline:= )"
-RDEPEND="${DEPEND}"
-BDEPEND="
-	sys-apps/texinfo
-	virtual/pkgconfig
-"
-
-SITEFILE="70mu-gentoo-autoload.el"
-
-src_prepare() {
-	default
-
-	# Don't install NEWS.org into /usr/share/doc.
-	sed -i '/NEWS.org/,+1 d' meson.build || die
-	sed -i '/mu4e-about.org/d' mu4e/meson.build || die
-
-	# Don't compress the info file.
-	sed -i '/gzip/d' build-aux/meson-install-info.sh || die
-
-	# Instead, put it in /usr/share/doc/${PF}.
-	sed -i "/MU_DOC_DIR/s/mu/${PF}/" mu4e/meson.build || die
-}
-
-src_configure() {
-	local emesonargs=(
-		$(meson_feature readline)
-		-Demacs="$(usex emacs "${EMACS}" emacs-not-enabled)"
-		# NOTE: Guile interface is deprecated to be removed shortly.
-		-Dguile=disabled
-	)
-	meson_src_configure
-}
-
-src_install() {
-	meson_src_install
-
-	# Since meson no longer installs NEWS.org, install it with dodoc.
-	# Also, it must be uncompressed so that it can be viewed with
-	# mu4e-info.
-	docompress -x /usr/share/doc/${PF}/NEWS.org
-	dodoc NEWS.org
-
-	# Same as above.
-	docompress -x /usr/share/doc/${PF}/mu4e-about.org
-	dodoc mu4e/mu4e-about.org
-}
-
-pkg_preinst() {
-	if [[ -n ${REPLACING_VERSIONS} ]]; then
-		elog "After upgrading from an old major version, you should"
-		elog "rebuild your mail index."
-	fi
-}
-
-pkg_postinst() {
-	if use emacs; then
-		einfo "To use mu4e you need to configure it in your .emacs file"
-		einfo "See the manual for more information:"
-		einfo "https://www.djcbsoftware.nl/code/mu/mu4e/"
-
-		elisp-site-regen
-	fi
-}
-
-pkg_postrm() {
-	use emacs && elisp-site-regen
-}
diff --git a/net-print/Manifest.gz b/net-print/Manifest.gz
index df095cdc0587..af3fcb4c30c9 100644
--- a/net-print/Manifest.gz
+++ b/net-print/Manifest.gz
diff --git a/net-print/hplip/Manifest b/net-print/hplip/Manifest
index 146ec96687e1..da5069ca80b1 100644
--- a/net-print/hplip/Manifest
+++ b/net-print/hplip/Manifest
@@ -3,5 +3,5 @@ DIST hplip-3.22.4.tar.gz 27479009 BLAKE2B 6446cecad6a9dea4685874da4879b604ad5c68
 DIST hplip-3.22.6-patches-1.tar.xz 17948 BLAKE2B ab6f0482dfebba2a1974cf6adb8037846a7e8990f15a74641af4db73d363b02d7c37baf958a8a9e83eebfc8bcccd058959c3cee448a832b26fd8a2097614c4fd SHA512 a6e3921d15ab75386f71a5e4a1aab48a014279cffd5141b152a7c1e985c7685892fd555eeb5578ab5f266ce8763c98d30d4630c3ec69ba1209a9856d6d5b0ead
 DIST hplip-3.22.6.tar.gz 29331408 BLAKE2B 7f2bc09ab2d7950d8e84b4c23d35fd5370ddc51d1d61c674fad0ce1667f8ecf9c25e0b57c155b688d932db583d3c6af528da86348ebe64ce8da9c8d051b2be34 SHA512 cb25c07c767d3d8921468429ef154401a4df9d2fdf87ead3ab18f0d06e1bd3de610843b8131641a1af8d920c7e15e290a0923405bf609cdc0a3fba9df93ddb5e
 EBUILD hplip-3.22.4.ebuild 8240 BLAKE2B 7ff6b29ac60acfe257e6574a7e63845562d16e6ae3c0a31ab2537a3bbb0886f5a043c195a27c5aec56f92bc8b6d449fc99d38a4bb7e06b2fd16f9ea201ba68f5 SHA512 fcbb6b9c6d6b3ee4b3fe6e45a954615831547594c14ddefd11de70198e1a4546a119ea2f34ddbc6838f3640f1cc2ebe5ee49d706b1c14a8ca9294eda69ea8223
-EBUILD hplip-3.22.6.ebuild 8246 BLAKE2B 9c1c3bab6c75e3d941a258d37b05681a2a88929bc5efb62255f70710005a5e4655a3d809e0f87a12b9d1d2dadc51ebf8709f784b9679a1126a37781305c47090 SHA512 242b6c9e3eb9565750a06f79d89742137cd41c4c77904f606fe57cd08d9d236a58b8cb1ac2e9169847e68ea0d6c88b7cbaf28a77ef38c609ac58e7a833cffe9f
+EBUILD hplip-3.22.6.ebuild 8242 BLAKE2B a991816da758d8f335f41f47899400a4fcf5cbd983defaaa19447487ed2744b91b9d9e1755d875503cbfa0e63b6da6353d9723014d51ee46ae3d0a5a33547af9 SHA512 1b5f9a8734d3b7741c628dad56a7c7aaa20c98cb0c8e10e964e2e1883e67db989fbcf225df99239144b556edeb1e44f5797b78da3134807e69fb60a516db21f3
 MISC metadata.xml 1849 BLAKE2B 381cc0d0fe08d072487850a5f5ac6e264cb4ee5db8722b6f83ad9d4e6e78948a7768e80ea2a8a2313bdca1029b59a02d8c3ca309d9438d5e4d63585f7a6b2a83 SHA512 0f5f42b561099e943d99dc5e50cfd42577582b31590c0cd98f276e5acc364fb31f4a48cf91b33e923d24daa77b7b3a6bc54a0c24d9ebff9e3ec82c957a5671e3
diff --git a/net-print/hplip/hplip-3.22.6.ebuild b/net-print/hplip/hplip-3.22.6.ebuild
index 6728248a54a0..66cabdfb3830 100644
--- a/net-print/hplip/hplip-3.22.6.ebuild
+++ b/net-print/hplip/hplip-3.22.6.ebuild
@@ -15,7 +15,7 @@ SRC_URI="mirror://sourceforge/hplip/${P}.tar.gz
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
+KEYWORDS="~amd64 arm arm64 ppc ppc64 ~x86"
 
 IUSE="doc fax +hpcups hpijs kde libnotify libusb0 minimal parport policykit qt5 scanner +snmp static-ppds X"
 
diff --git a/net-wireless/Manifest.gz b/net-wireless/Manifest.gz
index 196d3e346be5..583a35bdd937 100644
--- a/net-wireless/Manifest.gz
+++ b/net-wireless/Manifest.gz
diff --git a/net-wireless/unifi/Manifest b/net-wireless/unifi/Manifest
index f8d7d5a3ca9c..6208dc808c43 100644
--- a/net-wireless/unifi/Manifest
+++ b/net-wireless/unifi/Manifest
@@ -7,7 +7,9 @@ AUX unifi.service-r2 233 BLAKE2B 95d87f040be667c5d5817bc9b6eabfa3d2ef454cfcdd60b
 DIST unifi-6.5.55.zip 157805689 BLAKE2B 09a7b69143478d0b81dd6f7be1746b1a35cd00ee034471c512d04e4f91aa02688871857edf3c0ef538e601aaf8eccdd0c55193a9bde10924ddeff1fd333da355 SHA512 c2f677de819268366d65622238c1b8d6d8abcd5e06d6f1f635d9755573eff5a6aca0c84298a111b0da5e80bade8132e05339035edde3cc5fc08834f2d6c4b26e
 DIST unifi-7.1.68.zip 202099045 BLAKE2B f84a579c01ec0494e0e8b67a126947cd7bb0625c60d5f5026232e563ee84a4c0fdef827e5f8044de4e5d7fd970a50846dc91d7467196fc2f53bb27655bbb5212 SHA512 b4e71dd28bb645d7fb085546fc29019aa6f33780e559ed284216b7f330eaf5f41f5177e839a5a277d4d41a2242ffe16a44b582c51e74e469bacf96502d187a55
 DIST unifi-7.2.94.zip 171734421 BLAKE2B ab692e5c4c07365c40d3e10e52f9fcb06a5919e9da0d13db7d67def6d4a92c6372b8b6a8924a40305b0f894836ed0db1a7f71f65253e8ed538e29eaa00d11e90 SHA512 913c5b3a8d88faae18ae197b95e15d22611281ee296bc33f240d90e77b90db1a8f3d59b4dfb537a498d600d69dd53d09e6c604ef11e490873041c5010fda07d2
+DIST unifi-7.2.95.zip 171756458 BLAKE2B f453beb8c7e7a7f9791c2c471d83d06a29345a7595bfff412a7c059294adbd507d598b22242488af5519b2abf5c52884fc3e93bb1d3f96872a1f651aa3a175e2 SHA512 cda5c0d8fd3a43735de7b1c34cb908411ee4569cfa8313575e47efa1339ef03a6a232d02d5b14552e6380eb69a05fec08b33467202cdd7f399249f5a21260934
 EBUILD unifi-6.5.55-r2.ebuild 2471 BLAKE2B 85ea582f14c30db8c8fa3f02057f8ed8c506338860b1c549ce7e2192423c4be8a087c19cdec05079731b8bfa045c63edc094e740b5ad7b0fe987635319aac7b5 SHA512 395d780fa97045cadebc193ef391576c5def6f06413940857902e792b5a39dceb93f7ee8a8b2d8162df395c132bdb89490460d2fa69191f6b87cf9282b6e7f7b
 EBUILD unifi-7.1.68.ebuild 2769 BLAKE2B d5ec76f424bf98feea111f913d1f894b0a241c89cc38dd44ed4af1420ad222969f687dc83d2e736b8348a31f5dd3e9c3ced815b1aac3ba04dab52450e1dfce97 SHA512 460c447df2c68275e5dbd965bcc594401a4ce91c0ef322155e801eaac54838116a2bb73647ffa32552613817b36a642a6a721b90e37b8a27e5156e07d5d55054
 EBUILD unifi-7.2.94.ebuild 2769 BLAKE2B 0af3a4174bc24e80386a6465f485720df30131bb16addf9b2673a354e523bf016591cb1f2fb19bc43326307903c0b8a9408c46e0496ecbf1c87797bf2c6b9340 SHA512 c52e0958cef38dd05f1a9c884e0aa01119e3f89a8447fa36e57fde3d749d2e110ca6781fbfa8fefd52dcb585f841aca19bd97d7643c4726e1f07de98341077ad
+EBUILD unifi-7.2.95.ebuild 2770 BLAKE2B 01906e6b0136751641ec149fe2bbcd468a75ae1c1a31cb0142b12627a64e0c039241de890cb454db78eb4ef842713c577431a21255568b8fd37c36e718775312 SHA512 f2498f0010d13771ac0a69454032c0e6809f43860240f2e4fe4dd7169ed48562e1a1a49f4744378c5f09e3d825badfb7f30d7304fa3d27f012bff0b0e317dc1d
 MISC metadata.xml 706 BLAKE2B c089f7ad4712f8ad5ef71f8127686dd13a7d3ead5f31dff6c939b100c18920680d648c4d27af479dc14624b5365fc038998f478ae82222fc2f2d073bbb7b58cb SHA512 8866e9107a41456a238b21316a1b174167b4343a55bcca2964b05e44fcc2d157df113a7867496726fcdc0eabf3e244e14567e03b53e3e1df2b11a2d932fa761c
diff --git a/net-wireless/unifi/unifi-7.2.95.ebuild b/net-wireless/unifi/unifi-7.2.95.ebuild
new file mode 100644
index 000000000000..5868a17927b3
--- /dev/null
+++ b/net-wireless/unifi/unifi-7.2.95.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+# Set this var for any releases except stable
+RC_SUFFIX="-e5951ac73c"
+
+inherit java-pkg-2 readme.gentoo-r1 systemd
+
+DESCRIPTION="A Management Controller for Ubiquiti Networks UniFi APs"
+HOMEPAGE="https://www.ubnt.com"
+SRC_URI="https://dl.ui.com/unifi/${PV}${RC_SUFFIX}/UniFi.unix.zip -> ${P}.zip"
+S="${WORKDIR}/UniFi"
+
+KEYWORDS="-* ~amd64 ~arm64"
+LICENSE="Apache-1.0 Apache-2.0 BSD-1 BSD-2 BSD CDDL EPL-1.0 GPL-2 LGPL-2.1 LGPL-3 MIT ubiquiti"
+SLOT="0/$(ver_cut 1-2)"
+IUSE="systemd system-mongodb"
+RESTRICT="bindist mirror"
+
+RDEPEND="
+	acct-group/unifi
+	acct-user/unifi
+	dev-db/mongodb
+	virtual/jre:1.8
+"
+
+BDEPEND="app-arch/unzip"
+
+DOCS=( "readme.txt" )
+
+QA_PREBUILT="usr/lib/unifi/lib/native/Linux/x86_64/*.so"
+
+src_prepare() {
+	# Remove unneeded files Mac and Windows
+	rm -r lib/native/{Mac,Windows} || die
+
+	if [[ ${CHOST} != aarch64* ]]; then
+		rm -r lib/native/Linux/aarch64 || die "Failed in removing aarch64 native libraries"
+	fi
+	if [[ ${CHOST} != armv7* ]]; then
+		rm -r lib/native/Linux/armv7 || die "Failed in removing armv7 native libraries"
+	fi
+	if [[ ${CHOST} != x86_64* ]]; then
+		rm -r lib/native/Linux/x86_64 || die "Failed in removing x86_64 native libraries"
+	fi
+
+	if [[ ${CHOST} == aarch64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/aarch64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == armv7* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/armv7/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+	if [[ ${CHOST} == x86_64* ]]; then
+		if ! use systemd; then
+			rm lib/native/Linux/x86_64/libubnt_sdnotify_jni.so || die
+		fi
+	fi
+
+	default
+}
+
+src_compile() {
+	:;
+}
+
+src_install() {
+	insinto /usr/lib/unifi
+	doins -r dl lib webapps
+	! use system-mongodb && doins -r bin
+
+	diropts -o unifi -g unifi
+	keepdir /var/lib/unifi/{conf,data,run,tmp,work} /var/log/unifi
+
+	for symlink in conf data run tmp work; do
+		dosym ../../../var/lib/unifi/${symlink} /usr/lib/unifi/${symlink}
+	done
+	dosym ../../../var/log/unifi /usr/lib/unifi/logs
+
+	java-pkg_regjar "${D}"/usr/lib/unifi/lib/*.jar
+	java-pkg_dolauncher unifi --java_args '-Dorg.xerial.snappy.tempdir=/usr/lib/unifi/tmp -Djava.library.path=' --jar ace.jar --pwd '/usr/lib/unifi'
+
+	if use system-mongodb; then
+		systemd_newunit "${FILESDIR}"/unifi-mongodb.service unifi.service
+		newinitd "${FILESDIR}"/unifi-mongodb.initd unifi
+	else
+		systemd_newunit "${FILESDIR}"/unifi.service-r2 unifi.service
+		newinitd "${FILESDIR}"/unifi.initd-r2 unifi
+	fi
+
+	newconfd "${FILESDIR}"/unifi.confd unifi
+
+	echo 'CONFIG_PROTECT="/var/lib/unifi"' > "${T}"/99unifi || die
+	doenvd "${T}"/99unifi
+
+	einstalldocs
+	readme.gentoo_create_doc
+}
+
+pkg_postinst() {
+	readme.gentoo_print_elog
+}
diff --git a/sys-auth/AusweisApp2/AusweisApp2-1.24.3.ebuild b/sys-auth/AusweisApp2/AusweisApp2-1.24.3.ebuild
new file mode 100644
index 000000000000..f1b6cc8c799f
--- /dev/null
+++ b/sys-auth/AusweisApp2/AusweisApp2-1.24.3.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake xdg-utils
+
+DESCRIPTION="Official authentication app for German ID cards and residence permits"
+HOMEPAGE="https://www.ausweisapp.bund.de/"
+SRC_URI="https://github.com/Governikus/${PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="EUPL-1.2"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	virtual/pkgconfig"
+
+RDEPEND="
+	dev-libs/openssl:0=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdeclarative:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5
+	dev-qt/qtquickcontrols2:5
+	dev-qt/qtsvg:5
+	dev-qt/qtwebsockets:5[qml]
+	dev-qt/qtwidgets:5
+	net-libs/http-parser:0=
+	sys-apps/pcsc-lite
+	virtual/udev"
+
+DEPEND="${RDEPEND}"
+
+src_configure() {
+	local mycmakeargs=(
+		-DBUILD_SHARED_LIBS=OFF
+		-DQt=Qt5
+	)
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_icon_cache_update
+}
+
+pkg_postrm() {
+	xdg_icon_cache_update
+}
diff --git a/sys-auth/AusweisApp2/Manifest b/sys-auth/AusweisApp2/Manifest
index e9640d1c07e0..c05a4424839e 100644
--- a/sys-auth/AusweisApp2/Manifest
+++ b/sys-auth/AusweisApp2/Manifest
@@ -1,4 +1,6 @@
 DIST AusweisApp2-1.24.2.tar.gz 11478273 BLAKE2B 3afb45bfa82c83f2fda6286c879d20fe3dd3769eb6be74c12297dfd991d976f40c6e9342237f953ae51534c41306daea3de7f8cf7e6b638489037772193e72e4 SHA512 15735cc52947b2cc16794cc508af7c2347d9789222c8506ff0ffbfce1263230892fd81f57d583df7f929ef197c2bbc0728ef31c3c700f2c08ec9dba516bd225b
+DIST AusweisApp2-1.24.3.tar.gz 11482297 BLAKE2B 2bd1351e0406c11b23cbd5ad3e1304e5bc1cde7a54227bb5cdc628f3d3c66aba82a7f1dc44eb9c6b6552926c9e987e0f3bb040155c014dc52c79bbaf961bbe10 SHA512 af963288e255c1dd49bcfafeebf4b5523d585c46fd293a4d3a57d6cd35cffddaa98bff21225aa623506a581596f375d5e9ae446b52bf351e3dae0aa9db81bff8
 EBUILD AusweisApp2-1.24.2.ebuild 944 BLAKE2B f18ed428f8ef252285635c6a2abb5bfde0f811d0f650afda09f239149debe1d10c43126ca86f9c251c581322d84a8e47af2dd2dae01889f1b31c299bd0eb8d48 SHA512 dc938d33d5260ae14bf4252739cf9a72aabd79e37261a9f402a740b6a12b5ee2c60f3dbcdd23ada0189d1c9cbe30a78995e07b5be37a0d5f7a1807858e7b963d
+EBUILD AusweisApp2-1.24.3.ebuild 946 BLAKE2B 8764b90e8d76102b676bd8e2e1d297471aadf01f5c0dc5c1534a678de9f75ab6e1d22a22611a8eec77d8bd2840c80a7969c9e0e1e1bab97da07e02c4f50f6f38 SHA512 fea69b9205cb73115f560ad2e06f67136ace1fc3f50a23b7ec1579a70067253b983233859ac8d61155b38ea84c4918f5f6de9d0f400d1fb585a81a493b14fe2b
 EBUILD AusweisApp2-9999.ebuild 896 BLAKE2B a283585d7f09d304017e9f80f3e081fa96787d702e919aa9f9bcd229078b6d17a9eb3dfeb8782f8011530a6cd8a3ab72be12c88251d4675c1924dea66a77672c SHA512 f361e420657a46e8234517d204548fb69b14bc367be38aa1f85b411bdcd53fdb6dc7a6b3807cf22376f82abc076181965d633b50e4b01a5a7a1032bbf45c0165
 MISC metadata.xml 338 BLAKE2B cc2c3169dbe9280f8ab769c2c2c38a691d0af53999169948243cca1200c2a6ef8bb2f97dcc0e8dcbd709f3660fa262bf5279d3acce525baefe91951f91f1eca7 SHA512 db2026e39095afa71c7431290d8032fb6cdf70138beb14ae5cc20f4c5d03a0fa334cd769c14fe1085520b8631947c35c654bbd686ccc2e60a308d19ef6eb9e83
diff --git a/sys-auth/Manifest.gz b/sys-auth/Manifest.gz
index 6b1660e13dc7..6ec3b9a016e1 100644
--- a/sys-auth/Manifest.gz
+++ b/sys-auth/Manifest.gz
diff --git a/sys-cluster/Manifest.gz b/sys-cluster/Manifest.gz
index 6f1f7d0f1d66..42b3e23590c6 100644
--- a/sys-cluster/Manifest.gz
+++ b/sys-cluster/Manifest.gz
diff --git a/sys-cluster/nomad/Manifest b/sys-cluster/nomad/Manifest
index a29523e3c54b..121efbd3e229 100644
--- a/sys-cluster/nomad/Manifest
+++ b/sys-cluster/nomad/Manifest
@@ -2,7 +2,10 @@ AUX nomad.confd 70 BLAKE2B e7cd65e529d1a8d99212a3267d3dc8d6f6d8b310f7cbda77e31f6
 AUX nomad.initd 534 BLAKE2B 392ba0c199a401c278d47f2fb068831f331485d34eb6d81d7e14df60cbcc62f3ecc01a200e5a8ac00ab734789c07d6bcd73391e67d5141f04365c08935c07d62 SHA512 63920465cc4346e6d79b54afd0c0ad418a06c5f977edf8a49adb8b2895390cc13d48a18fc377de91c92449af5095347c36aecf67eda528da76209e77130f2b98
 AUX nomad.logrotated 83 BLAKE2B 2c970621c10520b2aaa17172d9c99a741737393db9a6424278e12d8b6676492c97b628d4be419ab921f7cf7685bae1a5e93eb04efa2ca6242012cfde203e02da SHA512 0ebdbeab15b01145eb2b33e0c6fd43dde3e4ac8eae9d8aff81797688276530732f613a39cd658fa4f5c2e8c99d70e6255f814ca5f3cd2bc5de259be324ab2851
 AUX nomad.service 726 BLAKE2B 68e67299c15e096e0fca66a9cf87d6d2bd6e0339be8c8489e59c401f84b5aec86e3b55d566e7b6b0598afb17918c9a03a7b7c36851fd8486511955de2f9a12cb SHA512 c8959bfba81b48116ce4a0fc4b0cb439a7f289b27c3d9fc4a08a5c0d3fa7e1652642cb8b459f3ec96bbabf66a12010be190c7484060ebfae39bc8d0e82ecf442
-DIST nomad-1.2.6-vendor.tar.xz 8019208 BLAKE2B f972a84d201328f95e13a68fdc6dc0f0db5aff6d7ff98f5478ef310c6349fb4c0d9e5aa9c638ae81fb9f2776fa4d252c3b1daed091d3b9ae6d86a75d79e2ac0e SHA512 8d53eaa771847d862f14c3fad286fe42b5c4426b242b18d2b900e4807221e6624b8bb129f34c560078d8863ce19b58c6637d2cc806950fffb5140b8d44f44c8f
-DIST nomad-1.2.6.tar.gz 29585632 BLAKE2B 1b9ecbb11ddc59f8078831c6d41b8547a572c3b8475a21d65b8333204bdd2a6ee646cc7c5ec2bdffaee6c1b3cdf2dc30a667464695057e49c2bca41128b61452 SHA512 93a3ed9b0d992ba25cb126496cb9ed250195d8b8011312ebc4cffdf5f9f8786bc43cbe18cefc820597b8a117a05f6118e2e4a88e25e738c1bd309c5504e93ed9
-EBUILD nomad-1.2.6.ebuild 1249 BLAKE2B 1429963add21d0f5fc1464b1529aab6efabbce7d063b2d57d89a8a6ce143d6fc11f55ab5c8dde9f49ab2587ccae5c9a9740b3adccf8873d9bf9f50e56092890d SHA512 093d6efa3ed9e30a8de740921a5f6893ec58af8c9edd560248f06898bc763192ebe647b31791566bbce3528efb17b36df365ba7f210c956260bccb8122e8c2a3
+DIST nomad-1.2.13-deps.tar.xz 333983572 BLAKE2B 089b6de3c72d38ed78ed4b6e643faf636c103f7b63ce669ea1fa07b0c1a8d67d637498d23279b40f53127c9db58d1d4115769b85457e5181a4bf163272d6dd62 SHA512 1b40e3189ea95ac280baff5c604a6a0c01fde79954855694e117af7b54c6448a1343ce09f0eb0a3fdc64121866d6366af96750be5f62ee423962265671d43275
+DIST nomad-1.2.13.tar.gz 21582623 BLAKE2B 88922fa619af1f1ad31326b9729a0d8b0885fbc88dcb1657181ee8e7472f043dd455c847edd7615f84ead2031c91f85c13524e20e6df2b5bf1ffef87919a0dfd SHA512 a4390f37707df4483b93b85b153f26e2e1340736cbb5e8363782467c8b88f9ac5b9967102b8f7478c27ab39bc682486f39fc90a158e04b0a02aa1e12b4e97d23
+DIST nomad-1.4.1-deps.tar.xz 374031840 BLAKE2B 8859181e7e5bbf74367f2e9231c80869b91394d831d367d0dbad77cec1822e399d0436f93f4e66c3079c47687a366dac6fe926b7cd3906f8ce1539b40e860085 SHA512 c422fc115c062482d8ea85f9271c3be9fcdccbd67cc6cc3a2c26f1df77f2686ea90df7e118e82dd9f496af4c8482e11d6eb3130fd69e3e797d684c2d41e4da0c
+DIST nomad-1.4.1.tar.gz 22931445 BLAKE2B b21eed2e85a618738f8ade32b993799d0cf2e3afaf7abfd174ad9cd93b54360bc27089fda4a37eafb1487c36ae93c087208eaa1078fecaf61d8e01fa992983d5 SHA512 80da494a595339242f77182ee47a124b75277a609e845b9e7fa20f0d9f89b1d4044e18f4d44ade7fe9e4feb06d1bdf71ca9d733ec6270af8ae062374a4ee01a2
+EBUILD nomad-1.2.13.ebuild 1139 BLAKE2B ce24b7a4d0177c98d4b054fdd09078d532eb20677f3a6735f72ff4e7b802372c7f452eea4dff548a4806ced54d906870f93e4b567879fa626a3ca115ada48c93 SHA512 58f286cec23a04077cf35bbebfc968e885df1e134ed44ffba5a08243f9a9c7d5406d47526a4d68d4a3705d5ea394c2fc074132c751cd4093ac1f510e328d357e
+EBUILD nomad-1.4.1.ebuild 1139 BLAKE2B 56d0ae07ee62cb98e7cd8c03149f8f04df8a27955c08f29a4f806dc7678273c3b3fc2ad493e5516f9d893c3c1f05b21fd47500aa321bfe7925d80eef8d7a1f92 SHA512 e52275d20637bdbced3dad0b42c92a56c145a29f54ff34976877da762f0d6eb72a43043861516558b0ec409aeea685af170adaee3bcae62d8aa4f067d22e7f71
 MISC metadata.xml 325 BLAKE2B 00faa3d3eaaa071810bfe35c43e2a956c304098234e54a27ffd6630f4696323c29fdd9dfce086fb40d9432bd1ffabfebaa470da67566ddd8bdf5ec700a0a548d SHA512 dbbb8f548227eb2f79b51c02eb8e2ed6b45eb30e1b5808c60f6527fbf0c0504b20a1f51b556c97450e2837e05e5cea7179fc26548cc6e0dbf9a8c78c40768ca9
diff --git a/sys-cluster/nomad/nomad-1.2.6.ebuild b/sys-cluster/nomad/nomad-1.2.13.ebuild
index 3f80f72e6b1a..11268df20c44 100644
--- a/sys-cluster/nomad/nomad-1.2.6.ebuild
+++ b/sys-cluster/nomad/nomad-1.2.13.ebuild
@@ -3,12 +3,12 @@
 
 EAPI=8
 inherit go-module systemd
-GIT_COMMIT=95514d569610f15ce49b4a7a1a6bfd3e7b3e7b4f
+GIT_COMMIT=6892b138959f03d2fcc02975b61c24c297b360bb
 
 DESCRIPTION="A simple and flexible workload orchestrator"
 HOMEPAGE="https://nomadproject.io"
 SRC_URI="https://github.com/hashicorp/nomad/archive/v${PV}.tar.gz -> ${P}.tar.gz"
-SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-vendor.tar.xz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
 
 LICENSE="MPL-2.0"
 SLOT="0"
@@ -17,24 +17,17 @@ IUSE="ui"
 
 RESTRICT=" test"
 
-src_prepare() {
-	default
-	if [[ -d ../vendor ]]; then
-		mv ../vendor . || die
-	fi
-}
-
 src_compile() {
 	local go_ldflags go_tags
 	go_ldflags="-X github.com/hashicorp/nomad/version.GitCommit=${GIT_COMMIT}"
 	go_tags="codegen_generated"
 	go_tags+="$(usex ui ',ui' '' )"
 	CGO_ENABLED=1 \
-		go build \
+		ego build \
 		-ldflags "${go_ldflags}" \
 		-tags "${go_tags}" \
 		-trimpath \
-		-o bin/${PN} || die "compile failed"
+		-o bin/${PN}
 }
 
 src_install() {
diff --git a/sys-cluster/nomad/nomad-1.4.1.ebuild b/sys-cluster/nomad/nomad-1.4.1.ebuild
new file mode 100644
index 000000000000..83f65f816da5
--- /dev/null
+++ b/sys-cluster/nomad/nomad-1.4.1.ebuild
@@ -0,0 +1,44 @@
+# Copyright 2020-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+inherit go-module systemd
+GIT_COMMIT=2aa7e66bdb526e25f59883952d74dad7ea9a014e
+
+DESCRIPTION="A simple and flexible workload orchestrator"
+HOMEPAGE="https://nomadproject.io"
+SRC_URI="https://github.com/hashicorp/nomad/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+SRC_URI+=" https://dev.gentoo.org/~williamh/dist/${P}-deps.tar.xz"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64"
+IUSE="ui"
+
+RESTRICT=" test"
+
+src_compile() {
+	local go_ldflags go_tags
+	go_ldflags="-X github.com/hashicorp/nomad/version.GitCommit=${GIT_COMMIT}"
+	go_tags="codegen_generated"
+	go_tags+="$(usex ui ',ui' '' )"
+	CGO_ENABLED=1 \
+		ego build \
+		-ldflags "${go_ldflags}" \
+		-tags "${go_tags}" \
+		-trimpath \
+		-o bin/${PN}
+}
+
+src_install() {
+	dobin bin/${PN}
+	systemd_dounit "${FILESDIR}"/nomad.service
+	keepdir /etc/nomad.d
+	einstalldocs
+	dodoc CHANGELOG.md
+	keepdir /var/lib/nomad /var/log/nomad
+	newconfd "${FILESDIR}/nomad.confd" nomad
+	newinitd "${FILESDIR}/nomad.initd" nomad
+	insinto /etc/logrotate.d
+	newins "${FILESDIR}/nomad.logrotated" nomad
+}
diff --git a/sys-devel/Manifest.gz b/sys-devel/Manifest.gz
index 2bcc32827a0e..e44d51149b8d 100644
--- a/sys-devel/Manifest.gz
+++ b/sys-devel/Manifest.gz
diff --git a/sys-devel/clang-common/Manifest b/sys-devel/clang-common/Manifest
index 4be1c4957c76..63a4616b1459 100644
--- a/sys-devel/clang-common/Manifest
+++ b/sys-devel/clang-common/Manifest
@@ -7,7 +7,7 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-common-13.0.1.ebuild 593 BLAKE2B f7d78facc226d949240f31d10bb01f6a2bbe3c806d7f7c22a78d715d29de74723bedccdeefd029d309b090afe63821e10a1bd27662ff156640820fbca1896bab SHA512 48e5c5f3d4716c15018aa246cf61fbf898c4c459b1f04710da155084a8cf5b8a6df7697c300d297ac48ee1a8a8cff9bc9b4fca712455032f78cb26e9f77ef955
 EBUILD clang-common-14.0.6.ebuild 541 BLAKE2B 87b158e874cf600e23591a8095e0edb4d30d4482600ef8fe38984e9ba9559e6e2226107cd482f355d950392a6a452e1a8ae79d297d5afc3951a7f1c8f6227b5f SHA512 1bd0481468c278f131ec9f87243927b60a59752f4229450559bf8016e9599155a52593810fcdc1cf0aecd4aa1529e8df300d95123a53de18eb326152caafbbef
-EBUILD clang-common-15.0.3-r2.ebuild 3582 BLAKE2B b40af0942fdac6ca4510b577c85df18c85a15d0f0927b5d83681462559f32f212e328d70f4ce0a68707eb953d010231afea6334c1da68b8c5b1334bf076ecb9d SHA512 3d5d22788808f7b4fb3d08e2b91f971835f08966f1203ca3d4847a6edefaaac7da23a319a146167697d8ce358d97517681ffa45817d7210ac06d46f6d51db5e8
+EBUILD clang-common-15.0.3-r2.ebuild 3580 BLAKE2B 0790e89abb1c00662d9c0f3c898971ec454e15e6a5117c548c9c96d318fd95d7f128113767ce4adac9ccfc3239a482cd00d8d187daefab872ce8c0ee52fc931c SHA512 100322d2c0698f449be39e70499b59c5706761e24ed0679d0df91905c3d10f85a96601a7c8bae6e3fffe9b71d903a2ce2800bc3a958c8f57000d9fcddf9cf432
 EBUILD clang-common-15.0.4.9999.ebuild 3499 BLAKE2B e646b6cc44fdd8543ff74724a2e8fb02276fd9c591ae2334cf28abbd022c044be82d9fbe6385553f7b175ac8fb57f876e36ae79bdd304a87a3bd8ce5fe97f44a SHA512 0f98a23302a878350e8df9a0d181f3b2ed9df0c29666171c48fbb37204b93e236a79649759c8dc3eb72b7bc965bc3c890716d5d3b3814415528556273ccc6450
 EBUILD clang-common-16.0.0.9999.ebuild 3432 BLAKE2B 92679a03e3a45df587198ce70dfaebbc674c47229b14040c93353dd4c384636df7ff6591138c8aedf00fcee0f75edef3fc9f3257058f1d8fcdcade0c2be8c244 SHA512 e33fd7582bbe2d3ad4ed3405a92db98d7365d040df39f7e32d2f75b093e346ec88230813c607983398f9c310bc0925b61d9b438905e8177665db123e1b7d064c
 EBUILD clang-common-16.0.0_pre20221016-r1.ebuild 3432 BLAKE2B 92679a03e3a45df587198ce70dfaebbc674c47229b14040c93353dd4c384636df7ff6591138c8aedf00fcee0f75edef3fc9f3257058f1d8fcdcade0c2be8c244 SHA512 e33fd7582bbe2d3ad4ed3405a92db98d7365d040df39f7e32d2f75b093e346ec88230813c607983398f9c310bc0925b61d9b438905e8177665db123e1b7d064c
diff --git a/sys-devel/clang-common/clang-common-15.0.3-r2.ebuild b/sys-devel/clang-common/clang-common-15.0.3-r2.ebuild
index 3b0e0815f078..c42414796e04 100644
--- a/sys-devel/clang-common/clang-common-15.0.3-r2.ebuild
+++ b/sys-devel/clang-common/clang-common-15.0.3-r2.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="
 	default-compiler-rt default-libcxx default-lld llvm-libunwind
 	stricter
diff --git a/sys-devel/clang-runtime/Manifest b/sys-devel/clang-runtime/Manifest
index a32eb0d88b13..630a60bfe490 100644
--- a/sys-devel/clang-runtime/Manifest
+++ b/sys-devel/clang-runtime/Manifest
@@ -1,6 +1,6 @@
 EBUILD clang-runtime-13.0.1.ebuild 704 BLAKE2B a75c3997e7f744e1c50f7672bcd3564229fb1b55b8e2a5dac7ca38e8d390d61b76df6dec7134356ddf6487b63adb613ec7484240681f6c5cec9d7fe41912c353 SHA512 a1d245b587ec92bdca8b557d7e821d5f217bb1866a4804539305068d946c42355b1e84e3491d238b549c24822ad60aa872f761ef4418895b13d68f7574fef9f8
 EBUILD clang-runtime-14.0.6.ebuild 760 BLAKE2B 0f6cfb8536569ffe2a09305e71056309690ad1c8e92543e64025bd5e009eac35018ec22b2c0f80c12f3a527cc7e0bfe4ec1bfcb2dd9dea54106abf46b13e5592 SHA512 580efee12fe0e53447f5644fad248ebded8ae6cd8cb5871cb38bb3148091886b6fb9a57ac712d3158d5c3fc38c043b0bfbf62fc550a609752a42c23e605b0ded
-EBUILD clang-runtime-15.0.3.ebuild 765 BLAKE2B 2761c21c85fdf90d5d56088b496717b0e17fc5fe405a47d3cef2fb81f6af09dbe01944ca1adff3387c354cd2512cdfe2e994ea626cfddcf4698f136e2ec8c9ef SHA512 fb66d2faeec472633699e6913600fd9a372fa4eccf05d1d46390c58710ceb1ad45f34d16e8223b1842d6708149848c49eafe4dfe553b42d364ee8559c570233a
+EBUILD clang-runtime-15.0.3.ebuild 763 BLAKE2B 648e68757933120128149a7035759172e7ca5cd82b4c790dd81b0696f2e38cd6987ab532b2982a0947e6192ec3e779e3018e973d76af4e6927df461dfe8a97da SHA512 a33ebda0cff7cb4b3b5b3032d87205565c01c517deb9279723fef41bc5897c110860d61c628cadd92241158fd3f26af313a6af04bed4fff5ca92393f99a72fad
 EBUILD clang-runtime-15.0.4.9999.ebuild 700 BLAKE2B fc3ea6d50378cd569aa9a2a30cae69dfe59524f7c9edf5a4f6e39d5d07568224625ad286e857d7d852aef95903cfe9804f54e83aa093269ca2287f57fba2ebb2 SHA512 0b88353d5a7fda68a034017bac76c37ef36d8477b52f4446e81ff01861d50f1140933b54058ad3a3bfa5cade8d8ad2c86cfe5c580b682a9bb03f2e471d3e99ed
 EBUILD clang-runtime-16.0.0.9999.ebuild 1374 BLAKE2B 9699c87947cae5b33b56d8d2edfc7eb1128f3f9355986f74874e4e8b481fb513e8a52523c8b97cf56db364dff311f7d07afa0acb04d37ba30be2918f24226a81 SHA512 cc6a00e72f472b8d1144dc61ec773b41268ed69fa56330e59185775d6fa242a3b884bc8cd539a80375deb22d42bbf53a30d0bf074e0afb706089e20a23c513f0
 EBUILD clang-runtime-16.0.0_pre20221016.ebuild 1374 BLAKE2B 9699c87947cae5b33b56d8d2edfc7eb1128f3f9355986f74874e4e8b481fb513e8a52523c8b97cf56db364dff311f7d07afa0acb04d37ba30be2918f24226a81 SHA512 cc6a00e72f472b8d1144dc61ec773b41268ed69fa56330e59185775d6fa242a3b884bc8cd539a80375deb22d42bbf53a30d0bf074e0afb706089e20a23c513f0
diff --git a/sys-devel/clang-runtime/clang-runtime-15.0.3.ebuild b/sys-devel/clang-runtime/clang-runtime-15.0.3.ebuild
index 1b2d7daba521..cb0d1576ef23 100644
--- a/sys-devel/clang-runtime/clang-runtime-15.0.3.ebuild
+++ b/sys-devel/clang-runtime/clang-runtime-15.0.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://clang.llvm.org/"
 
 LICENSE="metapackage"
 SLOT="$(ver_cut 1-3)"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+compiler-rt libcxx openmp +sanitize"
 REQUIRED_USE="sanitize? ( compiler-rt )"
 
diff --git a/sys-devel/clang-toolchain-symlinks/Manifest b/sys-devel/clang-toolchain-symlinks/Manifest
index 3f47acaf373b..510cc997f5e7 100644
--- a/sys-devel/clang-toolchain-symlinks/Manifest
+++ b/sys-devel/clang-toolchain-symlinks/Manifest
@@ -1,4 +1,4 @@
 EBUILD clang-toolchain-symlinks-14-r2.ebuild 1154 BLAKE2B 1da81bdc43afd21ad3f45e3ede1decf1f2eb0aa0dd5a451b28b06a74837cb1354e785784d723a770b7fd3e4dfaeb3b7d095d8579ea07cc798c33d65f9fd6fb9f SHA512 f02f2c7c21def93692503fceae45f8aa6abd608ad99b3be0a63a85f80b54899b201457ee56666161c87d0039bc512eef2bbf6f819807f236e52ac2d88f4bbe54
-EBUILD clang-toolchain-symlinks-15-r2.ebuild 1153 BLAKE2B f67c2005592edb7f5f931138bbb54524d0af1d0f9fdbb962b37b10551f021cebe6625e67d8d4d697ac114a04ffc3f0aa11fb0b1aaea1e43d859bbc0742c50dfc SHA512 7e923b1cb4a9746977ec941d545c5bf8727f076858a898e67b324e86c3552fd0b539fca5b14f7142c66696990c1874c591dbe1c9569b5fa5297e0c2c2e1f5c2a
+EBUILD clang-toolchain-symlinks-15-r2.ebuild 1151 BLAKE2B 1f8e985ead9f7f4075397e01dd913fc5630df5306e5f38c186816ca30c70406d97bbe27bae88fbc9f17ae66c7cc22024d33d474b2cb3697d05ef5ba937c86db0 SHA512 ab9a89bd4e2474d73d0b63b3bccf86406442fa08df4f63ecbbc49cc28cc2f6cfc4b834a07f9c83ca578efc5f0fd606e9bd24906c560fe71ff7374487844d61bb
 EBUILD clang-toolchain-symlinks-16-r2.ebuild 1099 BLAKE2B 427a21d153852b4964b2ac1707513765f64501fd20102c64aa14eb6514ec33804fef15caeea234fe205d313f8fc9a4757e8c3bb0c092e2cee19a371a15afe407 SHA512 4df541a68c2c40496ad02c30e5cf8fbe442421cf2d5ffc5c43bfc0ba709c64cab307591522d432eb26f977bbcf14ddf6ecede867697b979a283e8ff64e720b30
 MISC metadata.xml 904 BLAKE2B d2c8a31355b0f3bea6c5b4c72d198f40bf14b6908f5a3f765b48fffb2ba3e4f09a8bb37c87ea4e7d9b4e1de0a3ad2c80bdca6feb45538c973119f27ba6329ad8 SHA512 846548593c071d6905b56984c6924086d5f03929c813be986c89c57a6924d1976975b29769ee60a2796287753aa3453608794af8d36cf48b76c55920778c27d4
diff --git a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild
index 2b8b1302ae87..051a023cfc5a 100644
--- a/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild
+++ b/sys-devel/clang-toolchain-symlinks/clang-toolchain-symlinks-15-r2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos"
 IUSE="gcc-symlinks multilib-symlinks +native-symlinks"
 
 # Blocker for bug #872416
diff --git a/sys-devel/clang/Manifest b/sys-devel/clang/Manifest
index e1899d48947b..a43bf0f4c7e3 100644
--- a/sys-devel/clang/Manifest
+++ b/sys-devel/clang/Manifest
@@ -16,7 +16,7 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD clang-13.0.1.ebuild 11294 BLAKE2B 33760cbd488068389efed5c011b15288021d1f93a371d5114301a5f86e815b3a1e9ae21ed6304d90916778f2312db17339d85b6d76e5e8255614706ddc3a7cf6 SHA512 b49773a02c15c4e869682664bd5703d7e08f60be9558fdbd78da19be5d5a1158093729260106cffe4cd8a6295ba740e42cc43d07da00ed8ead14dc45899ce80a
 EBUILD clang-14.0.6-r1.ebuild 11719 BLAKE2B 743e26b68f15e8b4aa7acfe4f7abd095fe42a3ba6dafdff278d0bfe06f57679490e0940a1029f97d5cc3f6d4ac8b44ea63283bbad1052623ee0048fdbbeb54e0 SHA512 ec6da9dcbed9f078307e8265362a5b39dac9d97d8aadbba16395ee7ddb442d34d1d2a1e9e880da41dbdb51fcf3c741c33ac469e5f6ffa4d091adb4d1743fa12b
-EBUILD clang-15.0.3.ebuild 11823 BLAKE2B e1f2a9bc9f0d0784553a3e096814b8a14ee459044881013577aa26fdf42ff5a48850124b3e795074fbbd86807af6c23337c3211d5fe04c92c966f8215a57455e SHA512 a1d08b0f416cf8c547df73c3510df5f00b8cfdaa5b4f65abad91953474f7aeb92277ce01923fda863ac095ae1a4fc94d4603bcb3dbc5766985d0b8d4749109e6
+EBUILD clang-15.0.3.ebuild 11821 BLAKE2B 5888a5d58742cc09fb328ec8dfe7838e6bf4809d6009af011cd0e5dc1258859cb68eae6a87fff4ec3f00642fd26a9ab8d5e2931867f5ee5010e5f479c77c071e SHA512 a4d66ffc28cec978b4014745b3568b2dd777b8332e909b4b2fb2758ea33cca76f4befadc7c8a5c189951875a1ad33f4c691f40249b3b301137daa1c62115847b
 EBUILD clang-15.0.4.9999.ebuild 11753 BLAKE2B ee5d7c5223f01c58267128213a5298c323ce83b4d4d864df69fd7452d8d5d481a441114734f5e315de3ddab390338d1bc0e3b1eb221a0b92f7bc2e25dde0ccc8 SHA512 ad6948948729c0ccbd44ae0a334731e48cfb5bd499883805628d44db8281ab06fbc8a5cffd9ee41ab6142039db5d107647a41e5c241d0d1f6f0dd09841e4f2b4
 EBUILD clang-16.0.0.9999.ebuild 11570 BLAKE2B 0e6673a31b169a6523749a2fa53b8704c6d7cf7d221d1c3a28266fcf38ae576e61dcdb5bac59e35b1b07d529539ee5aa288571d893c7dca928f3b98bcefd7da0 SHA512 34447f8df00c8ded20d603845d602c5aa0336bc42133bdf54b79bb56982ffc8920a4aee4e9368c9b9922b5d4298049ad31e2b56a5359b2a00e6caf7660d58f81
 EBUILD clang-16.0.0_pre20221016.ebuild 11624 BLAKE2B e312140a5d44e3ca13eee40c89c52f764492336ab91ef75d53af8029ea5eacd60ac5a7dcb62417dbfc551ace8a03e6f34efb2484d4bb0aea7e88653ddbb2212d SHA512 80c577f21c9c7b30fd2dd110e22544d50cdfde623a79474fa87c25e962408fb5b61b0ecb9c74a81143505b0a4163328b8508ddbe728553e80476de1ba0295fa3
diff --git a/sys-devel/clang/clang-15.0.3.ebuild b/sys-devel/clang/clang-15.0.3.ebuild
index a06bec819064..10512deb62a7 100644
--- a/sys-devel/clang/clang-15.0.3.ebuild
+++ b/sys-devel/clang/clang-15.0.3.ebuild
@@ -15,7 +15,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA MIT"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~x64-macos"
 IUSE="debug doc +extra +pie +static-analyzer test xml"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
 RESTRICT="!test? ( test )"
diff --git a/sys-devel/gcc/Manifest b/sys-devel/gcc/Manifest
index e61978ed4c6b..e5b7f08ff1fc 100644
--- a/sys-devel/gcc/Manifest
+++ b/sys-devel/gcc/Manifest
@@ -20,6 +20,7 @@ DIST gcc-12.2.0-musl-patches-1.tar.xz 3844 BLAKE2B 004432806696f7d0a32366270ac45
 DIST gcc-12.2.0-patches-1.tar.xz 12864 BLAKE2B a5ae0a85dfc1b6f0bd968f0d5262ebed14ec9cdb3249e3a4c571578c54eda0e53708ee7fe8e03e506366c7f3cf7926eced9b390d9dee948c1249298c0fabd9fb SHA512 f3d793b89a2a0385d596162fb0c653d4acdf21ae418cb792c1786a01fde0391bd0719715dbf07d53636f127168f5cd99108a1dc11cf6cea889b7d82385bcc258
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
 DIST gcc-13-20221002.tar.xz 79899100 BLAKE2B e7bde088c380dacd08489541ead97a877a3b7cf514bb8c2e61144a5a953ff1da26342f8d52021983438a06f483f9cd6ac0ea966611801d4e57d3723ea13a09d4 SHA512 b47325dd065b579c71b0c2c57282c8d244894c4edd51a39e8ff97898e0a8dc80e920a9ada5ce13204f98c90c61e9015a4ecdae1c04a8417e20d1df93019f147a
+DIST gcc-13-20221023.tar.xz 80060928 BLAKE2B f35bcaf6a3243875aca6b74a77bdc3e97c68e004818366e0d48fcd830e7bfe1da243cdfe498b7c8f540426e880aeb7ef5466d410ce6f51778887bb6c10896a82 SHA512 d827e42ba0d1399b225cf8177def3efaaa5ff582c154af960d5da8a474cc8950db7d4412a758b941b477230629fad15700e3bbac1342e7c866073d3ba4b2273f
 DIST gcc-13.0.0-patches-1.tar.xz 11064 BLAKE2B 82a7ad193dac00475931840bcee82ef7a51718a74af224b03a41f8349e34c2a64a3eb29985b4e2bffde958c58782242eccaedaa54d950e8d51d8bb6f45868e0e SHA512 e04b510f529dd3187a08ae9cb9a894a3d3d30af81f13c43cc082fda7d26c44a3bf19d36ec02024b2ade8b8c193e9730246abeadee603c41b5873c5b785709921
 DIST gcc-8.5.0-patches-2.tar.bz2 16921 BLAKE2B 619a47f74edf05fa01c9de59d0ff7abb027a01cf0bdec91ac41046166192f4eae561684136c4a6a5e077f64754bb5b0710905129f31b0def21d88f92e6bba7fb SHA512 b6095d4570895e2c4dd58fed5756194aea27391b813e5e2de42b2749cb318c4bea2087eb0ff92c70e7f98ae4482c49d476db57be83d7beb19fd462aa61714ab2
 DIST gcc-8.5.0.tar.xz 63841008 BLAKE2B aa81a1a730fd7371360f6abed6ba78b5843fd18c58d5de5687acc320741b9e430e85df3535a1ef7a26051409be8d2f0945f503e5968480d919103123a99d4b12 SHA512 92f599680e6b7fbce88bcdda810f468777d541e5fddfbb287f7977d51093de2a5178bd0e6a08dfe37090ea10a0508a43ccd00220041abbbec33f1179bfc174d8
@@ -38,6 +39,7 @@ EBUILD gcc-12.2.1_p20221008.ebuild 1421 BLAKE2B ac34f19e52c2debca52725ffd9a219fa
 EBUILD gcc-12.2.1_p20221022.ebuild 1437 BLAKE2B c0f35f820ac6b8361761cd90944b7a860c6bff7994497fb96e6be2178f9c888b8927bd3a908af0f0521c06d98d3c84e46c988d70e6a7e454835a978cd0b4b34b SHA512 48ee0cee1a29d0b41f78dd73ce0ebedb5eae4befe60f456f5a80128e878e61f1e6c173110b21ff3de9770f5e05c144f72bacb273532cf6ce62ee221f5281db8a
 EBUILD gcc-12.3.9999.ebuild 1545 BLAKE2B 78fdc4a7b20d22bba137cba00e49d2249c5616bf1c4cf619162da1d98c750fb3da71fbb1cd4e136624cc4e0a112547e6c4c29992aa58ab12507917c7d728831a SHA512 f3562696a79035e64b8e79cee720fe24c7041bf922d79e5cff1ae864a533997995465d0871bfc4f87f6d5a66e7f8ac02c490792554a0628ae30d96a061ef9279
 EBUILD gcc-13.0.0_pre20221002.ebuild 1282 BLAKE2B 03e7f5b4c1434905797713910db534e33e9ccd97e7b931a3980222412b48d3daeae62f259a6f4445fccb4fcb510f92ef39c30e0c91930ec333f0af544b38ab84 SHA512 6cc09fc3d0736469630089056c8c79ec3a4751311201f832826be7c6782598b8efa110b23c45fd187006a5911eb7c0d132d478ccbd1c5817ebc123d10c807aa3
+EBUILD gcc-13.0.0_pre20221023.ebuild 1288 BLAKE2B a2281da17b96d44850dccf6a6420d66cf163a8f53ea755f1414911fcffd71b504273f3010b6a6c3cb796bf763d8da5b8fa64efb7e107b3e5a8bb1ab767704d05 SHA512 8108432caffabab640a472344adf5660a005436790d31f287f1e72109dd69b5831ea0f3e956a822439862da6a24b78daa7c4253fe51ce9b47457de3b83d80b5d
 EBUILD gcc-13.0.9999.ebuild 1252 BLAKE2B dbc0cdcbb6bae2177185c41fa014a0c98e05a8101f33e12975e2af951e25539117b9279573770b5d17261032b0c51d80864140417a13b152aa34739c28c0f0c3 SHA512 96e940c83f9e58b7b929c5293ca44582c266d3e10615f6aded5cd0b11cb1d46306382fea04227040a7d7cbfdc0f042e3b1c89a0e617193bbfadea50a4732e9a2
 EBUILD gcc-8.5.0-r1.ebuild 473 BLAKE2B 40d3b651d0aed62ceb1df973f1f7e2b6ce419df22da63e49d335fcd0bf7b349d1e7be40dc16e80fe143222d48ac6139d35bf47558d83c30aab4b25dba6fcf6cb SHA512 b88761a3495a1eab0de5321c9230c77cd621ae545d3be49a13273cfcd8e94cc21dbb062bfdebb64dc5bfe1ddd600ee8fb60df6fd7709a7be90915b7e99a8db29
 EBUILD gcc-9.5.0.ebuild 844 BLAKE2B 7bee440ddb624d5489ebaa9be899c530bdf7d9563453a9abf45e60d1f3ed66a78535cb9227e66e93524071fbca447786e2133ea316b5b2b55366e2599c587be6 SHA512 4b578a481eb06ff5b445bbd81cf18d4d63ec2d65230e33f95377f270b391bde02c2083a1b46b43838bd115be7d75c3957258f72fb5e7d89ba79185d08195b9ec
diff --git a/sys-devel/gcc/gcc-13.0.0_pre20221023.ebuild b/sys-devel/gcc/gcc-13.0.0_pre20221023.ebuild
new file mode 100644
index 000000000000..641ab05e8153
--- /dev/null
+++ b/sys-devel/gcc/gcc-13.0.0_pre20221023.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2022 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+TOOLCHAIN_PATCH_DEV="xen0n"
+PATCH_VER="1"
+PATCH_GCC_VER="13.0.0"
+MUSL_GCC_VER="13.0.0"
+
+if [[ $(ver_cut 3) == 9999 ]] ; then
+	MY_PV_2=$(ver_cut 2)
+	MY_PV_3=$(($(ver_cut 3) - 9998))
+	if [[ ${MY_PV_2} == 0 ]] ; then
+		MY_PV_2=0
+		MY_PV_3=0
+	else
+		MY_PV_2=$(($(ver_cut 2) - 1))
+	fi
+
+	# e.g. 12.2.9999 -> 12.1.1
+	TOOLCHAIN_GCC_PV=$(ver_cut 1).${MY_PV_2}.${MY_PV_3}
+fi
+
+inherit toolchain
+# Needs to be after inherit (for now?), bug #830908
+EGIT_BRANCH=master
+
+# Don't keyword live ebuilds
+if ! tc_is_live && [[ -z ${TOOLCHAIN_USE_GIT_PATCHES} ]] ; then
+	#KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+	KEYWORDS="~loong"
+fi
+
+# Technically only if USE=hardened *too* right now, but no point in complicating it further.
+# If GCC is enabling CET by default, we need glibc to be built with support for it.
+# bug #830454
+RDEPEND="elibc_glibc? ( sys-libs/glibc[cet(-)?] )"
+DEPEND="${RDEPEND}"
+BDEPEND="${CATEGORY}/binutils[cet(-)?]"
+
+src_prepare() {
+	local p upstreamed_patches=(
+		# add them here
+	)
+	for p in "${upstreamed_patches[@]}"; do
+		rm -v "${WORKDIR}/patch/${p}" || die
+	done
+
+	toolchain_src_prepare
+
+	eapply_user
+}
diff --git a/sys-devel/lld-toolchain-symlinks/Manifest b/sys-devel/lld-toolchain-symlinks/Manifest
index 611faeb84726..d2694a2bada4 100644
--- a/sys-devel/lld-toolchain-symlinks/Manifest
+++ b/sys-devel/lld-toolchain-symlinks/Manifest
@@ -1,7 +1,7 @@
 EBUILD lld-toolchain-symlinks-14-r1.ebuild 825 BLAKE2B df81d2b414d0e924a20296f2a8eceb49b81a3763b89558a40f47b5a66e76f685656d6c8bd06c4ec21ee6e5c14f70fae40db1c966eb8ce3e11f55ca611ed7cb1e SHA512 a456988c082fa942248aeeb60aac4a4784396fcfd1096c911a8d6449185774d360d0ebf28262510642157c8a59efc6e612ee3a053d2ad233a54ce9a108dfcdba
 EBUILD lld-toolchain-symlinks-14-r2.ebuild 801 BLAKE2B 9d503356ed85fd996a922f531782550dc9d9fb8f8f70b6298083abb4bda017b4015932add186a9e55c54e55135913b2cb83f571b115de09e704c936435f53f02 SHA512 7280dff33d642c0b1d4a6f23fbca4d412fc90693b7a9b825d0044f41694d2d4438b0c270277851999688dd7f04c4e67393c435b087d837abdd1f59011f3eb7ae
 EBUILD lld-toolchain-symlinks-15-r1.ebuild 825 BLAKE2B df81d2b414d0e924a20296f2a8eceb49b81a3763b89558a40f47b5a66e76f685656d6c8bd06c4ec21ee6e5c14f70fae40db1c966eb8ce3e11f55ca611ed7cb1e SHA512 a456988c082fa942248aeeb60aac4a4784396fcfd1096c911a8d6449185774d360d0ebf28262510642157c8a59efc6e612ee3a053d2ad233a54ce9a108dfcdba
-EBUILD lld-toolchain-symlinks-15-r2.ebuild 801 BLAKE2B 9d503356ed85fd996a922f531782550dc9d9fb8f8f70b6298083abb4bda017b4015932add186a9e55c54e55135913b2cb83f571b115de09e704c936435f53f02 SHA512 7280dff33d642c0b1d4a6f23fbca4d412fc90693b7a9b825d0044f41694d2d4438b0c270277851999688dd7f04c4e67393c435b087d837abdd1f59011f3eb7ae
+EBUILD lld-toolchain-symlinks-15-r2.ebuild 799 BLAKE2B e2fd15700bd30275124e5fbaa7b5970ed539f12f545c0f05a161dcef71b770ba24ef12320998d2f49c60aea3e1f5efb4416afb4355e84e3ceb008a77fc870e3e SHA512 47afbe7a0c025f85bca7fba4ea96134dd21125e1ba326e39a7ed07efabec4c97cfc6e92a16073cf68a355408befaa577a74a916d0c4899626f471bbbbfeccd9f
 EBUILD lld-toolchain-symlinks-16-r1.ebuild 801 BLAKE2B a539e9788b4cf4a758a5bd7209e69ff5b664029dac6bb3f4c0323efc4926d6e1de0c662d6361b8dfae4f45ee254ba559b0095f95bbc23404b28bd31a8b576073 SHA512 9e5ee806aa46d0d4b8ef2af27fac32ac146d12df5223a3b4b613400d2a47306068ebd8c9474c7b2f030d2e3d3fa1a309427afc03f096e60df04afe54ac0e1996
 EBUILD lld-toolchain-symlinks-16-r2.ebuild 777 BLAKE2B 7717e8a4bcedfacfb4c8e857345a8d57b7dedaa7986ce6e3f835e72089bf45d4904fe2f6aa50ed407d1b3b75e7fa293e3071cdef70c4b63a0002cf7a34c1e6ed SHA512 1163038de439599cc078642a4650f2b318d41ce92c25401e1c7a811e1eb15ea69f0877110d2a02c23700ac559255dfa55e02f0c079d9c1ba4679c3cd296be211
 MISC metadata.xml 784 BLAKE2B 044eebb87ddac511186e137d9e255cb3ead2d53aeffafc641cc9a53556b833f06cae439907de8e8ead1090d54f7cc4bcacdbfff52449b6fab5908aa6d354a110 SHA512 50a9ac94efe64f8f6533049f496a19c37e375803ea3920a3729c93f346117ea5b662978570db27e8fffcfaf78f990691c4ab5aaf7dd48a7e2931f713eddedb4b
diff --git a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15-r2.ebuild b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15-r2.ebuild
index ee8671571c75..cab1625ad3c1 100644
--- a/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15-r2.ebuild
+++ b/sys-devel/lld-toolchain-symlinks/lld-toolchain-symlinks-15-r2.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/sys-devel/lld/Manifest b/sys-devel/lld/Manifest
index 1454dbe0d967..5eaff9259eb5 100644
--- a/sys-devel/lld/Manifest
+++ b/sys-devel/lld/Manifest
@@ -7,7 +7,7 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD lld-13.0.1-r1.ebuild 2003 BLAKE2B bc67645d251f5c2883a32cd57ebcedefdf4fe8853c709139cc9ca11299e5f28d8b000eba622521cb5aba19ffe36189cf682e921386d2731538b05308f7c67257 SHA512 d933299ffeecdaea55e37a085c181322fc9d1d0f2e69e2c5f064b6db43c11bc152203908444b66423adbd299eeb13a1f6a0863b7ea359734fe919efd96bec639
 EBUILD lld-14.0.6-r1.ebuild 2009 BLAKE2B ba5b56979e55cdcc340294289ad31bcd1f331e4f93a4e76c185eb4a662abeaae0b54af59fd39d9a93d06410d20b0dc5c2600dcfd8d35260b152b2ceb7a3b56a9 SHA512 b3973f16c1973763e523c065016bce46e743c76bfa257d623af86b9231b0732e1b67b695fe6d9deb2ed6534cd8eb37de9de46ab46d3789aa2634bc54e7197657
-EBUILD lld-15.0.3.ebuild 2099 BLAKE2B 5938071d1cd45bf62a0258851a844dac9d402d07902c25de92954f65ab281481a1112cac50be27d1a5ab0f335b73aeed0f095d299d49e67bfd6fe3aac0fa1cf1 SHA512 a1d7cff5d06714f488b741d09bb21d6e10dded8635d85792791cd23eb560e3b4ae7e59eb525f521b560c8eeae1a5845401d94a326fc52fb0f177d29abb9476b8
+EBUILD lld-15.0.3.ebuild 2097 BLAKE2B 45c493e2d482312f7de06f3a26629e55bad1605630b8e17b990b1db306fb9380df0f3855a2717b19a46b7a2049390727f158cd2691f9989454511aa12340d2bf SHA512 1c06aa7d87c5a255b83b57954522dc35863779d26c8579e4b6d5a776fd28db1a008151a22fb1fc1b7b22effa196ee10ad8205ba01cae4e81281d6b8fc904dc28
 EBUILD lld-15.0.4.9999.ebuild 2057 BLAKE2B e41e0265a761f3ca21d7cbb32987b7f083f73979ab1ebdc4b76e98cc2415d2062783e46cc53b0cb6c21f2471df57f6f6209715d26e5baee01f20431a31c17b04 SHA512 8a4bab6ea39ff8bf25762658e6b1bf2df6523659049240390e9517c30a716b83823948b42b7aad22979e0a60b7dea2d6a5309938fb1810d07bc1566a2d903698
 EBUILD lld-16.0.0.9999.ebuild 2032 BLAKE2B 8c359c0d76e5ccb3ea0848a0d3c9ab9a9627f152cf982ad7efa67b1666693ed3c27494afaaace50650c94f0647461ec0d9aad1ae56b3e7205e1ddf065c7de224 SHA512 c2862c28c5b5f7ff31eb62d7e36fe7a2e9c413a6ece80cec8aa3e98c1cfb3c8fcf6f366bbf922775a2b232a89d9cb1a3daedb45dbd7d77a4e2e994b01aa34755
 EBUILD lld-16.0.0_pre20221016.ebuild 2032 BLAKE2B 8c359c0d76e5ccb3ea0848a0d3c9ab9a9627f152cf982ad7efa67b1666693ed3c27494afaaace50650c94f0647461ec0d9aad1ae56b3e7205e1ddf065c7de224 SHA512 c2862c28c5b5f7ff31eb62d7e36fe7a2e9c413a6ece80cec8aa3e98c1cfb3c8fcf6f366bbf922775a2b232a89d9cb1a3daedb45dbd7d77a4e2e994b01aa34755
diff --git a/sys-devel/lld/lld-15.0.3.ebuild b/sys-devel/lld/lld-15.0.3.ebuild
index b9d830d792d4..c9a8a6a6a872 100644
--- a/sys-devel/lld/lld-15.0.3.ebuild
+++ b/sys-devel/lld/lld-15.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86"
 IUSE="debug test"
 RESTRICT="!test? ( test )"
 
diff --git a/sys-devel/llvm-common/Manifest b/sys-devel/llvm-common/Manifest
index c3adb19a72e2..020f28f48025 100644
--- a/sys-devel/llvm-common/Manifest
+++ b/sys-devel/llvm-common/Manifest
@@ -7,7 +7,7 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-common-13.0.1.ebuild 608 BLAKE2B 1dfa0b25955f1f044b9980fb80f9d38eb9732a15f9bc1b352a0e75b809ad6d43db16fde3718c569b9152bfbbe2b0f71b7f9ff5306d5ae4b57a380ba003c98c86 SHA512 0702b3222f9733532ddd115f37268713ec2ebbb187b6a02e3423c1e966e594373e38c3c6f6f8eda549afae52922a3decb3126850ca0861cc3d4c8e7c0bdc5921
 EBUILD llvm-common-14.0.6.ebuild 602 BLAKE2B ef26d6ac2606e9a316ddcce442da1762f578ade0346ba2a947fdace5e2020e8841c63d173e42506d23abf6efc062a2edfac0be98a3eefe1f7a29c88702e9f1d5 SHA512 789dad6fdcf9a930ddc1046e7e98ebc1e05b2dd3713bb1ec5b8a5711690d779691c91d1000d9776720b21ed241d2f12c0ae9a8dba0e6a17d0ddf563cdfbe657f
-EBUILD llvm-common-15.0.3.ebuild 607 BLAKE2B 10e14518f42c69f14072fc2e74f9c2c1c517b9289dcbaebe071bd79ab7f46077437d9b19737d74aa8404b186a9cce9f4186db24d6ba0c98a6a3e84e585c62f29 SHA512 69ede976930b316e7869f65bae2103d8190473ece157d3552c135ef4132c8ba6b4116fd2406e3e00cbf0627169dfdccd5cf4371d00456b7629ba28f3eaadd94b
+EBUILD llvm-common-15.0.3.ebuild 605 BLAKE2B 224244448bb3d7b8a55e4d1951987556f8945986e3a08ac3dce389b4b66fe33c67e1c0cb8f90712940211cb13db2eec27accbd7c13fbd1a42eaf52e45eae06ae SHA512 e12270576d1bae25ed6be898729dc3a81fd9ba5678e62e9dddb553c7444f69b9547cb54342130b82d8bdbf44a72216e01b4674f0559cb6e4b60f812bb7a9dee8
 EBUILD llvm-common-15.0.4.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
 EBUILD llvm-common-16.0.0.9999.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
 EBUILD llvm-common-16.0.0_pre20221016.ebuild 524 BLAKE2B 1864e7c6a8578fe3ad74718368deca408757c501726fd3a2941087756f50bbf9ed83a6a635ef264150c86b577f373b5d391df4cbc6ff3e3e6a561bcc41b2c5f1 SHA512 feab4cb373d2384ce018d26b480024060b89c6a5475e7e7d475124b9a20a2c55470d98799067c437540b6ec6e7471f712534005ec426f76a247b8767edff6164
diff --git a/sys-devel/llvm-common/llvm-common-15.0.3.ebuild b/sys-devel/llvm-common/llvm-common-15.0.3.ebuild
index 5b1af0bf7ccc..efa14b40859d 100644
--- a/sys-devel/llvm-common/llvm-common-15.0.3.ebuild
+++ b/sys-devel/llvm-common/llvm-common-15.0.3.ebuild
@@ -10,7 +10,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 
 RDEPEND="
 	!sys-devel/llvm:0
diff --git a/sys-devel/llvm-toolchain-symlinks/Manifest b/sys-devel/llvm-toolchain-symlinks/Manifest
index 7a7a397af08f..cb6cebd6d92a 100644
--- a/sys-devel/llvm-toolchain-symlinks/Manifest
+++ b/sys-devel/llvm-toolchain-symlinks/Manifest
@@ -1,4 +1,4 @@
 EBUILD llvm-toolchain-symlinks-14-r1.ebuild 1050 BLAKE2B 2e1e3a23812823c1a747a2b09d006f874b3a192c92b1ed275988bd84740df5ed68283f638fa36232d780eec817c26163d4d76335ad1dc2e0c5780b96dddd88bd SHA512 f54178846a398792a753174cd6b067f63b22bef13dba49485b14cc7f909a1da2a8d9bb2657a0b485ccfb5a3830388a855d52e8dea7a62e766a3bd65bb6602923
-EBUILD llvm-toolchain-symlinks-15-r1.ebuild 1049 BLAKE2B 8f9693ab83ea30f1c5a10e6f95f5bed10ef0ddec3e6958f3f9b189431d93a6b061ddcf343129f9b74bf4d1c25772553924579ca99d0808d56ddd5b2c0e7cc967 SHA512 e384e4c78290fb02dc48f97296c7d57cffa21b551c0f046c8a22ecff6fc88fdc3c9aada2488d97e5bcf24574387723e94baf62380fd6a9ba4be12430d16e190a
+EBUILD llvm-toolchain-symlinks-15-r1.ebuild 1047 BLAKE2B 52851e8edd4ad8b4b0c2ffa83590180a34a2fbb4928dbd52d8d8cf269af54a8411cc4125146671e92c76bb6d2a41b628a6f9c734f812d4164e1f9541f6c05a01 SHA512 0f3273268f307cc8a67b8e5498bbd661ca738179f2cd9b2476f5b20618f8dc41d2867d6f64e51010e1b1340c0d0e626782bbae27f8cc11f3782edb434d3cea4e
 EBUILD llvm-toolchain-symlinks-16-r1.ebuild 984 BLAKE2B 2e75f61e728d2143dd9b3199cab0147f4b81a1762fcefffeae9c7ce812492eed1002e516c2ea0ff17aa4af2d389ea5b58c6d04033e1c6b070aa85c5827816b3a SHA512 8f65d67b9fdffed53ea16787229ea5b3c81e771bf7231739e3723d7b20d16ff4d5445a191e851cba006f5698cb362d8928825c591fd39d7e634cf14d679d2216
 MISC metadata.xml 815 BLAKE2B 963f1b8425495144d04659d2d8cdabab910f15f9861634bf436a82ccb70b27682b44c47415ca6884956097e92294457d09b5c44e7a2f108c93abb79df8884aa7 SHA512 940a6c63c4c13a1c78c041c02df9bd3d2ac0f19eb552fcfb8134784386a2197956b1dd4950c760ca6ac9e8fb154eb550d59fc6ab1aea9c9236e7e005882d556a
diff --git a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild
index 6ee57eebb98f..6da6b056f577 100644
--- a/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild
+++ b/sys-devel/llvm-toolchain-symlinks/llvm-toolchain-symlinks-15-r1.ebuild
@@ -12,7 +12,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="multilib-symlinks +native-symlinks"
 
 RDEPEND="
diff --git a/sys-devel/llvm/Manifest b/sys-devel/llvm/Manifest
index 765fbd2ee1cc..fdc4a186c4ac 100644
--- a/sys-devel/llvm/Manifest
+++ b/sys-devel/llvm/Manifest
@@ -15,7 +15,7 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-13.0.1.ebuild 12007 BLAKE2B f235f91c07fe75bfa0afffc6d750c10f77b7817353ee84d99a0fa706f6fb7fb30dd74bf2966ca4aaff162faad8c3c9ed9ee6446bdcd0878195de61a15ab23355 SHA512 b1cf7e90b038de6c1d9165e849e7bd422d4665fb23c477aa514bdde3c0cb92e9eb9dd76968e37d4e885bfd792f441ba7e95c1a41baea2f8f7993aadb38439717
 EBUILD llvm-14.0.6-r2.ebuild 12381 BLAKE2B 736afa7fbf7321ce4370e892075e716e6efb23981b4e9d235d60784c7548c6b62590527753e2752f80b4a4eafc04096fbd6ec5b8efbba88de08f322262361eda SHA512 1c800cea06768c48fe7c0944e4b4c9227f11ffbf9605ca52e487646385eeeaab5acca8aaba0e66b21b2939505533f562fe40ac5b23533adf0e42898e163a9620
-EBUILD llvm-15.0.3.ebuild 12542 BLAKE2B f72e8a93e3667503533f1d511568a31d20f6d73c5445c9f98e21c6520d3cd172074a6deb71db0de86df5ae4c86e8ba3bfc4eb3f466511548c0816d2fb20eca71 SHA512 096c6fa3079e5b6fe6b79f4e3e6953065548b15109e7d4c87d572c07d8464a68525ea648af4c24530ae7142fe4373612e3010492b1ad168ff8de20db0a0b1bde
+EBUILD llvm-15.0.3.ebuild 12540 BLAKE2B c97a5942e34b11a01363aff8e86f037aaf95fd44960786adc8511876cd599695d341dfdd84fddef8a125a9cae5a7df0e3f43ca9185edfd517a5195d84187940e SHA512 079127af1c9dfaf057e431a43c1178c701e91642b939c441dcdeeedcee269c0760eefeabca75962469f6ca5ea7315e0f5b516e90491c677e07f398a91d167330
 EBUILD llvm-15.0.4.9999.ebuild 12457 BLAKE2B 52496ac8ef1cb0d61f1f7c6dc5b3db0a0778d841ad67c983c140b0c7858125bd34bdbab31fd1862e5b6c6eca4554764dd1dd2422268ef485c6ee8ecf8fcf3c57 SHA512 0e4e356633dc5d9660e0d440f74ef709ebf88919cec1cb2f317c3744000e8db25e0036be3404a01dd8817ff8e77c64f95c38a27c8cd8e9445e7f037a0a8a5f7b
 EBUILD llvm-16.0.0.9999.ebuild 12559 BLAKE2B aa93af6653978a2a0d668e7127e21291e2f1ebeaae5a559186df394184f24ddc26f61911c67cc70ce33d01702fcdf2511e57968d545c993952fa21c2ab351a17 SHA512 22616fc733364c39188d17ebd5ce12d5a340fc5245e4d0901a93ba925288f588e00fd63f0cc3902082b48e248e48b98338d2820bfaf81f7dbef530a1e434a304
 EBUILD llvm-16.0.0_pre20221016.ebuild 12532 BLAKE2B fcc2fbe2f7b96e579d99ca52eb6c59ce2bc6fa652e2bf3fecfd88aaaafef9290ced05b5134aac327ceef0af9fb07b643a28405bc1aabf302fdb65c71544f40b8 SHA512 ec2991754334a2c33a08160d35ea099d2bc38f2ee9b2498f06d4864402cead296646aea33ed1240a32f452f360016dfcc066d12f3056753ff7e894cdf083d930
diff --git a/sys-devel/llvm/llvm-15.0.3.ebuild b/sys-devel/llvm/llvm-15.0.3.ebuild
index 078cb9b1052a..43ce7baefb0b 100644
--- a/sys-devel/llvm/llvm-15.0.3.ebuild
+++ b/sys-devel/llvm/llvm-15.0.3.ebuild
@@ -18,7 +18,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions UoI-NCSA BSD public-domain rc"
 SLOT="${LLVM_MAJOR}/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="
 	+binutils-plugin debug doc exegesis libedit +libffi ncurses test xar
 	xml z3 zstd
diff --git a/sys-devel/llvmgold/Manifest b/sys-devel/llvmgold/Manifest
index 1e8631246ede..558640b6a8cd 100644
--- a/sys-devel/llvmgold/Manifest
+++ b/sys-devel/llvmgold/Manifest
@@ -1,5 +1,5 @@
 EBUILD llvmgold-13-r2.ebuild 591 BLAKE2B 28b122d41982961594bd1f70e9a666ace7e51e7d986007fea010e6920d6ed41571dcf345761cce2e0ff5baa6e6cc2c26da6770b56d467318371f039f5065588d SHA512 4af8bb97486371e74b915964125dc06542234b1d5cc3db4567ffe5ab1a6e6d29ac39bafa23b69aa3cb0fad97ed8b658fdba04cf137b65b9660e5079f4742fd4e
 EBUILD llvmgold-14.ebuild 576 BLAKE2B c9493f322fa0e387411df160c28078a514510e684f01c415a035c93868dd5a16ae718f10af0debe2e1a4112ea0864890a81a89ebf3fefc55ffdc89adc743524f SHA512 7cdb73379b9f6db22abde1f01043e28b8bfd797f3123f77d31ab3166e2c8d72747aad0963e8f6a41a0a01a19ea29eb468d869b5dbc7a35eb016a4a89c57715c3
-EBUILD llvmgold-15.ebuild 581 BLAKE2B 23e23fb83bcec63016e97f21a6faf48636855c5b205f3c5156ef8eaa8248f52a8002a46b64e0e6720a720f50fcd6fbc04bebe68f80bc1c38b6fa1b735f56c684 SHA512 4c494d7a8f71eca22ee8693b9c4bb2a627eacb6f8367222fc99187d47b63cc2a2d61f98cd325359bab5dc214465f2b0526157084c33c635ef28c155906143fb6
+EBUILD llvmgold-15.ebuild 579 BLAKE2B 2e69eccd85f8435b231caa1a23901509cd3145deb10b983ee6ca9ed985cb3110652f3dc23e37e8a8d5c151d7f736f5eabb07e0669372227f4d860a7cb3cb8aa7 SHA512 a2175a3a8323a8cc3435f6c36451ae885dac90efb7cd76a1f380f286e683e1778247fd87f46d31b7c846109d3427c3b226468ccb97118819c63641b324b89462
 EBUILD llvmgold-16.ebuild 538 BLAKE2B 6b52842f7dfb1ea578c1878c49360c64eea77d4495a90a10bd9591fe47678f32b9accbed043d47a4f299e98b887cc329d6b74604011d931a6f9d2b810c24536e SHA512 8b7946b887064695a0d1a0df26dcdaca69f3c748fdc46ff3f82d0284785e82aeb467c610ba6b14bdce5c09ae9ab603d17f4e8cfe36e204e206a7d5d3e8e1e6d1
 MISC metadata.xml 299 BLAKE2B 2feead2cd1b35b3a43335ddd7711f8181b52bc63ee7166608914260c67528add5251349063afbef4f8cf0ec09b2cd4c3ffdd90f2c14ed60bb69ebc03888f6333 SHA512 cd745c54ab18d25bdaff18582105072574103a36cfe7c175ef740f266d00e9fc6f44c332904d23b911c939cf5bdf52973b388923099d8dd5dfef3c283b5cb685
diff --git a/sys-devel/llvmgold/llvmgold-15.ebuild b/sys-devel/llvmgold/llvmgold-15.ebuild
index df53c6a44040..dbc09d2342dd 100644
--- a/sys-devel/llvmgold/llvmgold-15.ebuild
+++ b/sys-devel/llvmgold/llvmgold-15.ebuild
@@ -9,7 +9,7 @@ S=${WORKDIR}
 
 LICENSE="public-domain"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~amd64-linux"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~amd64-linux"
 
 RDEPEND="
 	sys-devel/llvm:${PV}[binutils-plugin]
diff --git a/sys-fs/Manifest.gz b/sys-fs/Manifest.gz
index 1c6043cbfd55..f25d69cf3be8 100644
--- a/sys-fs/Manifest.gz
+++ b/sys-fs/Manifest.gz
diff --git a/sys-fs/lvm2/Manifest b/sys-fs/lvm2/Manifest
index 3c8ced56a316..837057d9c16a 100644
--- a/sys-fs/lvm2/Manifest
+++ b/sys-fs/lvm2/Manifest
@@ -6,18 +6,8 @@ AUX lvm-monitoring.initd-2.02.105-r2 960 BLAKE2B 82e1d55032827b7b330bbdb09c74ffb
 AUX lvm.confd-2.02.184-r3 282 BLAKE2B dcc65a1e9634becb8a79d74fbadc5fa9880a1e497546817418f0df7668454d8cad1f52c9516f251833874ca5bac1a530970b8a94860057b05361c736935047ce SHA512 05818e09fc6d8fe8287283b832fa73b4d3ef539837f956b9bfa394d206c1e379a3227148040934ac690d77524f3f7b16ba0d262a11de268914b1d11afe3a3c97
 AUX lvm.rc-2.02.187 4237 BLAKE2B d7d8ccc2c06ac7d4804de22363a48008c63e03f06ab737ed73555cd1f2c81eb627552531f2fc72df7cb76a88229ba13c9996a18140bc97d107ee77047dfb0055 SHA512 e09bd769f6be0ae8af337fe2bc1e4165edb77a74e2b411c981481254f4aabe5c06e387d655aacce0eba619a1b3e9e50900d0638d4db2a3fef9034621861f20a5
 AUX lvm2-2.02.166-HPPA-no-O_DIRECT.patch 285 BLAKE2B 0311aab5b4ac843ff36fb7c4dbb8f47538fb621848f8430118dbbbcdfbf64876098ce9732109dca00e9262551b12a0e3293f0edfbb82dadf2d442f448dd695a3 SHA512 e113c31400d9f382b89901be199dfd3dd3888e0b417fb080d381d2aab79ac522dc968fda6aa7fd7668d018fd9109be133252cce01825bf950a79da145ff8b240
-AUX lvm2-2.02.171-static-libm.patch 525 BLAKE2B 5cef02547acdfe24fb26cd96a0bd6eccb0c5cbc5ae79ed4aa0d52ad94391f5ddfede194484f2a9c00add07df7fe69e43f1d122c41c8fe05a91e86f797f4e9759 SHA512 498132b93e482739bd7bf11ee457b837843dee951b66fe268411e7aabcaad373c6c9a0d43083940c85348c506eda2d0d49a3aee205110388e18f9b58a6d6ef1a
-AUX lvm2-2.02.176-pthread-pkgconfig.patch 822 BLAKE2B 9c5d89a70c0a7074d689f8f50a1f811b91fe8a64b564e22426bce4574be165765b3640f8dc650e4ae047340a03390fc70faff0cd78ef5251063d28030e1f495f SHA512 d96f579bbdc56b8288fa01e6c416bfcf229c92b659102edd1aa10c9ae1c35eeecb4299bce161218dae423995431e8a12a2a78a80a868b79744f74053ec2f9bd2
-AUX lvm2-2.02.178-asneeded.patch 452 BLAKE2B 6d7013e7a0e1aae933e22b2c30b85cf744f1b34bf865714b64d3ac81431dbad472c637d735e618830966c76a3c82578fff599f51ee600d4b3a79a46e3d5a6abd SHA512 9890ae7cbc10589db730531ffbb8ccfeb15d6c548379ce0dc81a9c8e18b10e2305d1b0556d3e7e5dc23baa1546521c9dd786d446b6db28fe2f1875e32ffc0d45
-AUX lvm2-2.02.178-dynamic-static-ldflags.patch 2279 BLAKE2B 526104c96dbef36568a11898193c5d0a7d69a63df2011e1f1a778a4317248a683470e331ddbf8b07fe8654abca5a96e9a53d0b13715c860f8c1e8b33b8e95384 SHA512 83f253ca629e90380164edc74f3900f6e40fcd0002d357dbcaecf4a75c2a2213c55cce1291a27afd2e07c72838e46fe7438217f8a103c20233ffa2621cf02cb1
-AUX lvm2-2.02.178-example.conf.in.patch 1650 BLAKE2B f5e04bb7524cffb5ee3f6f819541eba0681e8a32f884be4c78537a38848fdbe03d3028b90568e03810df86012cfb497c9050fb949c6c8b1d4460174a6794205b SHA512 fe30018b3f0ebd6f99e63a5d8b423365b8f2c5d5b17b19810ca1bea52f49a5c07e059cfcb1851be752024ba5acad6fbb736f20264b83bdf385f845c3b68d5b5b
-AUX lvm2-2.02.178-static-pkgconfig-libs.patch 3495 BLAKE2B 85869e4f46b001c4a8d43692ae7e3d73731deb9bc6094b4cdb3059058dfb819ecf507f5c5a5b47d4be4db18e6d0765c652f5b0e18ea17ecb55112fc70f7033bd SHA512 9a8b3d2296e4966d7209bdef3cd4c40f65a81ab5c2220d6b8ea06fd35ebad272a09a39b7f4e352eff32ad82babfbbec6c4f108d200193b3f84b225f739e0afc6
-AUX lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch 2748 BLAKE2B 40b64eb5937ba162b6084f1cf8cdd977146593573127eea6635d389777d5620db1daa7133299445b56b7dba0444b5958d1107f097ec94e5d17014fbb17419d8e SHA512 632080b067a68f65b20d3e96f36616a494d1aabbbc1465a83058574bb0ec49b72f9413e60175d599137a85674f6bb3a9c0e89296101314fe0e127a843b5578c0
-AUX lvm2-2.02.184-dmeventd-no-idle-exit.patch 2468 BLAKE2B e59873c7da99a8e62f71c78b1e93d54c342258949719fabdf2b08b0fcbf00ddcd3c8eb2a937416c646a948dda91474d2ad2187fcb880152986c7f6936bbee1ee SHA512 02a82cde3affd8e84b9800ad06c0c2ec9562f9412157e4f9ba96ef502a22d7870ece3d867684cf90c32ebc77bad8ae3beef5a3fe606ef7c30ad1b2b73e81de1a
 AUX lvm2-2.02.184-mksh_build.patch 505 BLAKE2B c54a78589a409488a3356a3e0c3de251a1315e5e9497bed3480781cd0bf40ffbd05c97c9025fab0b43014c501771b8db4358aaff2a12a07a881fb87573b1e5c0 SHA512 20bd0cc039d113ad63608a0eb56bb9000d38c29a5ed64b88ca89aa20411d2ba77e6f5f34b99815ed3cc1ea8cf90b2d9bfb82c4d80a5944f2fc9a631a781bc0d3
-AUX lvm2-2.02.186-udev_remove_unsupported_option.patch 1149 BLAKE2B c2faaec3f9cc899515ae189e1c91bd2dc6b48f9e27fd267030fcb60d0dc61bce3062e25568052246f3981a5ac18dc7f88990db856df83e4fa88d11a8c3df0736 SHA512 1e8623368add4f9ce6278568fe98b7cc90da6b7c313345fe26c4a59ef07c000b5d3175e157989a0065f03d4186f679c2c81ec8265143dba91ceecee6cebdccf4
 AUX lvm2-2.02.56-lvm2create_initrd.patch 2032 BLAKE2B 5533ceb7a601d58995e7a90b1355508907edb30d14704b397a8c8ba0d66dbcd3d6b02ace1cadef1dfbb1d927449403f76f0f38e5d034344b3232deb512507cb6 SHA512 b2a1705fa6b962027ebc5047583547489afe8ef8d8977c6284a28d0a8b0e05e20e6c48bd6c02a8bb02de9cfb40ac2d6e2a4b8ed8ef8c4ae7b6ea9a29bc4194de
-AUX lvm2-2.02.63-always-make-static-libdm.patch 1420 BLAKE2B baf7010b5965f5c2b9a32ec812cb259cb3ceccea0d56e48d75e9f8e872634913f160fcfff0c2c77854ddfeaafb3b48bbca16d569041ab6f45aecb950f8e5bf4a SHA512 67735af9e51369d5b3b400cab4f9ffa25f8dea1c1ec3d01855cb3c5aeade5c39a35eeed43f3a665204fe6bbba4ca43baecd845330bf26d023064b94ca3d1317c
 AUX lvm2-2.02.67-createinitrd.patch 660 BLAKE2B 23e784e6769bc1f47fa57d690e6bebdf16d784d775a06af1c8eb7c54dd63a12abb0edd8331c8d033d7a0dda058252453a46dd35bd820fd47ba1407e9568b3858 SHA512 17fbba5d34ece5c1c25ef35fa3bbc3d6fcd20b44bd766c049bbc120853a8d60c9544db5790645a7814db5c272fd12d383699a8a9be6f4e9c56a7c0a1bb29ade2
 AUX lvm2-2.02.99-locale-muck.patch 405 BLAKE2B 07ac7c7f54d06dbdeae1c6bf0959fd0c223b30cbd67c08f853e02f520d212f7b6dcf7c3b6c3d3b7370bb004adbb23b226bf0d0792b5799ddbaff5ab655124ca2 SHA512 1c898693f71d165d55458ab87886a25206930c202b5aea95eba394ad06162cc710c1435e598acb9bcd3fbf46abf5409be972f6ce73bd02b2e177e1af780ae7ad
 AUX lvm2-2.03.05-dmeventd-no-idle-exit.patch 2737 BLAKE2B 957f51a45f41920e73141cff56612e1bc334ef455fe262f1563d7c476ed534922f8f7a5f99d4f8ad69bb8830b7b1b97cf7afeb9a628058d54ffcef9d6497956f SHA512 c8ba4930114d8f6af230c21840e966def269e064c2236db6402a527f4e4050762082f37a770c551d3dab8d1b21642cfee701e48231f2bf42d50e41056725b711
@@ -35,8 +25,6 @@ AUX lvm2-2.03.14-static-pkgconfig-libs.patch 4600 BLAKE2B 18fb5d69fb77625189539a
 AUX lvmetad.initd-2.02.116-r3 345 BLAKE2B d458efd01fa08debe0857072c880adf951477445dd619a052f50cab9da39d8a38c9d480fc2d20fe899e01dcbcdaea0696d5c3e65af128652feea3186857d206e SHA512 f3143c6e1d00893009c68141f5ffd7e1e6bcf5b7ef0ff8505bc6c7049d83b2f9ddd2dc5a3cfdc2641a20603830b5dba07d73740cc5ce82e6b1b602a9b737a241
 AUX lvmlockd.initd-2.02.166-r1 390 BLAKE2B aebfa2a654eca784da24fd4e4d46b3e6c97256a42b725e015a13c9673e79c0d1a10213d1eecb6c75d4ce1ebd99e6200010f19c36d758018bdef303ea08ee5549 SHA512 6359b3cbff1fa05944fb69582234220cac593b2c8f8317162a728bac72ced4f8b492ce11e6ced6d848a7654fa4a506c1e658f546cff302344a739646479a62dc
 AUX lvmpolld.initd-2.02.183 348 BLAKE2B cba0419add6591320dc60ef7616b66706e042b566284a4ec42002fbb5331a7173fc8b4b39be7198426fe4bbdcd3ad94b69fc3d8950705b6331c5f3f4cda4ad66 SHA512 b9b8376cbc8b6703868afab18e5baa4ef5354569e57f0596d38a8005fa725299f6858ac86b39fcca10e5a0f1adbd3a4cfa6cc6b62405e78916cc1287d8b36d0d
-DIST LVM2.2.02.188.tgz 2421550 BLAKE2B bed90c8454cd4b20fdeec6dcbf5a9f97c9310671aea3b2252f8069cfa439fcb050f5ad95f928a7125a1734a4dc5ac985da99a4a570538e377a7205191a505476 SHA512 8c9db17c49dc8ebcab6c7f246ab85870a80658be811cf7f4d8f36abbebafa355b030bfc1e3bcbad73ccccb7fcd06d4a95ac547ca15d18d33715126da92703dca
 DIST LVM2.2.03.14.tgz 2639538 BLAKE2B 806f5e9cb76a05febef6f8ce8cfc42c92927b9538f62a21029c5ffc426a4fd7c3f32709be08dbd8028b53891b1075d1d13cb3b0d7b1815071ee8eb927d8f3ed3 SHA512 6a93bed1d5cf36f0f48d4d413d028b0e480cd4fc20e25d173770a892f265d2a0cc68d01a720b1513469953649e989532cd0c45f9538f92a4190eb3dc4555857d
-EBUILD lvm2-2.02.188-r3.ebuild 10277 BLAKE2B f276a47825b148aaca7b5248693d59f1fa2fb1cd67207f51f59e2ad3a92496bd63ed7c425ee60560fdaca624a2a81edf2dd1f02c9e80a184df6e1ac115c472ab SHA512 4cfdffdb6555ca357a88a936d560b9314cd1bcd0ef05bcfc9fbbac6069cd73e833bda57d10deed141781b55b8aec3a5f2ac8ee8145c065c55436a46a11284905
-EBUILD lvm2-2.03.14-r3.ebuild 10261 BLAKE2B 50c63d1884ab9e6a9e0b30fa495bb72c479567d138dd184c241b7a1eedd38b7870976a780ba748dbb43b5cf16ccbd298992668c94108e3d1b1729457d0a70bf0 SHA512 7c543627f0d21b10af4b3a55e5ee2f1f7cef26f7f4510d8ea82ec2912236cee4ed94f1702b536ef862c0d06c251ef0f12c2982f559d0f82be970b91ffc8a783e
+EBUILD lvm2-2.03.14-r3.ebuild 9996 BLAKE2B 6b362736c095df126b9b6ebcea21cec474f0b194cf186b7af2568820cfb2521accdaa5f4247cb5a205190c741ca866bfc409cede0b814ac12a3c1e1003df60fd SHA512 a5931ee69d8a3fb9d32ad7e8fe91c9a9d07224f4b220e1b5a6dce290ea73c87eeb125ddc0c466c7bd4aa854f8c98af4a0e7d878f6a0be101dda6288f3f63760e
 MISC metadata.xml 924 BLAKE2B f8999a0d015771eab5a4f84adac00267d7bd04b5890838e155e75208eb4ba0d8440db090b6fd877c34528fd89fd25bc68051f127a43c75af978f2fedcc9d787a SHA512 670cc840de3818ee976269902fc4ef8e7b57c38960475f702e9340c9e847a2121f92fcd58ea506e2907e4939b5596cdf72207a3a276dcfa1374be14530268c00
diff --git a/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch b/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch
deleted file mode 100644
index 1cbf956db258..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.171-static-libm.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-diff --git a/make.tmpl.in b/make.tmpl.in
-index a40eaaa15..7eea943aa 100644
---- a/make.tmpl.in
-+++ b/make.tmpl.in
-@@ -53,7 +53,7 @@ PYCOMPILE = $(top_srcdir)/autoconf/py-compile
- 
- LIBS = @LIBS@
- # Extra libraries always linked with static binaries
--STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS)
-+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS) $(M_LIBS)
- DEFS += @DEFS@
- # FIXME set this only where it's needed, not globally?
- CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
diff --git a/sys-fs/lvm2/files/lvm2-2.02.176-pthread-pkgconfig.patch b/sys-fs/lvm2/files/lvm2-2.02.176-pthread-pkgconfig.patch
deleted file mode 100644
index c0265e81268a..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.176-pthread-pkgconfig.patch
+++ /dev/null
@@ -1,29 +0,0 @@
---- LVM2.2.02.176/libdm/libdevmapper.pc.in
-+++ LVM2.2.02.176/libdm/libdevmapper.pc.in
-@@ -9,4 +9,4 @@
- Cflags: -I${includedir} 
- Libs: -L${libdir} -ldevmapper
- Requires.private: @SELINUX_PC@ @UDEV_PC@
--Libs.private: -lm @RT_LIBS@
-+Libs.private: -lm @RT_LIBS@ @PTHREAD_LIBS@
---- LVM2.2.02.176/tools/Makefile.in
-+++ LVM2.2.02.176/tools/Makefile.in
-@@ -93,6 +93,7 @@
-   INSTALL_LVM_TARGETS += install_tools_static
-   INSTALL_DMSETUP_TARGETS += install_dmsetup_static
-   INSTALL_CMDLIB_TARGETS += install_cmdlib_static
-+  STATIC_LIBS += @PTHREAD_LIBS@
- endif
- 
- LVMLIBS = $(LVMINTERNAL_LIBS) -ldevmapper
-@@ -118,6 +119,10 @@
- 
- include $(top_builddir)/make.tmpl
- 
-+ifeq ("@STATIC_LINK@", "yes")
-+  STATIC_LIBS += @PTHREAD_LIBS@
-+endif
-+
- device-mapper: $(TARGETS_DM)
- 
- CFLAGS_dmsetup.o += $(UDEV_CFLAGS) $(EXTRA_EXEC_CFLAGS)
diff --git a/sys-fs/lvm2/files/lvm2-2.02.178-asneeded.patch b/sys-fs/lvm2/files/lvm2-2.02.178-asneeded.patch
deleted file mode 100644
index c831c6d6e60c..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.178-asneeded.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-http://bugs.gentoo.org/330255
-
-liblvm2app.so: undefined reference to `floor'
-
---- LVM2.2.02.178/liblvm/Makefile.in
-+++ LVM2.2.02.178/liblvm/Makefile.in
-@@ -43,7 +43,7 @@
- include $(top_builddir)/make.tmpl
- 
- LDFLAGS += -L$(top_builddir)/lib -L$(top_builddir)/daemons/dmeventd
--LIBS += $(LVMINTERNAL_LIBS) -ldevmapper -laio
-+LIBS += $(LVMINTERNAL_LIBS) -ldevmapper -laio -lm
- 
- .PHONY: install_dynamic install_static install_include install_pkgconfig
- 
diff --git a/sys-fs/lvm2/files/lvm2-2.02.178-dynamic-static-ldflags.patch b/sys-fs/lvm2/files/lvm2-2.02.178-dynamic-static-ldflags.patch
deleted file mode 100644
index 0a0e73209062..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.178-dynamic-static-ldflags.patch
+++ /dev/null
@@ -1,59 +0,0 @@
---- LVM2.2.02.178/configure.ac
-+++ LVM2.2.02.178/configure.ac
-@@ -33,6 +33,7 @@
- 		CLDFLAGS="$CLDFLAGS -Wl,--version-script,.export.sym"
- 		# equivalent to -rdynamic
- 		ELDFLAGS="-Wl,--export-dynamic"
-+		STATIC_LDFLAGS="-Wl,--no-export-dynamic"
- 		# FIXME Generate list and use --dynamic-list=.dlopen.sym
- 		CLDWHOLEARCHIVE="-Wl,-whole-archive"
- 		CLDNOWHOLEARCHIVE="-Wl,-no-whole-archive"
-@@ -2042,6 +2043,7 @@
- AC_SUBST(SYSTEMD_LIBS)
- AC_SUBST(SNAPSHOTS)
- AC_SUBST(STATICDIR)
-+AC_SUBST(STATIC_LDFLAGS)
- AC_SUBST(STATIC_LINK)
- AC_SUBST(TESTSUITE_DATA)
- AC_SUBST(THIN)
---- LVM2.2.02.178/daemons/dmeventd/Makefile.in
-+++ LVM2.2.02.178/daemons/dmeventd/Makefile.in
-@@ -64,7 +64,7 @@
- 		-o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS)
- 
- dmeventd.static: $(LIB_STATIC) dmeventd.o $(interfacebuilddir)/libdevmapper.a
--	$(CC) $(CFLAGS) $(LDFLAGS) -static -L. -L$(interfacebuilddir) dmeventd.o \
-+	$(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L. -L$(interfacebuilddir) dmeventd.o \
- 		-o $@ $(DL_LIBS) $(DMEVENT_LIBS) $(LIBS) $(STATIC_LIBS)
- 
- ifeq ("@PKGCONFIG@", "yes")
---- LVM2.2.02.178/make.tmpl.in
-+++ LVM2.2.02.178/make.tmpl.in
-@@ -64,6 +64,7 @@
- # FIXME set this only where it's needed, not globally?
- CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
- LDFLAGS ?= @LDFLAGS@
-+STATIC_LDFLAGS += @STATIC_LDFLAGS@
- CLDFLAGS += @CLDFLAGS@
- ELDFLAGS += @ELDFLAGS@
- LDDEPS += @LDDEPS@
---- LVM2.2.02.178/tools/Makefile.in
-+++ LVM2.2.02.178/tools/Makefile.in
-@@ -129,7 +129,7 @@
- 
- dmsetup.static: dmsetup.o $(interfacebuilddir)/libdevmapper.a
- 	@echo "    [CC] $@"
--	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) \
-+	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) \
- 	      -o $@ dmsetup.o -ldevmapper $(M_LIBS) $(PTHREAD_LIBS) $(STATIC_LIBS) $(LIBS)
- 
- all: device-mapper
-@@ -159,7 +159,7 @@
- 
- lvm.static: $(OBJECTS) lvm-static.o $(top_builddir)/lib/liblvm-internal.a  $(interfacebuilddir)/libdevmapper.a
- 	@echo "    [CC] $@"
--	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
-+	$(Q) $(CC) $(CFLAGS) $(LDFLAGS) $(STATIC_LDFLAGS) -static -L$(interfacebuilddir) -o $@ \
- 	      $(OBJECTS) lvm-static.o $(LVMLIBS) $(STATIC_LIBS) $(LIBS)
- 
- liblvm2cmd.a: $(top_builddir)/lib/liblvm-internal.a $(OBJECTS) lvmcmdlib.o lvm2cmd.o
diff --git a/sys-fs/lvm2/files/lvm2-2.02.178-example.conf.in.patch b/sys-fs/lvm2/files/lvm2-2.02.178-example.conf.in.patch
deleted file mode 100644
index 34c710d4392c..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.178-example.conf.in.patch
+++ /dev/null
@@ -1,50 +0,0 @@
---- LVM2.2.02.178/conf/example.conf.in
-+++ LVM2.2.02.178/conf/example.conf.in
-@@ -128,6 +128,9 @@
- 	# Example
- 	# Accept every block device:
- 	# filter = [ "a|.*/|" ]
-+	# Gentoo: we exclude /dev/nbd by default, because it makes a lot of kernel
-+	# noise when you probed while not available.
-+	filter = [ "r|/dev/nbd.*|", "a/.*/" ]
- 	# Reject the cdrom drive:
- 	# filter = [ "r|/dev/cdrom|" ]
- 	# Work with just loopback devices, e.g. for testing:
-@@ -704,7 +707,8 @@
- 	# Configuration option global/fallback_to_lvm1.
- 	# This setting is no longer used.
- 	# This configuration option has an automatic default value.
--	# fallback_to_lvm1 = 0
-+	# Gentoo: the LVM tools are a seperate package.
-+	fallback_to_lvm1 = 0
- 
- 	# Configuration option global/format.
- 	# This setting is no longer used.
-@@ -1508,7 +1512,7 @@
- 
- # Configuration section metadata.
- # This configuration section has an automatic default value.
--# metadata {
-+metadata {
- 
- 	# Configuration option metadata/check_pv_device_sizes.
- 	# Check device sizes are not smaller than corresponding PV sizes.
-@@ -1553,7 +1557,8 @@
- 	# 
- 	# This configuration option is advanced.
- 	# This configuration option has an automatic default value.
--	# pvmetadatacopies = 1
-+	# Gentoo: enable for data safety, but PV resize is then disabled.
-+	# pvmetadatacopies = 2
- 
- 	# Configuration option metadata/vgmetadatacopies.
- 	# Number of copies of metadata to maintain for each VG.
-@@ -1608,7 +1613,7 @@
- 	# 
- 	# This configuration option is advanced.
- 	# This configuration option does not have a default value defined.
--# }
-+}
- 
- # Configuration section report.
- # LVM report command output formatting.
diff --git a/sys-fs/lvm2/files/lvm2-2.02.178-static-pkgconfig-libs.patch b/sys-fs/lvm2/files/lvm2-2.02.178-static-pkgconfig-libs.patch
deleted file mode 100644
index 989b3082576d..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.178-static-pkgconfig-libs.patch
+++ /dev/null
@@ -1,102 +0,0 @@
---- LVM2.2.02.178/configure.ac
-+++ LVM2.2.02.178/configure.ac
-@@ -1238,6 +1238,7 @@
- 	PKG_CHECK_MODULES(BLKID, blkid >= 2.24,
- 			  [ BLKID_WIPING=yes
- 			    BLKID_PC="blkid"
-+			    BLKID_STATIC_LIBS=`$PKG_CONFIG --static --libs $BLKID_PC`
- 			    DEFAULT_USE_BLKID_WIPING=1
- 			    AC_DEFINE([BLKID_WIPING_SUPPORT], 1, [Define to 1 to use libblkid detection of signatures when wiping.])
- 			  ], [if test "$BLKID_WIPING" = maybe; then
-@@ -1286,6 +1287,7 @@
- if test "$UDEV_SYNC" = yes; then
- 	pkg_config_init
- 	PKG_CHECK_MODULES(UDEV, libudev >= 143, [UDEV_PC="libudev"])
-+	UDEV_STATIC_LIBS=`$PKG_CONFIG --static --libs libudev`
- 	AC_DEFINE([UDEV_SYNC_SUPPORT], 1, [Define to 1 to enable synchronisation with udev processing.])
- 
- 	AC_CHECK_LIB(udev, udev_device_get_is_initialized, AC_DEFINE([HAVE_LIBUDEV_UDEV_DEVICE_GET_IS_INITIALIZED], 1,
-@@ -1564,19 +1566,32 @@
- if test "$SELINUX" = yes; then
- 	AC_CHECK_LIB([sepol], [sepol_check_context], [
- 		AC_DEFINE([HAVE_SEPOL], 1, [Define to 1 if sepol_check_context is available.])
--		SELINUX_LIBS="-lsepol"])
-+		SEPOL_LIBS="-lsepol"])
-+
-+	dnl -- init pkgconfig if required
-+	if  test x$PKGCONFIG_INIT != x1; then
-+		pkg_config_init
-+	fi
-+	PKG_CHECK_MODULES(SELINUX, libselinux, [
-+		SELINUX_PC="libselinux"
-+		SELINUX_STATIC_LIBS=`$PKG_CONFIG --static --libs libselinux`
-+		SELINUX_LIBS="$SELINUX_LIBS $SEPOL_LIBS"
-+		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
-+	],[
-+		dnl -- old non-pkgconfig method, is buggy with static builds
- 
- 	AC_CHECK_LIB([selinux], [is_selinux_enabled], [
- 		AC_CHECK_HEADERS([selinux/selinux.h],, hard_bailout)
- 		AC_CHECK_HEADERS([selinux/label.h])
- 		AC_DEFINE([HAVE_SELINUX], 1, [Define to 1 to include support for selinux.])
--		SELINUX_LIBS="-lselinux $SELINUX_LIBS"
-+		SELINUX_LIBS="-lselinux $SEPOL_LIBS"
- 		SELINUX_PC="libselinux"
- 		HAVE_SELINUX=yes ], [
- 		AC_MSG_WARN(Disabling selinux)
- 		SELINUX_LIBS=
- 		SELINUX_PC=
- 		HAVE_SELINUX=no ])
-+	])
- fi
- 
- ################################################################################
-@@ -1927,6 +1942,7 @@
- ################################################################################
- AC_SUBST(APPLIB)
- AC_SUBST(AWK)
-+AC_SUBST(BLKID_STATIC_LIBS)
- AC_SUBST(BLKID_PC)
- AC_SUBST(BUILD_CMIRRORD)
- AC_SUBST(BUILD_DMEVENTD)
-@@ -2037,6 +2053,7 @@
- AC_SUBST(SALCK_LIBS)
- AC_SUBST(SBINDIR)
- AC_SUBST(SELINUX_LIBS)
-+AC_SUBST(SELINUX_STATIC_LIBS)
- AC_SUBST(SELINUX_PC)
- AC_SUBST(SYSCONFDIR)
- AC_SUBST(SYSTEMD_LIBS)
-@@ -2053,6 +2070,7 @@
- AC_SUBST(CACHE_DUMP_CMD)
- AC_SUBST(CACHE_REPAIR_CMD)
- AC_SUBST(CACHE_RESTORE_CMD)
-+AC_SUBST(UDEV_STATIC_LIBS)
- AC_SUBST(UDEV_PC)
- AC_SUBST(UDEV_RULES)
- AC_SUBST(UDEV_SYNC)
---- LVM2.2.02.178/make.tmpl.in
-+++ LVM2.2.02.178/make.tmpl.in
-@@ -59,7 +59,7 @@
- 
- LIBS = @LIBS@
- # Extra libraries always linked with static binaries
--STATIC_LIBS = $(SELINUX_LIBS) $(UDEV_LIBS) $(BLKID_LIBS)
-+STATIC_LIBS = $(SELINUX_STATIC_LIBS) $(UDEV_STATIC_LIBS) $(BLKID_STATIC_LIBS)
- DEFS += @DEFS@
- # FIXME set this only where it's needed, not globally?
- CFLAGS ?= @COPTIMISE_FLAG@ @CFLAGS@
-@@ -75,10 +75,13 @@
- PTHREAD_LIBS = @PTHREAD_LIBS@
- READLINE_LIBS = @READLINE_LIBS@
- SELINUX_LIBS = @SELINUX_LIBS@
-+SELINUX_STATIC_LIBS = @SELINUX_STATIC_LIBS@
- UDEV_CFLAGS = @UDEV_CFLAGS@
- UDEV_LIBS = @UDEV_LIBS@
-+UDEV_STATIC_LIBS = @UDEV_STATIC_LIBS@
- BLKID_CFLAGS = @BLKID_CFLAGS@
- BLKID_LIBS = @BLKID_LIBS@
-+BLKID_STATIC_LIBS = @BLKID_STATIC_LIBS@
- SYSTEMD_LIBS = @SYSTEMD_LIBS@
- VALGRIND_CFLAGS = @VALGRIND_CFLAGS@
- 
diff --git a/sys-fs/lvm2/files/lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch b/sys-fs/lvm2/files/lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch
deleted file mode 100644
index 34968c7c2eb7..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From a397b69ce33d811aba7d64d54b5c8e0efb86fd15 Mon Sep 17 00:00:00 2001
-From: Zdenek Kabelac <zkabelac@redhat.com>
-Date: Fri, 10 May 2019 14:40:11 +0200
-Subject: [PATCH] metadata: allow reading metadata with invalid creation_time
-
-lvm2 till version 2.02.169 (commit 78d004efa8a1809cea68283e6204edfa9d7c1091)
-was printing invalid creation_time argument into metadata on 32bit arch.
-
-However with commit ba9820b14223b731125c83dbc9709aa44fdcdbf1 we started
-to properly validate all input numbers and thus we refused to accept
-invalid metadata with 'garbage' string - but this results in the
-situation where metadata produced on older lvm2 on 32 bit architecture
-will become unreadable after upgrade.
-
-To fix this case - extend libdm parser in a way, that whenever we
-find error integer value, we also check if the parsed value is not for
-creation_time node and in this case we let the metadata pass through
-with made-up date 2018-05-24 (release date of 2.02.169).
----
- libdm/libdm-config.c | 18 +++++++++++++++---
- 1 file changed, 15 insertions(+), 3 deletions(-)
-
-diff --git a/libdm/libdm-config.c b/libdm/libdm-config.c
-index 3f0d2510e..382f86bbf 100644
---- a/libdm/libdm-config.c
-+++ b/libdm/libdm-config.c
-@@ -51,6 +51,8 @@ struct parser {
- 
- 	struct dm_pool *mem;
- 	int no_dup_node_check;	/* whether to disable dup node checking */
-+	const char *key;        /* last obtained key */
-+	unsigned ignored_creation_time;
- };
- 
- struct config_output {
-@@ -176,7 +178,7 @@ static int _do_dm_config_parse(struct dm_config_tree *cft, const char *start, co
- 	/* TODO? if (start == end) return 1; */
- 
- 	struct parser *p;
--	if (!(p = dm_pool_alloc(cft->mem, sizeof(*p))))
-+	if (!(p = dm_pool_zalloc(cft->mem, sizeof(*p))))
- 		return_0;
- 
- 	p->mem = cft->mem;
-@@ -615,6 +617,7 @@ static struct dm_config_node *_section(struct parser *p, struct dm_config_node *
- 		match(TOK_SECTION_E);
- 	} else {
- 		match(TOK_EQ);
-+		p->key = root->key;
- 		if (!(value = _value(p)))
- 			return_NULL;
- 		if (root->v)
-@@ -682,8 +685,17 @@ static struct dm_config_value *_type(struct parser *p)
- 		errno = 0;
- 		v->v.i = strtoll(p->tb, NULL, 0);	/* FIXME: check error */
- 		if (errno) {
--			log_error("Failed to read int token.");
--			return NULL;
-+			if (errno == ERANGE && p->key &&
-+			    strcmp("creation_time", p->key) == 0) {
-+				/* Due to a bug in some older 32bit builds (<2.02.169),
-+				 * lvm was able to produce invalid creation_time string */
-+				v->v.i = 1527120000; /* Pick 2018-05-24 day instead */
-+				if (!p->ignored_creation_time++)
-+					log_warn("WARNING: Invalid creation_time found in metadata (repaired with next metadata update).");
-+			} else {
-+				log_error("Failed to read int token.");
-+				return NULL;
-+			}
- 		}
- 		match(TOK_INT);
- 		break;
diff --git a/sys-fs/lvm2/files/lvm2-2.02.184-dmeventd-no-idle-exit.patch b/sys-fs/lvm2/files/lvm2-2.02.184-dmeventd-no-idle-exit.patch
deleted file mode 100644
index c80bd2ba2bec..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.184-dmeventd-no-idle-exit.patch
+++ /dev/null
@@ -1,68 +0,0 @@
-From: "Robin H. Johnson" <robbat2@gentoo.org>
-Date: Wed, 17 Apr 2019 06:54:27 +0000
-Subject: [PATCH] dmeventd configurable idle exit time
-
-dmeventd nominally exits after 1 hour of idle time. There are use cases for
-this, esp. with socket activation, but also cases where users don't expect
-dmeventd to exit.
-
-Provide a tuning knob via environment variable, DMEVENTD_IDLE_EXIT_TIMEOUT,
-that can be -1 to not exit, or a configurable time for different idle exit.
-
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-Fixes: https://bugs.gentoo.org/682556
-
-diff -Nuar LVM2.2.02.184.orig/daemons/dmeventd/dmeventd.c LVM2.2.02.184/daemons/dmeventd/dmeventd.c
---- LVM2.2.02.184.orig/daemons/dmeventd/dmeventd.c	2019-03-22 03:14:59.000000000 -0700
-+++ LVM2.2.02.184/daemons/dmeventd/dmeventd.c	2019-04-17 00:18:23.535029906 -0700
-@@ -2158,6 +2158,18 @@
- 		.server_path = DM_EVENT_FIFO_SERVER
- 	};
- 	time_t now, idle_exit_timeout = DMEVENTD_IDLE_EXIT_TIMEOUT;
-+
-+	/* Provide a basic way to config the idle timeout */
-+	char* idle_exit_timeout_env = getenv("DMEVENTD_IDLE_EXIT_TIMEOUT") ? : NULL;
-+	if(NULL != idle_exit_timeout_env) {
-+		char* endptr;
-+		idle_exit_timeout = strtol(idle_exit_timeout_env, &endptr, 10);
-+		if (errno == ERANGE || *endptr != '\0') {
-+			fprintf(stderr, "DMEVENTD_IDLE_EXIT_TIMEOUT: bad time input\n");
-+			exit(EXIT_FAILURE);
-+		}
-+	}
-+
- 	opterr = 0;
- 	optind = 0;
- 
-@@ -2253,7 +2265,7 @@
- 		_process_initial_registrations();
- 
- 	for (;;) {
--		if (_idle_since) {
-+		if (_idle_since || _exit_now) {
- 			if (_exit_now) {
- 				if (_exit_now == DM_SCHEDULED_EXIT)
- 					break; /* Only prints shutdown message */
-@@ -2262,7 +2274,7 @@
- 					 (long) (time(NULL) - _idle_since));
- 				break;
- 			}
--			if (idle_exit_timeout) {
-+			if (idle_exit_timeout && idle_exit_timeout > 0) {
- 				now = time(NULL);
- 				if (now < _idle_since)
- 					_idle_since = now; /* clock change? */
-diff -Nuar LVM2.2.02.184.orig/man/dmeventd.8_main LVM2.2.02.184/man/dmeventd.8_main
---- LVM2.2.02.184.orig/man/dmeventd.8_main	2019-03-22 03:15:00.000000000 -0700
-+++ LVM2.2.02.184/man/dmeventd.8_main	2019-04-17 00:17:46.076023638 -0700
-@@ -143,6 +143,10 @@
- Variable is set by thin plugin to prohibit recursive interation
- with dmeventd by any executed lvm2 command from
- a thin_command environment.
-+.TP
-+.B DMEVENTD_IDLE_EXIT_TIMEOUT
-+Configure the dmeventd idle exit timeout behavior, value in seconds. Default
-+is 3600 (1 hour). -1 means do not exit.
- .
- .SH SEE ALSO
- .
diff --git a/sys-fs/lvm2/files/lvm2-2.02.186-udev_remove_unsupported_option.patch b/sys-fs/lvm2/files/lvm2-2.02.186-udev_remove_unsupported_option.patch
deleted file mode 100644
index f895e1921e09..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.186-udev_remove_unsupported_option.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-From f98f79a047dd1c4980008e0ed6c9ad4e18596cdc Mon Sep 17 00:00:00 2001
-From: Peter Rajnoha <prajnoha@redhat.com>
-Date: Tue, 13 Aug 2019 15:18:30 +0200
-Subject: [PATCH] udev: remove unsupported OPTIONS+="event_timeout" rule
-
-The OPTIONS+="event_timeout" is Unsupported since systemd/udev version 216,
-that is ~5 years ago.
-
-Since systemd/udev version 243, there's a new message printed if unsupported
-OPTIONS value is used:
-
-  Invalid value for OPTIONS key, ignoring: 'event_timeout=180'
-
-Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1740666
----
- udev/11-dm-lvm.rules.in | 2 --
- 1 file changed, 2 deletions(-)
-
-diff --git a/udev/11-dm-lvm.rules.in b/udev/11-dm-lvm.rules.in
-index 91cb991df9..7c589943b7 100644
---- a/udev/11-dm-lvm.rules.in
-+++ b/udev/11-dm-lvm.rules.in
-@@ -37,8 +37,6 @@ ENV{DM_SUBSYSTEM_UDEV_FLAG0}!="1", ENV{DM_NOSCAN}=="1", ENV{DM_UDEV_DISABLE_OTHE
- 
- ENV{DM_UDEV_DISABLE_SUBSYSTEM_RULES_FLAG}=="1", GOTO="lvm_end"
- 
--OPTIONS+="event_timeout=180"
--
- # Do not create symlinks for inappropriate subdevices.
- ENV{DM_LV_NAME}=="pvmove?*|?*_vorigin", GOTO="lvm_disable"
- ENV{DM_LV_LAYER}=="?*", GOTO="lvm_disable"
--- 
-2.24.0
-
diff --git a/sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch b/sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch
deleted file mode 100644
index 5ddcb4e56711..000000000000
--- a/sys-fs/lvm2/files/lvm2-2.02.63-always-make-static-libdm.patch
+++ /dev/null
@@ -1,42 +0,0 @@
-diff -Nuar --exclude '*~' LVM2.2.02.63.orig/daemons/dmeventd/Makefile.in LVM2.2.02.63/daemons/dmeventd/Makefile.in
---- LVM2.2.02.63.orig/daemons/dmeventd/Makefile.in	2010-04-09 14:42:48.000000000 -0700
-+++ LVM2.2.02.63/daemons/dmeventd/Makefile.in	2010-04-19 11:53:27.000000000 -0700
-@@ -28,11 +28,12 @@
- INSTALL_LIB_TARGETS = install_lib_dynamic
- 
- LIB_NAME = libdevmapper-event
-+LIB_STATIC = $(LIB_NAME).a
-+INSTALL_LIB_TARGETS += install_lib_static
-+TARGETS += $(LIB_STATIC)
- ifeq ("@STATIC_LINK@", "yes")
--  LIB_STATIC = $(LIB_NAME).a
--  TARGETS += $(LIB_STATIC) dmeventd.static
-+  TARGETS += dmeventd.static
-   INSTALL_DMEVENTD_TARGETS += install_dmeventd_static
--  INSTALL_LIB_TARGETS += install_lib_static
- endif
- 
- LIB_VERSION = $(LIB_VERSION_DM)
-diff -Nuar --exclude '*~' LVM2.2.02.63.orig/libdm/Makefile.in LVM2.2.02.63/libdm/Makefile.in
---- LVM2.2.02.63.orig/libdm/Makefile.in	2010-04-09 14:42:51.000000000 -0700
-+++ LVM2.2.02.63/libdm/Makefile.in	2010-04-19 11:52:20.000000000 -0700
-@@ -34,8 +34,8 @@
- 
- INCLUDES = -I$(srcdir)/$(interface) -I$(srcdir)
- 
--ifeq ("@STATIC_LINK@", "yes")
- LIB_STATIC = $(interface)/libdevmapper.a
-+ifeq ("@STATIC_LINK@", "yes")
- endif
- 
- LIB_SHARED = $(interface)/libdevmapper.$(LIB_SUFFIX)
-@@ -63,8 +63,8 @@
- 
- INSTALL_TYPE = install_dynamic
- 
--ifeq ("@STATIC_LINK@", "yes")
-   INSTALL_TYPE += install_static
-+ifeq ("@STATIC_LINK@", "yes")
- endif
- 
- ifeq ("@PKGCONFIG@", "yes")
diff --git a/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild b/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild
deleted file mode 100644
index e6fd683ff142..000000000000
--- a/sys-fs/lvm2/lvm2-2.02.188-r3.ebuild
+++ /dev/null
@@ -1,308 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-TMPFILES_OPTIONAL=1
-inherit autotools linux-info systemd toolchain-funcs tmpfiles udev flag-o-matic
-
-DESCRIPTION="User-land utilities for LVM2 (device-mapper) software"
-HOMEPAGE="https://sourceware.org/lvm2/"
-SRC_URI="ftp://sourceware.org/pub/lvm2/${PN/lvm/LVM}.${PV}.tgz
-	ftp://sourceware.org/pub/lvm2/old/${PN/lvm/LVM}.${PV}.tgz"
-
-LICENSE="GPL-2"
-SLOT="0"
-KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux"
-IUSE="readline static static-libs systemd lvm2create-initrd sanlock selinux +udev +thin device-mapper-only"
-REQUIRED_USE="device-mapper-only? ( !lvm2create-initrd !sanlock !thin )
-	static? ( !systemd !udev )
-	static-libs? ( !udev )
-	systemd? ( udev )"
-
-DEPEND_COMMON="
-	dev-libs/libaio[static-libs?]
-	static? ( dev-libs/libaio[static-libs] )
-	!static? ( dev-libs/libaio[static-libs?] )
-	readline? ( sys-libs/readline:0= )
-	sanlock? ( sys-cluster/sanlock )
-	systemd? ( >=sys-apps/systemd-205:0= )
-	udev? ( >=virtual/libudev-208:= )"
-# /run is now required for locking during early boot. /var cannot be assumed to
-# be available -- thus, pull in recent enough baselayout for /run.
-# This version of LVM is incompatible with cryptsetup <1.1.2.
-RDEPEND="${DEPEND_COMMON}
-	>=sys-apps/baselayout-2.2
-	>=sys-apps/util-linux-2.16
-	lvm2create-initrd? ( sys-apps/makedev )
-	!device-mapper-only? ( virtual/tmpfiles )
-	thin? ( >=sys-block/thin-provisioning-tools-0.3.0 )"
-# note: thin- 0.3.0 is required to avoid --disable-thin_check_needs_check
-DEPEND="${DEPEND_COMMON}
-	static? (
-		selinux? ( sys-libs/libselinux[static-libs] )
-		>=sys-apps/util-linux-2.16[static-libs]
-	)"
-BDEPEND="
-	sys-devel/autoconf-archive
-	virtual/pkgconfig
-"
-
-S="${WORKDIR}/${PN/lvm/LVM}.${PV}"
-
-PATCHES=(
-	# Gentoo specific modification(s):
-	"${FILESDIR}"/${PN}-2.02.178-example.conf.in.patch
-
-	# For upstream -- review and forward:
-	"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch
-	"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
-	"${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
-	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
-	"${FILESDIR}"/${PN}-2.02.178-dynamic-static-ldflags.patch #332905
-	"${FILESDIR}"/${PN}-2.02.178-static-pkgconfig-libs.patch #370217, #439414 + blkid
-	"${FILESDIR}"/${PN}-2.02.176-pthread-pkgconfig.patch #492450
-	"${FILESDIR}"/${PN}-2.02.171-static-libm.patch #617756
-	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
-	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
-	"${FILESDIR}"/${PN}-2.02.184-dmeventd-no-idle-exit.patch
-	#"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380 # merged upstream
-	"${FILESDIR}"/${PN}-2.02.184-mksh_build.patch #686652
-	"${FILESDIR}"/${PN}-2.02.186-udev_remove_unsupported_option.patch #700160
-)
-
-pkg_setup() {
-	local CONFIG_CHECK="~SYSVIPC"
-
-	if use udev; then
-		local WARNING_SYSVIPC="CONFIG_SYSVIPC:\tis not set (required for udev sync)\n"
-		if linux_config_exists; then
-			local uevent_helper_path=$(linux_chkconfig_string UEVENT_HELPER_PATH)
-			if [[ -n "${uevent_helper_path}" ]] && [[ "${uevent_helper_path}" != '""' ]]; then
-				ewarn "It's recommended to set an empty value to the following kernel config option:"
-				ewarn "CONFIG_UEVENT_HELPER_PATH=${uevent_helper_path}"
-			fi
-		fi
-	fi
-
-	check_extra_config
-
-	# 1. Genkernel no longer copies /sbin/lvm blindly.
-	if use static; then
-		elog "Warning, we no longer overwrite /sbin/lvm and /sbin/dmsetup with"
-		elog "their static versions. If you need the static binaries,"
-		elog "you must append .static to the filename!"
-	fi
-}
-
-src_prepare() {
-	default
-
-	sed -i \
-		-e "1iAR = $(tc-getAR)" \
-		-e "s:CC ?= @CC@:CC = $(tc-getCC):" \
-		make.tmpl.in || die #444082
-
-	sed -i -e '/FLAG/s:-O2::' configure{.ac,} || die #480212
-
-	if use udev && ! use device-mapper-only; then
-		sed -i -e '/use_lvmetad =/s:0:1:' conf/example.conf.in || die #514196
-		elog "Notice that \"use_lvmetad\" setting is enabled with USE=\"udev\" in"
-		elog "/etc/lvm/lvm.conf, which will require restart of udev, lvm, and lvmetad"
-		elog "if it was previously disabled."
-	fi
-
-	sed -i -e "s:/usr/bin/true:$(type -P true):" scripts/blk_availability_systemd_red_hat.service.in || die #517514
-
-	# Don't install thin man page when not requested
-	if ! use thin ; then
-		sed -i -e 's/^\(MAN7+=.*\) $(LVMTHINMAN) \(.*\)$/\1 \2/' man/Makefile.in || die
-	fi
-
-	eautoreconf
-}
-
-src_configure() {
-	filter-flags -flto
-	local myeconfargs=()
-
-	# Most of this package does weird stuff.
-	# The build options are tristate, and --without is NOT supported
-	# options: 'none', 'internal', 'shared'
-	myeconfargs+=(
-		$(use_enable !device-mapper-only dmfilemapd)
-		$(use_enable !device-mapper-only dmeventd)
-		$(use_enable !device-mapper-only cmdlib)
-		$(use_enable !device-mapper-only applib)
-		$(use_enable !device-mapper-only fsadm)
-		$(use_enable !device-mapper-only lvmetad)
-		$(use_enable !device-mapper-only lvmpolld)
-		$(usex device-mapper-only --disable-udev-systemd-background-jobs '')
-
-		# This only causes the .static versions to become available
-		$(usex static --enable-static_link '')
-
-		# dmeventd requires mirrors to be internal, and snapshot available
-		# so we cannot disable them
-		--with-mirrors="$(usex device-mapper-only none internal)"
-		--with-snapshots="$(usex device-mapper-only none internal)"
-
-		# disable O_DIRECT support on hppa, breaks pv detection (#99532)
-		$(usex hppa --disable-o_direct '')
-	)
-
-	if use thin; then
-		myeconfargs+=( --with-thin=internal --with-cache=internal )
-		local texec
-		for texec in check dump repair restore; do
-			myeconfargs+=( --with-thin-${texec}="${EPREFIX}"/sbin/thin_${texec} )
-			myeconfargs+=( --with-cache-${texec}="${EPREFIX}"/sbin/cache_${texec} )
-		done
-	else
-		myeconfargs+=( --with-thin=none --with-cache=none )
-	fi
-
-	myeconfargs+=( --with-clvmd=none --with-cluster=none )
-
-	myeconfargs+=(
-		$(use_enable readline)
-		$(use_enable selinux)
-		--enable-pkgconfig
-		--with-confdir="${EPREFIX}"/etc
-		--exec-prefix="${EPREFIX}"
-		--sbindir="${EPREFIX}/sbin"
-		--with-staticdir="${EPREFIX}"/sbin
-		--libdir="${EPREFIX}/$(get_libdir)"
-		--with-usrlibdir="${EPREFIX}/usr/$(get_libdir)"
-		--with-default-dm-run-dir=/run
-		--with-default-run-dir=/run/lvm
-		--with-default-locking-dir=/run/lock/lvm
-		--with-default-pid-dir=/run
-		$(use_enable udev udev_rules)
-		$(use_enable udev udev_sync)
-		$(use_with udev udevdir "$(get_udevdir)"/rules.d)
-		$(use_enable sanlock lvmlockd-sanlock)
-		$(use_enable systemd udev-systemd-background-jobs)
-		$(use_enable systemd notify-dbus)
-		--with-systemdsystemunitdir="$(systemd_get_systemunitdir)"
-		CLDFLAGS="${LDFLAGS}"
-	)
-	# Hard-wire this to bash as some shells (dash) don't know
-	# "-o pipefail" #682404
-	CONFIG_SHELL="/bin/bash" \
-	econf "${myeconfargs[@]}"
-}
-
-src_compile() {
-	pushd include >/dev/null
-	emake V=1
-	popd >/dev/null
-
-	if use device-mapper-only ; then
-		emake V=1 device-mapper
-	else
-		emake V=1
-		emake V=1 CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
-	fi
-}
-
-src_test() {
-	einfo "Tests are disabled because of device-node mucking, if you want to"
-	einfo "run tests, compile the package and see ${S}/tests"
-}
-
-src_install() {
-	local inst
-	local INSTALL_TARGETS=( install install_tmpfiles_configuration )
-	# install systemd related files only when requested, bug #522430
-	use systemd && INSTALL_TARGETS+=( SYSTEMD_GENERATOR_DIR="$(systemd_get_systemgeneratordir)" install_systemd_units install_systemd_generators )
-	use device-mapper-only && INSTALL_TARGETS=( install_device-mapper )
-	emake V=1 DESTDIR="${D}" "${INSTALL_TARGETS[@]}"
-
-	newinitd "${FILESDIR}"/device-mapper.rc-2.02.105-r2 device-mapper
-	newconfd "${FILESDIR}"/device-mapper.conf-1.02.22-r3 device-mapper
-
-	if use !device-mapper-only ; then
-		newinitd "${FILESDIR}"/dmeventd.initd-2.02.184-r2 dmeventd
-		newinitd "${FILESDIR}"/lvm.rc-2.02.187 lvm
-		newconfd "${FILESDIR}"/lvm.confd-2.02.184-r3 lvm
-		if ! use udev ; then
-			# We keep the variable but remove udev from it.
-			sed -r -i \
-				-e '/^rc_need=/s/\<udev\>//g' \
-				"${ED}/etc/conf.d/lvm" || die "Could not drop udev from rc_need"
-		fi
-
-		newinitd "${FILESDIR}"/lvm-monitoring.initd-2.02.105-r2 lvm-monitoring
-		newinitd "${FILESDIR}"/lvmetad.initd-2.02.116-r3 lvmetad
-		newinitd "${FILESDIR}"/lvmpolld.initd-2.02.183 lvmpolld
-	fi
-
-	if use sanlock; then
-		newinitd "${FILESDIR}"/lvmlockd.initd-2.02.166-r1 lvmlockd
-	fi
-
-	if use static-libs; then
-		dolib.a libdm/ioctl/libdevmapper.a
-		if use !device-mapper-only; then
-			# depends on lvmetad
-			dolib.a libdaemon/client/libdaemonclient.a #462908
-			# depends on dmeventd
-			dolib.a daemons/dmeventd/libdevmapper-event.a
-		fi
-	else
-		rm -f "${ED}"/usr/$(get_libdir)/{libdevmapper-event,liblvm2cmd,liblvm2app,libdevmapper}.a
-	fi
-
-	if use lvm2create-initrd; then
-		dosbin scripts/lvm2create_initrd/lvm2create_initrd
-		doman scripts/lvm2create_initrd/lvm2create_initrd.8
-		newdoc scripts/lvm2create_initrd/README README.lvm2create_initrd
-	fi
-
-	insinto /etc
-	doins "${FILESDIR}"/dmtab
-
-	dodoc README VERSION* WHATS_NEW WHATS_NEW_DM doc/*.{c,txt} conf/*.conf
-}
-
-pkg_postinst() {
-	if ! use device-mapper-only; then
-		tmpfiles_process lvm2.conf
-	fi
-
-	if use udev; then
-		udev_reload
-	fi
-
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		ewarn "Make sure the \"lvm\" init script is in the runlevels:"
-		ewarn "# rc-update add lvm boot"
-		ewarn
-		ewarn "Make sure to enable lvmetad in /etc/lvm/lvm.conf if you want"
-		ewarn "to enable lvm autoactivation and metadata caching."
-	fi
-
-	if use udev && [[ -d /run ]] ; then
-		local permission_run_expected="drwxr-xr-x"
-		local permission_run=$(stat -c "%A" /run)
-		if [[ "${permission_run}" != "${permission_run_expected}" ]] ; then
-			ewarn "Found the following problematic permissions:"
-			ewarn ""
-			ewarn "    ${permission_run} /run"
-			ewarn ""
-			ewarn "Expected:"
-			ewarn ""
-			ewarn "    ${permission_run_expected} /run"
-			ewarn ""
-			ewarn "This is known to be causing problems for UDEV-enabled LVM services."
-		fi
-	fi
-}
-
-pkg_postrm() {
-	if use udev && [[ -z ${REPLACED_BY_VERSION} ]]; then
-		udev_reload
-	fi
-}
diff --git a/sys-fs/lvm2/lvm2-2.03.14-r3.ebuild b/sys-fs/lvm2/lvm2-2.03.14-r3.ebuild
index 09335d12ddaf..b0b0fa745cfe 100644
--- a/sys-fs/lvm2/lvm2-2.03.14-r3.ebuild
+++ b/sys-fs/lvm2/lvm2-2.03.14-r3.ebuild
@@ -55,20 +55,16 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-2.03.06-example.conf.in.patch
 
 	# For upstream -- review and forward:
-	#"${FILESDIR}"/${PN}-2.02.63-always-make-static-libdm.patch # FIXME: breaks libdm/dm-tools build
 	"${FILESDIR}"/${PN}-2.02.56-lvm2create_initrd.patch
 	"${FILESDIR}"/${PN}-2.02.67-createinitrd.patch #301331
 	"${FILESDIR}"/${PN}-2.02.99-locale-muck.patch #330373
-	#"${FILESDIR}"/${PN}-2.02.178-asneeded.patch # -Wl,--as-needed
 	"${FILESDIR}"/${PN}-2.03.12-dynamic-static-ldflags.patch #332905
 	"${FILESDIR}"/${PN}-2.03.14-static-pkgconfig-libs.patch #370217, #439414 + blkid
 	"${FILESDIR}"/${PN}-2.03.12-static-pkgconfig-libs-2.patch
 	"${FILESDIR}"/${PN}-2.03.05-pthread-pkgconfig.patch #492450
 	"${FILESDIR}"/${PN}-2.03.12-static-libm.patch #617756
 	"${FILESDIR}"/${PN}-2.02.166-HPPA-no-O_DIRECT.patch #657446
-	#"${FILESDIR}"/${PN}-2.02.145-mkdev.patch #580062 # Merged upstream
 	"${FILESDIR}"/${PN}-2.03.05-dmeventd-no-idle-exit.patch
-	#"${FILESDIR}"/${PN}-2.02.184-allow-reading-metadata-with-invalid-creation_time.patch #682380 # merged upstream
 	"${FILESDIR}"/${PN}-2.02.184-mksh_build.patch #686652
 	"${FILESDIR}"/${PN}-2.03.14-r1-add-fcntl.patch
 	"${FILESDIR}"/${PN}-2.03.14-r1-fopen-to-freopen.patch
@@ -203,6 +199,8 @@ src_compile() {
 
 	if use device-mapper-only ; then
 		emake V=1 device-mapper
+		# https://bugs.gentoo.org/878131
+		emake -C libdm/dm-tools V=1 device-mapper
 	else
 		emake V=1
 		emake V=1 CC="$(tc-getCC)" -C scripts lvm2_activation_generator_systemd_red_hat
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index d3d21c2d8c44..3aa293da0b00 100644
--- a/sys-kernel/Manifest.gz
+++ b/sys-kernel/Manifest.gz
diff --git a/sys-kernel/gentoo-kernel-bin/Manifest b/sys-kernel/gentoo-kernel-bin/Manifest
index 67e3baba3d0b..2e24ab0d5d23 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,62 +1,41 @@
-DIST genpatches-5.10-157.base.tar.xz 4210372 BLAKE2B 607d4005190d4b623126ad644508f471cac783a365a0b1f15983eed50a1a594be6c473840c0d79a9c0847afb221a4b95e6dd954f6f7b57cdec6f53651a5fc9a0 SHA512 fd176ed3f4af5e4f3ecb37f553a9ceb034cb8d9602106818edf1deab8ecc34ab4e08009cb4608578fa4892bd5cc76952fa8ab9a010c9159680f860a23775d6bf
-DIST genpatches-5.10-157.extras.tar.xz 3868 BLAKE2B 6662b3d2ab7179cd186061ac684324834a5322c0d6132cb61ba31098f360302534f9f59357c0044eccdb262a6c9f973a21c071c1e27fada967119fe793a7e6e1 SHA512 d85943c5b389d3b4966dac77bfd2abbb9e85c039dd365990cca40bebc82ee35d58a3a24a9a3a15a40eb36ee8671dcac9a43f9753ae48a7d19ac7a7e5013c7cc7
-DIST genpatches-5.10-158.base.tar.xz 4211444 BLAKE2B 0dc1d053275d080f7e61a280f8311c3da1a1497b929e6d1d4f24a15b7e6b5f4bebd4fdd49fe90137b7a01b5d1f4df60ed7c7bbe0089505a54632618d90b5fa63 SHA512 6630ede665881b848a768b0f959820be4370ea5ecc897e6fe819a186568d11d58373056266c62d858d004153fb894dbc64df48e03098bba4f68b560a5e273b70
-DIST genpatches-5.10-158.extras.tar.xz 3868 BLAKE2B c2cb0c011084012b46fede2333a7022bb78a4c92e675fdba5ba2c44f37cef35e6f0334dbfdf69b6b6c0602793a5821660aba29236d011eaed808f8db9b42c876 SHA512 85dc76fbfcc1cb8064faf012b8bb40eb1c6b7e2ab0adbf2af191b5c3ea0c6f57a685dd53d1e3c6266de4b88c414516371001d8b95648b02adb5c4f25d7ca1049
-DIST genpatches-5.15-78.base.tar.xz 3076864 BLAKE2B e868bff991ca299fe186380ef4e7222029fadf1eda5adf66ac6861fba5febcb222c69db93dedc3280c45a4a222f5800a497c12dd47425071b7dd5263ee680c3e SHA512 5018436394bc934ee2f0b50a3b012fbf86a615108bbf16d18d636b202d66d2bb75d9b04cabb87e75fbc7360c137ea52961609e90643caa2d9779628fd3292b60
-DIST genpatches-5.15-78.extras.tar.xz 3932 BLAKE2B b971f35cd6b525ea2fa675909790f489b66a1bd96403d12acf47ac2cb00218181ad267649d143e37f2cc775f4892c0e3a24817c9270c27c7b937b69ad002000e SHA512 6973da0d4dc2d48c5c481a45581ca51449957bb662dc8520ae00a23056dc25f2b9d419cd2ccf9fd5244313ee2eee0b907cd367259ae1d27cbd226bbe8bbced32
-DIST genpatches-5.19-18.base.tar.xz 911172 BLAKE2B db20a811ffc927b01dc389fc3d959809442fa4065fc2951b992561fbc102e854b5fd8dd17833604458e95f8bcec23c75ae94095df90745b489628e52661b5878 SHA512 4e9b9eb22f6a3b634964c35241a9a50517228787f6bd7f25f2de3ff82336c8d0acd8b2fe703a9595ed32776d64bb66ba518919f597948922db6791c10c572b67
-DIST genpatches-5.19-18.extras.tar.xz 3808 BLAKE2B dab7e5596066c9b70ebc2b7413ec7dc9c35bddc29f230dfdc74a9594706713a6807e0ded167eea3ec6a4bcf0c901404bb4fe1a71fa1c8aa265c599b6a1dac8fa SHA512 f39d76551328f9e8d1aa646e819282096bbcea1cb22902fd087dec878a7d673aacb517441a9c213e85a03f2f15768e1a252f103ca89f1b84ef994a0998416bb8
+DIST genpatches-5.10-159.base.tar.xz 4292244 BLAKE2B f2afd1af247c7c7833787f4fcba41f36793233de4f3c14602afb18b6ebd7ac918ab49f8be4c1f8481cd9f6249992a7cdd7b532df029e436ff7f05780c8671578 SHA512 f8cdf11ffa78229db60eb33134b7648c75b2ea08e9f521126497abd19dcd6aa7b50b638a9ebc61871c249bd2e8f117b2faad96b3d6afed0235f56f25ec073976
+DIST genpatches-5.10-159.extras.tar.xz 3868 BLAKE2B 2cd0fc67c5b6f89303e3dcf5492b944eb048623c3ee865521933793af8cc2837d841e5f740035b1ad46a5b2f805f6fa8f1004f824ee3967c545c417e7c3b2513 SHA512 3b5b76c7220c1068ee2d29c48635655af4a227f542a870c3c140f7eea256f3d3e2c3df160c6bf193e595f150c2b51f66818c646af1ba679f94ec0c4086fe8b27
+DIST genpatches-5.15-79.base.tar.xz 3195612 BLAKE2B bf8edc209ecc99da4f4c05b575b095992e64ca421e9848a75ef1ff7bca84377eec93ac3bc7d23bfd4c91d529cbf1693e231b606b27ba2ead46e9c3037db10c21 SHA512 c8cdadb66f904f2083f713a58bce743e56e27440f01fe98b3ddf82aaa43401c2fabad029060e7c01590dc294edcdfa8ec6c784f24ca87a1b9fa8703ed626e4f3
+DIST genpatches-5.15-79.extras.tar.xz 3932 BLAKE2B df50c7ce655f1f81d46ab6f077963afb0997ed2f6c0b70aa49c34a445d3f8938cce7201b75221705fe27c0a6f699dc553f932eeee7960a21dd89e3c55dde9306 SHA512 31e8c8aeb98e01dd1e0b25c51cfe48d5b6bc98617833229b283d35da6d7572b95dd8141592a2350ff01554bf80d918d2137ef2eb248c483ab22fc3db20a11fe3
 DIST genpatches-5.19-19.base.tar.xz 1098964 BLAKE2B c79251602e677d36db4f923ad148422c1c19d9e35b33d1eead75f317ac468ba919baa0c61a690425714bc0b29d96eb47aeb1c960ec4192ccb3905df752f81ab4 SHA512 bb0ed1e481a78f8f65229db777c5d8031edbd3d31cdc0ed45e48d4f5916b838397c1ccec5d465d957673494469290a1dffc8a4466c252395348c8160f2f5cc67
 DIST genpatches-5.19-19.extras.tar.xz 3804 BLAKE2B c73e8bb8be2845ada725f71045e69fa38c99d0561e702d38e3827cf1e25ff2ab2105e3142d0f85baea59fa4a28a4521202d222c53190b741055609551ac1039f SHA512 b6f813b816f475a120543f637857f683e82cb22484fad7149bfbc5bcdd6d5119373d915ac53d6b743197910e78fc2ebdf35bcfb3612015e571629d33740f2701
-DIST genpatches-5.4-223.base.tar.xz 5119600 BLAKE2B d2ad667a58be0061e5e94a885f3cafd7c0d99b108f129a5d7bdc18d0d77b99d52b2dfd0067f6d4657dadcc73f371555949c9ae70f71c1b457c9487179db25070 SHA512 0e58903a7e78f1a50a961a27929f3a936f07ee45343d079389cf9e8b9e78a1b542ec58bbba49ced2e0873d86d28ef2ebf3501a70a5cc8465298c267d95a09899
-DIST genpatches-5.4-223.extras.tar.xz 1812 BLAKE2B e0ebc78506b6ca3d8bc09164b26f15a8cc94495797fc17a36381a3f031dd81bf7870915a48b0deb4f58cfb43e5ec4a64e18e6ca6c00837bdfc5e4fab913752b8 SHA512 ce01405cfc355d6230e687c407c9a5e92d88c6f0837eda19d2bc23d3517df4c5159332d491459867841827e0dc3976c8229cf0d0cb1c9d39360ba67ea616a734
-DIST genpatches-5.4-224.base.tar.xz 5119576 BLAKE2B 3f5fa9712da6376491d9903759334ca4981a6fc9b24919ba6acb5114ce805333a26052570df1a192dc8e062ee77667b45dac62c309d37b02190e4f8a07640aea SHA512 d433e356e47f0a6be0ba3b41172618f0b9cce634e4227924d62a8487cb74af3ea0c4d3245ee4fd2936d39ed5eb839d52985866b9d796f7e7a84415a6b60f9b50
-DIST genpatches-5.4-224.extras.tar.xz 1812 BLAKE2B d28183946e63eedcde3ccc19d84baad11b74349abbba19501c0763ae4597150f2ad7397c19396ce07627643cae526e6ef216dfa2166d217e8452719887e7f2bd SHA512 6505c71e0da13992e0abf5ffd31b414b4bcbde4be78abee6e9d402c14eb329e212e85cca77cb79591ba6d66b3f3b4ae2014e57cd8a88b39373a5dc2403f37d26
-DIST genpatches-6.0-4.base.tar.xz 272160 BLAKE2B 3758714884e31f3ddb414d2011752cdf7fd2da9d54b6dd455e9b9ec559c0201fd7753df98a1cba0618f209552419a56ef8747ac0283f794a41769dc41b3844ad SHA512 ef8292b96f10586cbc9a9ba820bed3b3f30ab1e4b90d3452d94b5e44dd4c333818c99bf6cee1272416e83cda424942be84a7aa6f270687192d94a583e8a836c0
-DIST genpatches-6.0-4.extras.tar.xz 3808 BLAKE2B 42c2695cc364ed353e1ccfa945c6f69c2b3c81e32149de5134eeaf2a738b67a952ae33ace111122bf2c58083c81a4e056e8f666693d02c39f6631a7502c36038 SHA512 305cf01975f19237de99a40dfb2a395f0084809f00040296e5ec36ed949b4301cf7887dcd3f6e287945f8d92f3544e84f3ace2ba60d6720ae09458475159132c
-DIST gentoo-kernel-5.10.148-1.amd64.gpkg.tar 66600960 BLAKE2B 8aa2a893602b1f1b9b94e462c8e6588d04515e78f7ab41ce124db79ca46e890674bf2faff1245170cf27df0a8130b3229c9fa6b70975555b22f98c275216753e SHA512 eaed6a7c5a3f993d8023a05ce701303d2a3af7e4acf038a96ef90ff2fd05c1f1ff3b7ce58fc075758625fe0e3bddef69bc119b32717ba30bb65c30e85f69639f
-DIST gentoo-kernel-5.10.148-1.arm64.gpkg.tar 59760640 BLAKE2B 133644550ff4c86ab62eaef3dac0377d568765e0e5d25d2fe392b0950ac94e536ca9dca73bdf192d8994bcc326448529b76dcc8c55f4161c1960cd153b711470 SHA512 07b91fa83c509d62d05e1e6beb9ee80d0f3c68cbb2edf66b70d9646e190b5ea1bf162592c6d091c1699600285891f7abb8807d3d281086eb14c49ec3da457d3b
-DIST gentoo-kernel-5.10.148-1.ppc64le.gpkg.tar 55121920 BLAKE2B 764f413d2c48d9b1a6825ba7dc88ab24933fc08d5e949a41ade557d794a8f92a827b9211d76a0cfc67728490e2a9ba7152f0b2d0d27daf6bebcb13c9625834cd SHA512 0f469b0902d7849c9f77c489f005d64b1ff8ba6e26335188e9ab919732f9111733f603a5a86a22edee5c4e20738140f79e457a8631772ccf8c908f689a3c77f7
-DIST gentoo-kernel-5.10.148-1.x86.gpkg.tar 56412160 BLAKE2B 8d69943d38991f778a710de5d0a525a70140cc93f842ba7c40caa6d883143e1e5154068236c649d4bd251a3dca038934d2a3bda63dfa41da39d4978a486696b0 SHA512 bf0ef66534187ba3fdc8e805a28c4de5220db8ef89b1b2afd48712a035fbe2179504a2bf4a811e62aff3a2244aec9288b1d993bf550d08bca7a25363f423a961
-DIST gentoo-kernel-5.10.149-1.amd64.gpkg.tar 66478080 BLAKE2B 2955f0fc44ae5e4882eb4a5d36f355a0e5106316bb81452d0cd81bf965cfec2ef0e316e6afd4f482bfb9573dec2f0afc0a393ffe8994651b43db56c381bb7902 SHA512 930ed59473c59d81fc4f47f34228c263d124da16badd64f780f69cb8a32dfa78beee8120176e835fe06ce42420982beee57fe725f655e2d071c8cdface353d82
-DIST gentoo-kernel-5.10.149-1.arm64.gpkg.tar 59648000 BLAKE2B 558a92f3d10e556e445422ae9a2a62e52b41b4bac9496764b015a0e211fde3528e1e60195bd811dbd7d3878cd66ca0055bcf382eb2bae9c837d29a03e6004931 SHA512 a1e75fa85d528aa46ac121e927ec90a7db4e3a7b7d88d77111727b3758e0b5124eb717a89ff43fd052f41f67a78fa0c0868e145af2fc0d6e2cfb4a94524b203f
-DIST gentoo-kernel-5.10.149-1.ppc64le.gpkg.tar 55019520 BLAKE2B 41fd10f6cbacc44de60dcfbc48600c849fffe13b3220ea008fd998bcbdee08fb5c8957ef1ab870286636ffd660898306085364eca246ef02da27be79155bc10b SHA512 725e811649fcc122bf389256ece51468f635508acb9dfd8bceeb24bb7c4878192eb46417b2a01829527153073b0552fa7217794d0201963200ca362a9615e609
-DIST gentoo-kernel-5.10.149-1.x86.gpkg.tar 56412160 BLAKE2B c79880a0435020b7e069c683b79ecb2f5f945e3abe63c744fcde4fbcd8afe0e72c39618308b640729312635a9bd31f482bef73bd62eae8c53086ee911d7665d9 SHA512 5e7bdcf867a84dcc0da78c4825e85d52b4458a4710381bea021a7f986dfe09b1105d410525b031d2adfc22676399dfbe945c945cf0fadcccaa020c4c8e9ccc69
-DIST gentoo-kernel-5.15.74-1.amd64.gpkg.tar 69908480 BLAKE2B 377403f3eae31f8ab48a167f7b2fd292c5fed9972263078a5eae8a0b66807aaa2b4f8e3fa2bedfb07865892c2701cf41111746591e58c794d1bd76ac187ee178 SHA512 a1651e79575406d2f3fb75c1f342de21be603fb3fd08b531b3ec7ac59d11cadaaf4dc857d693285bc300e0b0f1b0c755a369ae37ec67909c6627d5938f5ba666
-DIST gentoo-kernel-5.15.74-1.arm64.gpkg.tar 62986240 BLAKE2B 48394734bd5b23bf44535f41ece63640da5cfe7268d3e186074cd416dfb8dca2ce887758c436525c1ac8fe4e198ae3d74402953e64e86b09367bcd6230292180 SHA512 5155ba03a4067bbbd580e0ab50c82df032dac4ab410e7261c70738643bf66be3754f3dd5114c31fc740d315b1aa7882a16228fccf3bf72c91cc24eccc1a6e5c9
-DIST gentoo-kernel-5.15.74-1.ppc64le.gpkg.tar 57333760 BLAKE2B 1b0f791484aaae6016ee4f4a4afa93fad2bd96fd98defaa41c5a04190170b5b348ec5a8aaeabba688cd484394311eb207009c776a9850376a133d1b5ea0219a9 SHA512 b8c1cbfb173298fcc58895f9c2d843a1b344beaf8ce6901a76314dee909c65fc2e943f1100b29897cd7c230ad52fe170a5beb2881bff11fac6ca03ecabfad73a
-DIST gentoo-kernel-5.15.74-1.x86.gpkg.tar 59125760 BLAKE2B 1b681566ba797791884b90fb43402e7b4a3a35bff7fa32da6142ff159023fe81428e5e58b2be46443939a97b4832bb3ff338d2642a6c406e8039d1afd024f8fd SHA512 0fae3167e687d23802816eb115e1284b4b2f48b569f45a4dff9aee7f9b7a192a80cd8b5d2cb0108b36ee522f4eb9b4d995c7a034b34f15b06474c3a4bb9d9773
-DIST gentoo-kernel-5.19.16-1.amd64.gpkg.tar 72704000 BLAKE2B a443464fa1f3a7066c5d1d27b8a59e45219823ebd5a9378c6eba58a785e839bbb707cc793afe97722e1e758365785a70b695b170bf007403fa48abec159ecae0 SHA512 05bc4b80fa439e601b0237396f0231a074aae0af94051d2c726de58e17db39fffa44e9c4221e45ca7b09046df74547378841967993af4443c6d099a26744c744
-DIST gentoo-kernel-5.19.16-1.arm64.gpkg.tar 65198080 BLAKE2B d8d5c440c290a8ebcf2c6735705fe7134859052a8beb8b7a8d333939e6467f9b41659456bb10d8e2a79fb1a3c0ec7efdfefb89d220f951d3476bb2c68a0a8413 SHA512 87c2a5ca9a7f551e1801e68a7bf23d828aae415140bca607e1abccefa296f14ffbdbf87543975b7db732bd06493f2b112de6d652eb8002d201cb1a27d116e366
-DIST gentoo-kernel-5.19.16-1.ppc64le.gpkg.tar 59146240 BLAKE2B 4d208f55cec56233ec5156b34d34d9227dc65b1e95b953d82eda3451078be716e4a73ac5a6e77a260b50fb5abd8f8ceba91ae3abbbbe8d8d4d8a2f3d1bf10420 SHA512 ec2dcfc74804fe4e5ffa710a6520e42084a7c4fc80400dced643f37fa37ba65545b3bdd7563aec23f55297b34913a5dec03eb419214e51aed12d1c1eb1a277dd
-DIST gentoo-kernel-5.19.16-1.x86.gpkg.tar 62402560 BLAKE2B 6d3312df6f05ce0432df9be591d77d48714c6877ba9babfe22f970c2f2631dbf753affee286ce16c3da50d58eabc2130aa633aae394da21a65c09585f70cbc44 SHA512 f409c4776e8eae6e2090566fa2c480cac98ed26cd36d87f397d39b1b85ff3044432e09545d30c7b030735731fe9a728bed359d0d85793854b1555a66a98a633e
+DIST genpatches-5.4-225.base.tar.xz 5166864 BLAKE2B 20ffa864c45b41e82079158fc4645e5c809bda93c0de480aea22b2f1feac231c7eddaf031daae9939126297a197bb3cbcd48a696da76eda0fe8591cac817103b SHA512 da6a1febb01a772d8ba454de51fe902830461bcbd87e76f8f459bf9adbb8bbe2493914c5ebd4f291ea59bcfedea34d3aa96baf98409e84220240d70c17ab66a1
+DIST genpatches-5.4-225.extras.tar.xz 1812 BLAKE2B 9f10288c90b85f42bb95694c9fc215f680251d121cc371495b798081beb4cb6a6bea10a54e291a187cf4f194a9edf7ee479b461dc188b1187692784651f1042f SHA512 0b9215d36bd6e04e0a7aae544997d10db03770a9e43b152c266b8ed099a12fd8b6da851d81a0b3885e5e4965bf5d9fa5cfa3a6fa3f1ea9642e6ca7b9abef124e
+DIST genpatches-6.0-5.base.tar.xz 279980 BLAKE2B 72e3445a0d791825d6aebfed695bde22454c1d3891176756d90b2cd6aaefa8051bc22a8c7b39326f2889e947d2f65112d386f8d158d1a5327aca142a9d2312fa SHA512 e74152dde7f6c6e511c500ab1038f5a5bd2473354fac8ade6293c43c288ead3e2549fe8f0a02ff205fd72f5947401372cee34425dc2cf23ed3bf1198ad7b6123
+DIST genpatches-6.0-5.extras.tar.xz 3804 BLAKE2B 36e9a4a81f9cc9bea2dab9138bbfa9e380ef6e6d1305ff27072f96be23a8be691c20505c07d0034f0cead7b0f955e463485fc7d488b04ccb951a27eb3aabfb39 SHA512 b0c4a0640f20bbad1c5a5ce4a4c7413c1bd3fa1463be6d8dde3447d0131beb0a5809be53d2df7660516affe4b35f9b88a6ad8ff1b8575cf76f01bc086e4ccf60
+DIST gentoo-kernel-5.10.150-1.amd64.gpkg.tar 66488320 BLAKE2B 548b1836f84cb713bfbc3a164e218f5d4cccc19287b3a7627de422fb521190401d890cac611a018f30fd6e6edff2da939cdb15e819470f76bf29b974b7b37f18 SHA512 c578eac829553e923fd0eb2fefe6cd182769e3ec74ff59d3a7c1d2b9cdd0838d32a16cc8f6be0599313d54da1a94d009e5ca9a8726c7f494a5d9820078430aea
+DIST gentoo-kernel-5.10.150-1.arm64.gpkg.tar 59648000 BLAKE2B 07d60e7576f56ddb93fdd8128a0a7392865ab6ab6d87069aca8845aea7128fa1cec81e9f7733e9620c77036641a027a6d64636b3c8561c2483f59a17e3bce888 SHA512 8c193e9b4e2ff698912c5fa09c8644561e9d555434a7b1f2d7406c9045604a17d7ae7699d264fdebd3354f30f7e0f679e0fd87cbd373fcd4b843d05da304a49b
+DIST gentoo-kernel-5.10.150-1.ppc64le.gpkg.tar 55029760 BLAKE2B 144627355aeb03f3a7886603473cee7579b7e9cf4d8bd8e53dd6e65a2713a008d789dbb4b0c8521c295d300d8e5e47c1eb20abc81f9667eb587d24b25387c8d1 SHA512 00354da7ab9103ce3664aceba5bddee24e66dc610eeed00e83460c776a4056e219ccce73d2bab7ac55d19500456fe8379025a519f7273487b9799739776d91cc
+DIST gentoo-kernel-5.10.150-1.x86.gpkg.tar 56412160 BLAKE2B 821c8d243cd7633b39a47b38a87d25297f2485e632bd015cda0dd1e0b880bad44bcc2e7ca1f02cea3d3236d0b162b83650ec2eefd62b231b39ec8be41b45194e SHA512 b19011a13879dbd08794c6388f3617bf0f176ff37b04e52ec89ed2ec740a88851764807ffc4e4b52473c015a0e3cda78fbebebbcc5f2b5988e97a7a41074c1b2
+DIST gentoo-kernel-5.15.75-1.amd64.gpkg.tar 69816320 BLAKE2B 738b6bc811c9af719007d4333c90751117281d2dc7db5722c289dd5d44ffe52381510e927c6e48e35f6204f67049b0962ffd1e4406401f0d712baaebd8f79511 SHA512 c732f731e0d9438305142ff6f8ca1deb2935ad23b694892e0885ac40a08265e40fc134cf31351fd0602d43276d8d08dda777a6baf2492589fa0ae50b1ebe8070
+DIST gentoo-kernel-5.15.75-1.arm64.gpkg.tar 62873600 BLAKE2B 823661948b075c438dff583c5b19602d2a7faa9f1e05bd5d8f036d034d468f91605600c15bbe62970ee436510ac1898afaec6d58461749a5eb34b4175a63f1db SHA512 9e9a19bd2c2120bf77918047a4ae728074a88d29d207628c077b0c4ee425ae0b9c266dfcd22dc1204e7c3871927d797aa7bbfc759fca0efd484edeeee1a2f637
+DIST gentoo-kernel-5.15.75-1.ppc64le.gpkg.tar 57241600 BLAKE2B ba82e45ea411b343c92fdc8d9c06565694e12955287451bb148d34a374004f68f9e32cfe1535dcdbc3e574018d8a3119e7d8c97c2d5f2b3ccbd0acf8ce497669 SHA512 c3a6d0a85d227608d5b2416360b9d597176b83643160b6b4a61f8a6bcdbe15c89ac9b6f0aa13cd4edb9100fdb666ddeb09de765b1faf5970360bed2546e93898
+DIST gentoo-kernel-5.15.75-1.x86.gpkg.tar 59136000 BLAKE2B 70bb29c55d86f26d531947850fa5c0ea668b18623fef920bcb60ffc222e7d607fd81dd8af6a653c1ca6162e025d697e5181f500c67726e92716e58f3942b2acf SHA512 f34b61b5302b2f85e9651269371d282ab1b6bdf395cd8ac90916cf59136941873811ab27f45029216cb97cdcafaa0bb1e1f011eeac3848ab434bf1f29885a14f
 DIST gentoo-kernel-5.19.17-1.amd64.gpkg.tar 72540160 BLAKE2B 18c079e028902f44f236222dc9ec0ed01edca3b8df5d667b05ff1c084f10f7dc64f1383e0e7c90330e33516e9901554e04a4518d4f07fbd54575d02de5469b89 SHA512 3f70e66bf1af9c0291bc0f19ab4fd24ea5acf98eb0bde3e4e74bd2cfd786c3cfd42b00da4adf8e8a74caa7204d7b37b8b3a7f11d25b1fa8907a6da72edb93527
 DIST gentoo-kernel-5.19.17-1.arm64.gpkg.tar 65095680 BLAKE2B 2895023dcd376bdcb936033408614f63a76110e68db108cb745bccbca573c66eb615ab683363428bf7fb7ec7da7c8e30fa88f5a1d41d1d54e5ef5a39e71a325f SHA512 610b12c9d6cf6124767163a03b254512dcb2b4bf5bf99459110a36b2b3965fadba75b2ebeeef4cc8a8460083460cde7c5c0fa9de95c2cd0b60501eadad5b56cb
 DIST gentoo-kernel-5.19.17-1.ppc64le.gpkg.tar 59043840 BLAKE2B ccbe861e45b1a40907b05b922f6f25aacb60ac94cffba372cfeacf905ab7946212e1422be0b6e59b51ce9221ab99fff3f6903ff7ba3a309f9350882f802361f5 SHA512 ea5ba28cb4dcba8b5fea921d0f17be0f4de6d5981e1685c5b2c2b9020680a04e0ae5bab528948d04e6ced8aa1a20f16a1b46988332b62b7c4b1b6b734116a6bf
 DIST gentoo-kernel-5.19.17-1.x86.gpkg.tar 62382080 BLAKE2B 445f87b7bc7585698ea8f67cfc9e2cd6c45001ad526be9a8fb309265c869270492e3536b1648ce7c528c9363a0c845ec99b94e4d5db56c98489be2aa445f9532 SHA512 a0d43732739e0c41116eabb90ab594ed77014410a21c234b5c9e1b48f533d9b237e1eb23e9e349042e8da2c9b8a7ce1baa3c2ad7cffe7a17b7c53f771f37c2e8
-DIST gentoo-kernel-5.4.218-1.amd64.gpkg.tar 60733440 BLAKE2B 1db4e1f0b0452173ef715348838a30a7d8a348810268b488646d6bbdd76ba4835c762b30342d8867d488b2653f7994b001ca97d1f003c55ad560550a280f952e SHA512 d911971ed47ae12ff58abd9e8ca0bb63237d2ec72962cc51da5c38525b2afbaf698682e3f6eaf59d0e580497138ed22448ed507e10e41acdd68d7dfcac027f41
-DIST gentoo-kernel-5.4.218-1.arm64.gpkg.tar 56934400 BLAKE2B d68cfa0d046ba6d161d3be877e79d46672933f88cdf1cc0e0cfc274a0b6c043b4c7bd3a673eac29fd7f3e395822e9709c475e8b67167605ecb507bbebf9ce7c2 SHA512 a06f40f330e4e0972cba8e8061d8099866a35a1f97e4989b82cff0fd70104e15a1c5fc2495ba2c19be00ffb61345c21d38b55bee1fba6188fc3e12fd1e32ae48
-DIST gentoo-kernel-5.4.218-1.ppc64le.gpkg.tar 54466560 BLAKE2B 5dbe9d43266feafb3403829532caab9b9b5c8165a1e80752dd876626b9208ce1dda990d9b010ab6a1d9d0937728ba59643612587e071231d76ed3d06298976f5 SHA512 60940c07de6dc71d659276e0a6d7688822de2bf5c355e2fd2045ac08b1f5724fe3ed97e61b3b48325e93cadf73086073af2baf8377a34591b6684d06750bfaa1
-DIST gentoo-kernel-5.4.218-1.x86.gpkg.tar 52387840 BLAKE2B 935c3fe381ac9b57ba131d6ff5fd19d4308da390c73a25b7a77f2107f43ab7e776a46eec64c454b2e7ecd3f6b6e84680fb549a3c865ddb501fea9762072bb01f SHA512 f8732561256ce0946b45f5f3cfcca6110c1c13005179344acaffe8d9aaab4bccfc1966e4a2092f3b420539bd9c03a0d32b2af5bc37077ba31c59ebac4322b3cf
-DIST gentoo-kernel-5.4.219-1.amd64.gpkg.tar 60631040 BLAKE2B b50c065ca4259719a0ee74bef71d6d9fce9cab18dd8a8d2544ada311d5a84b381e1483b16bbfc6316ecf2595373b1efa9dfbe8e27e58ea95c02a200602882023 SHA512 405186861b275b3606b561d976969f35b4112a229b2e3757530c3ec3b6e5cac17a5836d5c5f53a570322271e5bb9d90fffa1b9b97d0bba4b0e36f6ba33bae06d
-DIST gentoo-kernel-5.4.219-1.arm64.gpkg.tar 56832000 BLAKE2B 75250e0407ea8b846658a59b0e53d9293112c7e109a004783ea9ac8e54534065a50ebfa22bd9f1f059f55129bb39ba8948cc53e5afab1527ca97ec23902738ee SHA512 2e55538b7f10def530abb3ced3dc042e0b6b4de173dea949610353e3e719136860bb7271e6164eb2dcf410486a2c249e4898f0bdf24bed3140d29963dba0e229
-DIST gentoo-kernel-5.4.219-1.ppc64le.gpkg.tar 54343680 BLAKE2B 28888b569baaca609212ac382b1a3ee11bf518587d00d3553118340e847c7a3e7f814bb4727a1931daa6c39afa8567579781fd05726b759f2df8d3a9b44f7ab1 SHA512 93a8bf9453f19222cf8c0e0ad399f3bab7aeaf0ebc1c8802fb53fa2277e150584203050aea9d0e549d1bbb96a88178b891552dfdba4c460b54e20f3629cf4435
-DIST gentoo-kernel-5.4.219-1.x86.gpkg.tar 52387840 BLAKE2B 9a91a823ff95ef19a88cba5d2c2992632edf2f8a8f88c42b43c0b7dc36bb67d4ac273b0661d96520caf92f69c871aab7a7d9db1dd2cceb2f628fe88557e600ad SHA512 aa1572341d40f80ed3136bb9efc1b0519cd67d71fee6a39307a1dbeda1c086b6eeed661ea5216a3f52125d3e4e89ecc421338d40d164520301747ae5b8f0e94b
-DIST gentoo-kernel-6.0.3-1.amd64.gpkg.tar 75898880 BLAKE2B 22fa37348aca6e271a09253e60ddf1bcc05a0a669c5eb6468a76e60e0c8a74714960a49d9d3ea98cb9c5f5df2d59d7fd357d03c811d948887fb76f98cac21407 SHA512 2a72a5bb597d5ffb31604d9d8d3ad9c70d10a2c9fa7d19ab38d26160f786097da65f5dbdc9aaa4e2b3a704cd23519852536260d2fc2f6314545467254ae76fb3
-DIST gentoo-kernel-6.0.3-1.arm64.gpkg.tar 68792320 BLAKE2B 0b823e99597f1f89e6753a41b9940eb65afbfd0c43b86c46ead94b81e82f9d1e2653ff2885691fcaf6c0f5e1dc2ebd047fa4fcc0d07a1a559cd72bfdec33d136 SHA512 8b991af4189f77a5c2afcfb1c3323fef4d743eb8243d6fe08202892db4ae77a2eac7b54c49aae649ab385818a85907731f61290541788dd6020246773018d477
-DIST gentoo-kernel-6.0.3-1.ppc64le.gpkg.tar 62126080 BLAKE2B f0ba8e04802ed6a1bc66f9965c83d3beb21b5ca016f3a77c9b0f15550fca521de395d410341d6d698053ab81bb454854a906774d2f819b5a0c04e1097286d5e8 SHA512 dee4eeeba7ec50148377e6912ee57c91715afc0161c14964d5d304446470587316ec61be2c084a524af2165ab6c66fadc89467d83c0a2c5bb299c4b027a687c6
-DIST gentoo-kernel-6.0.3-1.x86.gpkg.tar 65269760 BLAKE2B 87b2ebaf40b3d33d25da9db3ce6cbd045143b1f65e59dfd91854091b86eac7671f2b5464dac9da8b1ec5dbc29b64c3b01efddf57f5ac69d2a67186f18afd0468 SHA512 2ec2d81743c85a5b10bbd8796b6478899ff02f2e926ca38c1e65fa2811d060dc2537a3db7aa6f459d92cb1c3c58482d2547f39a853c9d935172f7583ab2f75a1
+DIST gentoo-kernel-5.4.220-1.amd64.gpkg.tar 60641280 BLAKE2B 2f96ba924fd7d73748e77067125521491d826f1798700f0ffff09793f8bbdcad2cf745bb39038516b39355f7a44e10fc09b0bbed3b58c884e74ed6ff81ffa2e1 SHA512 364ffcfee11a9aaa54761895844fda044b2c8afbbd05461d9e3411e54b5c27dd8fd76444c613b030f7a69dd7e19772850926d282ce14f40c727ccaab006b704a
+DIST gentoo-kernel-5.4.220-1.arm64.gpkg.tar 56832000 BLAKE2B f54dcba86bc7f872994d159b7f0da10ea77498467e47e89ec4509ebc1dd1695a9aaea70ee12d16565fb9219c93b62535448902c0ca74134f6171fa9577565423 SHA512 41c39a38947113bfd223acb29a4bcebab17b5a6527e031a1b816c200754a7c1026c2fc729d4713bf7a115dca142c340a54c6c9043b89252980117618689c88fd
+DIST gentoo-kernel-5.4.220-1.ppc64le.gpkg.tar 54333440 BLAKE2B 7ce90089ef680746fc5463e95d21749b3375be09f69ada78bdce546a6c045f47769903b4354beead709e060783871d8c01ff37fb292af5924abcef758517e265 SHA512 3a9e23c8ab3a47a2a0802bd31bd98524317c217342d852bd832ac56faf348d141ec754d74e94126f625a1fa51bb866d6dbdc55a9dd80c8790820d779eedeb9dc
+DIST gentoo-kernel-5.4.220-1.x86.gpkg.tar 52398080 BLAKE2B edc5156be6509ae6b7e9b80d79bbc749bee96aa5a8a85fbaec3a0e44b8ce7ccf6fba240bb24b915ece90e072a0668ba6aeae1d8475cb7ebe3957da7e9e28822c SHA512 98c26b588ebed7ada2408436bedaf85426f4abf68bf538c15f11eabdb6ffc2c4aaafcd7af529d7661a7332593da2e2883c463a86ad15438a7d136782579e6f98
+DIST gentoo-kernel-6.0.5-1.amd64.gpkg.tar 75898880 BLAKE2B 5f4ebb5f829f76206838eaa9b89c9bab77a08e6587851b2f0c680b56c5ce74eb7a9a33e7d3e23f109f1ab9b61fdc15766260770e79765ea64ac7b07baab06b84 SHA512 72b33658a30b12947f45450c7c9f6cc8aebafecbe7940fcac476e780c46595d9bcf751849139ab81ddaef6eb1587b965bb3d05d7b8d693222cc98f44b71d1d0b
+DIST gentoo-kernel-6.0.5-1.arm64.gpkg.tar 68802560 BLAKE2B 33ed94c2431e6e17944bdf0bb8a50f420914ec040506cbb3ff8ec8ca752bc7b43be165881b85e4590e9d79665a5215639f84b6ebfc8ac4bd405ff26844668d51 SHA512 f34ea6de684e2bc1ac120117938e383446fc2f19744de95382a24a7fb6044a89711b86fc13479b5e5536c71fde4dc0ec1d9de6939a26e16e254d3ed1f405da8c
+DIST gentoo-kernel-6.0.5-1.ppc64le.gpkg.tar 62136320 BLAKE2B ae2c5b8830f123c5c2a853e5826e701bb46370919a24fef527f40d530e7fac9be23050cd36ea149644c9331954aaea20f23c44f8341d05b9b170adcbddb1bf2d SHA512 70635eab0375b229ae24efe2f2aa123249e8a38bd8fc864cad8afee0643c98f9f7ae7d4b10ea341a8ed14af4616bacfa2e9cf2e12d1aa47dbaaa21b4df619fcf
+DIST gentoo-kernel-6.0.5-1.x86.gpkg.tar 65290240 BLAKE2B bcd55c436378eac2b8ce96a4060848d3f218c5e01b0aa70f032717074a4195c5e31238b0af6720f1951018f3faac6f99fa7ac7e3be07436224cbe061ee68f241 SHA512 278553bf4f605c0b7df947341d78ffa19be12a843e0ecf4be73f22c9648d0cdc7a4d508470f5be1a6ed60dd2614cd006a1868ed2d47bd0ef4815a748af9748fe
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
 DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7484303d3a5280eddb038999aaa8b836666a487472d9c4a219af0f06b9fecccaf348fb5510ab8762f4ef4b7e83 SHA512 d25ad40b5bcd6a4c6042fd0fd84e196e7a58024734c3e9a484fd0d5d54a0c1d87db8a3c784eff55e43b6f021709dc685eb0efa18d2aec327e4f88a79f405705a
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
-EBUILD gentoo-kernel-bin-5.10.148.ebuild 2999 BLAKE2B 93c1a0cf84370f61fe9ec23bcccad5e2421ac6206411610653a1d8484c835de9def37872c3838f875767032d4331a245beff6cd619ccf53a43312c8331d86d3e SHA512 e4ced34e4d178d478f71d3199615f6b4b6d28127783ece7b7a04bbf376427c533539d75b07baa1692edb43a53a71c0a738982f34d68f6de1e0ef9a3c4260f4d9
-EBUILD gentoo-kernel-bin-5.10.149.ebuild 2999 BLAKE2B 93c1a0cf84370f61fe9ec23bcccad5e2421ac6206411610653a1d8484c835de9def37872c3838f875767032d4331a245beff6cd619ccf53a43312c8331d86d3e SHA512 e4ced34e4d178d478f71d3199615f6b4b6d28127783ece7b7a04bbf376427c533539d75b07baa1692edb43a53a71c0a738982f34d68f6de1e0ef9a3c4260f4d9
-EBUILD gentoo-kernel-bin-5.15.74.ebuild 2999 BLAKE2B bf50105e6cc148a793b36139a419ac66f4f14b4a73394b21af62803ab61347d87f800f066ccf7c9e33951c2efbb6d6dd77e7b7f296293cee6b0b7f17f3d1e7e2 SHA512 85bce161a2af46e8b9a2a005200e29e30e1bffc8c2263b7db2a756a73d411168dfc0e7720df907e58ccafe059f72558a47d8c93d9240222c093990de08d7500b
-EBUILD gentoo-kernel-bin-5.19.16.ebuild 3003 BLAKE2B 4ab34ea587fa8ccd865b3e236c492fb68a9d0f39c17503fe507107af52934cc14ec4dcf1afe08b92a78f6e4515da77cee078872b631e0711126b8c5b5661ef74 SHA512 6face53807c8ee8f1c1f9129d692514344491fed96102dd6579fd1ab3b0bcd02a730487a50b6a64da5f64050879231696c4d35b0d9862dbf98f4166ec1d55c4d
+EBUILD gentoo-kernel-bin-5.10.150.ebuild 2999 BLAKE2B 93c1a0cf84370f61fe9ec23bcccad5e2421ac6206411610653a1d8484c835de9def37872c3838f875767032d4331a245beff6cd619ccf53a43312c8331d86d3e SHA512 e4ced34e4d178d478f71d3199615f6b4b6d28127783ece7b7a04bbf376427c533539d75b07baa1692edb43a53a71c0a738982f34d68f6de1e0ef9a3c4260f4d9
+EBUILD gentoo-kernel-bin-5.15.75.ebuild 2999 BLAKE2B bf50105e6cc148a793b36139a419ac66f4f14b4a73394b21af62803ab61347d87f800f066ccf7c9e33951c2efbb6d6dd77e7b7f296293cee6b0b7f17f3d1e7e2 SHA512 85bce161a2af46e8b9a2a005200e29e30e1bffc8c2263b7db2a756a73d411168dfc0e7720df907e58ccafe059f72558a47d8c93d9240222c093990de08d7500b
 EBUILD gentoo-kernel-bin-5.19.17.ebuild 3003 BLAKE2B 4ab34ea587fa8ccd865b3e236c492fb68a9d0f39c17503fe507107af52934cc14ec4dcf1afe08b92a78f6e4515da77cee078872b631e0711126b8c5b5661ef74 SHA512 6face53807c8ee8f1c1f9129d692514344491fed96102dd6579fd1ab3b0bcd02a730487a50b6a64da5f64050879231696c4d35b0d9862dbf98f4166ec1d55c4d
-EBUILD gentoo-kernel-bin-5.4.218.ebuild 2999 BLAKE2B be5c5e139ee4da605dd15cf02c6251a762426d0da46ac2b75d46b79226e7c41c57429ed847e2e646735545fee33cb7ac45d62039158c0004380197255477be12 SHA512 b0ee61606614ca61b655b50a578efefd7fb49437014df935c4ea312ab1257dc415425684a05c6dac1e5dbeac5b1eac81071bf7cae4fec7bd68f8cae985b1c969
-EBUILD gentoo-kernel-bin-5.4.219.ebuild 2999 BLAKE2B be5c5e139ee4da605dd15cf02c6251a762426d0da46ac2b75d46b79226e7c41c57429ed847e2e646735545fee33cb7ac45d62039158c0004380197255477be12 SHA512 b0ee61606614ca61b655b50a578efefd7fb49437014df935c4ea312ab1257dc415425684a05c6dac1e5dbeac5b1eac81071bf7cae4fec7bd68f8cae985b1c969
-EBUILD gentoo-kernel-bin-6.0.3.ebuild 3003 BLAKE2B dc3e591b87f0b7c9137e29fdff1d2d36e4af887e61238788671903a6526136350e19e829180fc2ddcbae54cfce4dadaceb55cb95a38c36e43e3414d0a9a9378f SHA512 624e77b77f71fdfed7f50b0cb3a8f225fb2e1a27cf5c9b3d4d454aa782a6479d7e079e3bdd9f320023ad2215fea9b283648b7d6879929020caf8913135b93765
+EBUILD gentoo-kernel-bin-5.4.220.ebuild 2999 BLAKE2B be5c5e139ee4da605dd15cf02c6251a762426d0da46ac2b75d46b79226e7c41c57429ed847e2e646735545fee33cb7ac45d62039158c0004380197255477be12 SHA512 b0ee61606614ca61b655b50a578efefd7fb49437014df935c4ea312ab1257dc415425684a05c6dac1e5dbeac5b1eac81071bf7cae4fec7bd68f8cae985b1c969
+EBUILD gentoo-kernel-bin-6.0.5.ebuild 3003 BLAKE2B 8378e8fc136de7923ecd44e58e0e1b694ac72ce5090e4ee86e4c086ecd923f58898e925f4ef3c5ed40918dc10cea348d53614d10e7e10aa58764d0d4df2e50f2 SHA512 80c0f1d10d1a85c2677d683178936e8c1bae08801d841cd7e2c79120f7517b464550c2c634de031428041c59ee3d8a5c96e28dcca386bb28303231288cb97a1a
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.149.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.149.ebuild
deleted file mode 100644
index dcef0abe1c6b..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.149.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-install toolchain-funcs unpacker
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
-BINPKG=${P/-bin}-1
-
-DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.amd64.gpkg.tar
-	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.arm64.gpkg.tar
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.ppc64le.gpkg.tar
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.x86.gpkg.tar
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc
-"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH="$(tc-arch-kernel)"
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"${BINPKG}/image/lib/modules/${KPV}"
-}
-
-src_install() {
-	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d boot/dtbs ]]; then
-		mv "${BINPKG}"/image/boot "${ED}"/ || die
-	fi
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.148.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.150.ebuild
index dcef0abe1c6b..dcef0abe1c6b 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.148.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.150.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.74.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.75.ebuild
index 93026dac75dc..93026dac75dc 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.74.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.75.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.16.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.16.ebuild
deleted file mode 100644
index 0ba336c5c1aa..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.19.16.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-install toolchain-funcs unpacker
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-BINPKG=${P/-bin}-1
-
-DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.amd64.gpkg.tar
-	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.arm64.gpkg.tar
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.ppc64le.gpkg.tar
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.x86.gpkg.tar
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc
-"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH="$(tc-arch-kernel)"
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"${BINPKG}/image/lib/modules/${KPV}"
-}
-
-src_install() {
-	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d boot/dtbs ]]; then
-		mv "${BINPKG}"/image/boot "${ED}"/ || die
-	fi
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.219.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.219.ebuild
deleted file mode 100644
index 7d29184e6c6b..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.219.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-install toolchain-funcs unpacker
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
-BINPKG=${P/-bin}-1
-
-DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.amd64.gpkg.tar
-	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.arm64.gpkg.tar
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.ppc64le.gpkg.tar
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.x86.gpkg.tar
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ppc64 x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	virtual/yacc
-"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH="$(tc-arch-kernel)"
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"${BINPKG}/image/lib/modules/${KPV}"
-}
-
-src_install() {
-	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d boot/dtbs ]]; then
-		mv "${BINPKG}"/image/boot "${ED}"/ || die
-	fi
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.218.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.220.ebuild
index 7d29184e6c6b..7d29184e6c6b 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.218.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.4.220.ebuild
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.5.ebuild
index 5f8769d381a6..2b0e14e98e55 100644
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.3.ebuild
+++ b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit kernel-install toolchain-funcs unpacker
 
 MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 0 ))
 BINPKG=${P/-bin}-1
 
 DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index cbc422588e90..956537d28f12 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,19 +1,13 @@
-DIST genpatches-5.10-157.base.tar.xz 4210372 BLAKE2B 607d4005190d4b623126ad644508f471cac783a365a0b1f15983eed50a1a594be6c473840c0d79a9c0847afb221a4b95e6dd954f6f7b57cdec6f53651a5fc9a0 SHA512 fd176ed3f4af5e4f3ecb37f553a9ceb034cb8d9602106818edf1deab8ecc34ab4e08009cb4608578fa4892bd5cc76952fa8ab9a010c9159680f860a23775d6bf
-DIST genpatches-5.10-157.extras.tar.xz 3868 BLAKE2B 6662b3d2ab7179cd186061ac684324834a5322c0d6132cb61ba31098f360302534f9f59357c0044eccdb262a6c9f973a21c071c1e27fada967119fe793a7e6e1 SHA512 d85943c5b389d3b4966dac77bfd2abbb9e85c039dd365990cca40bebc82ee35d58a3a24a9a3a15a40eb36ee8671dcac9a43f9753ae48a7d19ac7a7e5013c7cc7
-DIST genpatches-5.10-158.base.tar.xz 4211444 BLAKE2B 0dc1d053275d080f7e61a280f8311c3da1a1497b929e6d1d4f24a15b7e6b5f4bebd4fdd49fe90137b7a01b5d1f4df60ed7c7bbe0089505a54632618d90b5fa63 SHA512 6630ede665881b848a768b0f959820be4370ea5ecc897e6fe819a186568d11d58373056266c62d858d004153fb894dbc64df48e03098bba4f68b560a5e273b70
-DIST genpatches-5.10-158.extras.tar.xz 3868 BLAKE2B c2cb0c011084012b46fede2333a7022bb78a4c92e675fdba5ba2c44f37cef35e6f0334dbfdf69b6b6c0602793a5821660aba29236d011eaed808f8db9b42c876 SHA512 85dc76fbfcc1cb8064faf012b8bb40eb1c6b7e2ab0adbf2af191b5c3ea0c6f57a685dd53d1e3c6266de4b88c414516371001d8b95648b02adb5c4f25d7ca1049
-DIST genpatches-5.15-78.base.tar.xz 3076864 BLAKE2B e868bff991ca299fe186380ef4e7222029fadf1eda5adf66ac6861fba5febcb222c69db93dedc3280c45a4a222f5800a497c12dd47425071b7dd5263ee680c3e SHA512 5018436394bc934ee2f0b50a3b012fbf86a615108bbf16d18d636b202d66d2bb75d9b04cabb87e75fbc7360c137ea52961609e90643caa2d9779628fd3292b60
-DIST genpatches-5.15-78.extras.tar.xz 3932 BLAKE2B b971f35cd6b525ea2fa675909790f489b66a1bd96403d12acf47ac2cb00218181ad267649d143e37f2cc775f4892c0e3a24817c9270c27c7b937b69ad002000e SHA512 6973da0d4dc2d48c5c481a45581ca51449957bb662dc8520ae00a23056dc25f2b9d419cd2ccf9fd5244313ee2eee0b907cd367259ae1d27cbd226bbe8bbced32
-DIST genpatches-5.19-18.base.tar.xz 911172 BLAKE2B db20a811ffc927b01dc389fc3d959809442fa4065fc2951b992561fbc102e854b5fd8dd17833604458e95f8bcec23c75ae94095df90745b489628e52661b5878 SHA512 4e9b9eb22f6a3b634964c35241a9a50517228787f6bd7f25f2de3ff82336c8d0acd8b2fe703a9595ed32776d64bb66ba518919f597948922db6791c10c572b67
-DIST genpatches-5.19-18.extras.tar.xz 3808 BLAKE2B dab7e5596066c9b70ebc2b7413ec7dc9c35bddc29f230dfdc74a9594706713a6807e0ded167eea3ec6a4bcf0c901404bb4fe1a71fa1c8aa265c599b6a1dac8fa SHA512 f39d76551328f9e8d1aa646e819282096bbcea1cb22902fd087dec878a7d673aacb517441a9c213e85a03f2f15768e1a252f103ca89f1b84ef994a0998416bb8
+DIST genpatches-5.10-159.base.tar.xz 4292244 BLAKE2B f2afd1af247c7c7833787f4fcba41f36793233de4f3c14602afb18b6ebd7ac918ab49f8be4c1f8481cd9f6249992a7cdd7b532df029e436ff7f05780c8671578 SHA512 f8cdf11ffa78229db60eb33134b7648c75b2ea08e9f521126497abd19dcd6aa7b50b638a9ebc61871c249bd2e8f117b2faad96b3d6afed0235f56f25ec073976
+DIST genpatches-5.10-159.extras.tar.xz 3868 BLAKE2B 2cd0fc67c5b6f89303e3dcf5492b944eb048623c3ee865521933793af8cc2837d841e5f740035b1ad46a5b2f805f6fa8f1004f824ee3967c545c417e7c3b2513 SHA512 3b5b76c7220c1068ee2d29c48635655af4a227f542a870c3c140f7eea256f3d3e2c3df160c6bf193e595f150c2b51f66818c646af1ba679f94ec0c4086fe8b27
+DIST genpatches-5.15-79.base.tar.xz 3195612 BLAKE2B bf8edc209ecc99da4f4c05b575b095992e64ca421e9848a75ef1ff7bca84377eec93ac3bc7d23bfd4c91d529cbf1693e231b606b27ba2ead46e9c3037db10c21 SHA512 c8cdadb66f904f2083f713a58bce743e56e27440f01fe98b3ddf82aaa43401c2fabad029060e7c01590dc294edcdfa8ec6c784f24ca87a1b9fa8703ed626e4f3
+DIST genpatches-5.15-79.extras.tar.xz 3932 BLAKE2B df50c7ce655f1f81d46ab6f077963afb0997ed2f6c0b70aa49c34a445d3f8938cce7201b75221705fe27c0a6f699dc553f932eeee7960a21dd89e3c55dde9306 SHA512 31e8c8aeb98e01dd1e0b25c51cfe48d5b6bc98617833229b283d35da6d7572b95dd8141592a2350ff01554bf80d918d2137ef2eb248c483ab22fc3db20a11fe3
 DIST genpatches-5.19-19.base.tar.xz 1098964 BLAKE2B c79251602e677d36db4f923ad148422c1c19d9e35b33d1eead75f317ac468ba919baa0c61a690425714bc0b29d96eb47aeb1c960ec4192ccb3905df752f81ab4 SHA512 bb0ed1e481a78f8f65229db777c5d8031edbd3d31cdc0ed45e48d4f5916b838397c1ccec5d465d957673494469290a1dffc8a4466c252395348c8160f2f5cc67
 DIST genpatches-5.19-19.extras.tar.xz 3804 BLAKE2B c73e8bb8be2845ada725f71045e69fa38c99d0561e702d38e3827cf1e25ff2ab2105e3142d0f85baea59fa4a28a4521202d222c53190b741055609551ac1039f SHA512 b6f813b816f475a120543f637857f683e82cb22484fad7149bfbc5bcdd6d5119373d915ac53d6b743197910e78fc2ebdf35bcfb3612015e571629d33740f2701
-DIST genpatches-5.4-223.base.tar.xz 5119600 BLAKE2B d2ad667a58be0061e5e94a885f3cafd7c0d99b108f129a5d7bdc18d0d77b99d52b2dfd0067f6d4657dadcc73f371555949c9ae70f71c1b457c9487179db25070 SHA512 0e58903a7e78f1a50a961a27929f3a936f07ee45343d079389cf9e8b9e78a1b542ec58bbba49ced2e0873d86d28ef2ebf3501a70a5cc8465298c267d95a09899
-DIST genpatches-5.4-223.extras.tar.xz 1812 BLAKE2B e0ebc78506b6ca3d8bc09164b26f15a8cc94495797fc17a36381a3f031dd81bf7870915a48b0deb4f58cfb43e5ec4a64e18e6ca6c00837bdfc5e4fab913752b8 SHA512 ce01405cfc355d6230e687c407c9a5e92d88c6f0837eda19d2bc23d3517df4c5159332d491459867841827e0dc3976c8229cf0d0cb1c9d39360ba67ea616a734
-DIST genpatches-5.4-224.base.tar.xz 5119576 BLAKE2B 3f5fa9712da6376491d9903759334ca4981a6fc9b24919ba6acb5114ce805333a26052570df1a192dc8e062ee77667b45dac62c309d37b02190e4f8a07640aea SHA512 d433e356e47f0a6be0ba3b41172618f0b9cce634e4227924d62a8487cb74af3ea0c4d3245ee4fd2936d39ed5eb839d52985866b9d796f7e7a84415a6b60f9b50
-DIST genpatches-5.4-224.extras.tar.xz 1812 BLAKE2B d28183946e63eedcde3ccc19d84baad11b74349abbba19501c0763ae4597150f2ad7397c19396ce07627643cae526e6ef216dfa2166d217e8452719887e7f2bd SHA512 6505c71e0da13992e0abf5ffd31b414b4bcbde4be78abee6e9d402c14eb329e212e85cca77cb79591ba6d66b3f3b4ae2014e57cd8a88b39373a5dc2403f37d26
-DIST genpatches-6.0-4.base.tar.xz 272160 BLAKE2B 3758714884e31f3ddb414d2011752cdf7fd2da9d54b6dd455e9b9ec559c0201fd7753df98a1cba0618f209552419a56ef8747ac0283f794a41769dc41b3844ad SHA512 ef8292b96f10586cbc9a9ba820bed3b3f30ab1e4b90d3452d94b5e44dd4c333818c99bf6cee1272416e83cda424942be84a7aa6f270687192d94a583e8a836c0
-DIST genpatches-6.0-4.extras.tar.xz 3808 BLAKE2B 42c2695cc364ed353e1ccfa945c6f69c2b3c81e32149de5134eeaf2a738b67a952ae33ace111122bf2c58083c81a4e056e8f666693d02c39f6631a7502c36038 SHA512 305cf01975f19237de99a40dfb2a395f0084809f00040296e5ec36ed949b4301cf7887dcd3f6e287945f8d92f3544e84f3ace2ba60d6720ae09458475159132c
+DIST genpatches-5.4-225.base.tar.xz 5166864 BLAKE2B 20ffa864c45b41e82079158fc4645e5c809bda93c0de480aea22b2f1feac231c7eddaf031daae9939126297a197bb3cbcd48a696da76eda0fe8591cac817103b SHA512 da6a1febb01a772d8ba454de51fe902830461bcbd87e76f8f459bf9adbb8bbe2493914c5ebd4f291ea59bcfedea34d3aa96baf98409e84220240d70c17ab66a1
+DIST genpatches-5.4-225.extras.tar.xz 1812 BLAKE2B 9f10288c90b85f42bb95694c9fc215f680251d121cc371495b798081beb4cb6a6bea10a54e291a187cf4f194a9edf7ee479b461dc188b1187692784651f1042f SHA512 0b9215d36bd6e04e0a7aae544997d10db03770a9e43b152c266b8ed099a12fd8b6da851d81a0b3885e5e4965bf5d9fa5cfa3a6fa3f1ea9642e6ca7b9abef124e
+DIST genpatches-6.0-5.base.tar.xz 279980 BLAKE2B 72e3445a0d791825d6aebfed695bde22454c1d3891176756d90b2cd6aaefa8051bc22a8c7b39326f2889e947d2f65112d386f8d158d1a5327aca142a9d2312fa SHA512 e74152dde7f6c6e511c500ab1038f5a5bd2473354fac8ade6293c43c288ead3e2549fe8f0a02ff205fd72f5947401372cee34425dc2cf23ed3bf1198ad7b6123
+DIST genpatches-6.0-5.extras.tar.xz 3804 BLAKE2B 36e9a4a81f9cc9bea2dab9138bbfa9e380ef6e6d1305ff27072f96be23a8be691c20505c07d0034f0cead7b0f955e463485fc7d488b04ccb951a27eb3aabfb39 SHA512 b0c4a0640f20bbad1c5a5ce4a4c7413c1bd3fa1463be6d8dde3447d0131beb0a5809be53d2df7660516affe4b35f9b88a6ad8ff1b8575cf76f01bc086e4ccf60
 DIST gentoo-kernel-config-g1.tar.gz 4283 BLAKE2B 44dd51ec45ebc71bffcd6d85a2fefba053f7bce8035057f0bbe928e24816ad4ba03c9bf67dcfcd6d6d1833c0a2ea93e0fd486c2093664dc41ccce316e1e60588 SHA512 3a45f28df9d457df0fe0d185da8b10f4e35f49dad75075e041e8cf3cf6972fecc8145cd557b0bf3a8dea20ddffae0194f88e61c1e5098fa0a5ca301d40aeea2e
 DIST gentoo-kernel-config-g3.tar.gz 4411 BLAKE2B 00edc4b5dc943834bc7ee977382b2960160888db00a25c5a7f73968784aa39a2b3b69f0bbda89b3ce8eb55e746006cff2839481493ac8bfca6a21de2299564f7 SHA512 44beae869bebf5445655dafe1facc47c3dbe602b34c5bf2fa984a581bfe3250fa0df908b8807c333c2e66ab9d1a2bb8026e22140f2a1f522d0dd647c96ca4d5e
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
@@ -41,12 +35,9 @@ DIST linux-5.15.tar.xz 121913744 BLAKE2B 3921274b23f7938abdf3ed9334534b4581e13d7
 DIST linux-5.19.tar.xz 131581464 BLAKE2B 4db03a6830a3b3bbf0837e1912182a443d9a4aa8af20a12e6ec814ed708038452d3c0ccee1258cca671c464d76461536363a8adc56e9d098c9a44ae3484a297a SHA512 00313b2f9b82d2dc3fb8294007cf7d7599d254b717ed2de23c81fa7a1bbcbc2798ad286cb94e2f7f5bd54132d1d764facd90d30f79dbcc6616cc7f926adc2623
 DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6fb07f909ff1056e57235834173194afc686993ccd785c1ff15804de0961b625f3008cca0e27493efc8f27b13 SHA512 9f60f77e8ab972b9438ac648bed17551c8491d6585a5e85f694b2eaa4c623fbc61eb18419b2656b6795eac5deec0edaa04547fc6723fbda52256bd7f3486898f
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
-EBUILD gentoo-kernel-5.10.148.ebuild 3598 BLAKE2B 08ce2dc5719f68b0359e131864a5b4d27a9cd1ca35d5ac0e1f9092958d8923015f99da9361104fa0fb45649c2422c2d204f89b9f66a38214d83ead29aa7f9f06 SHA512 b054a9e9858f23ef6f7ba77e6bf19abd9aec489661718107e5c3562362fbf1353319be98a7d6d551f9f998ee60ab2554ea6baadc744ce4527fc0695b4f05dff3
-EBUILD gentoo-kernel-5.10.149.ebuild 3598 BLAKE2B 08ce2dc5719f68b0359e131864a5b4d27a9cd1ca35d5ac0e1f9092958d8923015f99da9361104fa0fb45649c2422c2d204f89b9f66a38214d83ead29aa7f9f06 SHA512 b054a9e9858f23ef6f7ba77e6bf19abd9aec489661718107e5c3562362fbf1353319be98a7d6d551f9f998ee60ab2554ea6baadc744ce4527fc0695b4f05dff3
-EBUILD gentoo-kernel-5.15.74.ebuild 3595 BLAKE2B 3f9177ab76f55b26f0b9785ca179df92d66c3faf2a875ea90c996834670cb22a0b0076549390f48058b71d5b3e352e2ab7c01003b1224f3b1380c5cb20ab6b47 SHA512 d2b6b3aecc1b3571043b19deeb89ae32c07cc62e81bb9385628de7fe7506d277cadcdab5d75a6af07c9f62a0bb88e9c80ec6e467b3ded7a9468ad858ffa4cd8f
-EBUILD gentoo-kernel-5.19.16.ebuild 3860 BLAKE2B 83a9eb6186ac31ddcfcbb80401e078c150f2e1e1141e962e7f1891beae412391087764a48eab5ce0fc2f9b8bd00225e9122a95b2a15b320bf0de63622d98310e SHA512 345a88aa98de549dcba361e5def145e25eae6d715523cfc6b5adaa1782a5efbda2b415bb84c9541bae7ffb8cbe36f20ec41d11da72117122eb9d5303a95d4e0e
+EBUILD gentoo-kernel-5.10.150.ebuild 3598 BLAKE2B 08ce2dc5719f68b0359e131864a5b4d27a9cd1ca35d5ac0e1f9092958d8923015f99da9361104fa0fb45649c2422c2d204f89b9f66a38214d83ead29aa7f9f06 SHA512 b054a9e9858f23ef6f7ba77e6bf19abd9aec489661718107e5c3562362fbf1353319be98a7d6d551f9f998ee60ab2554ea6baadc744ce4527fc0695b4f05dff3
+EBUILD gentoo-kernel-5.15.75.ebuild 3595 BLAKE2B 3f9177ab76f55b26f0b9785ca179df92d66c3faf2a875ea90c996834670cb22a0b0076549390f48058b71d5b3e352e2ab7c01003b1224f3b1380c5cb20ab6b47 SHA512 d2b6b3aecc1b3571043b19deeb89ae32c07cc62e81bb9385628de7fe7506d277cadcdab5d75a6af07c9f62a0bb88e9c80ec6e467b3ded7a9468ad858ffa4cd8f
 EBUILD gentoo-kernel-5.19.17.ebuild 3860 BLAKE2B 83a9eb6186ac31ddcfcbb80401e078c150f2e1e1141e962e7f1891beae412391087764a48eab5ce0fc2f9b8bd00225e9122a95b2a15b320bf0de63622d98310e SHA512 345a88aa98de549dcba361e5def145e25eae6d715523cfc6b5adaa1782a5efbda2b415bb84c9541bae7ffb8cbe36f20ec41d11da72117122eb9d5303a95d4e0e
-EBUILD gentoo-kernel-5.4.218.ebuild 2799 BLAKE2B 925a58a4afcb3c66f5179e8e5c23912332e7a1025ecd9d77b7d53cb89b25482c3dbf136b0340ecbbc4bd1430599302e5537d7a9e9e0314b5bbec1f9b98e76166 SHA512 4d67a306017b4741452ebbe3d0be3f29cffb0debc69bc2a605c6298d730c19a908ce8aca41a30888d9015f1330b9b6a4f5ba518714df41daf17900e8f29ddd44
-EBUILD gentoo-kernel-5.4.219.ebuild 2799 BLAKE2B 925a58a4afcb3c66f5179e8e5c23912332e7a1025ecd9d77b7d53cb89b25482c3dbf136b0340ecbbc4bd1430599302e5537d7a9e9e0314b5bbec1f9b98e76166 SHA512 4d67a306017b4741452ebbe3d0be3f29cffb0debc69bc2a605c6298d730c19a908ce8aca41a30888d9015f1330b9b6a4f5ba518714df41daf17900e8f29ddd44
-EBUILD gentoo-kernel-6.0.3.ebuild 3858 BLAKE2B 45c32644ec54fb13b8aedf1c44a671ff8613b603265b05245996118156c7aa330c89a9d5e0fdc210647cbade3edf54d184eae2751d1c0f1ba10dbeddf6076784 SHA512 f4d60507210e73defb63a52f48c01999093177d940123db23b92903c60c38e99104eb6fb26d8097bfc31eb288e5c37da3de70d7eea3f15a780c1891b401227bc
+EBUILD gentoo-kernel-5.4.220.ebuild 2799 BLAKE2B 925a58a4afcb3c66f5179e8e5c23912332e7a1025ecd9d77b7d53cb89b25482c3dbf136b0340ecbbc4bd1430599302e5537d7a9e9e0314b5bbec1f9b98e76166 SHA512 4d67a306017b4741452ebbe3d0be3f29cffb0debc69bc2a605c6298d730c19a908ce8aca41a30888d9015f1330b9b6a4f5ba518714df41daf17900e8f29ddd44
+EBUILD gentoo-kernel-6.0.5.ebuild 3858 BLAKE2B c7e3afb50b09f9cfbd77b5f282ac6b6be27d2377efb94bf63dd19c6379168009c9086b0e3ed858e97b549010563ac67ee7f2d531a91d0852c14b08838caa4740 SHA512 61b484d739f2e00e9f95a40f0d4ecef12e6683294b70cf19d2bb860bea498974a6ec676a44fca30a18f086fd0b37143097f33f1c0e7b0b9c9ee298c83eaed4f2
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.149.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.149.ebuild
deleted file mode 100644
index b20535df0df0..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.149.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}
-"
-BDEPEND="
-	debug? ( dev-util/pahole )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-QA_FLAGS_IGNORED="
-	usr/src/linux-.*/scripts/gcc-plugins/.*.so
-	usr/src/linux-.*/vmlinux
-"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.148.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.150.ebuild
index b20535df0df0..b20535df0df0 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.148.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.150.ebuild
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.74.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.75.ebuild
index 594cf4733237..594cf4733237 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.74.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.75.ebuild
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.19.16.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.19.16.ebuild
deleted file mode 100644
index 09dafaff5094..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.19.16.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=5.19.13-gentoo
-GENTOO_CONFIG_VER=g3
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )
-	hppa? ( savedconfig )
-	riscv? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}
-"
-BDEPEND="
-	debug? ( dev-util/pahole )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-QA_FLAGS_IGNORED="
-	usr/src/linux-.*/scripts/gcc-plugins/.*.so
-	usr/src/linux-.*/vmlinux
-	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
-"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		riscv)
-			return
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.219.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.219.ebuild
deleted file mode 100644
index cad009d01a7b..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.219.ebuild
+++ /dev/null
@@ -1,100 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 5 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="Linux kernel built with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-IUSE="debug"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}
-"
-BDEPEND="
-	debug? ( dev-util/pahole )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-gentoo-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.218.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.220.ebuild
index cad009d01a7b..cad009d01a7b 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.218.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-5.4.220.ebuild
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.5.ebuild
index f494400b5148..b2d46f8af059 100644
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.3.ebuild
+++ b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.5.ebuild
@@ -6,7 +6,7 @@ EAPI=8
 inherit kernel-build toolchain-funcs
 
 MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
+GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 0 ))
 # https://koji.fedoraproject.org/koji/packageinfo?packageID=8
 # forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
 CONFIG_VER=6.0.3-gentoo
diff --git a/sys-kernel/gentoo-sources/Manifest b/sys-kernel/gentoo-sources/Manifest
index 966f3ec65e82..89a469e460a3 100644
--- a/sys-kernel/gentoo-sources/Manifest
+++ b/sys-kernel/gentoo-sources/Manifest
@@ -86,12 +86,12 @@ EBUILD gentoo-sources-4.9.329.ebuild 735 BLAKE2B d8bdafd9ae65b5160e244cce0781e1e
 EBUILD gentoo-sources-4.9.330.ebuild 742 BLAKE2B f08b8f1e4d1402a75d8cbfefe9c0b92b135f51a936dd5d43523200fe2247908d5818f1e081fb3e1a94edb8aa0f7b84f0491671e5c39dc54d8477b0211a495541 SHA512 a8c90a1b2be46603442b17bab686c9d4b5c355502b443261c3a0ab3f7381ac75c2838931c7bd7df982f0d8c806566d7d250a969b91ed25cdc2931d3d62c379da
 EBUILD gentoo-sources-4.9.331.ebuild 742 BLAKE2B d6ed761901e2a757a14532208608c54721fa7f39333f7bb3d08a6e9a479d43d2978cfc40867ea3b711266b6cdee0ecd7124c1453b2868e0282d0935c6427865d SHA512 7afa1e07ec2c39d7b880fb35070af650041653f713f1d8ed56d7484114558a9d73bb05fe537ff1a8c6cdaac68b4623defb566f7a41d011a33e23a81dbf6a41e4
 EBUILD gentoo-sources-5.10.149.ebuild 741 BLAKE2B baab5ce976169f3307165030922df507b491967ce5620006e8d32cade5197ef9f0304bbdd0042e52fe6cfde2fd4666f7288651aead223444301e12dda4e66bbc SHA512 054e5c9a4b30fc8c1a39810b8f31ea7fe126b2ccd62204b2d78c3251fd78d1de3e012c31fb6a826353e33590b3532bcc18ff3d9a5bf4f512bc3e857c5fb94fee
-EBUILD gentoo-sources-5.10.150.ebuild 749 BLAKE2B 79e69f34038a3d25b46aaef09e9e1ca66a9ad2d3ff25b7b52220fda698d7edcf97da87f4e4b887cce17f3c796e17585038bcd3e83bfe61df689ea0e9df1b6b07 SHA512 8d2f26842e44197f3be086dce7953c7760e797c5614e8b5c59f156062dca6c55bc0233451c8ef81bbfe37675263d0cad5adb3e1914e5a2f17940a491b2f92f10
+EBUILD gentoo-sources-5.10.150.ebuild 741 BLAKE2B 065a9625b63aff715ceb2a04b62a203086046981d57fc5f8ceaeba58320104d9489fee5d3e5f6b2ddcd4f19c97aa0e72dfa20a9fdee7cef00a6b317147e3c752 SHA512 ca2aa36ba127991f4feb587eeb33b4729c9ce161fe5660a0f601d91a479446bd64fbd8f56b26037abe319c04dfa955f1a8b430e2503aaf4687d7a7eac0fdce7d
 EBUILD gentoo-sources-5.15.74.ebuild 740 BLAKE2B fb89c3c7a6e33ab5c8fdb37e9ddf9f9c7cfc3c15baf505c5036b14f12d876b497edaba51723ce85283d9734b53ebb84b5ae089e65eacbef748253f7ee7bd78cb SHA512 517c90929232ffa17c783ca4243d7f955a6a19d5da244770d6739596df4929a7ee0462c5cca76565e5287fb35f950c6f1f5a85a905a0acb21787aaa9038cb923
-EBUILD gentoo-sources-5.15.75.ebuild 748 BLAKE2B a27182817f8827b4e43eced1dc4857a212783ac4a5a522cd32390d9613581a7daf7840caa63e44e181e5357854c664e4b79c15cf43384bc009d728d20ff9ba40 SHA512 14308e0217f7cdd19e54e98cf300af37992e81dbd7b336119f71cd16f98abe5de68ee1364dd8d1e62672a09a63b30947f2192ba0abbd42cebc01d3c310321e6b
+EBUILD gentoo-sources-5.15.75.ebuild 740 BLAKE2B c86e533cf8dbdded46665e03dc0a4d369a992257f42da69aeb42112bddbf0abc396452149a0ffbfda885e5a3302211d5db6a91f5ee86d21ee0616ec4da184fca SHA512 d8f5e3ca35aeaf2a4a4ef962ec753dd55868f69ab445fcef6095889cc6cccc2df731bbde917fc56cf54106ff0e9a3be5068b4503649c99b08227e6790743a626
 EBUILD gentoo-sources-5.19.17.ebuild 757 BLAKE2B 6e24c356b5467f2d9e34b9b11587f0220b39114945ad8c8523e877ff37527789383a8d88f464ce5aab945d7e43e740d967df9c1c87584972ba85ec29cc49a11f SHA512 14961c8e6525c0fd38e3346ddca99c85782e68ba75aa919e866524a264db853ed2c997741a86a1aa6b7e59eff4e5fa15015f9b9ad933aaf6456e2f2db672dc96
 EBUILD gentoo-sources-5.4.219.ebuild 734 BLAKE2B c19c0cd5d15ea9f6ebed81a797d6994a434dfbafe3be4634fb059fa4bd11a54160d7f334c4845dae40461b6c24ac5c40ec2741c9b5cd2466c81ad38c347921fa SHA512 978fe7cb95044c363b8609ba3ddd76cd185ca87c1a763d814f3941099629737a083a532f58c138a1fb9b9a46d20ca512ca677980622a41de7520b0a200aa4d61
-EBUILD gentoo-sources-5.4.220.ebuild 742 BLAKE2B 84fe94d059c282d261bccfce4fa042a9763890a2ff5ccac23712fac8de72c8539377da584a67d4c51ce1d523eef08b936509619e051e6f5c95e85787246d3952 SHA512 96ffb8a903dad831478e35a4a55323f6c6834a863148e90b086b7359878089d7a5e6da1f9692cabc935506493f1b025ad65c1cdf619efe57438165abf1843bcf
+EBUILD gentoo-sources-5.4.220.ebuild 734 BLAKE2B 922e1bd7f9ca6b07a17a58d8b592fed1c438eb160ead222a4ff515c4cd9f67e559caa37e321c5f2c526c0765abd119a4d94aa04b0c522d08c3a0935843ebfba1 SHA512 a79134afe8a8e35f3a3df35cf8086339f8e7a1e36e90844f47128d0946aeb8a60be1870eca0007fcd74e568c1c12e28d24d5a78615a77c0ee99b37a5df179442
 EBUILD gentoo-sources-6.0.3.ebuild 741 BLAKE2B 5ea1c1e649245e1c156ec44d9d454fded0e208ab1b0306f971808112994d7597760ad9bb0e5e518226098e812b9855272b2326bddedc21356d2a0e6756c16dca SHA512 b4c10e3ea61260f2df9ba92c7f6ec5a3b34ef12772fe4b3631a3c43948037f0709d6069b5bdfe7ef3855d19ca0fb1e6f491d8285769ad94a167b259e6fd00575
 EBUILD gentoo-sources-6.0.5.ebuild 741 BLAKE2B 1a7d328ea3676f0ac0a9e6bff442e83aa76725ea7898a9b4eb6d2521a2d18dee30b283791dc75c433d15fdb1685b7bb00d535e1a4926b678021699e95c8b9bf2 SHA512 d187671f1cea171181e15f8c5d80124861a780566f57ad5fd051fae05c2ef330570fd02326630995062d9c7e1a1e4395ca80c73012e9fc3b2acc362f17e94f33
 MISC metadata.xml 501 BLAKE2B f5363c8a19540d5bb924b38bdebeb8dbc60c84e58d1d87a9148a3e7abb09b0a1b733c98b130b778b8ab3a88375598444aa9d537d8c5338864a3d4497600d7836 SHA512 bc1ba0d75dbf5b95b3f93e666389c6408f20aebeec99bc8ec00653758b67588e07214285ed106fd9e5aed2c8d57c625d666c797212fda51e1ab98ce1df816467
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.10.150.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.10.150.ebuild
index a96979d743e4..4819356227bc 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.10.150.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.10.150.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.15.75.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.15.75.ebuild
index 89937091069e..1dc77993b41c 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.15.75.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.15.75.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~riscv ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/gentoo-sources/gentoo-sources-5.4.220.ebuild b/sys-kernel/gentoo-sources/gentoo-sources-5.4.220.ebuild
index 88436a5f8dd6..79a315cb522e 100644
--- a/sys-kernel/gentoo-sources/gentoo-sources-5.4.220.ebuild
+++ b/sys-kernel/gentoo-sources/gentoo-sources-5.4.220.ebuild
@@ -10,7 +10,7 @@ inherit kernel-2
 detect_version
 detect_arch
 
-KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+KEYWORDS="~alpha amd64 arm arm64 hppa ~ia64 ~m68k ~mips ppc ppc64 ~s390 sparc x86"
 HOMEPAGE="https://dev.gentoo.org/~mpagano/genpatches"
 IUSE="experimental"
 
diff --git a/sys-kernel/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 9a256ba310ed..69af29e6caf4 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -20,32 +20,23 @@ DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133d
 DIST kernel-x86_64-fedora.config.5.19.13-gentoo 224246 BLAKE2B 6dd95fc7a8bd38387a3bfd6c00733220b34091961c8437cdac61e4376de8b35529808f3b8e2db91c1a0c90e1115395df153f94107e6f9884a61bf646cb40d25e SHA512 1393e6315581a4934a35f3e66146d014ad154025fbc71245bd4b6e7639952387449b69df41605df8590a4d363a5aab5111b442b1a9f56b4d2996ca416f7e5c23
 DIST kernel-x86_64-fedora.config.6.0.3-gentoo 226517 BLAKE2B 6cdbdd1d285e07a5c8866f90a035feb5d1123c5619005b489341ffdf6a860e253ed2883fea19fee89e22752e1b99a42cc8c14546066254928ec957fe97eef2ac SHA512 758e2674b67efabaa8b49349bcc00b70f69ee24f72a1b194384f0beb1da2ce207738cc8833fc4016029566561fb4f68a984c4e9eaff4ff156991bc7e84e1f4db
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
-DIST linux-5.10.148.tar.sign 993 BLAKE2B 980955d55989336130219d93c49555ea5942c9922fdfb0b11243914a3749cb088c4ff21c7b9703cfaff9a4bd3caaee3bdda76b8f376f42787a37b8c687a5fcff SHA512 37f74ad7ab87ef35dfa11391aba91d635fa5479bf5525721e9fd3e5a8bf2cdf39cc583b6095ebc523e791773326254b125a5f8a2a599c3eee44df9188d657ab3
-DIST linux-5.10.148.tar.xz 120497176 BLAKE2B a2d356139a2549ed9f1bfc56cc0b2d61efea87f3a6e4a369c222820c0f5f36f99c0962fe52754f5d897566fa69cdea739536d2f98fa483ae1d7c7d04f25d3d89 SHA512 9cc354a14eac22cc41a0bcaeff0f6ef0a734713df45b15aefa120fa3eb5d7a6baf0e262cd702113ce37a2440ef826ee9b54117ec3976ad58bc6f5ba5286f755f
-DIST linux-5.10.149.tar.sign 993 BLAKE2B 040884b3760aec4b52262d43f9564ccd140fc04713a8ac9962e751e6667e146d1d9b093bca89954964995dabaebf0d460f53153833487126feec3f58119b8da8 SHA512 8376831fb40a38b89fde56d094bb99fa8f2426e24e1d159f9dfa4bd345eddeca4564b3bcefa934a11189e367cd230d236090e347c1d192306401f564085ef4f0
-DIST linux-5.10.149.tar.xz 120485608 BLAKE2B 8dda48d365c100e65757b51fada6764ea83c6ab2b521c16ba2dd32f545bd77d2d4c5dc946b02243f56f2fcd4e0df6edba68ce50fc95c93306e96a5c94353b8b8 SHA512 25344d9da8f7504c5ecc579506de418dd5e35f9029c27d7e0085d4510c4ac37dc4c6e6bca173446986fbefcf92f3a3fc40b586952a81a16d0118f79a66238b68
-DIST linux-5.15.74.tar.sign 991 BLAKE2B 5f7a422d394ed9942d08569927d746ec5f7ae7d21f99977623bad6816f7a45c2ad940c5cc61f554e17efb57321ef67d0389198f4ebdfc97dbba214b9bd55579c SHA512 d97e81f7a037435f91527f4ca057ae62c2d9f391b14df5dce65fabcb68b0feab2db6724acf1b3a3c56d57014c6f52050cd8fbe8a8248656eb81337ab53e10b22
-DIST linux-5.15.74.tar.xz 126457328 BLAKE2B bfff9c714c2073444b64ed295293fe98b92a34631826da4c378f2ee15cf866ca844ae9bf659457bb9c4b135803b2db12a1edd68e64134506850748ce24ff0733 SHA512 fe65228eacf7ed9ccbcd96c84a11d5f9c62aee9eefaf7cdbc05bac2d700a4356a8a856d4d756358c28068505903ea419fc03a12a5add1a5890c9adf61fe80b80
-DIST linux-5.19.16.tar.sign 991 BLAKE2B eed8ba71c0c0247a125d8f9babec75d0f9ead0b034123862e0c1ad8a5513ff1ce045cdb3fac7c822bd97b5926c068849aa647fd8d414f3f236baca8825ccd4d0 SHA512 f89d029af39a5b70b37465f91f04915493d3b1a0f2fa42160e7b63261b1639d2b75e395200c5443676b3f2f619014e46fd715ea0f2a1f2f9a2a6c22df73fc972
-DIST linux-5.19.16.tar.xz 131631784 BLAKE2B 401e87fc4172c597228a3d58d95d89a8ce015662928a60bd527e2040786ab368b5b6d9d7f3dfa177f7608baea3b49f786c1d0efd93bb25d642d557b93f3d29c8 SHA512 1ff662424830fbd48ac1d8c1aabd4d11a8eabc284c4fe3fdf803064d4f56d9c1b631a0fb60679bac40a4e05b77d5e6706a8fd52a5e025ef4f1231a6cc84bbbde
+DIST linux-5.10.150.tar.sign 993 BLAKE2B 0ae037ad070f0ffb6616a2975f6d4c2f3a1146d37041477e4bae099f81a1c37eb65e067ed43a269f33de28f9245630c24d43fb1e09ff60e9df2ca9e5b61bbdfd SHA512 1d20e28dec05e44586f8a7a4d112b13feb94dfac0b9d1f79091fd5653f79ad92dabbd80f8835ed0e0881d37617c4f1f1a31fdd265b883384d87cd98bed9ad025
+DIST linux-5.10.150.tar.xz 120500048 BLAKE2B 159868086f4571b88445424dd08d2c691bd97e8842814b00ca32113c6306ede05be3ce90aa541b29e65f7df4cb3b13aebb9ec4d9a83abb490f163d8e79bdb2f6 SHA512 a671b19973977652dbcda078b1fd7d810b994c8096c0cfcdf9e5c4c4acf1ed6fa56dc64acefe96b2d7ea555480f0560e9fc80350aa4cf1afef98f9e7bbcbdccd
+DIST linux-5.15.75.tar.sign 991 BLAKE2B ca3ab657a1e6d98d2f8419c98c5f41beba2cba0bcbed937c4233bf8d3222b362bd973b435bb5fc987ce9e9714dbf6ddfc2265c7ede51196d66df0234d904fe7b SHA512 81b5b73b910babb8a7b3d060c3f826f3da687fdbb8cd83fb55848238f052e035677549ea59f41636bda7dbe1ee5949e043c70e0c3d501ba1b09e5ad4e27191a3
+DIST linux-5.15.75.tar.xz 126466096 BLAKE2B cc913d15da3ec8389f7eb2b0597281a96465dd92245b4ddb41eefd76208d6672e6c83b88bd8d56596b553ed2c07e602e604038ee44c3b44325b3943fccf10fe9 SHA512 6cf56319d2bfbd27a3c01197d9ea23cfb3acbf83e0496889c6fb500c52a399ec852f965b7e9f54f389b3229dcf3dce8b48b278e5063d077936c8b8337cf370a6
 DIST linux-5.19.17.tar.sign 991 BLAKE2B 5f2a7a6e4bdc66f4803b03ba3e9c0b88f5eee798e192db40be092b7da480f326ea3898afe0b461f68e69bfbeb7cd5547529db72cf338ceeab3d111bf1b36ad6f SHA512 30d3a3e76be9327658391912720275c2a63ba1bca193b03989535ce6af1d8fa958a52abbb5ca9b3b614fcec88d547a4a0fa209eb738ed5ee90605517d74bc458
 DIST linux-5.19.17.tar.xz 131698200 BLAKE2B c672df8169c4b237b00759510fa5582089a92129bd60cb712faa94a14070c867a821aee088ccf75df136a728ff71a3fdaa3aaf4baebe9aa62ea8ad15ff5bc76d SHA512 aa1b471be303cbe470df7d8b681144f4352f677bed27b98056477f24c93684f8fc4e45bf91611b38f4798bacd3568b6e4bd3eb7641d618200815953ea05f441c
-DIST linux-5.4.218.tar.sign 991 BLAKE2B 821db66087ca8264ce3499cae2113868341f8ee176964b8dac7a156a62ce399b3dfc1ea4a199a7bb3e2f8d509087397dfb3981bde83226557529af835fcab512 SHA512 3eb5ec1f2ee535c3c6ec9c9ac021d3339a953cbc97bddba178491267a7ff19f2c73d89aa9b7c1dc2b851e27e83e4c5bbe1c67b66ab8a1059bb851cf178fa4af6
-DIST linux-5.4.218.tar.xz 112926060 BLAKE2B 4900ba1d0aabe61d2877d1b6ebda695e8ee5e1a4fd9ae3dab7010435f21a3cbd98fd36b8994f10eee1816b6a6561b958a2da176eeaf67309bf24fd90ff190df4 SHA512 51adf248105706eb30b611496baa7cc35be16857f890ac5ffb031373bf0538b6fdf3440c8b753b0d33aad6ec84ab2ef859585e79e65c470f5b4c9d728763aab4
-DIST linux-5.4.219.tar.sign 991 BLAKE2B 59380b43b19ae0521ea49ffb8aaf275e9b7f6b1317c31f9f8c8a179aedf32a053b8d9bbf4a424dd531dfe48e83c577936eb8968782c4d56a4909111d46054a69 SHA512 71141118cfbfd48a7b3e401bda0e75006efb5c4b935aa201fce2a0a94520ff30680e2db6852d89613d85b17f54e3073f8b6147be2cac27f69b01686759e202d5
-DIST linux-5.4.219.tar.xz 112952984 BLAKE2B 169d050a65f671467c2b874f0049789fe1fc15aec2654abdadc63a23e857408bb029beee6ce36c6048b87e1ed65f41573a56eeb92bb7f1b770aa15c022c5a440 SHA512 3eeffc922a154c44226f87bb55bf80fa24a1d9f5c3b7d58f6da07066795e757344c92c6e2351a30d2f6b5b63bd1f96648b745a1259e7fb9b70e81e069d6e2b43
-DIST linux-6.0.3.tar.sign 987 BLAKE2B 8c1796bdf0b846af4e1cae644930e6220a6ac2b628c6a53f505496457687e03f2afac6c3962fa5b37dd5c930e988589935164fc41d4cbdc36376dc4190d3f660 SHA512 27abba5616b4665ce040066038ad6af3a631208eb17f8273f99e30adf6af0741a4b9e361805eb2f9a9617a5acf05d5eadaf8d53a27a990bcc9497edb7196342a
-DIST linux-6.0.3.tar.xz 133903496 BLAKE2B 8ba900a7b98f22a208234cecc7813c4bd6125a6eb5a424b425c135a2de2780f2760a9d94da8ba3caa429c2ae4a9baf9407570cdc8aa9609e89787ba581a004a7 SHA512 953a4dfe46eeb5f4b7927c3e2af8e053b3a1a50a255f90bc33a7883fbcaa3a349044a2df1560ea2f84dab2668734ccf2cf4597b053950fd28bf07509e12f002d
-EBUILD vanilla-kernel-5.10.148.ebuild 3715 BLAKE2B 43376b8725a469a9f7e98e105b2e7617ee5c663b367b096292bd58e9b66905d1d40a8325714668ba3e04bf1d21d809950198aefab7b63b152c685f08b9bc497f SHA512 4bffc17a9a76ce0fd938ddd272587a294719262af38165686bafaa48a7a543068817b0b5136365e512a0f141bad06d545ded287786afb89df3bcd253280f30ff
-EBUILD vanilla-kernel-5.10.149.ebuild 3715 BLAKE2B 43376b8725a469a9f7e98e105b2e7617ee5c663b367b096292bd58e9b66905d1d40a8325714668ba3e04bf1d21d809950198aefab7b63b152c685f08b9bc497f SHA512 4bffc17a9a76ce0fd938ddd272587a294719262af38165686bafaa48a7a543068817b0b5136365e512a0f141bad06d545ded287786afb89df3bcd253280f30ff
+DIST linux-5.4.220.tar.sign 991 BLAKE2B 6296bf42826c849af68331ba32a8e84c892b54f299b9ee7b84ade2d52b5773a3488f189de1f4f7e2580a13bf8ac4af256b0d18fbecc9ed9a69bf1a1a94aa89ff SHA512 21c05e660eb0f55a2138eed952ccda9860ebffbdecfe81240c89ef32904f060aefd7c01846d614de6f1dd30986f0eab0ac85f2c31b0805f4bc578ba83ca82ab1
+DIST linux-5.4.220.tar.xz 112966272 BLAKE2B 6e1afe278f7d31cc34d73dcd87b807c6c3c790ff635918a54528bbece8861e60be06645fe7425e947a876969c44e63aca83663b0de9b0585033e23413c097410 SHA512 a09565da5da4fcd08ec9c6050908040fe86fabbb47375988764774acea9d5a6604c93407264a2de6a5b2e3805934884b505dde5e7405a772b3bcd35299ff3175
+DIST linux-6.0.5.tar.sign 987 BLAKE2B d8c7ceab01ab36ade7322ff141fab940fc95b4126d808edd59d823de4a338341fe8c1aa3500b8647540982feaa44c8c3be4de92b2c2ca2ea64b576b7dc258f38 SHA512 95af989dd78485d3405de63a2ec77ddb20cb6438b415b7c276e7d8c16bf0a5505affe06f9b21ffa8bbc2af835f1582c6fe0031e7115a5dd40408b8a223c37ed8
+DIST linux-6.0.5.tar.xz 133898040 BLAKE2B 71afe2e227bbab9b40ccbd3dda4aacbe1ba7f45b85c863c57a759a91d18d215cdc16c8bfd28e2d2bcd2a510c49b7fc84531d21695ad81895172ca6997ffe0f5a SHA512 90c0610be2bbca8841ff757b09d71c5d1efdcbc3cf0840d3f1d7a1b9a4854aa1eca36cfec0926dc191d35c5cbf71fea214097d831af2a34036c9a598f0ac55ad
+EBUILD vanilla-kernel-5.10.150.ebuild 3715 BLAKE2B 43376b8725a469a9f7e98e105b2e7617ee5c663b367b096292bd58e9b66905d1d40a8325714668ba3e04bf1d21d809950198aefab7b63b152c685f08b9bc497f SHA512 4bffc17a9a76ce0fd938ddd272587a294719262af38165686bafaa48a7a543068817b0b5136365e512a0f141bad06d545ded287786afb89df3bcd253280f30ff
 EBUILD vanilla-kernel-5.10.9999.ebuild 3234 BLAKE2B d1ae98cbcc1aa58bb90e787f61a60a3a1f5936fc7667d2ccf9d441c1445bedeec835e40609c28b586e199adb2ea75b68b01b1422d712eeef6d8129c516afa935 SHA512 304afe6d49b898671901bf8d8ebb380a4adb774d3263ddb19b8797d97708badb281e5cff02ef95392057be52e13004902d59fe5d91f5a2d7db0a734ec91a321b
-EBUILD vanilla-kernel-5.15.74.ebuild 3715 BLAKE2B 5f9721371b3ba0e5498b275fa2ed31fdb6f640e2506d4d246076460f085f33f1850adca9db07260deccd65b92c94488f60625b0f8fdb66d9294ae2a697f16493 SHA512 84eae31a460385f9508ced76a7f3f02be83a2283e6691fe94b56a8e68bacaa4c97604dde3691903195fef01ab5e1f55063421c895aa8d1737adca071aabd9477
+EBUILD vanilla-kernel-5.15.75.ebuild 3715 BLAKE2B 5f9721371b3ba0e5498b275fa2ed31fdb6f640e2506d4d246076460f085f33f1850adca9db07260deccd65b92c94488f60625b0f8fdb66d9294ae2a697f16493 SHA512 84eae31a460385f9508ced76a7f3f02be83a2283e6691fe94b56a8e68bacaa4c97604dde3691903195fef01ab5e1f55063421c895aa8d1737adca071aabd9477
 EBUILD vanilla-kernel-5.15.9999.ebuild 3234 BLAKE2B 996eac76e626ce6dc0a984e1edd9a0c0b7e5676c1a7537ec30f49041658600daccef70fbf325611dc1001ab5e73c24f5e107f7d78bc7460b911636c38c13e0f2 SHA512 505cee407fde3af7ba4cd631f743df29a1770396828de0090b1fb371eae3f811754bef70f8f6f61bf8eb2505285fdf93dbfe600d8fadaf5f0878a557388060e8
-EBUILD vanilla-kernel-5.19.16.ebuild 3835 BLAKE2B ba5aed4f0630a972dc9204da9b67184ff1ce8362ff445f469405e05e90a16db3d3dcb79fbbc2ae9867a62ecd518208472024673bfc0fe27b5758fd00d6bf43c2 SHA512 c5567b4c47a5cacd755ceff2d35ca716751f5759d7b13eafd83a4868fb144586bc20393ec2cec3298f19f8e98f9c53670e0692ad792bce507245c84089b25f6b
 EBUILD vanilla-kernel-5.19.17.ebuild 3835 BLAKE2B ba5aed4f0630a972dc9204da9b67184ff1ce8362ff445f469405e05e90a16db3d3dcb79fbbc2ae9867a62ecd518208472024673bfc0fe27b5758fd00d6bf43c2 SHA512 c5567b4c47a5cacd755ceff2d35ca716751f5759d7b13eafd83a4868fb144586bc20393ec2cec3298f19f8e98f9c53670e0692ad792bce507245c84089b25f6b
 EBUILD vanilla-kernel-5.19.9999.ebuild 3354 BLAKE2B 7d153d91d316f3f1a27a4f44d3b0d455182b046d0db44bf34adc00bcee00cda1e23cdd359bc655d8b67c74763cad8364a582c28fc57626e0ffb836ce4eeef369 SHA512 de41900154fc4c6e44b63e68caa6d87c60934acf4453b122103f1e655b10b23c601365af65d1af45246c4fc3cd763ab73bfd828e118398ec5b09d0c5b69d3f08
-EBUILD vanilla-kernel-5.4.218.ebuild 3001 BLAKE2B 2327a3c19157c0658328235c8853a8806b7e10af269041a7ff1d3a8d7b3df4ef767ebf12829b57d32892d9795619e946a574b704004da55b6f8641e71d832e69 SHA512 5068ce6fb368e17c40629eedc4cf78a7a5b9ca50b102d0378fe0022eeaba14ef710da4f5b31c7021b013c7745fcf52c569bc0bb11c8cb3de038a6f150680edfd
-EBUILD vanilla-kernel-5.4.219.ebuild 3001 BLAKE2B 2327a3c19157c0658328235c8853a8806b7e10af269041a7ff1d3a8d7b3df4ef767ebf12829b57d32892d9795619e946a574b704004da55b6f8641e71d832e69 SHA512 5068ce6fb368e17c40629eedc4cf78a7a5b9ca50b102d0378fe0022eeaba14ef710da4f5b31c7021b013c7745fcf52c569bc0bb11c8cb3de038a6f150680edfd
+EBUILD vanilla-kernel-5.4.220.ebuild 3001 BLAKE2B 2327a3c19157c0658328235c8853a8806b7e10af269041a7ff1d3a8d7b3df4ef767ebf12829b57d32892d9795619e946a574b704004da55b6f8641e71d832e69 SHA512 5068ce6fb368e17c40629eedc4cf78a7a5b9ca50b102d0378fe0022eeaba14ef710da4f5b31c7021b013c7745fcf52c569bc0bb11c8cb3de038a6f150680edfd
 EBUILD vanilla-kernel-5.4.9999.ebuild 2574 BLAKE2B 6a8f6619bc9a88b8076a80ad6158b8996544b2608a78571107ba0b7be09b5f35add48d99d54ab6a2232f110156df1cbf6f325da036be23c793b4f84bc0f995e5 SHA512 c95bf760e931180ca9cf09c91e7fe05039f2aa2d743ddc8aa3e14d765928d40fcea628754e0177cc66df3fddc0fa2fed54d962e8682c5aaa7fa416f0fe3ac323
-EBUILD vanilla-kernel-6.0.3.ebuild 3833 BLAKE2B ba32739ab7dab9b3a26798a39a2e2cd3f159648f7af56984292364b441ca55995dfa640625eeba053c045fd5143c8b21d1339972370f32ba790e4df78d7082f2 SHA512 a7a19990907b29b121982e245ccf5398468b8d51c5393f6a4fb46496c7e7601531b03c19e41b60d8c290903487d69b282ff4637ba2054e1148035783ea28f26a
+EBUILD vanilla-kernel-6.0.5.ebuild 3833 BLAKE2B ba32739ab7dab9b3a26798a39a2e2cd3f159648f7af56984292364b441ca55995dfa640625eeba053c045fd5143c8b21d1339972370f32ba790e4df78d7082f2 SHA512 a7a19990907b29b121982e245ccf5398468b8d51c5393f6a4fb46496c7e7601531b03c19e41b60d8c290903487d69b282ff4637ba2054e1148035783ea28f26a
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.149.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.149.ebuild
deleted file mode 100644
index beb11365e70a..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.149.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( sec-keys/openpgp-keys-kernel )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.148.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.150.ebuild
index beb11365e70a..beb11365e70a 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.148.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.150.ebuild
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.74.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.75.ebuild
index e9d460c7094d..e9d460c7094d 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.74.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.75.ebuild
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.19.16.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.19.16.ebuild
deleted file mode 100644
index 43e75eed5fa0..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.19.16.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=5.19.13-gentoo
-GENTOO_CONFIG_VER=g3
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( sec-keys/openpgp-keys-kernel )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.219.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.219.ebuild
deleted file mode 100644
index ae90752d5ab5..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.219.ebuild
+++ /dev/null
@@ -1,108 +0,0 @@
-# Copyright 2020-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.4.21
-CONFIG_HASH=2809b7faa6a8cb232cd825096c146b7bdc1e08ea
-GENTOO_CONFIG_VER=g1
-
-DESCRIPTION="Linux kernel built from vanilla upstream sources"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	verify-sig? (
-		https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.sign
-	)
-	amd64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-x86_64.config
-			-> kernel-x86_64.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-aarch64.config
-			-> kernel-aarch64.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-ppc64le.config
-			-> kernel-ppc64le.config.${CONFIG_VER}
-	)
-	x86? (
-		https://src.fedoraproject.org/rpms/kernel/raw/${CONFIG_HASH}/f/kernel-i686.config
-			-> kernel-i686.config.${CONFIG_VER}
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc ~x86"
-IUSE="debug"
-
-BDEPEND="
-	debug? ( dev-util/pahole )
-	verify-sig? ( sec-keys/openpgp-keys-kernel )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-VERIFY_SIG_OPENPGP_KEY_PATH=${BROOT}/usr/share/openpgp-keys/kernel.org.asc
-
-src_unpack() {
-	if use verify-sig; then
-		einfo "Unpacking linux-${PV}.tar.xz ..."
-		verify-sig_verify_detached - "${DISTDIR}"/linux-${PV}.tar.sign \
-			< <(xz -cd "${DISTDIR}"/linux-${PV}.tar.xz | tee >(tar -x))
-		assert "Unpack failed"
-		unpack "gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz"
-	else
-		default
-	fi
-}
-
-src_prepare() {
-	default
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64.config.${CONFIG_VER}" .config || die
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64.config.${CONFIG_VER}" .config || die
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le.config.${CONFIG_VER}" .config || die
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	echo 'CONFIG_LOCALVERSION="-dist"' > "${T}"/version.config || die
-	local merge_configs=(
-		"${T}"/version.config
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/no-debug.config
-	)
-	[[ ${ARCH} == x86 ]] && merge_configs+=(
-		"${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"/32-bit.config
-	)
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.218.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.220.ebuild
index ae90752d5ab5..ae90752d5ab5 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.218.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-5.4.220.ebuild
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.3.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.5.ebuild
index a77bd2fb0699..a77bd2fb0699 100644
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.3.ebuild
+++ b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.5.ebuild
diff --git a/sys-libs/Manifest.gz b/sys-libs/Manifest.gz
index 42c3a0af875e..830c79f52eed 100644
--- a/sys-libs/Manifest.gz
+++ b/sys-libs/Manifest.gz
diff --git a/sys-libs/compiler-rt-sanitizers/Manifest b/sys-libs/compiler-rt-sanitizers/Manifest
index 624a083db92c..03874d388dc8 100644
--- a/sys-libs/compiler-rt-sanitizers/Manifest
+++ b/sys-libs/compiler-rt-sanitizers/Manifest
@@ -12,7 +12,7 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD compiler-rt-sanitizers-13.0.1.ebuild 6369 BLAKE2B 4e8a715cd19dd39087fe7d6cad9e30a7e130c69bde12ea382fc748cc152099607c23b75915c644785820ded954eaba31779f7c58b63a71255f9c6b610afcee7d SHA512 f5a680a5de09feecde1a3038ab185cc3b321eb2dc15b5841cd58863323fd6da727307c44127d2af5077ce2b17744ee5d3f8a17dd3bceea71b1dec2a13555dd66
 EBUILD compiler-rt-sanitizers-14.0.6.ebuild 6381 BLAKE2B 010ce621c56c1568eaddeb6f4af6e680f2596106768e3b40bffd3c221df20b565c565793ff14a46b2a96b080a696a9217be0f547c2e85430e9031bd86adc2b90 SHA512 d68b96a7458c8b0d1946523a7c1b20e413de38b7f53bd87b8729103935cdb9ad8fc38863138ba36ffc8da57e0ddcf591c7deeb23fba0d76003adea978b262e37
-EBUILD compiler-rt-sanitizers-15.0.3.ebuild 6438 BLAKE2B 365a74be34dd43bb83e1eb3be7e643899baea439b56fca5b497ca3e92e001343de9a03d592b956c279d4994c805a5d975601f5f7750c8d099e2d446ed7e8b2eb SHA512 7a3836f239bf8053a07b38e112056506e3e3da363874fcb70d7a74bc72bea6a0298f08e97f3a73b5d3c1c4af57fdb692567fdff7775e5bcdff01eabfd2f962cb
+EBUILD compiler-rt-sanitizers-15.0.3.ebuild 6436 BLAKE2B b2efbd87ee0af965fa3d8f957314b152feb0fca831d4df44b1cab51cf07d277abee9a8fd6681477e5ea21da24324708578641d8b4ba2645a5db92e47b66545e4 SHA512 a975ed8f4cf4240d2e62dfbfa842be744101df1480353cb3654759c90f5cdcb2bbac1e9dbb1e4a3a82ae0697ba595904860dadcb35eb9a7218763feb8c2f8483
 EBUILD compiler-rt-sanitizers-15.0.4.9999.ebuild 6363 BLAKE2B 640625391bc73444ed357c25028b641351e5e4f2661271e2d762a9d0a8bbf70a916018c82ddabb25f95679121eea1f35726e011f12d99bb88f1aa6aafef9f5ba SHA512 0c9b3e50c61cb6129fcc20e2fc08f7d32fd2ee180d2bad3e6ed9c7b71819320af9c74457332afac8c14b476d18b47ce7a353813e7bb29e0a568771d314f9c46a
 EBUILD compiler-rt-sanitizers-16.0.0.9999.ebuild 6322 BLAKE2B a6c3057587f87750a2ef204d1504ef86e579bb1c8eccbb366563a4c5899ee9357ed211affe9190c44bfbe397ee54dc7b05622a693acae8aa32ea2b4ef36c33be SHA512 bdf5995cf3973ccf9f5d5dd4baa1a8424fa01d9f95cf44a4c656e66bb98e81359a794b95603f29532675c5247b3f472b1c1fdb79066dfde8e7a383ab5929bf13
 EBUILD compiler-rt-sanitizers-16.0.0_pre20221016.ebuild 6322 BLAKE2B a6c3057587f87750a2ef204d1504ef86e579bb1c8eccbb366563a4c5899ee9357ed211affe9190c44bfbe397ee54dc7b05622a693acae8aa32ea2b4ef36c33be SHA512 bdf5995cf3973ccf9f5d5dd4baa1a8424fa01d9f95cf44a4c656e66bb98e81359a794b95603f29532675c5247b3f472b1c1fdb79066dfde8e7a383ab5929bf13
diff --git a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.3.ebuild b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.3.ebuild
index a890877df54a..978e850d2014 100644
--- a/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.3.ebuild
+++ b/sys-libs/compiler-rt-sanitizers/compiler-rt-sanitizers-15.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_VERSION}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 # base targets
 IUSE+=" +libfuzzer +memprof +orc +profile +xray"
diff --git a/sys-libs/compiler-rt/Manifest b/sys-libs/compiler-rt/Manifest
index b40e2925eb67..e466de023356 100644
--- a/sys-libs/compiler-rt/Manifest
+++ b/sys-libs/compiler-rt/Manifest
@@ -13,7 +13,7 @@ DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69b
 EBUILD compiler-rt-13.0.1.ebuild 3880 BLAKE2B 83202517f413772d355aa49b5a3bd8b7000c86f6538da1a5ae96de5e84bc7536d0e639b530d1f504dc68b769565504434cc80d25426207b19283b9bc41df3388 SHA512 fe5329aee6c29d408c67af9e9891205fcdf313676780b948975f94ddce31b3f54e68cc041233c81b3005ff94f7685dcc09044f3634760d90e8c18c61f63651c3
 EBUILD compiler-rt-14.0.6-r1.ebuild 4248 BLAKE2B 8efb13b1c805b5178f01036e5ec3b9bf047066fd5d2fe09706bb40e1317fe8d2c3d72f2fd57536fbc5a0eeb6cc1b59d8290b2a342fcf8d6fc5bb8c6092276255 SHA512 52ae7b4f940ecf4f153ec001954589b4ece940e8a6302f5493d6edf5788d9db6f212fb165c7a6e07d1f8ad93e89f19520d0b65b9125a71e922b11503073f9e3e
 EBUILD compiler-rt-14.0.6.ebuild 4030 BLAKE2B 9881380671f25916b7a9356e14b45fd30b7c5cf5263fcf975b0d5ce0333389d519457dabaf1ac8dfc55f5206594335a5f996adcf26880f8a30c8a5ab99c3c391 SHA512 1ec4d79d5d319c5345caa7399c4d4bee5416af3952b9936f119764e17b1c05c25cc818a0c123c8b55ee31503e633999384d0a227a6c84d380cdbdc169f0f43ea
-EBUILD compiler-rt-15.0.3.ebuild 4264 BLAKE2B 7411477bbdf896d3cd8bd112b0aaf0fc92b21813b2808474571f90eb1b2bdcd1e617b6262267c3adb90c9993c7f0e5d326aac1430440873cbb2be1644499c156 SHA512 0dd3a2e968a4698bff0d617b710046e824fc219ce33998012cdf0bb62c56e2ff159122e39c0203a042e59c5f7f693dae8ea5dcccd4115871e0bd8b54f01469e0
+EBUILD compiler-rt-15.0.3.ebuild 4262 BLAKE2B 7f025fbb4effbc83755a9ee8708825e9a5d24f1d1914089251be8a468732b639aee9ea5da23d7abfdf96f3420e394c0d0e89e4ea0341cfbf921bf91c86fba122 SHA512 725a408f2189015572723aa671bd3adb57ae200e071e3e78e888ba44cc93e24f5645217fa7e550a06bb2393d097643ac8263d49c1b8b886b574b73ce46fefe85
 EBUILD compiler-rt-15.0.4.9999.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153
 EBUILD compiler-rt-16.0.0.9999.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153
 EBUILD compiler-rt-16.0.0_pre20221016.ebuild 4189 BLAKE2B da1b3444520bbb7a83569b65d7de338678a52b2aec70d29afee47142a268fb76310419dd00d1420445d2f30d3f567cf2bfe9e89cf89261843742094d477a2ef6 SHA512 d29905eca230cdba53aa9d63d1ccb68608b4ca74c4a6c3fbcab60245685c363d93e28ea3dba67f632c85964571da5c812ab8ca6c6be2bf97d06c93c072f75153
diff --git a/sys-libs/compiler-rt/compiler-rt-15.0.3.ebuild b/sys-libs/compiler-rt/compiler-rt-15.0.3.ebuild
index 044c81a79eb4..ec7e5616d2c1 100644
--- a/sys-libs/compiler-rt/compiler-rt-15.0.3.ebuild
+++ b/sys-libs/compiler-rt/compiler-rt-15.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="${LLVM_VERSION}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ppc64 ~riscv ~x86 ~amd64-linux ~ppc-macos ~x64-macos"
 IUSE="+abi_x86_32 abi_x86_64 +clang debug test"
 RESTRICT="!test? ( test ) !clang? ( test )"
 
diff --git a/sys-libs/libcxx/Manifest b/sys-libs/libcxx/Manifest
index 8584af352fba..d0067d37481d 100644
--- a/sys-libs/libcxx/Manifest
+++ b/sys-libs/libcxx/Manifest
@@ -9,7 +9,7 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD libcxx-13.0.1.ebuild 6768 BLAKE2B 71b0f62e35538d718d99e3d43447f98752933868d999bf831969a6940d3a817452789c2044e9ca3bb4d5d1f0c2976fc276c4d10cb018c44e0cc6109095d9c6d6 SHA512 a12023fa135a7945e8088b34421f575cab32bb8ac53f1aeaa61bcf2a7b9fe045a6e21efba168056ef47b165ef3100e382100f910c84dee972017de6355d2e9c0
 EBUILD libcxx-14.0.6.ebuild 6948 BLAKE2B 203e04f4e2603ec0b8e3cd672ca2458c971e4ec3c1d24ea65f85db143561d349d9b7e4b4a58f7c57f5c0caa519e5a79f99f0a76c404aeba47b0bcc683adcb572 SHA512 c1a353dd558c68d439ab66e089e26993e66f1729f7879912413531bbd89318338649dccde1f84a32784de380997d2611d6b7cf86841feb47c3c0c8d67bfe28df
-EBUILD libcxx-15.0.3.ebuild 5285 BLAKE2B d97bfc8b1190d3c02e5386112d9067ca0684c72709e70a4c72f7d097a867e4956308587ef29b7628e621712662d8c1cf35aae51b70ed844c00440e57041b4bd9 SHA512 a39041c6eb459b9c84c366898d3aed7e33b3dcfe0aee5010ff013194ad93777db91a848f26d4e19d6615c0223403380f60da8b2ae0221a038ee86008852cbf20
+EBUILD libcxx-15.0.3.ebuild 5284 BLAKE2B d76965fb77d1d865e7b9d29f32ae4be19310156bfa36867640806a75914430a29d84853f6445b9a7bb16aca4c172c0ad392180701253a3572fa4182d0665257d SHA512 9e2345b77d14074f4d28a1542e2b5008939334ce798da382508586dab26d7b48c8a4debb44f2c6e0f86fb4363cf9af22872962aee3ba8e2b015b3a0c862fc502
 EBUILD libcxx-15.0.4.9999.ebuild 5238 BLAKE2B bf9c8df5c949f999fdcfad82deb548231c5ef16c25b55c76fcdf3e8fa2e5c3be90fd6ceb4c747fb639de46ef2d192b7317ebf435dfcff44ba9ca5956e59012cf SHA512 519779336613cd1110194d8a7768d2e8c3f286c7ad72da87937bae694f1830dcbec686e2b8afa212b29a3d3406a504fc903e09599a4dc7c99f277ee8f5193a1c
 EBUILD libcxx-16.0.0.9999.ebuild 5238 BLAKE2B bf9c8df5c949f999fdcfad82deb548231c5ef16c25b55c76fcdf3e8fa2e5c3be90fd6ceb4c747fb639de46ef2d192b7317ebf435dfcff44ba9ca5956e59012cf SHA512 519779336613cd1110194d8a7768d2e8c3f286c7ad72da87937bae694f1830dcbec686e2b8afa212b29a3d3406a504fc903e09599a4dc7c99f277ee8f5193a1c
 EBUILD libcxx-16.0.0_pre20221016.ebuild 5238 BLAKE2B bf9c8df5c949f999fdcfad82deb548231c5ef16c25b55c76fcdf3e8fa2e5c3be90fd6ceb4c747fb639de46ef2d192b7317ebf435dfcff44ba9ca5956e59012cf SHA512 519779336613cd1110194d8a7768d2e8c3f286c7ad72da87937bae694f1830dcbec686e2b8afa212b29a3d3406a504fc903e09599a4dc7c99f277ee8f5193a1c
diff --git a/sys-libs/libcxx/libcxx-15.0.3.ebuild b/sys-libs/libcxx/libcxx-15.0.3.ebuild
index 92d3ede4f699..3dd73c28029b 100644
--- a/sys-libs/libcxx/libcxx-15.0.3.ebuild
+++ b/sys-libs/libcxx/libcxx-15.0.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxx.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv sparc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~riscv sparc ~x86 ~x64-macos"
 IUSE="+clang +libcxxabi static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libcxxabi/Manifest b/sys-libs/libcxxabi/Manifest
index 69f0de842da0..b63b255e2d5a 100644
--- a/sys-libs/libcxxabi/Manifest
+++ b/sys-libs/libcxxabi/Manifest
@@ -7,7 +7,7 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD libcxxabi-13.0.1.ebuild 3468 BLAKE2B 0da66a538e0efab041fa5f56c31a116c9274bec95aa18f10b5759d6347e3e864922207cba0ddc6821eadad4243c247b01869d34f42e34c213f410896f5ac5b8f SHA512 2eaf47c438cae3b024eb64cecedf2643ff2ecbd35610d5cff6fb2f06847af766ff105d4923dfaf2f4d014944f2ef3ac54edd5f7c83e31d49c071ac57f56cd38f
 EBUILD libcxxabi-14.0.6.ebuild 3384 BLAKE2B c7091fc3a025d186909465ea46508b4cc22bfd5bd5156ed7b007c04e5fdb8c80565274ba085ffd5f8bbba2b9182ab3cff0e0c042346f4a04184b0cfd6e5a5d48 SHA512 92f71c9fd82a430c7bb6ecae347b6dff5739c825194731d877dc55f4be302cafeeac66cc2e24b6aa7f0a248af950305628b6ecbf2f6ffc70dce86b6723b75d27
-EBUILD libcxxabi-15.0.3.ebuild 2913 BLAKE2B f6c5d5c8848d8e7a148f432bc6ccbfe68b67404af9a8f97480dc03321367ccfd30c0e076a99364631fbbaac956a6cc4b0f4004ced02f26bb25957b9986f8f6f0 SHA512 2ddcc790fe36b5724a06e13bea2aef0096e5f6a290cd4791c30efdc9c9c74c834e4497bddb45872d3363eb88b2a758896841fb06636c5b77979e07de151b9e72
+EBUILD libcxxabi-15.0.3.ebuild 2912 BLAKE2B 36ac094a63901c7896f2a9515981c2c426f87e074263ac02dc3388c1ae3b8f29cde79d8456981c901a146ccbdb789cf766f3f96335e7c4efcfc136d2c5a76d71 SHA512 10f01d76e82b8442befb23736a6ee5c640275613934cf688666f081b82a03c1bf70e1733d783c69b00d71b967af986733c0c5e63a5c999d77501c4275ca9c121
 EBUILD libcxxabi-15.0.4.9999.ebuild 2866 BLAKE2B 00dc8f0473e5a8081727c83e3fc5459dafc7c680a68f7b237be5f3c8da6cee1916748083e3baf4fda71af8b55dfecb97d7a195b35d4958b8376dc7777df328a5 SHA512 f0f14175c68e080b199d8bcb62fa1387e1b6755bd804dc342dcaf671b84d9dfe29cf8a3559acfe0c9308a73e61416944519b94839c736837fd4bea059c91ec91
 EBUILD libcxxabi-16.0.0.9999.ebuild 2866 BLAKE2B 00dc8f0473e5a8081727c83e3fc5459dafc7c680a68f7b237be5f3c8da6cee1916748083e3baf4fda71af8b55dfecb97d7a195b35d4958b8376dc7777df328a5 SHA512 f0f14175c68e080b199d8bcb62fa1387e1b6755bd804dc342dcaf671b84d9dfe29cf8a3559acfe0c9308a73e61416944519b94839c736837fd4bea059c91ec91
 EBUILD libcxxabi-16.0.0_pre20221016.ebuild 2866 BLAKE2B 00dc8f0473e5a8081727c83e3fc5459dafc7c680a68f7b237be5f3c8da6cee1916748083e3baf4fda71af8b55dfecb97d7a195b35d4958b8376dc7777df328a5 SHA512 f0f14175c68e080b199d8bcb62fa1387e1b6755bd804dc342dcaf671b84d9dfe29cf8a3559acfe0c9308a73e61416944519b94839c736837fd4bea059c91ec91
diff --git a/sys-libs/libcxxabi/libcxxabi-15.0.3.ebuild b/sys-libs/libcxxabi/libcxxabi-15.0.3.ebuild
index d8d3f74609d7..f3980a2808b5 100644
--- a/sys-libs/libcxxabi/libcxxabi-15.0.3.ebuild
+++ b/sys-libs/libcxxabi/libcxxabi-15.0.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://libcxxabi.llvm.org/"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~riscv sparc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~riscv sparc ~x86 ~x64-macos"
 IUSE="+clang static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
diff --git a/sys-libs/libomp/Manifest b/sys-libs/libomp/Manifest
index a2ae27ae7eba..275fd6df930b 100644
--- a/sys-libs/libomp/Manifest
+++ b/sys-libs/libomp/Manifest
@@ -9,7 +9,7 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD libomp-13.0.1.ebuild 3907 BLAKE2B 46ed471cb355b70f78b59faeffbcc5148d47a3b971818c831e7b155f4f0973238fdbfb5f2fa91913fef93e01beed45f42b1158af92e56cd8445c4a8157508bb7 SHA512 13f150c5223689e4d98e16cafa11e44164b177eb68d3df213582b85c5194e7f736143b49b2075f4178689efcfa8320e2b1faf34242c09dbfcda923b443d42741
 EBUILD libomp-14.0.6-r1.ebuild 3917 BLAKE2B 23460d17ef5b7e107d8be1bd1c37028d69fda2e151e7d8f7f0c6d23dc00336f5a503a4e8e692b4203f3e4219fde6f96f9d30d4c7fed0348066f8c603636cc39b SHA512 aa9e9985a1941fe5c33b998d81bfdd838dbe965d5c82e20e366d2cf7a08db24feb2f3f7633740bea45a3685049d1593df6465b8c785b9a87c197402f559b26ca
-EBUILD libomp-15.0.3.ebuild 3405 BLAKE2B e794e2ff98eb12991f899b50750624fa08f6b20dcde51e1be56f3f2c4a0a0e70fc157079fe14147334535b7f8388a704d6b4dd858e94be1368596bd2d333698a SHA512 a89c79b76a3ca6459c50d68949ef73d20e774b54e79dc49644512c58a757a7a5afbbd2ab003302662cf7598199748a4f55afbb3a9803dbf279c3fd82b1edccc8
+EBUILD libomp-15.0.3.ebuild 3403 BLAKE2B 7583a273159994fda021f13f557058074aacb65a3e8fb23397b80c34173ab6bbf5fbdff16bca0d42a16ba160771a476e15a0aa16cb0ea5df5aff03098f575471 SHA512 775ef003028ad6cb8330b55085f0e38ac208795d1a1af93e5d912649f5d2f1283c7343c26bcbb678915798c1b80cb78614fa045afc9ebf7c2862ec2f5e0d5e84
 EBUILD libomp-15.0.4.9999.ebuild 3339 BLAKE2B 4fb077e0f5195f1c2fef3691aba3e8b674d340df9f3d1de8c9962a03267662bcf55a43af75db6e3ab5121de6c129c7f7514c127ec27c3b940cb2fbbf619788d4 SHA512 49aa1cb488a8e428892dd3b74a82462206e9c11e139b5b9b8e2edca496279c274f81ece0dcb9e71eea43c4e6f99ca4aacd5bdc48e4595743b7f98e7a1f7ae3d9
 EBUILD libomp-16.0.0.9999.ebuild 3444 BLAKE2B fb82f952dc3be9c2b651dc0d26552f1d5b89fbc3eeda67ed7a102a403a462d1e8c2d6d06d3fbf376fc17d4a0b5ada9dc1d1e60b468af5eeb61c597ec04c98dbe SHA512 3c5b094ac77e709b3c55e9fb4e005ec1725faa8be9abe48d1e4ac8eaa56920c5d143f61cc18997bf017c8abb0ac8121671b26dea311a5ac62eba3cd5983d57ae
 EBUILD libomp-16.0.0_pre20221016.ebuild 3444 BLAKE2B fb82f952dc3be9c2b651dc0d26552f1d5b89fbc3eeda67ed7a102a403a462d1e8c2d6d06d3fbf376fc17d4a0b5ada9dc1d1e60b468af5eeb61c597ec04c98dbe SHA512 3c5b094ac77e709b3c55e9fb4e005ec1725faa8be9abe48d1e4ac8eaa56920c5d143f61cc18997bf017c8abb0ac8121671b26dea311a5ac62eba3cd5983d57ae
diff --git a/sys-libs/libomp/libomp-15.0.3.ebuild b/sys-libs/libomp/libomp-15.0.3.ebuild
index b172775e1370..1522b7aa2bcd 100644
--- a/sys-libs/libomp/libomp-15.0.3.ebuild
+++ b/sys-libs/libomp/libomp-15.0.3.ebuild
@@ -11,7 +11,7 @@ HOMEPAGE="https://openmp.llvm.org"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0/${LLVM_SOABI}"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv ~x86 ~amd64-linux ~x64-macos"
 IUSE="
 	debug hwloc offload ompt test
 	llvm_targets_AMDGPU llvm_targets_NVPTX
diff --git a/sys-libs/llvm-libunwind/Manifest b/sys-libs/llvm-libunwind/Manifest
index 49cfa9ee584c..5cf850828703 100644
--- a/sys-libs/llvm-libunwind/Manifest
+++ b/sys-libs/llvm-libunwind/Manifest
@@ -8,7 +8,7 @@ DIST llvm-project-b34ea582774c057d9bf5591174d683fd3d8aa02b.tar.gz 169735900 BLAK
 DIST llvmorg-13.0.1.tar.gz 147290251 BLAKE2B 2a44b012a672501761d0c27c6b3a315b69bfef0cd13b078a7e7d2fccc4a9c8c0f2bee0f164c4271c9106b0a99cb06e8b64986f66253b613336719fb86b82541b SHA512 9a8cb5d11964ba88b7624f19ec861fb28701f23956ea3c92f6ac644332d5f41fde97bd8933dd3ee70ed378058c252fa3a3887c8d1af90d219970c2b27691166f
 EBUILD llvm-libunwind-13.0.1-r1.ebuild 3772 BLAKE2B 8da1185d1b1c71fe4a84cf068847cdf86f210c181e5f745b3ed05635b8f2824ac7aab931a8066cf199c93553fe4a3a0915972f854af1e09b1a2411f66fee834d SHA512 736810a5a52be3271854a50b476874986618e79fb24022ae3188c68759b31b75071083db9a5c9ab8f9439edff3cf7df2e4a20a847ad330984796ed747eb1cd4f
 EBUILD llvm-libunwind-14.0.6-r1.ebuild 3161 BLAKE2B eba3be4b7bafe6a69329f7f565cf33fe3315949dd3e0a007079e1fb040bc746c9beec20c763c9c10fdc7eb7cd8cfc14053138594dd47db13df51dc3972365639 SHA512 83dbd99c4825aeb0aaeb3910af22717637a1be1ced85972381ea091183ca6ba128900511b26dedfafb4ac492d80ba3cd0982051fd71f5e72375af7e160da1f9b
-EBUILD llvm-libunwind-15.0.3.ebuild 3037 BLAKE2B e6e891f992d26cd6456893323d692c32a4764071f06736e34d58fe26f5bc35555d30a4dbc78afdfa5962731e5e544b5ac82c6077e3dc7eaa825351c399a7bfb8 SHA512 ef1779dc7b352784efbb8e3063f94de2679b54e111fd6a9bd4347e6ac55cf0aa55160c1bdc6eacc15599c2323acb8cd0c44f918e926beb57b510fe1bbe1a7704
+EBUILD llvm-libunwind-15.0.3.ebuild 3035 BLAKE2B 087bf35fcf75c708242494823b4ed909e93fbd9a7b658bcdd36b1ee31da8dd1820c3e48cba602368121a37b8acd7268234b025cc3f27d385ad9af254a2648c74 SHA512 23d87715402340ce4252d84441dfd03eb638f0b654e13482b481ad6c8e8039f84da12ea2efb55923f5938a33e85ac7f18323f19270f3c1ecaf4ef2af4a421157
 EBUILD llvm-libunwind-15.0.4.9999.ebuild 2978 BLAKE2B e1fc6e470239200cea2bd9b84e9e084c204536e1bd2886780849f342452cf6b86a6d4d5baac91d562af632a9bcf298569ff459f24464fabc1e01accdc30e0db1 SHA512 b9e5e37262bd55c9aa776b78bcbab46be96de644ddc182fa6787200e4d6746babb09f42481d61723faec935542f869b10e7ce3af688f36a5086bcd6b235bbeec
 EBUILD llvm-libunwind-16.0.0.9999.ebuild 2978 BLAKE2B e1fc6e470239200cea2bd9b84e9e084c204536e1bd2886780849f342452cf6b86a6d4d5baac91d562af632a9bcf298569ff459f24464fabc1e01accdc30e0db1 SHA512 b9e5e37262bd55c9aa776b78bcbab46be96de644ddc182fa6787200e4d6746babb09f42481d61723faec935542f869b10e7ce3af688f36a5086bcd6b235bbeec
 EBUILD llvm-libunwind-16.0.0_pre20221016.ebuild 2888 BLAKE2B 256d1277c398fbfd6361c7ea7649d486fa7032a4d93bba637154a51c0612e43ae6276f4a653e83edd20dcc8bf903bc3c85930c5efd5f86a25f004e3e7c2120f1 SHA512 38676c41a2b511dd2094a9dee38261278617922f231e653c0c6ed7cbe347952562b3c55523d1282cc184be4c19806516075fe7c05a832d296451f0094530e53f
diff --git a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.3.ebuild b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.3.ebuild
index 74722836ef03..7ef28f8d7e52 100644
--- a/sys-libs/llvm-libunwind/llvm-libunwind-15.0.3.ebuild
+++ b/sys-libs/llvm-libunwind/llvm-libunwind-15.0.3.ebuild
@@ -12,7 +12,7 @@ HOMEPAGE="https://llvm.org/docs/ExceptionHandling.html"
 
 LICENSE="Apache-2.0-with-LLVM-exceptions || ( UoI-NCSA MIT )"
 SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~riscv sparc ~x86 ~x64-macos"
+KEYWORDS="~amd64 ~arm arm64 ~ppc ppc64 ~riscv sparc ~x86 ~x64-macos"
 IUSE="+clang debug static-libs test"
 REQUIRED_USE="test? ( clang )"
 RESTRICT="!test? ( test )"
diff --git a/virtual/Manifest.gz b/virtual/Manifest.gz
index e33ae1dc4d28..68432d3af22f 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 92e0b0318141..526d03fed3da 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,9 +1,6 @@
-EBUILD dist-kernel-5.10.148.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
-EBUILD dist-kernel-5.10.149.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
-EBUILD dist-kernel-5.15.74.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
-EBUILD dist-kernel-5.19.16.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
+EBUILD dist-kernel-5.10.150.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
+EBUILD dist-kernel-5.15.75.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
 EBUILD dist-kernel-5.19.17.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
-EBUILD dist-kernel-5.4.218.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
-EBUILD dist-kernel-5.4.219.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
-EBUILD dist-kernel-6.0.3.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
+EBUILD dist-kernel-5.4.220.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
+EBUILD dist-kernel-6.0.5.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.10.148.ebuild b/virtual/dist-kernel/dist-kernel-5.10.150.ebuild
index a8bfe038d31a..a8bfe038d31a 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.148.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.10.150.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.15.74.ebuild b/virtual/dist-kernel/dist-kernel-5.15.74.ebuild
deleted file mode 100644
index a8bfe038d31a..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.15.74.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="amd64 ~arm arm64 ~hppa ~ppc ppc64 x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.10.149.ebuild b/virtual/dist-kernel/dist-kernel-5.15.75.ebuild
index a8bfe038d31a..a8bfe038d31a 100644
--- a/virtual/dist-kernel/dist-kernel-5.10.149.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.15.75.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-5.4.219.ebuild b/virtual/dist-kernel/dist-kernel-5.4.219.ebuild
deleted file mode 100644
index cbaab94293d4..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.4.219.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="amd64 arm64 ~ppc ppc64 x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.4.218.ebuild b/virtual/dist-kernel/dist-kernel-5.4.220.ebuild
index cbaab94293d4..cbaab94293d4 100644
--- a/virtual/dist-kernel/dist-kernel-5.4.218.ebuild
+++ b/virtual/dist-kernel/dist-kernel-5.4.220.ebuild
diff --git a/virtual/dist-kernel/dist-kernel-6.0.3.ebuild b/virtual/dist-kernel/dist-kernel-6.0.3.ebuild
deleted file mode 100644
index c2caefd6cfca..000000000000
--- a/virtual/dist-kernel/dist-kernel-6.0.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.19.16.ebuild b/virtual/dist-kernel/dist-kernel-6.0.5.ebuild
index c2caefd6cfca..c2caefd6cfca 100644
--- a/virtual/dist-kernel/dist-kernel-5.19.16.ebuild
+++ b/virtual/dist-kernel/dist-kernel-6.0.5.ebuild
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 746d6960f56b..ca5d32f0a252 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/nginx/Manifest b/www-servers/nginx/Manifest
index 654c5de13b78..97c34f9e4a66 100644
--- a/www-servers/nginx/Manifest
+++ b/www-servers/nginx/Manifest
@@ -2,7 +2,6 @@ AUX http_brotli-detect-brotli-r3.patch 745 BLAKE2B 1442822f9b16362c04354f29f45ee
 AUX http_cache_purge-1.11.6+.patch 615 BLAKE2B 520a437290dbed718f392bedecdb66c9eae3440c2e5977bede5829f8420905e60c74fac3dad7b22c12d2070ce47430795482d270222ba8d4640af415e4974210 SHA512 a3f45d8121d89a5c41783306577e146990404ff0e3691454e99cd6270ab02dfc7fd8718b3781666373ea6784ed2c06cec0b40315486a6a138185ca1548c04b60
 AUX http_javascript_cve_2022-38890.patch 1734 BLAKE2B ecc4cda7537f8d769389381bd13ce6d577469829f856b823f274e9d1c9c7086ae208fcdfa185208bd810066ed18563391503d0c2888e6fb0fd240f024e7177db SHA512 2b886272ef635666bc6fce15661cb695d69249ff9a2d5bd882a2b5a9b1c124e695b13dc1bf89e9ef04eb1850a36a2ec2c9b57b7b1942fb8599477488d6b13ded
 AUX http_sticky-nginx-1.23.0.patch 1101 BLAKE2B 0a5f0bc5fb7987e1da13f39b6c2c7fcbc21452ddea510fb7aeb4933bfe7c94cc10c8b714c8de135b14d212a0532e39beebbad0105e2d140e12ecc608b1996156 SHA512 3066e9aec3a3073acd8ef8e1d3bf9abc33b4f0d9232573bb83417b838a42f04195b82337b569f7f808c7c0b94a6fd53371882aa805576de5989d359b21872396
-AUX http_uploadprogress-issue_50-r1.patch 1098 BLAKE2B f8191fdfa85c7aa016555a636b5c291d6d0ed54fea0714b361ce500deb7431f16c77a2f5675c5dc2f6e8ed278f7c24efd45eba3ddab27a2fa7d4e6d1391cfe8d SHA512 bdc3a129059b1af9c317d1e8b74ec98a14bf1e55b59ae867b963304541457e1676acb775ac2cec730ee2036feedf75d636eeb36700b0913e417045a52a00eec9
 AUX http_uploadprogress-nginx-1.23.0.patch 2680 BLAKE2B 872a386964dd1fa3a8c09d69231b546ba497d85f1b270fbb015ec4835c0c7ca9e7b3018d0a7674b4bd8aa76b558327439cdffc1912c74a8c3d91b2334bb0a61d SHA512 2899636d730583c0eaa21e89d50ccb7a888e7f27fa194102909e42fb28cb8e239416978f55bed0a9115b65d0ac718cb7da8c1fa589eb79e9f66eea41dfc3458b
 AUX http_upstream_check-nginx-1.11.5+.patch 8557 BLAKE2B b1f21fa56e94d92b30d4b84353066039728b0935e2a243367e4e883afead2d4c728c9b7e7b5b5e8714b80a3af72059a36f8207af3641c22a43324c0e7f2b2f9b SHA512 9b377defaa9ddb78fee3f37e054c7b16258fd380b4093d6d61bc45fdc42cb45ee5246901cddd230dc1765838fabbd71d558b5b1d12d9829615b3501da4f3824a
 AUX nginx-1.4.1-fix-perl-install-path.patch 403 BLAKE2B af7c0d3845f4e971ff6470cac11722a54339832518a1f48eef6343908676e352d869df7e65e1072e41dc67dbac4e0f006694bba2ba66ab06ae500c7e00664023 SHA512 b8f6876831e1149b1421fff4919f8d4893e5fc46aad8a91d4cf2e0b21767b59820b8e227e3b722b80060832844ef191f30aa5dc056daeb49e55a05702d72858f
diff --git a/www-servers/nginx/files/http_uploadprogress-issue_50-r1.patch b/www-servers/nginx/files/http_uploadprogress-issue_50-r1.patch
deleted file mode 100644
index 42cbd779a8cb..000000000000
--- a/www-servers/nginx/files/http_uploadprogress-issue_50-r1.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From dd138546b16a01e9c09613d02211373baf1cac02 Mon Sep 17 00:00:00 2001
-From: Thomas Deutschmann <whissi@whissi.de>
-Date: Thu, 20 Oct 2016 03:09:37 +0200
-Subject: [PATCH] config: Fix ngx_module_type
-
-Since commit 37182ce2f3b6 the module was not present in static builds
-because due to an invalid "ngx_module_type" the module was not added to
-objs/ngx_modules.c.
-
-This commit will fix the problem by setting the correct module type
-"HTTP_FILTER" [Link 1].
-
-Link 1: https://www.nginx.com/resources/wiki/extending/new_config/#key-ngx_module_type
-Gentoo-Bug: https://bugs.gentoo.org/593450
-Fixes: https://github.com/masterzen/nginx-upload-progress-module/issues/50
----
- config | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/config b/config
-index 364af8c..5f4ade1 100644
---- a/config
-+++ b/config
-@@ -1,6 +1,6 @@
- ngx_addon_name=ngx_http_uploadprogress_module
- if test -n "$ngx_module_link"; then
--    ngx_module_type=FILTER
-+    ngx_module_type=HTTP_FILTER
-     ngx_module_name=ngx_http_uploadprogress_module
-     ngx_module_srcs="$ngx_addon_dir/ngx_http_uploadprogress_module.c"
-