gentoo auto-resync : 15:01:2023 - 11:54:40

author: V3n3RiX <venerix@koprulu.sector> 2023-01-15 11:54:41 +0000
committer: V3n3RiX <venerix@koprulu.sector> 2023-01-15 11:54:41 +0000
commit: 046c3c0984fd20387a9f86cdd0842fd81e70d94f (patch)
tree: cc10a34db3ff175a68ebd1f398672156c9aad0e9
parent: bdc9b55c978e3939e16252e66e83950cbecbf77c (diff)
383 files changed, 2951 insertions, 7730 deletions
diff --git a/Manifest b/Manifest
index a988de9807f5..b1050b4bc20d 100644
--- a/Manifest
+++ b/Manifest
@@ -1,23 +1,23 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA512
 
-MANIFEST Manifest.files.gz 29816 BLAKE2B c847c6990fcc33e0f6b6aece6442c6fa2abaf3b2dd4bab80f72d286ce5aa556c39ada1af08a8d93bff4a52b337a1829537c369de46a5d58cf9ecfa546577c477 SHA512 1a58db47eadb3f57ff27a366ab6afa6f140505371e554cdd172280393908bed657d94332405c1be0a057b144eaadbadee863a107eae4e9d819f6b0be814fdcb8
-TIMESTAMP 2023-01-15T05:09:58Z
+MANIFEST Manifest.files.gz 29809 BLAKE2B 450987f2c77556a7c52e634711ff16d1679a68d25c2bf0d10cf6a6c3babf81c640cea246369dc491d8d539ddb1b3a92c87d4c79198a1b86ba4f1d334b886b3ef SHA512 751ea8c84159a6820d148b841e5a394f9fc47ec4ce2d9dc318439efcba685b884fb1049e77b43eb5590cd3a79a5202979154f75d9ae437a8b998daf4d4339a87
+TIMESTAMP 2023-01-15T11:09:57Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPDiqZfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPD3wVfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDc4w//Wf9t+7eO3F9dP8bdvIdkvbqUqp1KpRjPXcP236DDjilmc3UsVbhKtttc
-pBQpOjBJT5jPD5qyyVoFIIdOB4kR7M4gePLpqk41eCiv9hh5F4CtNGXR8nW1otTo
-KlBFo2DLAFD5gMbT7Gp8CktbONwJViZbgg1r8Y92G684JmCiapbXvEfym7UwoVsS
-VkPGICjJKIEXUuf+29gVzGJTa1ai7Y3n9U7hfg5pV+fz6lkXfRsTa8lj/WZXTlsB
-JZgLBfTGQH5PiLKQo3h/sMI9yFMLDu2B02iNJpPR+r5lp/LDGN2C0EK/DOcZOiZM
-o6nzCUsWsRC2WP75XvEChVVe/zP6mDl7f+f4bokgm0of/nQjR9JPE7PYGJKVTVkn
-MeY+HKVeiL2XzJ3rkz9c0mznUEpd7FBF92p8muulEF/EUhEbLBrUVpYi7SwivrLU
-+ajRNPihooHpaplQY9Z4GV6wZX0BJxvgXXmaYm+rbU7TFoxBhlJSHH9z4yxS6d+S
-AMp36+vqQ+0b+As6zb8mJ+ydButKdA6trY9+h3GYFCk8mTYLs8smrFCtFXhS/5ZK
-pqIfiG7xLJpab92PYQYrwXKlYtvFtmaE9hVxA9c2Y/ycWZO8hyOdkaLIbvyh3hv+
-5K6X9xBGu7bOVNGWpkESe8g19tWdOduedoTMFaienkxBk1koBhA=
-=wHIB
+klCY7RAAmWPBE9of5UmQvQnN2NpUVJchdsE6ASww/Zyi3EbNl3lBe85X2atD1JIx
+uUC9ubaTKCsG78u/PaFykJM9Lev91hzPt1C7VC3QdkPWoAPESB8IO/+ESHOSsE3r
+KBOrlXK4eMjh8t15fU2y/WOw7W1F4bNAmaY7dzqiR+4OHw1QovAYRgYpiob/ZoOD
+K2l+lNfsOwJMQskZepzpv2e5iji8rrT3FV2XMs3jb1rr3+37UimDjJjhsNPrWG9D
+hPRXe9ToaaHqIIH6oBih4lVxn3tRzRXfuJb9Yy+3mygFW1em3OSvQC1cm9cNoC/U
+dKFOjBi4386xcttzNRXWKly/v7e1wRiJaziMV9oYX3asSS7BCJTheclSdO7aD5dl
+AfgU1NTpT5jWoLtv0weDJPgXdul563/nsPz6gyibV5G1FE2TE7SWVyWYacbHjmMY
+Sn7sBBDWifBAYedxRYMk4gmAnAmpcY5XHQbI6Y8LFL3B2lrCsNgKs/6X5xbQbibc
+I5QWyS2RNXblrmi0/5TOEnNWmpPWrMlrKUQfkCSr0WdwDX2aW8Zcqi76KbX5S1Kp
+EgeCSfrZXgREXwSOA7Yx9Cj0C6Oz+t2AQj6IhDyeYDLf9Lu9LNCERZpdgQY9RN7x
+2NWQ3af0sOOLZlpFllGWWDtwneItsl3wSdtD+jcyDTxy100B87M=
+=gn00
 -----END PGP SIGNATURE-----
diff --git a/Manifest.files.gz b/Manifest.files.gz
index d3d02f0cc7d2..61048ae56ad9 100644
--- a/Manifest.files.gz
+++ b/Manifest.files.gz
diff --git a/app-admin/Manifest.gz b/app-admin/Manifest.gz
index e371b4482862..d87baea2823e 100644
--- a/app-admin/Manifest.gz
+++ b/app-admin/Manifest.gz
diff --git a/app-admin/lnav/Manifest b/app-admin/lnav/Manifest
index d6659b67c78b..7cf20de9f462 100644
--- a/app-admin/lnav/Manifest
+++ b/app-admin/lnav/Manifest
@@ -3,5 +3,5 @@ AUX lnav-0.11.0-disable-tests.patch 1784 BLAKE2B e4c0184793b19eff53dea12a81f0e8c
 DIST lnav-0.11.0.tar.gz 9586979 BLAKE2B fa333d2dbc3c2a5cb8b96ea4cbf84412be117b9d9ec999bab784e7aefab25cd01edcb65617468b8a1fbc46d554cf20a02bc901c9d75f2c5831359da37a19fd22 SHA512 f10938aacb1e170a6912090c5de8e85e9aae5bc456e57b49192a21020e7dfa20414d1f5b66fd25b3c1ea5a3d1fd3bd92af6fe7e0c6b73953688c3d861266fd97
 DIST lnav-0.11.1.tar.gz 10268167 BLAKE2B d490c6798685e80021437e1771742dee59c3b5109a43591581f4ddc15528c5b616ab915418fa78b7cf13a82bce582baf0516b5b2339f5fa32054359c21908852 SHA512 6c7d2b603ee04bb2cee16bf28b0161ebe7bf3ec838bed765f9852f79ee1ff8a56691dcaa66998e0ef58f16f16274bf93c7f2eb8f2e58264faf284bcfd25818ef
 EBUILD lnav-0.11.0.ebuild 1155 BLAKE2B 59efdb1660359e7b6a3cedd81447640fcf8412da5a3660f3f7fbdec190d7acdaad2466c64500fede135742808b1f06b1b775763201196fa6e2b91b4bcc6459f5 SHA512 24e86205749e7d85678fe24bafe477390f2398991bf19ce7da26d82ba2f895e656222f1dc79298ac0659ea7f4d546fbd74c77733660592d11f08b1ea807fb290
-EBUILD lnav-0.11.1-r1.ebuild 1054 BLAKE2B c2ab04bee353cba5009dd9bf5de73a85e7ee2ce731efc6d0c755fe92857b763fa7dfce4032ac6e845eed4604d09d7b50672572c5c7f0efe75f49482e08b28ed2 SHA512 bdc846aeb5178e7b702777bd4d2dbf54eb99f6763277a14e67d53f3535783a556b46b6c46dcbfc0554ea7ce71ffb74444e9cae6db03e5c53f153597863589749
+EBUILD lnav-0.11.1-r1.ebuild 1053 BLAKE2B e9ef8249315807fedbce065aabd0d0637e2fde1d0e5b8d00347eaa858e31c8dd3b1e07abf0f77c53a4e93438e35495b92d7480e4e272a85a75e0f181027b4c78 SHA512 111688377dc73a01bb2ba340974341eef0072f3eeb33021bc344c83da8fc03eb8f5b2585cecf1c159a92eb2d236a190cfac425de467e491214a635313c394e03
 MISC metadata.xml 858 BLAKE2B 6596baed4200d06faeacd61693e5d2e257587a30555469e0b6661755ab563cfc6693dd7e0970856a78c132544cde04655ca7febac482c9406c26a3b7cbdfc201 SHA512 1787552bd321e245a49a1b5b95d6e6f58362422153b6ee0b51ce644bf67ab098dd3c5ea11cb144dc5dae089208360fcf2a732845c24bb1e4c5dd5c67987e88bf
diff --git a/app-admin/lnav/lnav-0.11.1-r1.ebuild b/app-admin/lnav/lnav-0.11.1-r1.ebuild
index a2b632547075..ee120eaf93e0 100644
--- a/app-admin/lnav/lnav-0.11.1-r1.ebuild
+++ b/app-admin/lnav/lnav-0.11.1-r1.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/tstack/${PN}/archive/refs/tags/v${PV}.tar.gz -> ${P}
 
 LICENSE="BSD-2"
 SLOT="0"
-KEYWORDS="amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="pcap test"
 RESTRICT="!test? ( test )"
 
diff --git a/app-portage/Manifest.gz b/app-portage/Manifest.gz
index 8bce0a13d1c1..7572f68cd538 100644
--- a/app-portage/Manifest.gz
+++ b/app-portage/Manifest.gz
diff --git a/app-portage/pycargoebuild/Manifest b/app-portage/pycargoebuild/Manifest
index 9bc3203b285a..7fef56ac23a0 100644
--- a/app-portage/pycargoebuild/Manifest
+++ b/app-portage/pycargoebuild/Manifest
@@ -1,13 +1,3 @@
-DIST pycargoebuild-0.5.1.gh.tar.gz 17587 BLAKE2B f5c35acc43cfcc1a844f9bf0f01b72ca62ff07531dba8911e9a4ec672586760c9fee93ae9b9a9cb4becd4702d2caabc8f1a02a4b702356708ec4cf3f1780b577 SHA512 eb35ddc93a34fd0a857f28166a5e1cdb64f3e9b13f8182fde79292e93f30d6218eec2f0f2933c763c37f398b09952550e208a3914fb47d8d2b6a755ae003a983
-DIST pycargoebuild-0.5.2.gh.tar.gz 18304 BLAKE2B f9150ee2532b9683be9c504397f6c396956aefd285784ff156aaec5d8ab7cb9bb71643271463dd237c357dd6d061fe67cc5dd2470085cf1faf79b4c62d839135 SHA512 56099598a6b97929029e7cb8f3d67c81d187b2a9811e78de384ab37ec28aec8649bfe61ca987ace82fc18925d77ba19c7c6e89d8537f37ea65bb0127566a6c2f
-DIST pycargoebuild-0.5.3.gh.tar.gz 19180 BLAKE2B 56d93ca65abd68e0c3f0b715ae9811f8428a8de99ff7f2689e42da4c1dfe5f74526014e7a91232602fec8dce4f329359cdeafdf47e9a9004898a3c731003acd3 SHA512 038759d67e4c45542fa07b21aa9f2237457ccb4d74565e3a8e744b3a978c38d5cbf2d86c28acba53c08062ad70a7a2ef45659129855b7242257b8ca4d2d69111
-DIST pycargoebuild-0.5.4.gh.tar.gz 19641 BLAKE2B d515ebcd988c5c6c5668ce53c793bd76ca3ffbf5c72645a55ddbf25a3f97960a362f4a34ca9f09336b014b5e658ab7ca3f75fb8e7c951d2141a07f3ff1716d62 SHA512 50997066d3b9616a90df88bce058b301dae6060f68d8ae28c733f8de97b2577700b2624d15f386b844e878c70aa0de408eb71e724cdc8cc40fc610e3e9807d1e
 DIST pycargoebuild-0.6.1.gh.tar.gz 20233 BLAKE2B a680f0b446554797f82f5903b8f51631d4026329de79327c788338ddafecdcc47b7f1d0ca3b0c81a909cde6ba24eece576f3f591ea08ad1d7adf90d545ab0869 SHA512 00183b2cedddb0c47be3e709250e679184f45af16575a5b94efc5a1598379f5c02246fd303e26b7e53ebf858c039552c7802329b0ee62c67cc15c42b39c00f09
-DIST pycargoebuild-0.6.gh.tar.gz 20133 BLAKE2B ff583fe514380acec276c7cdbedff459bd0a1dc4ce568d022743f5f7301073009f6838b2d6be20815b1d2108bc34c6af1540fbf4f736c90d6b355f6ee0c6c712 SHA512 1a132f1c15dc1b984e1f941ffac8105719e9afd691256bac73a70f64a61e35595eff36a56a6ad67462af30ab8ed043959513491e8c5f45448f79ba8ea1d787d2
-EBUILD pycargoebuild-0.5.1.ebuild 674 BLAKE2B c006e62e932db3d580c335815479dad7465805b36ef04e5f0e27acc20bb1b225142720f8e7842b2251868d1d171e55ff64c039786bf008fe2a85ec0c4090133e SHA512 d95db3cbf43a6b4f931044f8dcdf94cc4e5e3151064126a045956a2ceb887b30b2f90be47bf3d97370936f429a10392fc3a1da0b99fa42013dfdb7bc24bb90b0
-EBUILD pycargoebuild-0.5.2.ebuild 674 BLAKE2B c006e62e932db3d580c335815479dad7465805b36ef04e5f0e27acc20bb1b225142720f8e7842b2251868d1d171e55ff64c039786bf008fe2a85ec0c4090133e SHA512 d95db3cbf43a6b4f931044f8dcdf94cc4e5e3151064126a045956a2ceb887b30b2f90be47bf3d97370936f429a10392fc3a1da0b99fa42013dfdb7bc24bb90b0
-EBUILD pycargoebuild-0.5.3.ebuild 674 BLAKE2B c006e62e932db3d580c335815479dad7465805b36ef04e5f0e27acc20bb1b225142720f8e7842b2251868d1d171e55ff64c039786bf008fe2a85ec0c4090133e SHA512 d95db3cbf43a6b4f931044f8dcdf94cc4e5e3151064126a045956a2ceb887b30b2f90be47bf3d97370936f429a10392fc3a1da0b99fa42013dfdb7bc24bb90b0
-EBUILD pycargoebuild-0.5.4.ebuild 674 BLAKE2B c006e62e932db3d580c335815479dad7465805b36ef04e5f0e27acc20bb1b225142720f8e7842b2251868d1d171e55ff64c039786bf008fe2a85ec0c4090133e SHA512 d95db3cbf43a6b4f931044f8dcdf94cc4e5e3151064126a045956a2ceb887b30b2f90be47bf3d97370936f429a10392fc3a1da0b99fa42013dfdb7bc24bb90b0
 EBUILD pycargoebuild-0.6.1.ebuild 674 BLAKE2B c006e62e932db3d580c335815479dad7465805b36ef04e5f0e27acc20bb1b225142720f8e7842b2251868d1d171e55ff64c039786bf008fe2a85ec0c4090133e SHA512 d95db3cbf43a6b4f931044f8dcdf94cc4e5e3151064126a045956a2ceb887b30b2f90be47bf3d97370936f429a10392fc3a1da0b99fa42013dfdb7bc24bb90b0
-EBUILD pycargoebuild-0.6.ebuild 674 BLAKE2B c006e62e932db3d580c335815479dad7465805b36ef04e5f0e27acc20bb1b225142720f8e7842b2251868d1d171e55ff64c039786bf008fe2a85ec0c4090133e SHA512 d95db3cbf43a6b4f931044f8dcdf94cc4e5e3151064126a045956a2ceb887b30b2f90be47bf3d97370936f429a10392fc3a1da0b99fa42013dfdb7bc24bb90b0
 MISC metadata.xml 384 BLAKE2B a5c91cf81989cb7f2ff504cd9931e89cb85a2b17721818efbc436d13e68d673c4f384839c67eeec8fe24c1a78b112c3fe37ee1722d2d28f44c5a075ec8fe18ba SHA512 76ffa916e9630225aadb9a0d2073087fcb848b782f6e44c28c354533c5329ed337e609666ee7eba90ef1191be2a34e968d3bc06556cfafce32a43a22100cc6f0
diff --git a/app-portage/pycargoebuild/pycargoebuild-0.5.1.ebuild b/app-portage/pycargoebuild/pycargoebuild-0.5.1.ebuild
deleted file mode 100644
index 509b3840a625..000000000000
--- a/app-portage/pycargoebuild/pycargoebuild-0.5.1.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A generator for Rust/Cargo ebuilds written in Python"
-HOMEPAGE="
-	https://github.com/projg2/pycargoebuild/
-	https://pypi.org/project/pycargoebuild/
-"
-SRC_URI="
-	https://github.com/projg2/pycargoebuild/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/app-portage/pycargoebuild/pycargoebuild-0.5.2.ebuild b/app-portage/pycargoebuild/pycargoebuild-0.5.2.ebuild
deleted file mode 100644
index 509b3840a625..000000000000
--- a/app-portage/pycargoebuild/pycargoebuild-0.5.2.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A generator for Rust/Cargo ebuilds written in Python"
-HOMEPAGE="
-	https://github.com/projg2/pycargoebuild/
-	https://pypi.org/project/pycargoebuild/
-"
-SRC_URI="
-	https://github.com/projg2/pycargoebuild/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/app-portage/pycargoebuild/pycargoebuild-0.5.3.ebuild b/app-portage/pycargoebuild/pycargoebuild-0.5.3.ebuild
deleted file mode 100644
index 509b3840a625..000000000000
--- a/app-portage/pycargoebuild/pycargoebuild-0.5.3.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A generator for Rust/Cargo ebuilds written in Python"
-HOMEPAGE="
-	https://github.com/projg2/pycargoebuild/
-	https://pypi.org/project/pycargoebuild/
-"
-SRC_URI="
-	https://github.com/projg2/pycargoebuild/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/app-portage/pycargoebuild/pycargoebuild-0.5.4.ebuild b/app-portage/pycargoebuild/pycargoebuild-0.5.4.ebuild
deleted file mode 100644
index 509b3840a625..000000000000
--- a/app-portage/pycargoebuild/pycargoebuild-0.5.4.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A generator for Rust/Cargo ebuilds written in Python"
-HOMEPAGE="
-	https://github.com/projg2/pycargoebuild/
-	https://pypi.org/project/pycargoebuild/
-"
-SRC_URI="
-	https://github.com/projg2/pycargoebuild/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/app-portage/pycargoebuild/pycargoebuild-0.6.ebuild b/app-portage/pycargoebuild/pycargoebuild-0.6.ebuild
deleted file mode 100644
index 509b3840a625..000000000000
--- a/app-portage/pycargoebuild/pycargoebuild-0.6.ebuild
+++ /dev/null
@@ -1,32 +0,0 @@
-# Copyright 2022-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=flit
-PYTHON_COMPAT=( python3_{9..11} pypy3 )
-
-inherit distutils-r1
-
-DESCRIPTION="A generator for Rust/Cargo ebuilds written in Python"
-HOMEPAGE="
-	https://github.com/projg2/pycargoebuild/
-	https://pypi.org/project/pycargoebuild/
-"
-SRC_URI="
-	https://github.com/projg2/pycargoebuild/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/license-expression[${PYTHON_USEDEP}]
-	$(python_gen_cond_dep '
-		dev-python/tomli[${PYTHON_USEDEP}]
-	' 3.8 3.9 3.10)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-ada/Manifest.gz b/dev-ada/Manifest.gz
index 5b0ef502eb53..afb361cf3c8e 100644
--- a/dev-ada/Manifest.gz
+++ b/dev-ada/Manifest.gz
diff --git a/dev-ada/VSS/Manifest b/dev-ada/VSS/Manifest
index 3b7c5041e7dc..32df65080901 100644
--- a/dev-ada/VSS/Manifest
+++ b/dev-ada/VSS/Manifest
@@ -1,5 +1,5 @@
 DIST VSS-22.0.0.tar.gz 310314 BLAKE2B 710645472b0e767f744ca12564a595fabc6bd931a271bc6fd575fdee70ade1676f3a0dbe00d7700ba5bbeb341fa6cc767b8efb18162f1fc308edcb653c9919f4 SHA512 b38582efc2b334a5b550eb9eacadd721b354f51d4cc26fcb4da1c8e7d241a848d5d3ee2651a72b552e2d5357b9fde46ba48e694f17f49cc2bcdad63d2f9d685e
 DIST VSS-23.0.0.tar.gz 481748 BLAKE2B eb84e1b84b2d3a463a0e19a3cdd8b6e1e0dd666f72cd79f592f07f75fd7f2c8496f89f5d272c2be1af8a75491a8e3f0f11131dbfe892f3fe107f7e50223ea4bd SHA512 11e762a6ade7137acb32c0776db06244b40a137df90ee5d25855503deeba2a22e6e962ed56d991c71fd27a514edca22ff3d35b0f783855e2d670eb6b45aa4c03
-EBUILD VSS-22.0.0.ebuild 920 BLAKE2B ce2892dfe7dcad48c0e16f42d7e46d2f3aad2ad48e4e536c5b1f63590504509fb9f4c196f27dcac1e29ab4ca06722d640973df5c930587449f865486c05e811c SHA512 24cd5bf77e550747b0b4fdcf35b9e9e4d22ce48c6a3e9f86f61808d999fa4c0fce72a2aa28a16181495ed18c2130f88cd00d30a5119622b8e99146cfc88db290
-EBUILD VSS-23.0.0.ebuild 1033 BLAKE2B 9993b01e793ee0d6c2aa500addf7f65afe4d5239036e55947958a4f785cf95c0b43cec80c62d7189552b59d8b5b6ee42b284e17eec5b92ad2691374e09f7707f SHA512 57e49d50ce4e58f8e549e420c5d2d94fa0a7a3171b6cad2204be0e4e4303a7903f99d22d4f6ccfddc882cfef124d5ae0bf2cab9e07b5c168dfde0a692ac11cea
+EBUILD VSS-22.0.0.ebuild 918 BLAKE2B 7c7eca24f61af70250f03a44483be9181673b5aa36de61110c72eb86d8ad73b618780243d23f3d9205d8b6ce1ea8e332bda2bed40cee03c48d0d88fedc20938d SHA512 698788f40ffae9b3df7e58d16e72916c277f2d48f8d0c08ec2c674f01d08ac4cfd447c9b29b5336ed509afb75233de1e82f60faba4ca99ebaa1ff1cccbe55116
+EBUILD VSS-23.0.0.ebuild 1033 BLAKE2B 98ad906d514a93496305544a772b53c3f0944ef053e0eb348d1453bf9bdc1ca243ae4576486b37dad31c4c04f5bdf32438737e88c1c828a3dbcff63ce249626a SHA512 130359961ff637e7f862f14b6369c5658a6bec2fe0e5639efcb8852c994819e62cd26f937ba553592bd8aab2dd500ff413994b61d5c0c56eb099e52e9398937b
 MISC metadata.xml 292 BLAKE2B 5a618f9fd5bd6c227fb9c7a5c40c47ed72a314d5dbf2d5f93cb97a7c34236064ed43c4f874561e5e48b385c10eebb9d8a75f9916a722e5f460091738cf6e4679 SHA512 9440e2195e1500bb2edbb5cf4b800d211f6637749a2b5833d341409cfb11a854b0d18cb997e8ff4bfd1afbfb8d49b6f23957cf9b93bcaffd9bc0a60e7e8d8079
diff --git a/dev-ada/VSS/VSS-22.0.0.ebuild b/dev-ada/VSS/VSS-22.0.0.ebuild
index 80f00cfae220..a59fe4ac8241 100644
--- a/dev-ada/VSS/VSS-22.0.0.ebuild
+++ b/dev-ada/VSS/VSS-22.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3 gcc-runtime-library-exception-3.1"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${ADA_REQUIRED_USE}"
diff --git a/dev-ada/VSS/VSS-23.0.0.ebuild b/dev-ada/VSS/VSS-23.0.0.ebuild
index 358f9471d2dc..712d979fdb79 100644
--- a/dev-ada/VSS/VSS-23.0.0.ebuild
+++ b/dev-ada/VSS/VSS-23.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2021-2022 Gentoo Authors
+# Copyright 2021-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
diff --git a/dev-ada/aunit/Manifest b/dev-ada/aunit/Manifest
index 226858bb93af..8b2b1a34dfc8 100644
--- a/dev-ada/aunit/Manifest
+++ b/dev-ada/aunit/Manifest
@@ -1,9 +1,7 @@
 AUX aunit-2016-gentoo.patch 374 BLAKE2B 00d34a835afdc4a1a80f8c4dad23ae4a30a89eb801c3aeb8177a4d0cb838b3edf0c8463c774da212a9be56378f493ddd41aa4a26d976a38f1800999903dd2263 SHA512 0ea27e0d8783788c83a3916071ea0dd5361f21a4fc67727b735986dfc624c9f1bd6aa471229c389f5453001577ca1eec0ecdd0865952a0aa5fe1453787dac33b
 AUX aunit-22.0.0-redundant.patch 804 BLAKE2B 2bff62c0b0a19b617af6bbdcae90af536f3fd23e645d0f2e5e93dd1c6a334e3ecc112df8c3051aa7d58f3e9ab3ea41756e916dad4a395de8bb79ce86e0ef90f4 SHA512 de5154c286a06b795da449a0d0de27e5153a4b5c216bd6f484ca89ca6a249a0f89ff608a25d4f67b4e002a86b05f3eb1386a9e7d7980ffc1144ac3cfbd034433
-DIST aunit-2021-20210518-19DC5-src.tar.gz 625153 BLAKE2B 385478bcc889d5f764a3498d98915928671a546c7345d8ca3e4f092d85a92c7b196d2a3f7a81f2199237f472f691d30b05b2f3308f063c509d8e9f3e834d620e SHA512 c365ed5ffe4ff60413969e92989396c6d2849a1f16ceb4b8b3fd666153f6cb480f4d74c42362fb751c522a29a555996e3bc5fdd0e80ba2e817940599f8be4798
 DIST aunit-22.0.0.tar.gz 131442 BLAKE2B 6ddc2f37ea06cfd5c7ad4d145b8889e171169108b90252feacf600a00acbd4740e638e7d478e4ac474953f9f3dcb118a4c5486a1cca6380b054661cf4b5f7e18 SHA512 5380fcb18ede7422507aff566f97521760fcc8a713d0e90195128189807784fec828c2e2c538aa0ac897cbdeb15fa2120e67b9e998875aac0ade2636dbea4e96
 DIST aunit-23.0.0.tar.gz 131699 BLAKE2B 04ff77214ab6f4f5d59ea0609fffbc6fcfb4695d2fbbed45efa14e2b745c33868e1c134e5d00a7c3d8f11b1a8d15c6212110c78a53df4230b5862fb9b912a434 SHA512 450caa79e4808188107cd065665ca9cab599934e3934d18406b08d3ccebe26c1e95cd0c712ea3403d6082c7c5e8fd9ecf09ae3b63d231b80ad575048b3d61943
-EBUILD aunit-2021.ebuild 1184 BLAKE2B 503bdee703b8efe0f788a632aa34e388ad39c8f8920cd00895b5e9533272b6a85177a165f95411008d9a6f1debb81bf329162577bfc5daa0915cb821b2a01583 SHA512 3a42b2a1ecd14a6e1304571ac967dbe9f200247a57c18d40e06113714ba0a2b54c8bfb631113d875c6024bbdbcb9d20af92fa86b33b052f479d32f53c0d4e4ed
-EBUILD aunit-22.0.0.ebuild 998 BLAKE2B 2eae35418e29ef5886a6ec8e83f739aa2c1c6cb4fb56e6f400b659170d42e0bc0bd6a7e579ace57086c30a334ace13d1c517d662dc234a3c379632bdc599324e SHA512 0abd859324d79bc81bd135d82d3af28be13ed66d37784a3485e5c0206eef89107f923b46fa812a5abda814ab794fafcc33ed5b7620f227010b916319a773e848
+EBUILD aunit-22.0.0.ebuild 996 BLAKE2B 22317878fdf11bfe92a19b9de559834697a55654635212aa1654a9b770e341cd77be72fea3887e210ac02a3105a299b69601fafc102f58334e28a2a9811ad1e7 SHA512 90e2f22259b97595eebe80bb7ab7cf6c6e391079adcb2856dc378530f44db91881143b99d64e4cdb3ab933d808a054c00a963d8ab72da2085791ddcca99d5441
 EBUILD aunit-23.0.0.ebuild 925 BLAKE2B 10735bcc40e107342faa0c39fefadba09eb44ac231ed968fc387bdf56f07507f69ab0c72e5d51661853d91541aecc5001e6649eaba6d6c6a8511caf14b6fd4b9 SHA512 dba0addd11b6e6c96f1089c3e29f9a112c1b94035ff13c321ee9416f21dbdc02914d9627eac77c03a396b747c98b5dc1e5f60372fa8fc12a5cef57a908d0b5b7
 MISC metadata.xml 843 BLAKE2B 3f8a899e8d22a411596aae79b739e3cf47b7b867bedede255761146d65e70adfd810544528018212b8a3f36a59f2d886682146a6370ab33c976f676d331b9390 SHA512 2ae746ded1a937362aad360ccd273143b495e43e71aeffb23dbcc71f93154bcc2fce6fcf6fa99d2a7ab1140ffb52ece0b08d1a010a627c0d10ee80e7984fdc92
diff --git a/dev-ada/aunit/aunit-2021.ebuild b/dev-ada/aunit/aunit-2021.ebuild
deleted file mode 100644
index 2e1185171fad..000000000000
--- a/dev-ada/aunit/aunit-2021.ebuild
+++ /dev/null
@@ -1,48 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2021 )
-inherit ada multiprocessing
-
-MYP=${P}-${PV}0518-19DC5-src
-ID=c8eadafc40c016859e127cd0e82411fcd8f3e749
-ADAMIRROR=https://community.download.adacore.com/v1
-
-DESCRIPTION="Ada unit testing framework"
-HOMEPAGE="http://libre.adacore.com/tools/aunit/"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="${ADA_DEPS}"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${PN}-2016-gentoo.patch )
-
-src_compile() {
-	emake GPRBUILD="gprbuild -j$(makeopts_jobs) -v"
-}
-
-src_install() {
-	emake INSTALL="${D}"/usr install
-	einstalldocs
-	mv "${D}"/usr/share/doc/${PN}/* "${D}"/usr/share/doc/${PF}/ || die
-	rmdir "${D}"/usr/share/doc/${PN} || die
-	mv "${D}"/usr/share/examples/${PN} "${D}"/usr/share/doc/${PF}/examples || die
-	rmdir "${D}"/usr/share/examples || die
-	rm -r "${D}"/usr/share/gpr/manifests || die
-}
-
-src_test() {
-	emake PROJECT_PATH_ARG="ADA_PROJECT_PATH=$(pwd)/lib/gnat" -C test
-}
diff --git a/dev-ada/aunit/aunit-22.0.0.ebuild b/dev-ada/aunit/aunit-22.0.0.ebuild
index 625668fe55d7..f98ad1ae55ba 100644
--- a/dev-ada/aunit/aunit-22.0.0.ebuild
+++ b/dev-ada/aunit/aunit-22.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="${ADA_DEPS}"
diff --git a/dev-ada/aws/Manifest b/dev-ada/aws/Manifest
index cc20ecb6385c..03b23bc661e8 100644
--- a/dev-ada/aws/Manifest
+++ b/dev-ada/aws/Manifest
@@ -1,12 +1,10 @@
 AUX aws-2020-gentoo.patch 450 BLAKE2B db6858688b2a9237efea0bf82f39d62855a0d126f3be7174981700bf4964e053c0715cd2e5f9f0cc98c5a884a89af47b7f83e6a7ce89d491073bf4c2370ee91f SHA512 80862c07fec63999ff531981c843e463888bb2f78310e28fa9ade6814553cb3cadad548d896a643a819bd5904b7056486ff372ad101c6919919fcc6895f14d02
 AUX aws-22.0.0-gentoo.patch 1120 BLAKE2B 4cb809bd0c1771bbd15ab1e70ebb7c0f8d523c6f167f5e72906abef73c492889ce75de7d40d781f9e69b97a82eccebe5cb3bb2df40c387a7b5321c4dcbb0ed03 SHA512 a272aa69d2d19b2cf79f2eb42e81a0659dfad1cf94b5d44c032243c30774fa8f428eb8512c9b8667297429d50c00bd1484c360cded113c10957b53f42b85611a
 AUX aws-23.0.0-gentoo.patch 375 BLAKE2B 19d273abe460e60422d9e3290258280be21192e924e8a4b3b26b85bcfd94d3d2857f9ea209d5eaa11d636a0e0a2e1f11b8c99d1838fea9e8662d7a1071327a10 SHA512 c1fbaaf56fa0ae365da3bc9de0306ff312927d7212267cc9881e738cc998c2248f60d952186a5b13fa57c4e191c666891fa0d62e5516414645f43ed2b452042c
-DIST aws-2021-20210518-19F65-src.tar.gz 4351625 BLAKE2B 227e1af5423c7cbf8b15b2ad37b5fbea862daca10dd12e79edb6cb1392f502b8b665d0cedc151a4190723c6aa795801b65c5807592d0292511a9a80318f0a722 SHA512 1820750daf2ba2e95479a8280aa0eae0d38e1d86a32570b4caaa845498ad8f0e8ac8c91f6aef0d5ef06fa1b33bc2b2b264cacb7101ca69fc81f36ab8cb17c65f
 DIST aws-22.0.0.tar.gz 2356886 BLAKE2B 3f0a36ce23ed50855dddeb8ecc1888d51c4c7368990124c3d55f240c8b07cc72b59b4c172cad05d282de0ff4cd348ff912315d8cfad1582b2bbb049ad5fcea12 SHA512 6baeff7fa8012cb155bd3964177368f4ccd0bb367abaa66d44c0ffbcd4145f3930fe2e0fe5cfbeb41adccb7395d46c49acffc502878e9b83ecb5e2de597b897b
 DIST aws-23.0.0.tar.gz 2390842 BLAKE2B 2433493b1ad8a98b4f95671e306aec5e072600633c1705ca5fb86c4b09ccfff4e5e84a231d69b183cc1e9f91813493de1d8fcf56c6921a78f0a0c63a6e44c492 SHA512 cd041c2cc2d62832557cd03916491ee204090d48ed7dcc155d679512afb7650e0b41b3edfe56996b77f0b1bc14c9bba53afbe0ef05de7555a775aaff63603b75
 DIST templates-parser-22.0.0.tar.gz 224473 BLAKE2B c0c0d6feada3d0e54ee0456b48979e1f436c2bdf7210aeb061640c3128294b243ac21c29ef538b055871315b567640e37782b28057954bf4d43473d372c7d983 SHA512 9ce512e41bf3e682f1671d3ed931830d2279da9bef58f9997e430f4852cebb6119cabf0fde7dfaf999586155c13472ab258a0e0f3d885522aeb86d8acb4a2d4f
 DIST templates-parser-23.0.0.tar.gz 225459 BLAKE2B 0971030e3079ff93b876bcb51925208eeee63837878a24589700dc9e0c025272e2d7920f82ee9b769c04857e4701d3eed629a1ac1f0979714c47fc132a188bed SHA512 c0a94b42391c61b4251cbbe86f91c506f46f6eed5be3779385bf199cf43281b704c68fd078b8b917948675976538168c1ac4c1f3b757f6db9988a45af7bfc4a5
-EBUILD aws-2021.ebuild 938 BLAKE2B 9b754e01ae63cbba437bea7eef49f31c43eb55d24f5cfd6ac465fe6e23245b68df5e73bef130a78489c1239c5cc0e4ffd5b4ac18c4177f1ce3e05ba7e49bc00a SHA512 259f7af21b29eb8904fc441cfb0f8340ee75b58ca4b2d336472050106a03fb87aa7c11fd193daa46e0fe0d066ab4e611615ef26c35cece362f846974ded6d35b
-EBUILD aws-22.0.0.ebuild 1303 BLAKE2B 0756592f36d45f58f08578dbd7cb139f446b71e4273bbecf5e5501cc33cd6c36ce37b213edf37485c6654a029087f2df03e894e1b15bf6f588164fb049a4084a SHA512 598c2c83ca1c76afe338fe85498ecebccaffb73c3c805a65862d208c568d9c1e7ca2ef96d26312cabaf049961a206b42109f2e8a0770f3bad5afe568a619654e
+EBUILD aws-22.0.0.ebuild 1301 BLAKE2B cfb4ff7ec05ac43dd76d5e0c20e12abafd8a45a3667b3165b3e52269f92d89a838cc4543429b171073cd406e29b08088fd312023f61fd4951863858149043dcd SHA512 55c5529bc7a64863c7ff2b2d670434d7aeed02438b1ef205e10ed5c4ebb11fd074654f61825d258b70c6db6254ca91b4e40d5b0502c9f0f4f765eaaaf3aa1515
 EBUILD aws-23.0.0.ebuild 1743 BLAKE2B f27e3c3b332e0774e7ec22a715d34704d81c3b5a98bf2e7292d16c311add27ac9976aa5291f6d0e6b5fb80557fa37a4b3223c9fd9b0511e32077b946abd6516d SHA512 1c2ef8e83101eef325e6c4df637243293fdcd29e984c39496293f02a5d8497e1b3d364325655b8f99df922ceb4cbfd803c7a33f9813befbedf31e94ee3d9c035
 MISC metadata.xml 856 BLAKE2B f5c808887f55e62d0948f024c189ec495c60a94ed824d332b5a8f4db1bb857a3aa17bc60bacad8716b5bad8260acc321ae5651398fe7210fd82dd970475e82a5 SHA512 4fd8699b73661262c8c0928259d541cbaec36b9dc4dfb577fca7e69546d6d828c846995a23daee81f5aa5628852e14fd63d6ff3381db5ab176bddcb8bdfc98d5
diff --git a/dev-ada/aws/aws-2021.ebuild b/dev-ada/aws/aws-2021.ebuild
deleted file mode 100644
index 740af4036915..000000000000
--- a/dev-ada/aws/aws-2021.ebuild
+++ /dev/null
@@ -1,43 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2021 )
-inherit ada multiprocessing
-
-MYP=${P}-${PV}0518-19F65-src
-ADAMIRROR=https://community.download.adacore.com/v1
-ID=5b0fa09df8ac0c717abdf4ede9e08efe5fd98984
-
-DESCRIPTION="A complete Web development framework"
-HOMEPAGE="http://libre.adacore.com/tools/aws/"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE=""
-
-RDEPEND="dev-ada/xmlada[${ADA_USEDEP},shared,static-libs]"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-REQUIRED_USE="${ADA_REQUIRED_USE}"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-2020-gentoo.patch
-)
-
-src_configure() {
-	emake -j1 setup prefix=/usr ENABLE_SHARED=true \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
-
-src_compile() {
-	emake \
-		PROCESSORS=$(makeopts_jobs) \
-		GPRBUILD="/usr/bin/gprbuild -v"
-}
diff --git a/dev-ada/aws/aws-22.0.0.ebuild b/dev-ada/aws/aws-22.0.0.ebuild
index de3db2a9d882..de65be73147c 100644
--- a/dev-ada/aws/aws-22.0.0.ebuild
+++ b/dev-ada/aws/aws-22.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -15,7 +15,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE=""
 
 RDEPEND="dev-ada/gnatcoll-core:=[${ADA_USEDEP},shared,static-libs]
diff --git a/dev-ada/gnatcoll-core/Manifest b/dev-ada/gnatcoll-core/Manifest
index 6c77008b19af..9aea3efb4a45 100644
--- a/dev-ada/gnatcoll-core/Manifest
+++ b/dev-ada/gnatcoll-core/Manifest
@@ -1,8 +1,6 @@
 AUX gnatcoll-core-2018-gentoo.patch 555 BLAKE2B d0913c845f4f7d96afbcec5d400599535417ee1c7b0d9f3c1e0c8766218c6a2556ff2de3e39febc1882b31e947876ca0849fad1564970f422530e58a8966c638 SHA512 90ef785337cb85aa7e2e2b5d0a24efc963512aa19780b215a96a1db6d980e55ff3b1409939e6d77913bf6416d158402ca900fd3ccc4cfb5362ee7440dfb42b64
-DIST gnatcoll-core-2021-20210518-19ADF-src.tar.gz 1460647 BLAKE2B 42954ed9dfc41914f34973fcfe950b4415af455d8319e802a213994107c7d7a45a6a42b2d260f165fe5ec6589873a7a2c75665b68b97431b13d7694f48273b8c SHA512 6a58920a057dee656df9f64f610f9f1398bc3cbc4ed74a740e8693f2b45da83628c3ce8f76f624bdb101d348603a24bccb47aa770ade1ffbf24da806f4d1de20
 DIST gnatcoll-core-22.0.0.tar.gz 722642 BLAKE2B e9bc6b322866b086f080096457936f66925cb954533acc04265b1e4c7081fe65d420fbc841b9ad5f4932eb43848803c1bf78a37a6fc47c1ac9d30bbb8eb2e0c9 SHA512 ce3aaa90b339a57eedc070e6451ea8782a87d07ece09823c57179a5e44762349458564bf8d007427a7aba795bc05d744056e3defd6b44698bcc0a8af0c5285e9
 DIST gnatcoll-core-23.0.0.tar.gz 745131 BLAKE2B 25e5f17adf88c48f45cc30cfbd82e2213233aecd78c9c22455ac6458e2f336f527604911c9eaaa1ab8853e0a16bbe9e1a7b8f31481ee9c2894287ec16e961123 SHA512 49f33abe07d2c4b51a6e69be550d05c5794953f4fbe8cb15e29c9834b9c5600724acaff4156fb53e4146620f1e4335f4c22453215a39ec5ee95b3992528b9828
-EBUILD gnatcoll-core-2021-r1.ebuild 1735 BLAKE2B 6f1bd7897a8078fdda45f8cefa2b9a1586ad43e7dfd54c36549f828db27e5480b0b2f38545897d470d383244117e6ce65560d76f48f68a2a277a07a0b209f1cd SHA512 93cfb6853feffc05f5809e8484e18d42a9f6510bf6de09927a2028bc17127ded2175404d2d49ca143064674cc309f37585eeb35423f2431014f2c31136063057
-EBUILD gnatcoll-core-22.0.0.ebuild 1678 BLAKE2B 67cb7b4b43860ddd224db6c4f480176bf786ec1bcc04b792bf0f0a54b5523a25ef425f42a5cdd78624f602502806c8c79a26b710e6d00de1086b84dec0665cc9 SHA512 1adec2ae0252039dc60beb4aee376b20a282c8e2e5731533144286561fb817d8ec1ff18a9edb16f622a3c48f57727d73bebc8fb1c9efe27cd23bff1a328b5a2d
-EBUILD gnatcoll-core-23.0.0.ebuild 1627 BLAKE2B eb4ddfbf87d13ae9a14eb8fba6f4aa9470783820c0f1ae68b3afab0c574d9010ac156b5b69924b996d041b3a81e8ec0f1f07a9b8ad372006525caad6a4353f70 SHA512 58256fbd67c517025ce083cda6b5435be6182f2ca09030de72cd4d4b71c2876532e9d2220d96bd885c38da6349d4d90b1143c1be1fb2cb5d3a728293a0fd0987
+EBUILD gnatcoll-core-22.0.0-r1.ebuild 1626 BLAKE2B bb3eb1728f788273ade5535b060c71171d0693770af862e561013e8eacec7af294fd22f17f5cd0fb0e32a380dda1f392f0c19b2e6e76e161d6897a8d2de6044b SHA512 5dadb6e2c87d1515767373d0601237433c43530e24a10bbd85e69f98c1db0c0a29e533384b5681b6a956337c327bb0d67a9b7d52577360aec79bedb87550658a
+EBUILD gnatcoll-core-23.0.0.ebuild 1625 BLAKE2B 7cb9e754208f652aa094dac888bf92c31531c1b5165643478055f9a7b645b5a51ea034b2e456e45c3afb528e624e87fc80748249c36533299823a7e569af519d SHA512 3e33fb347a77ef0830d69d93d29e2d253879d6e044b19c094e8631d618e231b4dffb0b62edf51e8cf9e2d57e6fd8569aebf07861465a40e264740d8d98731328
 MISC metadata.xml 1182 BLAKE2B 3f9bf3841b3006cc8ca840bab94c1324f2fca7ceab33eabcb2d6b6d6a7b27562a24821129285ded3e764b3185ca81b6774fa11e54b27f392b6234fd66223e5b4 SHA512 ec28eeb7f441eb5e5181dbc6bab19b647fba1cf2786238353040d409afaf520803c34b26a94c8583fc2858cb3e674a3ac525e42f6b447f478fb2cdae4c9add18
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
deleted file mode 100644
index fd97495b124c..000000000000
--- a/dev-ada/gnatcoll-core/gnatcoll-core-2021-r1.ebuild
+++ /dev/null
@@ -1,77 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-ADA_COMPAT=( gnat_2021 )
-inherit ada multiprocessing
-
-MYP=${P}-${PV}0518-19ADF
-ADAMIRROR=https://community.download.adacore.com/v1
-ID=425b044d5cb112f096c7ac5ebbafb0d8e5297913
-
-DESCRIPTION="GNAT Component Collection Core packages"
-HOMEPAGE="http://libre.adacore.com"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}-src.tar.gz -> ${MYP}-src.tar.gz"
-
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs static-pic"
-REQUIRED_USE="|| ( shared static-libs static-pic )
-	${ADA_REQUIRED_USE}"
-
-RDEPEND="
-	>=dev-ada/libgpr-2021[${ADA_USEDEP},shared?,static-libs?,static-pic?]
-"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-
-S="${WORKDIR}"/${MYP}-src
-
-PATCHES=( "${FILESDIR}"/${PN}-2018-gentoo.patch )
-
-src_prepare() {
-	default
-	sed -i \
-		-e "s:@GNATLS@:${GNATLS}:g" \
-		src/gnatcoll-projects.ads \
-		|| die
-}
-
-src_configure() {
-	emake setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -p -m -j$(makeopts_jobs) \
-			-XBUILD=PROD -v -XGNATCOLL_VERSION=${PV} \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$* -XGPR_BUILD=$1 \
-			gnatcoll.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-	if use static-libs; then
-		build static
-	fi
-}
-
-src_install() {
-	if use shared; then
-		emake prefix="${D}"/usr install-relocatable
-	fi
-	if use static-pic; then
-		emake prefix="${D}"/usr install-static-pic
-	fi
-	if use static-libs; then
-		emake prefix="${D}"/usr install-static
-	fi
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-	dodir /usr/share/gnatdoc
-	mv "${D}"/usr/share/doc/gnatcoll "${D}"/usr/share/gnatdoc/ || die
-}
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0-r1.ebuild
index decaee308a38..b738764af093 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-22.0.0-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,17 +12,13 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"
 
 RDEPEND="
-	|| (
-		>=dev-ada/libgpr-2021
-		~dev-ada/libgpr-22.0.0
-	)
-	dev-ada/libgpr:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
+	~dev-ada/libgpr-22.0.0:=[${ADA_USEDEP},shared?,static-libs?,static-pic?]
 "
 DEPEND="${RDEPEND}
 	dev-ada/gprbuild[${ADA_USEDEP}]"
diff --git a/dev-ada/gnatcoll-core/gnatcoll-core-23.0.0.ebuild b/dev-ada/gnatcoll-core/gnatcoll-core-23.0.0.ebuild
index 66462b718a8a..02fc254f60e5 100644
--- a/dev-ada/gnatcoll-core/gnatcoll-core-23.0.0.ebuild
+++ b/dev-ada/gnatcoll-core/gnatcoll-core-23.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -12,7 +12,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0/${PV}"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 IUSE="+shared static-libs static-pic"
 REQUIRED_USE="|| ( shared static-libs static-pic )
 	${ADA_REQUIRED_USE}"
diff --git a/dev-ada/gprbuild/Manifest b/dev-ada/gprbuild/Manifest
index 36f8b1396907..97c754c87d5a 100644
--- a/dev-ada/gprbuild/Manifest
+++ b/dev-ada/gprbuild/Manifest
@@ -1,5 +1,3 @@
-AUX gprbuild-2021-gentoo.patch 11690 BLAKE2B 95762ee60f74dc15c0a513e03979803bfecd93bc0b9ae9c031ce741f16664157384163f506bd5c8735e25b81fc9aefd5e454a053f598c5f6a789fc81c47ea8cc SHA512 158fb122afe5df9d712706af0c87a1cb0c4d34cbeb93516d4b59c9ab40f714536fe878b067f2d1d2a7db12066bb54a21f332c2f035430927970cfca8f7a5d82e
-AUX gprbuild-2021-nm.patch 438 BLAKE2B e680ab2e110805de9ebe121c21364c3fb65e871a800a22ac863e5f3f42513929a9d1c5868e598312b72bfd14c76a4f118535f767b5dd7b79e019607a909cfc8e SHA512 7f2a1ee48c005aa20da779c87d2b00b3bdde1357d7e83094090f162441a03f890d6625121b3d9dcba5a0fbb76ca8bc3803f2a21a998a25a2b9bb882413d51011
 AUX gprbuild-2021-runpath.patch 303 BLAKE2B c70fc64c1e4d361cb72910dbab2d8a7652f0c054da7f9a707fa81ea049fb8f2e6272b1d87bb1a177ecae821cc4fb0ebff197b4527c494893cc6f9f11f37220c0 SHA512 1fd8058bbb8c37654337528856c5b5f3538f2e893a4b6da844d661bd25695dc33304648da8c6f38df7d66019e0a616ae1b705035cdcfa48750df69925eb91655
 AUX gprbuild-22.0.0-ar.patch 468 BLAKE2B 8cf38d8632123623ff369e6bf0d96c9ca37e828e71e8445ac46ccfb1636ae8676146a61934c0db915c5b1235a4b9bdc899502b3c71cabae2dae2b69082c87b4e SHA512 e1d66c86b1eeea36a84114bf4993eceeef64541c207d8e11318d842648eaead40675f90b2d16ddb27a68088d6f6bcf4b803c5f8b8c282e73453f76f9b99eb773
 AUX gprbuild-22.0.0-gentoo.patch 2052 BLAKE2B dcab01dcc71bdab78ecf16796c4174401a3d1dd950fb3600b993ed8e3f9606b7bb19e0ef9e30a1e2265a2003154b6ed06de8b1da73bb3279301b21e68a58e7a0 SHA512 6266611075133e580b07044f1fa85a03918254c189d2def36e227996f377b56876085f3e3ff18b443ccb0cc1d67ee69cb478cd90403015ff4d68107870929c0d
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch b/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
deleted file mode 100644
index 15264d6828e6..000000000000
--- a/dev-ada/gprbuild/files/gprbuild-2021-gentoo.patch
+++ /dev/null
@@ -1,292 +0,0 @@
---- a/src/gprlib.adb	2019-06-02 10:57:49.807002425 +0200
-+++ b/src/gprlib.adb	2019-06-02 11:01:32.986518447 +0200
-@@ -266,7 +266,9 @@
- 
-    Driver_Name                   : Name_Id := No_Name;
- 
--   Gnatbind_Name                 : String_Access := new String'("gnatbind");
-+   Gnatbind_Name                 : String_Access := new String'("@GNATBIND@");
-+
-+   Gnatbind_Path_Option          : constant String := "--gnatbind_path=";
- 
-    Compiler_Name                 : String_Access := new String'("gcc");
- 
-@@ -2081,7 +2083,7 @@
-                           and then Line (Last - 2 .. Last) = "gcc"
-                         then
-                            Gnatbind_Name :=
--                             new String'(Line (1 .. Last - 3) & "gnatbind");
-+                             new String'(Line (1 .. Last - 3) & "@GNATBIND@");
-                            Objcopy_Name :=
-                              new String'(Line (1 .. Last - 3) & "objcopy");
- 
-@@ -2089,7 +2091,7 @@
-                           and then Line (Last - 6 .. Last) = "gcc.exe"
-                         then
-                            Gnatbind_Name :=
--                             new String'(Line (1 .. Last - 7) & "gnatbind");
-+                             new String'(Line (1 .. Last - 7) & "@GNATBIND@");
-                            Objcopy_Name :=
-                              new String'(Line (1 .. Last - 7) & "objcopy");
-                         end if;
-@@ -2241,7 +2243,13 @@
-                Mapping_File_Name := new String'(Line (1 .. Last));
- 
-             when Binding_Options =>
--               Binding_Options_Table.Append (Line (1 .. Last));
-+               if Last > Gnatbind_Path_Option'Length
-+                  and then Line (1 .. Gnatbind_Path_Option'Length) =
-+                     Gnatbind_Path_Option then
-+                     null;
-+               else
-+                  Binding_Options_Table.Append (Line (1 .. Last));
-+               end if;
- 
-             when Copy_Source_Dir =>
-                Copy_Source_Directory := new String'(Line (1 .. Last));
---- a/share/gprconfig/compilers.xml	2019-06-01 21:29:57.611722804 +0200
-+++ b/share/gprconfig/compilers.xml	2019-06-01 21:42:56.000608601 +0200
-@@ -20,15 +20,15 @@
-   <!--    GCC 3.x & 4.x (not for GNAT Pro)-->
-   <compiler_description>
-     <name>GCC</name>
--    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc</executable>
-+    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-)?gcc-@VER@</executable>
-     <version>
--      <external>${PREFIX}gcc -v</external>
-+      <external>${PREFIX}gcc-@VER@ -v</external>
-       <nogrep regexp="for GNAT Pro"></nogrep>
-       <grep regexp="^gcc \S+ (\S+)" group="1"></grep>
-     </version>
-     <languages>C</languages>
-     <target>
--      <external>${PREFIX}gcc -dumpmachine</external>
-+      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
-       <grep regexp="[^\r\n]+"></grep>
-     </target>
-   </compiler_description>
-@@ -185,14 +185,14 @@
-    -->
-   <compiler_description>
-     <name>GNAT</name>
--    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls</executable>
-+    <executable prefix="1">(.*-wrs-.*|.*-sysgo.*|.*-elf-.*|.*-eabi-.*|.*-eabispe-.*|avr-.*|.*-elinos-linux.*|.*-generic-linux-gnu-|.*mingw32.*|.*-xcoff-.*|arm-linux-androideabi-|arm-linux-gnueabi-|arm-linux-gnueabihf-|e500v2-gnu-linux-|powerpc-.*-linux.*-|.*-darwin.*-|aarch64-linux-gnu-|.*-qnx.*)?gnatls-@VER@</executable>
-     <version>
--      <external>${PREFIX}gnatls -v --version</external>
-+      <external>${PREFIX}gnatls-@VER@ -v --version</external>
-       <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
-     </version>
-     <languages>Ada</languages>
-     <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
-+      <external>${PREFIX}gcc-@VER@ -v</external>
-       <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
-     </variable>
-     <runtimes default="default,kernel,native">
-@@ -202,68 +202,11 @@
-        <directory group="1" >\.\./$TARGET/lib/gnat/(.*)/adalib/</directory>
-     </runtimes>
-     <target>
--      <external>${PREFIX}gcc -dumpmachine</external>
-+      <external>${PREFIX}gcc-@VER@ -dumpmachine</external>
-       <grep regexp="[^\r\n]+"></grep>
-     </target>
-   </compiler_description>
- 
--  <!--  CodePeer -->
--
--  <compiler_description>
--    <name>GNAT_CODEPEER</name>
--    <executable prefix="1">(.*gnsa-|.*codepeer-)gnatls</executable>
--    <version>
--      <external>${PREFIX}gnatls -v</external>
--      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
--    </version>
--    <languages>Ada,C,C++</languages>
--    <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
--      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
--    </variable>
--    <runtimes default="default,native">
--       <directory group="default" >\.\./lib/gcc/.*/$gcc_version/adalib/</directory>
--       <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
--       <directory group="1" >\.\./lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
--    </runtimes>
--    <target>codepeer</target>
--  </compiler_description>
--
--  <!--  Generic GNAT LLVM Target -->
--
--  <compiler_description>
--    <name>GNAT_LLVM</name>
--    <executable prefix="1">(llvm-)gnatls</executable>
--    <version>
--      <external>${PREFIX}gnatls -v</external>
--      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
--    </version>
--    <languages>Ada</languages>
--    <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
--      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
--    </variable>
--    <runtimes default="default,native">
--       <directory group="default" >\.\./lib/rts-native/adalib/</directory>
--       <directory group="1" >\.\./lib/rts-(.*)/adalib/</directory>
--    </runtimes>
--    <target>llvm</target>
--  </compiler_description>
--
--  <!--  Generic C compiler for LLVM  -->
--  <compiler_description>
--    <name>C_LLVM</name>
--    <executable>clang</executable>
--    <version>
--      <external>clang --version</external>
--
--      <!--  '...clang version 6.0.0...'  -->
--      <grep regexp="clang version (\S+)" group="1"></grep>
--    </version>
--    <languages>C</languages>
--    <target>llvm</target>
--  </compiler_description>
--
-   <!--  Generic C++ compiler for LLVM  -->
-   <compiler_description>
-     <name>C++_LLVM</name>
-@@ -221,28 +221,6 @@
-     <target>llvm</target>
-   </compiler_description>
- 
--  <!--  C Target -->
--
--  <compiler_description>
--    <name>GNAT_C</name>
--    <executable prefix="1">(c-)gnatls</executable>
--    <version>
--      <external>${PREFIX}gnatls -v</external>
--      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
--    </version>
--    <languages>Ada</languages>
--    <variable name="gcc_version">
--      <external>${PREFIX}gcc -v</external>
--      <grep regexp="^[-\w]*gcc \S+ (\S+)" group="1"></grep>
--    </variable>
--    <runtimes default="default,ccg">
--       <directory group="default" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/adalib/</directory>
--       <directory group="1" >\.\./libexec/gnat_ccg/lib/gcc/.*/$gcc_version/rts-(.*)/adalib/</directory>
--       <directory group="1" >\.\./lib/gnat/(.*)/adalib/</directory>
--    </runtimes>
--    <target>c</target>
--  </compiler_description>
--
-   <!--  CCG Target (C generation via LLVM) -->
- 
-   <compiler_description>
-@@ -286,23 +264,6 @@
-   </compiler_description>
- 
- 
--  <!--  GNAT_DOTNET -->
--
--  <compiler_description>
--    <name>GNAT_DOTNET</name>
--    <executable prefix="1">(.*dotnet-)gnatls</executable>
--    <version>
--      <external>${PREFIX}gnatls -v</external>
--      <grep regexp="^GNATLS.+?(\d+(\.\d+)?)" group="1"></grep>
--    </version>
--    <languages>Ada</languages>
--    <runtimes default="default,kernel">
--       <directory group="default" >\.\./lib/dotgnat/adalib/</directory>
--       <directory group="1" >\.\./lib/dotgnat/rts-(.*)/adalib/</directory>
--    </runtimes>
--    <target>dotnet</target>
--  </compiler_description>
--
-   <!--  JGNAT -->
- 
-   <compiler_description>
-@@ -421,21 +326,6 @@
-     </target>
-   </compiler_description>
- 
--  <!-- LLVM Compiler -->
--  <compiler_description>
--    <name>LLVM</name>
--    <executable>clang</executable>
--    <version>
--      <external>clang -v</external>
--      <grep regexp=".*(LLVM|clang) version ([0-9.]*)" group="2"></grep>
--    </version>
--    <languages>C,C++</languages>
--    <target>
--      <external>clang -dumpmachine</external>
--      <grep regexp="[^\r\n]+"></grep>
--    </target>
--  </compiler_description>
--
-   <!--  Windres compiler -->
-   <compiler_description>
-     <name>WINDRES</name>
---- a/share/gprconfig/gnat.xml	2019-06-01 21:53:53.383281607 +0200
-+++ b/share/gprconfig/gnat.xml	2019-06-01 21:57:08.414196529 +0200
-@@ -60,7 +60,7 @@
-    &filter_gnat;
-    <config>
-    package Compiler is
--      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc";
-+      for Driver                   ("Ada") use "${PATH(ada)}${PREFIX(ada)}gcc-@VER@";
-       for Language_Kind            ("Ada") use "unit_based";
-       for Dependency_Kind          ("Ada") use "ALI_File";
-       for Leading_Required_Switches        ("Ada") use
-@@ -77,6 +77,9 @@
-       for Objects_Path_File     ("Ada") use "ADA_PRJ_OBJECTS_FILE";
-       for Driver         ("Ada") use
-           "${GPRCONFIG_PREFIX}libexec/gprbuild/gprbind";
-+      for Switches ("Ada") use ("--gnatbind_path=gnatbind-@VER@");
-+      for Required_Switches ("Ada") use
-+        Binder'Required_Switches ("Ada") &amp; ("--RTS=${RUNTIME_DIR(ada)}");
-    end Binder;
- 
-    for Toolchain_Version ("Ada") use "GNAT ${VERSION(ada)}";
---- a/share/gprconfig/c.xml	2019-06-01 21:57:36.244755708 +0200
-+++ b/share/gprconfig/c.xml	2019-06-01 21:59:14.919191663 +0200
-@@ -14,7 +14,7 @@
-      </compilers>
-      <config>
-    package Compiler is
--      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc";
-+      for Driver              ("C") use "${PATH(c)}${PREFIX(c)}gcc-@VER@";
-    end Compiler;
-      </config>
-    </configuration>
---- a/share/gprconfig/linker.xml	2019-06-01 21:59:34.546880368 +0200
-+++ b/share/gprconfig/linker.xml	2019-06-01 22:00:50.906668730 +0200
-@@ -112,6 +112,9 @@
-    for Object_Lister use ("nm", "-g");
-    for Object_Lister_Matcher use " [TDRB] (.*)";
- 
-+   LDFLAGS := External_As_List ("LDFLAGS", " ");
-+   for Leading_Library_Options use LDFLAGS;
-+
-    package Linker is
-       for Export_File_Format use "GNU";
-       for Export_File_Switch use "-Wl,--version-script=";
-@@ -1211,7 +1211,7 @@
-     </targets>
-     <config>
-    for Library_Partial_Linker use
--     ("${PATH(ada)}${PREFIX(ada)}gcc", "-nostdlib")
-+     ("${PATH(ada)}${PREFIX(ada)}gcc-@VER@", "-nostdlib")
-       &amp; GCC_No_Pie
-       &amp; ("-Wl,-r", "-o");
-     </config>
-@@ -1232,7 +1232,7 @@
-     </targets>
-     <config>
-    for Library_Partial_Linker use
--     ("${PATH(c)}${PREFIX(c)}gcc", "-nostdlib")
-+     ("${PATH(c)}${PREFIX(c)}gcc-@VER@", "-nostdlib")
-       &amp; GCC_No_Pie
-       &amp; ("-Wl,-r", "-o");
-     </config>
diff --git a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch b/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
deleted file mode 100644
index 9fcab1565857..000000000000
--- a/dev-ada/gprbuild/files/gprbuild-2021-nm.patch
+++ /dev/null
@@ -1,12 +0,0 @@
---- a/share/gprconfig/linker.xml	2021-12-21 21:36:45.306813518 +0100
-+++ b/share/gprconfig/linker.xml	2021-12-21 22:20:21.642668870 +0100
-@@ -128,7 +128,8 @@
-       <host name="^i686.*-linux.*$" />
-     </hosts>
-     <config>
--   for Object_Lister use ("nm", "-g");
-+   NM := External("NM", "nm");
-+   for Object_Lister use (NM, "-g");
-    for Object_Lister_Matcher use " [TDRB] (.*)";
- 
-    LDFLAGS := External_As_List ("LDFLAGS", " ");
diff --git a/dev-ada/libgpr/Manifest b/dev-ada/libgpr/Manifest
index 201950f88126..1241d80edc09 100644
--- a/dev-ada/libgpr/Manifest
+++ b/dev-ada/libgpr/Manifest
@@ -1,8 +1,6 @@
 AUX libgpr-2020-gentoo.patch 321 BLAKE2B fe3affe50712460474125d074936fd9db526c4392e6ecb8bbcb07091e9971042368ee134112d9550ffc9fd2a0ab23371e7bb760b3d8e53cd4ca0e54e0522f604 SHA512 2bcae85d30a41333664f17f097f31cf21b270c43092e823dda256098c928d4ccdab62f9d349b57f941b50bb676649aedf5f978a05f3afaf1ee234e4515c305b5
-DIST gprbuild-2021-20210519-19A34-src.tar.gz 2572773 BLAKE2B 42244b96b48a10795812865a430a92a75f3e6a58f384a72e6941945707e712d239f2350e00bd94e6161fb19c6469197547f4ddb565e860ae1d08573b7c667997 SHA512 f2fd10cdf8bd2ae553184104a8d29ddf884329946c55e1a199d49358151e9f1ea25f6566d6e00d15e07d26ea4e84377f4ee137a9af4eecb862fc825dd987ada8
 DIST gprbuild-22.0.0.tar.gz 945311 BLAKE2B 4573855667fe6c352a61ac2fd8218619e0c9fa5c5079fe6854988733b7dac27225177f550b58b8d596516e8d3bf9a279f44864fdcb00514ee9e5776415c78f2d SHA512 7e77d9441454670a7b3b14cff97339e654bb82e7321abd9d612a771e1559f3276057e5163b50ca08b6ab77ebb9fcfd36590ba3c9cfd28d07fce43c7673ad254a
 DIST gprbuild-23.0.0.tar.gz 952887 BLAKE2B a0de49e838dd41ca927d728dc2e7f23298bb3e7f865146ed6807e1da0f20fe9ce345d972ef93340f1a1fec91082ce14b575ad4e6642d759cb9d696602f291508 SHA512 d3b1af5295c0216eaa93e52b63ca51ceeaea324a3a3f40644e294f9048170f9294335e7e8ee2d77d99d4d9bb359267921632a01d43485d841b6e771143fb47a5
-EBUILD libgpr-2021.ebuild 1488 BLAKE2B 7c42a8634ccdf0ede450d9da5ea13cd3481679622970e55bfe9df22b1337133b77246df3761532f471ebc2afd094ffb5fd8bbcfdf0e457e30539d6f77df42953 SHA512 ae0870be62f04087987534045e327e06f8bdf12b708d32d91d537b124283ab02d476581021d086f91e39f1c08e65c17f0c2e11920bcf140a887b1d3c791eeba9
 EBUILD libgpr-22.0.0-r1.ebuild 1504 BLAKE2B a229f3c7ce451cf24947e06890de4639684a61a5dac10a08961cc3f44da9b1959f2add75618f1740ed1e543e9098bf91b17f6dd43c838d76f00bc3c7748b1f00 SHA512 f38fb8515c9dbe6b65d94eff2224705c241edb8d081944bc2188f060ec395413349c4986f38e2d655c836840805c1c5cb352b92c78b594f8ef6b0e2c372ff232
 EBUILD libgpr-23.0.0.ebuild 1504 BLAKE2B a229f3c7ce451cf24947e06890de4639684a61a5dac10a08961cc3f44da9b1959f2add75618f1740ed1e543e9098bf91b17f6dd43c838d76f00bc3c7748b1f00 SHA512 f38fb8515c9dbe6b65d94eff2224705c241edb8d081944bc2188f060ec395413349c4986f38e2d655c836840805c1c5cb352b92c78b594f8ef6b0e2c372ff232
 MISC metadata.xml 1021 BLAKE2B 448e77605bee95104afac31b48193217ee6c38af0b4e63cdee2c5d8e420a7f9b9a13c1302cfe49a109ab5c878808582a6f4a3ca3315e41b256f529d202bc1b4b SHA512 71427b65c100cba3e66d889124f27f1e378ad72559e7165ec93a4ffc68b7efe12db81ee5ec83aa92939b922d3efcfb3a5641c46db772a25bae21ce51acec5f47
diff --git a/dev-ada/libgpr/libgpr-2021.ebuild b/dev-ada/libgpr/libgpr-2021.ebuild
deleted file mode 100644
index f09ccc72ce37..000000000000
--- a/dev-ada/libgpr/libgpr-2021.ebuild
+++ /dev/null
@@ -1,64 +0,0 @@
-# Copyright 1999-2022 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ADA_COMPAT=( gnat_2021 )
-inherit ada multiprocessing
-
-MYP=gprbuild-${PV}-${PV}0519-19A34-src
-ID=23a77a37247ff811609e23a0a271f445c299fc8f
-ADAMIRROR=https://community.download.adacore.com/v1
-
-DESCRIPTION="Ada library to handle GPRbuild project files"
-HOMEPAGE="http://libre.adacore.com/"
-SRC_URI="${ADAMIRROR}/${ID}?filename=${MYP}.tar.gz -> ${MYP}.tar.gz"
-LICENSE="GPL-3"
-SLOT="0"
-KEYWORDS="amd64 x86"
-IUSE="+shared static-libs static-pic"
-
-RDEPEND="dev-ada/xmlada[shared?,static-libs?,static-pic?,${ADA_USEDEP}]
-	!net-libs/grpc"
-DEPEND="${RDEPEND}
-	dev-ada/gprbuild[${ADA_USEDEP}]"
-REQUIRED_USE="${ADA_REQUIRED_USE}
-	|| ( shared static-libs static-pic )"
-
-S="${WORKDIR}"/${MYP}
-
-PATCHES=( "${FILESDIR}"/${PN}-2020-gentoo.patch )
-
-src_configure() {
-	emake setup
-}
-
-src_compile() {
-	build () {
-		gprbuild -p -m -j$(makeopts_jobs) -XBUILD=production -v \
-			-XLIBRARY_TYPE=$1 -XXMLADA_BUILD=$1 \
-			gpr/gpr.gpr -cargs:C ${CFLAGS} -cargs:Ada ${ADAFLAGS} || die
-	}
-	if use shared; then
-		build relocatable
-	fi
-	if use static-libs; then
-		build static
-	fi
-	if use static-pic; then
-		build static-pic
-	fi
-}
-
-src_install() {
-	if use static-libs; then
-		emake prefix="${D}"/usr libgpr.install.static
-	fi
-	for kind in shared static-pic; do
-		if use ${kind}; then
-			emake prefix="${D}"/usr libgpr.install.${kind}
-		fi
-	done
-	rm -r "${D}"/usr/share/gpr/manifests || die
-	einstalldocs
-}
diff --git a/dev-ada/templates-parser/Manifest b/dev-ada/templates-parser/Manifest
index 1de95daeec9c..fe7fee362c27 100644
--- a/dev-ada/templates-parser/Manifest
+++ b/dev-ada/templates-parser/Manifest
@@ -1,3 +1,3 @@
 DIST templates-parser-23.0.0.tar.gz 225459 BLAKE2B 0971030e3079ff93b876bcb51925208eeee63837878a24589700dc9e0c025272e2d7920f82ee9b769c04857e4701d3eed629a1ac1f0979714c47fc132a188bed SHA512 c0a94b42391c61b4251cbbe86f91c506f46f6eed5be3779385bf199cf43281b704c68fd078b8b917948675976538168c1ac4c1f3b757f6db9988a45af7bfc4a5
-EBUILD templates-parser-23.0.0.ebuild 1012 BLAKE2B 85904db0a0b517e806e7addcd9265852f67bdc2ccf19ea01bff5c6582cff2ec4f9b507e9bade6c8c29ec959f98958d3b6aa70cde45516884651e24f0f20d3e40 SHA512 7eff7fa769506cbdb0a3f75865d59216311c35dbdab6597b53f8ba9ef0a412c40d7c8c58ff1d3852bee721f16806f5b7331ac96ae9d03fa8b27327456113aa5b
+EBUILD templates-parser-23.0.0.ebuild 1015 BLAKE2B d5204ad09021c99589d706228c3b3fe817c102f5a3f32a9dd4cf22ccc02610c564d65776be33d6b8bdfe601d683a5e9ddacd99b16ec9d6b846029fe153966abb SHA512 7b64c274335d2b0cec8efd2f0f88a7ea675d81fd681e09e5a93654a4698e0383f4f7a4956f684b27c5b5c0e1578e722524648ddaf08998ab09d56db0d43bb66d
 MISC metadata.xml 370 BLAKE2B 69c033fb988741a15510bfa2550038d9618b0d062e289f529c60c513cc9e63d0cd721a1f48212602f90be74e2f08e806bf0a6745b2488cfd6dde600a10eaaca6 SHA512 5ecbbb2c164d96711c20aa96dfbec89c17516406a649e8d1afa68455e262800f43b3f3697d9715a371027a850e821fcf80deb4c3f64ae0ece72a20edb1577767
diff --git a/dev-ada/templates-parser/templates-parser-23.0.0.ebuild b/dev-ada/templates-parser/templates-parser-23.0.0.ebuild
index 3200c2cc08dd..2a61873b68a9 100644
--- a/dev-ada/templates-parser/templates-parser-23.0.0.ebuild
+++ b/dev-ada/templates-parser/templates-parser-23.0.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ SRC_URI="https://github.com/AdaCore/${PN}/archive/refs/tags/v${PV}.tar.gz
 
 LICENSE="GPL-3"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 x86"
 RESTRICT="test"
 
 RDEPEND="${ADA_DEPS}
diff --git a/dev-java/Manifest.gz b/dev-java/Manifest.gz
index e2572a2b4cd3..c64c400ed454 100644
--- a/dev-java/Manifest.gz
+++ b/dev-java/Manifest.gz
diff --git a/dev-java/ant-eclipse-ecj/Manifest b/dev-java/ant-eclipse-ecj/Manifest
index 1a229b4a50f0..422a21d2592f 100644
--- a/dev-java/ant-eclipse-ecj/Manifest
+++ b/dev-java/ant-eclipse-ecj/Manifest
@@ -1,10 +1,13 @@
 AUX ecj-4.15 354 BLAKE2B e8ddbe928140e99fa36f0e4937cf1e9bf06bc3660ffdfba91099b35e4effaae3df1cb582a3cc8e9b26415d129d3c7e6b43f69e80f714ec1770ff593aebe4d5a8 SHA512 a8c159538a280ddc3616dce8fe6d1677ac45d7a72b27c23c85224a1d7e3acbb73912f2013be99b075f7b91e7ab52b4d871280246f1af56cf3718e3ce24b8ccc0
 AUX ecj-4.22 378 BLAKE2B 778ccee76b754a47ac6aaaad293c836a0505ce2d761e5b18d2e83b3a6a7cc9c611a6b447f3fe973f6875253678799b165534eb9d6c5a68fed95efd25f4e41db5 SHA512 da5cdb2ebf8857dd04f5189b85a58a6738d8cee14490533d8b10b39489b293542571abe8b34fd7366300cffaa36ae4f942c0a7844db5a276560ab23044809978
 AUX ecj-4.25 384 BLAKE2B 8c1b7500a376c89c56bcff2954f06fd7595092e4eaa4f8dbe0f04a09cd2acb80199cee747b7b47617bbee1ec1ade69a2a0229d93e177d602eda2617a81bdb1eb SHA512 e799535ff08bbceb9be6034421fe10a8cc92f982641f89eedeba49887c512accb5729c8d1a2dcdb540ebe39041fc3857303192a350d286669154848f75b6e286
+AUX ecj-4.26 390 BLAKE2B 42e06c8114370763caeee14aee4e4471ba5781f2257abab6ba69ff8657946681e06994804b5ba5d23547b066e8784bdda3bc2ba254ae357f98d234bd4da7a415 SHA512 9b29d5e650ec30e9d493d48c29820dbb2de79fa1cc897de3ccfc2558814a882e5ba0a35567d1fbcea11b050a2ced7b48f2c53a97a9f420ef81e715ab5156f9e0
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
 DIST ecjsrc-4.25.jar 2340770 BLAKE2B e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776 SHA512 b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
+DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
 EBUILD ant-eclipse-ecj-4.15-r1.ebuild 1265 BLAKE2B 10003921348e6a8c03eb7fb048fdaf391ecfcf2c9a8d45cff57491bc0bd4507462fbba41282c8998aa4b4b50792fc6d374052c1ef1019e4dab30e24f8ff853fa SHA512 2cac62f7e51e2086fcdfbbef59a2e794d165692683d993e6c8aa77f0fb3daf55f0c4c20c117a984edb70b268d2fac1c3742ab674a56e73778ecc4b434242e00a
 EBUILD ant-eclipse-ecj-4.22-r2.ebuild 1422 BLAKE2B a0b035a6386747d32ad2197ccb0e6eeb85a24b497236f5cf651dde1e39e81dd54746f4df6f9766e390c72a394b1d10e7cf4b40a86700a0875a59fe5ce469692b SHA512 739b38433d47dbd8e4d6bbf1c663d4001b33614c69c69d6bf146be0777624c55cff6c1d1c869dfa42ed6f8d325d5f8dbcd7eca9e77b18f7ecf89eeefd60f0ab8
 EBUILD ant-eclipse-ecj-4.25.ebuild 1422 BLAKE2B 92bb07a71d76ff089d0c7f478fe307d70855a95c1172f5a4fce14b3ddfb34b046af52b052dd50930de9101a5337dab625baa4e7b85de64fa76c7c1339d0451ec SHA512 2fc3b7fb3d50fe5411992ca8315e30ff348f7f8ebe5cc103c3d9c1b75f8dd666091580243807cff952d57c741a43d3090ea6d945986b935d5f56ec5458776fdd
+EBUILD ant-eclipse-ecj-4.26.ebuild 1424 BLAKE2B 489c78dfdc6db00d5c887ea39f79f01a4de3182ca4812e06708228975d1182e31a21fc4f4f218163e7b0bd6493c13ca238c343e1c65119b23a1d502f40e079a6 SHA512 a71f95184455bd2fa68403b6e1182deb78e3ca6633a7c485cb62a1128edf119d64637659fa051ef69a9239b6d88f6ccc202dce5a2d4c01256d5bf3ffd1f9b4f0
 MISC metadata.xml 547 BLAKE2B 250bb477a3547d97e993539eb2965d6ff8a5085627c8a4ce221fc74704b1c824b1ba4a2891a850b820bd42c4ccf3e684af3035ccaf45cc595f0eac6b62da2a4a SHA512 e1283be49bebaf5bb03e55ead8336a046eff3c657e600dd1456690280e2ae2f9f4fb12987d7c1cfd192e41d8f8d40b36896a2d7430063d243f374e4aedc4ec77
diff --git a/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
new file mode 100644
index 000000000000..749502b069a2
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/ant-eclipse-ecj-4.26.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple prefix
+
+DMF="R-${PV}-202211231800"
+
+DESCRIPTION="Ant Compiler Adapter for Eclipse Java Compiler"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/ecjsrc-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.26"
+IUSE=""
+
+CDEPEND="~dev-java/eclipse-ecj-${PV}:${SLOT}
+	dev-java/ant-core:0"
+# though technically both could be set to 1.8 and it would
+# compile using jdk 11+, it would not compile using jdk 1.8
+# because eclipse ecj has min jdk 11
+RDEPEND="${CDEPEND}
+	>=virtual/jre-11:*"
+DEPEND="${CDEPEND}
+	>=virtual/jdk-17:*"
+BDEPEND="app-arch/unzip"
+
+JAVA_GENTOO_CLASSPATH="ant-core,eclipse-ecj-${SLOT}"
+
+src_prepare() {
+	default
+
+	# Remove everything but the Ant component.
+	find org -type f ! -path "org/eclipse/jdt/internal/antadapter/*" ! -name "JDTCompilerAdapter.java" -delete || die
+
+	rm build.xml || die
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org -type f ! -name "*.java" | xargs jar uvf "${PN}.jar" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	insinto /usr/share/java-config-2/compiler
+	doins "${FILESDIR}/ecj-${SLOT}"
+	eprefixify "${ED}"/usr/share/java-config-2/compiler/ecj-${SLOT}
+}
diff --git a/dev-java/ant-eclipse-ecj/files/ecj-4.26 b/dev-java/ant-eclipse-ecj/files/ecj-4.26
new file mode 100644
index 000000000000..950088453264
--- /dev/null
+++ b/dev-java/ant-eclipse-ecj/files/ecj-4.26
@@ -0,0 +1,7 @@
+JAVAC="@GENTOO_PORTAGE_EPREFIX@/usr/bin/ecj-4.25"
+PACKAGE="=dev-java/ant-eclipse-ecj-4.25*"
+SUPPORTED_TARGET="1.1 1.2 1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19"
+SUPPORTED_SOURCE="1.3 1.4 1.5 1.6 1.7 1.8 9 10 11 12 13 14 15 16 17 18 19"
+ANT_BUILD_COMPILER="org.eclipse.jdt.core.JDTCompilerAdapter"
+ANT_BUILD_COMPILER_DEPS="eclipse-ecj-4.26,ant-eclipse-ecj-4.26"
+GENERATION="2"
diff --git a/dev-java/eclipse-ecj/Manifest b/dev-java/eclipse-ecj/Manifest
index c2b0d68ac507..69ab62dfb307 100644
--- a/dev-java/eclipse-ecj/Manifest
+++ b/dev-java/eclipse-ecj/Manifest
@@ -1,7 +1,9 @@
 DIST ecjsrc-4.15.jar 2166228 BLAKE2B 794e0ba1a19b325e2dd8ad0b288ccbe04866627670b50d39dd327c13fe1fac56200eb3a6c1c3d1af043cad795508b9b714a5243049671414b5a62a97725d3297 SHA512 ada55b2522cf26570f0cd43f415eb5cf20e6840f83dadc72e1ae474ebf10eadca73f9fa3d1db51e13fd2762c38cd3e3567db3c7840d43ae3d8665ebe35e1889d
 DIST ecjsrc-4.22.jar 2358194 BLAKE2B e091050297b4556c38adfb01fb1e43e13644af1b3c2b30a93cfe3fdbb55050a0f7709081c7406d384d7141de67a954253aa26cdbb45f56327b16ee5ddd5e82a7 SHA512 cd52a72aecded032625ee83581ac565e1e96f8d26ecfc76e982274fd3d6238f1e7f22576855589b021e9a5ef67686b9b75e010c4e2033a8b7f6e7c9b1ff7eb4c
 DIST ecjsrc-4.25.jar 2340770 BLAKE2B e1e82356984a72e7ebbd5ace2ccbaf885c7acfdaf410b2386fa0a143f85e4431cfa2f5d254197eb56203c48505bc7dbe264664815b572c725ac5814645254776 SHA512 b475d58ef6a03e4bbf7e0f440edcbdd61e0548f68e48c7762973f60850a14fc1c234bb9a41be404ed06db14a273646f1dc5ad7effd4c7146b46f40a52850f236
+DIST ecjsrc-4.26.jar 2347137 BLAKE2B 22e627178fe35f34cee7ba63e740ef2699bca691d460c81e97c2f18c197042cc0d901eea988331b3fa2ac7daa87daef9ee90bc1e62901935a6f2f3fe5f1e8534 SHA512 e53534160e6a2cdc8c5db7caec617d5671eb59954a86b9dcb36a514024c3205167c8416560796ce61d1aa188f551660f3bfd8eab46fefe9111c8f0b7a977342f
 EBUILD eclipse-ecj-4.15.ebuild 1737 BLAKE2B de3aff3c46cf68494920930ffbf337cc79864d1adaef1c603f1c9ea8ce168823e8ba772a0a616c77ab7dafc596e37687e6460db89ee61c4127c41ed739b2d914 SHA512 6a0bd08a4aac020bc4f299907777d40673128798bd093b3bc03602aa86bb7c3436d7400ba0dc31c58ff0703d6357ac691f909dd2358a773e0b548139d251a8e7
 EBUILD eclipse-ecj-4.22-r1.ebuild 1693 BLAKE2B 4b19af6eef3b9626b1451391c09836c764232352071cac79e82064c2a4a9be93b6f689845f38e8ff2c191c81e7a3a230f7927cd1fdb19115a99265f1720dbe5d SHA512 27e74aee2c6c828ed686ef17a82976f3ec6841d878384af29b10c8ee91792446153603cd8e5383b669564122f334310846ce7a72d592b2361ac02a60e64b65d4
 EBUILD eclipse-ecj-4.25.ebuild 1693 BLAKE2B f8aa316f2e366fcf65564005f11c256c3b52608b027981ef93dc344aaba0ab1a7bbd8bc0ccc7b0ddb026c1f1fdafbc5764014069ac6802739382f1b6b0234209 SHA512 9d178cc5e5ec4f5ca35badf455186dd4071ab5b67a53536b9f03ef73c66320c5cdb064b39e3dbc3771a63ad69a8071dc6d8311d682b35b1889ada2c7a3c71e8e
+EBUILD eclipse-ecj-4.26.ebuild 1695 BLAKE2B a7b1dab0385420d20b3127501e3a55d3e2fab801c80ffa4c1e237936ca35433703cdb0c992235ae949f6692328c22ddd9aedb17d84c4564ed9661cf78ca7ed02 SHA512 6a311a15f3ec9a1246271d34bae8f78b545e4e219baee8e0d91bd8c34b193f20ff4e2312360dad7c62bf416c7540e61ad8fa28813d8f55ea5269116e5638df53
 MISC metadata.xml 657 BLAKE2B ed8b1b4598051b4191bad5e92df382f1e0910f7aa6888d9df4dedef6929a3d8933c2951c98e8f8af8750f176ff541608d8db5d311e06c721b14ce1703a95a00e SHA512 ad91b4e46f609db5c5abc145feaea99dc0e6f4297ee1f6532ff1001a991775679e8f53ef91e823d61a614e6d77fbc18637469ea1869d8f82bab352a69c6fbdaf
diff --git a/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
new file mode 100644
index 000000000000..d4a38077e777
--- /dev/null
+++ b/dev-java/eclipse-ecj/eclipse-ecj-4.26.ebuild
@@ -0,0 +1,72 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+
+inherit java-pkg-2 java-pkg-simple
+
+MY_PN="ecj"
+DMF="R-${PV}-202211231800"
+
+DESCRIPTION="Eclipse Compiler for Java"
+HOMEPAGE="https://www.eclipse.org/"
+SRC_URI="https://download.eclipse.org/eclipse/downloads/drops4/${DMF}/${MY_PN}src-${PV}.jar"
+
+LICENSE="EPL-1.0"
+KEYWORDS="~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+SLOT="4.26"
+IUSE="+ant"
+
+COMMON_DEP="
+	app-eselect/eselect-java
+	dev-java/ant-core:0"
+RDEPEND="${COMMON_DEP}
+	>=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+	>=virtual/jdk-17:*
+	app-arch/unzip"
+PDEPEND="
+	ant? ( ~dev-java/ant-eclipse-ecj-${PV} )"
+
+JAVA_JAR_FILENAME="${MY_PN}.jar"
+JAVA_GENTOO_CLASSPATH="ant-core"
+
+S="${WORKDIR}"
+
+# See https://bugs.eclipse.org/bugs/show_bug.cgi?id=479134 for details
+src_prepare() {
+	default
+
+	# These have their own package.
+	rm org/eclipse/jdt/core/JDTCompilerAdapter.java || die
+	rm -r org/eclipse/jdt/internal/antadapter || die
+
+	# JavaCore is not distributed in the jar
+	sed -i -e '/import org.eclipse.jdt.core.JavaCore;/d' \
+		-e 's|JavaCore.getOptions()||g' \
+		org/eclipse/jdt/internal/compiler/batch/ClasspathDirectory.java
+}
+
+src_compile() {
+	java-pkg-simple_src_compile
+	find org META-INF -type f ! -name "*.java" | xargs jar uvf "${JAVA_JAR_FILENAME}" || die "jar update failed"
+}
+
+src_install() {
+	java-pkg-simple_src_install
+	java-pkg_dolauncher ${MY_PN}-${SLOT} --main \
+		org.eclipse.jdt.internal.compiler.batch.Main
+}
+
+pkg_postinst() {
+	einfo "To select between slots of ECJ..."
+	einfo " # eselect ecj"
+
+	eselect ecj update ecj-${SLOT}
+}
+
+pkg_postrm() {
+	eselect ecj update
+}
diff --git a/dev-java/tomcat-el-api/Manifest b/dev-java/tomcat-el-api/Manifest
index dbcc94153e14..3aaef0a7c2c4 100644
--- a/dev-java/tomcat-el-api/Manifest
+++ b/dev-java/tomcat-el-api/Manifest
@@ -1,10 +1,16 @@
 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
 DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
+DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d SHA512 d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02
+DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2
 DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
 DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
+DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
+DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
 EBUILD tomcat-el-api-10.1.4.ebuild 1374 BLAKE2B 4296a5b0314ecb8bf78fcba7c536a182e1abf4a52a89d18532b6a8083552926cb94f301bec141c85008d49f5aa12277c2b0807867fa882115f349bf3b11b7c9b SHA512 b1812d67e3405123bb2ad21469268df419141f75f1a9bb23da6ace7bea9a9f740c08301b0dc06c54525359c7dc3ef8767bf58f1c4dba923207285c1d6f50d367
+EBUILD tomcat-el-api-10.1.5.ebuild 1378 BLAKE2B d11b6f478292ea873911be713ae0e2dd118ab2fe7dfa2be6a134ce9cd9a3145cd36373b953b1bc6618f7540b000d875c23b316ce4bdaac58a7e2e3a3cf629bfe SHA512 f1b2cbd4ec5dcbd01a93e660e651618f26734ca3cb5d14a08a73b29e380f033607490e9933991bc40d6f6af9675e4dc5d40f19af502d3f12dd467689e36693ef
 EBUILD tomcat-el-api-8.5.84.ebuild 1370 BLAKE2B 34bacef959f8b2ffeae59deeac238c6ea7c13c587e29ce1ca648fabd5eaf331903c2056390feda0f603c2652414b12955af2727efb01184cd8c81365f26269f9 SHA512 cfbfbd055abd5a30836268389bb16aac872fef7c3a9f9fe249c08c994681f075e4bcc49f6e09d89eb67e7492c22098b9e9c19d1e7f026619f13e5284891b3ec7
 EBUILD tomcat-el-api-9.0.70.ebuild 1370 BLAKE2B f218b5ce0baf1563b88edff9a1720353367ecfe16907a880dabd9be2e88ede18eacd6fed334982a1f9c2902e0db5068eb75a6ac28059c59b4843d4fb102a8988 SHA512 7742cb95728b30becf186873b61a362cea048b9504a9ff993a1bf838afdaac7d7df85097639118d9bb61cd817f7c84701061fd6922a5225f0533f904345662c7
+EBUILD tomcat-el-api-9.0.71.ebuild 1374 BLAKE2B ab4d7145110aede19acf139547170ab4ea1e72d502132683961dd4648861ee877c247b473a6e4da3183e0e33fb856dd8256bff1ba66b80050fdef0c6d32aa8e3 SHA512 a53c4b29a2163ac9c3272521668a38116b0f2786c5004ea06a394d66de003881d3913970ddce47e76d56616f458067348f105459defeaca13223b9bbe7b11e33
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-10.1.5.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-10.1.5.ebuild
new file mode 100644
index 000000000000..c39acb26e40e
--- /dev/null
+++ b/dev-java/tomcat-el-api/tomcat-el-api-10.1.5.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-el-api:10.1.5"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's EL API 5.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="5.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-11:*"
+RDEPEND=">=virtual/jre-11:*"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/el"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/jakarta \( -name 'jsp' -o -name 'servlet' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/jakarta resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-el-api/tomcat-el-api-9.0.71.ebuild b/dev-java/tomcat-el-api/tomcat-el-api-9.0.71.ebuild
new file mode 100644
index 000000000000..89c977fcae8c
--- /dev/null
+++ b/dev-java/tomcat-el-api/tomcat-el-api-9.0.71.ebuild
@@ -0,0 +1,40 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-el-api:9.0.71"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's EL API 3.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="3.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+DEPEND=">=virtual/jdk-1.8:*"
+RDEPEND=">=virtual/jre-1.8:*"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/el"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/javax \( -name 'jsp' -o -name 'servlet' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/javax resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-jsp-api/Manifest b/dev-java/tomcat-jsp-api/Manifest
index 6eebf68559c0..40fb9927776e 100644
--- a/dev-java/tomcat-jsp-api/Manifest
+++ b/dev-java/tomcat-jsp-api/Manifest
@@ -1,10 +1,16 @@
 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
 DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
+DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d SHA512 d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02
+DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2
 DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
 DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
+DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
+DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
 EBUILD tomcat-jsp-api-10.1.4.ebuild 1417 BLAKE2B 03236d9990abcf733d8eb1cdd16deac9d38fbed148aef64ffde58c9f3564bf272fa0228a5ed11f3eb4c9a9e60b7250af0bf68deb608c9dba4f93fcd9a5eff078 SHA512 f10d63de0ea589d81d08c6c5cdd0961539096f4e5b1d946b49367f70cc304f2005630bceb8a08022cb9b80aa3110a90895f7e5dc6a1df1b68989f87197042725
+EBUILD tomcat-jsp-api-10.1.5.ebuild 1421 BLAKE2B f635868f212bc9cca81680f44a920d5c93540a8a0893bc21e1fb48c26d91beded4427d32de39b94c079225afcfa8b9e2573a6579cf72aec1c694703ba3fa226c SHA512 328855cb5b7d63cc19f7ed65df763c5204b7511e03bce576a7f4720a646a77dc3a1b2e68429d31752cadd729cf7126474030bd5ce290456e4d90202eb9a13826
 EBUILD tomcat-jsp-api-8.5.84.ebuild 1413 BLAKE2B b8bbb03d477442ddbd45f7b234bcc985b1b1f37d4ad07caf66a25d8db7b48dca1e3a1c21198a445730c82aec7a37baebab6eafeedaa7997d416166cf2b3032c3 SHA512 4dd898389dded9ddf958a931d4843d22806eee262c78128d3ce5ed961ff6c8f2be36bd256cc03ee57066ba729e3ef920ff31fd8a651b5c3a67a05386b0579359
 EBUILD tomcat-jsp-api-9.0.70.ebuild 1413 BLAKE2B 3695a4ee4b5365c8716e6cf465556e29920893f8361d2b015a091ee8984d7d38483dc44a4b55ea9d77ea9f561d4dfee2cd159a2d4ac4a5926b4a2e86fd21797f SHA512 153f9e1adea22e21250077e471c1d2d524659da13055a6be5f2f507a928773a933171e66384a8b3591336eb2c2b83cc30f6bbaede56b97099f15f2aeb18376bc
+EBUILD tomcat-jsp-api-9.0.71.ebuild 1417 BLAKE2B 84c3e02a8e4b627a2687fcc27f45004c85c609f41f596e6562be7ee7470c2bcacdb36417ad91142f688bc95d708afe7dde0d149386d478dd55825019681fef3a SHA512 bb10dddaa47d2b877e51fd524ff64e81a32d0531f0bc0f8b542375a9549efb88e1651b6fa1f9315c5febc61a61e6d3f4fcc2f12b0d9d82b294f7ec2c5a9e584e
 MISC metadata.xml 217 BLAKE2B cb41a7bd7e5c55319465d67551eae75371cc72d58629c61f70a7f54c388645d5ab1427c66dfdd5954e36ca40f0d3209f871d476cacd61516dd57e3297aaa601f SHA512 4df8395dcf07c52adadee71ad7dfa9f611ade8485cc9869397d0037272ae9add9b40d90669da8b80e578b4ee14c512da01ba096abe39a5859ac71c5316e425b6
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.5.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.5.ebuild
new file mode 100644
index 000000000000..4dbfa1e5d83d
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-10.1.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:10.1.5"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's JSP API 3.1 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="3.1"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/tomcat-el-api-${PV}:5.0
+	~dev-java/tomcat-servlet-api-${PV}:6.0
+"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-11:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/servlet/jsp"
+
+src_prepare() {
+	default
+	mkdir -p resources/jakarta/servlet || "creating \"resources\" failed"
+	cp -r {java,resources}/jakarta/servlet/jsp || "cannot copy to \"resources\" dir"
+	find resources \( -name '*.java' -o -name 'tagext' \) \
+		-exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.71.ebuild b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.71.ebuild
new file mode 100644
index 000000000000..4e38cdaba4ea
--- /dev/null
+++ b/dev-java/tomcat-jsp-api/tomcat-jsp-api-9.0.71.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-jsp-api:9.0.71"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's JSP API 2.3 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="2.3"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="
+	~dev-java/tomcat-el-api-${PV}:3.0
+	~dev-java/tomcat-servlet-api-${PV}:4.0
+"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/servlet/jsp"
+
+src_prepare() {
+	default
+	mkdir -p resources/javax/servlet || "creating \"resources\" failed"
+	cp -r {java,resources}/javax/servlet/jsp || "cannot copy to \"resources\" dir"
+	find resources \( -name '*.java' -o -name 'tagext' \) \
+		-exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-servlet-api/Manifest b/dev-java/tomcat-servlet-api/Manifest
index a6f7b8c1b599..24cf4fbb10df 100644
--- a/dev-java/tomcat-servlet-api/Manifest
+++ b/dev-java/tomcat-servlet-api/Manifest
@@ -3,6 +3,8 @@ AUX jsp-api-2.0-manifest 474 BLAKE2B 51ae750bf0caa563387eb51f0fb1be53c693c7cb0d1
 AUX servlet-api-2.4-manifest 310 BLAKE2B 8400197ebfe43615dbea9ac8fad2b85f89abe9e8414cbc1ce835f09ccc2921e3aa50bffc3d3c38364bd61d38f14e979219f93125c3b61403ebecebd16226fa56 SHA512 bb16a0fd2d277d2b7990294bfc730def285d6e390c8ab3166d8ffb08e9d9c62c9f462893fdd9eb84cfa93685262a8800622acdbf0fd9a7f2ffb5709f0387f9ca
 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
 DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
+DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d SHA512 d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02
+DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
 DIST apache-tomcat-4.1.40-src.tar.gz 3709719 BLAKE2B f7ca82052c1148a5c384fcbc3871beeddccdb4cfed05ba176581ebb50f52ba867bed8dbc500e97b7348a3a87b9693fb73eb81209df4f31e8c1ced7e30a6af30b SHA512 c455fa3da9da8fcbf1d54ae5dce808f8a4520ccafd627a6b2d1b003c37e8395d8b2a55d5471bf6c196549d082715862b3b8958aef88613293a07fc0160aa5c6e
 DIST apache-tomcat-5.5.36-src.tar.gz 3743113 BLAKE2B dbfcfd123a23b0ceb9f1fdd936e42324ea8b10cf327a1d0abf1703006535859c7122690a08b5ec27b86b526cc7709a7199b4f35f123538ff11f23f3b489358f3 SHA512 845636b5b992fbbb7d657d192afbab1e6a924bfd0c71b025cf22776eb4527d92d63f9b3f33475d4349a0df4cebd984ba3776eedd7482b820abdea909e90a97b7
 DIST apache-tomcat-6.0.53-src.tar.gz 3522914 BLAKE2B 054b097c16861abaa8bdbeba713b49bc1dfcff573bb3f4bd0ff5807c33a2a0fb991af618f6e11e5b3ce3fa55c589fc6569342cab5d5a00349c79bc7061d81e40 SHA512 915a0a18f5c2883625c9441eed6465973eff4f6bf41e08e925c7edaea89ef8f6ee9476d3e06fa38228d4bcb4decaf53e3a7bdb7ec7e899e6250db3e12a9f5f2c
@@ -11,11 +13,15 @@ DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a968
 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2
 DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
 DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
+DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
+DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
 EBUILD tomcat-servlet-api-10.1.4.ebuild 1464 BLAKE2B 8bf04e73c0e534bdff1d35f25d171b716a6416c179230b4e99f2731de3ac0336e3203e81bbea7b8dcdece2e79983126833a2836252b320edf931e5978d6220f6 SHA512 c88981bb5e3b7ccc2e97874a1703b3a40bcd7879653358c749680abdb6896be621ee0fd6fb9c6ca6d59fbce08aa5d5d9b6462167e5d0920227e3be28397f6d30
+EBUILD tomcat-servlet-api-10.1.5.ebuild 1468 BLAKE2B bddb7bfb7ee640b5b123abdd36e7d17ac591c88062094acfd37f84881e91132c5489da9a546fe50a2b331888ac7cc509637ea555cbd679f9333271d54f8b0238 SHA512 c011bcf35b5726ef815a85a6110cbae31a0bc39479c54f975c213f2c215fa36403f90814cea9cacdaf2fa276a896985c60eced355f3f0d1d391e44e4b805d520
 EBUILD tomcat-servlet-api-4.1.40.ebuild 1007 BLAKE2B 47367c64fb51f41908e0d04234e09306c56ed593120c5daa3ddd18e583d1ec3c1fa77b620613aa9b79dcd87e5a7b631cbe5c33443ae00380abfed671c93cd7d5 SHA512 c126e35ef153353c5cb5127ad7c6b46230a6ae0b70b873ce323e7906680becad7f99844792500281e4532e45ddb050e0f40079daea05ba514d733458aec4a715
 EBUILD tomcat-servlet-api-5.5.36.ebuild 1417 BLAKE2B 698cf8076448e7478124561d802e96cdb2d431778dced5de495f7ed2c665ff079300b37e658b3cad133c99bda92505eaf8add6c3e582d00ccdad61ebc4097c80 SHA512 7a571e537319eee86a34070e5e8e2baa722238fff2a57bea51a9e9ca746ec43ef07c7864a7235ef3ab33560b111c8d4971b8e4848f1e54f2719ed162857a7437
 EBUILD tomcat-servlet-api-6.0.53-r1.ebuild 961 BLAKE2B 66d34a80d320dd032acd712b2549a23f359648d8df6f69399be2c821eb55426fd9cdaa284aa3d474bf26a3cbed649d0e46ccf0a2334f8430e0927d35a72d8dbf SHA512 0ad484e1c808864d96daec646c5a14857f87ae097388f02631687a199c12888581edf24ff2e992a3b48ed0d4f5f5e954960673519705f4885004a46bd47dca78
 EBUILD tomcat-servlet-api-7.0.109.ebuild 2986 BLAKE2B 8bafa3c18cef415f0eb5b20ecf07ea4209313321288b8aa25e13463509e12aa58d250e8dbe52b3801ebf409cf0f013e42ee5cfb9bc1e548971263f7639b09240 SHA512 c3991e127f68c4e0ef6e1dde9ffefbcbfc72479d6dff48c048f8d56adb505ab8959da75422e52eb02c1f5d235c0051474f0329de4013774594289b011223a263
 EBUILD tomcat-servlet-api-8.5.84.ebuild 1620 BLAKE2B aa001d0cb52ec13e07f6c5e7b2512a770c46c17e3f29d99a90d0c2170adabba96d6ab20ab4f6b7447331911c0c5848df1f962b8067b8a9f92cd8e2dc5b5053f3 SHA512 e12ef8bf6cccca578ae5d099e0b3c391a7bb3d6a6b096f3a05b9c3041b15bc44150c99a2e0546b54e3738ea70f20c0f21de4959d94186949aa5751e28baeeff7
 EBUILD tomcat-servlet-api-9.0.70.ebuild 1460 BLAKE2B c330792fab85ca2b354b65ac58b5423f81e80ff7cf646e26fce93b552af9bb6b89dce92a821c97f2a2371a33462d213b64fb601c1fa50217b41dccd2abc0829a SHA512 1915129e4a4d72e8f155b537d0fb0e0ed03e4cf507ee9c091d9b0a16f5910af0a69f703d22b59b5099445910e74d8267ab375ce69d9ea91cdbebd5b9ee8e0e21
+EBUILD tomcat-servlet-api-9.0.71.ebuild 1464 BLAKE2B 4071ee6f118f195bf54f1af8a55a3514a41662feea2b7dc5824e0aa8a09f90e881c93f17ab75ad1fd624da59619c241dacb51cce745f564d4f96a7ebabc96d79 SHA512 051c599de1e74b323a7c5ce68bc525eed039d55d896d5a8065a35f6c1b659a44ebe6bb00dd3e97ced98902122394077e3d15963e2710d982582cf052832103d1
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.5.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.5.ebuild
new file mode 100644
index 000000000000..1417a3fe7289
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-10.1.5.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-servlet-api:10.1.5"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's Servlet API 6.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="6.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="~dev-java/tomcat-el-api-${PV}:5.0"
+
+DEPEND="
+	>=virtual/jdk-11:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-11:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/jakarta/servlet"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/jakarta \( -name 'el' -o -name 'jsp' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/jakarta resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.71.ebuild b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.71.ebuild
new file mode 100644
index 000000000000..bf643c6263da
--- /dev/null
+++ b/dev-java/tomcat-servlet-api/tomcat-servlet-api-9.0.71.ebuild
@@ -0,0 +1,47 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source"
+MAVEN_ID="org.apache.tomcat:tomcat-servlet-api:9.0.71"
+
+inherit java-pkg-2 java-pkg-simple verify-sig
+
+DESCRIPTION="Tomcat's Servlet API 4.0 implementation"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="4.0"
+KEYWORDS="~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris"
+
+CP_DEPEND="~dev-java/tomcat-el-api-${PV}:3.0"
+
+DEPEND="
+	>=virtual/jdk-1.8:*
+	${CP_DEPEND}"
+
+RDEPEND="
+	>=virtual/jre-1.8:*
+	${CP_DEPEND}"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S="${WORKDIR}/apache-tomcat-${PV}-src"
+
+JAVA_RESOURCE_DIRS="resources"
+JAVA_SRC_DIR="java/javax/servlet"
+
+src_prepare() {
+	default
+	# remove anything related to "el" or "jsp"
+	find java/javax \( -name 'el' -o -name 'jsp' \) \
+		-exec rm -rf {} + || die "removing jsp failed"
+
+	mkdir resources || "creating \"resources\" failed"
+	cp -r java/javax resources || "cannot copy to \"resources\" dir"
+	find resources -name '*.java' -exec rm -rf {} + || die "removing *.java files failed"
+}
diff --git a/dev-libs/Manifest.gz b/dev-libs/Manifest.gz
index 7a9be7fb40a4..b48ae668637e 100644
--- a/dev-libs/Manifest.gz
+++ b/dev-libs/Manifest.gz
diff --git a/dev-libs/dqlite/Manifest b/dev-libs/dqlite/Manifest
index 8ba5f32097db..504abc5d1b3b 100644
--- a/dev-libs/dqlite/Manifest
+++ b/dev-libs/dqlite/Manifest
@@ -2,5 +2,5 @@ AUX dqlite-1.12.0-disable-werror.patch 515 BLAKE2B 3a2ed21d6d4b33f3f39789459754f
 DIST dqlite-1.12.0.tar.gz 181709 BLAKE2B efb35aa9d0c348cd55eb190e27ad155b7d748ccbcb80822f33ce4589d56bc0090f5c0703d769e7090bb8da1b8908cbd73d1076568108661d5b85e55103795a9f SHA512 2a3dc17fcaa0ec2fc5481d3ff57a7bee42c8930f0e6ac7030d51e1a61ae3ce4d7b24f47921b29602a65353c1a51931a82d9af302ee580b19bdce561e6547e940
 DIST dqlite-1.13.0.tar.gz 190627 BLAKE2B 02880a112a7b070ee19653b60f19dbb49030b1d0d1bd3671577137ce281fd1af9c135f138d692fcc1c14592972cc9321198b3a2003fa0e81829c8ae462604964 SHA512 da56c622c75dcdc1df814d2b7acfeb08cb046fa7b74691d63575ddb3d30f91b441b8f58cc72466872b4c5e0028706b6505846d8f3d06583be844baefdd85f8a9
 EBUILD dqlite-1.12.0.ebuild 938 BLAKE2B 60472923a3f7b2ec5c980f68e5e37af966fcf037e356aac92517dbb56d8f57833f83d572b55cdafb31f19efbc0f54bdcdb0925de3644a4e5ac4b3ee735aa010d SHA512 7c545c2a3b0e09fbe0858a5230a8fe4e1028617eb78d8d73ea27de6f7a4258c7d1f9aab80167361c7795307a6619a93a0dea1c06288cbd1aecff13d8a6fbd924
-EBUILD dqlite-1.13.0.ebuild 961 BLAKE2B 8cf06a328bee43c78a7891e9f5848c1a67f272dde34ab1ed3cf2525cff9fd69ceffc102da8c768186086d50794c563f8d6fde3f1f7541a7a419d2fa45e5e30a6 SHA512 750247d895ed2d0d036ea2e56a0c92685ac540db787f69184a013ba11e3725d8dd7501d98a476fc38e8f3d2c295583e279d0ae2a4d17e239aa4cb413265a0ace
+EBUILD dqlite-1.13.0.ebuild 960 BLAKE2B 5bbfd3da9bdf47be5808612e893441b05b58bf504f39ec3a9cb8013ea5f6e720ebe93b0861c20894ddab8c7ac55b5563b3be766da4aa48db3da4c6c9979b83d3 SHA512 646f02663cc29f80b80cfd0cc086b9ebf43abcbe1e9b27538ba578d5d4010528f26f743a19f090c4708173046a6a52d9ef4881210682c6f4ffef4c79f8620b85
 MISC metadata.xml 950 BLAKE2B 26822e40a2c719e8e3a03db6e513d869eef038fcca973ef049da1b6eeec29aefd0867d6bced049ad1dd0465a4d942982565ff0436a7744ffb127879987ea626a SHA512 bb07a8a87ae66e5b5a2aca695e9d5cd1e5a1d725d1d9200099f9d5b46adad83c2ca9ebfedc172ad01fe31aecc1fbbe5a4de7255a2e04d4462c03a106127c7221
diff --git a/dev-libs/dqlite/dqlite-1.13.0.ebuild b/dev-libs/dqlite/dqlite-1.13.0.ebuild
index 8a73c0b76fbb..5dc934b5faf6 100644
--- a/dev-libs/dqlite/dqlite-1.13.0.ebuild
+++ b/dev-libs/dqlite/dqlite-1.13.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2020-2022 Gentoo Authors
+# Copyright 2020-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -11,7 +11,7 @@ SRC_URI="https://github.com/canonical/dqlite/archive/v${PV}.tar.gz -> ${P}.tar.g
 
 LICENSE="LGPL-3-with-linking-exception"
 SLOT="0/1.12.0"
-KEYWORDS="~amd64 ~arm64 ~x86"
+KEYWORDS="amd64 ~arm64 ~x86"
 IUSE="test"
 RESTRICT="!test? ( test )"
 
diff --git a/dev-lisp/Manifest.gz b/dev-lisp/Manifest.gz
index 322917a2b7af..c8e8acb1f438 100644
--- a/dev-lisp/Manifest.gz
+++ b/dev-lisp/Manifest.gz
diff --git a/dev-lisp/sbcl/Manifest b/dev-lisp/sbcl/Manifest
index f04bbec17c47..b4dde15af5ab 100644
--- a/dev-lisp/sbcl/Manifest
+++ b/dev-lisp/sbcl/Manifest
@@ -15,13 +15,13 @@ DIST sbcl-1.4.11-armhf-linux-binary.tar.bz2 9767589 BLAKE2B 2949338bc19973e0ca38
 DIST sbcl-1.4.2-arm64-linux-binary.tar.bz2 10578821 BLAKE2B 1cd25c548be0f1b7ec01edc3bee7fe6c2aaf07b7bd1fc55d408dee7ac95e8f3761a194bf9e8efb734179a7eff04cdae2fe5ba4a9ba5ab06f7322ac1550d142cc SHA512 39bbd735b242aa0bbac05c6f4dbe28cb45e01684db7e5b4f1e51f995a9f9d5b484f63cc4243f472f72b3b1e6c4cd2268a7e812b15426eca5cf9a1fede10f44bb
 DIST sbcl-1.4.3-x86-linux-binary.tar.bz2 10227185 BLAKE2B 6d77c4f4177cbdb72fb9bab0da5bd91e0aa8deafffd238818a2551332f0ab246715d9489b5c1156f3481aa7fb79d161a988404620fc09fe86ff927543a1ee678 SHA512 41cd63d61dd7c46370341dce39a362287a23b528bfebe8e5571614aeefdea03d318207d25562e995db9ccedb6c1f50ea4d66627721f0fd9486e99440126e6a38
 DIST sbcl-1.5.8-ppc64le-linux-binary.tar.bz2 10025597 BLAKE2B aac079e3585ebe9d5b610cf096e958edfd4410361b0d96b2fa88a285cbdce4133d89e1ddf0cf6729d43d6c3057365d07a3d73362f906fd8798b76c993210a8e5 SHA512 443ab604caa768c756f3322d7c599142a50227914bcd6be12434432daf1e3d5af0740d1ebdb166b856cc77ddf02451e29fcef9e29099f7bc4fb49ad61db17674
-DIST sbcl-2.2.10-source.tar.bz2 7269005 BLAKE2B e31c714c59fdfd959f86760d997369b9bea8abe51b6e8ca5ccd5a14298d61ee6af52980672e8ca0030d4cbc3781b82d791f04cfc0b966dc44c072a4a97ff730f SHA512 a8a58651fcff65819c6c605ce188f96f4a179e9eb6c0a11ac67aa1f8125d94635f694f4c431d15fbd6de36eb8d851e880cad0e9fcbb47a66a636d88b9b802389
-DIST sbcl-2.2.10-x86-64-linux-binary.tar.bz2 11646922 BLAKE2B f3f734981d3869d3686e5809256a2e6c8793e6cdd8b65a2d1da4e02ea7c72ea6ab33989552b23530b75f0f3303488cf44b5311994bf141c63fb981f9b6a52a52 SHA512 bbc3d08c93650996c592f19fe4d20031f6391410bba8742d616642241363cb52333c9f92a3ea071274781aaa4310691fadcb6cac5f4ef84edb640497490d599e
 DIST sbcl-2.2.11-source.tar.bz2 7290281 BLAKE2B 5242127e2e9ee384f96cb4a6a7c3db30a4ef20885f1d28edeb8a73ef46275f19a99a801bd3be9fb424fdfaa4c7c5915061f3d87e043388f0d5b73c53648f53d0 SHA512 5c13d9d1305903d0c99b27485224c97f6e8d118afd24711afc7f80f92884352fff8cb075c36c7b752c79a09136206b6a8bcd7fbf8cbe979bbce777b978a1a594
 DIST sbcl-2.2.11-x86-64-linux-binary.tar.bz2 11651831 BLAKE2B 4907159286054642145e26c9739d2becf6a6e01788ee0a203a6444fbdb2a6ea3f760c22cca373151297a366af3d022daa73bbe0191f28d3dc03544285882b509 SHA512 d5786c3b893dc264c611c19c5bd24e919ed1978746a14c96e2ccf4659953d26b112868342f8a5db2df6bd1c30890ecf77627dbf135416564add94cd904017474
 DIST sbcl-2.2.9-source.tar.bz2 7258148 BLAKE2B ed7c220644120c467bcf2ef0a254b5065a6169d1560238dabbb4589831b2f094801b018d3b0bfc5e671328204ae34be763ec9df32ab7c5dcffd4860400582ae8 SHA512 6e215c7d34fe0db681b558206061f40bc1e235a0c2eb39518811bf2803e6a91f220b36e25da408a6756fd84071b6d634dc41e4acba73fdb0ffbab2cd77c9a8db
 DIST sbcl-2.2.9-x86-64-linux-binary.tar.bz2 11641067 BLAKE2B 4afeb6c3dee6d0b13790b005882d0702978f039feb3dd85fc483282b04b40ee797f8506f2db1611abf148589215583640f02022a11d4e01e854bd4a566fdd48e SHA512 53f9da74dd18056cf086e2f2258949eb53cdaabe9b3f24b004378e65c7a3ae5821a8501868415d662fc24d59bd0edb2c3b67419ebe48d459e8546e17fb692400
-EBUILD sbcl-2.2.10.ebuild 8449 BLAKE2B 394a31afe4a4213f1839a166e3b69b1019fa827809a6dcdc2e386b0d5e1a8f521f29404fb68e41a1fbceaae4b336372f8cfe220c4b9ebb97220f62cd37e25d8f SHA512 5b8b755369d9f5b80790b2fd7301b681d0877a1c49c863fdec3e0a910759d6986b77327912db069a4e914d7974fc81afce67d0c7d1661878fe0156fb3a3e763b
+DIST sbcl-2.3.0-source.tar.bz2 7332206 BLAKE2B e0111d36c285b5cf3bc492a28d9b1ade794681e530272b924bf2f84cf418d8de1fccf067765ff890aa84483d4730b31c7e2b0633c45132fe97e96e4a82c0efde SHA512 1241dcc41f5119dbca0be7b7c0d926d951e3d8daf2bedf5467dcdffa384719bb635eb9e99b4e4653afb00ebfa27e1777ed24f193ebc6213bc924a102258a61b9
+DIST sbcl-2.3.0-x86-64-linux-binary.tar.bz2 11788515 BLAKE2B 9af0dd28d83dba9983797610bceaf1f88ce796c3ea55cc13b675b217818b2cf7dd231ad4577a7f31be31965b8cce6d4887a3f56f721dd6db51f12f6104ec8252 SHA512 864997a9774760f65a682f12236aba81777ed93ca69707978fb2ebf9fba83589bcd347f625ca886de2edfa4506c0df7d10100f8301c58a4729b59981593f7e96
 EBUILD sbcl-2.2.11.ebuild 8668 BLAKE2B 2dc14591df917eb6a60c3ee64366fc1729361925db10155e67d876c48681f95d1098bba93396f3d2acca9a2affeb7043153a4abdea8a698b33a2cf013aad6687 SHA512 f86d9920a8f0365dce7209ab4937f1b7eff91807274090e178dadb898d960f15490f1a97734de9df318c741c5fd6eb5fe33fcd0748706486e7b871eb56d63f7c
 EBUILD sbcl-2.2.9.ebuild 8535 BLAKE2B be42b258d73afa02628562c78f1f9ece2b314ff2d5b819016ef5c6452b0de24f6f1e5ec6e735d36e556422c9962467c1be607baca051fc89468cdbc481614894 SHA512 508b2cfb54402ae8c909da94f25859904f927903ce83a2add10f3dc18cd561c3016a441f43bfaef8f7bd0d948ccc9ed2f20927e5acc080b2bfc33013246d350d
+EBUILD sbcl-2.3.0.ebuild 8667 BLAKE2B 5254f7d4a53c9916cd93410841612a00b8167c480fcecccf943ee8569cea1e14e83c062cf8ba6964d6f6cf3c2c8f8d3e79e258c1e0306539549382a53dd58c19 SHA512 735bffe20d104a3068d8fa4339b998aba370ba61777f0b7515627edb1ce07bf3a711d1511779536ea4ed03fde5459ddc0a36f8e26fd33edcd6f502fb206a03c8
 MISC metadata.xml 1400 BLAKE2B f8ed0f7714ec54e42a3e17162a560d8cfb68ac2d981be02a31e5e64820d8e6cf1dbbc2774b52680d265042a48dfb497497a8d84289cfbe7da7a919ead68eadfc SHA512 22f3ff1dcd58a222319d6e4d46fee3b863ac3dbd997ec9a167e0038e28483d12f0f106332b2cb610cce0749f12828e68d71675ef43aa4dcd54441def6f9cb955
diff --git a/dev-lisp/sbcl/sbcl-2.2.10.ebuild b/dev-lisp/sbcl/sbcl-2.3.0.ebuild
index aa13ed1d98b9..2e5aba48e324 100644
--- a/dev-lisp/sbcl/sbcl-2.2.10.ebuild
+++ b/dev-lisp/sbcl/sbcl-2.3.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -7,7 +7,7 @@ inherit flag-o-matic pax-utils toolchain-funcs
 
 #same order as http://www.sbcl.org/platform-table.html
 BV_X86=1.4.3
-BV_AMD64=2.2.10
+BV_AMD64=2.3.0
 BV_PPC=1.2.7
 BV_PPC64LE=1.5.8
 BV_SPARC=1.0.28
@@ -42,7 +42,8 @@ SLOT="0/${PV}"
 KEYWORDS="-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris"
 IUSE="debug doc source +threads +unicode +zstd"
 
-CDEPEND=">=dev-lisp/asdf-3.3:="
+CDEPEND=">=dev-lisp/asdf-3.3:= \
+	prefix? ( dev-util/patchelf )"
 # bug #843851
 BDEPEND="${CDEPEND}
 		doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )"
@@ -151,6 +152,13 @@ src_configure() {
 	# http://sbcl.cvs.sourceforge.net/sbcl/sbcl/doc/PACKAGING-SBCL.txt?view=markup
 	echo -e ";;; Auto-generated by Gentoo\n\"gentoo-${PR}\"" > branch-version.lisp-expr
 
+	# set interpreter for Prefix
+	if use prefix ; then
+		patchelf --set-interpreter \
+			"${EPREFIX}/$(get_libdir)"/ld-linux-x86-64.so.2 \
+			"${WORKDIR}"/sbcl-binary/src/runtime/sbcl
+	fi
+
 	# applying customizations
 	sbcl_apply_features
 }
diff --git a/dev-python/Faker/Faker-15.3.4.ebuild b/dev-python/Faker/Faker-15.3.4.ebuild
index 82c8c94c9551..da98b1c6fa12 100644
--- a/dev-python/Faker/Faker-15.3.4.ebuild
+++ b/dev-python/Faker/Faker-15.3.4.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/python-dateutil-2.4.2[${PYTHON_USEDEP}]
diff --git a/dev-python/Faker/Manifest b/dev-python/Faker/Manifest
index e7bb46b30635..3ecf38df8483 100644
--- a/dev-python/Faker/Manifest
+++ b/dev-python/Faker/Manifest
@@ -2,7 +2,7 @@ DIST Faker-15.3.4.tar.gz 1599191 BLAKE2B 8fc26d35cbcde467123c8a5e15813351e65cf81
 DIST Faker-16.1.0.tar.gz 1599748 BLAKE2B 62c55659b84e556ad2960b0b3c3e49fc96beca86850469af152c833f5b8680e222ef8bde7dbeacb75ac13535ed9ec0774f5c524d58f10d92c78542ec4714ff1f SHA512 7da4ca3824b64fa1b36d5a3f58206e03f61ca984a672e59e68e8ab642da6bb08d7656dc2422a7107ee46ca2d5a0ec5bc7ed4301c296a07f2dfc39c2cfb6ff693
 DIST Faker-16.3.0.tar.gz 1624029 BLAKE2B c17eafa1ba85d3839545ec57811541edf9006c822ffeb15a19560f0d72e188d5ce09bced5d5bde12ab690867a9e6d35dc472cb7df50437c6da422f5f62ba40cf SHA512 2f4fc0a984ae22a8765831499d895b787fea095e9d4eeb54b3cad1e8ae7b0e583d221fb3aa8d3d4e9c07d25734d08b8cac7a53c7b500dd8dab18eaceacdff562
 DIST Faker-16.4.0.tar.gz 1624299 BLAKE2B 3f3fd6f1ca60c4c481817bcb6f822f2658430995739db4655070e6cd5498879aeb3634defc324adf12648ab056c2066b82f83cac6c81b2fe4157a924fcae1460 SHA512 07aec45c401e8992a71ca3b6402a51f15070b5a6dfb534813a843660f8d419aadb68a5ace9667beb1b317f5a5232ad7d94086e053cd6455d0a8d3df0c6d96a9e
-EBUILD Faker-15.3.4.ebuild 710 BLAKE2B 81f9a4d9ee7ebeead2c7ac42fad8f4f4ef6c6e5b507deffad98208da13cfd0f9a7c72e7efc23c5bf133acffe586cebf573d0e2426b2bfe6a818c8c7755231f57 SHA512 a79e28030042f982bf369c7eaf83ce8137eb8fa1db89a90007705b5583a5e0468ba9a8cbdcdec1e30ef1ce8ba4aff21c8a3bc500aff94a12293ef228d43e99c3
+EBUILD Faker-15.3.4.ebuild 709 BLAKE2B eeacb2884d2329167cebdd6d22bb16b5d754486b1edb9ec04f5bf13838c270f030e2e376a89a4fa7d3dc8ed14297aaf7ca1ba31a084410f08d7c177fab322ae2 SHA512 b0afa936fb5a4eb4e52f2d4170e9570c0bdad497a1d7ac84491cff3215619de8093354b7ea8d7141d7db33d81c5339eac3847ebe52ece5d1ce3b35c134b9db8f
 EBUILD Faker-16.1.0.ebuild 710 BLAKE2B 81f9a4d9ee7ebeead2c7ac42fad8f4f4ef6c6e5b507deffad98208da13cfd0f9a7c72e7efc23c5bf133acffe586cebf573d0e2426b2bfe6a818c8c7755231f57 SHA512 a79e28030042f982bf369c7eaf83ce8137eb8fa1db89a90007705b5583a5e0468ba9a8cbdcdec1e30ef1ce8ba4aff21c8a3bc500aff94a12293ef228d43e99c3
 EBUILD Faker-16.3.0.ebuild 710 BLAKE2B 81f9a4d9ee7ebeead2c7ac42fad8f4f4ef6c6e5b507deffad98208da13cfd0f9a7c72e7efc23c5bf133acffe586cebf573d0e2426b2bfe6a818c8c7755231f57 SHA512 a79e28030042f982bf369c7eaf83ce8137eb8fa1db89a90007705b5583a5e0468ba9a8cbdcdec1e30ef1ce8ba4aff21c8a3bc500aff94a12293ef228d43e99c3
 EBUILD Faker-16.4.0.ebuild 710 BLAKE2B 81f9a4d9ee7ebeead2c7ac42fad8f4f4ef6c6e5b507deffad98208da13cfd0f9a7c72e7efc23c5bf133acffe586cebf573d0e2426b2bfe6a818c8c7755231f57 SHA512 a79e28030042f982bf369c7eaf83ce8137eb8fa1db89a90007705b5583a5e0468ba9a8cbdcdec1e30ef1ce8ba4aff21c8a3bc500aff94a12293ef228d43e99c3
diff --git a/dev-python/Manifest.gz b/dev-python/Manifest.gz
index 393edde3f691..0899a0601d9b 100644
--- a/dev-python/Manifest.gz
+++ b/dev-python/Manifest.gz
diff --git a/dev-python/alembic/Manifest b/dev-python/alembic/Manifest
index 65e6f9998bf5..07f74fa4045a 100644
--- a/dev-python/alembic/Manifest
+++ b/dev-python/alembic/Manifest
@@ -1,7 +1,9 @@
 DIST alembic-1.8.1.tar.gz 1255927 BLAKE2B dbf40f9ca12171d99ad46bec6bf1841799226887a55a815db5c7a69cbcb7d861ede774aa35e1018e1a57bec26a8ddf7ee311e0b4396ebddd5477c67a4ad11876 SHA512 51f210447172d08eb94c41a962ddecc593a665790aa6f5badb771dccc882e0d653dcf153ebb04b9824dabcaeb1ac08e3747c2e3c74d8584a24b35662778de8dd
 DIST alembic-1.9.0.tar.gz 1278832 BLAKE2B 59131c5a53d051905c13e466c58ad5c1759e0e0f557bcb78bbe80e2ca8f3f7d791a1d8be017cd9227d6baf8b7416d0c6d89ec9e9e56f7440f6d1455577ed8676 SHA512 3c040ee07ce2f40af28a63f129dee886f7d8458b762a28cf2165ac10dd2f2f732b73da2ae2c9687b66e8872b75d85d95933847eb6a1190ad55e550e6bb120a04
 DIST alembic-1.9.1.tar.gz 1280020 BLAKE2B 2355b265a7cb42091f51e2d291dd2e620134f9f7ef96c101db7161e1a8667b44ddb61b6d01f46a0db4227b44dcc1821c9bd6923f8510c4235e26f3d482e4298a SHA512 143a62bab08c654c5846ff7ba1021dfb96d3a4b0e699d9c4bd692fda250f47b0ee10cb3238b769e8117b09ac495bdd97a6dbd290b29659b5121754be9a161331
+DIST alembic-1.9.2.tar.gz 1136929 BLAKE2B 26c4ad3185bc274aa4321a0860dc357566625abb51c951f2d0151bfd109f0e0bf7a37075d07ad2f0975127bdd327579f2d9a700f3cc130fbdd1c6458127b2e50 SHA512 d878d48d140be68facdaf0ec25f8582c9e10a369b23e9ee035ae63f8f2ad52d50464c5b8e9c666307edd1a797b6a2c495e56fa890f7dc8f46b3d75a726905ded
 EBUILD alembic-1.8.1.ebuild 962 BLAKE2B b0386dca470618e07459fe2fb4c971a861ca91420813c2f623c198d8fd83a63e883b15f6fbd68552354142bc0daa8a91276e2c40ac6aa52e555409e9ff9f7268 SHA512 3633b780b64db273c1a9f095f7752e3c738fc533f7eb8e041c7119b36140789b6b585d5a511a1ac81912312907ddcd928cff35144479a83f74c369246ca67e3f
 EBUILD alembic-1.9.0.ebuild 964 BLAKE2B b003d5963ec307f9bccda710c06057f553302f0a114facf57b06422e1c306559b0d43a90a136842019e2ba56658898848bf9781cd632b5564f2f4bdf32552f1e SHA512 0a362a623c1fe7a17cb0a4b2c4e2965c302b3b213238d57309644ee05d2bfcce3adb112270760960574f814f37218b9e5a1b52a8d04b4f3a5256d6265b8c12e7
 EBUILD alembic-1.9.1.ebuild 964 BLAKE2B b003d5963ec307f9bccda710c06057f553302f0a114facf57b06422e1c306559b0d43a90a136842019e2ba56658898848bf9781cd632b5564f2f4bdf32552f1e SHA512 0a362a623c1fe7a17cb0a4b2c4e2965c302b3b213238d57309644ee05d2bfcce3adb112270760960574f814f37218b9e5a1b52a8d04b4f3a5256d6265b8c12e7
+EBUILD alembic-1.9.2.ebuild 964 BLAKE2B b003d5963ec307f9bccda710c06057f553302f0a114facf57b06422e1c306559b0d43a90a136842019e2ba56658898848bf9781cd632b5564f2f4bdf32552f1e SHA512 0a362a623c1fe7a17cb0a4b2c4e2965c302b3b213238d57309644ee05d2bfcce3adb112270760960574f814f37218b9e5a1b52a8d04b4f3a5256d6265b8c12e7
 MISC metadata.xml 516 BLAKE2B 08b11ebed2913b00e0a8c0044a50e3ca7bc0e51fcad180725c90445227fed1aed58ed89b4bed58ef5c050c3eee3c19da33aabce5cd1f7835f4b560e67ccc7744 SHA512 b4afb6af57562e6065f03db71da0dbdfc9c4337e54cbaddfa257ee7bad48dbeecfaccd765901bf65279e34cf96be3975f983017858904716a36bf8c18f33db79
diff --git a/dev-python/alembic/alembic-1.9.2.ebuild b/dev-python/alembic/alembic-1.9.2.ebuild
new file mode 100644
index 000000000000..fd33bb44b171
--- /dev/null
+++ b/dev-python/alembic/alembic-1.9.2.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( pypy3 python3_{9..11} )
+
+inherit distutils-r1
+
+DESCRIPTION="Database migrations tool, written by the author of SQLAlchemy"
+HOMEPAGE="
+	https://github.com/sqlalchemy/alembic/
+	https://pypi.org/project/alembic/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+IUSE="doc"
+
+RDEPEND="
+	>=dev-python/sqlalchemy-1.1.0[${PYTHON_USEDEP}]
+	dev-python/mako[${PYTHON_USEDEP}]
+	>=dev-python/python-editor-0.3[${PYTHON_USEDEP}]
+	dev-python/python-dateutil[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/importlib_metadata[${PYTHON_USEDEP}]
+		dev-python/importlib_resources[${PYTHON_USEDEP}]
+	' pypy3 python3_8)
+"
+
+distutils_enable_tests pytest
+
+python_install_all() {
+	use doc && local HTML_DOCS=( docs/. )
+	distutils-r1_python_install_all
+}
diff --git a/dev-python/hypothesis/Manifest b/dev-python/hypothesis/Manifest
index ec5624d82ab0..2516e5ad86c6 100644
--- a/dev-python/hypothesis/Manifest
+++ b/dev-python/hypothesis/Manifest
@@ -2,8 +2,10 @@ DIST hypothesis-6.61.0.gh.tar.gz 9340090 BLAKE2B 0d550e50085ad2e9ae848b86b35eaa2
 DIST hypothesis-6.61.1.gh.tar.gz 9340617 BLAKE2B cdef4559eed21211ecfb3942575b3a9f83e8c2335443d5541e1f52e839a41755d18d5174c1041f12723a26100c6188c618acaa7f504f250132e53ca534c36be1 SHA512 1a0093f18ca3ce4507926c82838cbb205b012faa47f5b4c1b8f574cfe9ebfd10d94d673020212922d162ee1238ee2a09d20b596e9c81ba4a106dfb4e2d6692a0
 DIST hypothesis-6.61.3.gh.tar.gz 9339977 BLAKE2B 2bd7f2828563694f678eacc3537e920d027229d294f1d48ba23780d8a467ffb2829fd961ba4e002786f5d95e4b57c6d0c115d75df8468465f31f3512c7fcbbc7 SHA512 835a079570a983343f4059c7b6ca5a8e8d568ad945a173bf179f6ea4b1ac6cf7d1f7ab7df8092c18aacc455499a9aadd0803ac3b0fb800c4d880a16256ca12f2
 DIST hypothesis-6.62.0.gh.tar.gz 9341805 BLAKE2B 44a7f9a15f93e402405226d40293ea29954b1a85df02c18386aa0eebc72d973005402664df1f0594d30b25e2f4c43ed56c4a79ab0ad6627196ff5661ee6fff0a SHA512 5ccc098ca738f634972c210ba2cbf02f4f4f909ac7f963a0e761fe2868679854d1b51036b09c61f8cabff000b9f14221ead43740a9f17538138f67be9bd04815
+DIST hypothesis-6.62.1.gh.tar.gz 9342261 BLAKE2B 68ffa2294e667e1182ddc96d2b2595723ae38077a63c8f5c8d45ed232536f6749c15912ca9fa61280e9564ac117fc8f94555a564aef5bdfcb8f9bdc38faa8c3e SHA512 1f886de0ae1c4e3371a60e45f00f265542cefa89ce1a109f794ceff3eaa648e2faf566b86b0921e5741b5d8b8d285169387426d8a069410e86642a95380e312e
 EBUILD hypothesis-6.61.0.ebuild 2132 BLAKE2B be04a23a6cc71d17c7585c98d1df3e8bf9a32c84897a5328fba61561c756d8bbcbfdcf778debfa99d3555f430f697720a1bcf083e3422d55116f5649e901ae44 SHA512 61d1b1390b920c328bbafd1b80c7f1c934f5483972bfaba692ed95cd5478bbaa62bc65438665037b6bc10b0050477c02597f2fdc9536963d6769f23cdcd5f721
 EBUILD hypothesis-6.61.1.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.61.3.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 EBUILD hypothesis-6.62.0.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
+EBUILD hypothesis-6.62.1.ebuild 2140 BLAKE2B 2f30425aa0adf1a75d387919c79d317184887d591f26317945b877349a9ae6e3b6305dc4fbb6734954125e704c2709859e3ea558b21326ac715947df8bc989e1 SHA512 84b885785fd94b11d69783af8a4b119bc434adbae1612687841cac5c627954c0e83480d66ec4b5e129350310a807db73f43e914b6412e4ead6808c22c40fd990
 MISC metadata.xml 756 BLAKE2B 26e40ab96ddcbd5751023e3c0cc9aa86e96d73ba02bca750ad15eb4301beb0318d3d694c54c2c2a2cb50937731af727411e8afb67e1a21e58e0ff611eeea9149 SHA512 cd48d35c5fe41aa9efcfea9eb7b2d78a4646658b5aab7533ca6492d4700032099fd34ca2dc45a6198c27351650c9e901c8b7c4d53ade2b56695d5e26ca371238
diff --git a/dev-python/hypothesis/hypothesis-6.62.1.ebuild b/dev-python/hypothesis/hypothesis-6.62.1.ebuild
new file mode 100644
index 000000000000..c793a8a143d2
--- /dev/null
+++ b/dev-python/hypothesis/hypothesis-6.62.1.ebuild
@@ -0,0 +1,77 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+CLI_COMPAT=( python3_{9..10} )
+PYTHON_COMPAT=( "${CLI_COMPAT[@]}" python3_11 pypy3 )
+PYTHON_REQ_USE="threads(+),sqlite"
+
+inherit distutils-r1 multiprocessing optfeature
+
+TAG=hypothesis-python-${PV}
+MY_P=hypothesis-${TAG}
+DESCRIPTION="A library for property based testing"
+HOMEPAGE="
+	https://github.com/HypothesisWorks/hypothesis/
+	https://pypi.org/project/hypothesis/
+"
+SRC_URI="
+	https://github.com/HypothesisWorks/hypothesis/archive/${TAG}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+S="${WORKDIR}/${MY_P}/hypothesis-python"
+
+LICENSE="MPL-2.0"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+IUSE="cli"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	>=dev-python/sortedcontainers-2.1.0[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+	cli? (
+		$(python_gen_cond_dep '
+			dev-python/black[${PYTHON_USEDEP}]
+			dev-python/click[${PYTHON_USEDEP}]
+		' "${CLI_COMPAT[@]}")
+	)
+"
+BDEPEND="
+	test? (
+		dev-python/mock[${PYTHON_USEDEP}]
+		dev-python/pexpect[${PYTHON_USEDEP}]
+		dev-python/pytest-xdist[${PYTHON_USEDEP}]
+		!!<dev-python/requests-toolbelt-0.10.1
+	)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	# subtests are broken by warnings from random plugins
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x PYTEST_PLUGINS=xdist.plugin,pytest_forked,_hypothesis_pytestplugin
+
+	epytest tests/cover tests/pytest tests/quality -n "$(makeopts_jobs)"
+}
+
+python_install() {
+	distutils-r1_python_install
+	if ! use cli || ! has "${EPYTHON}" "${CLI_COMPAT[@]/_/.}"; then
+		rm -r "${ED}/usr/bin" "${D}$(python_get_scriptdir)" || die
+	fi
+}
+
+pkg_postinst() {
+	optfeature "datetime support" dev-python/pytz
+	optfeature "dateutil support" dev-python/python-dateutil
+	optfeature "numpy support" dev-python/numpy
+	optfeature "django support" dev-python/django dev-python/pytz
+	optfeature "pandas support" dev-python/pandas
+	optfeature "pytest support" dev-python/pytest
+}
diff --git a/dev-python/mkdocs-material/Manifest b/dev-python/mkdocs-material/Manifest
index b59411498d75..e730686e65f1 100644
--- a/dev-python/mkdocs-material/Manifest
+++ b/dev-python/mkdocs-material/Manifest
@@ -4,9 +4,11 @@ DIST mkdocs-material-9.0.1.gh.tar.gz 10585027 BLAKE2B 7515e9820466e375098781f1bd
 DIST mkdocs-material-9.0.2.gh.tar.gz 10585323 BLAKE2B 2dec935eddcd3865709f9d571a6e7e13774d88b7960fd1f12e1bfc3b7b70c996ac1b6e7d6da74305a693f0104ebeb5ac4b1d9d84682fcc0195346713b014a663 SHA512 fe789f02e306d7279d2b9e3c2fef0301791bc9f109df12a217a42d4334c891702472a1fa28a98741e670a534963175d926fc76f725cb4f56be4d3f49906ab4d5
 DIST mkdocs-material-9.0.3.gh.tar.gz 10587701 BLAKE2B 35fce28b42346cc2ce208cd3ea5d89437a65b0ebbb8bde2eaae278b5fa7da222a025f34cbf8b3212da206616945ce57ce23d9b2061f216f5b2bcde9e23c96989 SHA512 dd81508dd7784318ba0cebb2254891bcddc6283d5a45c04d956c5dca4e993d57e2059aa9f0dee5667889673515c1af2681fe907b92aebe18f69483023fd0d6d3
 DIST mkdocs-material-9.0.4.gh.tar.gz 10589697 BLAKE2B 4840b4eb98b1fd8ba80fbc2b2ac069abefc833d44dbeeb0d600c4bd4bf8f943dfd1e3fa1dc59fb5c3eab26b80c1912db54ca47ff066226c534b011dfc60d01d5 SHA512 f7d9baa23fa086d4f916ed52c94c80630102b4fadb6cd4885bd940b4783242539fcb406002ec3c44deacadca5a4f829af0febf66c180857ec01a5f7e241cee25
+DIST mkdocs-material-9.0.5.gh.tar.gz 10898510 BLAKE2B d5c6f10db280e6aa9dc1c1d761d831d6b872586c42c7ba0882a9a0a849919fc85da84c7ed46b8d77fd7f17d65cd0ffa967afb008643b76a8b51d36d5bbaa60d3 SHA512 530ce10a457b9f8726dcaad7e602b30338604fef644a885b7aa15f68107921b5a0be714a274771e96f7b9127eb386d926d412be71634283d7f803d56be1977d1
 EBUILD mkdocs-material-8.5.11.ebuild 1263 BLAKE2B 7323fb709d69a744fb72d1ab16e56b22b307b0965970fa36d12074a29f96329c721a8d91c6f9678071eace3ac0b339c46666c7d616f4228d8891924cc1c76847 SHA512 6750c93b730462cd2c2c2a4c8fccd0ec5586e43ec545f78feb8e782c5d910792f62c94644e60e686faebdba89874fd3129a6478f4bdf8a1ade122c6f58db0078
 EBUILD mkdocs-material-9.0.1.ebuild 1265 BLAKE2B 29df4d579f2a79841af5b1a6c762de5175e7b267b183028cf1548ac983a88edd7b4f34557c5ce1ba096db41e8c7c1780313ff02ac1541e03cb1e9aa9e3f49eb1 SHA512 7c5ebc27b3c5ab8cea5a0b573b78e4db6a1fb0b6602b8b67266acf93dc2009ca81039de8e25c1d71ecbbd9dfa3f1c9e1511bef08204b784136613f066c43bbd3
 EBUILD mkdocs-material-9.0.2.ebuild 1266 BLAKE2B 3d6af4b8f44d5bfe41377e09460c627a80b74c3b9fa8a9330d22676d75a7fb3717676026e4e57925b3e39c74e69e3d08447254cbdef6f30ee8f96bfb5a97c9f2 SHA512 4e943b433387b7275e399f573486b473b14c3238ee60fb077d3e9942606b491df513b4dfb50f4dc091149870a3b67f7ae09871b49e36d7f842e0a853a1855cb7
 EBUILD mkdocs-material-9.0.3.ebuild 1266 BLAKE2B 3d6af4b8f44d5bfe41377e09460c627a80b74c3b9fa8a9330d22676d75a7fb3717676026e4e57925b3e39c74e69e3d08447254cbdef6f30ee8f96bfb5a97c9f2 SHA512 4e943b433387b7275e399f573486b473b14c3238ee60fb077d3e9942606b491df513b4dfb50f4dc091149870a3b67f7ae09871b49e36d7f842e0a853a1855cb7
 EBUILD mkdocs-material-9.0.4.ebuild 1273 BLAKE2B 00962df71a81ba3e3d705e3757e7789e782f78dbbd1b9d7f8ca0a365926970106672cfdb98c8e56d96fc9cb9beca599b5ed80685a76b738540f7e7661cc9c206 SHA512 90faf451432bf546477e0d0a25e2c31f47d78a5bf3e76e8b954fa4169f5bd3097448b086222ba5086204dd6177e091b402837f953f7c989f868a733fe07a0e04
+EBUILD mkdocs-material-9.0.5.ebuild 1273 BLAKE2B 00962df71a81ba3e3d705e3757e7789e782f78dbbd1b9d7f8ca0a365926970106672cfdb98c8e56d96fc9cb9beca599b5ed80685a76b738540f7e7661cc9c206 SHA512 90faf451432bf546477e0d0a25e2c31f47d78a5bf3e76e8b954fa4169f5bd3097448b086222ba5086204dd6177e091b402837f953f7c989f868a733fe07a0e04
 MISC metadata.xml 1037 BLAKE2B 6997d0f85e31152c58092081b697d8934c54f933e188082eb55e5e9f252f57274f673e1d8e5b657907da2d1658f969cd67bdb32bdc05324746f211b718f3a4b2 SHA512 ccd4f4aa6e6e780d0aff5894b260eedb602d29cc25427c202561525d27de4a31d1e13f59267d8d732d0e12f3ca0485996bca6ef2a114e96b030259899e8ad47c
diff --git a/dev-python/mkdocs-material/mkdocs-material-9.0.5.ebuild b/dev-python/mkdocs-material/mkdocs-material-9.0.5.ebuild
new file mode 100644
index 000000000000..ae30183c31b4
--- /dev/null
+++ b/dev-python/mkdocs-material/mkdocs-material-9.0.5.ebuild
@@ -0,0 +1,53 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=hatchling
+PYTHON_COMPAT=( python3_{9..11} )
+
+DOCS_BUILDER="mkdocs"
+DOCS_DEPEND="
+	dev-python/mkdocs-material-extensions
+	dev-python/mkdocs-minify-plugin
+	dev-python/mkdocs-redirects
+"
+
+inherit distutils-r1 docs
+
+DESCRIPTION="A Material Design theme for MkDocs"
+HOMEPAGE="
+	https://github.com/squidfunk/mkdocs-material/
+	https://pypi.org/project/mkdocs-material/
+"
+SRC_URI="
+	https://github.com/squidfunk/${PN}/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~riscv ~x86"
+
+RDEPEND="
+	>=dev-python/jinja-3.0.2[${PYTHON_USEDEP}]
+	>=dev-python/markdown-3.2[${PYTHON_USEDEP}]
+	>=dev-python/mkdocs-1.4.2[${PYTHON_USEDEP}]
+	>=dev-python/pygments-2.14[${PYTHON_USEDEP}]
+	>=dev-python/pymdown-extensions-9.9.1[${PYTHON_USEDEP}]
+"
+
+# mkdocs-material-extensions depends on mkdocs-material creating a circular dep
+PDEPEND="
+	>=dev-python/mkdocs-material-extensions-1.1.0[${PYTHON_USEDEP}]
+"
+
+PATCHES=(
+	# simplify pyproject to remove extra deps for metadata
+	"${FILESDIR}/${PN}-8.5.7-simplify-build.patch"
+)
+
+src_prepare() {
+	echo "__version__ = '${PV}'" > gentoo_version.py || die
+	distutils-r1_src_prepare
+}
diff --git a/dev-python/pytest/Manifest b/dev-python/pytest/Manifest
index 935190367183..f7c9f4f77116 100644
--- a/dev-python/pytest/Manifest
+++ b/dev-python/pytest/Manifest
@@ -1,3 +1,5 @@
 DIST pytest-7.2.0.tar.gz 1300608 BLAKE2B 051c1c28aae1b2ff97af0b6e58046d8d3ee9b72909d4c8360f7ca3b9f2ed46f24a6db2d6138d1a629ec650bf7b0a14d89b44d0779340c31b60abb8608defd30b SHA512 a16b034c8522f0aa6ee9541b07b79be713565a6e755ab0489b38c2b0a0ed9f7857c87f952ff24c199a2e4c0d71ee26e918dd06abfe994d30ac90e32ae3e8c4d1
+DIST pytest-7.2.1.tar.gz 1301901 BLAKE2B 3323e4d0dc95708733425aba808a864816d73a1d67f2f3048ab516aff9c2e5ddafab67d8596ad5693254c906e9714508e7faef591c89592fcf071698b3dbdb30 SHA512 3f09ccda91c0f14156cf558abde880279838d1a61c8f7e7138ea9fcd59be0577234da2f30410959641fd5a17490c713c0008ce2ed4b4c57196267fca69714061
 EBUILD pytest-7.2.0.ebuild 3581 BLAKE2B b285f60f7b591696552998855b74aa9266dde79a27a25ea9747635a3b7c7e8dd5ef6bf16a4996c1b375da7635fb93ca1d8d14ebcb3c088be35f2d34d13addc39 SHA512 dc362a95d3062a2d0fb063172dece298896fdc89a08f5bfddab50a11f7ea7273cc4185159c979ba3a6c3ce66e941e2f3c5e6491f4d159a18ae93c92ad07b8455
+EBUILD pytest-7.2.1.ebuild 3589 BLAKE2B 5428a88cee9c9b70dc0d1b87590656078083a49aab9cd38e4bd1ce0a58e2f3d94e71c02cdd892b2041c3e9976a2cf83065fa57d23267a373b5c59aa93c9303ce SHA512 adb69c3a3d81654007ae48b4882886dc60532c7aac6bc4f49d27a81086bd64300d16fec97fede35f36302f0d6bb86bce8b618c5107a7aa4a523f8d34afe3420e
 MISC metadata.xml 391 BLAKE2B 48d31ecb4c8b171ee4e84a58399211368ddc00dfb5dbe0999f96e03d744294cd4fd5263e90600c93d1f13c7da21052faef84b6d0d56709f3559e37b3392ca31d SHA512 6e9caa57eda23995d21df6f52c52d5868e1ff56abb6c1351ffc0fe14b771639473481a2630e659caaff83f0255379aa2d012175af52a0de41221b27d3ab2f425
diff --git a/dev-python/pytest/pytest-7.2.1.ebuild b/dev-python/pytest/pytest-7.2.1.ebuild
new file mode 100644
index 000000000000..11413faf894a
--- /dev/null
+++ b/dev-python/pytest/pytest-7.2.1.ebuild
@@ -0,0 +1,105 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_TESTED=( python3_{9..11} pypy3 )
+PYTHON_COMPAT=( "${PYTHON_TESTED[@]}" )
+
+inherit distutils-r1 multiprocessing
+
+DESCRIPTION="Simple powerful testing with Python"
+HOMEPAGE="
+	https://pytest.org/
+	https://github.com/pytest-dev/pytest/
+	https://pypi.org/project/pytest/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
+IUSE="test"
+RESTRICT="!test? ( test )"
+
+RDEPEND="
+	>=dev-python/attrs-19.2.0[${PYTHON_USEDEP}]
+	dev-python/iniconfig[${PYTHON_USEDEP}]
+	>=dev-python/more-itertools-4.0.0[${PYTHON_USEDEP}]
+	dev-python/packaging[${PYTHON_USEDEP}]
+	>=dev-python/pluggy-0.12[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		>=dev-python/exceptiongroup-1.0.0_rc8[${PYTHON_USEDEP}]
+		>=dev-python/tomli-1.0.0[${PYTHON_USEDEP}]
+	' 3.8 3.9 3.10)
+"
+BDEPEND="
+	>=dev-python/setuptools_scm-6.2.3[${PYTHON_USEDEP}]
+	test? (
+		${RDEPEND}
+		$(python_gen_cond_dep '
+			dev-python/argcomplete[${PYTHON_USEDEP}]
+			>=dev-python/hypothesis-3.56[${PYTHON_USEDEP}]
+			dev-python/mock[${PYTHON_USEDEP}]
+			>=dev-python/pygments-2.7.2[${PYTHON_USEDEP}]
+			dev-python/pytest-xdist[${PYTHON_USEDEP}]
+			dev-python/requests[${PYTHON_USEDEP}]
+			dev-python/xmlschema[${PYTHON_USEDEP}]
+		' "${PYTHON_TESTED[@]}")
+	)
+"
+
+src_test() {
+	# workaround new readline defaults
+	echo "set enable-bracketed-paste off" > "${T}"/inputrc || die
+	local -x INPUTRC="${T}"/inputrc
+	distutils-r1_src_test
+}
+
+python_test() {
+	if ! has "${EPYTHON}" "${PYTHON_TESTED[@]/_/.}"; then
+		einfo "Skipping tests on ${EPYTHON}"
+		return
+	fi
+
+	local -x PYTEST_DISABLE_PLUGIN_AUTOLOAD=1
+	local -x COLUMNS=80
+
+	local EPYTEST_DESELECT=(
+		# broken by epytest args
+		testing/test_warnings.py::test_works_with_filterwarnings
+
+		# tend to be broken by random pytest plugins
+		# (these tests patch PYTEST_DISABLE_PLUGIN_AUTOLOAD out)
+		testing/test_helpconfig.py::test_version_less_verbose
+		testing/test_helpconfig.py::test_version_verbose
+		testing/test_junitxml.py::test_random_report_log_xdist
+		testing/test_junitxml.py::test_runs_twice_xdist
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_normal_count
+		testing/test_terminal.py::TestProgressOutputStyle::test_xdist_verbose
+		testing/test_terminal.py::TestProgressWithTeardown::test_xdist_normal
+		testing/test_terminal.py::TestTerminalFunctional::test_header_trailer_info
+		testing/test_terminal.py::TestTerminalFunctional::test_no_header_trailer_info
+
+		# unstable with xdist
+		testing/test_terminal.py::TestTerminalFunctional::test_verbose_reporting_xdist
+
+		# TODO (XPASS)
+		testing/test_debugging.py::TestDebuggingBreakpoints::test_pdb_not_altered
+		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_simple
+		testing/test_debugging.py::TestPDB::test_pdb_interaction_capturing_twice
+		testing/test_debugging.py::TestPDB::test_pdb_with_injected_do_debug
+		testing/test_debugging.py::test_pdb_suspends_fixture_capturing
+	)
+
+	[[ ${EPYTHON} == pypy3 ]] && EPYTEST_DESELECT+=(
+		# regressions on pypy3.9
+		# https://github.com/pytest-dev/pytest/issues/9787
+		testing/test_skipping.py::test_errors_in_xfail_skip_expressions
+		testing/test_unraisableexception.py
+	)
+
+	epytest -p xdist -n "$(makeopts_jobs)"
+}
diff --git a/dev-python/python-box/Manifest b/dev-python/python-box/Manifest
index 4e21f5da2436..15b28520f8c8 100644
--- a/dev-python/python-box/Manifest
+++ b/dev-python/python-box/Manifest
@@ -1,3 +1,3 @@
 DIST Box-6.1.0.gh.tar.gz 83124 BLAKE2B bf201a120b41c2cc6577c49253eac2737770df4fcc070960953f92b55901b59633461a4a77d0cb3dbc27b7c2c99e6d2b891c3df4b722ca37c3ea0e4a4882aa3f SHA512 54edebdf3b5954cd75519dd50b45f468470df1cbd8ef0de941b49777153064af9a678712365889401cc6562b339ebbfc4a8592dbaa7a749b167ed69ffbc41e4d
-EBUILD python-box-6.1.0.ebuild 767 BLAKE2B 034ad6b5ad76997e509d33fdfa330bb75568a89e3d23319fe09d2a4211e5742b8a6b90189e92798eac096701dbffb7df1df4244d8f4b31e6069e6604bb588043 SHA512 f32634481b37f160443d410aaa5f87739b6d37ef46888a3f7944892cd97a44bc0796c636af3271b5784a6b9d69f7a748f063c123b28ca09e58e14ad0bbaea13d
+EBUILD python-box-6.1.0.ebuild 766 BLAKE2B 0e5f0e9813544f7a48d3f19197211fe8cb89cc2450b2f68faddff247c5f91016e791a695020a2b5508f29590fdca92ae6d2be8e6114676c4cda4d365e156b1eb SHA512 984aa0a9aa8de3ad0e916ed719bfaa89bd93eb860cb6442ac7987ac3da3bf523c77fca28c82a4a7c3c71b9c06aa65e363d80228d69a9c71ac31f7ef5c7e4af4b
 MISC metadata.xml 526 BLAKE2B 9b7e9da39268190a4e2d34a6cbc4a9011e63ff916ddcc87fa0d799c3a48a71e67da0677ff41e3e2fa90e0167d91e4091f8a7d00bdcf804ea88321e9ea5a21d00 SHA512 4aaa21b74825ac744cc440cfcaabf68300f1f6035c64020ac6e4b967daf816a3dd36a770b6eddb925e32e8061227aecf6be61356873b2b4720025119e351e57d
diff --git a/dev-python/python-box/python-box-6.1.0.ebuild b/dev-python/python-box/python-box-6.1.0.ebuild
index cb140b6ae872..9f934dd469ac 100644
--- a/dev-python/python-box/python-box-6.1.0.ebuild
+++ b/dev-python/python-box/python-box-6.1.0.ebuild
@@ -22,7 +22,7 @@ S=${WORKDIR}/${MY_P}
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-python/msgpack[${PYTHON_USEDEP}]
diff --git a/dev-python/pytz/Manifest b/dev-python/pytz/Manifest
index 685729b43b66..25799a6043a9 100644
--- a/dev-python/pytz/Manifest
+++ b/dev-python/pytz/Manifest
@@ -1,5 +1,7 @@
 DIST pytz-2022.6.tar.gz 313766 BLAKE2B db52c5dab06c90f6cacda590682a8011e59a2f1155edb1147a656561b29098bcaa34e2140f260b314b360efa879e822ca76e14e637f5cb5581b43d93c12958b3 SHA512 ea0343453d011e252fba64502984e2a43ea7c7437a211025ca68a4a45178c8aaef4c2b65261434289b21166a99a1941ec9e2d9d26bb3d22a76cbaa421250131d
+DIST pytz-2022.7.1.tar.gz 313522 BLAKE2B f0e787438f56bb33e0681f28392ddcb8dde41e51437caf34de8c9891af468a1b60f845d393d300c408af598aa93463f2a66848a8d20754bd7980d44cac0f4216 SHA512 c70b9ef9c6e6a7dd50fc80a58bf068af33dbcdc83c3f2f44b0726e696927e17d843f2f0438392b6f34738a63aa51c5025e6aa4bcbb9e43400b9d68334ff05c18
 DIST pytz-2022.7.tar.gz 313499 BLAKE2B 357ef0107856e02e6c7cf028661d23a36cf3997dd5399f5a89e850b1b2e5330da08c60e10c8a7126d47d1d7e52e95bd29a8d63cdefaf4fced1332602ce0bd0d0 SHA512 48bad8a88e124c0935bf307713659228100c5c38230b3ee7f0aa92e46a1a305c4cebef388208dc7090ba59f51c4816f78789a091d69541615e885a9ad61c475b
 EBUILD pytz-2022.6.ebuild 826 BLAKE2B 5855e41ee85afdff3a1fedb4d1456266fd53e4f139f0fc0f0a4a9a3d16ccac3c26826889c863bfdc93a449c0677e3cac02df7e75189240695a26cc2ec668e5f8 SHA512 b321e578554ce467eb550f7415021d68678a4422807789143f09e655c3f288731ccdf67abb990913865369b7fb376013d07ef8116aed7dae31f4c9cb411c2153
+EBUILD pytz-2022.7.1.ebuild 834 BLAKE2B 31ba873fadd837c52ddf0ccf02a686dd6b8ba01e7bcc1f7e98996f889b9589a1fc9ca50981a2b158f73950e00ddc63d80735bcff869a894bd9a3729a0686f01f SHA512 0ddcb61f49b05f27566b79fb6e60b78a08d30863ec31f3e2b4b06819df58c5109e59c779d776214899a002ece8dd12ba283b8774e433f4a856296d2053fa9fa7
 EBUILD pytz-2022.7.ebuild 834 BLAKE2B 31ba873fadd837c52ddf0ccf02a686dd6b8ba01e7bcc1f7e98996f889b9589a1fc9ca50981a2b158f73950e00ddc63d80735bcff869a894bd9a3729a0686f01f SHA512 0ddcb61f49b05f27566b79fb6e60b78a08d30863ec31f3e2b4b06819df58c5109e59c779d776214899a002ece8dd12ba283b8774e433f4a856296d2053fa9fa7
 MISC metadata.xml 816 BLAKE2B fbebba08fc9a0eac3a94dff015dea77b57f01559bd703b906d7f922aa88b8aff3a43ca2391210533742d2ac6c16e6bf3e31b1a6bd5dd2ebf47ce7a29edf5040f SHA512 2614764bcffed71e746257b6cce2bb68de1205292001acbcff5bd69e3564ecabce55970967394ee3900e21dcf29d25150fa579bf39bffb189fd3b4e509d7b412
diff --git a/dev-python/pytz/pytz-2022.7.1.ebuild b/dev-python/pytz/pytz-2022.7.1.ebuild
new file mode 100644
index 000000000000..cc252ff26618
--- /dev/null
+++ b/dev-python/pytz/pytz-2022.7.1.ebuild
@@ -0,0 +1,35 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+PYTHON_REQ_USE="threads(+)"
+
+inherit distutils-r1
+
+DESCRIPTION="World timezone definitions for Python"
+HOMEPAGE="
+	https://pythonhosted.org/pytz/
+	https://launchpad.net/pytz/
+	https://pypi.org/project/pytz/
+"
+SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris"
+
+DEPEND="
+	|| (
+		>=sys-libs/timezone-data-2017a
+		sys-libs/glibc[vanilla]
+	)
+"
+RDEPEND="${DEPEND}"
+
+python_test() {
+	"${EPYTHON}" pytz/tests/test_tzinfo.py -v ||
+		die "Tests fail with ${EPYTHON}"
+}
diff --git a/dev-python/rich/Manifest b/dev-python/rich/Manifest
index cfcba7c058cc..a450701be874 100644
--- a/dev-python/rich/Manifest
+++ b/dev-python/rich/Manifest
@@ -1,7 +1,9 @@
 DIST rich-12.6.0.gh.tar.gz 15056457 BLAKE2B 58367ef0acb61d68931ea0394ea458e29b3bb59726c6b95d4b179553183c5cef2766484e0d040203181aad927add70198fb3483bfe6113e20851db141de3a867 SHA512 e05a0ad1d6b4f1e4f7e5e3d09c70d5892a618707ae0952e34274c5ffb18a833fe85a4ac15024cc34915515b63059c02f0df32a6c97cbe91e9ac96928c7134fb0
 DIST rich-13.0.0.gh.tar.gz 15065008 BLAKE2B b2b323b633e6600dd1595c1769daf3659b2d7cf6f98fe91ca9e083c24bc3de9de79b27de08144ab7acaa3634cc588f1548d73536555a06f1b4832f91c978ab9a SHA512 6837aad1015318c0a017000ba60cea0b4b06e85b7fb9650e90ed87ca8dedd3bf3369c5520571661123aee099380445eefa6b30002f0290c2160540a49433bb91
 DIST rich-13.0.1.gh.tar.gz 15065056 BLAKE2B 71d6418b483a88834f7fbce9d9ac8deffbf8940b32ac751503b68994ac1717c8cbede57a37fa33ba025ee6f03196a65797f934252c1658e7ca651cef759d731e SHA512 12458ceae7cc1a8796339547405df23598adbf8ac71dec42b65e0685c8725b0f183b4934c9a91690be3f54af463a91645cb595934749c0ee4ac7d1a4062cfb46
+DIST rich-13.1.0.gh.tar.gz 15065402 BLAKE2B 3d23cbf20536e0d1ed9cfa6257875e49d319364f4c9696643f6fbe6da01dd30b1de639b75631fbe6ab1204e177017031bea23f3e0e07b808070068e39397664f SHA512 6a8f264e16f691f38e4094359bad46cc62d40e5118887311d91732a194100aae27da8f2b29ba21b3cf1ec46c42d3b7d4446f125421e5494725bc5095bcc36104
 EBUILD rich-12.6.0.ebuild 1571 BLAKE2B eb5604a4ab05fc418f620a993696e32e73078cfa120369b32be27d5fc8b1cd39c2273e445166659e7aa3cc34b10176f7e071b147549c876bf9846030130e6c82 SHA512 f91b70f5d2a47a27e33f5ab51452039f67b538651797fbc9b47b99a8aaba8973fd8562695474da953ef077eed381207c36f879d9c54deed793266ae79130a86a
 EBUILD rich-13.0.0.ebuild 1194 BLAKE2B c71d07c817837bb087a36fde65354b27f98d5be028d30270248dfe94b8551832c603816d4b180cf4be6ecf73f424294cc80c5c3e7428fb652532f4ce7d1f3ce0 SHA512 bcb37ef391685e7870bfeb80172008005e770e0aec3a79c52a5557dc22c507cb30ca229bdfa53223ed655958d196e61aaf5d6a7e420e5c4e47b95b1049cc4319
 EBUILD rich-13.0.1.ebuild 1340 BLAKE2B ec2227be0abf99942fc9ed2e049f75534ebf9c0f2d8b14d843e4cfccb0b5ce1cd1f6519c097da47beeaabe9201c10077c4833a81cc6a3492d7727b1231755209 SHA512 edfb7399239593a5fc9783e9d3cfcdd2ea2940df74754eacaf819ef45e65e51df00fca1c071b975e26f8512c96e9cc1564e50ad5959f00ef1bf77e98d0203692
+EBUILD rich-13.1.0.ebuild 1340 BLAKE2B ec2227be0abf99942fc9ed2e049f75534ebf9c0f2d8b14d843e4cfccb0b5ce1cd1f6519c097da47beeaabe9201c10077c4833a81cc6a3492d7727b1231755209 SHA512 edfb7399239593a5fc9783e9d3cfcdd2ea2940df74754eacaf819ef45e65e51df00fca1c071b975e26f8512c96e9cc1564e50ad5959f00ef1bf77e98d0203692
 MISC metadata.xml 387 BLAKE2B 049491e034ba233f33c76dc5e3f1b887ba5d2da9d65b09bda51a7cf4eb30a9c66f3ddf714f52407a73e51da78523084064bccd4fc687e0bc0fc2b32dbb4c513b SHA512 448ce879331748e3166f670981a27ee5c3ef20b51af442ccc684cb6514c0d6a0d4e433a8bc1ddb3bdf68c734bac013c1ba04d38adf90644b062231ab1c1d2c0b
diff --git a/dev-python/rich/rich-13.1.0.ebuild b/dev-python/rich/rich-13.1.0.ebuild
new file mode 100644
index 000000000000..294866c9fd24
--- /dev/null
+++ b/dev-python/rich/rich-13.1.0.ebuild
@@ -0,0 +1,51 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=poetry
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1 optfeature
+
+DESCRIPTION="Python library for rendering rich text, tables, etc. to the terminal"
+HOMEPAGE="
+	https://github.com/Textualize/rich/
+	https://pypi.org/project/rich/
+"
+SRC_URI="
+	https://github.com/Textualize/rich/archive/v${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+LICENSE="MIT"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86"
+
+RDEPEND="
+	dev-python/colorama[${PYTHON_USEDEP}]
+	dev-python/commonmark[${PYTHON_USEDEP}]
+	dev-python/pygments[${PYTHON_USEDEP}]
+	$(python_gen_cond_dep '
+		dev-python/typing-extensions[${PYTHON_USEDEP}]
+	' 3.8)
+"
+
+distutils_enable_tests pytest
+
+python_test() {
+	local -x COLUMNS=80
+	local EPYTEST_DESELECT=(
+		# TODO
+		tests/test_console.py::test_size_can_fall_back_to_std_descriptors
+		tests/test_inspect.py::test_inspect_integer_with_methods_python38_and_python39
+		# pygments?
+		tests/test_syntax.py::test_python_render_simple_indent_guides
+		tests/test_syntax.py::test_python_render_line_range_indent_guides
+	)
+	epytest -p no:pytest-qt
+}
+
+pkg_postinst() {
+	optfeature "integration with HTML widgets for Jupyter" dev-python/ipywidgets
+}
diff --git a/dev-python/sabyenc/Manifest b/dev-python/sabyenc/Manifest
index 04cc17dfce15..30bc7142b8b4 100644
--- a/dev-python/sabyenc/Manifest
+++ b/dev-python/sabyenc/Manifest
@@ -1,7 +1,3 @@
-DIST sabyenc-5.4.2.gh.tar.gz 19774424 BLAKE2B fbb954435236eb1794611a8e5852534b0f7dbd79806e8a9ca1bb57274df7cc89a6a26aa92c89c596e0c2857d4bfbd4e4c34f1d529cb5d2464a669d6d15a3f392 SHA512 a07a57e6b3416e147fcef4f27e52fea4b3a522ebb722b4d223469b63e9d08f42689950d86c544a41bfe81bba934514a43094c13b98aa585167cae69a5aa1f405
-DIST sabyenc-5.4.3.gh.tar.gz 19774440 BLAKE2B 43d91d28b81ba1a18b27fa5da9419e0b06b726c1bcd51188a251afcd748f206cb7ae000bae466e94e87f76ea96eac72c783483b243ce79723841e34e6352f6f6 SHA512 ff18d527facdaf240f4b91866bdbeb31113645adce0d1cd4659218de27266d9ba3cfbec41ca21190aaaed406a3cd5e88467dcd3824796e16fa43e4abe197f69b
 DIST sabyenc-5.4.4.gh.tar.gz 19774441 BLAKE2B 945614697b59f984df1f159b64e177ee75d9b5c00cb59af21dddb92bf17f8647467b919be963a1beabfe64c4206aa6f3438b780a21e766722fad99afa38ea340 SHA512 a35a5f29b1f5586299fdfd87d4323fa8ab56f06a2f6ef3b0b95aa033a481beee886bf1834ed73e1ba65b74c5e86efc5f0307394f32803ef52a391ca4b0caedf9
-EBUILD sabyenc-5.4.2.ebuild 592 BLAKE2B c35c47f02ffe399c4151e916bc8a2ad09eec8643b90b0d676c78724eb8250536e68e6b0978c294922e7591a1ac25d9675dc9c0382fa51e7ba54965ce06badb05 SHA512 4f792fa1fc8bd6b9e052931b43414cc0db6d5f9eb83ab669ae5c0477ad9912265a79f7c40996657caf7f2743c520ec2fec73a5753a572475df151319331d440f
-EBUILD sabyenc-5.4.3.ebuild 592 BLAKE2B c35c47f02ffe399c4151e916bc8a2ad09eec8643b90b0d676c78724eb8250536e68e6b0978c294922e7591a1ac25d9675dc9c0382fa51e7ba54965ce06badb05 SHA512 4f792fa1fc8bd6b9e052931b43414cc0db6d5f9eb83ab669ae5c0477ad9912265a79f7c40996657caf7f2743c520ec2fec73a5753a572475df151319331d440f
 EBUILD sabyenc-5.4.4.ebuild 592 BLAKE2B c35c47f02ffe399c4151e916bc8a2ad09eec8643b90b0d676c78724eb8250536e68e6b0978c294922e7591a1ac25d9675dc9c0382fa51e7ba54965ce06badb05 SHA512 4f792fa1fc8bd6b9e052931b43414cc0db6d5f9eb83ab669ae5c0477ad9912265a79f7c40996657caf7f2743c520ec2fec73a5753a572475df151319331d440f
 MISC metadata.xml 524 BLAKE2B 6f50798327ad05e0f5301b0db45e23289ed7bcae8dfe923c2f7d8b025302397eec0c67cf051034a653017bedf3fc87fa369e32543b07b4dde33012d427eb5c9e SHA512 31c6225a2d530b33b0eb58292e27982e0bfeb4246b0ceda8e0b89c04e6a1b754c5afd3c383e36819d037520fe572c82503d6554ce68e1f74f7cc4171cdf0ce15
diff --git a/dev-python/sabyenc/sabyenc-5.4.2.ebuild b/dev-python/sabyenc/sabyenc-5.4.2.ebuild
deleted file mode 100644
index e78ae25c124c..000000000000
--- a/dev-python/sabyenc/sabyenc-5.4.2.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="Module providing raw yEnc encoding/decoding for SABnzbd"
-HOMEPAGE="https://github.com/sabnzbd/sabyenc"
-SRC_URI="
-	https://github.com/sabnzbd/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/chardet[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.md doc/yenc-draft.1.3.txt )
-
-distutils_enable_tests pytest
diff --git a/dev-python/sabyenc/sabyenc-5.4.3.ebuild b/dev-python/sabyenc/sabyenc-5.4.3.ebuild
deleted file mode 100644
index e78ae25c124c..000000000000
--- a/dev-python/sabyenc/sabyenc-5.4.3.ebuild
+++ /dev/null
@@ -1,29 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="Module providing raw yEnc encoding/decoding for SABnzbd"
-HOMEPAGE="https://github.com/sabnzbd/sabyenc"
-SRC_URI="
-	https://github.com/sabnzbd/${PN}/archive/v${PV}.tar.gz
-		-> ${P}.gh.tar.gz
-"
-
-LICENSE="LGPL-3"
-SLOT="0"
-KEYWORDS="amd64 ~x86"
-
-BDEPEND="
-	test? (
-		dev-python/chardet[${PYTHON_USEDEP}]
-	)
-"
-
-DOCS=( README.md doc/yenc-draft.1.3.txt )
-
-distutils_enable_tests pytest
diff --git a/dev-python/tavalidate/Manifest b/dev-python/tavalidate/Manifest
index c5df894f2815..2e07d9757372 100644
--- a/dev-python/tavalidate/Manifest
+++ b/dev-python/tavalidate/Manifest
@@ -1,3 +1,3 @@
 DIST tavalidate-0.0.6.tar.gz 4561 BLAKE2B 85e923888cf419e7c58f864e1f651d822ee1d52711f12730831d95fe71efc3a7549963983239ef3f7d2babd5c8a624f2b6a55361732e6ef6401c0df654096bb1 SHA512 7651ba2e28d5ff74ce506e1184c20b149c018ba75c5e02631da5b0efa8c48800a3315d74f48d7ba4b5368cf4be445f589099f0d788005c61161a31047c464103
-EBUILD tavalidate-0.0.6.ebuild 428 BLAKE2B 21473a645b5bda4fea85d77e7d0edf5646e43a15f69aba6d9633d5ce209cfdfaefc7c2d3eab6212ad48f475f085ddce1b7e68f61bc5ceb89e6e829548bd400a5 SHA512 c2b6fe8059f0229353ba4903c3f14b982c71e0e420396aa68bb87f8bb4603cf4b0730619a025ea05a6c24cb0ebc403ddc74b13fb2e3a8b55aea35d0bf0007339
+EBUILD tavalidate-0.0.6-r1.ebuild 567 BLAKE2B d530af4fa783c977380edf9692d6cd16fd390db55d6d139ca8a161ea1e3e12c8801e17f29257c7794f9434e44e78d0425995f3af83b343ace9bd3e61e3292aad SHA512 0aab3e7f118f8a3e2b98cde38f88e31ec2cdbf7d3e817a1117193a316ea3a33e601dcb96c0d3b767e4e6f69282c409921781cacf5698893aa27c662c277030e7
 MISC metadata.xml 532 BLAKE2B 4b4c3f3ad08e93d9a11001397b9833639493c4fcd22e89ec9f54877e934142f1b244317c24000da0cd74d7f51c7d9245b349eac63242a25ad3e1f3283e6bd6ac SHA512 e84a5ec718c7d9b0e15161b0a65e1f38feada8be31b017fa1a8719b6a4e077cfb4b075d573fc77f9eae9a58a895b5845c73a1fd4af83f03beac28ecdb990a322
diff --git a/dev-python/tavalidate/tavalidate-0.0.6.ebuild b/dev-python/tavalidate/tavalidate-0.0.6-r1.ebuild
index 3d3ffcfc46d2..c8fb584de742 100644
--- a/dev-python/tavalidate/tavalidate-0.0.6.ebuild
+++ b/dev-python/tavalidate/tavalidate-0.0.6-r1.ebuild
@@ -5,14 +5,23 @@ EAPI=8
 
 DISTUTILS_USE_PEP517=setuptools
 PYTHON_COMPAT=( python3_{9..11} )
+
 inherit distutils-r1
 
 DESCRIPTION="Utities to validate Tavern responses"
-HOMEPAGE="https://github.com/sohoffice/tavalidate"
+HOMEPAGE="
+	https://github.com/sohoffice/tavalidate/
+	https://pypi.org/project/tavalidate/
+"
 SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
+
+RDEPEND="
+	>=dev-python/lxml-4.0.0[${PYTHON_USEDEP}]
+	dev-python/python-box[${PYTHON_USEDEP}]
+"
 
 distutils_enable_tests pytest
diff --git a/dev-python/tavern/Manifest b/dev-python/tavern/Manifest
index a992ea6f2614..325d9c085bfe 100644
--- a/dev-python/tavern/Manifest
+++ b/dev-python/tavern/Manifest
@@ -1,7 +1,5 @@
-DIST tavern-1.24.0.gh.tar.gz 163796 BLAKE2B d1683bf9f62f77551155259d5627de8c5b9b7da4ec2024ac273f3ce912a004f48365ed46feadf437e7c8be38d5d17be146facc06dfc95b38ba10c24df0d28c55 SHA512 d0e57dcf792540028a790ec11fd1c4887f638af24ab8a716f855d5396410e780fa36dcdb175b86d26e86839478c57df32630cf9095e268ed8166069d49a6f706
 DIST tavern-1.24.1.gh.tar.gz 163938 BLAKE2B 661160fe203e5117452e23178a74279a982cb3e4b4cdb84df074d5cd8481796cb9a05b2c5d42b225c6a2d2cf34283166d59a3242ff5df76a457d89c6acf60576 SHA512 9a9f7e46172a62a0dbf0c42aa0521d0fbde644f05a650dd768a32b3c8652bb17209b8073519830e52b2865bbe646825e650cce251184b85f0a5343cfd2ceb1c3
 DIST tavern-2.0.0.gh.tar.gz 207901 BLAKE2B 8b5c68a16361afcf3ff5936e0d7e3d706da5052422e2c7a6aef97c8dcdfc370c8d0236bf40c9b03e12120f06279d4af39d321964214ddc0e2db7bf4e91c389b3 SHA512 aed751dccc26317c35d96b29e0b3ed6bc5d4f4bd70261c296dfd5573a83cb9b10e022a247eb9df72a2879f2d324098233b6fbae8847472052eb1536f457f7592
-EBUILD tavern-1.24.0.ebuild 961 BLAKE2B f832fca46a9a8fb6347ac73f23a27c04827ff20acaf4ea006f363bb02518816333dd1304ee3ef1ebecda35231118dbdf64cf6dd79c2ab0833d53895a5cccd11e SHA512 e888368c593dd6115da6890ea2ddd05d9a1facf31a21fa42eabef30daba8ec24c420b62ceac59448eee9c678b5ecb6fa5d61d8e7b181873c9261d58b836f16ca
-EBUILD tavern-1.24.1.ebuild 995 BLAKE2B 6f53c19bcc3c17674945389f9566c87cef4458cc05cdccba67d73aa3d4030712569d925e19dc70be866d8e50e5ca5be87eddf3c72101b73519518500044aea2a SHA512 2811bdeec8aa856f9f860413cdd3968936294d5473a4b6ff82b1f06e311eafc31f1084c7af1a232f2b5de121208cdf4a80b9f77e75878e0e231ad18659be8d70
+EBUILD tavern-1.24.1.ebuild 994 BLAKE2B c785d88049b539d1e0553c9d536c100f638f25d03cd0fc63695fa9e872a1d994a574b16267678e4452a6621b22783bc6e5ce974afc59d8b01fcf2bf866d41631 SHA512 bbd79a9810c12965eea3fb7d38182d6e217555655f299ffc600a692553e220aca1a48400bb2bbab49c63ac91e3847216f29a88d833093f2902395ad60cfd2108
 EBUILD tavern-2.0.0-r1.ebuild 1243 BLAKE2B a22e5436d2a698b885494ee937e34ead2e2af67f81ec1ff197b5eb5c24b00cfc7b41c253c5788ce4ef8f5fddbbe19c1f1b18261383c74655fce8695e11f5904e SHA512 81c39dd44ad5358a8250f3a2f1dd8cbd81f981cab9264bbec5c011763d82c4c741ccd96578ae4eabed4b3de6925187cfc6b357bd5c6c1fb37ead5ef5afba38df
 MISC metadata.xml 722 BLAKE2B 0ed7dd19f49aae7940de52b0df249979458b3950422e1089886929499d7a92d16a3a6e101b52313569900af6aec4e26388ae6d0673d5b1acef1e1615ed87d34a SHA512 3c30524ee5129700db664b5dab8635463ee17d4a45295583d79755c1f5b1dbba9ac611fcec3e9584028bfe96cf913f4f4b9d8da67a0e8ff6cde1ebedbf57c15a
diff --git a/dev-python/tavern/tavern-1.24.0.ebuild b/dev-python/tavern/tavern-1.24.0.ebuild
deleted file mode 100644
index 54a19eecc848..000000000000
--- a/dev-python/tavern/tavern-1.24.0.ebuild
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-DISTUTILS_USE_PEP517=setuptools
-PYTHON_COMPAT=( python3_{9..11} )
-inherit distutils-r1
-
-DESCRIPTION="A tool, library, and Pytest plugin for testing RESTful APIs"
-HOMEPAGE="https://github.com/taverntesting/tavern"
-SRC_URI="https://github.com/taverntesting/tavern/archive/refs/tags/${PV}.tar.gz -> ${P}.gh.tar.gz"
-
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64"
-
-RDEPEND="
-	dev-python/jmespath[${PYTHON_USEDEP}]
-	dev-python/paho-mqtt[${PYTHON_USEDEP}]
-	dev-python/pyjwt[${PYTHON_USEDEP}]
-	dev-python/pykwalify[${PYTHON_USEDEP}]
-	dev-python/pytest[${PYTHON_USEDEP}]
-	dev-python/python-box[${PYTHON_USEDEP}]
-	dev-python/pyyaml[${PYTHON_USEDEP}]
-	dev-python/requests[${PYTHON_USEDEP}]
-	dev-python/stevedore[${PYTHON_USEDEP}]
-"
-BDEPEND="
-	test? (
-		dev-python/colorlog[${PYTHON_USEDEP}]
-		dev-python/Faker[${PYTHON_USEDEP}]
-	)
-"
-
-distutils_enable_tests pytest
diff --git a/dev-python/tavern/tavern-1.24.1.ebuild b/dev-python/tavern/tavern-1.24.1.ebuild
index 0e9d1372e5cb..3bb6cf68a411 100644
--- a/dev-python/tavern/tavern-1.24.1.ebuild
+++ b/dev-python/tavern/tavern-1.24.1.ebuild
@@ -20,7 +20,7 @@ SRC_URI="
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RDEPEND="
 	dev-python/jmespath[${PYTHON_USEDEP}]
diff --git a/dev-python/validators/Manifest b/dev-python/validators/Manifest
index 75223b10c15c..2f8cd55c76dd 100644
--- a/dev-python/validators/Manifest
+++ b/dev-python/validators/Manifest
@@ -1,3 +1,3 @@
 DIST validators-0.20.0.tar.gz 30665 BLAKE2B 7534c4970ab288cc02794176e0b3368ed2d4035d602d36ecadad84fb4a41407210b22a8ed1230650f4f247ba1552634aa500fea5c2f03f5e13d6e1120e62b15b SHA512 2f3d9caac9246b346e10604758168092ac483fe6e4a0c9470900e49719fbbebfd18e03aca525f8cca33cec224589aee28de3ea9bf5cd4941a49715d4216dba20
-EBUILD validators-0.20.0.ebuild 533 BLAKE2B 887ca8e76097ee66b59ce7a61df9978a3298d17b0bf85803eefa0910d707fac523727f25f564e5c553d698f91081fc53358a63cc873c3fea5f1ef0c28deef4f6 SHA512 53bbbf1ec1b126185723d0bc670a50739f8739a13325f3c0f6f9008e7998b3c39f44b769d00dd90caa8e71a862e41fa823a7665ee58da55307a6685e652b4ef0
+EBUILD validators-0.20.0.ebuild 532 BLAKE2B 1d430662563d45caaf5e3c7c2961196e77478f5b6ab92cd094960a3ceebf6f481a7fcf2e65132d548d7f820a614aa20eb807a819aef3a6c2d889033d468eeed5 SHA512 e2531f7e0955b50109edf93ee57c95c1b8c5301cae683c874b09a40cb226fa989c11a3a80646ace691ac22d9e99ffec5cc5b1fc2c74e4313a1ca7cac167a5eea
 MISC metadata.xml 486 BLAKE2B 2b994e57709609f59cffcbfe21c7fdb62788a6188dfddb6e2b2f034f07c312303ba9f3bd19cbfd66b46f2df913da3ee1397f444ccdc40f0b448294c07de1737b SHA512 bca153c237710afd5b407f7aa14c7f6983075fa016beae8ad0494a0ec860f85c6db1f28b24e6edbbf5785b8210dce0edf492cb0521c734b6eedad71b46d8e0ca
diff --git a/dev-python/validators/validators-0.20.0.ebuild b/dev-python/validators/validators-0.20.0.ebuild
index d97827dc4d8d..70139d239ff8 100644
--- a/dev-python/validators/validators-0.20.0.ebuild
+++ b/dev-python/validators/validators-0.20.0.ebuild
@@ -17,7 +17,7 @@ SRC_URI="mirror://pypi/${PN:0:1}/${PN}/${P}.tar.gz"
 
 LICENSE="MIT"
 SLOT="0"
-KEYWORDS="~amd64 ~x86"
+KEYWORDS="amd64 ~x86"
 
 RDEPEND="
 	>=dev-python/decorator-3.4.0[${PYTHON_USEDEP}]
diff --git a/dev-python/wcwidth/Manifest b/dev-python/wcwidth/Manifest
index b0fc78fe432b..f593d217c464 100644
--- a/dev-python/wcwidth/Manifest
+++ b/dev-python/wcwidth/Manifest
@@ -1,3 +1,5 @@
 DIST wcwidth-0.2.5.gh.tar.gz 47514 BLAKE2B 0ac5fb08283c23039453408da2edac36e2079fde8fc903002785e2e0f8bed55d1d6a291181097f73e4ec8152b6eaa4f4553b0b39fe1cadc7a99bacb2d7e55d2c SHA512 3f1f1fefd3ee9f06ea2051842e8c3bb09a92501f031124b8514bec444eaa8594ab9649534b4264340d475716d5a6571dbe5ae932f685160defd75c19295e60f9
+DIST wcwidth-0.2.6.gh.tar.gz 51990 BLAKE2B 8561e06aaf92f48246bacfb4012358067d81d4d9eeb33a0406eb012b5c22841ac66ff5760df2d5ea6a5d48a1880b4b9cbbcddf7a5eba5f663f6a559005f657ad SHA512 1f97cb6ef6a804da1d062b8dafb146a3e21261e63a644bad88bed74101be1371c753c2645db5ad25868fe9641fce9b13bd5dc920496b00e1d73d406f69631ac9
 EBUILD wcwidth-0.2.5-r1.ebuild 995 BLAKE2B 8ce789e26ba19903b520089f13de52920b255d2b77202bf0d9b2be6f11e92e6e6c850f991f6b2c1edccad4e66c4f3d462ed608d8b3fc30ed33439e484cf887d1 SHA512 9eb62216d2359d3587a3ccc579e29d1f157397bfc76ab80ca394b80470c24cd9b549719b02d568e064e363feaddfef95865939345d5c130e4767fd8d79ed4f92
+EBUILD wcwidth-0.2.6.ebuild 890 BLAKE2B 299d7e9a1f1bd8f80dfdc356afbc736875341d2bdca66f781b2aaedb259698c3b4142b46c332c1f3a032de55a3fc68f67e3f863329e65725650bbcb135db5785 SHA512 5418fdb39e63d8c166e763d70f07fa1a03d78447be9ce006e671bb9a92349ca31f498ddb200f8e005097ee25f64c197d32c37acdcfd6b4f9cf236f9165485298
 MISC metadata.xml 402 BLAKE2B 86714d496f80fe46cb313bed026135b2712ddfb47fea5994d0021516aa6ad28eb5fc52d37b37a7a224ec0613681b27ee039f4ac734430d94aafe4ec8946cecc7 SHA512 85c0e684f66a5582ca63d6f72c4e69101e8ec30f8e03c52e972fa36a2e6b6d2a8f019fb33a1e39e73fb37de25c82b906b18ac626afdd0a93d97db2ddcf485063
diff --git a/dev-python/wcwidth/wcwidth-0.2.6.ebuild b/dev-python/wcwidth/wcwidth-0.2.6.ebuild
new file mode 100644
index 000000000000..a442e366ff6d
--- /dev/null
+++ b/dev-python/wcwidth/wcwidth-0.2.6.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DISTUTILS_USE_PEP517=setuptools
+PYTHON_COMPAT=( python3_{9..11} pypy3 )
+
+inherit distutils-r1
+
+DESCRIPTION="Measures number of Terminal column cells of wide-character codes"
+HOMEPAGE="
+	https://pypi.org/project/wcwidth/
+	https://github.com/jquast/wcwidth/
+"
+SRC_URI="
+	https://github.com/jquast/wcwidth/archive/${PV}.tar.gz
+		-> ${P}.gh.tar.gz
+"
+
+SLOT="0"
+LICENSE="MIT"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux"
+
+distutils_enable_tests pytest
+
+src_prepare() {
+	sed -e 's:--cov-append::' \
+		-e 's:--cov-report=html::' \
+		-e 's:--cov=wcwidth::' \
+		-i tox.ini || die
+	distutils-r1_src_prepare
+}
+
+python_install_all() {
+	docinto docs
+	dodoc docs/intro.rst
+	distutils-r1_python_install_all
+}
diff --git a/dev-ruby/Manifest.gz b/dev-ruby/Manifest.gz
index 2c357451344f..815195c8d34f 100644
--- a/dev-ruby/Manifest.gz
+++ b/dev-ruby/Manifest.gz
diff --git a/dev-ruby/asciimath/Manifest b/dev-ruby/asciimath/Manifest
index 62abb52a08e2..2edc66f333a6 100644
--- a/dev-ruby/asciimath/Manifest
+++ b/dev-ruby/asciimath/Manifest
@@ -1,7 +1,7 @@
 DIST asciimath-1.0.9.gem 18944 BLAKE2B 3ccc3f594d7a0d8b6996349d85356179ef3a9052a84f923ad1d0976e42f58670a350473b41d1c4a0c4f70a3cc4687e6adaa7987bd811ef32bd3da41f100f4246 SHA512 32c4f2cb7e9d330c371e9b9abcdf9e31bf44014c5c0b0044589302116b55840a2e1a41ab006d61a2258e4a5c2d4a772dad77f579150fc9bf099a7a4d19c6cd44
 DIST asciimath-2.0.3.gem 59392 BLAKE2B 7d1d373c5d80172e88ba5737ea2244c384f274c200fed2104b23e76b6615f5bc987e14acb5c8d9088069f590eed5c645a2f51338540197a2ef9c44696f704488 SHA512 748c8ff121190470299c1e04100e063fd7352a0adaeda160a235d1f0f0ccb02108274ffe8ab4f1f54b07eb750d637e26f2efb6aac12d3389dafe1c00be103f4c
 DIST asciimath-2.0.4.gem 60416 BLAKE2B 9a5d6bf967962d37e620d0b49204ba8dafadf65e95a613924c7c169fee98f00203861fbbb1c06db1ee833e401f9a2141566dc693237e1cb7e797e639c63dccfa SHA512 28ab7fd7f43320112c0e7166fb2a6ef269eb91314940deb88606443bec055792cf3c49bc2d9b75c1e5ee5690c3071e66f15f817c4539fc6246da7a8d792f1803
-EBUILD asciimath-1.0.9.ebuild 463 BLAKE2B b9f363552ecf9a6c429280a4e17de7fb05d19efdf2e8a0e52da36e5112fca5706d9c0fdd575f3865d20f3f849e773059a10e8e8c1219eb7976a5fb613fd8ea93 SHA512 e8d19d6e49b727c75f5df69f68855ac85eb981dc33c353b881137755c16b02d848f5e8d43949aecbf3f70a649a602383e21d1a63c5732b171165fb7f5fc4689f
+EBUILD asciimath-1.0.9.ebuild 449 BLAKE2B 48ac5e3d9b3d9b81b5adbf9a639d9641ef34bdffcd6938470a2f6f9b4e4d66c36e6ea7db28d611499e6103b621a779d59575ba1e431048b50a380e7cacf259f0 SHA512 57438599e82c51c2150f24022e4d90b00450a2c9649fa92f23f919ecbadcd2e69cf7c8637246b6b7891ab33bec7809d53286b437ba9d9d74111f8bc4c94d5813
 EBUILD asciimath-2.0.3.ebuild 517 BLAKE2B 3c21de7e43e386a56d7f5932cfa67f3950a7f006dbf29854eddf35b708bef8dd4929de100d843519195a175616bec3de82cabf734f0ff9684dd9c2f957ca08ff SHA512 ba5d0a80f7084ca356ca0cf6689e320ceaca995a63b31c52512de1b5a5cc9acdfeac232c86f4947ac8bec918e58c8f03883618197cc855296a0f53ba78908870
 EBUILD asciimath-2.0.4.ebuild 517 BLAKE2B 2f2c26448a849f3d612c8aeab73736136562f26d261c76f5576fd5f1424d82b2c4365ef33fc3410c48a3173c575a23f48b1fede3117f4aab69d92e4169108d1d SHA512 55e91afccb128eaf9fc5efc15aef5848b4598671725175801d8f2156054db09cddde4b64f121297a1dde25c62b1195c880be8b125997a0970a81cda15d74ac46
 MISC metadata.xml 345 BLAKE2B ef3c44119073cf7d78c3d16ffbe42f3e1e9868efe1c0c5cba6e2fc83f57b3347db85e8357d8011eeea76fe9c90dfe5870dfea389183567a1c5728c047b168ae7 SHA512 8e1dfce281e0a933b8813407546a8d49ef4d529a5090f59d04ae289f4980d9e4ea8c2e3be4088c6b8a3219af88342e820e2a1bbac5fbd5552089ce71e3c5d766
diff --git a/dev-ruby/asciimath/asciimath-1.0.9.ebuild b/dev-ruby/asciimath/asciimath-1.0.9.ebuild
index c637713081cc..967de8477616 100644
--- a/dev-ruby/asciimath/asciimath-1.0.9.ebuild
+++ b/dev-ruby/asciimath/asciimath-1.0.9.ebuild
@@ -1,8 +1,8 @@
-# Copyright 1999-2020 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
-USE_RUBY="ruby24 ruby25 ruby26 ruby27"
+USE_RUBY="ruby27 ruby30"
 
 RUBY_FAKEGEM_RECIPE_TEST="rspec3"
 
diff --git a/dev-tcltk/Manifest.gz b/dev-tcltk/Manifest.gz
index bb8eb630cbd9..07cd4eea885b 100644
--- a/dev-tcltk/Manifest.gz
+++ b/dev-tcltk/Manifest.gz
diff --git a/dev-tcltk/blt/Manifest b/dev-tcltk/blt/Manifest
index ae7de908e028..37be9bf4c1fe 100644
--- a/dev-tcltk/blt/Manifest
+++ b/dev-tcltk/blt/Manifest
@@ -4,5 +4,5 @@ AUX blt-2.5.3-gentoo.patch 1280 BLAKE2B 8c2107115f34b1acb384c490e893d0ef357149c1
 AUX blt-2.5.3-lto.patch 877 BLAKE2B a61977113475d98fb2315ac0ab5aeae3ceb270552b19da20a333bfd2124a8ab49053f873c799c31a02752b15c7be9a7625cda270196335be33bd2bf6d0f15d65 SHA512 9b7f7fceafb226cfa6e8d758a5b01a7e52cb49c2c2ff730a82a9458a6c846a0825c500e960c96d62e4dde67ea1054b740a09d374ba3df3a293dd4fcad31870fd
 DIST blt-2.5.3-debian-patches.tar.gz 52252 BLAKE2B 700a2df32117ea84f9e211e18bda0d64163d24b633b0c5735808da6f3c5f32b73a69e9f1af548cca7eea4538c2aae57a87d82b2f61673e49709ac30dc036e38a SHA512 3da7831c3c8a7847e004cfb81e911883eb29f565e63f3b7ed47719ccba0a0cb593c0dbb77ff22262d5f8c4a3cb94cc074fd9c02f37729fe7763533be6677a852
 DIST blt-src-2.5.3.zip 2724036 BLAKE2B c669bc033e691d1717b6b6dccf42901fed26f58bb4d2e9fffdd4e7f83eae788e1cbdb8fd1bcdc860845a569232ec26d06773146a420984d8abf5d25ee7f73dd9 SHA512 f589564cc5f790ab11ac1356b2e27659ef0e6132ffde42d4325f0aa8d8aa4269fdb9e81dd1c196017518704e4c1c78c0d4116f32afd1e6a1c60878961b8cdb26
-EBUILD blt-2.5.3-r1.ebuild 3964 BLAKE2B ebcc1190dae7630ce2ece48368a1414bbc68f6c5d2cddbcab1f919123fe62cfe51c16f2148d7e4fa27edb712ceb48cb9523bbd53733b6bb600b5fdb6951943f1 SHA512 6bc08c50d2b2a0650d726f06f636d9fbe5649aa43cca3828916466c5d310932d10ca90babe63984e8fc10598ad354bc2ef4dd242bcf49a02c66e0eba7a6cb070
+EBUILD blt-2.5.3-r2.ebuild 3948 BLAKE2B be2c483251f845628b219cf438cdc4856d6a23d0d2840c5a2635c2b11bb7d06221c2ad161556728f06167eec1fd62fafdfdf535c49205c9409ed2e97d0fb1a74 SHA512 7ba9f5d61eb3786c57ec706f4fd8484713b07a0467896d1a6355cf3c867766c8b5597022eb359d1832841394de0ea1303f1e270bf0449ab8a9362a7007938c62
 MISC metadata.xml 337 BLAKE2B 516358308d0546bf002efb976c99fd297cdae8d4f9b7cc59b5eff5bb9ec530150ad0e0cf0b3cbb9a3285547683505f62d3ded7d55daba20c0935c55818155386 SHA512 1ea3c5a04ee8192793fbfb59d7532e4b8aca70c782378ad6f475445aa828680a09bb0e4f2ed0ec09df225582f545dcb32577dec58562fa307c775e9a7e10239c
diff --git a/dev-tcltk/blt/blt-2.5.3-r1.ebuild b/dev-tcltk/blt/blt-2.5.3-r2.ebuild
index 52f8652b362b..aa67d1d5dd5b 100644
--- a/dev-tcltk/blt/blt-2.5.3-r1.ebuild
+++ b/dev-tcltk/blt/blt-2.5.3-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=7
@@ -13,7 +13,7 @@ HOMEPAGE="https://sourceforge.net/projects/wize/"
 SRC_URI="mirror://sourceforge/wize/${PN}-src-${PV}.zip
 	https://dev.gentoo.org/~tupone/distfiles/${P}-debian-patches.tar.gz"
 
-IUSE="jpeg static-libs X"
+IUSE="jpeg static-libs"
 SLOT="0/${SHVER}"
 LICENSE="BSD"
 KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris"
@@ -21,7 +21,7 @@ KEYWORDS="~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390
 DEPEND="
 	dev-lang/tk:0=
 	jpeg? ( media-libs/libjpeg-turbo:0= )
-	X? ( x11-libs/libX11 )"
+	x11-libs/libX11"
 RDEPEND="${DEPEND}"
 BDEPEND="app-arch/unzip"
 
@@ -96,7 +96,7 @@ src_configure() {
 		--with-cflags="${CFLAGS}" \
 		--with-gnu-ld \
 		$(use_enable jpeg) \
-		$(use_with X x) \
+		--with-X \
 		CC="$(tc-getCC)"
 }
 
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz
index 0734100b379b..d5f1de52cdf6 100644
--- a/dev-util/Manifest.gz
+++ b/dev-util/Manifest.gz
diff --git a/dev-util/mingw64-toolchain/Manifest b/dev-util/mingw64-toolchain/Manifest
index 69e99caf3162..b7c884f59f03 100644
--- a/dev-util/mingw64-toolchain/Manifest
+++ b/dev-util/mingw64-toolchain/Manifest
@@ -3,7 +3,9 @@ AUX gcc-12.2.0-drop-cflags-sed.patch 1077 BLAKE2B 4e0ff834cbfd4597c67d9adf2e287f
 AUX mingw64-runtime-10.0.0-msvcr-extra-race.patch 1987 BLAKE2B 120aa8ad9ee269ee39b3724b3ff26ecfe0865508f655919e0ac69733ed5a41454725d8756c41094ec431f2a1df947db9542ead5d81088db4085d7169e6fcfb6d SHA512 02b696643276cbcd8c129e8a03cc8843f86d0c06608260eb391112fa1aeea49f9458c6978600fc344e8293b032e4482efcc19afd3a61747594888abcc0be6e11
 AUX mingw64-runtime-10.0.0-tmp-files-clash.patch 572 BLAKE2B c0604bf4bcc3de23a4144bb1482e824c145e51e19468489702002c8d0e446dbd896424d1cd498329e144892e46349286d3d9fdf257a1cc181ee0ea6f87a25b3c SHA512 01eb77360b609a32bfa65da5b4ca4c737144514c43d1d05b462e2dec8051aef921fde23ec2c39c17444464ba46354dbe109e9267b8fa77a929be1550711290fd
 DIST binutils-2.39.tar.xz 25167756 BLAKE2B ac6a5296c6586d53eaadcbffc5c399a6d79edf72450b9bb8b3525ce525129cef3d2eb90c85ef3bb3270b5a03b0e1ffb8f0b705f028158726f9777ebb8685066f SHA512 68e038f339a8c21faa19a57bbc447a51c817f47c2e06d740847c6e9cc3396c025d35d5369fa8c3f8b70414757c89f0e577939ddc0d70f283182504920f53b0a3
+DIST binutils-2.40.tar.xz 25241484 BLAKE2B 8d799f7c595f878b9af5b17a490021dd8b8300ac2fe0ed8574c012929d22d2d0493e003a3e631a9436e8e712da801779b777c566167fe42b0bde119ffa5ad1c2 SHA512 a37e042523bc46494d99d5637c3f3d8f9956d9477b748b3b1f6d7dfbb8d968ed52c932e88a4e946c6f77b8f48f1e1b360ca54c3d298f17193f3b4963472f6925
 DIST gcc-12.2.0.tar.xz 84645292 BLAKE2B 715574af9ad678f9dc8cfd19c866bf910c7edfd479e7e9681337feaa9b54e5d304ddb85483816b8d89754d502405823ae2eff0d1e444538763f40be8e428d8da SHA512 e9e857bd81bf7a370307d6848c81b2f5403db8c7b5207f54bce3f3faac3bde63445684092c2bc1a2427cddb6f7746496d9fbbef05fbbd77f2810b2998f1f9173
 DIST mingw-w64-v10.0.0.tar.bz2 9620291 BLAKE2B 451372403289c492ca939d65bb4d9f6e9fa6bdd6b32d79d6438d858e106e8cc291712ada1f3f7b951a4c6908e7d0385d485ca76920af39bcf86effa48408e330 SHA512 3c0827af7c40809a867758f6cd9ef3ff0c988b43082345bf725e03949af95968d634ace99a7ffae323189549221dcb5d861de9e801f1fbc7904e446641b60516
 EBUILD mingw64-toolchain-10.0.0_p1-r2.ebuild 9715 BLAKE2B 42bb3caaee09901b0d0ab7e90f3f53fefd3d220e4a99305130c504c387661595789acffd6ef65cdfac549f037ebfaf17294bdea287646634dd34cdccf8c9bbee SHA512 79f4bb56176112f4e77b9d7b1c8a309d56ff261fb0805a65be0dea7629163fe7d9a93fb800ea006b4d71751cb6bddff929de5491e1e84e322874470d943a146d
+EBUILD mingw64-toolchain-10.0.0_p2.ebuild 9962 BLAKE2B 97e47aa304cb0750735821124466803b0dfb209f491daafc825b7e4f8c4a7add4f866ccba109353cc4af7cd020635ce8ccbaeb467ccce3fe000262419d0a908b SHA512 ecb1404d7e7593258d81c642f4ba9808aa0bfb3825cbda878ebc6ce10ce372cd17619eccd25b8e53663c53e42a97c4c956cc9f18388c7dadc343d223f0ca6492
 MISC metadata.xml 432 BLAKE2B 273e7dd75d25bd1857a83a8fbad8705413e2780589beca8e9841fabd266f1e94d6f85875901829cbdd5bfd979d23c1ebacb3b07a04cb48388e0a10656ade6cca SHA512 71bf6b85f6b8b8640167a464296199f8d91d36ef048a21a1bd55383dc5ee6ccace50b153e6945163d197f8227f05c2f339899e5b3c5c67e01896241326b2f313
diff --git a/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p2.ebuild b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p2.ebuild
new file mode 100644
index 000000000000..4fcbb96b0cb6
--- /dev/null
+++ b/dev-util/mingw64-toolchain/mingw64-toolchain-10.0.0_p2.ebuild
@@ -0,0 +1,315 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+MULTILIB_COMPAT=( abi_x86_{32,64} )
+inherit edo flag-o-matic multilib-build toolchain-funcs
+
+# Pick versions known to work for Wine and use vanilla for simplicity,
+# ideally update only on mingw64-runtime bumps or if toolchain is getting
+# too outdated to avoid rebuilding the entire toolchain too often.
+# Do _p1++ rather than revbump if changing without bumping mingw64 itself.
+BINUTILS_PV=2.40
+GCC_PV=12.2.0
+MINGW_PV=$(ver_cut 1-3)
+
+DESCRIPTION="All-in-one mingw64 toolchain intended for building Wine without crossdev"
+HOMEPAGE="
+	https://www.mingw-w64.org/
+	https://gcc.gnu.org/
+	https://sourceware.org/binutils/"
+SRC_URI="
+	mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v${MINGW_PV}.tar.bz2
+	mirror://gnu/gcc/gcc-${GCC_PV}/gcc-${GCC_PV}.tar.xz
+	mirror://gnu/binutils/binutils-${BINUTILS_PV}.tar.xz
+	https://sourceware.org/pub/binutils/releases/binutils-${BINUTILS_PV}.tar.xz"
+S="${WORKDIR}"
+
+# l1:binutils+gcc, l2:gcc(libraries), l3:mingw64-runtime
+LICENSE="
+	GPL-3+
+	LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 )
+	ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain"
+SLOT="0"
+# unkeyworded for testing new binutils, keywording may wait until can bump
+# either gcc or mingw64-runtime at same time given the long build time
+#KEYWORDS="-* ~amd64 ~x86"
+IUSE="+abi_x86_32 custom-cflags debug"
+
+RDEPEND="
+	dev-libs/gmp:=
+	dev-libs/mpc:=
+	dev-libs/mpfr:=
+	sys-libs/zlib:=
+	virtual/libiconv"
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	"${FILESDIR}"/mingw64-runtime-10.0.0-msvcr-extra-race.patch
+	"${FILESDIR}"/mingw64-runtime-10.0.0-tmp-files-clash.patch
+	"${FILESDIR}"/gcc-11.3.0-plugin-objdump.patch
+	"${FILESDIR}"/gcc-12.2.0-drop-cflags-sed.patch
+)
+
+pkg_pretend() {
+	[[ ${MERGE_TYPE} == binary ]] && return
+
+	tc-is-cross-compiler &&
+		die "cross-compilation of the toolchain itself is unsupported"
+}
+
+src_prepare() {
+	# rename directories to simplify both patching and the ebuild
+	mv binutils{-${BINUTILS_PV},} || die
+	mv gcc{-${GCC_PV},} || die
+	mv mingw-w64-v${MINGW_PV} mingw64 || die
+
+	default
+}
+
+src_compile() {
+	# not great but do everything in src_compile given bootstrapping
+	# process needs to be done in steps of configure+compile+install
+	# (done modular to have most package-specific things in one place)
+
+	CTARGET=$(usex x86 i686 x86_64)-w64-mingw32
+
+	MWT_D=${T}/root # moved to ${D} in src_install
+	local mwtdir=/usr/lib/${PN}
+	local prefix=${EPREFIX}${mwtdir}
+	local sysroot=${MWT_D}${prefix}
+	local -x PATH=${sysroot}/bin:${PATH}
+
+	filter-lto # requires setting up, and may be messy with mingw static libs
+	use custom-cflags || strip-flags # fancy flags are not realistic here
+
+	local multilib=false
+	use abi_x86_32 && use abi_x86_64 && multilib=true
+
+	# global configure flags
+	local conf=(
+		--build=${CBUILD:-${CHOST}}
+		--target=${CTARGET}
+		--{doc,info,man}dir=/.skip # let individual packages handle docs
+	)
+
+	# binutils
+	local conf_binutils=(
+		--prefix="${prefix}"
+		--host=${CHOST}
+		--disable-cet
+		--disable-default-execstack
+		--disable-nls
+		--disable-shared
+		--with-system-zlib
+		--without-debuginfod
+		--without-msgpack
+		--without-zstd
+	)
+	mwt-binutils() {
+		# symlink gcc's lto plugin for AR (bug #854516)
+		ln -s ../../libexec/gcc/${CTARGET}/${GCC_PV%%.*}/liblto_plugin.so \
+			"${sysroot}"/lib/bfd-plugins || die
+	}
+
+	# gcc (minimal -- if need more, disable only in stage1 / enable in stage3)
+	local conf_gcc=(
+		--prefix="${prefix}"
+		--host=${CHOST}
+		--disable-bootstrap
+		--disable-cet
+		--disable-gcov #843989
+		--disable-gomp
+		--disable-libquadmath
+		--disable-libsanitizer
+		--disable-libssp
+		--disable-libvtv
+		--disable-shared
+		--disable-werror
+		--with-gcc-major-version-only
+		--with-system-zlib
+		--without-isl
+		--without-zstd
+	)
+	${multilib} || conf_gcc+=( --disable-multilib )
+
+	local conf_gcc_stage1=(
+		--enable-languages=c
+		--disable-libatomic
+		--with-sysroot="${sysroot}"
+	)
+	local -n conf_gcc_stage2=conf_gcc_stage1
+
+	local conf_gcc_stage3=(
+		--enable-languages=c,c++
+		--enable-threads=posix # needs stage3, and is required for dxvk/vkd3d
+		--with-sysroot="${prefix}"
+		--with-build-sysroot="${sysroot}"
+	)
+
+	# mingw64-runtime (split in several parts, 3 needed for gcc stages)
+	local conf_mingw64=(
+		--prefix="${prefix}"/${CTARGET}
+		--host=${CTARGET}
+		--with-sysroot=no
+		--without-{crt,headers}
+
+		# mingw .dll aren't used by wine and packages wouldn't find them
+		# at runtime, use crossdev if need dll and proper search paths
+		--disable-shared
+	)
+
+	local conf_mingw64_headers=(
+		--enable-idl
+		--with-headers
+	)
+	mwt-mingw64_headers() { ln -s ${CTARGET} "${sysroot}"/mingw || die; } #419601
+
+	local conf_mingw64_runtime=( --with-crt )
+	${multilib} ||
+		conf_mingw64_runtime+=( $(usex x86 --disable-lib64 --disable-lib32 ) )
+
+	local conf_mingw64_libraries=( --with-libraries )
+	local conf_mingw64_libraries32=(
+		--libdir="${prefix}"/${CTARGET}/lib32
+		--with-libraries
+		CC="${CTARGET}-gcc -m32"
+		RCFLAGS="--target=pe-i386 ${RCFLAGS}"
+	)
+
+	# mingw64-runtime's idl compiler (useful not to depend on wine for widl)
+	local conf_widl=( --prefix="${prefix}" )
+
+	# mwt-build [-x] <path/package-name> [stage-name]
+	# -> ./configure && make && make install && mwt-package() && mwt-package_stage()
+	# passes conf, conf_package, and conf_package_stage arrays to configure, and
+	# users can add options through environment with e.g.
+	#	MWT_BINUTILS_CONF="--some-option"
+	#	MWT_GCC_STAGE1_CONF="--some-gcc-stage1-only-option"
+	#	MWT_WIDL_CONF="--some-other-option"
+	#	EXTRA_ECONF="--global-option" (generic naming for if not reading this)
+	mwt-build() {
+		if [[ ${1} == -x ]]; then
+			(
+				# cross-compiling, cleanup and let ./configure handle it
+				unset AR AS CC CPP CXX LD NM OBJCOPY OBJDUMP RANLIB RC STRIP
+				CHOST=${CTARGET}
+				filter-flags '-fstack-clash-protection' #758914
+				filter-flags '-fstack-protector*' #870136
+				filter-flags '-fuse-ld=*'
+				filter-flags '-mfunction-return=thunk*' #878849
+				strip-unsupported-flags
+				mwt-build "${@:2}"
+			)
+			return
+		fi
+
+		local id=${1##*/}
+		local build_dir=${WORKDIR}/${1}${2+_${2}}-build
+
+		# econf is not allowed in src_compile and its defaults are
+		# mostly unused here, so use configure directly
+		local conf=( "${WORKDIR}/${1}"/configure "${conf[@]}" )
+
+		local -n conf_id=conf_${id} conf_id2=conf_${id}_${2}
+		[[ ${conf_id@a} == *a* ]] && conf+=( "${conf_id[@]}" )
+		[[ ${2} && ${conf_id2@a} == *a* ]] && conf+=( "${conf_id2[@]}" )
+
+		local -n extra_id=MWT_${id^^}_CONF extra_id2=MWT_${id^^}_${2^^}_CONF
+		conf+=( ${EXTRA_ECONF} ${extra_id} ${2+${extra_id2}} )
+
+		einfo "Building ${id}${2+ ${2}} in ${build_dir} ..."
+
+		mkdir -p "${build_dir}" || die
+		pushd "${build_dir}" >/dev/null || die
+
+		edo "${conf[@]}"
+		emake
+		emake DESTDIR="${MWT_D}" install
+
+		declare -f mwt-${id} >/dev/null && edo mwt-${id}
+		declare -f mwt-${id}_${2} >/dev/null && edo mwt-${id}_${2}
+
+		popd >/dev/null || die
+	}
+
+	# workaround race condition with out-of-source crt build (bug #879537)
+	mkdir -p mingw64_runtime-build/mingw-w64-crt/lib{32,64} || die
+
+	# build with same ordering that crossdev would do + stage3 for pthreads
+	mwt-build binutils
+	mwt-build mingw64 headers
+	mwt-build gcc stage1
+	mwt-build -x mingw64 runtime
+	mwt-build gcc stage2
+	${multilib} && mwt-build -x mingw64 libraries32
+	mwt-build -x mingw64 libraries
+	mwt-build gcc stage3
+	mwt-build mingw64/mingw-w64-tools/widl
+	# note: /could/ system-bootstrap if already installed, but gcc and
+	# libraries will use the system's older mingw64 headers/static-libs
+	# and make this potentially fragile without more workarounds/stages
+
+	if ${multilib}; then
+		# Like system's gcc, `x86_64-w64-mingw32-gcc -m32` can build for x86,
+		# but packages expect crossdev's i686-w64-mingw32-gcc which is the same
+		# just without 64bit support and would rather not build the toolchain
+		# twice. Dirty but wrap to allow simple interoperability with crossdev.
+		mwt-i686_wrapper() {
+			printf "#!/usr/bin/env sh\nexec \"${prefix}/bin/${bin}\" ${*} "'"${@}"\n' \
+				> ${bin32} || die
+			chmod +x ${bin32} || die
+		}
+		pushd "${sysroot}"/bin >/dev/null || die
+		local bin bin32
+		for bin in ${CTARGET}-*; do
+			bin32=${bin/x86_64-w64/i686-w64}
+			case ${bin#${CTARGET}-} in
+				as) mwt-i686_wrapper --32;;
+				cpp|gcc|gcc-${GCC_PV%%.*}|g++|widl) mwt-i686_wrapper -m32;;
+				ld|ld.bfd) mwt-i686_wrapper -m i386pe;;
+				windres) mwt-i686_wrapper --target=pe-i386;;
+				*) ln -s ${bin} ${bin32} || die;;
+			esac
+		done
+		popd >/dev/null || die
+	fi
+
+	# portage doesn't know the right strip executable to use for CTARGET
+	# and it can lead to .a mangling, notably with 32bit (breaks toolchain)
+	dostrip -x ${mwtdir}/{${CTARGET}/lib{,32},lib/gcc/${CTARGET}}
+
+	# ... and instead do it here given this saves ~60MB
+	if use !debug; then
+		einfo "Stripping ${CTARGET} static libraries ..."
+		find "${sysroot}"/{,lib/gcc/}${CTARGET} -type f -name '*.a' \
+			-exec ${CTARGET}-strip --strip-unneeded {} + || die
+	fi
+}
+
+src_install() {
+	mv "${MWT_D}${EPREFIX}"/* "${ED}" || die
+
+	find "${ED}" -type f -name '*.la' -delete || die
+}
+
+pkg_postinst() {
+	if [[ ! ${REPLACING_VERSIONS} ]]; then
+		elog "Note that this package is primarily intended for Wine and related"
+		elog "packages to depend on without needing a manual crossdev setup."
+		elog
+		elog "Settings are oriented only for what these need and simplicity."
+		elog "Use sys-devel/crossdev if need full toolchain/customization:"
+		elog "    https://wiki.gentoo.org/wiki/Mingw"
+		elog "    https://wiki.gentoo.org/wiki/Crossdev"
+	fi
+
+	local cross_gcc=cross-$(usex x86 i686 x86_64)-w64-mingw32/gcc
+	if has_version ${cross_gcc}; then
+		# encourage cleanup given users may not realize if switch by default
+		ewarn "${cross_gcc} is installed, note that ${PN}"
+		ewarn "is redundant with the *-w64-mingw32/{binutils,gcc,mingw64-runtime}"
+		ewarn "packages and optionally only one needs to be kept."
+	fi
+}
diff --git a/dev-util/scons/Manifest b/dev-util/scons/Manifest
index ca0b80acf034..97bd3a1095af 100644
--- a/dev-util/scons/Manifest
+++ b/dev-util/scons/Manifest
@@ -4,6 +4,6 @@ DIST SCons-4.4.0.tar.gz 3096863 BLAKE2B 60f125c077dd8f50a7150db6dc1234eac988cf7e
 DIST scons-4.4.0-user.html 1608381 BLAKE2B ff4eb1e0f9c5e8ea7ca44cc00dc37e3e2dd38c24cb09a857c691e6a48f11e5fc86a55740037cc295e6b23df2a1c1b600adf0462320ec87cc26d4bcf919b07342 SHA512 8c1d6578270054efba34c56ddc07b4314bf62630f6a445f5b9f865cc48d593f6c92101a8d216dece201b8d6cb5bce59ff4adb51caaa40128e96b6235087f748c
 DIST scons-4.4.0-user.pdf 2964111 BLAKE2B 45b37c99c3f3d0e9969a16506e27aeabfd562155405f5a59ba79c24404b14e5588fbd0673d86e2266adbd25eca140c9e1cf86e271228658591c0d9285474f078 SHA512 57330f685e7c775cb1c782e40f711c2b2322fad19212a22a920aff92db974610cc78f276e1606fb827660bb488ce803e2458bb9d93c452fa0600df4478f03d06
 DIST scons-4.4.0.gh.tar.gz 5808265 BLAKE2B f6ce757f2edc40551b05285098626bb62def6abda2380d4885ee4443868e715e53aaa34f26c09dc689bb6ade26d1b0e276046fe3b1d2ddf8eb40400bca9ea164 SHA512 01fcd40bf818ca22a278973af1cda3024efb74cf877f15d46607fda860448fbd577fc96ba33fef2bed3d145e662a0371f55e8c927e7ac44feea7f3081791ce11
-EBUILD scons-4.4.0-r1.ebuild 3785 BLAKE2B 35cbb9c2e862f90510fe844e9b17009fe4c0a4cb3c30927d93744de13c639e15eec01e7cc2c689f5868051016382844f0e04fd496d87d284252773dff8c553d8 SHA512 8b1149fe31dffafd80b207f34b87a24a9c8995e9469ef0b957b3cfd2745d86d56f1be13a348dfde2500d2be3e2aff2d90a277fd325f8e89000591f5b69cdee36
+EBUILD scons-4.4.0-r1.ebuild 3748 BLAKE2B 8a0d34afdd7ff554764e41608d75cece47bb47988371da296f5739d2aa2e3d0c7cd589d519edd089b26bae7385727005ab459e23549bd0d3c1a77be4a11faba2 SHA512 c7ae3e2a735b0e3adcd7b2fad1bc030eb3c557a51cc200bd38026e06c6e4adadffba236bceca0b79c47626aaf12e6da5ab74313766434927eaa9381ac069a2d0
 EBUILD scons-4.4.0.ebuild 3659 BLAKE2B 1bd5799550b7874e8885f538d7ddc68b77c50012a03c8e8f71a1f68f8c3d38aacb8e851754bf1b9c0044d520049231e12630a8b372ae8316bc1da29f364934ef SHA512 1e289c45de9c534f56c851da908bf2d4bc05129b054faa35ba4fe6050077cabcf45b8048cd34e347218345df01ea0b95eee0c1634a4dd291f4be3c47647b84ea
 MISC metadata.xml 803 BLAKE2B 17a1596fb7b6991a9c4732c8e8c1231cd57ba42ae9e0b65a475f4a00503bacba23ae671df112909688574f836962951dcd2fd7a35bc83c34a0eeb72ecb96bbc2 SHA512 c1451442bdf49d7c85cc84831ea3a8a540581680858dc1ac117080b6a8558419d004952ade0410c0b31d9d241ae3d5eef1c81525ecb80c40cdc380b50f49e1ad
diff --git a/dev-util/scons/scons-4.4.0-r1.ebuild b/dev-util/scons/scons-4.4.0-r1.ebuild
index 368366ec1db3..b5cb85dfa845 100644
--- a/dev-util/scons/scons-4.4.0-r1.ebuild
+++ b/dev-util/scons/scons-4.4.0-r1.ebuild
@@ -39,7 +39,6 @@ RESTRICT="!test? ( test )"
 
 BDEPEND="
 	test? (
-		dev-libs/libxml2[${PYTHON_USEDEP}]
 		dev-python/lxml[${PYTHON_USEDEP}]
 		dev-python/psutil[${PYTHON_USEDEP}]
 	)
diff --git a/gnome-extra/Manifest.gz b/gnome-extra/Manifest.gz
index 7b9f67c96b52..50be1efef780 100644
--- a/gnome-extra/Manifest.gz
+++ b/gnome-extra/Manifest.gz
diff --git a/gnome-extra/cinnamon-control-center/Manifest b/gnome-extra/cinnamon-control-center/Manifest
index 5b5ed93bca35..8b12e8accc5a 100644
--- a/gnome-extra/cinnamon-control-center/Manifest
+++ b/gnome-extra/cinnamon-control-center/Manifest
@@ -4,6 +4,6 @@ AUX cinnamon-control-center-5.6.0-fix-icon-build.patch 1670 BLAKE2B 3cc64e45c8d0
 DIST cinnamon-control-center-5.2.1.tar.gz 3863530 BLAKE2B 826494b8f8a4dead32d6031d7b4b2a44d357b3e8fedf1065b61193caa86ad433ba68fd9344f70bbce77bb94e086ae15f8854dc73916a5f60c49b1b2bd9e7101c SHA512 d322a9b460f13c697d327dda75a3ea16dd96414ed52ffbcdfc19479533178585da795c064ae441b36ef02f1aa779704db039328ca4ac4c373f363967948f2301
 DIST cinnamon-control-center-5.6.0.tar.gz 3872303 BLAKE2B c0db21dbad031e3a3e06ea2f6253421c548b993eef323e2be1ad131e0a8e980b7b3a93d9a7a6d1feaf13ebe8c5f77fd286f0cb56b7d22c7cb447e46178c6f328 SHA512 336c554c93212c28df4f163b6a06d2c287901c167dc8e5563dbb44ddd69119db36d15086b6b1e78ff1b199424a4a24ac9605d59877a3f8174fd1f406a0f7ca4f
 EBUILD cinnamon-control-center-5.2.1-r2.ebuild 2592 BLAKE2B cf75a9416107770b76a4f88baff6f3788ff054556b518406099e13cd90f92fc7b7778d8c5a3435fdc7ad9649452490c649fb1e743f442a01a5757e4e8d348ea9 SHA512 3805deec698606f2c9f8849eb63879c13bcbf311262f5fcdd14e45699351750c6daff2d93ed04ef249b6a81deb23b3ab9162b17e146f01d154641376e5302ec3
-EBUILD cinnamon-control-center-5.2.1-r3.ebuild 2774 BLAKE2B c76d8c82a4e9115ac2831aca2d96b6b556ba096cdb13d33d3ff040a66a5b9edde2126eeb8c5a5bd273feba5d34d2cd8b0df284c69eaf3205e95b6eab06f39c68 SHA512 aa27bb436e0d121ac28ddfceb3ece9e4cde237dffdc1021d82bdfc682ac562192778bd5093c8e92abf2cacff1bad9ef2c767bb9414259a58ebb34572ef95fdaf
+EBUILD cinnamon-control-center-5.2.1-r3.ebuild 2772 BLAKE2B 6b69847a6dec8c5a4ab3699915a24874a55c9e1657cdf8f50a95eab039318b69bbd3402102a240a97a4d49243737cb469fc2e96ef52ff2b769450aa04df3cde1 SHA512 a6cd2f2a1cccbf46861de7cc61c578edb1dbe6c19ea0207b5c5bfd942ce6cce750519ac2c477042883d1e8fefd9ae6fa13c5e36b59bdb1acb1abe0fa786034c2
 EBUILD cinnamon-control-center-5.6.0.ebuild 2589 BLAKE2B 99eab764bdf8d56bd75e6576060283b84787575a1540d0912c1c30ee706595b7752e3304a49e8531f1673c97301b7b18b83b739ddefbc14e0a0475fdcc859ef3 SHA512 9f4ce1769bf3bfac69d13d56fc120650b1bfa9483f6392c4fbfcd7e28f5d219e815673f381955c483d88c7d253af483fcb147d444339f8466ffa3a808aafc755
 MISC metadata.xml 762 BLAKE2B 5a4411060287e76154bd0727feae76a45e8992077d7cbc6d1ad102d933246d98b3349bf0dc516f35d538e6c1d4a5d427e1561b646b628d408a5743666f5f2ca7 SHA512 c03709d9a1c8d678ce0957d08516e49f8affa6be2153f30607c0f1be7c29a1e00f4955f2112e82dc7c3b3e410a6dabf5ba2bdd9f3141b6a5299068598decd0c3
diff --git a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r3.ebuild b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r3.ebuild
index d370949429c5..4f9aebd7f2ef 100644
--- a/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r3.ebuild
+++ b/gnome-extra/cinnamon-control-center/cinnamon-control-center-5.2.1-r3.ebuild
@@ -15,7 +15,7 @@ LICENSE="GPL-2+ LGPL-2+ LGPL-2.1+ MIT"
 SLOT="0"
 IUSE="+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test"
 REQUIRED_USE="modemmanager? ( networkmanager )"
-KEYWORDS="~amd64 ~arm64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm64 ~riscv x86"
 RESTRICT="test"
 
 COMMON_DEPEND="
diff --git a/media-libs/Manifest.gz b/media-libs/Manifest.gz
index 15eabe2f8079..ace5495fb1e8 100644
--- a/media-libs/Manifest.gz
+++ b/media-libs/Manifest.gz
diff --git a/media-libs/openh264/Manifest b/media-libs/openh264/Manifest
index 1559090f3b3c..56a4a82e89f0 100644
--- a/media-libs/openh264/Manifest
+++ b/media-libs/openh264/Manifest
@@ -3,5 +3,5 @@ DIST gmp-api-Firefox39-3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz 10464 BLA
 DIST openh264-2.3.0.tar.gz 60290792 BLAKE2B 08aa571471188c72bb0f098fa1cfaf9ba46ee4311f50518de868a2d7bbd61d9d4547cf5d33b3140d56c09a1ea7ea411bfaa96ed960e159876e6cc803f081b5d3 SHA512 5f0ccbb3c0026a010d9830e973312486f9d5ea8152afa3653ab6b3c43906a1169cebea70532134c1624846cc03b586e85b12cfd0621af505bd532a7dd833defd
 DIST openh264-2.3.1.tar.gz 60290897 BLAKE2B b4480150cfe7c44b89c7b294698db06f93d96f5f9f3ef4345108c4e360e99bc6133407cead54e720e6e74aa17ab9f2e4342287a42f19463a54eb44c9d3141c80 SHA512 fd59c767794cdfb934d692d5929e4500d78606cbf1e403bc7c7dce048cc07e40daa0794357adb856d29479427a53460c76338e156b6bbeaa36139afcd603c8e1
 EBUILD openh264-2.3.0.ebuild 3618 BLAKE2B 9ea4acd09a5c2281a99a576974bf3d0348fd54377349a68fb94ff983051a6f27a4a59c8b756124e48cdab8e92dfa336558e804ab80da4fd15cb271428de45977 SHA512 6cc32135588b0da11776558c210e7bc8ddca89f4028d4ad1fe283c046b08b058eac6404320937f7d1c6e3ac17fbaa14f7f04f505a1915d68fa2b393c72691efa
-EBUILD openh264-2.3.1-r1.ebuild 3627 BLAKE2B f05d5afc8c2e9edff8c85b803979dc6bd5c1a00aff31e6aac750a7ee03025cf03028fec6799c231763328dda119ad8583c2fd49a4adbaa800a1f88dd0dd2c4b8 SHA512 cd8e75396acb4dabd41cd53e040739c51202bc706f1919917e51f8e6014744a849f3709237e13f04c9c0b1b748ce782f1adc9f6fb9cab3a8b9829ce1f013b172
+EBUILD openh264-2.3.1-r1.ebuild 3626 BLAKE2B 7e75fe73ee51d62bbb5bc3e02e1b84456659e6c541b7c9865ecf5624f456ab4c17da98fb0f164b7112969b7ef17137a29ed8b414b23ffe4acf87163ed25191b8 SHA512 11beb34de4df806d9ae81988f2573fa46fa1d4b918a806f20bf8e76c3efa3758f89c17653b35dcabdb7972a606436b13da7c098810f1ce2223069c400b0e2f37
 MISC metadata.xml 569 BLAKE2B 14a021fba978f0156bab46178d05a6b9f8f67fdeba784d587759207fe60ea1d74a383eec3fc40662c39d33fcecb71d8cafe7eb6354383c253e0a3f7f1e94feae SHA512 ceb77117c6a50f16640b329368c86db26127b8e501475dbaca4c53ba41315b0fc7161f6d9268cb86d1f6dbf2cf867e2bb0e6b5f45240ab3227b99b734c344efd
diff --git a/media-libs/openh264/openh264-2.3.1-r1.ebuild b/media-libs/openh264/openh264-2.3.1-r1.ebuild
index 1e177407f89f..61262aaa914f 100644
--- a/media-libs/openh264/openh264-2.3.1-r1.ebuild
+++ b/media-libs/openh264/openh264-2.3.1-r1.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -18,7 +18,7 @@ LICENSE="BSD"
 # (2.2.0 needed a minor bump due to undocumented but breaking ABI changes, just to be sure.
 #  https://github.com/cisco/openh264/issues/3459 )
 SLOT="0/7"
-KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86"
+KEYWORDS="~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86"
 IUSE="cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils"
 
 RESTRICT="bindist test"
diff --git a/media-sound/Manifest.gz b/media-sound/Manifest.gz
index 42579849892c..880b308cf0db 100644
--- a/media-sound/Manifest.gz
+++ b/media-sound/Manifest.gz
diff --git a/media-sound/mpd/Manifest b/media-sound/mpd/Manifest
index b8ff2da31ac1..9a82cccfa099 100644
--- a/media-sound/mpd/Manifest
+++ b/media-sound/mpd/Manifest
@@ -5,6 +5,6 @@ DIST mpd-0.23.10.tar.xz 774196 BLAKE2B 6b648971412a5f83fe9ff2694c030b451393c415d
 DIST mpd-0.23.11.tar.xz 774592 BLAKE2B 70cc22abe78f6457bcec20a8e668647f9a2f38417956133ba5fde286179acaa710337461461d73b907a069fc0cfe6cb3787bc0db6bf61d82ad9fb082cbd2776d SHA512 971ae6b8ee5bf963a0f2408194fa01089713b606b3a2423081621b80a25e1b480f0e80a6d155ac8c2083960d99681c90f4bf00bf0baffa1f977259f1687c4ceb
 DIST mpd-0.23.9.tar.xz 774156 BLAKE2B 2c045c86ecbe2267d032ebfd4a18835e9b1323860eb348b047d0900a284f5457ca4f18fdd50ea2f678e07a63817b4e4e3245cf0d3948e1f14cf3539d47b314d2 SHA512 67db093e35693f79267f955463ecaa284773b5e47a38f1548a0d16c9ba82aecc3434fd805e224b78782c5978c07e16d26f7632823e536f5304f557985f028d6e
 EBUILD mpd-0.23.10.ebuild 7836 BLAKE2B e20b67d52b15fc09589357782dc3fe948e7d6f2563c93402b124c915dda03cb2cf4e6dca5304f20b778c121ad59941135fbdffeed3d4f452bfb8df532aed68c2 SHA512 21ac27def460cec75aa095c9f5912c51e8c4fce3138353dc6ab10dafb7c1bfb8de970a6f83d4fce251b98342e98b38efe64f3600240f37fd93be3a6b17c26eb4
-EBUILD mpd-0.23.11.ebuild 7883 BLAKE2B 43fbaac7891e7f071124e2ada2c50d7f8b383a2c4b1eef9c4c8231d0c3d82ee97c39bcdec44f7b2c52d94a41094e2db225f7914d6bcf5ae00558df50d766fdfa SHA512 8d6d054d021b1e9382a4a78b5749b2e734cfa2d8eb459b55540b9903f3c24dd366b3f1c28e8cb1b1f0b291b370e61c0eed71662f58529075d3772bb7dd7ae7b3
+EBUILD mpd-0.23.11.ebuild 7882 BLAKE2B 999f14b3b679391525d5d0074cf8b28582db49de0ec39eb4d45f9f8b5035f60fedff4690bfa462fa06df98e68ec279cf3e0656aad7c701ffbbfcc56efb5e05a1 SHA512 b403662a3ff501ffb678fc31fb0f5b282e8555eb337b88863540515aac1484c8a2cfd1bc15560a864f78e8aed5d2a495e5d0502821846ed680033ec967ca353d
 EBUILD mpd-0.23.9-r1.ebuild 7818 BLAKE2B 87f87088224425a560f4a2f259a85cec204f768f0bf40290e7945c48b51d62a6d138d87d4474c9fcf9c0d10f4ef369b5097d51c43696006d49926fa2faf25133 SHA512 3c0f67fdb303eecbf3157a73aa43e2fdea376c9556558353dfd185f3bc2c7719da55d9467b90ab2e9e23ec73b16d17e218eb89829baf9c46acbb509b240d1ef2
 MISC metadata.xml 2805 BLAKE2B afe65d7428c79de96b99855e74d8a474df33dbd71fe9f9f65f64270126dea5ca9138a533c9f4f8d422722352574ccbfec2ec64f5e492869e9c97fbc84dd2c1a1 SHA512 74c249f71a819f5747739c6c720d48edf52b62012f9d1fd30bb6027bd3c5794161f7a70b7c87d78a60fa46e37fc94aa449e0b8825bb8d3eea32143bf240e1d92
diff --git a/media-sound/mpd/mpd-0.23.11.ebuild b/media-sound/mpd/mpd-0.23.11.ebuild
index 009df379c597..3c94bc93825b 100644
--- a/media-sound/mpd/mpd-0.23.11.ebuild
+++ b/media-sound/mpd/mpd-0.23.11.ebuild
@@ -11,7 +11,7 @@ SRC_URI="https://www.musicpd.org/download/${PN}/${PV%.*}/${P}.tar.xz"
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv ~x86"
+KEYWORDS="amd64 ~arm ~arm64 ppc ppc64 ~riscv x86"
 IUSE="+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus
 	+eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify
 	jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms
diff --git a/media-sound/rescrobbled/Manifest b/media-sound/rescrobbled/Manifest
index c245cdd42089..33a165e21216 100644
--- a/media-sound/rescrobbled/Manifest
+++ b/media-sound/rescrobbled/Manifest
@@ -179,5 +179,5 @@ DIST zbus_macros-2.3.2.crate 25540 BLAKE2B 4dc91d9da0804f3cfb6cfa464e6e9cdff2dba
 DIST zbus_names-2.1.0.crate 8481 BLAKE2B 8d2186e3018723ae3aaee473a77538485e05228591522206cdfcb2b086714aff02e7aa212b4d469b9a4bc3cf9b98bb060ddfceb60eddb2058b65f6cdf67d2255 SHA512 59ca26c081893a2c87b0ce00c8cdb43affe40eb6f1d0faa4a115ec730cf308f5b5d146669a14a4c12862c3176b05b4f9766655959d46b6b4285d2d197f7c1803
 DIST zvariant-3.4.1.crate 67944 BLAKE2B c3dc50f9b4d033e895fbd6dda625cabf36310cc0574fbbf00b42aa0f59f1485cfb344af8e5f49f2f240e3219d83cb2419c631f54364e3b9cf88a05cb7b0842c0 SHA512 8e07153505854292e904e8280c9737359f5e549e4aef444a0c8c7a1c870865dfeb221937d153f18ce66ea8626a5aa694610c38d311a180d99d02b659c94fd742
 DIST zvariant_derive-3.4.1.crate 10938 BLAKE2B 971977459df2890d2148cb2a3677fdf2618a5fcc89f22f6c8807ed1c18469846b36a9414717c61ba2492d7a2d56da711456b983c945d6568d31650693e0c371f SHA512 491fdd47cffdf452b32bf81c650ce402c6e63af1040a0cd6ab02b0831400925ecef4dd7041f4b45be54efb84aa81975fd46d8b4bbfd02b45544406de55f8a7bf
-EBUILD rescrobbled-0.6.2.ebuild 4493 BLAKE2B 6db5ae8c1cfed763d9f9e8ad5b5712f399cce3faf70f99c8788a9c61f46aa6a99db67a56c6c43c7f3621d5d85163b85f82917d94637d096ffc199b8f08b52363 SHA512 e2404aabe26853fb5875dfc05bd77e367497a14767af9616c6fe6ab41b54fbb25caa0ab9d7b1b1df37f44d89917f6f0048f2a01f1514558bf3f749f60fbc440d
+EBUILD rescrobbled-0.6.2-r1.ebuild 4534 BLAKE2B 0f97d1604e4ce6b2713184b6168f6d10e552c6275c8b26f7687470f216776d91ba74e8cd89cb033a398a28786c5e9263729ef4ed80826493ad3fe56fdf106803 SHA512 95a37d3e937b23481281982deec420fd0928f903ed22d556ede1f06eba46111e7e2bcd74c039523db124145e6741cf65d98fd0da32f1b5f306a027d85911de68
 MISC metadata.xml 349 BLAKE2B ee0329a9679f3724d4688ecfb07bbf068d829941c3650f410ccc01b7963ca6d06c0022d23c392091cc9da98de1d211aa4d4298fb79b2a4a18eb12f64f2e84d87 SHA512 a2ee2354e5b7fb9203ef39db0a96319b7209742fb3e31c8e2decea5351ba601598a34d6489964509d4d3a02e20bc6b76d5909e709d0de9f2daa8811f570f91e6
diff --git a/media-sound/rescrobbled/rescrobbled-0.6.2.ebuild b/media-sound/rescrobbled/rescrobbled-0.6.2-r1.ebuild
index e62a91e3a43e..e23470413be2 100644
--- a/media-sound/rescrobbled/rescrobbled-0.6.2.ebuild
+++ b/media-sound/rescrobbled/rescrobbled-0.6.2-r1.ebuild
@@ -216,6 +216,8 @@ src_install() {
 
 	dodoc "${FILESDIR}"/config.toml
 	docompress -x "/usr/share/doc/${PF}/config.toml"
+
+	dodoc -r "${S}"/filter-script-examples
 }
 
 pkg_postinst() {
diff --git a/media-sound/strawberry/Manifest b/media-sound/strawberry/Manifest
index ae7dd8ad3e84..b026adf6bbcd 100644
--- a/media-sound/strawberry/Manifest
+++ b/media-sound/strawberry/Manifest
@@ -1,8 +1,10 @@
 DIST strawberry-1.0.10.tar.xz 11220176 BLAKE2B a1ffba755ea0e9931e2320bfc21f14c0d269b06270f87c72e39ba2a8fcc5c5992828fe926ec71e4366b53d7b2e7b9fd1a4a9df100ddeba32ceffa5fc0ef37ad2 SHA512 f13115e5c91dacb508b3c4bf6cee5dd0c1866eae41b145cfcdb7f83dafaf277bc43e3be0b58c16b4b9aa855ef9a7756c53552804481ffae7c78ca929f3d5e8af
 DIST strawberry-1.0.12.tar.xz 11231600 BLAKE2B 7c65d3f0a7418bd4e4ec2d5032406457066f3402efd9f2632f378c15d0c549ab516a8d09dd6d31e2e5723af36d1481614a2b355404596f2384db397ce52495ca SHA512 f29d9d59576788cfb5521a4394dd16501a6dc277c70ebff3629dc891ae70baaebc98ec07f4eda281ac5ebc6c8693c35a5a6611e014d27850beaf20125601e5ce
 DIST strawberry-1.0.13.tar.xz 11232884 BLAKE2B f2762a280ca00d080836f2d9a201161588119f26c59bdc6d5a9fd2bfc98d8dc64110e675fb8860cecd44a1406e0b869b14793644a8cfd01316b7ec823489efd6 SHA512 b870252a3abcc6accfc7b9b52563573f42fb65d8322880bcd6558a083d8e12da043e5967165dcdc4714800ce283e837c68cbf3a61a5c018a4978c7b7b5b39bff
+DIST strawberry-1.0.14.tar.xz 11234760 BLAKE2B 2dc0d1cee93ffa130da403c986c147f5d3eb59689079a0450183edc53947f7472ea5ff69c57c8ce971f03e89896d06c51bf22bcf57f97adb97067c8a35cf0e15 SHA512 bf667cb93b8f0ffdb8dc625df821bc4355e3845629ff25ed57d7999e19072edffab05f27dbea90adf0bb9a9cbe478856a292a1a6f7ed2c5f37442548699a4c02
 EBUILD strawberry-1.0.10.ebuild 3019 BLAKE2B f90ce6144be7f24a66d09d114f4ec9b4f28bd6c12e37a423b785973b8391f06dff2c35eca6e344c6b1ce82dd64e65f0d894e8de1e8eb1bf7cb5c08bce72a604b SHA512 6b803a3b98994f7628d2cb8f729ca189c7d72d865a76087f0fda8f00d8922844d3e16516e27bca8c3b547a3608f0074c999707472ecb3c2c2aab37344d04f2e9
 EBUILD strawberry-1.0.12.ebuild 3021 BLAKE2B 49d972f0be2dfca036c8d61ec1272ac7098d2ada74f5de1058429af2e14708a978c157f82914db222cd99eda6b1230c6d06ab43d3a5ad658678618accbb8d339 SHA512 9037db1106c60e5e280a374ed1ab29881b09a450b2d5399b9fecb295b120b3282197948dbefef3fdf51cdf3d22e3e1bacedd02e2ce02ae0c7b9bd2d894218c0c
 EBUILD strawberry-1.0.13.ebuild 3021 BLAKE2B 49d972f0be2dfca036c8d61ec1272ac7098d2ada74f5de1058429af2e14708a978c157f82914db222cd99eda6b1230c6d06ab43d3a5ad658678618accbb8d339 SHA512 9037db1106c60e5e280a374ed1ab29881b09a450b2d5399b9fecb295b120b3282197948dbefef3fdf51cdf3d22e3e1bacedd02e2ce02ae0c7b9bd2d894218c0c
+EBUILD strawberry-1.0.14.ebuild 3021 BLAKE2B 49d972f0be2dfca036c8d61ec1272ac7098d2ada74f5de1058429af2e14708a978c157f82914db222cd99eda6b1230c6d06ab43d3a5ad658678618accbb8d339 SHA512 9037db1106c60e5e280a374ed1ab29881b09a450b2d5399b9fecb295b120b3282197948dbefef3fdf51cdf3d22e3e1bacedd02e2ce02ae0c7b9bd2d894218c0c
 EBUILD strawberry-9999.ebuild 3021 BLAKE2B 626e0dce302219386fc8cddc66d0f11127718685392fbd0324610ea2099c581376871db28d214cbf00c906d697a067713f02e24034ccc2aa93d799ed184a1c44 SHA512 5c5c18f84ebcc125638f590631f92c20103dc4ea344358f2f8b9eb3f3f2932589936a45a25ad13ea2aa664bdedb96b960a74decbba91973d8175407ee421a7a4
 MISC metadata.xml 473 BLAKE2B 87bfc0758ce3a886e370384baf5bf4832c0e94f27a1789bce62c73f69c8f6ceda5c2cf36295412b751ae55aeb7c5c52f695e96b363e72d91f4019fe4a81af945 SHA512 88779d17c969b36adc7cc1ead94940643e1842e081d5c370c9190da1bbe1b0b152211d249a1b06d99a9638930a44e48e54a89c6b4139793cb23bcaf136e24813
diff --git a/media-sound/strawberry/strawberry-1.0.14.ebuild b/media-sound/strawberry/strawberry-1.0.14.ebuild
new file mode 100644
index 000000000000..884e0da1aa38
--- /dev/null
+++ b/media-sound/strawberry/strawberry-1.0.14.ebuild
@@ -0,0 +1,120 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+inherit cmake flag-o-matic plocale xdg
+
+PLOCALES="ca cs de es es_AR es_ES es_MX fi fr hu id it ja ko nb nl pl pt_BR ru sv uk zh_CN"
+
+DESCRIPTION="Modern music player and library organizer based on Clementine and Qt"
+HOMEPAGE="https://www.strawberrymusicplayer.org/"
+if [[ ${PV} == *9999* ]]; then
+	EGIT_REPO_URI="https://github.com/strawberrymusicplayer/strawberry"
+	inherit git-r3
+else
+	SRC_URI="https://github.com/strawberrymusicplayer/strawberry/releases/download/${PV}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~ppc64 ~x86"
+fi
+
+LICENSE="GPL-3"
+SLOT="0"
+IUSE="cdda debug +gstreamer ipod moodbar mtp pulseaudio +udisks vlc"
+
+BDEPEND="
+	dev-qt/linguist-tools:5
+	sys-devel/gettext
+	virtual/pkgconfig
+"
+COMMON_DEPEND="
+	dev-db/sqlite:=
+	dev-libs/glib:2
+	dev-libs/protobuf:=
+	dev-qt/qtconcurrent:5
+	dev-qt/qtcore:5
+	dev-qt/qtdbus:5
+	dev-qt/qtgui:5
+	dev-qt/qtnetwork:5[ssl]
+	dev-qt/qtsql:5[sqlite]
+	dev-qt/qtwidgets:5
+	dev-qt/qtx11extras:5
+	media-libs/alsa-lib
+	media-libs/taglib
+	x11-libs/libX11
+	cdda? ( dev-libs/libcdio:= )
+	gstreamer? (
+		media-libs/chromaprint:=
+		media-libs/gstreamer:1.0
+		media-libs/gst-plugins-base:1.0
+	)
+	ipod? ( media-libs/libgpod )
+	moodbar? ( sci-libs/fftw:3.0 )
+	mtp? ( media-libs/libmtp )
+	pulseaudio? ( media-sound/pulseaudio )
+	vlc? ( media-video/vlc )
+"
+# Note: sqlite driver of dev-qt/qtsql is bundled, so no sqlite use is required; check if this can be overcome someway;
+RDEPEND="${COMMON_DEPEND}
+	gstreamer? (
+		media-plugins/gst-plugins-meta:1.0
+		media-plugins/gst-plugins-soup:1.0
+		media-plugins/gst-plugins-taglib:1.0
+	)
+	mtp? ( gnome-base/gvfs[mtp] )
+	udisks? ( sys-fs/udisks:2 )
+"
+DEPEND="${COMMON_DEPEND}
+	dev-cpp/gtest
+	dev-libs/boost
+	dev-qt/qttest:5
+"
+
+DOCS=( Changelog README.md )
+
+REQUIRED_USE="
+	cdda? ( gstreamer )
+	|| ( gstreamer vlc )
+"
+
+src_prepare() {
+	plocale_find_changes "src/translations" "" ".po"
+
+	cmake_src_prepare
+}
+
+src_configure() {
+	# spotify is not in portage
+	local mycmakeargs=(
+		-DBUILD_WERROR=OFF
+		# avoid automagically enabling of ccache (bug #611010)
+		-DCCACHE_EXECUTABLE=OFF
+		-DENABLE_GIO=ON
+		-DLINGUAS="$(plocale_get_locales)"
+		-DENABLE_AUDIOCD="$(usex cdda)"
+		-DENABLE_GSTREAMER="$(usex gstreamer)"
+		-DENABLE_LIBGPOD="$(usex ipod)"
+		-DENABLE_LIBMTP="$(usex mtp)"
+		-DENABLE_LIBPULSE="$(usex pulseaudio)"
+		-DENABLE_MOODBAR="$(usex moodbar)"
+		-DENABLE_MUSICBRAINZ="$(usex gstreamer)"
+		-DENABLE_SONGFINGERPRINTING="$(usex gstreamer)"
+		-DENABLE_UDISKS2="$(usex udisks)"
+		-DENABLE_VLC="$(usex vlc)"
+		# Disable until we have qt6 in the tree
+		-DWITH_QT6=OFF
+	)
+
+	use !debug && append-cppflags -DQT_NO_DEBUG_OUTPUT
+
+	cmake_src_configure
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	if use gstreamer ; then
+		elog "Note that list of supported formats is controlled by media-plugins/gst-plugins-meta "
+		elog "USE flags. You may be interested in setting aac, flac, mp3, ogg or wavpack USE flags "
+		elog "depending on your preferences"
+	fi
+}
diff --git a/metadata/Manifest.gz b/metadata/Manifest.gz
index bca532c197c9..fed7c7a241de 100644
--- a/metadata/Manifest.gz
+++ b/metadata/Manifest.gz
diff --git a/metadata/dtd/timestamp.chk b/metadata/dtd/timestamp.chk
index bb6b55e5ca45..8e2922aaef49 100644
--- a/metadata/dtd/timestamp.chk
+++ b/metadata/dtd/timestamp.chk
@@ -1 +1 @@
-Sun, 15 Jan 2023 05:09:52 +0000
+Sun, 15 Jan 2023 11:09:52 +0000
diff --git a/metadata/glsa/Manifest b/metadata/glsa/Manifest
index 1fa8d447225c..200fbcf9deda 100644
--- a/metadata/glsa/Manifest
+++ b/metadata/glsa/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 540216 BLAKE2B d30aef090eaffb1f3ce91f96dfcc44f7a5d1a954885fba68126dee1aa21a3de740e45dd7106f5d3ba2b51e48eda29870b954e2a90cc8bfa9dc1ac93912daadef SHA512 f9ff42d8d58ea6e6bae5d32f95af7bcddc333ce0478d31cfefb14e85c8d99eaf4d3d9a0802c961e3f7e7d8f3696894cb1d1d0e81db3807d1796858a550f0351f
-TIMESTAMP 2023-01-15T05:09:57Z
+TIMESTAMP 2023-01-15T11:09:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPDiqVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPD3wRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klDdJA/+LvHXjR0ho2Omx3k/+Wuphp5EYiYZ2vQLKzm/M9UCWYAWU/IHgMan3C03
-5zOKfwDbWSng96Ul7wUiQ516sMbZmQ4l83exQXHbaoUX1vDHaI380IZShKIei5Im
-8Rb07isOxSUPpl3jfhR0Slso4oR9JoZfhLzOPLvJ+anmdbRlg8RyKQp/G1VAUov7
-mfecDo7OrX+8+q6tNUZBtJDteKOvyDjopURUzC5ihYTHgo9q6UApgn5bVJALkw3E
-f/JonJQxMDyn6BG6hHnCELGwzyE4yIaLrgknWZ27IwwbuKGvodcLsMk3e8qc5J1k
-CsmRZZSYAHmZ+X4D9YUDQgijH55MB7r72slyzyUVVr4R0avFZsMmL1b42Tj6Ad1K
-gpdilI5KdHRiSxieKQW+KVX/wuH5j7cjjUNnIRgQsqquCcCOFutG5TIjQGSH6zr6
-YfA7FJj71d3M3x2Xueb6L20wPQO451hAiwogWt/o0qhFW44j7nxzUOw4WNRiTtSp
-yO62bIy+nVQNqzLPWy7PLI66jwOJ17Q8CbYZc7tekQro03n2yKQ8xO036XwEHcpr
-5rF1+JLahZWI29MJeyTyAeo7dBN1TExJ25n/kZQOhesgjLzN5c44v5D46F58yg/c
-uILe0qb9pYnWmL5SglqyEKzS/3WuYFXH9xJEbd4/wNCuhioDXfs=
-=C9PT
+klBX1xAAthlS6QHoMHrSO1aEfxhQpLKQji2Xcdn3BhQQiFwMVp9YYCmkNJCAY0Nz
+V+19xu5HTL7d9QNHaDEPtqkU1jp7Qd7sDK3ImjpX01CwXvjjxr6pT1x9+YlUs4am
+znTwzDSQIOEkmywOcErYOABvQKtrSbGV1zF8J47l6SQsqJfpgcxxomExGFLd/pbH
+7JtJsyDMLHxSVCHTe2kv5VYv+fCgC+AEzhxRtgmy84n4qD9VtQNwyJcmljoLzQIZ
+nYcecHOn0qr8M1lBJjFFQJwJ3EQVMcgl2g2XZWOo20z/kI6sYGrTGRPGgOcfBJ+m
+CwrZXG9mf0rQrwseo9bEa7mJowIDmOOo/OKAEJCbA0HJqzpUMfPm+dOHIa90Goxj
+PCS0cJQHxat+bOu+r5vJX52Fv261DOE3oqztrDfrXTcouO/Nlzzw5VW31IvgHFtg
+dj1uZGeK/bV89lWSdyVfVpeFnm/v9Hm2Lga7YycOnNZI39MTtdgFgkkn8+3Ivk7l
+ihml804j5rc0mdvYvDOkfVka2HfgSWhdu1roCDe7Ozjdvs4MQqL0uVfxEXxd7hfj
+tgt/m2anzhynIOZlvEqSajQ5CkETx1XbCOKibU22tEl9mT6hfqv5V8lifcQYPvjI
+RsGAxkmbbVTI5x3dhPCwPdPUuhfW7f0U+sSZYgCUHYBU+tj2IMM=
+=q6KZ
 -----END PGP SIGNATURE-----
diff --git a/metadata/glsa/timestamp.chk b/metadata/glsa/timestamp.chk
index 6ffa4b9d917e..8e2922aaef49 100644
--- a/metadata/glsa/timestamp.chk
+++ b/metadata/glsa/timestamp.chk
@@ -1 +1 @@
-Sun, 15 Jan 2023 05:09:53 +0000
+Sun, 15 Jan 2023 11:09:52 +0000
diff --git a/metadata/md5-cache/Manifest.gz b/metadata/md5-cache/Manifest.gz
index 4eee20c19596..0c4ffa76fe7e 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 0280fc4b0261..e44d6b2695fb 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/lnav-0.11.1-r1 b/metadata/md5-cache/app-admin/lnav-0.11.1-r1
index ba926b34f880..0c2aaa755153 100644
--- a/metadata/md5-cache/app-admin/lnav-0.11.1-r1
+++ b/metadata/md5-cache/app-admin/lnav-0.11.1-r1
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://lnav.org
 INHERIT=autotools flag-o-matic
 IUSE=pcap test
-KEYWORDS=amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=BSD-2
 RDEPEND=app-arch/bzip2:0= app-arch/libarchive:= >=dev-db/sqlite-3.9.0 dev-libs/libpcre2 >=net-misc/curl-7.23.0 sys-libs/ncurses:= sys-libs/readline:= sys-libs/zlib:= pcap? ( net-analyzer/wireshark[tshark] )
 RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/tstack/lnav/archive/refs/tags/v0.11.1.tar.gz -> lnav-0.11.1.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=f8052fd7ee64338e244006ad6ca7b664
+_md5_=b93e3c021d65b2f05a6aadc60d35203c
diff --git a/metadata/md5-cache/app-portage/Manifest.gz b/metadata/md5-cache/app-portage/Manifest.gz
index fd38d73c4f0e..241bef9e0ae0 100644
--- a/metadata/md5-cache/app-portage/Manifest.gz
+++ b/metadata/md5-cache/app-portage/Manifest.gz
diff --git a/metadata/md5-cache/app-portage/pycargoebuild-0.5.1 b/metadata/md5-cache/app-portage/pycargoebuild-0.5.1
deleted file mode 100644
index 86a000df9a50..000000000000
--- a/metadata/md5-cache/app-portage/pycargoebuild-0.5.1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A generator for Rust/Cargo ebuilds written in Python
-EAPI=8
-HOMEPAGE=https://github.com/projg2/pycargoebuild/ https://pypi.org/project/pycargoebuild/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/pycargoebuild/archive/v0.5.1.tar.gz -> pycargoebuild-0.5.1.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=f4688bdc0fdc7705fe7400184ef2deba
diff --git a/metadata/md5-cache/app-portage/pycargoebuild-0.5.2 b/metadata/md5-cache/app-portage/pycargoebuild-0.5.2
deleted file mode 100644
index 61e3468e8ea5..000000000000
--- a/metadata/md5-cache/app-portage/pycargoebuild-0.5.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A generator for Rust/Cargo ebuilds written in Python
-EAPI=8
-HOMEPAGE=https://github.com/projg2/pycargoebuild/ https://pypi.org/project/pycargoebuild/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/pycargoebuild/archive/v0.5.2.tar.gz -> pycargoebuild-0.5.2.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=f4688bdc0fdc7705fe7400184ef2deba
diff --git a/metadata/md5-cache/app-portage/pycargoebuild-0.5.3 b/metadata/md5-cache/app-portage/pycargoebuild-0.5.3
deleted file mode 100644
index 57f4ceaed661..000000000000
--- a/metadata/md5-cache/app-portage/pycargoebuild-0.5.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A generator for Rust/Cargo ebuilds written in Python
-EAPI=8
-HOMEPAGE=https://github.com/projg2/pycargoebuild/ https://pypi.org/project/pycargoebuild/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/pycargoebuild/archive/v0.5.3.tar.gz -> pycargoebuild-0.5.3.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=f4688bdc0fdc7705fe7400184ef2deba
diff --git a/metadata/md5-cache/app-portage/pycargoebuild-0.5.4 b/metadata/md5-cache/app-portage/pycargoebuild-0.5.4
deleted file mode 100644
index a5fb90dff798..000000000000
--- a/metadata/md5-cache/app-portage/pycargoebuild-0.5.4
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A generator for Rust/Cargo ebuilds written in Python
-EAPI=8
-HOMEPAGE=https://github.com/projg2/pycargoebuild/ https://pypi.org/project/pycargoebuild/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/pycargoebuild/archive/v0.5.4.tar.gz -> pycargoebuild-0.5.4.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=f4688bdc0fdc7705fe7400184ef2deba
diff --git a/metadata/md5-cache/app-portage/pycargoebuild-0.6 b/metadata/md5-cache/app-portage/pycargoebuild-0.6
deleted file mode 100644
index aee2672b9fe8..000000000000
--- a/metadata/md5-cache/app-portage/pycargoebuild-0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/flit_core-3.8.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A generator for Rust/Cargo ebuilds written in Python
-EAPI=8
-HOMEPAGE=https://github.com/projg2/pycargoebuild/ https://pypi.org/project/pycargoebuild/
-INHERIT=distutils-r1
-IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/license-expression[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/projg2/pycargoebuild/archive/v0.6.tar.gz -> pycargoebuild-0.6.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=f4688bdc0fdc7705fe7400184ef2deba
diff --git a/metadata/md5-cache/dev-ada/Manifest.gz b/metadata/md5-cache/dev-ada/Manifest.gz
index 8f7f24e84cfb..a09f5800509f 100644
--- a/metadata/md5-cache/dev-ada/Manifest.gz
+++ b/metadata/md5-cache/dev-ada/Manifest.gz
diff --git a/metadata/md5-cache/dev-ada/VSS-22.0.0 b/metadata/md5-cache/dev-ada/VSS-22.0.0
index 1ec7df3b6057..dcd68a09c657 100644
--- a/metadata/md5-cache/dev-ada/VSS-22.0.0
+++ b/metadata/md5-cache/dev-ada/VSS-22.0.0
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://github.com/AdaCore/VSS
 INHERIT=ada multiprocessing
 IUSE=test ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3 gcc-runtime-library-exception-3.1
 RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] )
 REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/22.0.0
 SRC_URI=https://github.com/AdaCore/VSS/archive/refs/tags/v22.0.0.tar.gz -> VSS-22.0.0.tar.gz
 _eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=f737a58fa95694b65e0c65ac1de4c0fe
+_md5_=76b0f7076a18621511c2d1de95dc76f3
diff --git a/metadata/md5-cache/dev-ada/VSS-23.0.0 b/metadata/md5-cache/dev-ada/VSS-23.0.0
index d69e09799a12..f844782bcd97 100644
--- a/metadata/md5-cache/dev-ada/VSS-23.0.0
+++ b/metadata/md5-cache/dev-ada/VSS-23.0.0
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0/23.0.0
 SRC_URI=https://github.com/AdaCore/VSS/archive/refs/tags/v23.0.0.tar.gz -> VSS-23.0.0.tar.gz
 _eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=ff66714f5614256de7d77b215e3d2939
+_md5_=fac3f847aad9147661398f137fee4830
diff --git a/metadata/md5-cache/dev-ada/aunit-2021 b/metadata/md5-cache/dev-ada/aunit-2021
deleted file mode 100644
index b7f323d6c786..000000000000
--- a/metadata/md5-cache/dev-ada/aunit-2021
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile install setup test
-DEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) dev-ada/gprbuild[ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-)]
-DESCRIPTION=Ada unit testing framework
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/tools/aunit/
-INHERIT=ada multiprocessing
-IUSE=ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] )
-REQUIRED_USE=ada_target_gnat_2021
-SLOT=0
-SRC_URI=https://community.download.adacore.com/v1/c8eadafc40c016859e127cd0e82411fcd8f3e749?filename=aunit-2021-20210518-19DC5-src.tar.gz -> aunit-2021-20210518-19DC5-src.tar.gz
-_eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=7930f92cdfff28b970e76dc9ed3e8417
diff --git a/metadata/md5-cache/dev-ada/aunit-22.0.0 b/metadata/md5-cache/dev-ada/aunit-22.0.0
index 8ae109ac9918..3fdcab5d4b29 100644
--- a/metadata/md5-cache/dev-ada/aunit-22.0.0
+++ b/metadata/md5-cache/dev-ada/aunit-22.0.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aunit/
 INHERIT=ada multiprocessing
 IUSE=ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] )
 REQUIRED_USE=^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
 SLOT=0
 SRC_URI=https://github.com/AdaCore/aunit/archive/refs/tags/v22.0.0.tar.gz -> aunit-22.0.0.tar.gz
 _eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=a47954a47da9d1835047a11ea3b1a6c8
+_md5_=a404581eef32accfbed4e61bb93d1e62
diff --git a/metadata/md5-cache/dev-ada/aws-2021 b/metadata/md5-cache/dev-ada/aws-2021
deleted file mode 100644
index 2b4bc613c63f..000000000000
--- a/metadata/md5-cache/dev-ada/aws-2021
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure setup
-DEPEND=dev-ada/xmlada[ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-),shared,static-libs] dev-ada/gprbuild[ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-)]
-DESCRIPTION=A complete Web development framework
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/tools/aws/
-INHERIT=ada multiprocessing
-IUSE=ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-),shared,static-libs]
-REQUIRED_USE=ada_target_gnat_2021
-SLOT=0
-SRC_URI=https://community.download.adacore.com/v1/5b0fa09df8ac0c717abdf4ede9e08efe5fd98984?filename=aws-2021-20210518-19F65-src.tar.gz -> aws-2021-20210518-19F65-src.tar.gz
-_eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=0fb2ccd7a134871065896a5a012b93c4
diff --git a/metadata/md5-cache/dev-ada/aws-22.0.0 b/metadata/md5-cache/dev-ada/aws-22.0.0
index cc726fa7f9ac..7ae9caafb805 100644
--- a/metadata/md5-cache/dev-ada/aws-22.0.0
+++ b/metadata/md5-cache/dev-ada/aws-22.0.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://libre.adacore.com/tools/aws/
 INHERIT=ada multiprocessing
 IUSE=ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=dev-ada/gnatcoll-core:=[ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-),shared,static-libs] dev-libs/openssl
 REQUIRED_USE=ada_target_gnat_2021
 SLOT=0
 SRC_URI=https://github.com/AdaCore/aws/archive/refs/tags/v22.0.0.tar.gz -> aws-22.0.0.tar.gz https://github.com/AdaCore/templates-parser/archive/refs/tags/v22.0.0.tar.gz -> templates-parser-22.0.0.tar.gz
 _eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=5737ecaaedcda623b6fe09ab291d1f6e
+_md5_=7eb43a69837d13d18aa903d95372d893
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-core-2021-r1 b/metadata/md5-cache/dev-ada/gnatcoll-core-2021-r1
deleted file mode 100644
index 565803c86a24..000000000000
--- a/metadata/md5-cache/dev-ada/gnatcoll-core-2021-r1
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install prepare setup
-DEPEND=>=dev-ada/libgpr-2021[ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-),shared?,static-libs?,static-pic?] dev-ada/gprbuild[ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-)]
-DESCRIPTION=GNAT Component Collection Core packages
-EAPI=7
-HOMEPAGE=http://libre.adacore.com
-INHERIT=ada multiprocessing
-IUSE=+shared static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=>=dev-ada/libgpr-2021[ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-),shared?,static-libs?,static-pic?]
-REQUIRED_USE=|| ( shared static-libs static-pic ) ada_target_gnat_2021
-SLOT=0
-SRC_URI=https://community.download.adacore.com/v1/425b044d5cb112f096c7ac5ebbafb0d8e5297913?filename=gnatcoll-core-2021-20210518-19ADF-src.tar.gz -> gnatcoll-core-2021-20210518-19ADF-src.tar.gz
-_eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=6e8faa2057f4eee077660f0db6259084
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-core-22.0.0 b/metadata/md5-cache/dev-ada/gnatcoll-core-22.0.0-r1
index 19723a5f593e..17d9e2c183a6 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-core-22.0.0
+++ b/metadata/md5-cache/dev-ada/gnatcoll-core-22.0.0-r1
@@ -1,15 +1,15 @@
 DEFINED_PHASES=compile configure install prepare setup
-DEPEND=|| ( >=dev-ada/libgpr-2021 ~dev-ada/libgpr-22.0.0 ) dev-ada/libgpr:=[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared?,static-libs?,static-pic?] dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
+DEPEND=~dev-ada/libgpr-22.0.0:=[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared?,static-libs?,static-pic?] dev-ada/gprbuild[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?]
 DESCRIPTION=GNAT Component Collection Core packages
 EAPI=7
 HOMEPAGE=http://libre.adacore.com
 INHERIT=ada multiprocessing
 IUSE=+shared static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
-RDEPEND=|| ( >=dev-ada/libgpr-2021 ~dev-ada/libgpr-22.0.0 ) dev-ada/libgpr:=[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared?,static-libs?,static-pic?]
+RDEPEND=~dev-ada/libgpr-22.0.0:=[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared?,static-libs?,static-pic?]
 REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
 SLOT=0/22.0.0
 SRC_URI=https://github.com/AdaCore/gnatcoll-core/archive/refs/tags/v22.0.0.tar.gz -> gnatcoll-core-22.0.0.tar.gz
 _eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=eac4c141d4f933c3724ec429f55e7295
+_md5_=5c2e53d08149ad546138f4674b67ce5a
diff --git a/metadata/md5-cache/dev-ada/gnatcoll-core-23.0.0 b/metadata/md5-cache/dev-ada/gnatcoll-core-23.0.0
index 4443590ae4dc..208175cc66cc 100644
--- a/metadata/md5-cache/dev-ada/gnatcoll-core-23.0.0
+++ b/metadata/md5-cache/dev-ada/gnatcoll-core-23.0.0
@@ -5,11 +5,11 @@ EAPI=7
 HOMEPAGE=http://libre.adacore.com
 INHERIT=ada multiprocessing
 IUSE=+shared static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=~dev-ada/libgpr-23.0.0:=[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared?,static-libs?,static-pic?]
 REQUIRED_USE=|| ( shared static-libs static-pic ) ^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
 SLOT=0/23.0.0
 SRC_URI=https://github.com/AdaCore/gnatcoll-core/archive/refs/tags/v23.0.0.tar.gz -> gnatcoll-core-23.0.0.tar.gz
 _eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=387abbc5f7cb07fdbe9063e617c6895a
+_md5_=2fd89ade28da8edc9e20df5c9e8cf321
diff --git a/metadata/md5-cache/dev-ada/libgpr-2021 b/metadata/md5-cache/dev-ada/libgpr-2021
deleted file mode 100644
index 0d34aa1f2444..000000000000
--- a/metadata/md5-cache/dev-ada/libgpr-2021
+++ /dev/null
@@ -1,15 +0,0 @@
-DEFINED_PHASES=compile configure install setup
-DEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-)] !net-libs/grpc dev-ada/gprbuild[ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-)]
-DESCRIPTION=Ada library to handle GPRbuild project files
-EAPI=7
-HOMEPAGE=http://libre.adacore.com/
-INHERIT=ada multiprocessing
-IUSE=+shared static-libs static-pic ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=amd64 x86
-LICENSE=GPL-3
-RDEPEND=dev-ada/xmlada[shared?,static-libs?,static-pic?,ada_target_gnat_2021(-)?,-ada_target_gcc_12_2_0(-)] !net-libs/grpc
-REQUIRED_USE=ada_target_gnat_2021 || ( shared static-libs static-pic )
-SLOT=0
-SRC_URI=https://community.download.adacore.com/v1/23a77a37247ff811609e23a0a271f445c299fc8f?filename=gprbuild-2021-20210519-19A34-src.tar.gz -> gprbuild-2021-20210519-19A34-src.tar.gz
-_eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=0abdbcd07b74009377f7a113f21acd10
diff --git a/metadata/md5-cache/dev-ada/templates-parser-23.0.0 b/metadata/md5-cache/dev-ada/templates-parser-23.0.0
index 522fd542e63b..85fed70cab66 100644
--- a/metadata/md5-cache/dev-ada/templates-parser-23.0.0
+++ b/metadata/md5-cache/dev-ada/templates-parser-23.0.0
@@ -5,7 +5,7 @@ EAPI=7
 HOMEPAGE=https://github.com/AdaCore/templates-parser
 INHERIT=ada multiprocessing
 IUSE=+shared static-libs ada_target_gnat_2021 ada_target_gcc_12_2_0
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 x86
 LICENSE=GPL-3
 RDEPEND=ada_target_gnat_2021? ( dev-lang/gnat-gpl:10[ada] ) ada_target_gcc_12_2_0? ( =sys-devel/gcc-12.2.0*[ada] ) dev-ada/xmlada[ada_target_gnat_2021(-)?,ada_target_gcc_12_2_0(-)?,shared?,static-libs?] shared? ( dev-ada/xmlada[static-pic] )
 REQUIRED_USE=|| ( shared static-libs ) ^^ ( ada_target_gnat_2021 ada_target_gcc_12_2_0 )
@@ -13,4 +13,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/AdaCore/templates-parser/archive/refs/tags/v23.0.0.tar.gz -> templates-parser-23.0.0.tar.gz
 _eclasses_=ada	492e700cbeece78fe1a7e23be17a4ba8	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730
-_md5_=02d2baa61a014205eed6acd43960f0db
+_md5_=1c758c79cdcf6d0fd951461568ed7681
diff --git a/metadata/md5-cache/dev-java/Manifest.gz b/metadata/md5-cache/dev-java/Manifest.gz
index 89dba8755975..ca8611e2e454 100644
--- a/metadata/md5-cache/dev-java/Manifest.gz
+++ b/metadata/md5-cache/dev-java/Manifest.gz
diff --git a/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.26 b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.26
new file mode 100644
index 000000000000..55e16956dcde
--- /dev/null
+++ b/metadata/md5-cache/dev-java/ant-eclipse-ecj-4.26
@@ -0,0 +1,15 @@
+BDEPEND=app-arch/unzip
+DEFINED_PHASES=compile install preinst prepare setup test
+DEPEND=~dev-java/eclipse-ecj-4.26:4.26 dev-java/ant-core:0 >=virtual/jdk-17:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Ant Compiler Adapter for Eclipse Java Compiler
+EAPI=8
+HOMEPAGE=https://www.eclipse.org/
+INHERIT=java-pkg-2 java-pkg-simple prefix
+IUSE=doc source
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=EPL-1.0
+RDEPEND=~dev-java/eclipse-ecj-4.26:4.26 dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.26
+SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/ecjsrc-4.26.jar
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	prefix	eab3c99d77fe00506c109c8a736186f7
+_md5_=ff95a1decd5959a1fe6c97001308c709
diff --git a/metadata/md5-cache/dev-java/eclipse-ecj-4.26 b/metadata/md5-cache/dev-java/eclipse-ecj-4.26
new file mode 100644
index 000000000000..6b887f4513a8
--- /dev/null
+++ b/metadata/md5-cache/dev-java/eclipse-ecj-4.26
@@ -0,0 +1,15 @@
+DEFINED_PHASES=compile install postinst postrm preinst prepare setup test
+DEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jdk-17:* app-arch/unzip >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Eclipse Compiler for Java
+EAPI=8
+HOMEPAGE=https://www.eclipse.org/
+INHERIT=java-pkg-2 java-pkg-simple
+IUSE=+ant doc source
+KEYWORDS=~amd64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=EPL-1.0
+PDEPEND=ant? ( ~dev-java/ant-eclipse-ecj-4.26 )
+RDEPEND=app-eselect/eselect-java dev-java/ant-core:0 >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.26
+SRC_URI=https://download.eclipse.org/eclipse/downloads/drops4/R-4.26-202211231800/ecjsrc-4.26.jar
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1
+_md5_=501409b1f662b17185c3c02e90b9b59b
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-10.1.5 b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.5
new file mode 100644
index 000000000000..96d7cbb94cd8
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-10.1.5
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.5:10.1.5 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's EL API 5.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=5.0
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=c9b7e00b6ee5195fa2377154c18c922d
diff --git a/metadata/md5-cache/dev-java/tomcat-el-api-9.0.71 b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.71
new file mode 100644
index 000000000000..07d6fa2bb176
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-el-api-9.0.71
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.71:9.0.71 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's EL API 3.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=a6223da0c3e57c2cc020135be4b13aaf
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.5 b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.5
new file mode 100644
index 000000000000..f481013b2c55
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-10.1.5
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.5:10.1.5 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-11:* ~dev-java/tomcat-el-api-10.1.5:5.0 ~dev-java/tomcat-servlet-api-10.1.5:6.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's JSP API 3.1 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.5:5.0 ~dev-java/tomcat-servlet-api-10.1.5:6.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=3.1
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=245ed200d48251993d5dfa195fe9c2d7
diff --git a/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.71 b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.71
new file mode 100644
index 000000000000..ff1f7f41e4ab
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-jsp-api-9.0.71
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.71:9.0.71 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/tomcat-el-api-9.0.71:3.0 ~dev-java/tomcat-servlet-api-9.0.71:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's JSP API 2.3 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.71:3.0 ~dev-java/tomcat-servlet-api-9.0.71:4.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=2.3
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=c5147787e2184f572f0822ee48036246
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.5 b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.5
new file mode 100644
index 000000000000..cf8806c2e9e2
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-10.1.5
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.5:10.1.5 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-11:* ~dev-java/tomcat-el-api-10.1.5:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 6.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-11:* ~dev-java/tomcat-el-api-10.1.5:5.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=6.0
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=d289d63afc7a049e06d4261174c564ef
diff --git a/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.71 b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.71
new file mode 100644
index 000000000000..dfa42a8faa27
--- /dev/null
+++ b/metadata/md5-cache/dev-java/tomcat-servlet-api-9.0.71
@@ -0,0 +1,15 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.71:9.0.71 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile install preinst prepare setup test unpack
+DEPEND=>=virtual/jdk-1.8:* ~dev-java/tomcat-el-api-9.0.71:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+DESCRIPTION=Tomcat's Servlet API 4.0 implementation
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-pkg-simple verify-sig
+IUSE=doc source verify-sig
+KEYWORDS=~amd64 ~arm ~arm64 ~ppc64 ~x86 ~amd64-linux ~x86-linux ~x64-solaris ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=>=virtual/jre-1.8:* ~dev-java/tomcat-el-api-9.0.71:3.0 >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+SLOT=4.0
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz.asc )
+_eclasses_=java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-pkg-simple	257a59d157060d7bd51a13e68c614dd5	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=1391a38984d562e7ccbb698d90410507
diff --git a/metadata/md5-cache/dev-libs/Manifest.gz b/metadata/md5-cache/dev-libs/Manifest.gz
index d6fc56591982..b1dbb0bcf684 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/dqlite-1.13.0 b/metadata/md5-cache/dev-libs/dqlite-1.13.0
index 5ca66933f550..32bfea94b2b1 100644
--- a/metadata/md5-cache/dev-libs/dqlite-1.13.0
+++ b/metadata/md5-cache/dev-libs/dqlite-1.13.0
@@ -6,11 +6,11 @@ EAPI=8
 HOMEPAGE=https://dqlite.io/ https://github.com/canonical/dqlite
 INHERIT=autotools
 IUSE=test
-KEYWORDS=~amd64 ~arm64 ~x86
+KEYWORDS=amd64 ~arm64 ~x86
 LICENSE=LGPL-3-with-linking-exception
 RDEPEND=dev-db/sqlite:3 dev-libs/libuv:= >=dev-libs/raft-0.16.0
 RESTRICT=!test? ( test )
 SLOT=0/1.12.0
 SRC_URI=https://github.com/canonical/dqlite/archive/v1.13.0.tar.gz -> dqlite-1.13.0.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=51b3da1b50f1fdea54034c269f3b9e1b
+_md5_=cc01930f5041e801aa98d3adda35dde2
diff --git a/metadata/md5-cache/dev-lisp/Manifest.gz b/metadata/md5-cache/dev-lisp/Manifest.gz
index c70eafe3d062..bd81ec7ad629 100644
--- a/metadata/md5-cache/dev-lisp/Manifest.gz
+++ b/metadata/md5-cache/dev-lisp/Manifest.gz
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.2.10 b/metadata/md5-cache/dev-lisp/sbcl-2.2.10
deleted file mode 100644
index 8430ddadd4b3..000000000000
--- a/metadata/md5-cache/dev-lisp/sbcl-2.2.10
+++ /dev/null
@@ -1,14 +0,0 @@
-BDEPEND=>=dev-lisp/asdf-3.3:= doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
-DEFINED_PHASES=compile configure install prepare test unpack
-DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
-EAPI=8
-HOMEPAGE=https://www.sbcl.org/ http://sbcl.sourceforge.net/
-INHERIT=flag-o-matic pax-utils toolchain-funcs
-IUSE=debug doc source +threads +unicode +zstd
-KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
-LICENSE=MIT
-RDEPEND=>=dev-lisp/asdf-3.3:= zstd? ( app-arch/zstd ) !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
-SLOT=0/2.2.10
-SRC_URI=mirror://sourceforge/sbcl/sbcl-2.2.10-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.2.10-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) ppc64? ( mirror://sourceforge/sbcl/sbcl-1.5.8-ppc64le-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
-_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=18ae9a59b50c5d90c8d64a2fc719d7ab
diff --git a/metadata/md5-cache/dev-lisp/sbcl-2.3.0 b/metadata/md5-cache/dev-lisp/sbcl-2.3.0
new file mode 100644
index 000000000000..40d2bbd4895e
--- /dev/null
+++ b/metadata/md5-cache/dev-lisp/sbcl-2.3.0
@@ -0,0 +1,14 @@
+BDEPEND=>=dev-lisp/asdf-3.3:= prefix? ( dev-util/patchelf ) doc? ( sys-apps/texinfo >=media-gfx/graphviz-2.26.0 )
+DEFINED_PHASES=compile configure install prepare test unpack
+DESCRIPTION=Steel Bank Common Lisp (SBCL) is an implementation of ANSI Common Lisp
+EAPI=8
+HOMEPAGE=https://www.sbcl.org/ http://sbcl.sourceforge.net/
+INHERIT=flag-o-matic pax-utils toolchain-funcs
+IUSE=debug doc source +threads +unicode +zstd
+KEYWORDS=-* ~amd64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-linux ~x86-linux ~x64-macos ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-lisp/asdf-3.3:= prefix? ( dev-util/patchelf ) zstd? ( app-arch/zstd ) !prefix? ( elibc_glibc? ( >=sys-libs/glibc-2.6 ) )
+SLOT=0/2.3.0
+SRC_URI=mirror://sourceforge/sbcl/sbcl-2.3.0-source.tar.bz2 x86? ( mirror://sourceforge/sbcl/sbcl-1.4.3-x86-linux-binary.tar.bz2 ) amd64? ( mirror://sourceforge/sbcl/sbcl-2.3.0-x86-64-linux-binary.tar.bz2 ) ppc? ( mirror://sourceforge/sbcl/sbcl-1.2.7-powerpc-linux-binary.tar.bz2 ) ppc64? ( mirror://sourceforge/sbcl/sbcl-1.5.8-ppc64le-linux-binary.tar.bz2 ) sparc? ( mirror://sourceforge/sbcl/sbcl-1.0.28-sparc-linux-binary.tar.bz2 ) alpha? ( mirror://sourceforge/sbcl/sbcl-1.0.28-alpha-linux-binary.tar.bz2 ) arm? ( mirror://sourceforge/sbcl/sbcl-1.4.11-armhf-linux-binary.tar.bz2 ) arm64? ( mirror://sourceforge/sbcl/sbcl-1.4.2-arm64-linux-binary.tar.bz2 ) x64-macos? ( mirror://sourceforge/sbcl/sbcl-1.2.11-x86-64-darwin-binary.tar.bz2 ) ppc-macos? ( mirror://sourceforge/sbcl/sbcl-1.0.47-powerpc-darwin-binary.tar.bz2 ) x86-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-solaris-binary.tar.bz2 ) x64-solaris? ( mirror://sourceforge/sbcl/sbcl-1.2.7-x86-64-solaris-binary.tar.bz2 ) sparc-solaris? ( mirror://sourceforge/sbcl/sbcl-1.0.23-sparc-solaris-binary.tar.bz2 )
+_eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	pax-utils	91d47e5d20627c717aa878b9167c62a8	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=437ba69b13ac22ab973bdaa69b5e70d6
diff --git a/metadata/md5-cache/dev-python/Faker-15.3.4 b/metadata/md5-cache/dev-python/Faker-15.3.4
index 10ac46655170..750709411058 100644
--- a/metadata/md5-cache/dev-python/Faker-15.3.4
+++ b/metadata/md5-cache/dev-python/Faker-15.3.4
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/joke2k/faker/ https://pypi.org/project/Faker/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/python-dateutil-2.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !dev-ruby/faker python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/F/Faker/Faker-15.3.4.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=5458c0fa6c5688ba19ec02ef9899987a
+_md5_=3288827ce10e3d1cfdd51be19ec22d70
diff --git a/metadata/md5-cache/dev-python/Manifest.gz b/metadata/md5-cache/dev-python/Manifest.gz
index 48a2958dfeff..df176032ea6b 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/alembic-1.9.2 b/metadata/md5-cache/dev-python/alembic-1.9.2
new file mode 100644
index 000000000000..485c4fe368a4
--- /dev/null
+++ b/metadata/md5-cache/dev-python/alembic-1.9.2
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] dev-python/importlib_resources[python_targets_pypy3(-)?] ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Database migrations tool, written by the author of SQLAlchemy
+EAPI=8
+HOMEPAGE=https://github.com/sqlalchemy/alembic/ https://pypi.org/project/alembic/
+INHERIT=distutils-r1
+IUSE=doc test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+LICENSE=MIT
+RDEPEND=>=dev-python/sqlalchemy-1.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mako[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/python-editor-0.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-dateutil[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( dev-python/importlib_metadata[python_targets_pypy3(-)?] dev-python/importlib_resources[python_targets_pypy3(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/a/alembic/alembic-1.9.2.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=d44d4ceb8ef0355024f785c0eef36bb5
diff --git a/metadata/md5-cache/dev-python/hypothesis-6.62.1 b/metadata/md5-cache/dev-python/hypothesis-6.62.1
new file mode 100644
index 000000000000..fe1f3162bc0c
--- /dev/null
+++ b/metadata/md5-cache/dev-python/hypothesis-6.62.1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pexpect[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] !!<dev-python/requests-toolbelt-0.10.1 ) test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),sqlite] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=A library for property based testing
+EAPI=8
+HOMEPAGE=https://github.com/HypothesisWorks/hypothesis/ https://pypi.org/project/hypothesis/
+INHERIT=distutils-r1 multiprocessing optfeature
+IUSE=cli test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MPL-2.0
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/sortedcontainers-2.1.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) cli? ( python_targets_python3_9? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/black[python_targets_python3_9(-)?,python_targets_python3_10(-)?] dev-python/click[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+),sqlite] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+),sqlite] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+),sqlite] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+),sqlite] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/HypothesisWorks/hypothesis/archive/hypothesis-python-6.62.1.tar.gz -> hypothesis-6.62.1.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=990cdabf0a2222632a46e5fc0ed375f9
diff --git a/metadata/md5-cache/dev-python/mkdocs-material-9.0.5 b/metadata/md5-cache/dev-python/mkdocs-material-9.0.5
new file mode 100644
index 000000000000..a94cb871aa38
--- /dev/null
+++ b/metadata/md5-cache/dev-python/mkdocs-material-9.0.5
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hatchling-1.11.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] doc? ( || ( ( >=dev-lang/python-3.11.1:3.11 dev-python/mkdocs[python_targets_python3_11(-)] dev-python/mkdocs-material-extensions[python_targets_python3_11(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_11(-)] dev-python/mkdocs-redirects[python_targets_python3_11(-)] ) ( >=dev-lang/python-3.10.9:3.10 dev-python/mkdocs[python_targets_python3_10(-)] dev-python/mkdocs-material-extensions[python_targets_python3_10(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_10(-)] dev-python/mkdocs-redirects[python_targets_python3_10(-)] ) ( >=dev-lang/python-3.9.16:3.9 dev-python/mkdocs[python_targets_python3_9(-)] dev-python/mkdocs-material-extensions[python_targets_python3_9(-)] dev-python/mkdocs-minify-plugin[python_targets_python3_9(-)] dev-python/mkdocs-redirects[python_targets_python3_9(-)] ) ) )
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=A Material Design theme for MkDocs
+EAPI=8
+HOMEPAGE=https://github.com/squidfunk/mkdocs-material/ https://pypi.org/project/mkdocs-material/
+INHERIT=distutils-r1 docs
+IUSE=python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 doc
+KEYWORDS=~amd64 ~ppc ~riscv ~x86
+LICENSE=MIT
+PDEPEND=>=dev-python/mkdocs-material-extensions-1.1.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+RDEPEND=>=dev-python/jinja-3.0.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/markdown-3.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/mkdocs-1.4.2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.14[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pymdown-extensions-9.9.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=https://github.com/squidfunk/mkdocs-material/archive/9.0.5.tar.gz -> mkdocs-material-9.0.5.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	docs	314e509c51630fb75f120d62a77d008c	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=82e775e9d3e22e2c3f8a7abae5637e4d
diff --git a/metadata/md5-cache/dev-python/pytest-7.2.1 b/metadata/md5-cache/dev-python/pytest-7.2.1
new file mode 100644
index 000000000000..c4a64e923074
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytest-7.2.1
@@ -0,0 +1,16 @@
+BDEPEND=>=dev-python/setuptools_scm-6.2.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] test? ( >=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( dev-python/argcomplete[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hypothesis-3.56[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.7.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmlschema[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( dev-python/argcomplete[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hypothesis-3.56[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.7.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmlschema[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_10? ( dev-python/argcomplete[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hypothesis-3.56[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.7.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmlschema[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_11? ( dev-python/argcomplete[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/hypothesis-3.56[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/mock[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pygments-2.7.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest-xdist[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/xmlschema[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Simple powerful testing with Python
+EAPI=8
+HOMEPAGE=https://pytest.org/ https://github.com/pytest-dev/pytest/ https://pypi.org/project/pytest/
+INHERIT=distutils-r1 multiprocessing
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
+LICENSE=MIT
+RDEPEND=>=dev-python/attrs-19.2.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/iniconfig[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/more-itertools-4.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/packaging[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pluggy-0.12[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_9? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( >=dev-python/exceptiongroup-1.0.0_rc8[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] >=dev-python/tomli-1.0.0[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytest/pytest-7.2.1.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=11763aa3db83a57b099afdc79308e315
diff --git a/metadata/md5-cache/dev-python/python-box-6.1.0 b/metadata/md5-cache/dev-python/python-box-6.1.0
index 6e12cf7e5b94..e61889f6ed7a 100644
--- a/metadata/md5-cache/dev-python/python-box-6.1.0
+++ b/metadata/md5-cache/dev-python/python-box-6.1.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/cdgriffith/Box/ https://pypi.org/project/python-box/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=dev-python/msgpack[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/ruamel-yaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) python_targets_python3_10? ( dev-python/tomli[python_targets_python3_9(-)?,python_targets_python3_10(-)?] ) dev-python/tomli-w[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( 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/cdgriffith/Box/archive/6.1.0.tar.gz -> Box-6.1.0.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c2201691cad1e3126a94f0932378a0c8
+_md5_=d7573f5dc1c8836809eb6665f7bf3722
diff --git a/metadata/md5-cache/dev-python/pytz-2022.7.1 b/metadata/md5-cache/dev-python/pytz-2022.7.1
new file mode 100644
index 000000000000..9ce1ca49b762
--- /dev/null
+++ b/metadata/md5-cache/dev-python/pytz-2022.7.1
@@ -0,0 +1,16 @@
+BDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DEPEND=|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] )
+DESCRIPTION=World timezone definitions for Python
+EAPI=8
+HOMEPAGE=https://pythonhosted.org/pytz/ https://launchpad.net/pytz/ https://pypi.org/project/pytz/
+INHERIT=distutils-r1
+IUSE=python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~x64-solaris
+LICENSE=MIT
+RDEPEND=|| ( >=sys-libs/timezone-data-2017a sys-libs/glibc[vanilla] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0=[threads(+)] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+SLOT=0
+SRC_URI=mirror://pypi/p/pytz/pytz-2022.7.1.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=d4fe703767fad084436dfc6f58bd294b
diff --git a/metadata/md5-cache/dev-python/rich-13.1.0 b/metadata/md5-cache/dev-python/rich-13.1.0
new file mode 100644
index 000000000000..a989c3fd54e2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/rich-13.1.0
@@ -0,0 +1,16 @@
+BDEPEND=test? ( dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/poetry-core-1.3.2[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install postinst prepare test
+DESCRIPTION=Python library for rendering rich text, tables, etc. to the terminal
+EAPI=8
+HOMEPAGE=https://github.com/Textualize/rich/ https://pypi.org/project/rich/
+INHERIT=distutils-r1 optfeature
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86
+LICENSE=MIT
+RDEPEND=dev-python/colorama[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/commonmark[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pygments[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/Textualize/rich/archive/v13.1.0.tar.gz -> rich-13.1.0.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=6474c43aa2fc7c9751412fca087f9751
diff --git a/metadata/md5-cache/dev-python/sabyenc-5.4.2 b/metadata/md5-cache/dev-python/sabyenc-5.4.2
deleted file mode 100644
index 86c84af42ac0..000000000000
--- a/metadata/md5-cache/dev-python/sabyenc-5.4.2
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Module providing raw yEnc encoding/decoding for SABnzbd
-EAPI=8
-HOMEPAGE=https://github.com/sabnzbd/sabyenc
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sabnzbd/sabyenc/archive/v5.4.2.tar.gz -> sabyenc-5.4.2.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=493961928a6617497031ce002e9b1b64
diff --git a/metadata/md5-cache/dev-python/sabyenc-5.4.3 b/metadata/md5-cache/dev-python/sabyenc-5.4.3
deleted file mode 100644
index f28a58bbb701..000000000000
--- a/metadata/md5-cache/dev-python/sabyenc-5.4.3
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/chardet[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Module providing raw yEnc encoding/decoding for SABnzbd
-EAPI=8
-HOMEPAGE=https://github.com/sabnzbd/sabyenc
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=amd64 ~x86
-LICENSE=LGPL-3
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sabnzbd/sabyenc/archive/v5.4.3.tar.gz -> sabyenc-5.4.3.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=493961928a6617497031ce002e9b1b64
diff --git a/metadata/md5-cache/dev-python/tavalidate-0.0.6 b/metadata/md5-cache/dev-python/tavalidate-0.0.6
deleted file mode 100644
index 144423e4fd00..000000000000
--- a/metadata/md5-cache/dev-python/tavalidate-0.0.6
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=Utities to validate Tavern responses
-EAPI=8
-HOMEPAGE=https://github.com/sohoffice/tavalidate
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=mirror://pypi/t/tavalidate/tavalidate-0.0.6.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=39d98eb9275806b9719eeb59371d9577
diff --git a/metadata/md5-cache/dev-python/tavalidate-0.0.6-r1 b/metadata/md5-cache/dev-python/tavalidate-0.0.6-r1
new file mode 100644
index 000000000000..32b7f728ef40
--- /dev/null
+++ b/metadata/md5-cache/dev-python/tavalidate-0.0.6-r1
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/lxml-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-box[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Utities to validate Tavern responses
+EAPI=8
+HOMEPAGE=https://github.com/sohoffice/tavalidate/ https://pypi.org/project/tavalidate/
+INHERIT=distutils-r1
+IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=amd64
+LICENSE=MIT
+RDEPEND=>=dev-python/lxml-4.0.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-box[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=mirror://pypi/t/tavalidate/tavalidate-0.0.6.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=ea3e861753629824b41009ddd4303c19
diff --git a/metadata/md5-cache/dev-python/tavern-1.24.0 b/metadata/md5-cache/dev-python/tavern-1.24.0
deleted file mode 100644
index 3d9dd78ec6ae..000000000000
--- a/metadata/md5-cache/dev-python/tavern-1.24.0
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=test? ( dev-python/colorlog[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/Faker[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) test? ( dev-python/jmespath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paho-mqtt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyjwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pykwalify[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-box[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stevedore[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/pytest-7.1.3[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
-DEFINED_PHASES=compile configure install prepare test
-DESCRIPTION=A tool, library, and Pytest plugin for testing RESTful APIs
-EAPI=8
-HOMEPAGE=https://github.com/taverntesting/tavern
-INHERIT=distutils-r1
-IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
-LICENSE=MIT
-RDEPEND=dev-python/jmespath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paho-mqtt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyjwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pykwalify[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-box[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stevedore[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
-REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/taverntesting/tavern/archive/refs/tags/1.24.0.tar.gz -> tavern-1.24.0.gh.tar.gz
-_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=fc2d1f07031b4b2d5f9229f3aa4ea778
diff --git a/metadata/md5-cache/dev-python/tavern-1.24.1 b/metadata/md5-cache/dev-python/tavern-1.24.1
index b3c74ce58b23..72e436cabc33 100644
--- a/metadata/md5-cache/dev-python/tavern-1.24.1
+++ b/metadata/md5-cache/dev-python/tavern-1.24.1
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/taverntesting/tavern/ https://pypi.org/project/tavern/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=MIT
 RDEPEND=dev-python/jmespath[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/paho-mqtt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyjwt[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pykwalify[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pytest[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/python-box[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/pyyaml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/requests[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/stevedore[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( 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/taverntesting/tavern/archive/1.24.1.tar.gz -> tavern-1.24.1.gh.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=92cf1e364ee9bca627daf6844e11940f
+_md5_=db74cb4a9975570bf9315a7ecd4ce428
diff --git a/metadata/md5-cache/dev-python/validators-0.20.0 b/metadata/md5-cache/dev-python/validators-0.20.0
index c90b150f044b..6845d73c213a 100644
--- a/metadata/md5-cache/dev-python/validators-0.20.0
+++ b/metadata/md5-cache/dev-python/validators-0.20.0
@@ -5,7 +5,7 @@ EAPI=8
 HOMEPAGE=https://github.com/kvesteri/validators/ https://pypi.org/project/validators/
 INHERIT=distutils-r1
 IUSE=test python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
-KEYWORDS=~amd64 ~x86
+KEYWORDS=amd64 ~x86
 LICENSE=MIT
 RDEPEND=>=dev-python/decorator-3.4.0[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
 REQUIRED_USE=|| ( python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=mirror://pypi/v/validators/validators-0.20.0.tar.gz
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=4cab5135ff9cd9912f3f294a2736b4e7
+_md5_=3ae82473ca85a3a6091199917d610351
diff --git a/metadata/md5-cache/dev-python/wcwidth-0.2.6 b/metadata/md5-cache/dev-python/wcwidth-0.2.6
new file mode 100644
index 000000000000..60a5e812e5e2
--- /dev/null
+++ b/metadata/md5-cache/dev-python/wcwidth-0.2.6
@@ -0,0 +1,16 @@
+BDEPEND=test? ( >=dev-python/pytest-7.1.3[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) >=dev-python/gpep517-9[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_pypy3(-)?,python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+DEFINED_PHASES=compile configure install prepare test
+DESCRIPTION=Measures number of Terminal column cells of wide-character codes
+EAPI=8
+HOMEPAGE=https://pypi.org/project/wcwidth/ https://github.com/jquast/wcwidth/
+INHERIT=distutils-r1
+IUSE=test python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~m68k ~mips ~ppc ~ppc64 ~riscv ~s390 ~sparc ~x86 ~amd64-linux ~x86-linux
+LICENSE=MIT
+RDEPEND=python_targets_pypy3? ( >=dev-python/pypy3-7.3.10-r1:0= ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11 )
+REQUIRED_USE=|| ( python_targets_pypy3 python_targets_python3_9 python_targets_python3_10 python_targets_python3_11 )
+RESTRICT=!test? ( test )
+SLOT=0
+SRC_URI=https://github.com/jquast/wcwidth/archive/0.2.6.tar.gz -> wcwidth-0.2.6.gh.tar.gz
+_eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=9d962f73e1ef4ca3a4afd32e7eb9ac35
diff --git a/metadata/md5-cache/dev-ruby/Manifest.gz b/metadata/md5-cache/dev-ruby/Manifest.gz
index fffd22daf85b..bbc12ff87b8e 100644
--- a/metadata/md5-cache/dev-ruby/Manifest.gz
+++ b/metadata/md5-cache/dev-ruby/Manifest.gz
diff --git a/metadata/md5-cache/dev-ruby/asciimath-1.0.9 b/metadata/md5-cache/dev-ruby/asciimath-1.0.9
index 95cbee0d72dc..1026526f2742 100644
--- a/metadata/md5-cache/dev-ruby/asciimath-1.0.9
+++ b/metadata/md5-cache/dev-ruby/asciimath-1.0.9
@@ -1,17 +1,17 @@
-BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) )
+BDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( doc? ( dev-ruby/rdoc[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby27(-)] ) ) ruby_targets_ruby30? ( test? ( dev-ruby/rspec:3[ruby_targets_ruby30(-)] ) ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) test? ( ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] ) )
 DEFINED_PHASES=compile configure install prepare setup test unpack
-DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
+DEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
 DESCRIPTION=A pure Ruby AsciiMath parsing and conversion library
 EAPI=7
 HOMEPAGE=https://github.com/pepijnve/asciimath
 INHERIT=ruby-fakegem
-IUSE=ruby_targets_ruby27 doc test test
+IUSE=ruby_targets_ruby27 ruby_targets_ruby30 doc test test
 KEYWORDS=amd64 arm arm64 ~hppa ppc ppc64 ~sparc x86
 LICENSE=MIT
-RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] )
-REQUIRED_USE=|| ( ruby_targets_ruby27 )
+RDEPEND=ruby_targets_ruby27? ( dev-lang/ruby:2.7 ) ruby_targets_ruby30? ( dev-lang/ruby:3.0 ) ruby_targets_ruby27? ( virtual/rubygems[ruby_targets_ruby27(-)] ) ruby_targets_ruby30? ( virtual/rubygems[ruby_targets_ruby30(-)] )
+REQUIRED_USE=|| ( ruby_targets_ruby27 ruby_targets_ruby30 )
 RESTRICT=!test? ( test ) !test? ( test )
 SLOT=1
 SRC_URI=https://rubygems.org/gems/asciimath-1.0.9.gem
 _eclasses_=estack	055c42df72f76a4f45ec92b35e83cd56	multilib	5ca4e49abed8e3a2f7b56920eadee157	ruby-fakegem	b4704898f1b861fc19d465c8af7abe9c	ruby-ng	1147c87e94def682fd485ce7a14a86c2	ruby-utils	97c8e15d89dc6537e36cddedf413ed22	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b0bafd90840842d302187198832836dd
+_md5_=a884306ffb840e961666ae36b97a6b9b
diff --git a/metadata/md5-cache/dev-tcltk/Manifest.gz b/metadata/md5-cache/dev-tcltk/Manifest.gz
index 87488ea77a70..9c1079192354 100644
--- a/metadata/md5-cache/dev-tcltk/Manifest.gz
+++ b/metadata/md5-cache/dev-tcltk/Manifest.gz
diff --git a/metadata/md5-cache/dev-tcltk/blt-2.5.3-r1 b/metadata/md5-cache/dev-tcltk/blt-2.5.3-r2
index 3b212f798a1d..67836d5fcdc6 100644
--- a/metadata/md5-cache/dev-tcltk/blt-2.5.3-r1
+++ b/metadata/md5-cache/dev-tcltk/blt-2.5.3-r2
@@ -1,15 +1,15 @@
 BDEPEND=app-arch/unzip sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
 DEFINED_PHASES=compile configure install prepare
-DEPEND=dev-lang/tk:0= jpeg? ( media-libs/libjpeg-turbo:0= ) X? ( x11-libs/libX11 )
+DEPEND=dev-lang/tk:0= jpeg? ( media-libs/libjpeg-turbo:0= ) x11-libs/libX11
 DESCRIPTION=Extension to Tk, adding new widgets, geometry managers, and misc commands
 EAPI=7
 HOMEPAGE=https://sourceforge.net/projects/wize/
 INHERIT=autotools flag-o-matic multilib toolchain-funcs
-IUSE=jpeg static-libs X
+IUSE=jpeg static-libs
 KEYWORDS=~alpha amd64 arm arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~s390 sparc x86 ~amd64-linux ~x86-linux ~ppc-macos ~x64-macos ~sparc-solaris ~sparc64-solaris ~x64-solaris ~x86-solaris
 LICENSE=BSD
-RDEPEND=dev-lang/tk:0= jpeg? ( media-libs/libjpeg-turbo:0= ) X? ( x11-libs/libX11 )
+RDEPEND=dev-lang/tk:0= jpeg? ( media-libs/libjpeg-turbo:0= ) x11-libs/libX11
 SLOT=0/25
 SRC_URI=mirror://sourceforge/wize/blt-src-2.5.3.zip https://dev.gentoo.org/~tupone/distfiles/blt-2.5.3-debian-patches.tar.gz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c
-_md5_=9d76acb148043a935d97de2800c3eb30
+_md5_=b85bab4f5c012887d5626bfee8268c09
diff --git a/metadata/md5-cache/dev-util/Manifest.gz b/metadata/md5-cache/dev-util/Manifest.gz
index cf71282018c9..42242d1f71e8 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/mingw64-toolchain-10.0.0_p2 b/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0_p2
new file mode 100644
index 000000000000..7c4c286cc25a
--- /dev/null
+++ b/metadata/md5-cache/dev-util/mingw64-toolchain-10.0.0_p2
@@ -0,0 +1,14 @@
+DEFINED_PHASES=compile install postinst prepare pretend
+DEPEND=dev-libs/gmp:= dev-libs/mpc:= dev-libs/mpfr:= sys-libs/zlib:= virtual/libiconv
+DESCRIPTION=All-in-one mingw64 toolchain intended for building Wine without crossdev
+EAPI=8
+HOMEPAGE=https://www.mingw-w64.org/ https://gcc.gnu.org/ https://sourceware.org/binutils/
+INHERIT=edo flag-o-matic multilib-build toolchain-funcs
+IUSE=+abi_x86_32 custom-cflags debug abi_x86_32 abi_x86_64
+LICENSE=GPL-3+ LGPL-3+ || ( GPL-3+ libgcc libstdc++ gcc-runtime-library-exception-3.1 ) ZPL BSD BSD-2 ISC LGPL-2+ LGPL-2.1+ MIT public-domain
+RDEPEND=dev-libs/gmp:= dev-libs/mpc:= dev-libs/mpfr:= sys-libs/zlib:= virtual/libiconv
+REQUIRED_USE=|| ( abi_x86_32 abi_x86_64 )
+SLOT=0
+SRC_URI=mirror://sourceforge/mingw-w64/mingw-w64/mingw-w64-release/mingw-w64-v10.0.0.tar.bz2 mirror://gnu/gcc/gcc-12.2.0/gcc-12.2.0.tar.xz mirror://gnu/binutils/binutils-2.40.tar.xz https://sourceware.org/pub/binutils/releases/binutils-2.40.tar.xz
+_eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	flag-o-matic	69394e25812406faa1f90edaf4969395	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=2d7bb3075e3e2047fe629bfc9bb06ada
diff --git a/metadata/md5-cache/dev-util/scons-4.4.0-r1 b/metadata/md5-cache/dev-util/scons-4.4.0-r1
index cbb06a70ff21..25163db7bebd 100644
--- a/metadata/md5-cache/dev-util/scons-4.4.0-r1
+++ b/metadata/md5-cache/dev-util/scons-4.4.0-r1
@@ -1,4 +1,4 @@
-BDEPEND=test? ( dev-libs/libxml2[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
+BDEPEND=test? ( dev-python/lxml[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] dev-python/psutil[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] ) python_targets_python3_9? ( >=dev-lang/python-3.9.16:3.9[threads(+)] ) python_targets_python3_10? ( >=dev-lang/python-3.10.9:3.10[threads(+)] ) python_targets_python3_11? ( >=dev-lang/python-3.11.1:3.11[threads(+)] ) >=dev-python/gpep517-9[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/setuptools-65.5.1[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?] >=dev-python/wheel-0.38.4[python_targets_python3_9(-)?,python_targets_python3_10(-)?,python_targets_python3_11(-)?]
 DEFINED_PHASES=compile configure install prepare test unpack
 DESCRIPTION=Extensible Python-based build utility
 EAPI=8
@@ -13,4 +13,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://downloads.sourceforge.net/project/scons/scons/4.4.0/SCons-4.4.0.tar.gz doc? ( https://www.scons.org/doc/4.4.0/PDF/scons-user.pdf -> scons-4.4.0-user.pdf https://www.scons.org/doc/4.4.0/HTML/scons-user.html -> scons-4.4.0-user.html ) test? ( https://github.com/SCons/scons/archive/4.4.0.tar.gz -> scons-4.4.0.gh.tar.gz )
 _eclasses_=distutils-r1	dcd5f48510105eb95e550ab968147365	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-r1	666be58f658d6b32affe30f80e39a49e	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=7655bae86af22fa888ec6506601edb1d
+_md5_=be073f41e14eab3c20f8006a47068c53
diff --git a/metadata/md5-cache/gnome-extra/Manifest.gz b/metadata/md5-cache/gnome-extra/Manifest.gz
index 7c596535b1d2..274ed5c58ab5 100644
--- a/metadata/md5-cache/gnome-extra/Manifest.gz
+++ b/metadata/md5-cache/gnome-extra/Manifest.gz
diff --git a/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.2.1-r3 b/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.2.1-r3
index 2cfe73bc9304..1c5e58bb64db 100644
--- a/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.2.1-r3
+++ b/metadata/md5-cache/gnome-extra/cinnamon-control-center-5.2.1-r3
@@ -6,7 +6,7 @@ EAPI=7
 HOMEPAGE=https://projects.linuxmint.com/cinnamon/ https://github.com/linuxmint/cinnamon-control-center
 INHERIT=meson gnome2-utils python-any-r1 xdg virtualx
 IUSE=+colord input_devices_wacom +networkmanager +modemmanager gnome-online-accounts systemd test test
-KEYWORDS=~amd64 ~arm64 ~riscv ~x86
+KEYWORDS=amd64 ~arm64 ~riscv x86
 LICENSE=GPL-2+ LGPL-2+ LGPL-2.1+ MIT
 RDEPEND=>=dev-libs/glib-2.44.0:2 >=gnome-base/libgnomekbd-3.0.0:0= >=gnome-extra/cinnamon-desktop-5.2:0= >=gnome-extra/cinnamon-menus-5.2:0= media-libs/fontconfig >=sys-auth/polkit-0.103 >=x11-libs/gdk-pixbuf-2.23.0:2 >=x11-libs/gtk+-3.16.0:3 >=x11-libs/libnotify-0.7.3:0= x11-libs/libX11 >=x11-libs/libxklavier-5.1 colord? ( >=x11-misc/colord-0.1.14:0= ) input_devices_wacom? ( >=dev-libs/libwacom-0.7:= >=gnome-extra/cinnamon-settings-daemon-5.2:0= >=x11-libs/libXi-1.2 ) networkmanager? ( >=gnome-extra/nm-applet-1.2.0 >=net-libs/libnma-1.8.34 >=net-misc/networkmanager-1.2.0:=[modemmanager?] modemmanager? ( >=net-misc/modemmanager-0.7 ) ) gnome-online-accounts? ( >=net-libs/gnome-online-accounts-3.18.0 ) x11-themes/adwaita-icon-theme colord? ( >=gnome-extra/gnome-color-manager-3 ) input_devices_wacom? ( gnome-extra/cinnamon-settings-daemon[input_devices_wacom] ) systemd? ( >=sys-apps/systemd-31 ) !systemd? ( app-admin/openrc-settingsd )
 REQUIRED_USE=modemmanager? ( networkmanager )
@@ -14,4 +14,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/linuxmint/cinnamon-control-center/archive/5.2.1.tar.gz -> cinnamon-control-center-5.2.1.tar.gz
 _eclasses_=eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	gnome2-utils	2116cec8f46f4d1b0a88c5b1f1575dd3	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	virtualx	644887c82aefdf12001489391fca4f02	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=93005faab51ccc11d5c7d1821ba97d36
+_md5_=3f9500f0f004d1d699ea46d913eb1bda
diff --git a/metadata/md5-cache/media-libs/Manifest.gz b/metadata/md5-cache/media-libs/Manifest.gz
index 5d60244c6493..02eebbd3039f 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/openh264-2.3.1-r1 b/metadata/md5-cache/media-libs/openh264-2.3.1-r1
index ac2985149f9a..e8111c6ed273 100644
--- a/metadata/md5-cache/media-libs/openh264-2.3.1-r1
+++ b/metadata/md5-cache/media-libs/openh264-2.3.1-r1
@@ -5,10 +5,10 @@ EAPI=8
 HOMEPAGE=https://www.openh264.org/ https://github.com/cisco/openh264
 INHERIT=toolchain-funcs multilib-minimal
 IUSE=cpu_flags_arm_neon cpu_flags_x86_avx2 +plugin utils abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64
-KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ~ppc64 ~riscv ~sparc x86
+KEYWORDS=~alpha amd64 ~arm arm64 ~hppa ~ia64 ~loong ~ppc ppc64 ~riscv ~sparc x86
 LICENSE=BSD
 RESTRICT=bindist test
 SLOT=0/7
 SRC_URI=https://github.com/cisco/openh264/archive/refs/tags/v2.3.1.tar.gz -> openh264-2.3.1.tar.gz https://github.com/mozilla/gmp-api/archive/3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz -> gmp-api-Firefox39-3a01c086d1b0394238ff1b5ad22e76022830625a.tar.gz
 _eclasses_=multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=484c131621be65508447aa7e34ab5341
+_md5_=aa3e8a6eb298fedbe2356555ff274bdf
diff --git a/metadata/md5-cache/media-sound/Manifest.gz b/metadata/md5-cache/media-sound/Manifest.gz
index 6542614f924f..77249329d80e 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/mpd-0.23.11 b/metadata/md5-cache/media-sound/mpd-0.23.11
index a91c3e67c4f8..ca55c0768ff4 100644
--- a/metadata/md5-cache/media-sound/mpd-0.23.11
+++ b/metadata/md5-cache/media-sound/mpd-0.23.11
@@ -7,7 +7,7 @@ HOMEPAGE=https://www.musicpd.org https://github.com/MusicPlayerDaemon/MPD
 IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
 INHERIT=flag-o-matic linux-info meson systemd xdg
 IUSE=+alsa ao +audiofile bzip2 cdio chromaprint +cue +curl doc +dbus +eventfd expat faad +ffmpeg +fifo flac fluidsynth gme +icu +id3tag +inotify jack lame libmpdclient libsamplerate libsoxr +mad mikmod mms modplug mpg123 musepack +network nfs openal openmpt opus oss pipe pipewire pulseaudio qobuz recorder samba selinux sid signalfd snapcast sndfile sndio soundcloud sqlite systemd test twolame udisks vorbis wavpack webdav wildmidi upnp zeroconf zip zlib
-KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv ~x86
+KEYWORDS=amd64 ~arm ~arm64 ppc ppc64 ~riscv x86
 LICENSE=GPL-2
 RDEPEND=acct-user/mpd dev-libs/libfmt:= dev-libs/libpcre2 media-libs/libogg sys-libs/liburing:= alsa? ( media-libs/alsa-lib media-sound/alsa-utils ) ao? ( media-libs/libao:=[alsa?,pulseaudio?] ) audiofile? ( media-libs/audiofile:= ) bzip2? ( app-arch/bzip2 ) cdio? ( dev-libs/libcdio:= dev-libs/libcdio-paranoia ) chromaprint? ( media-libs/chromaprint ) curl? ( net-misc/curl ) dbus? ( sys-apps/dbus ) doc? ( dev-python/sphinx ) expat? ( dev-libs/expat ) faad? ( media-libs/faad2 ) ffmpeg? ( media-video/ffmpeg:= ) flac? ( media-libs/flac:= ) fluidsynth? ( media-sound/fluidsynth ) gme? ( >=media-libs/game-music-emu-0.6.0_pre20120802 ) icu? ( dev-libs/icu:= virtual/libiconv ) id3tag? ( media-libs/libid3tag:= ) jack? ( virtual/jack ) lame? ( network? ( media-sound/lame ) ) libmpdclient? ( media-libs/libmpdclient ) libsamplerate? ( media-libs/libsamplerate ) libsoxr? ( media-libs/soxr ) mad? ( media-libs/libmad ) mikmod? ( media-libs/libmikmod ) mms? ( media-libs/libmms ) modplug? ( media-libs/libmodplug ) mpg123? ( media-sound/mpg123 ) musepack? ( media-sound/musepack-tools ) network? ( >=media-libs/libshout-2.4.0 ) nfs? ( net-fs/libnfs ) openal? ( media-libs/openal ) openmpt? ( media-libs/libopenmpt ) opus? ( media-libs/opus ) pulseaudio? ( media-sound/pulseaudio ) pipewire? ( media-video/pipewire:= ) qobuz? ( dev-libs/libgcrypt:0 ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-mpd ) sid? ( || ( media-libs/libsidplay:2 media-libs/libsidplayfp ) ) snapcast? ( media-sound/snapcast ) sndfile? ( media-libs/libsndfile ) sndio? ( media-sound/sndio ) soundcloud? ( >=dev-libs/yajl-2:= ) sqlite? ( dev-db/sqlite:3 ) systemd? ( sys-apps/systemd:= ) twolame? ( media-sound/twolame ) udisks? ( sys-fs/udisks:2 ) upnp? ( net-libs/libupnp:0 ) vorbis? ( media-libs/libvorbis ) wavpack? ( media-sound/wavpack ) wildmidi? ( media-sound/wildmidi ) zeroconf? ( net-dns/avahi[dbus] ) zip? ( dev-libs/zziplib:= ) zlib? ( sys-libs/zlib:= )
 REQUIRED_USE=|| ( alsa ao fifo jack network openal oss pipe pipewire pulseaudio snapcast sndio recorder ) || ( audiofile faad ffmpeg flac fluidsynth mad mikmod modplug mpg123 musepack opus openmpt flac sid vorbis wavpack wildmidi ) network? ( || ( audiofile flac lame twolame vorbis ) ) recorder? ( || ( audiofile flac lame twolame vorbis ) ) qobuz? ( curl soundcloud ) soundcloud? ( curl qobuz ) udisks? ( dbus ) upnp? ( curl expat ) webdav? ( curl expat )
@@ -15,4 +15,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://www.musicpd.org/download/mpd/0.23/mpd-0.23.11.tar.xz
 _eclasses_=flag-o-matic	69394e25812406faa1f90edaf4969395	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	meson	1994a5aef5d4f5798b92f64d6f9a6003	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=e25547321b2a7155f33d8a696c5a6cfd
+_md5_=30d71c23ff52f2d63a128552000b5868
diff --git a/metadata/md5-cache/media-sound/rescrobbled-0.6.2 b/metadata/md5-cache/media-sound/rescrobbled-0.6.2-r1
index 6b75654d177a..8c5a9a213e14 100644
--- a/metadata/md5-cache/media-sound/rescrobbled-0.6.2
+++ b/metadata/md5-cache/media-sound/rescrobbled-0.6.2-r1
@@ -12,4 +12,4 @@ RESTRICT=test
 SLOT=0
 SRC_URI=https://github.com/InputUsername/rescrobbled/archive/refs/tags/v0.6.2.tar.gz -> rescrobbled-0.6.2.tar.gz https://crates.io/api/v1/crates/adler/1.0.2/download -> adler-1.0.2.crate https://crates.io/api/v1/crates/aho-corasick/0.7.18/download -> aho-corasick-0.7.18.crate https://crates.io/api/v1/crates/anyhow/1.0.58/download -> anyhow-1.0.58.crate https://crates.io/api/v1/crates/async-broadcast/0.4.0/download -> async-broadcast-0.4.0.crate https://crates.io/api/v1/crates/async-channel/1.6.1/download -> async-channel-1.6.1.crate https://crates.io/api/v1/crates/async-executor/1.4.1/download -> async-executor-1.4.1.crate https://crates.io/api/v1/crates/async-io/1.7.0/download -> async-io-1.7.0.crate https://crates.io/api/v1/crates/async-lock/2.5.0/download -> async-lock-2.5.0.crate https://crates.io/api/v1/crates/async-recursion/0.3.2/download -> async-recursion-0.3.2.crate https://crates.io/api/v1/crates/async-task/4.3.0/download -> async-task-4.3.0.crate https://crates.io/api/v1/crates/async-trait/0.1.56/download -> async-trait-0.1.56.crate https://crates.io/api/v1/crates/attohttpc/0.17.0/download -> attohttpc-0.17.0.crate https://crates.io/api/v1/crates/attohttpc/0.19.1/download -> attohttpc-0.19.1.crate https://crates.io/api/v1/crates/autocfg/1.1.0/download -> autocfg-1.1.0.crate https://crates.io/api/v1/crates/bitflags/1.3.2/download -> bitflags-1.3.2.crate https://crates.io/api/v1/crates/block/0.1.6/download -> block-0.1.6.crate https://crates.io/api/v1/crates/byteorder/1.4.3/download -> byteorder-1.4.3.crate https://crates.io/api/v1/crates/bytes/1.2.0/download -> bytes-1.2.0.crate https://crates.io/api/v1/crates/cache-padded/1.2.0/download -> cache-padded-1.2.0.crate https://crates.io/api/v1/crates/cc/1.0.73/download -> cc-1.0.73.crate https://crates.io/api/v1/crates/cfg-if/1.0.0/download -> cfg-if-1.0.0.crate https://crates.io/api/v1/crates/concurrent-queue/1.2.2/download -> concurrent-queue-1.2.2.crate https://crates.io/api/v1/crates/core-foundation/0.9.3/download -> core-foundation-0.9.3.crate https://crates.io/api/v1/crates/core-foundation-sys/0.8.3/download -> core-foundation-sys-0.8.3.crate https://crates.io/api/v1/crates/crc32fast/1.3.2/download -> crc32fast-1.3.2.crate https://crates.io/api/v1/crates/darling/0.13.4/download -> darling-0.13.4.crate https://crates.io/api/v1/crates/darling_core/0.13.4/download -> darling_core-0.13.4.crate https://crates.io/api/v1/crates/darling_macro/0.13.4/download -> darling_macro-0.13.4.crate https://crates.io/api/v1/crates/dbus/0.9.6/download -> dbus-0.9.6.crate https://crates.io/api/v1/crates/derivative/2.2.0/download -> derivative-2.2.0.crate https://crates.io/api/v1/crates/derive_is_enum_variant/0.1.1/download -> derive_is_enum_variant-0.1.1.crate https://crates.io/api/v1/crates/dirs/4.0.0/download -> dirs-4.0.0.crate https://crates.io/api/v1/crates/dirs-next/2.0.0/download -> dirs-next-2.0.0.crate https://crates.io/api/v1/crates/dirs-sys/0.3.7/download -> dirs-sys-0.3.7.crate https://crates.io/api/v1/crates/dirs-sys-next/0.1.2/download -> dirs-sys-next-0.1.2.crate https://crates.io/api/v1/crates/easy-parallel/3.2.0/download -> easy-parallel-3.2.0.crate https://crates.io/api/v1/crates/enum-kinds/0.5.1/download -> enum-kinds-0.5.1.crate https://crates.io/api/v1/crates/enumflags2/0.7.5/download -> enumflags2-0.7.5.crate https://crates.io/api/v1/crates/enumflags2_derive/0.7.4/download -> enumflags2_derive-0.7.4.crate https://crates.io/api/v1/crates/event-listener/2.5.2/download -> event-listener-2.5.2.crate https://crates.io/api/v1/crates/fastrand/1.7.0/download -> fastrand-1.7.0.crate https://crates.io/api/v1/crates/flate2/1.0.24/download -> flate2-1.0.24.crate https://crates.io/api/v1/crates/fnv/1.0.7/download -> fnv-1.0.7.crate https://crates.io/api/v1/crates/foreign-types/0.3.2/download -> foreign-types-0.3.2.crate https://crates.io/api/v1/crates/foreign-types-shared/0.1.1/download -> foreign-types-shared-0.1.1.crate https://crates.io/api/v1/crates/form_urlencoded/1.0.1/download -> form_urlencoded-1.0.1.crate https://crates.io/api/v1/crates/from_variants/1.0.0/download -> from_variants-1.0.0.crate https://crates.io/api/v1/crates/from_variants_impl/1.0.0/download -> from_variants_impl-1.0.0.crate https://crates.io/api/v1/crates/futures-core/0.3.21/download -> futures-core-0.3.21.crate https://crates.io/api/v1/crates/futures-io/0.3.21/download -> futures-io-0.3.21.crate https://crates.io/api/v1/crates/futures-lite/1.12.0/download -> futures-lite-1.12.0.crate https://crates.io/api/v1/crates/futures-sink/0.3.21/download -> futures-sink-0.3.21.crate https://crates.io/api/v1/crates/futures-task/0.3.21/download -> futures-task-0.3.21.crate https://crates.io/api/v1/crates/futures-util/0.3.21/download -> futures-util-0.3.21.crate https://crates.io/api/v1/crates/getrandom/0.2.7/download -> getrandom-0.2.7.crate https://crates.io/api/v1/crates/heck/0.3.3/download -> heck-0.3.3.crate https://crates.io/api/v1/crates/hex/0.4.3/download -> hex-0.4.3.crate https://crates.io/api/v1/crates/http/0.2.8/download -> http-0.2.8.crate https://crates.io/api/v1/crates/ident_case/1.0.1/download -> ident_case-1.0.1.crate https://crates.io/api/v1/crates/idna/0.2.3/download -> idna-0.2.3.crate https://crates.io/api/v1/crates/instant/0.1.12/download -> instant-0.1.12.crate https://crates.io/api/v1/crates/itoa/1.0.2/download -> itoa-1.0.2.crate https://crates.io/api/v1/crates/lazy_static/1.4.0/download -> lazy_static-1.4.0.crate https://crates.io/api/v1/crates/libc/0.2.126/download -> libc-0.2.126.crate https://crates.io/api/v1/crates/libdbus-sys/0.2.2/download -> libdbus-sys-0.2.2.crate https://crates.io/api/v1/crates/listenbrainz/0.4.2/download -> listenbrainz-0.4.2.crate https://crates.io/api/v1/crates/lock_api/0.4.7/download -> lock_api-0.4.7.crate https://crates.io/api/v1/crates/log/0.4.17/download -> log-0.4.17.crate https://crates.io/api/v1/crates/mac-notification-sys/0.5.5/download -> mac-notification-sys-0.5.5.crate https://crates.io/api/v1/crates/malloc_buf/0.0.6/download -> malloc_buf-0.0.6.crate https://crates.io/api/v1/crates/matches/0.1.9/download -> matches-0.1.9.crate https://crates.io/api/v1/crates/md5/0.7.0/download -> md5-0.7.0.crate https://crates.io/api/v1/crates/memchr/2.5.0/download -> memchr-2.5.0.crate https://crates.io/api/v1/crates/memoffset/0.6.5/download -> memoffset-0.6.5.crate https://crates.io/api/v1/crates/miniz_oxide/0.5.3/download -> miniz_oxide-0.5.3.crate https://crates.io/api/v1/crates/mpris/2.0.0/download -> mpris-2.0.0.crate https://crates.io/api/v1/crates/native-tls/0.2.10/download -> native-tls-0.2.10.crate https://crates.io/api/v1/crates/nix/0.23.1/download -> nix-0.23.1.crate https://crates.io/api/v1/crates/notify-rust/4.5.8/download -> notify-rust-4.5.8.crate https://crates.io/api/v1/crates/num_threads/0.1.6/download -> num_threads-0.1.6.crate https://crates.io/api/v1/crates/objc/0.2.7/download -> objc-0.2.7.crate https://crates.io/api/v1/crates/objc-foundation/0.1.1/download -> objc-foundation-0.1.1.crate https://crates.io/api/v1/crates/objc_id/0.1.1/download -> objc_id-0.1.1.crate https://crates.io/api/v1/crates/once_cell/1.13.0/download -> once_cell-1.13.0.crate https://crates.io/api/v1/crates/openssl/0.10.41/download -> openssl-0.10.41.crate https://crates.io/api/v1/crates/openssl-macros/0.1.0/download -> openssl-macros-0.1.0.crate https://crates.io/api/v1/crates/openssl-probe/0.1.5/download -> openssl-probe-0.1.5.crate https://crates.io/api/v1/crates/openssl-sys/0.9.75/download -> openssl-sys-0.9.75.crate https://crates.io/api/v1/crates/ordered-stream/0.0.1/download -> ordered-stream-0.0.1.crate https://crates.io/api/v1/crates/parking/2.0.0/download -> parking-2.0.0.crate https://crates.io/api/v1/crates/parking_lot/0.11.2/download -> parking_lot-0.11.2.crate https://crates.io/api/v1/crates/parking_lot_core/0.8.5/download -> parking_lot_core-0.8.5.crate https://crates.io/api/v1/crates/percent-encoding/2.1.0/download -> percent-encoding-2.1.0.crate https://crates.io/api/v1/crates/pin-project-lite/0.2.9/download -> pin-project-lite-0.2.9.crate https://crates.io/api/v1/crates/pin-utils/0.1.0/download -> pin-utils-0.1.0.crate https://crates.io/api/v1/crates/pkg-config/0.3.25/download -> pkg-config-0.3.25.crate https://crates.io/api/v1/crates/polling/2.2.0/download -> polling-2.2.0.crate https://crates.io/api/v1/crates/ppv-lite86/0.2.16/download -> ppv-lite86-0.2.16.crate https://crates.io/api/v1/crates/proc-macro-crate/1.1.3/download -> proc-macro-crate-1.1.3.crate https://crates.io/api/v1/crates/proc-macro2/1.0.40/download -> proc-macro2-1.0.40.crate https://crates.io/api/v1/crates/quote/0.3.15/download -> quote-0.3.15.crate https://crates.io/api/v1/crates/quote/1.0.20/download -> quote-1.0.20.crate https://crates.io/api/v1/crates/rand/0.8.5/download -> rand-0.8.5.crate https://crates.io/api/v1/crates/rand_chacha/0.3.1/download -> rand_chacha-0.3.1.crate https://crates.io/api/v1/crates/rand_core/0.6.3/download -> rand_core-0.6.3.crate https://crates.io/api/v1/crates/redox_syscall/0.2.13/download -> redox_syscall-0.2.13.crate https://crates.io/api/v1/crates/redox_users/0.4.3/download -> redox_users-0.4.3.crate https://crates.io/api/v1/crates/regex/1.6.0/download -> regex-1.6.0.crate https://crates.io/api/v1/crates/regex-syntax/0.6.27/download -> regex-syntax-0.6.27.crate https://crates.io/api/v1/crates/remove_dir_all/0.5.3/download -> remove_dir_all-0.5.3.crate https://crates.io/api/v1/crates/rpassword/6.0.1/download -> rpassword-6.0.1.crate https://crates.io/api/v1/crates/rustfm-scrobble-proxy/1.1.2/download -> rustfm-scrobble-proxy-1.1.2.crate https://crates.io/api/v1/crates/ryu/1.0.10/download -> ryu-1.0.10.crate https://crates.io/api/v1/crates/schannel/0.1.20/download -> schannel-0.1.20.crate https://crates.io/api/v1/crates/scopeguard/1.1.0/download -> scopeguard-1.1.0.crate https://crates.io/api/v1/crates/security-framework/2.6.1/download -> security-framework-2.6.1.crate https://crates.io/api/v1/crates/security-framework-sys/2.6.1/download -> security-framework-sys-2.6.1.crate https://crates.io/api/v1/crates/serde/1.0.139/download -> serde-1.0.139.crate https://crates.io/api/v1/crates/serde_derive/1.0.139/download -> serde_derive-1.0.139.crate https://crates.io/api/v1/crates/serde_json/1.0.82/download -> serde_json-1.0.82.crate https://crates.io/api/v1/crates/serde_repr/0.1.8/download -> serde_repr-0.1.8.crate https://crates.io/api/v1/crates/serde_urlencoded/0.7.1/download -> serde_urlencoded-0.7.1.crate https://crates.io/api/v1/crates/sha1/0.6.1/download -> sha1-0.6.1.crate https://crates.io/api/v1/crates/sha1_smol/1.0.0/download -> sha1_smol-1.0.0.crate https://crates.io/api/v1/crates/slab/0.4.7/download -> slab-0.4.7.crate https://crates.io/api/v1/crates/smallvec/1.9.0/download -> smallvec-1.9.0.crate https://crates.io/api/v1/crates/socket2/0.4.4/download -> socket2-0.4.4.crate https://crates.io/api/v1/crates/static_assertions/1.1.0/download -> static_assertions-1.1.0.crate https://crates.io/api/v1/crates/strsim/0.10.0/download -> strsim-0.10.0.crate https://crates.io/api/v1/crates/strum/0.22.0/download -> strum-0.22.0.crate https://crates.io/api/v1/crates/strum_macros/0.22.0/download -> strum_macros-0.22.0.crate https://crates.io/api/v1/crates/syn/0.11.11/download -> syn-0.11.11.crate https://crates.io/api/v1/crates/syn/1.0.98/download -> syn-1.0.98.crate https://crates.io/api/v1/crates/synom/0.11.3/download -> synom-0.11.3.crate https://crates.io/api/v1/crates/tempfile/3.3.0/download -> tempfile-3.3.0.crate https://crates.io/api/v1/crates/thiserror/1.0.37/download -> thiserror-1.0.37.crate https://crates.io/api/v1/crates/thiserror-impl/1.0.37/download -> thiserror-impl-1.0.37.crate https://crates.io/api/v1/crates/time/0.3.11/download -> time-0.3.11.crate https://crates.io/api/v1/crates/tinyvec/1.6.0/download -> tinyvec-1.6.0.crate https://crates.io/api/v1/crates/tinyvec_macros/0.1.0/download -> tinyvec_macros-0.1.0.crate https://crates.io/api/v1/crates/toml/0.5.9/download -> toml-0.5.9.crate https://crates.io/api/v1/crates/tracing/0.1.35/download -> tracing-0.1.35.crate https://crates.io/api/v1/crates/tracing-attributes/0.1.22/download -> tracing-attributes-0.1.22.crate https://crates.io/api/v1/crates/tracing-core/0.1.28/download -> tracing-core-0.1.28.crate https://crates.io/api/v1/crates/uds_windows/1.0.2/download -> uds_windows-1.0.2.crate https://crates.io/api/v1/crates/unicode-bidi/0.3.8/download -> unicode-bidi-0.3.8.crate https://crates.io/api/v1/crates/unicode-ident/1.0.2/download -> unicode-ident-1.0.2.crate https://crates.io/api/v1/crates/unicode-normalization/0.1.21/download -> unicode-normalization-0.1.21.crate https://crates.io/api/v1/crates/unicode-segmentation/1.9.0/download -> unicode-segmentation-1.9.0.crate https://crates.io/api/v1/crates/unicode-xid/0.0.4/download -> unicode-xid-0.0.4.crate https://crates.io/api/v1/crates/url/2.2.2/download -> url-2.2.2.crate https://crates.io/api/v1/crates/vcpkg/0.2.15/download -> vcpkg-0.2.15.crate https://crates.io/api/v1/crates/waker-fn/1.1.0/download -> waker-fn-1.1.0.crate https://crates.io/api/v1/crates/wasi/0.11.0+wasi-snapshot-preview1/download -> wasi-0.11.0+wasi-snapshot-preview1.crate https://crates.io/api/v1/crates/wepoll-ffi/0.1.2/download -> wepoll-ffi-0.1.2.crate https://crates.io/api/v1/crates/wildmatch/1.1.0/download -> wildmatch-1.1.0.crate https://crates.io/api/v1/crates/wildmatch/2.1.1/download -> wildmatch-2.1.1.crate https://crates.io/api/v1/crates/winapi/0.3.9/download -> winapi-0.3.9.crate https://crates.io/api/v1/crates/winapi-i686-pc-windows-gnu/0.4.0/download -> winapi-i686-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/winapi-x86_64-pc-windows-gnu/0.4.0/download -> winapi-x86_64-pc-windows-gnu-0.4.0.crate https://crates.io/api/v1/crates/windows/0.24.0/download -> windows-0.24.0.crate https://crates.io/api/v1/crates/windows-sys/0.36.1/download -> windows-sys-0.36.1.crate https://crates.io/api/v1/crates/windows_aarch64_msvc/0.36.1/download -> windows_aarch64_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.24.0/download -> windows_i686_gnu-0.24.0.crate https://crates.io/api/v1/crates/windows_i686_gnu/0.36.1/download -> windows_i686_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.24.0/download -> windows_i686_msvc-0.24.0.crate https://crates.io/api/v1/crates/windows_i686_msvc/0.36.1/download -> windows_i686_msvc-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.24.0/download -> windows_x86_64_gnu-0.24.0.crate https://crates.io/api/v1/crates/windows_x86_64_gnu/0.36.1/download -> windows_x86_64_gnu-0.36.1.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.24.0/download -> windows_x86_64_msvc-0.24.0.crate https://crates.io/api/v1/crates/windows_x86_64_msvc/0.36.1/download -> windows_x86_64_msvc-0.36.1.crate https://crates.io/api/v1/crates/winrt-notification/0.5.1/download -> winrt-notification-0.5.1.crate https://crates.io/api/v1/crates/wrapped-vec/0.3.0/download -> wrapped-vec-0.3.0.crate https://crates.io/api/v1/crates/xml-rs/0.8.4/download -> xml-rs-0.8.4.crate https://crates.io/api/v1/crates/zbus/2.3.2/download -> zbus-2.3.2.crate https://crates.io/api/v1/crates/zbus_macros/2.3.2/download -> zbus_macros-2.3.2.crate https://crates.io/api/v1/crates/zbus_names/2.1.0/download -> zbus_names-2.1.0.crate https://crates.io/api/v1/crates/zvariant/3.4.1/download -> zvariant-3.4.1.crate https://crates.io/api/v1/crates/zvariant_derive/3.4.1/download -> zvariant_derive-3.4.1.crate
 _eclasses_=cargo	73ed573e1525a108d236a0dffb3a68fb	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=9a9b51942e608d90172069436f6e9b39
+_md5_=b2c4193f53a7a838e755cb96a1744bca
diff --git a/metadata/md5-cache/media-sound/strawberry-1.0.14 b/metadata/md5-cache/media-sound/strawberry-1.0.14
new file mode 100644
index 000000000000..81906ffdddde
--- /dev/null
+++ b/metadata/md5-cache/media-sound/strawberry-1.0.14
@@ -0,0 +1,17 @@
+BDEPEND=dev-qt/linguist-tools:5 sys-devel/gettext virtual/pkgconfig >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare test
+DEPEND=dev-db/sqlite:= dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/taglib x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( media-libs/libgpod ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( media-libs/libmtp ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) dev-cpp/gtest dev-libs/boost dev-qt/qttest:5
+DESCRIPTION=Modern music player and library organizer based on Clementine and Qt
+EAPI=8
+HOMEPAGE=https://www.strawberrymusicplayer.org/
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=cmake flag-o-matic plocale xdg
+IUSE=cdda debug +gstreamer ipod moodbar mtp pulseaudio +udisks vlc
+KEYWORDS=~amd64 ~ppc64 ~x86
+LICENSE=GPL-3
+RDEPEND=dev-db/sqlite:= dev-libs/glib:2 dev-libs/protobuf:= dev-qt/qtconcurrent:5 dev-qt/qtcore:5 dev-qt/qtdbus:5 dev-qt/qtgui:5 dev-qt/qtnetwork:5[ssl] dev-qt/qtsql:5[sqlite] dev-qt/qtwidgets:5 dev-qt/qtx11extras:5 media-libs/alsa-lib media-libs/taglib x11-libs/libX11 cdda? ( dev-libs/libcdio:= ) gstreamer? ( media-libs/chromaprint:= media-libs/gstreamer:1.0 media-libs/gst-plugins-base:1.0 ) ipod? ( media-libs/libgpod ) moodbar? ( sci-libs/fftw:3.0 ) mtp? ( media-libs/libmtp ) pulseaudio? ( media-sound/pulseaudio ) vlc? ( media-video/vlc ) gstreamer? ( media-plugins/gst-plugins-meta:1.0 media-plugins/gst-plugins-soup:1.0 media-plugins/gst-plugins-taglib:1.0 ) mtp? ( gnome-base/gvfs[mtp] ) udisks? ( sys-fs/udisks:2 )
+REQUIRED_USE=cdda? ( gstreamer ) || ( gstreamer vlc )
+SLOT=0
+SRC_URI=https://github.com/strawberrymusicplayer/strawberry/releases/download/1.0.14/strawberry-1.0.14.tar.xz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	plocale	950fbaec7deeba41b5bcc0572cca99b9	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=e45a3cdfc5381b4cd1f9333250941c8f
diff --git a/metadata/md5-cache/net-misc/Manifest.gz b/metadata/md5-cache/net-misc/Manifest.gz
index 17c2ac98f636..1f73397a4fbb 100644
--- a/metadata/md5-cache/net-misc/Manifest.gz
+++ b/metadata/md5-cache/net-misc/Manifest.gz
diff --git a/metadata/md5-cache/net-misc/tigervnc-1.12.90 b/metadata/md5-cache/net-misc/tigervnc-1.12.90
new file mode 100644
index 000000000000..eb524098c658
--- /dev/null
+++ b/metadata/md5-cache/net-misc/tigervnc-1.12.90
@@ -0,0 +1,17 @@
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
+DEPEND=dev-libs/gmp:= dev-libs/nettle:= media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) !net-misc/turbovnc[server] ) viewer? ( media-video/ffmpeg:= x11-libs/fltk:1 x11-libs/libXi x11-libs/libXrender !net-misc/turbovnc[viewer] ) drm? ( x11-libs/libdrm ) server? ( media-fonts/font-util x11-base/xorg-proto x11-libs/libxcvt x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrender x11-misc/util-macros opengl? ( media-libs/mesa ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=Remote desktop viewer display system
+EAPI=8
+HOMEPAGE=https://tigervnc.org
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+IUSE=dri3 +drm gnutls java nls +opengl +server +viewer xinerama java
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=GPL-2
+RDEPEND=dev-libs/gmp:= dev-libs/nettle:= media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) !net-misc/turbovnc[server] ) viewer? ( media-video/ffmpeg:= x11-libs/fltk:1 x11-libs/libXi x11-libs/libXrender !net-misc/turbovnc[viewer] ) java? ( virtual/jre:1.8 ) server? ( dev-lang/perl sys-process/psmisc ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=dri3? ( drm ) java? ( viewer ) opengl? ( server ) || ( server viewer )
+SLOT=0
+SRC_URI=server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-21.1.1.tar.xz ) https://github.com/TigerVNC/tigervnc/archive/v1.12.90.tar.gz -> tigervnc-1.12.90.tar.gz
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=53fcff2bd21a383444d9ae1bd7bef3f7
diff --git a/metadata/md5-cache/net-misc/tigervnc-9999 b/metadata/md5-cache/net-misc/tigervnc-9999
index 8f984620a9ad..666d04f0606c 100644
--- a/metadata/md5-cache/net-misc/tigervnc-9999
+++ b/metadata/md5-cache/net-misc/tigervnc-9999
@@ -1,16 +1,17 @@
-BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 >=dev-vcs/git-1.8.2.1[curl] virtual/pkgconfig
+BDEPEND=virtual/pkgconfig nls? ( sys-devel/gettext ) sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7 >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 virtual/pkgconfig >=dev-vcs/git-1.8.2.1[curl]
 DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test unpack
-DEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/fltk:1 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) ) drm? ( x11-libs/libdrm ) server? ( media-fonts/font-util x11-base/xorg-proto x11-libs/libxcvt x11-libs/libxkbfile x11-misc/util-macros opengl? ( media-libs/mesa ) ) java? ( >=dev-java/java-config-2.2.0-r3 ) dev-util/desktop-file-utils x11-misc/shared-mime-info
+DEPEND=dev-libs/gmp:= dev-libs/nettle:= media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) !net-misc/turbovnc[server] ) viewer? ( media-video/ffmpeg:= x11-libs/fltk:1 x11-libs/libXi x11-libs/libXrender !net-misc/turbovnc[viewer] ) drm? ( x11-libs/libdrm ) server? ( media-fonts/font-util x11-base/xorg-proto x11-libs/libxcvt x11-libs/libXi x11-libs/libxkbfile x11-libs/libXrender x11-misc/util-macros opengl? ( media-libs/mesa ) ) java? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=Remote desktop viewer display system
-EAPI=7
+EAPI=8
 HOMEPAGE=https://tigervnc.org
-INHERIT=autotools cmake eapi8-dosym flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd xdg
-IUSE=dri3 +drm gnutls java nls +opengl +server xinerama java
+IDEPEND=dev-util/desktop-file-utils x11-misc/shared-mime-info
+INHERIT=autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg git-r3
+IUSE=dri3 +drm gnutls java nls +opengl +server +viewer xinerama java
 LICENSE=GPL-2
 PROPERTIES=live
-RDEPEND=media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/fltk:1 x11-libs/libX11 x11-libs/libXext x11-libs/libXi x11-libs/libXrandr x11-libs/libXrender x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) ) java? ( virtual/jre:1.8 ) server? ( dev-lang/perl sys-process/psmisc ) java? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=dri3? ( drm ) opengl? ( server )
+RDEPEND=dev-libs/gmp:= dev-libs/nettle:= media-libs/libjpeg-turbo:= sys-libs/zlib:= x11-libs/libX11 x11-libs/libXext x11-libs/libXrandr x11-libs/pixman gnutls? ( net-libs/gnutls:= ) nls? ( virtual/libiconv ) server? ( dev-libs/libbsd dev-libs/openssl:0= sys-libs/pam x11-libs/libXau x11-libs/libXdamage x11-libs/libXdmcp x11-libs/libXfixes x11-libs/libXfont2 x11-libs/libXtst x11-libs/pixman x11-libs/xtrans x11-apps/xauth x11-apps/xinit x11-apps/xkbcomp x11-apps/xsetroot x11-misc/xkeyboard-config opengl? ( media-libs/libglvnd[X] ) !net-misc/turbovnc[server] ) viewer? ( media-video/ffmpeg:= x11-libs/fltk:1 x11-libs/libXi x11-libs/libXrender !net-misc/turbovnc[viewer] ) java? ( virtual/jre:1.8 ) server? ( dev-lang/perl sys-process/psmisc ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=dri3? ( drm ) java? ( viewer ) opengl? ( server ) || ( server viewer )
 SLOT=0
 SRC_URI=server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-21.1.1.tar.xz )
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cmake	449b4785acace35308fe747fc939bde1	eapi8-dosym	cd7d420bb5be5ee079f27239ce76b8f5	edos2unix	33e347e171066657f91f8b0c72ec8773	eutils	8f942ebdcf04334697649d4a0bf65a32	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	strip-linguas	ac3ee41ee2d31d8c41a77c0838320cc7	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	wrapper	4a1902f969e5718126434fc35f3a0d9c	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=4c768cd7c7a72f11e9259a4e870818ce
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	cmake	449b4785acace35308fe747fc939bde1	flag-o-matic	69394e25812406faa1f90edaf4969395	git-r3	2347f8fe2d392b2a091191f94be37e6f	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	optfeature	1a2157392a869265b2afcb63a26c12ac	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=53fcff2bd21a383444d9ae1bd7bef3f7
diff --git a/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.0 b/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.0
index dcc1a71a6be9..f818ff1f5a86 100644
--- a/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.0
+++ b/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.0
@@ -1,9 +1,9 @@
 DEFINED_PHASES=-
 DESCRIPTION=Metapackage for the xorg module provided by tigervnc
 EAPI=8
-HOMEPAGE=https://www.tigervnc.org
+HOMEPAGE=https://tigervnc.org/
 KEYWORDS=~alpha amd64 arm ~arm64 ~hppa ~ia64 ~loong ~mips ppc ppc64 ~riscv ~sparc x86
 LICENSE=metapackage
 RDEPEND=~net-misc/tigervnc-1.12.0[server] =x11-base/xorg-server-21.1*
 SLOT=0
-_md5_=502ebe0a50b2705ef2736e16b84e419c
+_md5_=69e14a97ed148c710a66b4acdf1eb58c
diff --git a/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.90 b/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.90
new file mode 100644
index 000000000000..87cdebce9d27
--- /dev/null
+++ b/metadata/md5-cache/net-misc/tigervnc-xorg-module-1.12.90
@@ -0,0 +1,9 @@
+DEFINED_PHASES=-
+DESCRIPTION=Metapackage for the xorg module provided by tigervnc
+EAPI=8
+HOMEPAGE=https://tigervnc.org/
+KEYWORDS=~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=metapackage
+RDEPEND=~net-misc/tigervnc-1.12.90[server] =x11-base/xorg-server-21.1*
+SLOT=0
+_md5_=2d31a197d54685c902e6206fefc4d37c
diff --git a/metadata/md5-cache/net-misc/turbovnc-3.0.2 b/metadata/md5-cache/net-misc/turbovnc-3.0.2
index dd85a90d0d26..1f58e86fcdab 100644
--- a/metadata/md5-cache/net-misc/turbovnc-3.0.2
+++ b/metadata/md5-cache/net-misc/turbovnc-3.0.2
@@ -1,16 +1,16 @@
 BDEPEND=verify-sig? ( sec-keys/openpgp-keys-vgl-turbovnc ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5 verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
 DEFINED_PHASES=compile configure install preinst prepare pretend setup test unpack
-DEPEND=x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-misc/xkeyboard-config client? ( media-libs/libjpeg-turbo:=[java] x11-libs/libXi !net-misc/tigervnc ) server? ( media-libs/libjpeg-turbo:= sys-libs/pam sys-libs/zlib virtual/opengl x11-libs/libXau x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/pixman ssl? ( dev-libs/openssl:= ) !net-misc/tigervnc[server] ) x11-libs/xtrans client? ( >=virtual/jdk-1.8:* ) server? ( app-arch/bzip2 media-libs/freetype x11-libs/libfontenc ) client? ( >=dev-java/java-config-2.2.0-r3 )
+DEPEND=x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-misc/xkeyboard-config server? ( media-libs/libjpeg-turbo:= sys-libs/pam sys-libs/zlib virtual/opengl x11-libs/libXau x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/pixman ssl? ( dev-libs/openssl:= ) !net-misc/tigervnc[server] ) viewer? ( media-libs/libjpeg-turbo:=[java] x11-libs/libXi !net-misc/tigervnc[viewer(+)] ) x11-libs/xtrans viewer? ( >=virtual/jdk-1.8:* ) server? ( app-arch/bzip2 media-libs/freetype x11-libs/libfontenc ) viewer? ( >=dev-java/java-config-2.2.0-r3 )
 DESCRIPTION=A fast replacement for TigerVNC
 EAPI=8
 HOMEPAGE=https://www.turbovnc.org/
 INHERIT=cmake desktop java-pkg-opt-2 verify-sig
-IUSE=+server +ssl client verify-sig
+IUSE=+server +ssl +viewer viewer verify-sig
 KEYWORDS=~amd64
 LICENSE=GPL-2
-RDEPEND=x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-misc/xkeyboard-config client? ( media-libs/libjpeg-turbo:=[java] x11-libs/libXi !net-misc/tigervnc ) server? ( media-libs/libjpeg-turbo:= sys-libs/pam sys-libs/zlib virtual/opengl x11-libs/libXau x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/pixman ssl? ( dev-libs/openssl:= ) !net-misc/tigervnc[server] ) x11-apps/xkbcomp client? ( >=virtual/jre-1.8:* ) client? ( >=dev-java/java-config-2.2.0-r3 )
-REQUIRED_USE=|| ( client server )
+RDEPEND=x11-apps/xauth x11-libs/libX11 x11-libs/libXext x11-misc/xkeyboard-config server? ( media-libs/libjpeg-turbo:= sys-libs/pam sys-libs/zlib virtual/opengl x11-libs/libXau x11-libs/libXdmcp x11-libs/libXfont2 x11-libs/pixman ssl? ( dev-libs/openssl:= ) !net-misc/tigervnc[server] ) viewer? ( media-libs/libjpeg-turbo:=[java] x11-libs/libXi !net-misc/tigervnc[viewer(+)] ) x11-apps/xkbcomp viewer? ( >=virtual/jre-1.8:* ) viewer? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=|| ( server viewer )
 SLOT=0
 SRC_URI=https://sourceforge.net/projects/turbovnc/files/3.0.2/turbovnc-3.0.2.tar.gz/download -> turbovnc-3.0.2.tar.gz verify-sig? ( https://sourceforge.net/projects/turbovnc/files/3.0.2/turbovnc-3.0.2.tar.gz.sig/download -> turbovnc-3.0.2.tar.gz.sig )
 _eclasses_=cmake	449b4785acace35308fe747fc939bde1	desktop	7eb20ad915a0a318176d51bc2508ff5c	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=324d5b0859253aa5f72b0257ae70f950
+_md5_=11995df906d388e715f54229fc5cbaba
diff --git a/metadata/md5-cache/net-nntp/Manifest.gz b/metadata/md5-cache/net-nntp/Manifest.gz
index 1324b6586f62..8bec6d9eccad 100644
--- a/metadata/md5-cache/net-nntp/Manifest.gz
+++ b/metadata/md5-cache/net-nntp/Manifest.gz
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.6.0-r1 b/metadata/md5-cache/net-nntp/sabnzbd-3.6.0-r1
deleted file mode 100644
index 1586d131837e..000000000000
--- a/metadata/md5-cache/net-nntp/sabnzbd-3.6.0-r1
+++ /dev/null
@@ -1,16 +0,0 @@
-BDEPEND=virtual/pkgconfig
-DEFINED_PHASES=install postinst setup
-DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] ~dev-python/sabyenc-5.4.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabyenc-5.4.2[python_targets_python3_10(-)] )
-DESCRIPTION=Binary newsgrabber with web-interface
-EAPI=8
-HOMEPAGE=https://sabnzbd.org/
-INHERIT=python-single-r1 systemd
-IUSE=+7za +rar unzip python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=amd64
-LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
-RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] ~dev-python/sabyenc-5.4.2[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabyenc-5.4.2[python_targets_python3_10(-)] ) >=app-arch/par2cmdline-0.4 net-misc/wget 7za? ( app-arch/p7zip ) rar? ( || ( app-arch/unrar app-arch/rar ) ) unzip? ( >=app-arch/unzip-5.5.2 )
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-SLOT=0
-SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.6.0/SABnzbd-3.6.0-src.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=b1e7dac586c8c3b59aca7a0ff7f08c32
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.6.1-r1 b/metadata/md5-cache/net-nntp/sabnzbd-3.6.1-r1
deleted file mode 100644
index bb29a8c8cc86..000000000000
--- a/metadata/md5-cache/net-nntp/sabnzbd-3.6.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_9? ( dev-python/flaky[python_targets_python3_9(-)] >=dev-python/lxml-4.5.0[python_targets_python3_9(-)] dev-python/pkginfo[python_targets_python3_9(-)] dev-python/pyfakefs[python_targets_python3_9(-)] dev-python/pytest-httpbin[python_targets_python3_9(-)] dev-python/pytest-httpserver[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/selenium[python_targets_python3_9(-)] dev-python/tavalidate[python_targets_python3_9(-)] dev-python/tavern[python_targets_python3_9(-)] dev-python/werkzeug[python_targets_python3_9(-)] dev-python/xmltodict[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flaky[python_targets_python3_10(-)] >=dev-python/lxml-4.5.0[python_targets_python3_10(-)] dev-python/pkginfo[python_targets_python3_10(-)] dev-python/pyfakefs[python_targets_python3_10(-)] dev-python/pytest-httpbin[python_targets_python3_10(-)] dev-python/pytest-httpserver[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/selenium[python_targets_python3_10(-)] dev-python/tavalidate[python_targets_python3_10(-)] dev-python/tavern[python_targets_python3_10(-)] dev-python/werkzeug[python_targets_python3_10(-)] dev-python/xmltodict[python_targets_python3_10(-)] ) app-arch/p7zip app-arch/unrar app-arch/unzip www-apps/chromedriver-bin ) virtual/pkgconfig
-DEFINED_PHASES=install postinst setup test
-DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] ~dev-python/sabyenc-5.4.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabyenc-5.4.3[python_targets_python3_10(-)] )
-DESCRIPTION=Binary newsgrabber with web-interface
-EAPI=8
-HOMEPAGE=https://sabnzbd.org/
-INHERIT=optfeature python-single-r1 systemd
-IUSE=test python_single_target_python3_9 python_single_target_python3_10
-KEYWORDS=~amd64
-LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
-RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] ~dev-python/sabyenc-5.4.3[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabyenc-5.4.3[python_targets_python3_10(-)] ) >=app-arch/par2cmdline-0.4 net-misc/wget
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.6.1/SABnzbd-3.6.1-src.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=2ca235b16a8fb534202ccad93928bee5
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.7.0 b/metadata/md5-cache/net-nntp/sabnzbd-3.7.0
deleted file mode 100644
index bf7897156b93..000000000000
--- a/metadata/md5-cache/net-nntp/sabnzbd-3.7.0
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=test? ( python_single_target_python3_9? ( dev-python/flaky[python_targets_python3_9(-)] >=dev-python/lxml-4.5.0[python_targets_python3_9(-)] dev-python/pkginfo[python_targets_python3_9(-)] dev-python/pyfakefs[python_targets_python3_9(-)] dev-python/pytest-httpbin[python_targets_python3_9(-)] dev-python/pytest-httpserver[python_targets_python3_9(-)] dev-python/pytest[python_targets_python3_9(-)] dev-python/requests[python_targets_python3_9(-)] dev-python/selenium[python_targets_python3_9(-)] dev-python/tavalidate[python_targets_python3_9(-)] dev-python/tavern[python_targets_python3_9(-)] dev-python/werkzeug[python_targets_python3_9(-)] dev-python/xmltodict[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/flaky[python_targets_python3_10(-)] >=dev-python/lxml-4.5.0[python_targets_python3_10(-)] dev-python/pkginfo[python_targets_python3_10(-)] dev-python/pyfakefs[python_targets_python3_10(-)] dev-python/pytest-httpbin[python_targets_python3_10(-)] dev-python/pytest-httpserver[python_targets_python3_10(-)] dev-python/pytest[python_targets_python3_10(-)] dev-python/requests[python_targets_python3_10(-)] dev-python/selenium[python_targets_python3_10(-)] dev-python/tavalidate[python_targets_python3_10(-)] dev-python/tavern[python_targets_python3_10(-)] dev-python/werkzeug[python_targets_python3_10(-)] dev-python/xmltodict[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/flaky[python_targets_python3_11(-)] >=dev-python/lxml-4.5.0[python_targets_python3_11(-)] dev-python/pkginfo[python_targets_python3_11(-)] dev-python/pyfakefs[python_targets_python3_11(-)] dev-python/pytest-httpbin[python_targets_python3_11(-)] dev-python/pytest-httpserver[python_targets_python3_11(-)] dev-python/pytest[python_targets_python3_11(-)] dev-python/requests[python_targets_python3_11(-)] dev-python/selenium[python_targets_python3_11(-)] dev-python/tavalidate[python_targets_python3_11(-)] dev-python/tavern[python_targets_python3_11(-)] dev-python/werkzeug[python_targets_python3_11(-)] dev-python/xmltodict[python_targets_python3_11(-)] ) app-arch/p7zip app-arch/unrar app-arch/unzip www-apps/chromedriver-bin ) virtual/pkgconfig
-DEFINED_PHASES=install postinst setup test
-DEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cheetah3[python_targets_python3_11(-)] dev-python/cherrypy[python_targets_python3_11(-)] dev-python/configobj[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_11(-)] >=dev-python/guessit-3.1.0[python_targets_python3_11(-)] dev-python/notify2[python_targets_python3_11(-)] dev-python/portend[python_targets_python3_11(-)] dev-python/puremagic[python_targets_python3_11(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_11(-)] )
-DESCRIPTION=Binary newsgrabber with web-interface
-EAPI=8
-HOMEPAGE=https://sabnzbd.org/
-INHERIT=optfeature python-single-r1 systemd
-IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64
-LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
-RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cheetah3[python_targets_python3_11(-)] dev-python/cherrypy[python_targets_python3_11(-)] dev-python/configobj[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_11(-)] >=dev-python/guessit-3.1.0[python_targets_python3_11(-)] dev-python/notify2[python_targets_python3_11(-)] dev-python/portend[python_targets_python3_11(-)] dev-python/puremagic[python_targets_python3_11(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_11(-)] ) >=app-arch/par2cmdline-0.4 net-misc/wget
-REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
-RESTRICT=!test? ( test )
-SLOT=0
-SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.7.0/SABnzbd-3.7.0-src.tar.gz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=00037081e7cac8f2a1832312d637c26c
diff --git a/metadata/md5-cache/net-nntp/sabnzbd-3.7.1 b/metadata/md5-cache/net-nntp/sabnzbd-3.7.1
index 47dde30ddd32..482c54e6f4b5 100644
--- a/metadata/md5-cache/net-nntp/sabnzbd-3.7.1
+++ b/metadata/md5-cache/net-nntp/sabnzbd-3.7.1
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=https://sabnzbd.org/
 INHERIT=optfeature python-single-r1 systemd
 IUSE=test python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=GPL-2 BSD LGPL-2 MIT BSD-1
 RDEPEND=acct-user/sabnzbd acct-group/sabnzbd python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9[sqlite] ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10[sqlite] ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11[sqlite] ) python_single_target_python3_9? ( dev-python/chardet[python_targets_python3_9(-)] dev-python/cheetah3[python_targets_python3_9(-)] dev-python/cherrypy[python_targets_python3_9(-)] dev-python/configobj[python_targets_python3_9(-)] dev-python/cryptography[python_targets_python3_9(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_9(-)] >=dev-python/guessit-3.1.0[python_targets_python3_9(-)] dev-python/notify2[python_targets_python3_9(-)] dev-python/portend[python_targets_python3_9(-)] dev-python/puremagic[python_targets_python3_9(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_9(-)] ) python_single_target_python3_10? ( dev-python/chardet[python_targets_python3_10(-)] dev-python/cheetah3[python_targets_python3_10(-)] dev-python/cherrypy[python_targets_python3_10(-)] dev-python/configobj[python_targets_python3_10(-)] dev-python/cryptography[python_targets_python3_10(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_10(-)] >=dev-python/guessit-3.1.0[python_targets_python3_10(-)] dev-python/notify2[python_targets_python3_10(-)] dev-python/portend[python_targets_python3_10(-)] dev-python/puremagic[python_targets_python3_10(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_10(-)] ) python_single_target_python3_11? ( dev-python/chardet[python_targets_python3_11(-)] dev-python/cheetah3[python_targets_python3_11(-)] dev-python/cherrypy[python_targets_python3_11(-)] dev-python/configobj[python_targets_python3_11(-)] dev-python/cryptography[python_targets_python3_11(-)] >=dev-python/feedparser-6.0.10[python_targets_python3_11(-)] >=dev-python/guessit-3.1.0[python_targets_python3_11(-)] dev-python/notify2[python_targets_python3_11(-)] dev-python/portend[python_targets_python3_11(-)] dev-python/puremagic[python_targets_python3_11(-)] ~dev-python/sabyenc-5.4.4[python_targets_python3_11(-)] ) >=app-arch/par2cmdline-0.4 net-misc/wget
 REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=https://github.com/sabnzbd/sabnzbd/releases/download/3.7.1/SABnzbd-3.7.1-src.tar.gz
 _eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=00037081e7cac8f2a1832312d637c26c
+_md5_=567d253c4a626a4353b10c5e357f3dc4
diff --git a/metadata/md5-cache/net-nntp/tin-2.6.2 b/metadata/md5-cache/net-nntp/tin-2.6.2
deleted file mode 100644
index b9e4ad7c2872..000000000000
--- a/metadata/md5-cache/net-nntp/tin-2.6.2
+++ /dev/null
@@ -1,15 +0,0 @@
-BDEPEND=app-alternatives/yacc virtual/pkgconfig nls? ( sys-devel/gettext )
-DEFINED_PHASES=compile configure install postinst
-DEPEND=dev-libs/icu:= dev-libs/uulib sys-libs/ncurses:= virtual/libiconv cancel-locks? ( >=net-libs/canlock-3.0:= ) gpg? ( app-crypt/gnupg ) nls? ( virtual/libintl ) pcre2? ( dev-libs/libpcre2:= ) !pcre2? ( dev-libs/libpcre:3 ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( libtls? ( dev-libs/libretls:= ) !libtls? ( dev-libs/openssl:= ) ) )
-DESCRIPTION=A threaded NNTP and spool based UseNet newsreader
-EAPI=8
-HOMEPAGE=http://www.tin.org/
-INHERIT=optfeature toolchain-funcs
-IUSE=cancel-locks debug gnutls gpg libtls nls +pcre2 sasl socks5 ssl
-KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
-LICENSE=BSD
-RDEPEND=dev-libs/icu:= dev-libs/uulib sys-libs/ncurses:= virtual/libiconv cancel-locks? ( >=net-libs/canlock-3.0:= ) gpg? ( app-crypt/gnupg ) nls? ( virtual/libintl ) pcre2? ( dev-libs/libpcre2:= ) !pcre2? ( dev-libs/libpcre:3 ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( libtls? ( dev-libs/libretls:= ) !libtls? ( dev-libs/openssl:= ) ) )
-SLOT=0
-SRC_URI=ftp://ftp.tin.org/pub/news/clients/tin/stable/tin-2.6.2.tar.xz
-_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c1d2eb8177d8602692eb4e3044cb64ce
diff --git a/metadata/md5-cache/net-nntp/tin-2.6.2-r1 b/metadata/md5-cache/net-nntp/tin-2.6.2-r1
new file mode 100644
index 000000000000..f761445fe83f
--- /dev/null
+++ b/metadata/md5-cache/net-nntp/tin-2.6.2-r1
@@ -0,0 +1,15 @@
+BDEPEND=app-alternatives/yacc dev-libs/libpcre2 virtual/pkgconfig nls? ( sys-devel/gettext )
+DEFINED_PHASES=compile configure install postinst
+DEPEND=dev-libs/icu:= dev-libs/libpcre2:= dev-libs/uulib sys-libs/ncurses:= virtual/libiconv cancel-locks? ( >=net-libs/canlock-3.0:= ) gpg? ( app-crypt/gnupg ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( libtls? ( dev-libs/libretls:= ) !libtls? ( dev-libs/openssl:= ) ) )
+DESCRIPTION=A threaded NNTP and spool based UseNet newsreader
+EAPI=8
+HOMEPAGE=http://www.tin.org/
+INHERIT=optfeature toolchain-funcs
+IUSE=cancel-locks debug gnutls gpg libtls nls sasl socks5 ssl
+KEYWORDS=~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos
+LICENSE=BSD
+RDEPEND=dev-libs/icu:= dev-libs/libpcre2:= dev-libs/uulib sys-libs/ncurses:= virtual/libiconv cancel-locks? ( >=net-libs/canlock-3.0:= ) gpg? ( app-crypt/gnupg ) nls? ( virtual/libintl ) sasl? ( virtual/gsasl ) socks5? ( net-proxy/dante ) ssl? ( gnutls? ( net-libs/gnutls:= ) !gnutls? ( libtls? ( dev-libs/libretls:= ) !libtls? ( dev-libs/openssl:= ) ) )
+SLOT=0
+SRC_URI=ftp://ftp.tin.org/pub/news/clients/tin/stable/tin-2.6.2.tar.xz
+_eclasses_=multilib	5ca4e49abed8e3a2f7b56920eadee157	optfeature	1a2157392a869265b2afcb63a26c12ac	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=c149e439acaf0bf66f38a9eba379db88
diff --git a/metadata/md5-cache/net-proxy/Manifest.gz b/metadata/md5-cache/net-proxy/Manifest.gz
index 35957764b90b..6ca8add7e7bb 100644
--- a/metadata/md5-cache/net-proxy/Manifest.gz
+++ b/metadata/md5-cache/net-proxy/Manifest.gz
diff --git a/metadata/md5-cache/net-proxy/squid-5.7 b/metadata/md5-cache/net-proxy/squid-5.7
index 502164104e5a..85be53a3dd03 100644
--- a/metadata/md5-cache/net-proxy/squid-5.7
+++ b/metadata/md5-cache/net-proxy/squid-5.7
@@ -6,7 +6,7 @@ EAPI=8
 HOMEPAGE=http://www.squid-cache.org/
 INHERIT=autotools flag-o-matic linux-info pam systemd toolchain-funcs
 IUSE=caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp +wccp +wccpv2
-KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86
+KEYWORDS=~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86
 LICENSE=GPL-2
 RDEPEND=!!<net-proxy/squid-5 acct-group/squid acct-user/squid dev-libs/libltdl sys-libs/tdb virtual/libcrypt:= caps? ( >=sys-libs/libcap-2.16 ) ecap? ( net-libs/libecap:1 ) esi? ( dev-libs/expat dev-libs/libxml2 ) ldap? ( net-nds/openldap:= ) gnutls? ( >=net-libs/gnutls-3.1.5:= ) logrotate? ( app-admin/logrotate ) nis? ( net-libs/libtirpc:= net-libs/libnsl:= ) kerberos? ( virtual/krb5 ) pam? ( sys-libs/pam ) qos? ( net-libs/libnetfilter_conntrack ) ssl? ( dev-libs/nettle:= !gnutls? ( dev-libs/openssl:= ) ) sasl? ( dev-libs/cyrus-sasl ) systemd? ( sys-apps/systemd:= ) mysql? ( dev-perl/DBD-mysql ) postgres? ( dev-perl/DBD-Pg ) perl? ( dev-lang/perl ) samba? ( net-fs/samba ) selinux? ( sec-policy/selinux-squid ) sqlite? ( dev-perl/DBD-SQLite )
 REQUIRED_USE=tproxy? ( caps ) qos? ( caps )
@@ -14,4 +14,4 @@ RESTRICT=!test? ( test )
 SLOT=0
 SRC_URI=http://www.squid-cache.org/Versions/v5/squid-5.7.tar.xz
 _eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	flag-o-matic	69394e25812406faa1f90edaf4969395	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	linux-info	7e4d48a3c6c8ebdaa9f7f9e7d2991e22	multilib	5ca4e49abed8e3a2f7b56920eadee157	pam	01b77091d5b6560b0aeafa7fbb1bd818	systemd	5f4bb0758df2e483babf68cd517078ca	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=07cb3703b23751a4bd05642ca347ab34
+_md5_=17a46c454f1cc5cceba9f6d06e541f23
diff --git a/metadata/md5-cache/sci-mathematics/Manifest.gz b/metadata/md5-cache/sci-mathematics/Manifest.gz
index ac7eb683019d..e78ab957df9d 100644
--- a/metadata/md5-cache/sci-mathematics/Manifest.gz
+++ b/metadata/md5-cache/sci-mathematics/Manifest.gz
diff --git a/metadata/md5-cache/sci-mathematics/form-4.3.0 b/metadata/md5-cache/sci-mathematics/form-4.3.0
deleted file mode 100644
index ba8b9f7bb231..000000000000
--- a/metadata/md5-cache/sci-mathematics/form-4.3.0
+++ /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-r5 >=sys-devel/libtool-2.4.7
-DEFINED_PHASES=compile configure install prepare
-DEPEND=gmp? ( dev-libs/gmp:0= ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib ) devref? ( dev-texlive/texlive-latex ) doc? ( dev-texlive/texlive-latex ) doxygen? ( app-doc/doxygen )
-DESCRIPTION=Symbolic Manipulation System
-EAPI=8
-HOMEPAGE=https://www.nikhef.nl/~form/ https://github.com/vermaseren/form/
-INHERIT=autotools toolchain-funcs
-IUSE=devref doc doxygen gmp mpi threads zlib
-KEYWORDS=~amd64 ~x86
-LICENSE=GPL-3
-RDEPEND=gmp? ( dev-libs/gmp:0= ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib )
-SLOT=0
-SRC_URI=https://github.com/vermaseren/form/releases/download/v4.3.0/form-4.3.0.tar.gz
-_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=95e3c6761e0b305006ef1dbf6b7666ab
diff --git a/metadata/md5-cache/sci-mathematics/form-4.3.0-r1 b/metadata/md5-cache/sci-mathematics/form-4.3.0-r1
new file mode 100644
index 000000000000..34fb3822ff00
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/form-4.3.0-r1
@@ -0,0 +1,15 @@
+BDEPEND=sys-devel/gnuconfig >=app-portage/elt-patches-20170815 || ( >=sys-devel/automake-1.16.5:1.16 ) >=sys-devel/autoconf-2.71-r5 >=sys-devel/libtool-2.4.7
+DEFINED_PHASES=compile configure install postinst postrm prepare
+DEPEND=gmp? ( dev-libs/gmp:0= ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib ) devref? ( dev-texlive/texlive-latexrecommended ) doc? ( dev-texlive/texlive-latexrecommended ) doxygen? ( app-doc/doxygen ) emacs? ( app-editors/emacs:* )
+DESCRIPTION=Symbolic Manipulation System
+EAPI=8
+HOMEPAGE=https://www.nikhef.nl/~form/ https://github.com/vermaseren/form/
+INHERIT=autotools toolchain-funcs elisp-common
+IUSE=devref doc doxygen emacs gmp mpi threads zlib
+KEYWORDS=~amd64 ~x86
+LICENSE=GPL-3
+RDEPEND=gmp? ( dev-libs/gmp:0= ) mpi? ( virtual/mpi ) zlib? ( sys-libs/zlib )
+SLOT=0
+SRC_URI=https://github.com/vermaseren/form/releases/download/v4.3.0/form-4.3.0.tar.gz emacs? ( https://dev.gentoo.org/~grozin/form-mode.el.gz )
+_eclasses_=autotools	6dcd6b6a486e79928e1243ff9ba41fcc	elisp-common	79f8e13c80c89792e5c9b3fc8ef59f3b	gnuconfig	b6b3e92f8b8c996400074b5f61a59256	libtool	241a8f577b9781a42a7421e53448a44e	multilib	5ca4e49abed8e3a2f7b56920eadee157	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
+_md5_=f67932276ba5c823975cb80e68bdfcdd
diff --git a/metadata/md5-cache/sci-mathematics/z3-4.12.0 b/metadata/md5-cache/sci-mathematics/z3-4.12.0
new file mode 100644
index 000000000000..d113e42faefe
--- /dev/null
+++ b/metadata/md5-cache/sci-mathematics/z3-4.12.0
@@ -0,0 +1,16 @@
+BDEPEND=doc? ( app-doc/doxygen[dot] ) >=dev-util/ninja-1.8.2 >=dev-util/cmake-3.20.5
+DEFINED_PHASES=compile configure install postinst postrm preinst prepare setup test
+DEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=virtual/jdk-1.8 ) java? ( >=dev-java/java-config-2.2.0-r3 )
+DESCRIPTION=An efficient theorem prover
+EAPI=8
+HOMEPAGE=https://github.com/Z3Prover/z3/
+INHERIT=cmake-multilib java-pkg-opt-2 python-single-r1
+IUSE=doc examples gmp isabelle java python abi_x86_32 abi_x86_64 abi_x86_x32 abi_mips_n32 abi_mips_n64 abi_mips_o32 abi_s390_32 abi_s390_64 java python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11
+KEYWORDS=~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86
+LICENSE=MIT
+RDEPEND=python_single_target_python3_9? ( >=dev-lang/python-3.9.16:3.9 ) python_single_target_python3_10? ( >=dev-lang/python-3.10.9:3.10 ) python_single_target_python3_11? ( >=dev-lang/python-3.11.1:3.11 ) gmp? ( dev-libs/gmp:0=[cxx(+),abi_x86_32(-)?,abi_x86_64(-)?,abi_x86_x32(-)?,abi_mips_n32(-)?,abi_mips_n64(-)?,abi_mips_o32(-)?,abi_s390_32(-)?,abi_s390_64(-)?] ) java? ( >=dev-java/java-config-2.2.0-r3 )
+REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10 python_single_target_python3_11 )
+SLOT=0/4.12
+SRC_URI=https://github.com/Z3Prover/z3/archive/z3-4.12.0.tar.gz
+_eclasses_=cmake	449b4785acace35308fe747fc939bde1	cmake-multilib	57da9a64d1575fc2b54c50c26d033561	flag-o-matic	69394e25812406faa1f90edaf4969395	java-pkg-opt-2	a71433e535af8faae0c0f6c861a32054	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multibuild	bddcb51b74f4a76724ff7cf8e7388869	multilib	5ca4e49abed8e3a2f7b56920eadee157	multilib-build	e8aed98bd43dbd25694310a660ad562c	multilib-minimal	4b0f1857965db8869a729948d5277e0b	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	ninja-utils	38c85b725d0467e51954ea921b6c104b	out-of-source-utils	1a9007554652a6e627edbccb3c25a439	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg-utils	ac0e315a3688929e34ac75b139e7349a
+_md5_=63b1e460a1688e0b61a30ffe902a194f
diff --git a/metadata/md5-cache/sec-keys/Manifest.gz b/metadata/md5-cache/sec-keys/Manifest.gz
index 0a0f514200c2..17b586e38381 100644
--- a/metadata/md5-cache/sec-keys/Manifest.gz
+++ b/metadata/md5-cache/sec-keys/Manifest.gz
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.5 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.5
new file mode 100644
index 000000000000..59a54d33026d
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-10.1.5
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-90.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=10.1.5
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/KEYS -> openpgp-keys-apache-tomcat-10.1.5-KEYS.asc
+_md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.71 b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.71
new file mode 100644
index 000000000000..c1c0ca5a0520
--- /dev/null
+++ b/metadata/md5-cache/sec-keys/openpgp-keys-apache-tomcat-9.0.71
@@ -0,0 +1,9 @@
+DEFINED_PHASES=install
+DESCRIPTION=OpenPGP keys used by tomcat.apache.org
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/download-90.cgi
+KEYWORDS=amd64 ~arm arm64 ppc64 x86
+LICENSE=public-domain
+SLOT=9.0.71
+SRC_URI=https://downloads.apache.org/tomcat/tomcat-9/v9.0.71/KEYS -> openpgp-keys-apache-tomcat-9.0.71-KEYS.asc
+_md5_=5659f38b8facd7a3fd4b97428d033703
diff --git a/metadata/md5-cache/sys-kernel/Manifest.gz b/metadata/md5-cache/sys-kernel/Manifest.gz
index 4edc5f92f1c6..6e20270211a3 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.162 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.162
deleted file mode 100644
index b5ee6915cb93..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.10.162
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=8
-HOMEPAGE=https://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.162
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.10.162 virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.162
-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-171.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-171.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g4.tar.gz -> gentoo-kernel-config-g4.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=87424d44d13f7af86300c2e121922ece
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.86 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.86
deleted file mode 100644
index d3001d7380f1..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.86
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.15.86
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.86 virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.15.86
-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-90.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-90.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	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=467badd8045b484dbd655f59e5c28461
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.87 b/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.87
deleted file mode 100644
index 4e0db36131e9..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-5.15.87
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.15.87
-RDEPEND=!sys-kernel/gentoo-kernel-bin:5.15.87 virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.15.87
-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-91.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-91.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g5.tar.gz -> gentoo-kernel-config-g5.tar.gz amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c9bd5ab3244e3fff322b003ae6c739b8
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.15 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.15
deleted file mode 100644
index 68911d5a3688..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.15
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.0.15
-RDEPEND=!sys-kernel/gentoo-kernel-bin:6.0.15 virtual/libelf
-REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.0.15
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.0-15.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.0-15.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.8-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.8-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.8-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.8-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.8-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=5bc8edc79ac5e7a0dd553cc89da5089c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.16 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.16
deleted file mode 100644
index 9a16f86e4f74..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.0.16
-RDEPEND=!sys-kernel/gentoo-kernel-bin:6.0.16 virtual/libelf
-REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.0.16
-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-16.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-16.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.8-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.8-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.8-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.8-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.8-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=0b2e7cc67d01f528cad9536cb815d185
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.17
deleted file mode 100644
index 494069dfd265..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.17
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.0.17
-RDEPEND=!sys-kernel/gentoo-kernel-bin:6.0.17 virtual/libelf
-REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.0.17
-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-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-17.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g4.tar.gz -> gentoo-kernel-config-g4.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.8-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.8-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.8-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.8-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=9e89e3600ffc3507334d1099dbdc10ac
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.18
deleted file mode 100644
index 98583ff34624..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.0.18
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.0.18
-RDEPEND=!sys-kernel/gentoo-kernel-bin:6.0.18 virtual/libelf
-REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.0.18
-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-18.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-18.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g5.tar.gz -> gentoo-kernel-config-g5.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.8-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.8-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.8-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.8-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=6f7df6c7e895f11329e9d52e2d6645c3
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.1
deleted file mode 100644
index 0f2574c776bd..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.1
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.1.1
-RDEPEND=!sys-kernel/gentoo-kernel-bin:6.1.1 virtual/libelf
-REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.1.1
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-2.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-2.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.1.0-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.0-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.0-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.0-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.0-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.0-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.0-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.0-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=c1df05f515f857b131803d6ebb1e536b
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.2
deleted file mode 100644
index a1f7cf69e3e8..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.2
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.1.2
-RDEPEND=!sys-kernel/gentoo-kernel-bin:6.1.2 virtual/libelf
-REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.1.2
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-3.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-3.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.1.0-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.0-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.0-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.0-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.0-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.0-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.0-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.0-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=5b7a60d25cc72d061ff36f0709ea27c1
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.3
deleted file mode 100644
index 46b0a3915f2f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.3
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.1.3
-RDEPEND=!sys-kernel/gentoo-kernel-bin:6.1.3 virtual/libelf
-REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.1.3
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-4.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g4.tar.gz -> gentoo-kernel-config-g4.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.2-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.2-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.2-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.2-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=e1ff8c4ff8edeecbb338f15272e7a481
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.4
deleted file mode 100644
index 62e45969228f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.4
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.1.4
-RDEPEND=!sys-kernel/gentoo-kernel-bin:6.1.4 virtual/libelf
-REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.1.4
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-5.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g5.tar.gz -> gentoo-kernel-config-g5.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.2-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.2-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.2-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.2-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=d759c6a6088ad895359804caab98d88f
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.5
deleted file mode 100644
index bd8b44adaca7..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-6.1.5
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test
-DESCRIPTION=Linux kernel built with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs
-IUSE=debug hardened savedconfig +initramfs test
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.1.5
-RDEPEND=!sys-kernel/gentoo-kernel-bin:6.1.5 virtual/libelf
-REQUIRED_USE=arm? ( savedconfig ) hppa? ( savedconfig ) riscv? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.1.5
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-7.extras.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g5.tar.gz -> gentoo-kernel-config-g5.tar.gz amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.2-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.2-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.2-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.2-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f
-_md5_=864b2c9e90fa4f1c2327488dc32e9794
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.162 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.162
deleted file mode 100644
index cb698d3b0cdd..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.10.162
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-install toolchain-funcs unpacker
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.10.162
-RDEPEND=!sys-kernel/gentoo-kernel:5.10.162 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.162
-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-171.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.10-171.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.162-1.gpkg.tar -> gentoo-kernel-5.10.162-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.162-1.gpkg.tar -> gentoo-kernel-5.10.162-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.162-1.gpkg.tar -> gentoo-kernel-5.10.162-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.162-1.gpkg.tar -> gentoo-kernel-5.10.162-1.x86.gpkg.tar )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
-_md5_=f8fa00c4b0476dc3be4b1ae7e6b46403
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.86 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.86
deleted file mode 100644
index cd39a6df58d5..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.86
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-install toolchain-funcs unpacker
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.15.86
-RDEPEND=!sys-kernel/gentoo-kernel:5.15.86 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.15.86
-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-90.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-90.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.86-1.gpkg.tar -> gentoo-kernel-5.15.86-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.86-1.gpkg.tar -> gentoo-kernel-5.15.86-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.86-1.gpkg.tar -> gentoo-kernel-5.15.86-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.86-1.gpkg.tar -> gentoo-kernel-5.15.86-1.x86.gpkg.tar )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
-_md5_=8ffcd00818801bf6bb887b311e6df39c
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.87 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.87
deleted file mode 100644
index 413d18341643..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-5.15.87
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-install toolchain-funcs unpacker
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.15.87
-RDEPEND=!sys-kernel/gentoo-kernel:5.15.87 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.15.87
-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-91.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-5.15-91.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.87-1.gpkg.tar -> gentoo-kernel-5.15.87-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.87-1.gpkg.tar -> gentoo-kernel-5.15.87-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.87-1.gpkg.tar -> gentoo-kernel-5.15.87-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.87-1.gpkg.tar -> gentoo-kernel-5.15.87-1.x86.gpkg.tar )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
-_md5_=94eb09196b8203bd20e442e87c3756c9
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.15-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.15-r1
deleted file mode 100644
index 6fc7d61d4841..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.15-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-install toolchain-funcs unpacker
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.0.15
-RDEPEND=!sys-kernel/gentoo-kernel:6.0.15 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.0.15
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.0-15.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.0-15.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.15-1.gpkg.tar -> gentoo-kernel-6.0.15-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.15-1.gpkg.tar -> gentoo-kernel-6.0.15-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.15-1.gpkg.tar -> gentoo-kernel-6.0.15-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.15-1.gpkg.tar -> gentoo-kernel-6.0.15-1.x86.gpkg.tar )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
-_md5_=4580f6ae1d87b37ee38efdec0dfb3c9d
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.16 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.16
deleted file mode 100644
index a413be0ad4b9..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.16
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-install toolchain-funcs unpacker
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.0.16
-RDEPEND=!sys-kernel/gentoo-kernel:6.0.16 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.0.16
-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-16.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-16.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.16-1.gpkg.tar -> gentoo-kernel-6.0.16-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.16-1.gpkg.tar -> gentoo-kernel-6.0.16-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.16-1.gpkg.tar -> gentoo-kernel-6.0.16-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.16-1.gpkg.tar -> gentoo-kernel-6.0.16-1.x86.gpkg.tar )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
-_md5_=b95726e360971528f65a527dbd6f1118
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.17 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.17
deleted file mode 100644
index 38f653778b6f..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.17
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-install toolchain-funcs unpacker
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.0.17
-RDEPEND=!sys-kernel/gentoo-kernel:6.0.17 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.0.17
-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-17.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-17.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.17-1.gpkg.tar -> gentoo-kernel-6.0.17-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.17-1.gpkg.tar -> gentoo-kernel-6.0.17-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.17-1.gpkg.tar -> gentoo-kernel-6.0.17-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.17-1.gpkg.tar -> gentoo-kernel-6.0.17-1.x86.gpkg.tar )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
-_md5_=f14b38d259ddb17cd647466ff0753efc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.18 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.18
deleted file mode 100644
index 74598b8a0900..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.0.18
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-install toolchain-funcs unpacker
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.0.18
-RDEPEND=!sys-kernel/gentoo-kernel:6.0.18 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.0.18
-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-18.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.0-18.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.18-1.gpkg.tar -> gentoo-kernel-6.0.18-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.18-1.gpkg.tar -> gentoo-kernel-6.0.18-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.18-1.gpkg.tar -> gentoo-kernel-6.0.18-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.18-1.gpkg.tar -> gentoo-kernel-6.0.18-1.x86.gpkg.tar )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
-_md5_=f14b38d259ddb17cd647466ff0753efc
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.1-r1 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.1-r1
deleted file mode 100644
index 65983e9601b3..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.1-r1
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-install toolchain-funcs unpacker
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.1.1
-RDEPEND=!sys-kernel/gentoo-kernel:6.1.1 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.1.1
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-2.base.tar.xz https://dev.gentoo.org/~alicef/dist/genpatches/genpatches-6.1-2.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.1-1.gpkg.tar -> gentoo-kernel-6.1.1-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.1-1.gpkg.tar -> gentoo-kernel-6.1.1-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.1-1.gpkg.tar -> gentoo-kernel-6.1.1-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.1-1.gpkg.tar -> gentoo-kernel-6.1.1-1.x86.gpkg.tar )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
-_md5_=3855989114265d5f6c0846c8f85a18be
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.2 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.2
deleted file mode 100644
index 4c21808fd9f9..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.2
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-install toolchain-funcs unpacker
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.1.2
-RDEPEND=!sys-kernel/gentoo-kernel:6.1.2 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.1.2
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-3.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-3.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.2-1.gpkg.tar -> gentoo-kernel-6.1.2-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.2-1.gpkg.tar -> gentoo-kernel-6.1.2-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.2-1.gpkg.tar -> gentoo-kernel-6.1.2-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.2-1.gpkg.tar -> gentoo-kernel-6.1.2-1.x86.gpkg.tar )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
-_md5_=23e7b8553cdc74a3c1b7d786ef1b4d99
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.3 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.3
deleted file mode 100644
index 9468baed57fb..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.3
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-install toolchain-funcs unpacker
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.1.3
-RDEPEND=!sys-kernel/gentoo-kernel:6.1.3 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.1.3
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-4.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-4.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.3-1.gpkg.tar -> gentoo-kernel-6.1.3-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.3-1.gpkg.tar -> gentoo-kernel-6.1.3-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.3-1.gpkg.tar -> gentoo-kernel-6.1.3-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.3-1.gpkg.tar -> gentoo-kernel-6.1.3-1.x86.gpkg.tar )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
-_md5_=3d8af92bf42ed338767974e4cf8479d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.4 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.4
deleted file mode 100644
index 071d3a7a2e5c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.4
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-install toolchain-funcs unpacker
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.1.4
-RDEPEND=!sys-kernel/gentoo-kernel:6.1.4 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.1.4
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-5.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-5.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.4-1.gpkg.tar -> gentoo-kernel-6.1.4-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.4-1.gpkg.tar -> gentoo-kernel-6.1.4-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.4-1.gpkg.tar -> gentoo-kernel-6.1.4-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.4-1.gpkg.tar -> gentoo-kernel-6.1.4-1.x86.gpkg.tar )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
-_md5_=3d8af92bf42ed338767974e4cf8479d0
diff --git a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.5 b/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.5
deleted file mode 100644
index 4f0b5f27c51c..000000000000
--- a/metadata/md5-cache/sys-kernel/gentoo-kernel-bin-6.1.5
+++ /dev/null
@@ -1,17 +0,0 @@
-BDEPEND=sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc test? ( dev-tcltk/expect sys-apps/coreutils sys-kernel/dracut sys-fs/e2fsprogs amd64? ( app-emulation/qemu[qemu_softmmu_targets_x86_64] ) arm64? ( app-emulation/qemu[qemu_softmmu_targets_aarch64] ) ppc? ( app-emulation/qemu[qemu_softmmu_targets_ppc] ) ppc64? ( app-emulation/qemu[qemu_softmmu_targets_ppc64] ) x86? ( app-emulation/qemu[qemu_softmmu_targets_i386] ) )
-DEFINED_PHASES=config configure install postinst postrm preinst prepare prerm pretend test unpack
-DESCRIPTION=Pre-built Linux kernel with Gentoo patches
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-install toolchain-funcs unpacker
-IUSE=+initramfs test
-KEYWORDS=~amd64 ~arm64 ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.1.5
-RDEPEND=!sys-kernel/gentoo-kernel:6.1.5 virtual/libelf
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.1.5
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-7.base.tar.xz https://dev.gentoo.org/~mpagano/dist/genpatches/genpatches-6.1-7.extras.tar.xz amd64? ( https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.5-1.gpkg.tar -> gentoo-kernel-6.1.5-1.amd64.gpkg.tar ) arm64? ( https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.5-1.gpkg.tar -> gentoo-kernel-6.1.5-1.arm64.gpkg.tar ) ppc64? ( https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.5-1.gpkg.tar -> gentoo-kernel-6.1.5-1.ppc64le.gpkg.tar ) x86? ( https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.5-1.gpkg.tar -> gentoo-kernel-6.1.5-1.x86.gpkg.tar )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	unpacker	8bbea377a8dd2b5d5c8bc0d834ae6157
-_md5_=bf277291b9a653d45c9e133d3282088a
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.162 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.162
deleted file mode 100644
index 95e83ff8f988..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.10.162
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=8
-HOMEPAGE=https://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.162
-RDEPEND=virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.10.162
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.162.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g4.tar.gz -> gentoo-kernel-config-g4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.10.162.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.10.12 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.10.12 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.10.12 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/836165dd2dff34e4f2c47ca8f9c803002c1e6530/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.10.12 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=df9698486ca574037c95e781c8e90286
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.86 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.86
deleted file mode 100644
index d4952112a0e3..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.86
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs verify-sig
-IUSE=debug hardened savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.15.86
-RDEPEND=virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.15.86
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.86.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.86.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=3e4f9b1f2db82487ca5d21a388b5ee08
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.87 b/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.87
deleted file mode 100644
index 40bea7348c0b..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-5.15.87
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs verify-sig
-IUSE=debug hardened savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-5.15.87
-RDEPEND=virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=5.15.87
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.87.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g5.tar.gz -> gentoo-kernel-config-g5.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v5.x/linux-5.15.87.tar.sign ) amd64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.5.15.19 ) arm64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.5.15.19 ) ppc64? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.5.15.19 ) x86? ( https://src.fedoraproject.org/rpms/kernel/raw/ec69da7a42b5b7c3da91572ef22097b069ddbd01/f/kernel-i686-fedora.config -> kernel-i686-fedora.config.5.15.19 )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=ea4541b90ff8fcd392a0257259bb70e8
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.15 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.15
deleted file mode 100644
index a7ebbffabeb9..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.15
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs verify-sig
-IUSE=debug hardened savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.0.15
-RDEPEND=virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.0.15
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.15.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.15.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.8-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.8-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.8-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.8-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=31d6897273d3b5f74a16a66407e06f23
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.16 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.16
deleted file mode 100644
index 3a6eb7fe46b8..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs verify-sig
-IUSE=debug hardened savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.0.16
-RDEPEND=virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.0.16
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.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/v6.x/linux-6.0.16.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.8-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.8-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.8-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.8-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=31d6897273d3b5f74a16a66407e06f23
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.17 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.17
deleted file mode 100644
index 9e17012f25bc..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.17
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs verify-sig
-IUSE=debug hardened savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.0.17
-RDEPEND=virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.0.17
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.17.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g4.tar.gz -> gentoo-kernel-config-g4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.17.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.8-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.8-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.8-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.8-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=c700e87ef1902c029e099c791a623a42
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.18 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.18
deleted file mode 100644
index b1dc694f6986..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.0.18
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs verify-sig
-IUSE=debug hardened savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.0.18
-RDEPEND=virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.0.18
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.18.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g5.tar.gz -> gentoo-kernel-config-g5.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.0.18.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.0.8-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.0.8-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.0.8-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.0.8-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.0.8-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=4fec2a2f2ef31080a84e2704bc2e596e
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.1 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.1
deleted file mode 100644
index 0e1695587a82..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.1
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs verify-sig
-IUSE=debug hardened savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.1.1
-RDEPEND=virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.1.1
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.1.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.1.1.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.0-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.0-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.0-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.0-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.0-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.0-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.0-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.0-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=9ad7d83666e75c044cab4230b9329151
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.2 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.2
deleted file mode 100644
index 0f667be9bced..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.2
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs verify-sig
-IUSE=debug hardened savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.1.2
-RDEPEND=virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.1.2
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.2.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.1.2.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.0-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.0-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.0-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.0-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.0-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.0-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.0-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.0-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=9ad7d83666e75c044cab4230b9329151
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.3 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.3
deleted file mode 100644
index 354f64c484a8..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.3
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs verify-sig
-IUSE=debug hardened savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.1.3
-RDEPEND=virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.1.3
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.3.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g4.tar.gz -> gentoo-kernel-config-g4.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.3.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.2-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.2-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.2-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.2-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=d980c2999c51b246f8da9d30cb2ce4de
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.4 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.4
deleted file mode 100644
index a86d4da3cb02..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.4
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs verify-sig
-IUSE=debug hardened savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.1.4
-RDEPEND=virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.1.4
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.4.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g5.tar.gz -> gentoo-kernel-config-g5.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.4.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.2-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.2-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.2-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.2-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=50e94af3883933d954018f03a602b9d9
diff --git a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.5 b/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.5
deleted file mode 100644
index 1fa2451f9404..000000000000
--- a/metadata/md5-cache/sys-kernel/vanilla-kernel-6.1.5
+++ /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.1:3.11 >=dev-lang/python-3.10.9:3.10 >=dev-lang/python-3.9.16:3.9 ) app-arch/cpio sys-devel/bc sys-devel/flex virtual/libelf app-alternatives/yacc verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
-DEFINED_PHASES=compile config configure install postinst postrm preinst prepare prerm pretend setup test unpack
-DESCRIPTION=Linux kernel built from vanilla upstream sources
-EAPI=8
-HOMEPAGE=https://www.kernel.org/
-IDEPEND=|| ( sys-kernel/installkernel-gentoo sys-kernel/installkernel-systemd-boot ) initramfs? ( >=sys-kernel/dracut-049-r3 )
-INHERIT=kernel-build toolchain-funcs verify-sig
-IUSE=debug hardened savedconfig +initramfs test verify-sig
-KEYWORDS=~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86
-LICENSE=GPL-2
-PDEPEND=>=virtual/dist-kernel-6.1.5
-RDEPEND=virtual/libelf
-REQUIRED_USE=arm? ( savedconfig )
-RESTRICT=!test? ( test ) test? ( userpriv ) arm? ( test )
-SLOT=6.1.5
-SRC_URI=https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.5.tar.xz https://github.com/projg2/gentoo-kernel-config/archive/g5.tar.gz -> gentoo-kernel-config-g5.tar.gz verify-sig? ( https://cdn.kernel.org/pub/linux/kernel/v6.x/linux-6.1.5.tar.sign ) amd64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-x86_64-fedora.config -> kernel-x86_64-fedora.config.6.1.2-gentoo ) arm64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-aarch64-fedora.config -> kernel-aarch64-fedora.config.6.1.2-gentoo ) ppc64? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-ppc64le-fedora.config -> kernel-ppc64le-fedora.config.6.1.2-gentoo ) x86? ( https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/6.1.2-gentoo/kernel-i686-fedora.config -> kernel-i686-fedora.config.6.1.2-gentoo )
-_eclasses_=dist-kernel-utils	557a93bd51735200952a735894f6628e	kernel-build	e8aabe0ea0c0ca1de81a0b7357fea0b5	kernel-install	8b73c5cb30e5d76184a7f46acb1a7688	mount-boot	02a45c5e022c08dbc05178522b2772f2	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	portability	58227860123d3e8da23290064ce3373e	python-any-r1	d2955aaac8daaaa69fcc6dc93ed19f29	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	savedconfig	4011d8d7370446e970e2c92b20a31341	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
-_md5_=50e94af3883933d954018f03a602b9d9
diff --git a/metadata/md5-cache/virtual/Manifest.gz b/metadata/md5-cache/virtual/Manifest.gz
index 740dd874107b..06147560583d 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.162 b/metadata/md5-cache/virtual/dist-kernel-5.10.162
deleted file mode 100644
index 2dbdb136f82c..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.10.162
+++ /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.162 ~sys-kernel/gentoo-kernel-bin-5.10.162 ~sys-kernel/vanilla-kernel-5.10.162 )
-SLOT=0/5.10.162
-_md5_=2b14c705dcd61ca0cb392a256fbcb273
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.86 b/metadata/md5-cache/virtual/dist-kernel-5.15.86
deleted file mode 100644
index 1da5a6144851..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.15.86
+++ /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.15.86 ~sys-kernel/gentoo-kernel-bin-5.15.86 ~sys-kernel/vanilla-kernel-5.15.86 )
-SLOT=0/5.15.86
-_md5_=8d5178e82e5992dcec134c02ff7397e0
diff --git a/metadata/md5-cache/virtual/dist-kernel-5.15.87 b/metadata/md5-cache/virtual/dist-kernel-5.15.87
deleted file mode 100644
index 516d76305d90..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-5.15.87
+++ /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.15.87 ~sys-kernel/gentoo-kernel-bin-5.15.87 ~sys-kernel/vanilla-kernel-5.15.87 )
-SLOT=0/5.15.87
-_md5_=2b14c705dcd61ca0cb392a256fbcb273
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.0.15 b/metadata/md5-cache/virtual/dist-kernel-6.0.15
deleted file mode 100644
index e46832a185ca..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-6.0.15
+++ /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-6.0.15 ~sys-kernel/gentoo-kernel-bin-6.0.15 ~sys-kernel/vanilla-kernel-6.0.15 )
-SLOT=0/6.0.15
-_md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.0.16 b/metadata/md5-cache/virtual/dist-kernel-6.0.16
deleted file mode 100644
index dbea2191a76a..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-6.0.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-6.0.16 ~sys-kernel/gentoo-kernel-bin-6.0.16 ~sys-kernel/vanilla-kernel-6.0.16 )
-SLOT=0/6.0.16
-_md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.0.17 b/metadata/md5-cache/virtual/dist-kernel-6.0.17
deleted file mode 100644
index 28a99aae833a..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-6.0.17
+++ /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-6.0.17 ~sys-kernel/gentoo-kernel-bin-6.0.17 ~sys-kernel/vanilla-kernel-6.0.17 )
-SLOT=0/6.0.17
-_md5_=1b77229b710f7250654decf4c40132e9
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.0.18 b/metadata/md5-cache/virtual/dist-kernel-6.0.18
deleted file mode 100644
index 8e63d674e700..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-6.0.18
+++ /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-6.0.18 ~sys-kernel/gentoo-kernel-bin-6.0.18 ~sys-kernel/vanilla-kernel-6.0.18 )
-SLOT=0/6.0.18
-_md5_=1b77229b710f7250654decf4c40132e9
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.1.1 b/metadata/md5-cache/virtual/dist-kernel-6.1.1
deleted file mode 100644
index 72f8b857306d..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-6.1.1
+++ /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-6.1.1 ~sys-kernel/gentoo-kernel-bin-6.1.1 ~sys-kernel/vanilla-kernel-6.1.1 )
-SLOT=0/6.1.1
-_md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.1.2 b/metadata/md5-cache/virtual/dist-kernel-6.1.2
deleted file mode 100644
index b7604635e802..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-6.1.2
+++ /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-6.1.2 ~sys-kernel/gentoo-kernel-bin-6.1.2 ~sys-kernel/vanilla-kernel-6.1.2 )
-SLOT=0/6.1.2
-_md5_=62eff3c91f3533c035b4103dfd4b6dd7
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.1.3 b/metadata/md5-cache/virtual/dist-kernel-6.1.3
deleted file mode 100644
index b439624103b9..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-6.1.3
+++ /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-6.1.3 ~sys-kernel/gentoo-kernel-bin-6.1.3 ~sys-kernel/vanilla-kernel-6.1.3 )
-SLOT=0/6.1.3
-_md5_=1b77229b710f7250654decf4c40132e9
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.1.4 b/metadata/md5-cache/virtual/dist-kernel-6.1.4
deleted file mode 100644
index 30160275350d..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-6.1.4
+++ /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-6.1.4 ~sys-kernel/gentoo-kernel-bin-6.1.4 ~sys-kernel/vanilla-kernel-6.1.4 )
-SLOT=0/6.1.4
-_md5_=1b77229b710f7250654decf4c40132e9
diff --git a/metadata/md5-cache/virtual/dist-kernel-6.1.5 b/metadata/md5-cache/virtual/dist-kernel-6.1.5
deleted file mode 100644
index f3be8a6ce763..000000000000
--- a/metadata/md5-cache/virtual/dist-kernel-6.1.5
+++ /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-6.1.5 ~sys-kernel/gentoo-kernel-bin-6.1.5 ~sys-kernel/vanilla-kernel-6.1.5 )
-SLOT=0/6.1.5
-_md5_=1b77229b710f7250654decf4c40132e9
diff --git a/metadata/md5-cache/www-apps/Manifest.gz b/metadata/md5-cache/www-apps/Manifest.gz
index 2edb9cea13a9..5f248e63f4c2 100644
--- a/metadata/md5-cache/www-apps/Manifest.gz
+++ b/metadata/md5-cache/www-apps/Manifest.gz
diff --git a/metadata/md5-cache/www-apps/chromedriver-bin-109.0.5414.74 b/metadata/md5-cache/www-apps/chromedriver-bin-109.0.5414.74
index d527f972eb8f..f324fdead74e 100644
--- a/metadata/md5-cache/www-apps/chromedriver-bin-109.0.5414.74
+++ b/metadata/md5-cache/www-apps/chromedriver-bin-109.0.5414.74
@@ -3,10 +3,10 @@ DEFINED_PHASES=install
 DESCRIPTION=WebDriver for Chrome
 EAPI=8
 HOMEPAGE=https://sites.google.com/a/chromium.org/chromedriver
-KEYWORDS=~amd64
+KEYWORDS=amd64
 LICENSE=google-chrome
 RDEPEND=sys-libs/glibc !www-client/chromium www-client/google-chrome
 RESTRICT=bindist mirror strip
 SLOT=0
 SRC_URI=amd64? ( https://chromedriver.storage.googleapis.com/109.0.5414.74/chromedriver_linux64.zip -> chromedriver-bin-109.0.5414.74.linux64.zip )
-_md5_=a4422d3c8dbe10f09a1cdd680d10bc57
+_md5_=5a3996134d6aee5255905c8b528f1afd
diff --git a/metadata/md5-cache/www-servers/Manifest.gz b/metadata/md5-cache/www-servers/Manifest.gz
index 259a65365f5a..6de0ac2acd18 100644
--- a/metadata/md5-cache/www-servers/Manifest.gz
+++ b/metadata/md5-cache/www-servers/Manifest.gz
diff --git a/metadata/md5-cache/www-servers/tomcat-10.1.5 b/metadata/md5-cache/www-servers/tomcat-10.1.5
new file mode 100644
index 000000000000..c5d8805a1464
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-10.1.5
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-10.1.5:10.1.5 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.26 dev-java/glassfish-xmlrpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 ~dev-java/tomcat-el-api-10.1.5:5.0 ~dev-java/tomcat-jsp-api-10.1.5:3.1 ~dev-java/tomcat-servlet-api-10.1.5:6.0 dev-java/wsdl4j:0 app-admin/pwgen dev-java/ant-core >=virtual/jdk-11:* test? ( dev-java/ant-junit:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~amd64-linux
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/glassfish-xmlrpc-api:0 >=dev-java/jakartaee-migration-1.0.5:0 ~dev-java/tomcat-el-api-10.1.5:5.0 ~dev-java/tomcat-jsp-api-10.1.5:3.1 ~dev-java/tomcat-servlet-api-10.1.5:6.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-11:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=10.1
+SRC_URI=mirror://apache/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.3.1/biz.aQute.bnd-6.3.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.3.1/biz.aQute.bndlib-6.3.1.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-10/v10.1.5/src/apache-tomcat-10.1.5-src.tar.gz.asc )
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=ec2fa803265ed68ec24922dc863b6dde
diff --git a/metadata/md5-cache/www-servers/tomcat-9.0.71 b/metadata/md5-cache/www-servers/tomcat-9.0.71
new file mode 100644
index 000000000000..6930e86be1fe
--- /dev/null
+++ b/metadata/md5-cache/www-servers/tomcat-9.0.71
@@ -0,0 +1,16 @@
+BDEPEND=verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-9.0.71:9.0.71 ) verify-sig? ( app-crypt/gnupg >=app-portage/gemato-16 )
+DEFINED_PHASES=compile configure install postinst preinst prepare setup test unpack
+DEPEND=dev-java/eclipse-ecj:4.26 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-el-api-9.0.71:3.0 ~dev-java/tomcat-jsp-api-9.0.71:2.3 ~dev-java/tomcat-servlet-api-9.0.71:4.0 dev-java/wsdl4j:0 app-admin/pwgen >=dev-java/ant-core-1.9.13 >=virtual/jdk-1.8:* test? ( >=dev-java/ant-junit-1.9:0 dev-java/easymock:3.2 ) >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip ) >=dev-java/ant-core-1.8.2:0 dev-java/javatoolkit
+DESCRIPTION=Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container
+EAPI=8
+HOMEPAGE=https://tomcat.apache.org/
+INHERIT=java-pkg-2 java-ant-2 prefix verify-sig
+IUSE=extra-webapps doc source test verify-sig
+KEYWORDS=~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris
+LICENSE=Apache-2.0
+RDEPEND=dev-java/eclipse-ecj:4.26 dev-java/glassfish-xmlrpc-api:0 ~dev-java/tomcat-el-api-9.0.71:3.0 ~dev-java/tomcat-jsp-api-9.0.71:2.3 ~dev-java/tomcat-servlet-api-9.0.71:4.0 dev-java/wsdl4j:0 acct-group/tomcat acct-user/tomcat >=virtual/jre-1.8:* >=dev-java/java-config-2.2.0-r3 source? ( app-arch/zip )
+RESTRICT=test !test? ( test )
+SLOT=9
+SRC_URI=mirror://apache/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/6.3.1/biz.aQute.bnd-6.3.1.jar https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/6.3.1/biz.aQute.bndlib-6.3.1.jar verify-sig? ( https://downloads.apache.org/tomcat/tomcat-9/v9.0.71/src/apache-tomcat-9.0.71-src.tar.gz.asc )
+_eclasses_=java-ant-2	5cf479aa9e0ac9cc55899f2762c2aaa0	java-pkg-2	3b09e051fc2045a0f0b9471b87d4f8bd	java-utils-2	c79d65661a9f4f72b60376c9e4b3dfa1	multilib	5ca4e49abed8e3a2f7b56920eadee157	prefix	eab3c99d77fe00506c109c8a736186f7	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	verify-sig	afb98fe4696292e4234ce36713fd4e9e
+_md5_=5dc846f0ec87563f3ead46b892fd1d1d
diff --git a/metadata/md5-cache/x11-terms/Manifest.gz b/metadata/md5-cache/x11-terms/Manifest.gz
index 92c019840da0..5fb38a0f38e7 100644
--- a/metadata/md5-cache/x11-terms/Manifest.gz
+++ b/metadata/md5-cache/x11-terms/Manifest.gz
diff --git a/metadata/md5-cache/x11-terms/kitty-9999 b/metadata/md5-cache/x11-terms/kitty-9999
index 004a81b1bd06..d1d06eabd1df 100644
--- a/metadata/md5-cache/x11-terms/kitty-9999
+++ b/metadata/md5-cache/x11-terms/kitty-9999
@@ -14,4 +14,4 @@ REQUIRED_USE=^^ ( python_single_target_python3_9 python_single_target_python3_10
 RESTRICT=!test? ( test )
 SLOT=0
 _eclasses_=edo	c0eb9cbe6b0bd01fcb4918f12598a4d3	git-r3	2347f8fe2d392b2a091191f94be37e6f	multilib	5ca4e49abed8e3a2f7b56920eadee157	multiprocessing	b4e253ab22cef7b1085e9b67c7a3b730	optfeature	1a2157392a869265b2afcb63a26c12ac	python-single-r1	75118e916668a74c660a13b0ecb22562	python-utils-r1	a1a985ddd8795a8634b4b7f820b93143	toolchain-funcs	ec8bbc28394c7305b43ea07164bd8f5f	xdg	6024fbc93167fad782e2032933654857	xdg-utils	ac0e315a3688929e34ac75b139e7349a
-_md5_=469e10b43110d4006ccf6f57db7c4c6e
+_md5_=657cc8eb686208f6a329d31fb0691f53
diff --git a/metadata/news/Manifest b/metadata/news/Manifest
index f583263796a2..e44964e124a1 100644
--- a/metadata/news/Manifest
+++ b/metadata/news/Manifest
@@ -2,22 +2,22 @@
 Hash: SHA512
 
 MANIFEST Manifest.files.gz 14966 BLAKE2B 687a7b166f711e4c3c75d588b8febb4831fac9bee694b4222597007a9b433fee3a5aa6e187f1fc35937c84f642d144e511d63be549688dfd15f1839a5369d701 SHA512 bd9169c0f73f3e95819cf527d7df79adcfc029e6bfc752f29b75c7be14518984914e4ae2cb94e42a6398dc1af3b2a3e52070736093238502bb4eced7f5775b16
-TIMESTAMP 2023-01-15T05:09:57Z
+TIMESTAMP 2023-01-15T11:09:56Z
 -----BEGIN PGP SIGNATURE-----
 
-iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPDiqVfFIAAAAAALgAo
+iQKTBAEBCgB9FiEE4dartjv8+0ugL98c7FkO6skYklAFAmPD3wRfFIAAAAAALgAo
 aXNzdWVyLWZwckBub3RhdGlvbnMub3BlbnBncC5maWZ0aGhvcnNlbWFuLm5ldEUx
 RDZBQkI2M0JGQ0ZCNEJBMDJGREYxQ0VDNTkwRUVBQzkxODkyNTAACgkQ7FkO6skY
-klCpWw//e+/ADD1laHiVtIqaPoi4diqFpqYevp9f5qxeCryh/14g2Di93KmL6STp
-nk3ct7xxp07qTVNHlte5R2ixQZpUaYr2Pq9vN3dXv4Y7iCx4pHbsSX3OjV9j9Lq6
-FFJVYccGbonktouOUmyJnncyKya1+UbWPpZNeIAiOUDX8+d0AL7RTvyfLmczdvJd
-qyiQqslu8KzRIup5KlQxMe3dy2U7QfFGacaLekZuo8DONa0Fvsf/stXZi6FmSKQ/
-aqzL5wCg2nwckMN3C0pvDo55ARe9ymTtnYbrRGzTUl+4tKaKgEtHPaBzc5qUlt5c
-joTaaveMJDFXZrWK9O3k3j9z1bThBkZk+xm7lRD4fK9omMdZF+tUSh5eNSOk7NSv
-irvC/mMHYsBXrcaQboRyEHivEMRbcQrcZyRjDlCRUzj+Iw1lxe8h+P0GAdbeylHq
-POGulg/g8fk24f92C9WKDrr//86eDWHO1o0pwD4t47QbIKgp8FZgo4Xu9XvbxsTq
-toXFFtY6LI9N7OeKW+UGBW5ebApPHwPjhescCwUdpZU1cuR/UXkvvYSDfBj415N5
-wNs+0qpZrIu/xzn/S1ElzCqmkqlmneVU+Jh9hCEm9GRxm41ZwhG0Zk3QiNIn54mu
-F7+Hr4TB/9t4zTBlq3iPp4rMmYfo3p+T0CC47rLqfJIREJsaM8I=
-=yJIh
+klAxdw/9HfSliKak7+n9xXkqV73QcSnsr8GHS0UbKmC9sdJgFAVoO/EIjSDzlBsQ
+AMaW0InvJCezJTuuXOe3VPPFz3gFcggupzDRzJ7SyDTw71YTGEDYF+pCnErgZYkT
+LG/fMf7n/++T4n+l2m3yl5iqVUqvQxba0lCQiExgyUkMgfDO1/Mx/TKlFN/rinXw
+Bwu2IymhTVGGPaTO9RdHje45Wr/fKBv3NqZxP9MwrzeQeDaGtAzGKt0j+YDvFlJT
+cxJGrxVSY1LeCVvqaUTDoyY2VTIgTYMdwEx+kfwtRG7Sd5o7HYcYSkm1KMPpILLM
+H9l/Yq/V3ZrGCJZDuGWGL1O7qCCxVp4dWKm1Zcd2fEmuGwJL3OrZ/AWotqD11aeX
+x/Z6Z5ho9PNVyAUckY8E0Py+bBrqKJAYmciLvvo6rWia1Jn8SwxPLlYQP3TlD5Qh
+DB0pVzDYDGw1kg3oR0BQ1eTD0ynEQlcscFf4u8CjqPRXIlfe38ZF5+erTjBtETd2
+hnx3VPKXv0cYWWfk1N06qiiid/ztTyEENof5ug8NrF/Z3/bOaQp7GvT/mE1f8elO
+nzN3Uy5VWsMdaWd+yJ134XXKG9LAQv7N1xyqKg0TgaWWaZKsEdjaYYw/V2Ef2Emd
+OjNIN0xtoiEE+Xbcr7TBMDYACRw32iU7nIsiWgeeAy0B4GdHX9U=
+=XuNs
 -----END PGP SIGNATURE-----
diff --git a/metadata/news/timestamp.chk b/metadata/news/timestamp.chk
index 6ffa4b9d917e..8e2922aaef49 100644
--- a/metadata/news/timestamp.chk
+++ b/metadata/news/timestamp.chk
@@ -1 +1 @@
-Sun, 15 Jan 2023 05:09:53 +0000
+Sun, 15 Jan 2023 11:09:52 +0000
diff --git a/metadata/timestamp b/metadata/timestamp
index 19b6652b8116..b2a295cb20c0 100644
--- a/metadata/timestamp
+++ b/metadata/timestamp
@@ -1 +1 @@
-Sun Jan 15 05:09:52 AM UTC 2023
+Sun Jan 15 11:09:52 AM UTC 2023
diff --git a/metadata/timestamp.chk b/metadata/timestamp.chk
index 092401b05491..eb8c1d057bc1 100644
--- a/metadata/timestamp.chk
+++ b/metadata/timestamp.chk
@@ -1 +1 @@
-Sun, 15 Jan 2023 05:15:01 +0000
+Sun, 15 Jan 2023 11:15:01 +0000
diff --git a/metadata/timestamp.commit b/metadata/timestamp.commit
index 378efff655a8..4329558aadfa 100644
--- a/metadata/timestamp.commit
+++ b/metadata/timestamp.commit
@@ -1 +1 @@
-d69385cd24a131899918f7d51f8350a30564e983 1673755143 2023-01-15T03:59:03+00:00
+e824a21078513e559651e70fed7a0abc8fa621f7 1673780679 2023-01-15T11:04:39+00:00
diff --git a/metadata/timestamp.x b/metadata/timestamp.x
index 0fc1add92cc9..edca4bdc5e47 100644
--- a/metadata/timestamp.x
+++ b/metadata/timestamp.x
@@ -1 +1 @@
-1673759401 Sun 15 Jan 2023 05:10:01 AM UTC
+1673781001 Sun 15 Jan 2023 11:10:01 AM UTC
diff --git a/metadata/xml-schema/timestamp.chk b/metadata/xml-schema/timestamp.chk
index bb6b55e5ca45..8e2922aaef49 100644
--- a/metadata/xml-schema/timestamp.chk
+++ b/metadata/xml-schema/timestamp.chk
@@ -1 +1 @@
-Sun, 15 Jan 2023 05:09:52 +0000
+Sun, 15 Jan 2023 11:09:52 +0000
diff --git a/net-misc/Manifest.gz b/net-misc/Manifest.gz
index 6b49a1213057..71a0505fcd3a 100644
--- a/net-misc/Manifest.gz
+++ b/net-misc/Manifest.gz
diff --git a/net-misc/tigervnc-xorg-module/Manifest b/net-misc/tigervnc-xorg-module/Manifest
index bcbe9ef64d9b..8a7e75d8b8d3 100644
--- a/net-misc/tigervnc-xorg-module/Manifest
+++ b/net-misc/tigervnc-xorg-module/Manifest
@@ -1,2 +1,3 @@
-EBUILD tigervnc-xorg-module-1.12.0.ebuild 450 BLAKE2B b0632866a0ed282dae6b0dd4d1acf566ae6708d6ed24183211e7c0929187e79dbd032cfaba4f92e74a8201a3c314d0e166a11b1244ebe70794731940be02d77c SHA512 547c1b77c7c610661dcac3e9554e3a92a6f3e8f4cb0aba8fe908334ae6fd361a9e3cab5a61d93e9a6cf27c29d0440fff2dbf0ddd0096aadf91917d4745d84e44
+EBUILD tigervnc-xorg-module-1.12.0.ebuild 452 BLAKE2B 97f1a04d5c7610ca254d4aed5270a4996267ff538f2f8205da49a407eefab3ac44c970b34e970918709c10dcd06b1b1abb1459d6dd00a02450470bef51228922 SHA512 1ce2c3fcadba4316bfab72882eed619576ea38a404499c4506e61a0952b2dc786cf9dcdfa4739e283724bc3f9595cd1ecc318de9d52d0824348f645d904892c2
+EBUILD tigervnc-xorg-module-1.12.90.ebuild 457 BLAKE2B d140db31d7fc14436d0577b9d6c5dc76f944cc085e546f6ab241d30292bf90e43715c5c8c0a9257ecb642957d60076384b93495d9a3042e693351364ff29c398 SHA512 89d7c67336ba9aef161d18a5a5210ad67dead62257b2de1f295455120fd15de472e62593fa005954cad38123ab3c91ac1337f77d96379cdbf9c7eb94a4721ddc
 MISC metadata.xml 331 BLAKE2B a429af641beadf65a9af48b70d47442530df38a6653daa75a67bae2f86dafe206ee745086336ef10af5e1d11ed6df08c017a99e2f434c0d8015549e78c8825f2 SHA512 dca884d6e2edf72771b5062195aa3d379ded3d0b9c74f9f7bd4c6f5ae432128e93d53c8b24bcfe76963b9705be325668edab703cd2f8724123b1c70fda59c786
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
index 3f9ee15b2f61..48f881ebf961 100644
--- a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.0.ebuild
@@ -1,4 +1,4 @@
-# Copyright 2022 Gentoo Authors
+# Copyright 2022-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
@@ -6,7 +6,7 @@ EAPI=8
 XSERVER_VERSION="21.1.1"
 
 DESCRIPTION="Metapackage for the xorg module provided by tigervnc"
-HOMEPAGE="https://www.tigervnc.org"
+HOMEPAGE="https://tigervnc.org/"
 
 LICENSE="metapackage"
 SLOT="0"
diff --git a/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.90.ebuild b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.90.ebuild
new file mode 100644
index 000000000000..aa3265514938
--- /dev/null
+++ b/net-misc/tigervnc-xorg-module/tigervnc-xorg-module-1.12.90.ebuild
@@ -0,0 +1,18 @@
+# Copyright 2022-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+XSERVER_VERSION="21.1.1"
+
+DESCRIPTION="Metapackage for the xorg module provided by tigervnc"
+HOMEPAGE="https://tigervnc.org/"
+
+LICENSE="metapackage"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+
+RDEPEND="
+	~net-misc/tigervnc-${PV}[server]
+	=x11-base/xorg-server-${XSERVER_VERSION%.*}*
+"
diff --git a/net-misc/tigervnc/Manifest b/net-misc/tigervnc/Manifest
index 721f4729e3bc..d2fbee4c1841 100644
--- a/net-misc/tigervnc/Manifest
+++ b/net-misc/tigervnc/Manifest
@@ -5,9 +5,12 @@ AUX tigervnc-1.12.0-xsession-path.patch 973 BLAKE2B c193ccc5ad0d8e04f8cd9f755c9d
 AUX tigervnc-1.12.0.confd 665 BLAKE2B 1525706e3e60727ed0f3eeb0dcfc849ea2b92463d9c4bff09eb9e644e51aa7665ff96d0f0c5ec321014145f8227d7c7b94578a97d948bfc94cacbc4087ebc184 SHA512 bced660d691f559ab9392aef7ea0040ea5f435d7f1cfef9b82983395c10103b8607e90a03de67d330371d641bf249ec61200b9d28d48600f7548978b7ee367c6
 AUX tigervnc-1.12.0.initd 2149 BLAKE2B 7d7389128816ad07ba0890d57c113834fc325b00729a5e3979dca5c25e9940690aab9e10d7e6a94a8645002cc15dcbd54137636b373c99f86454a5873870ed72 SHA512 c1047acf1211c4073a4581d5bfe78dec00320e0749b44608224cc478ac335233cd7beacbd161f61330fe28c2a6fa8de137b2c80e9ebda9d92f90b062f489eecb
 AUX tigervnc-1.12.80-disable-server-and-pam.patch 1394 BLAKE2B fcda4d2199dce67a189e3b3aba7e88e41d2325e79147de7a5e0a414aff2583ac0bda1de7e372b907527177612eaeb2462294dbf578f5342701e9d274f09e4f78 SHA512 ec1fa15f70ff508636c02cf3b945b7e372fb391c674e47c6c0cbfc871400a3fc6f0847dae62cf7eb5d56afae121b9aec8d19359319ca0e7e04df03b3bec3cc5e
+AUX tigervnc-1.13.80-depend-po-files.patch 1590 BLAKE2B d1dea3c951cd636124927a1735482b94cfbc41ffc570c7a1dd82ec953fb02f7e593c542a761177d4714903e3b55d69877475b76548cd7e7b61065485e874dc19 SHA512 35d54da0c95f6c42c6a241f49988439dee2b754ac7d1d79c7616032a854d6197acc04c7857d4559c6947f14b2f0703735294146b002a36f49c4acb171511cb75
 DIST tigervnc-1.12.0-xserver-21.patch 3642 BLAKE2B 690860c51d9d2e4606b16318237f86e5a042410dd5778e3d99a01df3fedd7f1993b4fc1eaeb9d193ef9e54d5b25b1d99bfb0bedc8cfb6673983625d9b45c2f92 SHA512 8e9a667557d22e908b1f4e58017f822e98bc608d1e27a09e6b8cfb3b01fe0c5cf9bf484fa634e4109eb7a32234df67fcfdeaca92d4ff982de0e83778c359034d
 DIST tigervnc-1.12.0.tar.gz 1561898 BLAKE2B 891934e48e3c4f2c36c280ad1562874d3c22ca3118e8eda2f68f9ad7cca978c76b8825100f540774b7a6553e981bd9264e0f717c8313585553741d31706cafad SHA512 a16b15e9cda552a49a3934e4174e49d186d06494d90d11582599ab82559014332662aed7760619a6dfb32a8c95f7d63c68ac7d632c29dd662a6b713f036672bb
+DIST tigervnc-1.12.90.tar.gz 1963656 BLAKE2B cef93c05dc0e22f67db02d62de276329102b86119263f7224cde7648d8d705ae8f82ec10c7d895a9ae99477cf437038acc3345903b61a1ac30f5649948f9adde SHA512 c9f650e9985ab073042c15f8f3fafd57d5a56b3109c15ffbcfa6ea2fe6c6e56626aa8677415b9826700374d7fbd376e05004921194408604b8550758bd402025
 DIST xorg-server-21.1.1.tar.xz 4958508 BLAKE2B fadac208773700b91003ef18d46e6f2c6b501e59b7491c943f406641e9ff3837a8126034c023e9b6d2d4131ee438c1ef94fa458af1828d4be325519b47069a79 SHA512 8608ed9c1537c95e8a3adea5e3e372a3c5eb841f8e27c84283093f22fb1909e16a800006510da684b13f8f237f33b8a4be3e2537f5f9ab9af4c5ad12770eef0d
 EBUILD tigervnc-1.12.0-r7.ebuild 4722 BLAKE2B a311bc7e557bf9576c34ec1f5da32f414bfd270105f086e5917bcb126fbbd77f29681a42010713628a2b611155f40ddcb48db377130c7c989144fb48598f9b51 SHA512 1182eed80fcd13c01ffc7a267f0dc91858a730ac9f57e3edd94d78db15638ace8ddc98af239292d8384c86e29849681251341f07d5fc90d7ecb1308ae1d7f1dc
-EBUILD tigervnc-9999.ebuild 4618 BLAKE2B 972a802c205587855cfe3e70a421ab83984a3175dc75cfb71dc9d3127508fe5261eb4ce284c7593ff8056fd5ab9574e9a60a5d969b9ffcb64ce15b04d11f52f1 SHA512 6db6240797c92bcd49d82c8217120406b90de1dc7fd3aa8a7f3bc94014fb32d75f1796e400873d3d58fdd33b8b6b004158ba1769bbca6edf052daf1b5996b8ef
-MISC metadata.xml 497 BLAKE2B 196be4d87d96979869779efa591a6ae6d7fe255cea642fda061743de51e0148e920adb1a7dc3504f0c7bb99f7049ad7c122c7f11ec9db476346d27ff916a4009 SHA512 d62e59f933cf96251ee03023fd07beb9bbf7193f275ce214b91ef70996019b3f42c8b77a8b5895669134c9868e745de049ca8f38fecf7230d65eace36d96854c
+EBUILD tigervnc-1.12.90.ebuild 5288 BLAKE2B 4ce90fc20c2e9f93f30e369f315b65fb5b750c3818bf9cd9cea32276f869d0a303a00087f55dcba5d340bbdb6e99bac4ef563a3958f156970e6638190ae17a9f SHA512 c72a5f56201d1f60f47652e5557bd6317529f41702bcf02b201687905f7e5331240c3b434450031ce338f345d9e8c109c26ca677c02aebbd51e8c5cd8c2f25ac
+EBUILD tigervnc-9999.ebuild 5288 BLAKE2B 4ce90fc20c2e9f93f30e369f315b65fb5b750c3818bf9cd9cea32276f869d0a303a00087f55dcba5d340bbdb6e99bac4ef563a3958f156970e6638190ae17a9f SHA512 c72a5f56201d1f60f47652e5557bd6317529f41702bcf02b201687905f7e5331240c3b434450031ce338f345d9e8c109c26ca677c02aebbd51e8c5cd8c2f25ac
+MISC metadata.xml 602 BLAKE2B cd3ae9a2fa5758627621230b5bc005b46c65d028764c5578d7684ae7aaa6403d301a59476e2aae6fa4a7a1f38cd0d8c23a7db3a784666aa2f375267444c48658 SHA512 16c1ccff038df995cbe4bace496636e41f1de9c28ad25c45d49f63485d3b7b71d9682866ff1b005acc7b401d66112c1709048298a77fb1c0baadc879fa236743
diff --git a/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch b/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch
new file mode 100644
index 000000000000..d611ece53fb1
--- /dev/null
+++ b/net-misc/tigervnc/files/tigervnc-1.13.80-depend-po-files.patch
@@ -0,0 +1,36 @@
+Currently the live version does not build because of this dependency.  Remove it for now
+
+--- a/vncviewer/CMakeLists.txt
++++ b/vncviewer/CMakeLists.txt
+@@ -81,7 +81,6 @@
+                 --desktop --template vncviewer.desktop.in
+                 -d ${CMAKE_SOURCE_DIR}/po -o vncviewer.desktop
+       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
+-              ${CMAKE_SOURCE_DIR}/po/*.po
+     )
+   elseif(INTLTOOL_MERGE_EXECUTABLE)
+     add_custom_command(OUTPUT vncviewer.desktop
+@@ -93,7 +92,6 @@
+                 -d ${CMAKE_SOURCE_DIR}/po
+                 vncviewer.desktop.intl vncviewer.desktop
+       DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/vncviewer.desktop.in
+-              ${CMAKE_SOURCE_DIR}/po/*.po
+     )
+   else()
+     add_custom_command(OUTPUT vncviewer.desktop
+@@ -110,7 +108,6 @@
+                 --xml --template ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
+                 -d ${CMAKE_SOURCE_DIR}/po -o org.tigervnc.vncviewer.metainfo.xml
+       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
+-              ${CMAKE_SOURCE_DIR}/po/*.po
+     )
+   elseif(INTLTOOL_MERGE_EXECUTABLE)
+     add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
+@@ -123,7 +120,6 @@
+                 -x ${CMAKE_SOURCE_DIR}/po
+                 org.tigervnc.vncviewer.metainfo.xml.intl org.tigervnc.vncviewer.metainfo.xml
+       DEPENDS ${CMAKE_CURRENT_SOURCE_DIR}/org.tigervnc.vncviewer.metainfo.xml.in
+-              ${CMAKE_SOURCE_DIR}/po/*.po
+     )
+   else()
+     add_custom_command(OUTPUT org.tigervnc.vncviewer.metainfo.xml
diff --git a/net-misc/tigervnc/metadata.xml b/net-misc/tigervnc/metadata.xml
index 09bd90e4d40b..7c4c48e857d6 100644
--- a/net-misc/tigervnc/metadata.xml
+++ b/net-misc/tigervnc/metadata.xml
@@ -6,9 +6,11 @@
 		<name>Viorel Munteanu</name>
 	</maintainer>
 	<use>
+		<flag name="dri3">Build with DRI3 support</flag>
 		<flag name="drm">Build with DRM support</flag>
+		<flag name="java">Build TigerVNC Java viewer</flag>
 		<flag name="server">Build TigerVNC server</flag>
-		<flag name="dri3">Build with DRI3 support</flag>
+		<flag name="viewer">Build TigerVNC viewer</flag>
 	</use>
 	<upstream>
 		<remote-id type="github">TigerVNC/tigervnc</remote-id>
diff --git a/net-misc/tigervnc/tigervnc-1.12.90.ebuild b/net-misc/tigervnc/tigervnc-1.12.90.ebuild
new file mode 100644
index 000000000000..fc6cb7d77a07
--- /dev/null
+++ b/net-misc/tigervnc/tigervnc-1.12.90.ebuild
@@ -0,0 +1,227 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+CMAKE_IN_SOURCE_BUILD=1
+inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
+
+XSERVER_VERSION="21.1.1"
+
+DESCRIPTION="Remote desktop viewer display system"
+HOMEPAGE="https://tigervnc.org"
+SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+else
+	SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
+REQUIRED_USE="
+	dri3? ( drm )
+	java? ( viewer )
+	opengl? ( server )
+	|| ( server viewer )
+"
+
+# TODO: sys-libs/libselinux
+COMMON_DEPEND="
+	dev-libs/gmp:=
+	dev-libs/nettle:=
+	media-libs/libjpeg-turbo:=
+	sys-libs/zlib:=
+	x11-libs/libX11
+	x11-libs/libXext
+	x11-libs/libXrandr
+	x11-libs/pixman
+	gnutls? ( net-libs/gnutls:= )
+	nls? ( virtual/libiconv )
+	server? (
+		dev-libs/libbsd
+		dev-libs/openssl:0=
+		sys-libs/pam
+		x11-libs/libXau
+		x11-libs/libXdamage
+		x11-libs/libXdmcp
+		x11-libs/libXfixes
+		x11-libs/libXfont2
+		x11-libs/libXtst
+		x11-libs/pixman
+		x11-libs/xtrans
+		x11-apps/xauth
+		x11-apps/xinit
+		x11-apps/xkbcomp
+		x11-apps/xsetroot
+		x11-misc/xkeyboard-config
+		opengl? ( media-libs/libglvnd[X] )
+		!net-misc/turbovnc[server]
+	)
+	viewer? (
+		media-video/ffmpeg:=
+		x11-libs/fltk:1
+		x11-libs/libXi
+		x11-libs/libXrender
+		!net-misc/turbovnc[viewer]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
+	java? ( virtual/jre:1.8 )
+	server? (
+		dev-lang/perl
+		sys-process/psmisc
+	)
+"
+DEPEND="${COMMON_DEPEND}
+	drm? ( x11-libs/libdrm )
+	server? (
+		media-fonts/font-util
+		x11-base/xorg-proto
+		x11-libs/libxcvt
+		x11-libs/libXi
+		x11-libs/libxkbfile
+		x11-libs/libXrender
+		x11-misc/util-macros
+		opengl? ( media-libs/mesa )
+	)
+"
+BDEPEND="
+	virtual/pkgconfig
+	nls? ( sys-devel/gettext )
+"
+
+PATCHES=(
+	# Restore Java viewer
+	"${FILESDIR}"/${PN}-1.11.0-install-java-viewer.patch
+	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
+	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
+)
+[[ ${PV} == *9999 ]] && PATCHES+=( "${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
+
+src_unpack() {
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+	else
+		default
+	fi
+}
+
+src_prepare() {
+	if use server; then
+		cp -r "${WORKDIR}"/xorg-server-${XSERVER_VERSION}/. unix/xserver || die
+	fi
+
+	cmake_src_prepare
+
+	if use server; then
+		cd unix/xserver || die
+		eapply ../xserver${XSERVER_VERSION}.patch
+		eautoreconf
+		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
+		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
+
+		if use drm; then
+			cd "${WORKDIR}" && \
+			sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+		fi
+	fi
+}
+
+src_configure() {
+	if use arm || use hppa; then
+		append-flags "-fPIC"
+	fi
+
+	local mycmakeargs=(
+		-DENABLE_GNUTLS=$(usex gnutls)
+		-DENABLE_NLS=$(usex nls)
+		-DBUILD_JAVA=$(usex java)
+		-DBUILD_SERVER=$(usex server)
+		-DBUILD_VIEWER=$(usex viewer)
+	)
+
+	cmake_src_configure
+
+	if use server; then
+		cd unix/xserver || die
+		econf \
+			$(use_enable opengl glx) \
+			$(use_enable drm libdrm) \
+			--disable-config-hal \
+			--disable-config-udev \
+			--disable-devel-docs \
+			--disable-dri \
+			$(use_enable dri3) \
+			--disable-glamor \
+			--disable-kdrive \
+			--disable-libunwind \
+			--disable-linux-acpi \
+			--disable-record \
+			--disable-selective-werror \
+			--disable-static \
+			--disable-unit-tests \
+			--disable-xephyr \
+			$(use_enable xinerama) \
+			--disable-xnest \
+			--disable-xorg \
+			--disable-xvfb \
+			--disable-xwin \
+			--enable-dri2 \
+			--with-pic \
+			--without-dtrace \
+			--disable-present \
+			--with-sha1=libcrypto
+	fi
+}
+
+src_compile() {
+	cmake_src_compile
+
+	if use server; then
+		# deps of the vnc module and the module itself
+		local d subdirs=(
+			fb xfixes Xext dbe $(usex opengl glx "") $(usev dri3) randr render
+			damageext miext Xi xkb composite dix mi os hw/vnc
+		)
+		for d in "${subdirs[@]}"; do
+			emake -C unix/xserver/"${d}"
+		done
+	fi
+}
+
+src_install() {
+	cmake_src_install
+
+	if use server; then
+		emake -C unix/xserver/hw/vnc DESTDIR="${D}" install
+		rm -v "${ED}"/usr/$(get_libdir)/xorg/modules/extensions/libvnc.la || die
+
+		newconfd "${FILESDIR}"/${PN}-1.12.0.confd ${PN}
+		newinitd "${FILESDIR}"/${PN}-1.12.0.initd ${PN}
+
+		systemd_douserunit unix/vncserver/vncserver@.service
+
+		# comment out pam_selinux.so, the server does not start if missing
+		# part of bug #746227
+		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
+
+		# install vncserver to /usr/bin too, see bug #836620
+		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
+	fi
+}
+
+pkg_postinst() {
+	xdg_pkg_postinst
+
+	local OPTIONAL_DM="gnome-base/gdm x11-misc/lightdm x11-misc/sddm x11-misc/slim"
+	use server && \
+		optfeature "keeping track of the xorg-server module" net-misc/tigervnc-xorg-module && \
+		optfeature_header "Install any additional display manager package:" && \
+		optfeature "proper session support" ${OPTIONAL_DM}
+}
diff --git a/net-misc/tigervnc/tigervnc-9999.ebuild b/net-misc/tigervnc/tigervnc-9999.ebuild
index d8ae0f70e5f1..fc6cb7d77a07 100644
--- a/net-misc/tigervnc/tigervnc-9999.ebuild
+++ b/net-misc/tigervnc/tigervnc-9999.ebuild
@@ -1,36 +1,44 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
 CMAKE_IN_SOURCE_BUILD=1
-inherit autotools cmake eapi8-dosym flag-o-matic git-r3 java-pkg-opt-2 optfeature systemd xdg
+inherit autotools cmake flag-o-matic java-pkg-opt-2 optfeature systemd xdg
 
 XSERVER_VERSION="21.1.1"
 
 DESCRIPTION="Remote desktop viewer display system"
 HOMEPAGE="https://tigervnc.org"
 SRC_URI="server? ( ftp://ftp.freedesktop.org/pub/xorg/individual/xserver/xorg-server-${XSERVER_VERSION}.tar.xz )"
-EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+
+if [[ ${PV} == *9999 ]]; then
+	inherit git-r3
+	EGIT_REPO_URI="https://github.com/TigerVNC/tigervnc/"
+else
+	SRC_URI+=" https://github.com/TigerVNC/tigervnc/archive/v${PV}.tar.gz -> ${P}.tar.gz"
+	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~loong ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS=""
-IUSE="dri3 +drm gnutls java nls +opengl +server xinerama"
+IUSE="dri3 +drm gnutls java nls +opengl +server +viewer xinerama"
 REQUIRED_USE="
 	dri3? ( drm )
+	java? ( viewer )
 	opengl? ( server )
+	|| ( server viewer )
 "
 
-CDEPEND="
+# TODO: sys-libs/libselinux
+COMMON_DEPEND="
+	dev-libs/gmp:=
+	dev-libs/nettle:=
 	media-libs/libjpeg-turbo:=
 	sys-libs/zlib:=
-	x11-libs/fltk:1
 	x11-libs/libX11
 	x11-libs/libXext
-	x11-libs/libXi
 	x11-libs/libXrandr
-	x11-libs/libXrender
 	x11-libs/pixman
 	gnutls? ( net-libs/gnutls:= )
 	nls? ( virtual/libiconv )
@@ -52,31 +60,40 @@ CDEPEND="
 		x11-apps/xsetroot
 		x11-misc/xkeyboard-config
 		opengl? ( media-libs/libglvnd[X] )
+		!net-misc/turbovnc[server]
 	)
-	"
-
-RDEPEND="${CDEPEND}
+	viewer? (
+		media-video/ffmpeg:=
+		x11-libs/fltk:1
+		x11-libs/libXi
+		x11-libs/libXrender
+		!net-misc/turbovnc[viewer]
+	)
+"
+RDEPEND="${COMMON_DEPEND}
 	java? ( virtual/jre:1.8 )
 	server? (
 		dev-lang/perl
 		sys-process/psmisc
-	)"
-
-DEPEND="${CDEPEND}
+	)
+"
+DEPEND="${COMMON_DEPEND}
 	drm? ( x11-libs/libdrm )
 	server? (
 		media-fonts/font-util
 		x11-base/xorg-proto
 		x11-libs/libxcvt
+		x11-libs/libXi
 		x11-libs/libxkbfile
+		x11-libs/libXrender
 		x11-misc/util-macros
 		opengl? ( media-libs/mesa )
-	)"
-
+	)
+"
 BDEPEND="
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
-	"
+"
 
 PATCHES=(
 	# Restore Java viewer
@@ -84,10 +101,15 @@ PATCHES=(
 	"${FILESDIR}"/${PN}-1.12.0-xsession-path.patch
 	"${FILESDIR}"/${PN}-1.12.80-disable-server-and-pam.patch
 )
+[[ ${PV} == *9999 ]] && PATCHES+=( "${FILESDIR}"/${PN}-1.13.80-depend-po-files.patch )
 
 src_unpack() {
-	git-r3_src_unpack
-	use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+	if [[ ${PV} == *9999 ]]; then
+		git-r3_src_unpack
+		use server && unpack xorg-server-${XSERVER_VERSION}.tar.xz
+	else
+		default
+	fi
 }
 
 src_prepare() {
@@ -104,7 +126,10 @@ src_prepare() {
 		sed -i 's:\(present.h\):../present/\1:' os/utils.c || die
 		sed -i '/strcmp.*-fakescreenfps/,/^        \}/d' os/utils.c || die
 
-		cd "${WORKDIR}" && sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+		if use drm; then
+			cd "${WORKDIR}" && \
+			sed -i 's:\(drm_fourcc.h\):libdrm/\1:' $(grep drm_fourcc.h -rl .) || die
+		fi
 	fi
 }
 
@@ -118,6 +143,7 @@ src_configure() {
 		-DENABLE_NLS=$(usex nls)
 		-DBUILD_JAVA=$(usex java)
 		-DBUILD_SERVER=$(usex server)
+		-DBUILD_VIEWER=$(usex viewer)
 	)
 
 	cmake_src_configure
@@ -186,7 +212,7 @@ src_install() {
 		sed -i -e '/pam_selinux/s/^/#/' "${ED}"/etc/pam.d/tigervnc || die
 
 		# install vncserver to /usr/bin too, see bug #836620
-		dosym8 -r /usr/libexec/vncserver /usr/bin/vncserver
+		dosym -r /usr/libexec/vncserver /usr/bin/vncserver
 	fi
 }
 
diff --git a/net-misc/turbovnc/Manifest b/net-misc/turbovnc/Manifest
index 2a65b77b0c93..d61557ae6cb9 100644
--- a/net-misc/turbovnc/Manifest
+++ b/net-misc/turbovnc/Manifest
@@ -1,5 +1,5 @@
 AUX turbovnc-3.0-fix-musl-compilation.patch 936 BLAKE2B d0785023ecf0ffa4f1c1d4f09ad8669d04780bf7c7159da06caf4ee8b58c2b46268d55c6148de95b9bfc8d4c695e2571338aa90c65ee848e1cf5886ffb909309 SHA512 dbf30af408a921a73e3100e5f05639beea2466c02cb8b3b2c8c498e904ba33bc84f92541f1e7d03ac6ae8301afcdfa537101ea9efe3c52245e2470903b13a517
 DIST turbovnc-3.0.2.tar.gz 8691956 BLAKE2B 872dbdb0127d9935e8232757f0939cf95930bcd087d06dabe771bfe4ccf4703c05fd2d9c01f0baf073ba37f989c0f02b4e20d5ed08eb6f2a4a83c6f5bb0f9d36 SHA512 f04ab062dafe3210ab7722aa12a97d1f7956ddef7eed965e7df86810b7c9aa35d981d2397503d154bd0da0c71542e0e58be458fb5841f05fc9a0d80fdddf2d11
 DIST turbovnc-3.0.2.tar.gz.sig 543 BLAKE2B 3eeaa647ab3cab092112e3aa14cb4dba204e3c8a164082f32f942fd730d465e9b1973c9c7af047fcbba35fbfa02bb312fb8072963876b6add51d1105ac8eccbc SHA512 d17c6900db2bc47d8bbe3cc4bf8d0d1f17447fe4db5346baabf105c5d37a5a13048d6888d48fc5bd8e7a7a81b473b59b66c4c0108a10fcac211365d603093c4c
-EBUILD turbovnc-3.0.2.ebuild 2979 BLAKE2B 7cdab8545696eb6d324e27e5a34cebcf2dd2bbda6793f5f97d59d35d37d4e91d094c20adf60978d124a880ac0a4899da112cbd4f3a8ee63ee3580146b839ddae SHA512 cf3b7a1925f6276fece97bfca2a5b6d69e607cad67d12d5be163b82ff73192c1166b6fc259b3488b262d7e034c86fd60fe6621666ce9392446244f107b56e33d
-MISC metadata.xml 820 BLAKE2B 10f3075f4bbe8c9c39a7b1a2d40fb4986c089b48fd041e39880b310507130c091b53683870884b1f93a94e10ccf70a87504c6894637144d817ffa64b532c41e8 SHA512 13bd42b209f6a0f2b27240988edfa6b7e260ee70dbf42f380c1eec86a082106132de707d366325eb5eb04df5319420bc27b7f226fb994cb0ee700b0759b6b91c
+EBUILD turbovnc-3.0.2.ebuild 2998 BLAKE2B 568f6a2dd2392158fd1a2a9a402fe8d6913e6d4ecaa02e9b20caee02d3e088d71ee0982c38fbf701cb9bc423867cba4ebfdfe214437aa9608263933ba2ecdff3 SHA512 53836490d66875436733ec641cbb4b09d0baed77d0113e56e01dab704bf593c55352376e55224925fef9043b1411bf3d8d5ddbcbee8f3cc2e510232fc93c21af
+MISC metadata.xml 820 BLAKE2B 331426a28ac5efa9f27d1e9b21e4b75e6965b5c1cf41ce7b8d98b03187fc56d81ffb58f555fc522188d1003e64713220b6f5591131fb8a26a8fe43e277f54526 SHA512 0aa50eef5eb122e0de38bf5e2f8d0627841419dd5e88ee58444493f4a9804626111d5edc5b36aa996635f38c7fd87c71706dd543305f9b495031971b1c52be3d
diff --git a/net-misc/turbovnc/metadata.xml b/net-misc/turbovnc/metadata.xml
index 97cad453f15c..5c1cfb86ec9a 100644
--- a/net-misc/turbovnc/metadata.xml
+++ b/net-misc/turbovnc/metadata.xml
@@ -14,8 +14,8 @@
 		By The VirtualGL Project.
 	</longdescription>
 	<use>
-		<flag name="client">Build the client (vncviewer)</flag>
 		<flag name="server">Build the server (vncserver, Xvnc)</flag>
+		<flag name="viewer">Build the viewer (vncviewer)</flag>
 	</use>
 	<upstream>
 		<remote-id type="sourceforge">turbovnc</remote-id>
diff --git a/net-misc/turbovnc/turbovnc-3.0.2.ebuild b/net-misc/turbovnc/turbovnc-3.0.2.ebuild
index 3471a1f73bd5..abebac6c9c50 100644
--- a/net-misc/turbovnc/turbovnc-3.0.2.ebuild
+++ b/net-misc/turbovnc/turbovnc-3.0.2.ebuild
@@ -1,9 +1,9 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
-JAVA_PKG_OPT_USE=client
+JAVA_PKG_OPT_USE=viewer
 inherit cmake desktop java-pkg-opt-2 verify-sig
 
 DESCRIPTION="A fast replacement for TigerVNC"
@@ -16,19 +16,14 @@ SRC_URI="
 LICENSE="GPL-2"
 SLOT="0"
 KEYWORDS="~amd64"
-IUSE="+server +ssl"
-REQUIRED_USE="|| ( client server )"
+IUSE="+server +ssl +viewer"
+REQUIRED_USE="|| ( server viewer )"
 
 COMMON_DEPEND="
 	x11-apps/xauth
 	x11-libs/libX11
 	x11-libs/libXext
 	x11-misc/xkeyboard-config
-	client? (
-		media-libs/libjpeg-turbo:=[java]
-		x11-libs/libXi
-		!net-misc/tigervnc
-	)
 	server? (
 		media-libs/libjpeg-turbo:=
 		sys-libs/pam
@@ -41,12 +36,17 @@ COMMON_DEPEND="
 		ssl? ( dev-libs/openssl:= )
 		!net-misc/tigervnc[server]
 	)
+	viewer? (
+		media-libs/libjpeg-turbo:=[java]
+		x11-libs/libXi
+		!net-misc/tigervnc[viewer(+)]
+	)
 "
 
 RDEPEND="
 	${COMMON_DEPEND}
 	x11-apps/xkbcomp
-	client? ( >=virtual/jre-1.8:* )
+	viewer? ( >=virtual/jre-1.8:* )
 "
 
 # libbz2.so.1, libfontenc.so.1 and libfreetype.so.6 are used by libXfont2.so.2
@@ -54,7 +54,7 @@ RDEPEND="
 DEPEND="
 	${COMMON_DEPEND}
 	x11-libs/xtrans
-	client? ( >=virtual/jdk-1.8:* )
+	viewer? ( >=virtual/jdk-1.8:* )
 	server? (
 		app-arch/bzip2
 		media-libs/freetype
@@ -77,14 +77,14 @@ pkg_pretend() {
 }
 
 src_prepare() {
-	use client && java-pkg-opt-2_src_prepare
+	use viewer && java-pkg-opt-2_src_prepare
 	cmake_src_prepare
 }
 
 src_configure() {
 	local mycmakeargs=(
-		-DTVNC_BUILDVIEWER=$(usex client)
-		-DTVNC_BUILDHELPER=$(usex client)
+		-DTVNC_BUILDVIEWER=$(usex viewer)
+		-DTVNC_BUILDHELPER=$(usex viewer)
 		-DTVNC_BUILDSERVER=$(usex server)
 		-DTVNC_BUILDWEBSERVER=$(usex server)
 	)
@@ -109,7 +109,7 @@ src_configure() {
 		fi
 	fi
 
-	if use client ; then
+	if use viewer ; then
 		export JAVACFLAGS="$(java-pkg_javac-args)"
 		export JNI_CFLAGS="$(java-pkg_get-jni-cflags)"
 	fi
@@ -120,7 +120,7 @@ src_configure() {
 src_install() {
 	cmake_src_install
 
-	if use client ; then
+	if use viewer ; then
 		java-pkg_dojar "${BUILD_DIR}"/java/VncViewer.jar
 		make_desktop_entry vncviewer "TurboVNC Viewer" /usr/share/icons/hicolor/48x48/apps/${PN}.png
 	fi
diff --git a/net-nntp/Manifest.gz b/net-nntp/Manifest.gz
index 81767487cf2b..70f5f5236feb 100644
--- a/net-nntp/Manifest.gz
+++ b/net-nntp/Manifest.gz
diff --git a/net-nntp/sabnzbd/Manifest b/net-nntp/sabnzbd/Manifest
index 1ecded7d52a2..9b1a9b09e69c 100644
--- a/net-nntp/sabnzbd/Manifest
+++ b/net-nntp/sabnzbd/Manifest
@@ -2,12 +2,6 @@ AUX sabnzbd-r1.ini 322 BLAKE2B a0afea7621d0385f2d5d01f7b9bff2afaa87efdf8b8cbea19
 AUX sabnzbd-r1.initd 1391 BLAKE2B 1ff6d3dc4f5ece413cf1c0ab104b23c3a4ab451d5cda283327ca781acee88dcbbe22cffc15a725f6f6825a123f0db94fbad017fb7343c05f47ad02a02b68a235 SHA512 c5be8bf0a0053e1a5a6458b7a86c994e636845be2721dc0b14e76ed425ed077274ecbc800724502fa9fa543714470bbede219ec06e7b5dbd310e07c9a14f644c
 AUX sabnzbd.confd 156 BLAKE2B 8cd006eedf4f6614fa00ad9bfee6411dbfb99e1e487c19c4b314b3a7a12742ae4da5de93d771f3fb11a8c2ff5a7eef8fc1b879c1d85757ce218d9357037a70d6 SHA512 91915b54b6e2c2dc7839c23726aba7982b158b20a813ad0f66fa879d2454db14e24472e57e076b41866b28c7cd3991f9961c114b17dfc7e37322b23aa1e6c468
 AUX sabnzbd_at.service 185 BLAKE2B bedc84a8dec50c230bd2d4041d3e56dd33fdd7814488e3a6b53fbb8e0c7df2100ac13ee746e4b6cd45b384acfe6a9478df3a3d1f75bfc70dc41f51ac8f018916 SHA512 e5e6882c8520d26c21583fd2b9895248a777fa7519dc3588726dcccf689f81d604f2ef883681e54f6b212a51a8d8e690570ab60742d8b0232af73e98d61d6d34
-DIST SABnzbd-3.6.0-src.tar.gz 5052873 BLAKE2B 41b6fb818e9bcf40bedd16e9b2a0d5b2590cdbef8a29187f0e995d11d036c60364ed6f297eb6c2bb3f257040ef66b9bd26bc8464b9af2adfac3922f4817918a6 SHA512 277953a10211b72532ef4c490cc77516ad4691e15f55bbc08572edba8fc4154ddde5d6bd62ea79c2279dad571038cab25194d6764bf1377dda25d522a5838a92
-DIST SABnzbd-3.6.1-src.tar.gz 5051796 BLAKE2B a123b148290dd135f2eb375ce712b19b241907fd78935d9ec8cbb1b80b695c0aa0f92aff6b533e1966c84b9024f4c154a9708496331f85111906e6b068c22410 SHA512 7864f9252bbe8d66cd307e78911b03973554f1a2ccbba0e5ede536e4b7c679fe48cc1e334209688a9f9cd289b8bafc9a317dd02c6563e4151eba4fe2d81b9ddc
-DIST SABnzbd-3.7.0-src.tar.gz 5107150 BLAKE2B e582aaf09016ae34df8c49a1164d3f7e9a8ee85f734ae1066cc6d2c52f6a50a3de5d4abec30e0465d05629af73f4277920211557692e12f41d4b725476059796 SHA512 dbb18f06a0f5eec9ed4b946560073701bbb80ef20de9403ce92f408e96545fda5f7663dfd603723ea6c396c1a13dbb40e5868175d02e3218843138382c2a1335
 DIST SABnzbd-3.7.1-src.tar.gz 5108463 BLAKE2B 5858fc5ece3948696132c64c1f4a7459319bbc604074dc78339e54e7e77353dbd141b4aad0c0cd027ac6ea1499aee0100ed7f4a1b20d0786728503eb6ffad055 SHA512 c76f74e20943196467206b5c0427421d7fe4e614855c477a045d06854c5247c13056ce9055d82b5f0c6391a046dc3c65c577e50fc30646c8f2290df4bada4fb9
-EBUILD sabnzbd-3.6.0-r1.ebuild 3130 BLAKE2B 26eab87a3149b10ba3927ba4b72b3fb20142987e392c0e839060055a88263af0e0e9cedfbdb172ae44df54aa8c1cde1a3644574a3f4dfd9155ad6e30d193bafa SHA512 52e95ebe7e63fbe682f06379b5badc04da735dc40937016549203b763a3dc8821ea9acb55681655c62aa4f6234a4a7b18d85d458edfbbd74fcdd1f625eaa922d
-EBUILD sabnzbd-3.6.1-r1.ebuild 4760 BLAKE2B 5f3192af4b2145bcb79b8426a2935ae5095fa8307052c485e5048e39f5fb93c0072e5573d8f5a30539198873a5ed7f2768018ce5363ddfd465fa38de187764c7 SHA512 a6d9c6e0105b615929634d10febb22ab472cb2fd371e4721795f7aef20d51069307dda180edb88f06c9e0fb44e42db94d611103b59f78c507ad83207072ab9cc
-EBUILD sabnzbd-3.7.0.ebuild 4818 BLAKE2B fe9fd53f105688c2ad164724787da74c7e7d561b0c8c7d7c725dfe4bc5bc48a231699ea5906056ceb8d75d16c4b45c3a29fdaee65cd0606d814738c77a624dd0 SHA512 0a442f3759b5f30c9b48fc8cc9dceca1200e9e9d588a29686616e0c88614eda5223181ff18593dcd6356125c7e48f3d2d904726587650e4eaaaf207ad06645e4
-EBUILD sabnzbd-3.7.1.ebuild 4818 BLAKE2B fe9fd53f105688c2ad164724787da74c7e7d561b0c8c7d7c725dfe4bc5bc48a231699ea5906056ceb8d75d16c4b45c3a29fdaee65cd0606d814738c77a624dd0 SHA512 0a442f3759b5f30c9b48fc8cc9dceca1200e9e9d588a29686616e0c88614eda5223181ff18593dcd6356125c7e48f3d2d904726587650e4eaaaf207ad06645e4
-MISC metadata.xml 669 BLAKE2B 47998686b1b62f061cd33b5c719dab44f9a72e2b809587af75e17d130095099c03be0f585c6acaeebe8882c00b8d9870a9473cd85102317a4c55b3f3474f0fab SHA512 2c0ab624955c4ff2457d094e7c6bf11ceb098eab1e722fde02c2cb15a517504766e3bb4767961fab7b41bfcaa33d2527afbd159649359ca70428f6ba0849f9f3
+EBUILD sabnzbd-3.7.1.ebuild 4817 BLAKE2B b679d535d7181afb9a053c306fb65c8e56cda6371704b852fa0fd6495faf2b326bfe608955bdcca9ebb4a7ecc627adb447d99f95a1d2194c49aedea7e6039d6c SHA512 46d48b0dc40b8e72cfc28dd0bf043da97855c20f5c9316ace34d63fccf2c3e4920fb21a9626240f8f74340ec4eaf34e170ffffe70b12be111e5d17cff47a3257
+MISC metadata.xml 463 BLAKE2B 90b3702d7d29524a2f0c450d757fa35178211816fbf04661251a257d681d0af7ca7020f920e51fb1ae380fa24c5dd473588ae8ea42f1eb4982246c903872becd SHA512 ea4d26003fa929bc21a5678633a8df6cf76a6ce4dc4a6c33c15207e41fd147e94e2632dfcf3c1bfd46467920d8c46a667ec83fe71caa1347a5da2b798dffc329
diff --git a/net-nntp/sabnzbd/metadata.xml b/net-nntp/sabnzbd/metadata.xml
index 0ec067e3c855..256972b598b3 100644
--- a/net-nntp/sabnzbd/metadata.xml
+++ b/net-nntp/sabnzbd/metadata.xml
@@ -1,11 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!DOCTYPE pkgmetadata SYSTEM "https://www.gentoo.org/dtd/metadata.dtd">
 <pkgmetadata>
-	<use>
-		<flag name="7za">Add support for extracting 7za files</flag>
-		<flag name="rar">Add support for extracting rar files</flag>
-		<flag name="unzip">Add support for extracting zip files</flag>
-	</use>
 	<maintainer type="person" proxied="yes">
 		<email>joe@wt.gd</email>
 		<name>Joe Kappus</name>
diff --git a/net-nntp/sabnzbd/sabnzbd-3.6.0-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.6.0-r1.ebuild
deleted file mode 100644
index 0380a2df95fc..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.6.0-r1.ebuild
+++ /dev/null
@@ -1,122 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit python-single-r1 systemd
-
-MY_PV="${PV/_rc/RC}"
-MY_PV="${MY_PV//_pre*}"
-
-MY_P="${PN/sab/SAB}-${MY_PV}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="amd64"
-IUSE="+7za +rar unzip"
-
-# Sabnzbd is installed to /usr/share/ as upstream makes it clear they should not
-# be in python's sitedir.  See: https://sabnzbd.org/wiki/advanced/unix-packaging
-
-COMMON_DEPS="
-	acct-user/sabnzbd
-	acct-group/sabnzbd
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/cherrypy[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-6.0.10[${PYTHON_USEDEP}]
-		>=dev-python/guessit-3.1.0[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/puremagic[${PYTHON_USEDEP}]
-		~dev-python/sabyenc-5.4.2[${PYTHON_USEDEP}]
-	')
-"
-
-DEPEND="${COMMON_DEPS}"
-
-RDEPEND="
-	${COMMON_DEPS}
-	>=app-arch/par2cmdline-0.4
-	net-misc/wget
-	7za? ( app-arch/p7zip )
-	rar? ( || ( app-arch/unrar app-arch/rar ) )
-	unzip? ( >=app-arch/unzip-5.5.2 )
-"
-
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-S="${WORKDIR}/${MY_P}"
-
-pkg_setup() {
-	MY_HOMEDIR="/var/lib/${PN}"
-	python-single-r1_pkg_setup
-}
-
-src_install() {
-	local d
-
-	for d in email icons interfaces locale po sabnzbd scripts tools; do
-		insinto "/usr/share/${PN}/${d}"
-		doins -r ${d}/*
-	done
-
-	exeinto "/usr/share/${PN}"
-	doexe SABnzbd.py
-
-	python_fix_shebang "${ED}/usr/share/${PN}"
-	python_optimize "${ED}/usr/share/${PN}"
-
-	newinitd "${FILESDIR}/${PN}-r1.initd" "${PN}"
-	newconfd "${FILESDIR}/${PN}.confd" "${PN}"
-
-	diropts -o "${PN}" -g "${PN}"
-	dodir "/etc/${PN}"
-	keepdir "/var/log/${PN}"
-
-	insinto "/etc/${PN}"
-	insopts -m 0600 -o "${PN}" -g "${PN}"
-	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
-
-	dodoc ISSUES.txt README.mkd
-
-	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		einfo "Default directory: ${MY_HOMEDIR}"
-		einfo
-		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
-		einfo
-		einfo "    usermod -a -G sabnzbd <user>"
-		einfo
-		einfo "By default, SABnzbd will listen on TCP port 8080."
-	else
-		local v
-		for v in ${REPLACING_VERSIONS}; do
-			if ver_test "${v}" -lt 3; then
-				ewarn
-				ewarn "Due to changes in this release, the queue will be converted when ${PN}"
-				ewarn "is started for the first time. Job order, settings and data will be"
-				ewarn "preserved, but all jobs will be unpaused and URLs that did not finish"
-				ewarn "fetching before the upgrade will be lost!"
-				ewarn
-				break
-			fi
-		done
-	fi
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-3.6.1-r1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.6.1-r1.ebuild
deleted file mode 100644
index 614de09e30cd..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.6.1-r1.ebuild
+++ /dev/null
@@ -1,155 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{9..10} )
-PYTHON_REQ_USE="sqlite"
-
-inherit optfeature python-single-r1 systemd
-
-MY_PV="${PV/_rc/RC}"
-MY_PV="${MY_PV//_pre*}"
-
-MY_P="${PN/sab/SAB}-${MY_PV}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	acct-user/sabnzbd
-	acct-group/sabnzbd
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/cherrypy[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-6.0.10[${PYTHON_USEDEP}]
-		>=dev-python/guessit-3.1.0[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/puremagic[${PYTHON_USEDEP}]
-		~dev-python/sabyenc-5.4.3[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="
-	${DEPEND}
-	>=app-arch/par2cmdline-0.4
-	net-misc/wget
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/flaky[${PYTHON_USEDEP}]
-			>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-			dev-python/pkginfo[${PYTHON_USEDEP}]
-			dev-python/pyfakefs[${PYTHON_USEDEP}]
-			dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/selenium[${PYTHON_USEDEP}]
-			dev-python/tavalidate[${PYTHON_USEDEP}]
-			dev-python/tavern[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/xmltodict[${PYTHON_USEDEP}]
-		')
-		app-arch/p7zip
-		app-arch/unrar
-		app-arch/unzip
-		www-apps/chromedriver-bin
-	)
-"
-
-src_test() {
-	local EPYTEST_IGNORE=(
-		# network sandbox
-		tests/test_getipaddress.py
-		tests/test_rss.py
-		tests/test_urlgrabber.py
-		tests/test_utils/test_happyeyeballs.py
-		tests/test_utils/test_internetspeed.py
-	)
-	local EPYTEST_DESELECT=(
-		# network sandbox
-		'tests/test_consistency.py::TestWiki'
-		# Just plain fails
-		'tests/test_newsunpack.py::TestPar2Repair::test_basic'
-		# Chromedriver tests don't want to behave in portage
-		'tests/test_functional_config.py::TestBasicPages::test_base_pages'
-		'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
-		'tests/test_functional_config.py::TestConfigLogin::test_login'
-		'tests/test_functional_config.py::TestConfigCategories::test_page'
-		'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
-		'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
-		'tests/test_functional_misc.py::TestShowLogging::test_showlog'
-		'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
-		'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
-	)
-
-	epytest -s
-}
-
-src_install() {
-	local d
-	for d in email icons interfaces locale po sabnzbd scripts tools; do
-		insinto /usr/share/${PN}/${d}
-		doins -r ${d}/*
-	done
-
-	exeinto /usr/share/${PN}
-	doexe SABnzbd.py
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-	python_optimize "${ED}"/usr/share/${PN}
-
-	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	diropts -o ${PN} -g ${PN}
-	dodir /etc/${PN}
-	keepdir /var/log/${PN}
-
-	insinto "/etc/${PN}"
-	insopts -m 0600 -o "${PN}" -g "${PN}"
-	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
-
-	dodoc ISSUES.txt README.mkd
-
-	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		einfo "Default directory: /var/lib/${PN}"
-		einfo
-		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
-		einfo
-		einfo "    usermod -a -G sabnzbd <user>"
-		einfo
-		einfo "By default, SABnzbd will listen on TCP port 8080."
-	fi
-
-	optfeature "7z archive support" app-arch/p7zip
-	optfeature "rar archive support" app-arch/unrar app-arch/rar
-	optfeature "zip archive support" app-arch/unzip
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-3.7.0.ebuild b/net-nntp/sabnzbd/sabnzbd-3.7.0.ebuild
deleted file mode 100644
index a421ba546d4e..000000000000
--- a/net-nntp/sabnzbd/sabnzbd-3.7.0.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI="8"
-
-PYTHON_COMPAT=( python3_{9..11} )
-PYTHON_REQ_USE="sqlite"
-
-inherit optfeature python-single-r1 systemd
-
-MY_PV="${PV/_rc/RC}"
-MY_PV="${MY_PV//_pre*}"
-
-MY_P="${PN/sab/SAB}-${MY_PV}"
-
-DESCRIPTION="Binary newsgrabber with web-interface"
-HOMEPAGE="https://sabnzbd.org/"
-SRC_URI="https://github.com/sabnzbd/sabnzbd/releases/download/${MY_PV}/${MY_P}-src.tar.gz"
-S="${WORKDIR}/${MY_P}"
-
-# Sabnzbd is GPL-2 but bundles software with the following licenses.
-LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
-SLOT="0"
-KEYWORDS="~amd64"
-IUSE="test"
-RESTRICT="!test? ( test )"
-REQUIRED_USE="${PYTHON_REQUIRED_USE}"
-
-DEPEND="
-	acct-user/sabnzbd
-	acct-group/sabnzbd
-	${PYTHON_DEPS}
-	$(python_gen_cond_dep '
-		dev-python/chardet[${PYTHON_USEDEP}]
-		dev-python/cheetah3[${PYTHON_USEDEP}]
-		dev-python/cherrypy[${PYTHON_USEDEP}]
-		dev-python/configobj[${PYTHON_USEDEP}]
-		dev-python/cryptography[${PYTHON_USEDEP}]
-		>=dev-python/feedparser-6.0.10[${PYTHON_USEDEP}]
-		>=dev-python/guessit-3.1.0[${PYTHON_USEDEP}]
-		dev-python/notify2[${PYTHON_USEDEP}]
-		dev-python/portend[${PYTHON_USEDEP}]
-		dev-python/puremagic[${PYTHON_USEDEP}]
-		~dev-python/sabyenc-5.4.4[${PYTHON_USEDEP}]
-	')
-"
-RDEPEND="
-	${DEPEND}
-	>=app-arch/par2cmdline-0.4
-	net-misc/wget
-"
-BDEPEND="
-	test? (
-		$(python_gen_cond_dep '
-			dev-python/flaky[${PYTHON_USEDEP}]
-			>=dev-python/lxml-4.5.0[${PYTHON_USEDEP}]
-			dev-python/pkginfo[${PYTHON_USEDEP}]
-			dev-python/pyfakefs[${PYTHON_USEDEP}]
-			dev-python/pytest-httpbin[${PYTHON_USEDEP}]
-			dev-python/pytest-httpserver[${PYTHON_USEDEP}]
-			dev-python/pytest[${PYTHON_USEDEP}]
-			dev-python/requests[${PYTHON_USEDEP}]
-			dev-python/selenium[${PYTHON_USEDEP}]
-			dev-python/tavalidate[${PYTHON_USEDEP}]
-			dev-python/tavern[${PYTHON_USEDEP}]
-			dev-python/werkzeug[${PYTHON_USEDEP}]
-			dev-python/xmltodict[${PYTHON_USEDEP}]
-		')
-		app-arch/p7zip
-		app-arch/unrar
-		app-arch/unzip
-		www-apps/chromedriver-bin
-	)
-"
-
-src_test() {
-	local EPYTEST_IGNORE=(
-		# network sandbox
-		tests/test_getipaddress.py
-		tests/test_rss.py
-		tests/test_urlgrabber.py
-		tests/test_utils/test_happyeyeballs.py
-		tests/test_utils/test_internetspeed.py
-	)
-	local EPYTEST_DESELECT=(
-		# network sandbox
-		'tests/test_cfg.py::TestValidators::test_validate_host'
-		'tests/test_consistency.py::TestWiki'
-		# Just plain fails
-		'tests/test_newsunpack.py::TestPar2Repair::test_basic'
-		# Chromedriver tests don't want to behave in portage
-		'tests/test_functional_config.py::TestBasicPages::test_base_pages'
-		'tests/test_functional_config.py::TestBasicPages::test_base_submit_pages'
-		'tests/test_functional_config.py::TestConfigLogin::test_login'
-		'tests/test_functional_config.py::TestConfigCategories::test_page'
-		'tests/test_functional_config.py::TestConfigRSS::test_rss_basic_flow'
-		'tests/test_functional_config.py::TestConfigServers::test_add_and_remove_server'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_basic_rar5'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_7zip'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_passworded'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_fully_obfuscated'
-		'tests/test_functional_downloads.py::TestDownloadFlow::test_download_unicode_rar'
-		'tests/test_functional_misc.py::TestShowLogging::test_showlog'
-		'tests/test_functional_misc.py::TestQueueRepair::test_queue_repair'
-		'tests/test_functional_misc.py::TestDaemonizing::test_daemonizing'
-	)
-
-	epytest -s
-}
-
-src_install() {
-	local d
-	for d in email icons interfaces locale po sabnzbd scripts tools; do
-		insinto /usr/share/${PN}/${d}
-		doins -r ${d}/*
-	done
-
-	exeinto /usr/share/${PN}
-	doexe SABnzbd.py
-
-	python_fix_shebang "${ED}"/usr/share/${PN}
-	python_optimize "${ED}"/usr/share/${PN}
-
-	newinitd "${FILESDIR}"/${PN}-r1.initd ${PN}
-	newconfd "${FILESDIR}"/${PN}.confd ${PN}
-
-	diropts -o ${PN} -g ${PN}
-	dodir /etc/${PN}
-	keepdir /var/log/${PN}
-
-	insinto "/etc/${PN}"
-	insopts -m 0600 -o "${PN}" -g "${PN}"
-	newins "${FILESDIR}"/${PN}-r1.ini ${PN}.ini
-
-	dodoc ISSUES.txt README.mkd
-
-	systemd_newunit "${FILESDIR}"/sabnzbd_at.service 'sabnzbd@.service'
-}
-
-pkg_postinst() {
-	if [[ -z "${REPLACING_VERSIONS}" ]]; then
-		# This is a new installation
-		einfo "Default directory: /var/lib/${PN}"
-		einfo
-		einfo "To add a user to the sabnzbd group so it can edit SABnzbd+ files, run:"
-		einfo
-		einfo "    usermod -a -G sabnzbd <user>"
-		einfo
-		einfo "By default, SABnzbd will listen on TCP port 8080."
-	fi
-
-	optfeature "7z archive support" app-arch/p7zip
-	optfeature "rar archive support" app-arch/unrar app-arch/rar
-	optfeature "zip archive support" app-arch/unzip
-}
diff --git a/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild b/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild
index a421ba546d4e..47090e19ad47 100644
--- a/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild
+++ b/net-nntp/sabnzbd/sabnzbd-3.7.1.ebuild
@@ -21,7 +21,7 @@ S="${WORKDIR}/${MY_P}"
 # Sabnzbd is GPL-2 but bundles software with the following licenses.
 LICENSE="GPL-2 BSD LGPL-2 MIT BSD-1"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 IUSE="test"
 RESTRICT="!test? ( test )"
 REQUIRED_USE="${PYTHON_REQUIRED_USE}"
diff --git a/net-nntp/tin/Manifest b/net-nntp/tin/Manifest
index c37c52694f79..abe4ff71fb77 100644
--- a/net-nntp/tin/Manifest
+++ b/net-nntp/tin/Manifest
@@ -3,5 +3,5 @@ AUX tin-2.6.2-gnutls.patch 653 BLAKE2B fd5ad80b1f2e5c5307e28e513f2aaf9cbd17f1251
 DIST tin-2.6.1.tar.xz 1570500 BLAKE2B ec9c54b8b89ecd33a42ede37c8db50828de2dce56ddff01900121903a18d73bde8a06733ca2dfb72c676eb373b5ea874cecb9a1ee7890ada4ad6539d9ff1a435 SHA512 dc9ace5e24cac1efcaac25df1747dd435573130cff4e9c846c89e8faaed8e8120d66a2021332c01f350744155bcb7be608657285560a1a2457b4635cc8fa22b3
 DIST tin-2.6.2.tar.xz 1598732 BLAKE2B 0e5bac9a711fb69e64d64b4f0c070d456f38f727e7b7aa794ad5ada8695c2174023964b8f07d2e7d6add51cf0c7c3102965bef653a7e873275747145cb70dbe2 SHA512 4c9e0edb3268d57fb89d9d53a90e8a5ba73da7c1da63c834224bed0f763502a7c3dd325351d3e57b1ddcb57494a84228cc38f227c49300b759fad8d112b1cac1
 EBUILD tin-2.6.1-r1.ebuild 2025 BLAKE2B 11841532f22a5b6c56c0e5261d24c501ec46f76edc062155d2385e63cc2052e369bae4c3d697e4c0811a63d84b693a112b5ce038e40520398a741c388421a388 SHA512 5cf5e4b1249df5eed6f124499aa3cb56623a5ec2b00e971fff58f4c44fcf91c737718618c56df5eef5923cf552c3fc8f5330af21792698aa526be9f1a2623fde
-EBUILD tin-2.6.2.ebuild 2616 BLAKE2B 1a413554c21c265ff5788cbc803a8d93c1dbabfd5bb80bcce80b8bff9225c63a5382c8a47ec6793065af57ae3de2dafb0520325a6e47c6acce00ef999dd906b9 SHA512 7200bc8e81eaa2414274db129b0d873601d92dd5c476462f5e61efe508660ace7a1b1f0b824119733d2d43a4578902825f61d19cdab50cd58b8151015fcd3d18
-MISC metadata.xml 702 BLAKE2B e49603687a5cf71915d5228e4ecb37b2d14adaebdc7e77d6ccde3fead607e40a722e72423712d38194e14af5e4e429598c1bd7e52242688c6f746a983bc4d7f2 SHA512 cb7e2a8b53bdbb06270daf300fac3af347bdfa40049966e75b7e18db4157569dafc50a1c5abb3367a0103718c26e703b3245b5076686df81ec9727338ce42491
+EBUILD tin-2.6.2-r1.ebuild 2546 BLAKE2B 9c46b165c35e7f9df94b503a81a27b3b0f651d1f27060232f1fb4953b5c3e5ec1de423814d18d44d7df150a415a97122ee220f4caf4de8563277164583cbd3ce SHA512 e5e621ccb31270d2d287cfe19f74f6112fd1bf5df96f63f40e8b9ca07538715177078589787b019ced4c554be5c973a828f24c42ed109b5ea06bb015e7b0c29a
+MISC metadata.xml 567 BLAKE2B 25916692a1170d644125e756c5165c39ae91c663bcb2cb6eee21e6aca3852acb4eedc7ac6b3efdd1506a474c3e3314496018e84c99e218d1e9a92d4bbe6c2b99 SHA512 eabaa6400110777a838ece4787f6978eb2c4dd1bdf4051e498190e0607550ad8bf18ac63fd946635d2ea19849ea015a383da9bed35cfc940a2cae9b7f1329c61
diff --git a/net-nntp/tin/metadata.xml b/net-nntp/tin/metadata.xml
index 2273dcd0ef5a..99b4b39ce6a7 100644
--- a/net-nntp/tin/metadata.xml
+++ b/net-nntp/tin/metadata.xml
@@ -9,6 +9,5 @@
 		<flag name="cancel-locks">Enable Cancel-Lock header functionality</flag>
 		<flag name="gpg">Enable <pkg>app-crypt/gnupg</pkg> support</flag>
 		<flag name="libtls" restrict="&gt;=net-nntp/tin-2.6.2">Prefer <pkg>dev-libs/libretls</pkg> as SSL/TLS provider (ineffective with USE=-ssl)</flag>
-		<flag name="pcre2" restrict="&gt;=net-nntp/tin-2.6.2">Use <pkg>dev-libs/libpcre2</pkg> instead of <pkg>dev-libs/libpcre</pkg></flag>
 	</use>
 </pkgmetadata>
diff --git a/net-nntp/tin/tin-2.6.2.ebuild b/net-nntp/tin/tin-2.6.2-r1.ebuild
index 50345f36be9e..b5e39382f92c 100644
--- a/net-nntp/tin/tin-2.6.2.ebuild
+++ b/net-nntp/tin/tin-2.6.2-r1.ebuild
@@ -12,18 +12,17 @@ SRC_URI="ftp://ftp.tin.org/pub/news/clients/tin/stable/${P}.tar.xz"
 LICENSE="BSD"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-IUSE="cancel-locks debug gnutls gpg libtls nls +pcre2 sasl socks5 ssl"
+IUSE="cancel-locks debug gnutls gpg libtls nls sasl socks5 ssl"
 
 RDEPEND="
 	dev-libs/icu:=
+	dev-libs/libpcre2:=
 	dev-libs/uulib
 	sys-libs/ncurses:=
 	virtual/libiconv
 	cancel-locks? ( >=net-libs/canlock-3.0:= )
 	gpg? ( app-crypt/gnupg )
 	nls? ( virtual/libintl )
-	pcre2? ( dev-libs/libpcre2:= )
-	!pcre2? ( dev-libs/libpcre:3 )
 	sasl? ( virtual/gsasl )
 	socks5? ( net-proxy/dante )
 	ssl? (
@@ -37,6 +36,7 @@ RDEPEND="
 DEPEND="${RDEPEND}"
 BDEPEND="
 	app-alternatives/yacc
+	dev-libs/libpcre2
 	virtual/pkgconfig
 	nls? ( sys-devel/gettext )
 "
@@ -56,9 +56,6 @@ src_configure() {
 		$(use_enable cancel-locks)
 		$(use_with cancel-locks canlock)
 
-		$(use_with pcre2 pcre2-config)
-		$(use_with !pcre2 pcre "${ESYSROOT}"/usr)
-
 		$(use_enable debug)
 		$(use_enable gpg pgp-gpg)
 		$(use_enable nls)
@@ -66,6 +63,8 @@ src_configure() {
 		--disable-mime-strict-charset
 		--enable-nntp
 		--enable-prototypes
+		--without-pcre
+		--with-pcre2-config
 		--with-coffee # easter egg :)
 		--with-nntp-default-server="${TIN_DEFAULT_SERVER:-${NNTPSERVER:-news.gmane.io}}"
 		--with-screen=ncursesw
diff --git a/net-proxy/Manifest.gz b/net-proxy/Manifest.gz
index ff0187a16c88..92aa1f27857f 100644
--- a/net-proxy/Manifest.gz
+++ b/net-proxy/Manifest.gz
diff --git a/net-proxy/squid/Manifest b/net-proxy/squid/Manifest
index 70be8fe65652..50eeaf6ff453 100644
--- a/net-proxy/squid/Manifest
+++ b/net-proxy/squid/Manifest
@@ -9,5 +9,5 @@ AUX squid.pam 209 BLAKE2B 113fa119ce4fd96ddf34b95c1a1ca958b34aea405564076f89abdb
 DIST squid-4.17.tar.xz 2464204 BLAKE2B e227dfbac846dff66f04c6c72d81d667076107653721d14804f079518cef68efc53f5404fbe3306efb0c775a10638661c300a8e7cd3d7ab43c0e57a344387674 SHA512 cea36de10f128f5beb51bdc89604c16af3a820a5ac27284b2aa181ac87144930489688e1d85ce357fe1ed8a4e96e300277b95034a2475cbf86c9d6923ddf7c0a
 DIST squid-5.7.tar.xz 2566560 BLAKE2B 4a403ca4f94034356922ea1a4feffd5f5289e2aadbe1585bd04e83ee89712227ce04c53f7e05c10f7c8ac6be67a265a32b47032e7b56e929a172772fa41d5299 SHA512 624a39041a6ceda6c470dc0937616f1aa67200f3db02b4d74095d8d706ed31d6df5e0417dcacde45f6be40b617bee018849793d52c96a626aab32a2b182972aa
 EBUILD squid-4.17-r1.ebuild 8183 BLAKE2B ca1794b42ea7605d0fc0dae80a5d6071fc7929528d1619848fccd1a05c600057695596026d96efa21a3076b543ac8df20fecbba054a41182cdf317ca2059317b SHA512 7a94968e331c85dd6028d9c958c016c214d936176fae3c2453e8caab31df24bc2b3fa558934b2dc88ceec157af63323fb3ab7e10f893984414f49674fe5b1f6e
-EBUILD squid-5.7.ebuild 8975 BLAKE2B 78a77c5cc453937ad33e33eab643758d56e86c9b684167983f3feea15d866bc023b4aee0663ed3442328d7d11b5a12a6ae1963261657849da4f520faab63fa73 SHA512 5137bf6f177d8a8740f6f07c3257e2987489ff27a2f10741db71aec220aecad94efe7955e3e843d1a05d7a440e4568f9c31c7d5404f2e8e1b2772c797f07f0c3
+EBUILD squid-5.7.ebuild 8974 BLAKE2B e8d09c1b65dcaa4a4c81bafb5f64ba515a9957b301711bfab330aa820ad828b18f60949ef130f3109384167784f69a92e92fb6856077ad40984a4179452bde50 SHA512 28ba0c7f232ba2515a618a619e437ca55d8ee8ecca60c46c891c6ed750f9cc9c114c9e480ba4342854f7b2223fa8df4b988ec2491bc96d497473b5d2cf0ef8b6
 MISC metadata.xml 1351 BLAKE2B 8a6ea8bc939b5900572bd323fb3be78e0dfa9b4d7436f2d5e27fa59905f57af5cd9b7fe9a2903f8f57859a88176aab17c1a5d507a69765aab0f5320ceec69c96 SHA512 db7a47668d220a16f10d25319ffc4cd33270209d7d00f488d45680150f094d70776c4bf3c7b203b6ec8c69be18e5ac3a78d3d4367ec90a9ffb91ffd29f66890f
diff --git a/net-proxy/squid/squid-5.7.ebuild b/net-proxy/squid/squid-5.7.ebuild
index bb1976fb612b..4fee13888fb5 100644
--- a/net-proxy/squid/squid-5.7.ebuild
+++ b/net-proxy/squid/squid-5.7.ebuild
@@ -21,7 +21,7 @@ fi
 
 LICENSE="GPL-2"
 SLOT="0"
-KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc ~x86"
+KEYWORDS="~alpha amd64 ~arm ~arm64 ~hppa ~ia64 ~mips ~ppc ~ppc64 ~riscv ~sparc x86"
 IUSE="caps gnutls pam ldap samba sasl kerberos nis radius ssl snmp selinux logrotate test ecap"
 IUSE+=" esi ssl-crtd mysql postgres sqlite systemd perl qos tproxy +htcp +wccp +wccpv2"
 RESTRICT="!test? ( test )"
diff --git a/profiles/Manifest.gz b/profiles/Manifest.gz
index f7df9b339ca1..86695a6bbc5b 100644
--- a/profiles/Manifest.gz
+++ b/profiles/Manifest.gz
diff --git a/profiles/arch/amd64/make.defaults b/profiles/arch/amd64/make.defaults
index e7e18ff6a912..b428ef1b9888 100644
--- a/profiles/arch/amd64/make.defaults
+++ b/profiles/arch/amd64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="amd64"
@@ -63,3 +63,7 @@ IUSE_IMPLICIT="abi_x86_64"
 # Enable USE=libtirpc by default, to ease dependency resolution during
 # the stabilization of glibc-2.26. Bug 657148
 USE="libtirpc"
+
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+RUBY_TARGETS="ruby27"
diff --git a/profiles/arch/amd64/use.stable.mask b/profiles/arch/amd64/use.stable.mask
index eb5449388b24..0b02556030e1 100644
--- a/profiles/arch/amd64/use.stable.mask
+++ b/profiles/arch/amd64/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+ruby_targets_ruby30
+
 # Andreas Sturmlechner <asturm@gentoo.org> (2020-06-06)
 # sci-libs/mkl is not stable, needs online registration to even run pkg_setup
 mkl
diff --git a/profiles/arch/arm/make.defaults b/profiles/arch/arm/make.defaults
index 8c15da959c05..6eee33f58dd2 100644
--- a/profiles/arch/arm/make.defaults
+++ b/profiles/arch/arm/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2008-2021 Gentoo Authors
+# Copyright 2008-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Main ARM profile
@@ -25,3 +25,7 @@ VIDEO_CARDS="exynos fbdev omap"
 # Michał Górny <mgorny@gentoo.org> (2017-03-14)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+RUBY_TARGETS="ruby27"
diff --git a/profiles/arch/arm/use.stable.mask b/profiles/arch/arm/use.stable.mask
index c0fee12811ec..e17443daa607 100644
--- a/profiles/arch/arm/use.stable.mask
+++ b/profiles/arch/arm/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+ruby_targets_ruby30
+
 # Sam James <sam@gentoo.org> (2022-01-16)
 # net-libs/gnome-online-accounts is not marked stable on arm yet
 gnome-online-accounts
diff --git a/profiles/arch/arm64/make.defaults b/profiles/arch/arm64/make.defaults
index 2f35acff83c7..5283ee21346e 100644
--- a/profiles/arch/arm64/make.defaults
+++ b/profiles/arch/arm64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 2014-2021 Gentoo Authors
+# Copyright 2014-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # Main ARM64 (AArch64/ARMv8) profile; endian independent.
@@ -28,3 +28,7 @@ USE="libtirpc"
 # Michał Górny <mgorny@gentoo.org> (2017-03-14)
 # Unhide the ARM-specific USE_EXPANDs.
 USE_EXPAND_HIDDEN="-CPU_FLAGS_ARM"
+
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+RUBY_TARGETS="ruby27"
diff --git a/profiles/arch/arm64/use.stable.mask b/profiles/arch/arm64/use.stable.mask
index 75662ccee1bc..6e8a4ae5e46f 100644
--- a/profiles/arch/arm64/use.stable.mask
+++ b/profiles/arch/arm64/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+ruby_targets_ruby30
+
 # Ionen Wolkens <ionen@gentoo.org> (2022-02-17)
 # x11-drivers/nvidia-drivers is not stable yet
 video_cards_nvidia
diff --git a/profiles/arch/hppa/make.defaults b/profiles/arch/hppa/make.defaults
index 2908b66bb4e6..197fd6f830ef 100644
--- a/profiles/arch/hppa/make.defaults
+++ b/profiles/arch/hppa/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="hppa"
@@ -22,3 +22,7 @@ CHOST_hppa="${CHOST}"
 # Donnie Berkholz <dberkholz@gentoo.org> (2006-08-18)
 # Defaults for video drivers
 VIDEO_CARDS="fbdev"
+
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+RUBY_TARGETS="ruby27"
diff --git a/profiles/arch/hppa/use.stable.mask b/profiles/arch/hppa/use.stable.mask
index f6e015839f72..93c97503dde8 100644
--- a/profiles/arch/hppa/use.stable.mask
+++ b/profiles/arch/hppa/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+ruby_targets_ruby30
+
 # Rolf Eike Beer <eike@sf-mail.de> (2021-11-12)
 # dev-libs/nspr and dev-libs/nss are not stable on hppa
 nss
diff --git a/profiles/arch/powerpc/ppc32/make.defaults b/profiles/arch/powerpc/ppc32/make.defaults
index 0092e22c5c8e..9f5ea0744596 100644
--- a/profiles/arch/powerpc/ppc32/make.defaults
+++ b/profiles/arch/powerpc/ppc32/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # All extra USE/etc should be specified in sub-profiles.
@@ -31,3 +31,7 @@ IUSE_IMPLICIT="abi_ppc_32"
 
 # Enable abi_ppc_32 for packages that don't have it forced.
 ABI_PPC="32"
+
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+RUBY_TARGETS="ruby27"
diff --git a/profiles/arch/powerpc/ppc32/use.stable.mask b/profiles/arch/powerpc/ppc32/use.stable.mask
index bb0e227d65f3..7061a477827e 100644
--- a/profiles/arch/powerpc/ppc32/use.stable.mask
+++ b/profiles/arch/powerpc/ppc32/use.stable.mask
@@ -1,6 +1,10 @@
-# Copyright 2014-2022 Gentoo Authors
+# Copyright 2014-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+ruby_targets_ruby30
+
 # Sam James <sam@gentoo.org> (2022-03-03)
 # dev-lang/ocaml and dev-ml/* not marked stable here
 ocaml
diff --git a/profiles/arch/powerpc/ppc64/make.defaults b/profiles/arch/powerpc/ppc64/make.defaults
index 6f2df78adcd4..98f9021997d3 100644
--- a/profiles/arch/powerpc/ppc64/make.defaults
+++ b/profiles/arch/powerpc/ppc64/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # All extra USE/etc should be specified in sub-profiles.
@@ -39,3 +39,7 @@ VIDEO_CARDS="fbdev mga r128 radeon"
 
 # Enable abi_ppc_64 for packages that don't have it forced.
 ABI_PPC="64"
+
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+RUBY_TARGETS="ruby27"
diff --git a/profiles/arch/powerpc/ppc64/use.stable.mask b/profiles/arch/powerpc/ppc64/use.stable.mask
index 49d27fdb8144..a33e0614453d 100644
--- a/profiles/arch/powerpc/ppc64/use.stable.mask
+++ b/profiles/arch/powerpc/ppc64/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+ruby_targets_ruby30
+
 # Michał Górny <mgorny@gentoo.org> (2021-12-31)
 # PyPy3 target is not ready for stable.
 python_targets_pypy3
diff --git a/profiles/arch/sparc/make.defaults b/profiles/arch/sparc/make.defaults
index 23b5d7dad10a..165c975c732f 100644
--- a/profiles/arch/sparc/make.defaults
+++ b/profiles/arch/sparc/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 ARCH="sparc"
@@ -42,3 +42,7 @@ VIDEO_CARDS="fbdev mga r128 radeon"
 # Enable USE=libtirpc by default, to ease dependency resolution during
 # the stabilization of glibc-2.26. Bug 657148
 USE="libtirpc"
+
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+RUBY_TARGETS="ruby27"
diff --git a/profiles/arch/sparc/use.stable.mask b/profiles/arch/sparc/use.stable.mask
index 3062c3d30baa..e9b7d357b07d 100644
--- a/profiles/arch/sparc/use.stable.mask
+++ b/profiles/arch/sparc/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+ruby_targets_ruby30
+
 # Matt Turner <mattst88@gentoo.org> (2022-09-16)
 # gui-libs/gtk is not stable here
 gtk4
diff --git a/profiles/arch/x86/make.defaults b/profiles/arch/x86/make.defaults
index c1f35ac18d3a..43d51b858dab 100644
--- a/profiles/arch/x86/make.defaults
+++ b/profiles/arch/x86/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # All extra USE/etc should be specified in sub-profiles.
@@ -43,3 +43,7 @@ ABI_X86="32"
 # Enable USE=libtirpc by default, to ease dependency resolution during
 # the stabilization of glibc-2.26. Bug 657148
 USE="libtirpc"
+
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+RUBY_TARGETS="ruby27"
diff --git a/profiles/arch/x86/use.stable.mask b/profiles/arch/x86/use.stable.mask
index 093b69d79a82..8602730094f2 100644
--- a/profiles/arch/x86/use.stable.mask
+++ b/profiles/arch/x86/use.stable.mask
@@ -1,9 +1,13 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
 # Please use the same syntax as in use.mask
 
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
+# Temporary mask for https://bugs.gentoo.org/890915
+ruby_targets_ruby30
+
 # Sam James <sam@gentoo.org> (2020-11-10)
 # media-gfx/openvdb is not stable on x86
 # ... and has failing tests right now anyway
diff --git a/profiles/base/make.defaults b/profiles/base/make.defaults
index d7bc0fde9322..ab69dbfae58e 100644
--- a/profiles/base/make.defaults
+++ b/profiles/base/make.defaults
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 #
 # System-wide defaults for the Portage system
@@ -101,8 +101,8 @@ LCD_DEVICES="bayrad cfontz cfontz633 glk hd44780 lb216 lcdm001 mtxorb ncurses te
 
 # Manuel Rüger <mrueg@gentoo.org> (2015-09-09)
 # Default Ruby build target(s)
-# Updated to include ruby27 on 2021-10-10
-RUBY_TARGETS="ruby27"
+# Updated to include ruby30 on 2023-01-15
+RUBY_TARGETS="ruby27 ruby30"
 
 # Andreas K. Hüttel <dilfridge@gentoo.org> (2022-10-22)
 # These USE flags are what is common between the various sub-profiles. Stages 2
diff --git a/profiles/base/use.stable.mask b/profiles/base/use.stable.mask
index 419ea2fee196..4cb6c49e0416 100644
--- a/profiles/base/use.stable.mask
+++ b/profiles/base/use.stable.mask
@@ -1,4 +1,4 @@
-# Copyright 1999-2022 Gentoo Authors
+# Copyright 1999-2023 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 # This file requires eapi 5 or later. New entries go on top.
@@ -25,8 +25,7 @@ darcs
 python_targets_pypy3
 python_single_target_pypy3
 
-# Hans de Graaff <graaff@gentoo.org> (2021-10-10)
+# Hans de Graaff <graaff@gentoo.org> (2023-01-15)
 # Currently in testing and not ready to go stable yet.
-ruby_targets_ruby30
 ruby_targets_ruby31
 ruby_targets_ruby32
diff --git a/profiles/use.local.desc b/profiles/use.local.desc
index 506344e98969..36a5b1230361 100644
--- a/profiles/use.local.desc
+++ b/profiles/use.local.desc
@@ -6574,9 +6574,11 @@ net-misc/streamtuner:xiph - Enable xiph.org plug-in.
 net-misc/stunnel:stunnel3 - Install the stunnel3 wrapper.
 net-misc/tigervnc:dri3 - Build with DRI3 support
 net-misc/tigervnc:drm - Build with DRM support
+net-misc/tigervnc:java - Build TigerVNC Java viewer
 net-misc/tigervnc:server - Build TigerVNC server
-net-misc/turbovnc:client - Build the client (vncviewer)
+net-misc/tigervnc:viewer - Build TigerVNC viewer
 net-misc/turbovnc:server - Build the server (vncserver, Xvnc)
+net-misc/turbovnc:viewer - Build the viewer (vncviewer)
 net-misc/uftp:server - Install uftp server daemon
 net-misc/vde:pcap - Enable the pcap-based plugin that allows creating a switch against a real interface.
 net-misc/wget:cookie-check - Enable cookie checks via net-libs/libpsl
@@ -6631,15 +6633,11 @@ net-news/sfeed:theme-mono-highlight - Use mono_highlight theme
 net-news/sfeed:theme-newsboat - Use newsboat theme
 net-news/sfeed:theme-templeos - Use templeos theme
 net-nntp/nzbget:parcheck - Enable support for checking PAR archives
-net-nntp/sabnzbd:7za - Add support for extracting 7za files
-net-nntp/sabnzbd:rar - Add support for extracting rar files
-net-nntp/sabnzbd:unzip - Add support for extracting zip files
 net-nntp/slrn:canlock - Add support for cancel locks via net-libs/canlock
 net-nntp/slrn:uudeview - Add support for yEnc coding and more using dev-libs/uulib
 net-nntp/tin:cancel-locks - Enable Cancel-Lock header functionality
 net-nntp/tin:gpg - Enable app-crypt/gnupg support
 net-nntp/tin:libtls - Prefer dev-libs/libretls as SSL/TLS provider (ineffective with USE=-ssl)
-net-nntp/tin:pcre2 - Use dev-libs/libpcre2 instead of dev-libs/libpcre
 net-p2p/airdcpp-webclient:nat-pmp - Enable support for the NAT-PMP protocol
 net-p2p/airdcpp-webclient:tbb - Enable support of the TBB library to improve performance
 net-p2p/airdcpp-webclient:webui - Enable the Web UI
diff --git a/sci-mathematics/Manifest.gz b/sci-mathematics/Manifest.gz
index 16d22d37ff27..1b623148fb84 100644
--- a/sci-mathematics/Manifest.gz
+++ b/sci-mathematics/Manifest.gz
diff --git a/sci-mathematics/form/Manifest b/sci-mathematics/form/Manifest
index a28fd3bba62c..43beb9c706cd 100644
--- a/sci-mathematics/form/Manifest
+++ b/sci-mathematics/form/Manifest
@@ -1,5 +1,7 @@
+AUX 64form-gentoo.el 196 BLAKE2B c0c02c02c5292317f9303ae70f084031e5933582f6635a593e50db9332778295cc35a0fbef7bc6a9b9a6ebea469c50b714e6a3de23b27351884382ed180665f7 SHA512 dc6fa5d675ffc2cfe1289815f27610fc01923d16804bbf66287896f21afec496ba534df4fc569505b0deeda477ef46035fe2353c4e491c2e90c0f9d4e79a0b38
 DIST form-4.2.1.tar.gz 1444257 BLAKE2B 27ac9ee1412e6f478324b170e37e6e31822b74f902a5739d5fa00558aa4c9f7a977bd5fe3d6982313f1232a774c592d44af07fec8a290266c31bf3a100e87d1a SHA512 5569ae3e487194b0d082f4a032fb4b8d57238218d92d9b04d5f51db2a73e065eb1efdc26011bda46723e902fa3f324010ca2f8e91ba9a077e87b0a07b40cf594
 DIST form-4.3.0.tar.gz 1457721 BLAKE2B 029c62b0e1d92cf66be0290e45467e9de47f8ac9a593e7d012c13d877fb84aa1a212bb99b7a1a7b8b5b04c4cb056b58da80812faf5f0af5d33629c7632768ae6 SHA512 3f7f9cabf37d33fce0dcb7e091ac5ce60412ebe840fcea432655ab7f0c86c620200d60df085af3011d92d8057d9501583f16686257e5d097f6d0571d7f1b6742
+DIST form-mode.el.gz 6657 BLAKE2B 41d014e4ca8036249d53f5361012095e2ed2ef5e43543ba809a058f0ed241bd3ec984d9b61ab13a5b447faf07decf4e696362f24cacea3af5870cccdf43b1415 SHA512 aa81cc9c45a90af982179d56b874de0d152538653242ea028450675ab8421df2e0d53988c7efa3527845dae145c8047b71574191eedd90511fa89ad812851e25
 EBUILD form-4.2.1.ebuild 1746 BLAKE2B 571d9e4b9903bed7104ce42acbfb28d905d904e64d06c20de432f187fc9d6808f1d7b5e171cbe51b3e187bf40b3cccdfb2b8eeaeeeb9055854347122f45de782 SHA512 a659fc5b39b04562dce5a3fc2c9cb507fc209abb3b6009bdd8787ac547a3d14e3a0e6998489d3fbfee057458d9af6ae8de33df3f938e930a8e6bd1bd711b640e
-EBUILD form-4.3.0.ebuild 1746 BLAKE2B f8238b4ac53b22964f14f69392631bdcca8938418250f100779e712fe9b4b1f106d73bb643adc1b0de4708698fe80b35f586898f1cfbe6ef05f775665f98f229 SHA512 e00b9602de863f8ba6b91b3d06a5b08550f68d741c7a9cf78705b6878c80ce2d2b0a0490f20d32589ff6a9e75a15f514c75f6c2b4670a01d3fc10fd913bbf985
+EBUILD form-4.3.0-r1.ebuild 2174 BLAKE2B 503588f0c73a606b089e1208eca99e2d9fe3f131f5fa11d23fb37fae01bd3b3a3c6b0f8c5405ec3060cba607955fc9cdc06b7049521e0b8932570dc5ac8afc81 SHA512 68173b4ba583d540dfbfc1b57a79119bef6950a1f82bbb05e640f8db28440d73b5d54df1e188ad389aad1bb6f80dc2591af1cc27488a9436a38a4274574719bd
 MISC metadata.xml 515 BLAKE2B 9305198d106c3faefa094554d1b58ba3dc639b653d9db90d58784c6e7ab21188073c3e0e4d0671e6431451544c42e349af81c74a88f4e6022f5697c8fb39f13e SHA512 821c33a7f95b17c2c55799cf3973edc1180d3c0260f85658393f7552b6c2b8beea2ccf80008df61d236ba704b90e7bb943089d6d2f5830d22c3e69b2c168c9f1
diff --git a/sci-mathematics/form/files/64form-gentoo.el b/sci-mathematics/form/files/64form-gentoo.el
new file mode 100644
index 000000000000..e9da182fec15
--- /dev/null
+++ b/sci-mathematics/form/files/64form-gentoo.el
@@ -0,0 +1,6 @@
+
+;;; form site-lisp configuration
+
+(add-to-list 'load-path "@SITELISP@")
+(add-to-list 'auto-mode-alist '("\\.frm\\'" . form-mode))
+(autoload 'form-mode "form-mode" "Major mode for form files." t)
diff --git a/sci-mathematics/form/form-4.3.0.ebuild b/sci-mathematics/form/form-4.3.0-r1.ebuild
index 42e130cd9849..abdbf0481b5f 100644
--- a/sci-mathematics/form/form-4.3.0.ebuild
+++ b/sci-mathematics/form/form-4.3.0-r1.ebuild
@@ -3,25 +3,29 @@
 
 EAPI=8
 
-inherit autotools toolchain-funcs
+inherit autotools toolchain-funcs elisp-common
 
 DESCRIPTION="Symbolic Manipulation System"
 HOMEPAGE="https://www.nikhef.nl/~form/ https://github.com/vermaseren/form/"
-SRC_URI="https://github.com/vermaseren/${PN}/releases/download/v${PV}/${P}.tar.gz"
+SRC_URI="https://github.com/vermaseren/${PN}/releases/download/v${PV}/${P}.tar.gz
+	emacs? ( https://dev.gentoo.org/~grozin/form-mode.el.gz )"
 
 LICENSE="GPL-3"
 SLOT="0"
 KEYWORDS="~amd64 ~x86"
-IUSE="devref doc doxygen gmp mpi threads zlib"
+IUSE="devref doc doxygen emacs gmp mpi threads zlib"
 
 RDEPEND="
 	gmp? ( dev-libs/gmp:0= )
 	mpi? ( virtual/mpi )
 	zlib? ( sys-libs/zlib )"
 DEPEND="${RDEPEND}
-	devref? ( dev-texlive/texlive-latex )
-	doc? ( dev-texlive/texlive-latex )
-	doxygen? ( app-doc/doxygen )"
+	devref? ( dev-texlive/texlive-latexrecommended )
+	doc? ( dev-texlive/texlive-latexrecommended )
+	doxygen? ( app-doc/doxygen )
+	emacs? ( app-editors/emacs:* )"
+
+SITEFILE="64${PN}-gentoo.el"
 
 src_prepare() {
 	default
@@ -51,12 +55,12 @@ src_compile() {
 	default
 	if use devref; then
 		pushd doc/devref > /dev/null || die "doc/devref does not exist"
-		LANG=C emake pdf
+		LANG=C VARTEXFONTS="${T}/fonts" emake pdf
 		popd > /dev/null
 	fi
 	if use doc; then
 		pushd doc/manual > /dev/null || die "doc/manual does not exist"
-		LANG=C emake pdf
+		LANG=C VARTEXFONTS="${T}/fonts" emake pdf
 		popd > /dev/null
 	fi
 	if use doxygen; then
@@ -78,4 +82,16 @@ src_install() {
 		docinto html
 		dodoc -r doc/doxygen/html/.
 	fi
+	if use emacs; then
+		elisp-install ${PN} "${WORKDIR}"/*.el
+		elisp-site-file-install "${FILESDIR}/${SITEFILE}"
+	fi
+}
+
+pkg_postinst() {
+	use emacs && elisp-site-regen
+}
+
+pkg_postrm() {
+	use emacs && elisp-site-regen
 }
diff --git a/sci-mathematics/z3/Manifest b/sci-mathematics/z3/Manifest
index 9aed3e426a33..ee4e7853a70e 100644
--- a/sci-mathematics/z3/Manifest
+++ b/sci-mathematics/z3/Manifest
@@ -1,3 +1,5 @@
 DIST z3-4.11.2.tar.gz 5428273 BLAKE2B 85fe5b94c5bfaeaca5b1dfe42fe9763a278c414955a9aed45abbb3e60c366a86bcdcd7c3bdcf27cc67bc10c76700069d548cb1e27ccf3286c8c6eccfa9d492d1 SHA512 be2573d38c0e50b46fcb025d50335e016769fdeab3c26f5dc2a13102fae889d23039258ea8d38de3f53daa4cf073704d8639ac291e781a74633194adedaae21a
+DIST z3-4.12.0.tar.gz 5468532 BLAKE2B 229e8fb19cfb377f3ec9a728254c913a582ee16cfafaa8eb66683df01fc8320b527e493fe692fa85029360f6065d5a068ccbf337cdaf4b8f492ac8a2c3674063 SHA512 53a51c8304fa4356d13293f68b14d9d9eef57a0771c6698d38aea5fac62c4e52c41ff003cb6d771a32645d2aa4ef59be5f792f2efbee927d06ac8280094976e5
 EBUILD z3-4.11.2.ebuild 2598 BLAKE2B 11ed8b0481fd1b020907a8dfa31b23210a292d5f9fda1c472709138686f9c072b7ad3392849d7e4b18e3ea69b778c97579099cb738ca0e7dcece73a0ecaed94a SHA512 fd0e47c7015b77c7fe8d9256b94ef5508e97e3d0d4f8eb20ad4932614829b73221af30841d521a32d50ab341c39dcdec07a27ebe3c968c227d75a4769b254a24
+EBUILD z3-4.12.0.ebuild 2604 BLAKE2B b19844adc8eb2155fe1b203a3bcae36b339033a9771b0685f709d0e1695e2a537adb54dcdc3afaa03259c9dfb91b20fd4511a957dea9a46d6c1ebf20e939dd84 SHA512 de65594b85e908e228a8f3f69d1da65201e8509623d93597516593b8bd5ffd70948af3245bbe0ace3c7516c861f7676efce0dff97c19839e9df0180f5da2af7a
 MISC metadata.xml 1800 BLAKE2B 26b4fd829e8daf66cfb19f61afffe9535099260732b3856c400881e68dbc4c2ffe88ff57f3a23449a2259696f23969c6502d4f3432b9cafc2e89e99167c94b90 SHA512 92f05bb1617630c16801ae5ea4215436c4d5dde6890d1a9e90c81f8ce1cddf101b73e016d1ec67eb41ccb4b59753547e6d08ac6a70a5b2d3dc792dc9fba13166
diff --git a/sci-mathematics/z3/z3-4.12.0.ebuild b/sci-mathematics/z3/z3-4.12.0.ebuild
new file mode 100644
index 000000000000..56bcff6924d7
--- /dev/null
+++ b/sci-mathematics/z3/z3-4.12.0.ebuild
@@ -0,0 +1,107 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+PYTHON_COMPAT=( python3_{9..11} )
+
+inherit cmake-multilib java-pkg-opt-2 python-single-r1
+
+DESCRIPTION="An efficient theorem prover"
+HOMEPAGE="https://github.com/Z3Prover/z3/"
+SRC_URI="https://github.com/Z3Prover/z3/archive/${P}.tar.gz"
+S=${WORKDIR}/z3-${P}
+
+SLOT="0/$(ver_cut 1-2)"
+LICENSE="MIT"
+KEYWORDS="~amd64 ~arm ~arm64 ~loong ~ppc ~ppc64 ~riscv ~sparc ~x86"
+IUSE="doc examples gmp isabelle java python"
+REQUIRED_USE="${PYTHON_REQUIRED_USE}"
+
+RDEPEND="
+	${PYTHON_DEPS}
+	gmp? ( dev-libs/gmp:0=[cxx(+),${MULTILIB_USEDEP}] )
+"
+DEPEND="
+	${RDEPEND}
+	java? ( >=virtual/jdk-1.8 )
+"
+BDEPEND="
+	doc? ( app-doc/doxygen[dot] )
+"
+
+CMAKE_BUILD_TYPE=RelWithDebInfo
+
+src_prepare() {
+	cmake_src_prepare
+	java-pkg-opt-2_src_prepare
+}
+
+multilib_src_configure() {
+	local mycmakeargs=(
+		-DCMAKE_INSTALL_DOCDIR="${EPREFIX}/usr/share/doc/${PF}"
+		-DZ3_USE_LIB_GMP=$(usex gmp)
+		-DZ3_ENABLE_EXAMPLE_TARGETS=OFF
+		-DZ3_BUILD_DOCUMENTATION=$(multilib_native_usex doc)
+		-DZ3_BUILD_PYTHON_BINDINGS=$(multilib_native_usex python)
+		-DZ3_BUILD_JAVA_BINDINGS=$(multilib_native_usex java)
+		-DZ3_INCLUDE_GIT_DESCRIBE=OFF
+		-DZ3_INCLUDE_GIT_HASH=OFF
+	)
+
+	multilib_is_native_abi && use java && mycmakeargs+=( -DJAVA_HOME="$(java-config -g JAVA_HOME )" )
+
+	cmake_src_configure
+}
+
+multilib_src_test() {
+	cmake_build test-z3
+	set -- "${BUILD_DIR}"/test-z3 /a
+	echo "${@}" >&2
+	"${@}" || die
+}
+
+multilib_src_install_all() {
+	dodoc README.md
+	use examples && dodoc -r examples
+	use python && python_optimize
+
+	if use isabelle; then
+		insinto /usr/share/Isabelle/contrib/${P}/etc
+		newins - settings <<-EOF
+			Z3_COMPONENT="\$COMPONENT"
+			Z3_HOME="${EPREFIX}/usr/bin"
+			Z3_SOLVER="${EPREFIX}/usr/bin/z3"
+			Z3_REMOTE_SOLVER="z3"
+			Z3_VERSION="${PV}"
+			Z3_INSTALLED="yes"
+			Z3_NON_COMMERCIAL="yes"
+		EOF
+	fi
+}
+
+pkg_postinst() {
+	if use isabelle; then
+		if [[ -f ${ROOT}/etc/isabelle/components ]]; then
+			sed -e "/contrib\/${PN}-[0-9.]*/d" \
+				-i "${ROOT}/etc/isabelle/components" || die
+			cat <<-EOF >> "${ROOT}/etc/isabelle/components" || die
+				contrib/${P}
+			EOF
+		fi
+	fi
+}
+
+pkg_postrm() {
+	if use isabelle; then
+		if [[ ! ${REPLACING_VERSIONS} ]]; then
+			if [[ -f "${ROOT}/etc/isabelle/components" ]]; then
+				# Note: this sed should only match the version of this ebuild
+				# Which is what we want as we do not want to remove the line
+				# of a new Isabelle component being installed during an upgrade.
+				sed -e "/contrib\/${P}/d" \
+					-i "${ROOT}/etc/isabelle/components" || die
+			fi
+		fi
+	fi
+}
diff --git a/sec-keys/Manifest.gz b/sec-keys/Manifest.gz
index c230b0a937f8..846d01399eca 100644
--- a/sec-keys/Manifest.gz
+++ b/sec-keys/Manifest.gz
diff --git a/sec-keys/openpgp-keys-apache-tomcat/Manifest b/sec-keys/openpgp-keys-apache-tomcat/Manifest
index b913b7b63bc9..c056295bf96b 100644
--- a/sec-keys/openpgp-keys-apache-tomcat/Manifest
+++ b/sec-keys/openpgp-keys-apache-tomcat/Manifest
@@ -1,7 +1,11 @@
 DIST openpgp-keys-apache-tomcat-10.1.4-KEYS.asc 29066 BLAKE2B 72cc4f65649cf9b0118936d3af7d122833aa3a8f55c13457e1656acaf0c0081fc0e2a276891ce7701cb672b69497dfe9bf21a39b08319d896c138abcd6c50afc SHA512 ced5f5251dfda8b5accd3278ff54df8038bdf1c2dc7a07abd2c2366167d9bc5788e26d2a8036649b9a6498d2c0008af4829103724e76a6cfd29b262a70037444
+DIST openpgp-keys-apache-tomcat-10.1.5-KEYS.asc 29066 BLAKE2B 72cc4f65649cf9b0118936d3af7d122833aa3a8f55c13457e1656acaf0c0081fc0e2a276891ce7701cb672b69497dfe9bf21a39b08319d896c138abcd6c50afc SHA512 ced5f5251dfda8b5accd3278ff54df8038bdf1c2dc7a07abd2c2366167d9bc5788e26d2a8036649b9a6498d2c0008af4829103724e76a6cfd29b262a70037444
 DIST openpgp-keys-apache-tomcat-8.5.84-KEYS.asc 45686 BLAKE2B 77604cd61e33efa2df702a992bc27cdb2060da1714c00bc75ee0438e1374d7b63a9a02c7aaa917fa982c0c8112bf29974b03a46e78146c9d51c360bc6343b898 SHA512 44f3063f5ada8d7e4be644b6d9cafc79b9c4e03d58f6843da20782ea945832d3d70ed02e4ad26594f97b30d2b77bf2339fbe11e671a0772ca3bfbef7db533210
 DIST openpgp-keys-apache-tomcat-9.0.70-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
+DIST openpgp-keys-apache-tomcat-9.0.71-KEYS.asc 14008 BLAKE2B 62f0f6bf0d89a3930df668c039c69c4b2648128079a4d420f4f0c8a1b4c228ca5c631f3d2f66745a7c4d8c85e98609dc4119bc224306d972f65ab432385a1231 SHA512 51ad85d42824d22ace66ce2eeee62df598d55efe11caad7f6e5c9d09377a80431013711a0243fb0dc1f7a4bf3aa24ed77024a311aa77277743b784e3ef6a946e
 EBUILD openpgp-keys-apache-tomcat-10.1.4.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
+EBUILD openpgp-keys-apache-tomcat-10.1.5.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 EBUILD openpgp-keys-apache-tomcat-8.5.84.ebuild 562 BLAKE2B 8098448a887a6e53fb964ec0f009bcb9e593859eecaf4acb60ff28b983a266cceacea63c109a0a2bd88b3c234f694c8501e0c60f88b4b5ef32d11131e987343d SHA512 82eaf7b5ccbf41d3ee3ba07447f1c932d76c012bab82059c155ca13ad4263a3262a1e994bf31ae95aeea1f33f513fa28f38cc5301bf9691437cd06e510a60c8e
 EBUILD openpgp-keys-apache-tomcat-9.0.70.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
+EBUILD openpgp-keys-apache-tomcat-9.0.71.ebuild 562 BLAKE2B dac6c0e71f598ddfd7daf93ecc2488430a2923e37a97cb2791fc4e640fc03e3ed842eb1ce67983f568836de9f33fd7220e9038edd89b46cb97dbd42b3e71b8c9 SHA512 d170cc16cbd38ec290c3859a546c41d082078d7c68391bfe4bdf1466485acb39472df98dc9400522d4f4c0c4ecf65d147f43911272cfaaf3ae9f346b3b84db57
 MISC metadata.xml 237 BLAKE2B 7c3263833976c18611a5cba44845af4d80f2f86c48cf587a657292ed0074022088cef88756e3209b292252dce5c0eea307c4f2f45f28b8517609124708f7d09a SHA512 e8227b536eb45569cbf744907106e101d1aa6bf9ba8337783786d719ab107d8bda0fde5dd7067d168181d694b4161b12d1ef3cb5a83b14971b21aa4479670559
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.5.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.5.ebuild
new file mode 100644
index 000000000000..81b3505e76ec
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-10.1.5.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.71.ebuild b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.71.ebuild
new file mode 100644
index 000000000000..81b3505e76ec
--- /dev/null
+++ b/sec-keys/openpgp-keys-apache-tomcat/openpgp-keys-apache-tomcat-9.0.71.ebuild
@@ -0,0 +1,20 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+DESCRIPTION="OpenPGP keys used by tomcat.apache.org"
+HOMEPAGE="https://tomcat.apache.org/download-90.cgi"
+SRC_URI="https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/KEYS -> ${P}-KEYS.asc"
+
+LICENSE="public-domain"
+SLOT="${PV}"
+KEYWORDS="amd64 ~arm arm64 ppc64 x86"
+
+S="${WORKDIR}"
+
+src_install() {
+	local files=( ${A} )
+	insinto /usr/share/openpgp-keys
+	newins - tomcat-${PV}.apache.org.asc < <(cat "${files[@]/#/${DISTDIR}/}" || die)
+}
diff --git a/sys-kernel/Manifest.gz b/sys-kernel/Manifest.gz
index cd5b8417cfad..c056782fe83a 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 ee888b0958c3..658aa33b64c2 100644
--- a/sys-kernel/gentoo-kernel-bin/Manifest
+++ b/sys-kernel/gentoo-kernel-bin/Manifest
@@ -1,49 +1,21 @@
 DIST genpatches-5.10-170.base.tar.xz 4506932 BLAKE2B 9503a369d1d653fc08e0c24438943dd3b583c25d187b5913a5308d41a7322a6467324be402b3748d201040b004980a5c6021704142008e49888d4898ec6194b2 SHA512 7b737194adc2876f589be2a155b1142a48353a099872cf1f75f653fe0c2fbb1899cee2c39970147c827c46ae31d5151aaef18d0a805fdb28d8efc0fce4c808c7
 DIST genpatches-5.10-170.extras.tar.xz 3868 BLAKE2B fcba4ddac271a957a8f2645fc833338bd2da71ded4cb935bf1f2df267f50fdf1bab0e2bb0967a3cae975bc7cfaeae932261ae0aab4bcad40b32546ff69850c41 SHA512 bb272928563d33ddf9a90db610ed013f625121f8a05cf497c14dfb74052300cae361474e71203be35949ace7aa9bdc23e98f2dedfe3eef885a59674a90166c6e
-DIST genpatches-5.10-171.base.tar.xz 4617172 BLAKE2B 7ab9b6676f808124a6e2996bd3ad36b1e76228ac969f16ad3956b50b31e8f5f12f3f4588afc88df42b157bd6847474e8cb1e1317e863ea63da94503ee0b73e18 SHA512 5243ffe0b9c79e75f1649f3deafd6293cb016475459e51fc4f298513245d974803a5d802c1670022840d1c087daa55e5d1133caa5e5b49b39d1aa1e7604e897b
-DIST genpatches-5.10-171.extras.tar.xz 3872 BLAKE2B 27eff9d6f83ae27c147de7910f5d8e1c43f286f3f3da6cb56caa048c2c226c28926a32fc40b47cb0dae39347754fd65e1f26ef9c350065cd7db62ee5935372e5 SHA512 bc82b100c55bd0c935363c10dc87607a8aa2539401ea6a1c6618d37deae072b390cb33e3075a4dab3583d52c7f0a79e30f2dfc8b0a6eb5fcf5f59d8a01020ede
 DIST genpatches-5.10-172.base.tar.xz 4831748 BLAKE2B 46acfe58044df90c98057fc25903c1af1ff3baccace354659b79b939ca6b2054488c8823c456620880e4af9221e0d26eadfd355aaccf4679989ce2e6077507e5 SHA512 8951a10959454b515269be97e163e73aa7cc8374abc7d0fa73243f67944bd1592051736ec06e2ce29ee01d4e0b79ec783d30b40664105f12aad24c9c4cff0a33
 DIST genpatches-5.10-172.extras.tar.xz 3868 BLAKE2B 32ee2c036c224c800ce53fa94d8f6676c70023bb733cef143355ed5907a4815cb252bc43d1660bedd841dffc814c15a9016d8c0d43b80ece58c9f4bf77c472eb SHA512 10372d1ab1d8bd73dc1c7412498cfb5ce91dc74d5e40c6497aeac24fb71d9c007d03cdbe58b2b7d6304af11816a4981cfc4bdefcd39da19009cb2f0bef9ba5ea
 DIST genpatches-5.15-89.base.tar.xz 3552056 BLAKE2B 2131869a216e9e99fe893e502e9dff10ef486fcbd0a130db2621ecbc61194d4f224745d146213edf35083752de89624346eb7fcd7c2fb53f414d3ddc200b5b51 SHA512 ac840d8ea832f5a388ace30cc435501112992a16834dfd01bef764683b415405b1f9fa644062c8ca3ecb18739e55133f2282281436847d9ceae8fd6104dc583e
 DIST genpatches-5.15-89.extras.tar.xz 3932 BLAKE2B 25a5b47eed2412b6d660572c266fd8d22be0c3e570dab6d45a7e6a0015227a1b4cd468582bebe3ebc7f47600d3ad30a5853dc2398e39ae02352a1b5df1faea36 SHA512 b4ce39a33610e5ff1c3309f787dddca702e55d81b19dbfb9300386a246e758ca9192eb98189ed01ba138d38947fa35e27dc6d3b459da059807bee93289845879
-DIST genpatches-5.15-90.base.tar.xz 3757428 BLAKE2B 30e129e5362a5fd690d8273a36e102510e113415e3241f838b366c2e35dbf1b95fa30d6e34e6e36c5d938855aefcc66a039f1242ea8a69263fdbaf84c46434c4 SHA512 bca6d1252657ad611a71ed2ea128887b131f9dad83f4c0007573b2637fd79b117023d0ade5b833070a8c86ab4f698d0b3250e01b612a0b65515a164fdc9d1212
-DIST genpatches-5.15-90.extras.tar.xz 3932 BLAKE2B e84edd591a94f2d21593f86aa7ed2a27980e099b388f49e899655dd687d459be87491c6441b73a5c024c43bb81f74103ef226d3bc3ae42d089749db0b06ccf45 SHA512 687240f034abd1e91d85e057bae2693129ef6fc4b6119c71df00c306ae2d1cc64ea294a76ce8017b7f2b0ac557c41b9ac70d4fb466ca2899a3c544490421df45
-DIST genpatches-5.15-91.base.tar.xz 3838856 BLAKE2B e42746d0b7342cd6e2ab1b6b907a202277365a4fe52df5eae5d3685c68efbcbce58ab1c6d00e0b89c1f581f6818ba830f35af96d40e1bbf80ac824b0be572715 SHA512 37b31c9f878dc1cc4c5446fe7810b6fb9caf556296e99975de1e37bde9e798f5f74e90cd6d825ae1f474bbd8ae31da3f07e5527d3ce6aff42761ce8425634949
-DIST genpatches-5.15-91.extras.tar.xz 3932 BLAKE2B 139a9a7876504ce63abf76db63904b3b4330ab101ec7f0c97717ee83ff861595df31a36f5fe4fbaf3b70641e6029e399235a7ec3e26feb98522c57e6b4b5d71b SHA512 9486f83b99c1f0bcd23e556229c7c0947be4fa097d688b510b6d57d94584e6fffcc9a2412c3620ceeffc2b347fad1ea1e12f58b2f0629cf93a2bde19f567ee5d
 DIST genpatches-5.15-92.base.tar.xz 3843196 BLAKE2B 1a70c672f4ceda221611ba1bad20fc4e791a51e27f412995308cb7f39962c6e237efc1bb7912c67b8e3dabaffce3bb6ceb55d62f4f12b79671910b70c1e7a8dd SHA512 33390b3e24783405971f2eacb24e715faf841a66e477a03d4055d61694fa72694d7563d799b95d47037ad0d7e7c234e56c894ddd7cd1dba59077efb901bbba26
 DIST genpatches-5.15-92.extras.tar.xz 3932 BLAKE2B 12936d0ac139d69f2e5947436ffd34add80625aa383aa23e51b4419a5e2ad3c38ace4d69c9e7066bfeae32ab727013e602c3a1c3424e128562597c517c7e5903 SHA512 6595eca7525db97672a15275228dbb9b14e7e234514b549e0fc17daeda4b48d298f6dbcde46e5862fe02bac9f50ffd7b05d82a174541469456289bdc6eb7f4b1
 DIST genpatches-5.4-233.base.tar.xz 5294692 BLAKE2B 357046687c6f2797d5d7090dad357e00675eed329ccef44223dd476551cf04e9f711f1020144cfc59796657cb5b1e6d76b607ecb164e27636869a8bc8984f567 SHA512 45f6b35dbca12e8b9e6a9f99d12c44e47a6e471e5091ab75c42346f1d8bc12dc454cbb335f1549b497842c2d9f13a5930c80b5000cb86bd3db7b03347dfebcf4
 DIST genpatches-5.4-233.extras.tar.xz 1812 BLAKE2B abedf631da893391a98a98cf48d264f9eaf9f9f7811bf595c36a774c8dde21f105afaf6f4e113e04de472bd6ce0c759bd41fd95aa980b7e05499d8571f3e8a44 SHA512 16b09d0a4465123079360ef9f070e0c163f45f9784714e98fe53f7174e836fe7b2562af01e5c2dc932571bb3eafe2d9afedfd60b5c8467bd8410de651ab82473
-DIST genpatches-6.0-15.base.tar.xz 709204 BLAKE2B cba74ce5f9a6d8a00991f87fe33771f615640c8c3adaee94432580f5df51cb2a488794a376c9355d568ab4b3014fe23e4c9fb000bb9ed6948b4225211df862d6 SHA512 64d5d04b8c1b3c3967fd22cfd975b7f9bbf37e7d7d4e966c7017b589837cfa02200a80880f13ac52942fd845c9835143d809817f5517c91992e30e101b15c775
-DIST genpatches-6.0-15.extras.tar.xz 3804 BLAKE2B 84856863ba0897a7ac9238094fec3d46a39cfed7db81d1021b236fcf0bbd4bd893ba44af4ddcc9ae955ab66424afd70ead4fa714a1b68e11d7e66539f94a6cf5 SHA512 7e49da632e9bf5a78c80a0817708e571452f92a99fa91daca8495282fd0ed955bb16a5fb57ebbfff68e9fe6733655c4d04967c6931d1acf6dc6102a44bd9b04f
-DIST genpatches-6.0-16.base.tar.xz 995192 BLAKE2B 17cfba17971fadc2e389f14e4787604489f8a30760f3687df364d053999819dfbe63264eaff4b04bf7df00d66278e6d56d856e09a043407e282bbcb2fbce4c7d SHA512 fc199b59ee9392693147cdfcd11d26cacc5ae5b4a76a3734f32e2b86a027e0d13a4ad5927ab06d333b7ec89f1983acacd876c272cb48e6555e1b067b0c7ae63d
-DIST genpatches-6.0-16.extras.tar.xz 3804 BLAKE2B e03fc44e706291fe586f115e0cf58c78fea7f259a02cbc05cd9bd44166de7f329c538e00a86ca9151cdcad66f029f52266816199743fcf176e0e0295c785a833 SHA512 06ad99c99c6b130e6b6aca4918ffdd693b04830ec475a397f697e70ed2356c43a177a67ef46141d28fdc7ade2eb9941f24402c82304340b000f28831f4ea83e2
-DIST genpatches-6.0-17.base.tar.xz 1012800 BLAKE2B 66ba9821444aa24e2e2a4b400417ca11b97818a6fd2cecbbfb6c3e66b5f1b66f957b464e2fd7e6ccca80a513855a4c54bb1e54fcb9e58c33161ba721345eb87d SHA512 ffdf33470043972e06084e725061a0d508502696079f8cae0c6a23b0c1977da9213f73069890483952b19ffceef822ff409314c2b763024767cf8cc85adf6645
-DIST genpatches-6.0-17.extras.tar.xz 3804 BLAKE2B 46529c32e888478e4542e581837bb51322f68234470ba8a66a2f532bbe1469cdeebf7895931084d7e177562d201720bb8d8b6d32d92f27854d4728beee17423e SHA512 aa1125ef91fecafb21ef0cea18c9d8f0569e46c0ae24460cbe864e48c7bfba5c287bb05e958544592962e77992d6acaf2306041faa6f2542026d923a7140b43d
-DIST genpatches-6.0-18.base.tar.xz 1058696 BLAKE2B d196ac73218aba9a040cbb227010f8a698f7073d9c18e59b38dec48f2c86cb013544d66d57f2c2a9a6ad81646d753ece44222426f62348ff0dbf6dde1ea3622a SHA512 55aa267c66bc1baf908b6f1ee4e38c0ec8dbfbeb699635727efccd7d8561459cc49c973bc9a59c61a320550781dcb274d4e70d274bd46f59bbfa4b8cf8117147
-DIST genpatches-6.0-18.extras.tar.xz 3804 BLAKE2B feeb5ba822e8d1fd70fce07f7e3f74b5678ca17fa54c81e64f364d45ee8801edf5d1e88ad237d9944288163b7c776ea0a9d8ab19aef43aa436f814e50c9fd10d SHA512 a40804af99da5f085046a121e2f400229a9c091969d17dcb0ee2f21ee837ad08dcc56dcfd0f826883dfb3f61f36d9277880b9819fc17e8a318f5720853e81b98
 DIST genpatches-6.0-19.base.tar.xz 1107844 BLAKE2B e185f0d47ac23c92668d523a32d56a3b8c7dbb67db40e7cc776b267e6e5ffec4d25d10ec85df396687d96460937eeeb47bb4a9e6213199ee32f0c2a0f5e034a4 SHA512 beb49081cf89405825638cb49eb95fd8fb0d2b59790a663c629b4c4bf5c7c55e424cbf96fe9bc83220c14270ed2fee39481ad79f287aded00c7bd0cbf755c400
 DIST genpatches-6.0-19.extras.tar.xz 3804 BLAKE2B b3111f38985093d7ae6936f7ceedacce53fda92163973d79984a9bf19c127ba7dd203f55bf5c57b69591310851c91127848edec87eb715c4d20ab8051bc8d30e SHA512 2212c66beddfb576e90f8c4015ed64aca1cae44367f5ffca98c949e208e68eba6b357b00a6196671cefd7811a3f1f2e188337dcf10457c8b7955129d096c5bb0
-DIST genpatches-6.1-2.base.tar.xz 15048 BLAKE2B 84d1f7b4cb2c13e70b0d542853856f05de48739400f66253fd277167144ae0c259579e539d43ce65d2ee206a2820ec2ef288d9296c68a4dbd674c43d378102b9 SHA512 e349b8b535e8ab9f70cd01c513480cf75bd10dd2f2d5ef15f97734ecc9e481f137dc1cfa4c50f8a1a2f3549bf0142f83f7224603f881e66af130cbe1f8023496
-DIST genpatches-6.1-2.extras.tar.xz 3808 BLAKE2B 70f549904446897e8f955146dba039b43681e03e0d72049e35473ac6ff5d05a1a72c124d410fdfe065d5652c0f0312c6eb4907afbb475e3cd9828c3f0edb6fa2 SHA512 9f92c3b899a8b106649003acccd33cb3cfaf9838ec421998d3b587893b2e6705068fdc0ff7b52ae78203dc793b6064742b721e68bb1e8d7160c48b419062448a
-DIST genpatches-6.1-3.base.tar.xz 331284 BLAKE2B 66670841382237e0d222ba04fea65c98420c15160c7c9073b3107efc2779aceca0bea1643be6c06d5d1ea15558cf53676d25921013bd437027090be4acb85228 SHA512 5873cfa3f67a8118d92b141406298760b54c8b3625081c5dae79fe0c07e3eae20474cbc85601e871a6bdb5b3ed2f70e16e1939d8e4af67db7598af845853f0f1
-DIST genpatches-6.1-3.extras.tar.xz 3808 BLAKE2B e4dbbeabac30e90a113041d4402bcb53d27a77408cdcf2e36dba448e680899efe7a62abd6b64574d778b8b058bba09ca0ae9830fc2ce4956cc2548dd243f00ef SHA512 17482b5ac89d4a2da96142195dbb6660295f0a2d8a321a92b1629d5f77e50c125115f2dbab6409867a989747dd28d6d42ca57d2f1e0193e731eb9d57ed5e1dd2
-DIST genpatches-6.1-4.base.tar.xz 350692 BLAKE2B e310351161d4e0bbe0f498285da235a12b585fe5974b9dd35d6567af5eadcd291d63af5bfe036b7f0c03fb5a5c4285a7a4d771010474eba32a2bdd806f95b808 SHA512 42888c297a002e68575a4fb8f5de844418ff610b8770d544404b1c410c86f68f1a1c28c60d32ccea34c10d2ee8e0383e057cb24d4a99edaccbff6388570c5b24
-DIST genpatches-6.1-4.extras.tar.xz 3808 BLAKE2B af64347e6fd2f640d86b0839feac7c6768489235fdaf6be7bc46ced24cd0e20490fd18b06096ddf2ad7ac70973339c895e75aa2ce3d19e368b87a4a0219fe54c SHA512 a0a94512517ece1bef28101433e3f59433c87a0e4b1f7c3937ae4f753a3d3c49f14e5a6780c9d4416082bf5282430e0386dd9bb72c924af72bd1fd902586ec0d
-DIST genpatches-6.1-5.base.tar.xz 416352 BLAKE2B c3aedee62099a942b85016df0493ca1ca403efddc3c6b8c3e5d91246448cdc2a3626af200ee62865270f3ea5bb9dff131fed425fa78f6ecbaff08818e7a48022 SHA512 c3b8b2e58e4f6e5c7750d8c2bed54952feac33b319c318f562b8b5a894ff5d25ffe0149f5373f2b1655c1be6757eef8c6890460228f54828a42c59a1f869bf45
-DIST genpatches-6.1-5.extras.tar.xz 3804 BLAKE2B ef944c72d659c38fcf1d279693fa3c1a7e2aeca6fa5d706699dd3f862247d0f0ffa2522a326aa896b57eac985417d04ddb652a260a96924b97c6dbf9ae940562 SHA512 e7461ef3c47af3b6c4e9861a95dacd56b71bef7a518b69abc0ff94b40fb3beae0d3fc04a16ff80332cebcfd16eff0ffd334e02377d7e15bb1a824f51ee143173
-DIST genpatches-6.1-7.base.tar.xz 470576 BLAKE2B 09a0d003fb9d121c51423d05729a9a72b27d5eb57e0e671d454cf14a8a72a1109a5d869ea25792602e3f7a53008d3ff7b568389b16400ff7bd04c9c1ee311a59 SHA512 80db2cdacffa2ac85830ebef934c33345dc113f5ccae252ad18201d322b7b4ad4bee5826e077cba4029f97e871fc16ce22fcd994d58cb787c71c746088cccc34
-DIST genpatches-6.1-7.extras.tar.xz 3808 BLAKE2B 1640a94b258538c462e74f566b290e18a6c88a1993aad96e9442b40c498d8a8dd33b634816f53cd6ac39a1e95d9b0f9462d345970c706e3424ec6be8ff99d902 SHA512 e843e33fb1fefd0f3e0e426132ecf56dcc9702cca1d57cde74e4b43d414acc01e0334b3b1bf767391c2d1bbc4499d5e73508778b47ec849b256569392d77f84f
 DIST genpatches-6.1-8.base.tar.xz 477364 BLAKE2B 29fa8d45feed6333883e1f4733ace6ed52b5424aeeada3e71917a0e3d85f87a7b99f0863ff468e678ee5631c6e0f0dd7c3a0115a58d80512ac1a27d58a2df149 SHA512 d1f32215ced0ed39cc1c6d224b1a12ae3f80bcc19f1ea23189e853367ebc661c74d17d335bd615c2fc1f3c21271f6f170a35caa38194b2dfd09f78e405739ae0
 DIST genpatches-6.1-8.extras.tar.xz 3808 BLAKE2B af83b01895f1b3af4c0220a89b0dabc3642e578920475402c02dbe0300c520dbc621a2245eb66842addac48565c8b612198138c49491dca7909d594a9d2ef818 SHA512 22f9378bc7b4413d60672656c2e73bfbcc6debd10179a0eb2b523bceb5f3adeacecbd433ede3aa057143163a9cc2971d5023d73ac8187eaad59508dd229feba7
 DIST gentoo-kernel-5.10.161-1.amd64.gpkg.tar 66498560 BLAKE2B 6614aef018fd06c61edd76c8526a96d72f73225ce915fa8bebcf835bf1a92de5f3bbb6c9045cc2cf38c326b15d7d00b236a609b8dbd2f50296ae0563d0b01c58 SHA512 e370627c308d0f9ad1cd9972677a61d2dae152e8cb849dd772e3d1d60d3fb4ed195ae048705bed4bbb663c6532cb1465947a31ada825a3fa66e2aaf089acd115
 DIST gentoo-kernel-5.10.161-1.arm64.gpkg.tar 59658240 BLAKE2B e88ccc74dea87976843b87bd96ed1704d588e519913d4376cdbe80cded1e3a4370b9c3cf692e510732ef15505ab5497db1d5c5091b523457e644793b0dba6c0c SHA512 8f7648ecd4e99c3ebd8bf67f33924df60693cdad47f027c75b8a68bd3efae23defe9f1caee2f2604d58b931439d557ef263c98a6a6eb6171c7a2b8b91f2b1d60
 DIST gentoo-kernel-5.10.161-1.ppc64le.gpkg.tar 55050240 BLAKE2B 97a879d136891448fa86f598de5ebefe875bbd2b35c89ebd882b6913cf02a82de9981afdd25d758649aefcfd977edec2ca11d603271bdb17a76097b3333cb3e2 SHA512 2f5f0a2dd49caefcafe44ea8603f615be5487e1109e6aaee21553e6b4d9b516e8b0ddced4a85cdc355d363e9ddeb431b9c7c3fbc1806bec5d4bcfd36195c77c7
 DIST gentoo-kernel-5.10.161-1.x86.gpkg.tar 56422400 BLAKE2B 13d65b837c23fcdea30a82ffd38b6433f91abdb1911f07271be055c005963911959e02fd95b2967149f29cfce77845f8fd1872d599b6c07710cbfc6fcab45eab SHA512 5a0086a2916997ebdb9aa3250db2761d2d2403f8594955eb369639883e49d2c5c156596c8caf893df4d685abb9483855851660799f49e89a69c9019ed549afee
-DIST gentoo-kernel-5.10.162-1.amd64.gpkg.tar 66498560 BLAKE2B f3825295f7b65e758182f7dbaabcc02a827372f6c3b7850edef288eacd35eb223820cf5476921089ac926c9f610a492c50ed251610db96a89e8eb121c5dbee71 SHA512 57e5c7781612f0321d8272e62f92409c82f6cc5d94a06973599460fd74f5807747be098bed2759528f60f4e3ace4ef33b3138f853c66e7f5dc508534a2e07d26
-DIST gentoo-kernel-5.10.162-1.arm64.gpkg.tar 59668480 BLAKE2B 6207a761c00f7ad10d4f733cb7cd8251354786fea8c3e339ea3b5ae09882bffdbe9b4e30eec10ff06b554c7c914f452d7a0da4321ef4d4f03566fc9b1e4356de SHA512 f4ed1976e2d9325e7d188440d0797bf5b07ac60d29dfe8573e8a721fe42c948d13e8a0c76adb7aef2ddcff7420fec1505e81923e66d1a32677e9b206feba57bc
-DIST gentoo-kernel-5.10.162-1.ppc64le.gpkg.tar 55050240 BLAKE2B 359a8cf556e549960cafda4ef108f66cb1ff01f3e6d0a9c850365d8bb9f0f65221b0a4711ade4a2326edd45209ecffa1e2dab485da359e450bb80493aae6019e SHA512 f6cebe6c889444b83251eb1be08a54fc3629ba2f226792dfd406a76fe85067ed48abe79e3b9bcb5b71b560460ea45527b813349358504d9938e4b02dc4151781
-DIST gentoo-kernel-5.10.162-1.x86.gpkg.tar 56442880 BLAKE2B 240127a3fd2c39d9a00fe03e161a58c323d6e3e8cd89592217ec6b8d7a4b95033f6eeacff27cd30fb4995dac5b675ace1375b999ad15da2cac6844e8058e4ff8 SHA512 7193db90ba292da179de8035fc71c36a9cf10e78614efce19c84e4a4fb33f0e2894ba232bc9a9ef5a141997e3b4dc2df86f93ee812fb753082fb3d1fee304ed1
 DIST gentoo-kernel-5.10.163-1.amd64.gpkg.tar 66539520 BLAKE2B db354db6d769696f6f708f3329420dcb304954f71c76401594c4c2b02e60d5e3f271d1e4531dc49a267835743eb7441ced1981cf0ef00b0adca30aea1f562595 SHA512 7ca27b561405a5247fa05ec969705f2efa3fe315255aa745ca412c9231b4ec267ea129984aa63d718b2a574cb103a996e83fdd43ed468076db49736ebf12aca9
 DIST gentoo-kernel-5.10.163-1.arm64.gpkg.tar 59668480 BLAKE2B c75893bcc35fb0102c718a1848c1973795d9cfa54ce4b203c0461409e65e6c1eebacbb554a0c859c35c8f87a2a9b33dc2ac5d72859fdc8769e1e64db2efd89b9 SHA512 1db8b0d5b5309755be331d4dad233c02afd6bd82a1b7613e10101a9e8d077299ee967f6e007b11f815a496f1733879cd61f88a861e43623521c1bc8b69512364
 DIST gentoo-kernel-5.10.163-1.ppc64le.gpkg.tar 55029760 BLAKE2B 612963d75e798c2e2e295d7d4e00fd6fd15cf494aca11ee59926cbcbcad5f0a945bb263cb2155eb138fa0195cf85a489e44d1aca0cbe32d5d1ed42d8401eaa6b SHA512 215dd62c513394a4b78f6cf57f4706a71daf4a06b76c83f113b6e357a2f0cddb3a8e46324a520312918c31d5a05d0af260cc4265ea81d339f1b494b2b6c1e3fc
@@ -52,14 +24,6 @@ DIST gentoo-kernel-5.15.85-1.amd64.gpkg.tar 69806080 BLAKE2B c8a30ead36075a73121
 DIST gentoo-kernel-5.15.85-1.arm64.gpkg.tar 62873600 BLAKE2B dd718f470550c4243b13dbcb3c2513fbbcbc168554b4fccf483689772a59c6bd92342e80ecaced38e2c5ad139b6cc19fae54c6ecd90f3d58bbef5e7bc2692799 SHA512 6c056798c28245c297703b97859c2219123ea00a8ee816694ddc186f5694444c5854c469b52830e9c2f3d4978b469d83707626e10f9cae4472c29ea8181d4472
 DIST gentoo-kernel-5.15.85-1.ppc64le.gpkg.tar 57231360 BLAKE2B dea31232116da911864d2ce1ec8a62e2959658ae339483fa23a3251fb98cee1821ee51a24041b711bfa317f9b4c2443f1c34b4643ac9b8be3788b04fee0bcae5 SHA512 de537a3f7e0059f94b6b7de56776e10fef13658aa464e54e528cbd5dc78eb5fec41b0c428bc5f106d16b87745fcaa4d767cc3b5843c83de26a5eb568f9afe613
 DIST gentoo-kernel-5.15.85-1.x86.gpkg.tar 59146240 BLAKE2B c56de581cecc5c639f674b09f005b504e886ab9b2cbcf8d3d69702f1db4939901a259c5cdfcaf60314093e261177b6128822351c2f4973e9b16968378b6a74d1 SHA512 eb01dbef71c2c392148b1c344a735382f077d3c69f69a13b18aa9cfcb74738c973b782083853b1a038bb6bd85364efb563d353523e72f26109a6644d75f25850
-DIST gentoo-kernel-5.15.86-1.amd64.gpkg.tar 69836800 BLAKE2B 96a6e194e19491060879eea487db56fcf75f9d4dcc5e5324f56c8404d91097c94677344384176ae9025921eac14cbdb6c9eaae102395ff6812ff4227256efe49 SHA512 92c671ec2176be4b22f11a2e56aa920c58d01618a20300e0fcf8202d02c9ce97b816e31d9d09ef4a8a6d58ca9c1e5e805810373787c60b66e58e99d2b399c096
-DIST gentoo-kernel-5.15.86-1.arm64.gpkg.tar 62883840 BLAKE2B f764ef5f86089649f806ba8dc4589c50fcb3bc4b2911dccf7d342dab7398d0764d9f815ecc4198a8b60d031316bda869c74d3255b560a37524c48d7f5495a78b SHA512 51edaffb4b215d1da3822a0d41b5ac6c44474bfc4ab81c7f839c66e681a971779061b7875d10b6a9caf6e0cdbc4f57d69ec59c3bca3ad34860639b4c2671eedf
-DIST gentoo-kernel-5.15.86-1.ppc64le.gpkg.tar 57241600 BLAKE2B b385d1d76bd7fee50580807fa5441ed48a556623c5c0c1fb85b67433599b8015ad789049476895c29cf0f2817e2515cbf0520b2854278d695d246f5680720c65 SHA512 9c72cd372dd1fd81474cb39f6b0314f6c9da0011ad411613627cd6707d11e926e3912d328dea243f3c99f7a562e2455b9c0471d318882ab721311fe10afdea1a
-DIST gentoo-kernel-5.15.86-1.x86.gpkg.tar 59166720 BLAKE2B 30d671640a9d4c090d2e1852993c42b6759bb8350ef7a38d92d6f4463fecbc5750c818e4a11693d268e51d7589b9815a6afb99ec40978401ec5be998a65d287a SHA512 b74e26446ea61c9fbae107f367e21bd8fef7f4f101da946c3651fab26974607560262cb0f678f04b746be88bc959573ca4dad556188dcbfa2cf7fa66875e63b4
-DIST gentoo-kernel-5.15.87-1.amd64.gpkg.tar 69847040 BLAKE2B 56722f91d5aad571d62942c31c63d70fed9b60f458bc4c80d240f512aae44d6023f908538d8114ffe074ab61ceac46337edd2677c72f6ef0b8f38791bf654928 SHA512 9389f36e62fa521f73817c1a9ef18133d7b446f03af5785ab9bbbac4f4d57ae24a86cb4ffd8e2b5d5c62edca33a25195a3e3127b1480d8ad9f354f002db4456f
-DIST gentoo-kernel-5.15.87-1.arm64.gpkg.tar 62894080 BLAKE2B 6f32b227d21ce827e458375db7125a1906d87e33abe0e71c420e8cd021f803c24da15bbc12bd498c8cdea30ce563325ff1317d1be2a07bb5473f2f7456090446 SHA512 de51f2e6c3855f6d2f5c5d05f3c81857a5ee115da73d07f554760832f4d6049c3472b209b1ab4a4f6376a902372dd9a805f218a859dffaf171dcb25b36bca794
-DIST gentoo-kernel-5.15.87-1.ppc64le.gpkg.tar 57241600 BLAKE2B 3d1eb4090079858e3a7e9e16fcf4b60f9874accf49c9077d73544a20dc2400a02bd55ba4c14c538dd7654e40eac70998fb51f18688e1091a4cb6ee7908975cab SHA512 8160793c72b9fab27866c68c9b351ef0bcbb41a730f4dffbc3bfa3dcd941afb370bd8d452433a98f3fa065c387bbbbd3108b75067488f7c3302e26c84049fa6e
-DIST gentoo-kernel-5.15.87-1.x86.gpkg.tar 59176960 BLAKE2B c167bb32e5aa6bf7a06b36a326f275c3e657df8b62892c4bed7195f619763d4e1422336e1d6cae520edcf4e8a76139016b9cb3e580574371830b8b9d1e52982b SHA512 4c3f86b7fa95f6a1d39aa3f443f59fbd7018ad9f24dc094cf0f35c8be513c0937d9be9991c8214aa7b4b7deadc828b3e2ec47c15cbbee404493b4404777a7311
 DIST gentoo-kernel-5.15.88-1.amd64.gpkg.tar 69826560 BLAKE2B 9c32c9a590770f2b15e67e62066265cbbf82d09ce9daef7af5522be320eb98eb13714425f842c6de038fee83f7a2166c2113c77acfb6044c201b39e26d36f1e4 SHA512 9143d0393203eb00249916b84b0699aadbd8af5dd5e4376ce251ef77a1018ab647ccd7a370e2724b6b2f72d077ba9fc3f2000ecc8518295e975cfc8f464d9df2
 DIST gentoo-kernel-5.15.88-1.arm64.gpkg.tar 62904320 BLAKE2B 8edaa87b1d574787913d9f0e935d3f79505aaa507069ba8bfdf4acd894582adecacbbd429554e02c569aeef975eabeb3285f9cabb1e9ca5aea4d32487a5f298a SHA512 6f41644cbc0442f39d79c54aef05d64fed2da2f8dff1f906cd109470a7c12d2b67732fb5b68959e3393db99972185fdb960dfc22c153992da3632ed2bf9f382e
 DIST gentoo-kernel-5.15.88-1.ppc64le.gpkg.tar 57251840 BLAKE2B 361eb1433ee75820bdd85ed39960681b091c42d7cc7004540e4a6f60e8636569463e18d9de785f98d4015463f24dd58b1da368ad97a431e9fc5f13e9d2a98194 SHA512 c9ebe0f7a184a7fba4bc8532e7b66ad652b2cf9f1754d6267c9534673a62940c8adefbd50184655920a6518634bee9b97f1ae3037b39862ada64344ef62f090d
@@ -68,46 +32,10 @@ DIST gentoo-kernel-5.4.228-1.amd64.gpkg.tar 60620800 BLAKE2B 99531b57d6e1135e239
 DIST gentoo-kernel-5.4.228-1.arm64.gpkg.tar 56821760 BLAKE2B 554bb0c19cc971551647a7d7189264808e2cb8145fa091ae16758ab7593d6c3707e23cc88501c1ec5e86170c1d91d94a080eed7dbdec2210640af8ff4b2cc7eb SHA512 e20226c43556b0fd33b267833de5ced1d3b7e8b6b8ffa060c5b61c5a96957b5a0825d569ea6a662dc8d4368b1dd69ab9fa2a42ee57d53e8456be1e927f766fec
 DIST gentoo-kernel-5.4.228-1.ppc64le.gpkg.tar 54343680 BLAKE2B f85a074a1b492655d14cd95b1c966b1bdc4dd997288475204810a693361f9dd17ee3d3c519a413dc157a3e5a2f47ad79c4d596a9b7b1144f6c62c4ca4dd8f577 SHA512 1025fd90c6b32f165fa37b2d27db25b1c5295f14fe55865104431bd512e2c22de58824b309382e6b6445401ec43168e4ecec31fcc052df78854333fe58ca9f71
 DIST gentoo-kernel-5.4.228-1.x86.gpkg.tar 52398080 BLAKE2B 7d8091279949410decf21fe9066eb27f9edc5574dc10bd976c6add123ed491f302ddae4e02f7a23110f566cd0026ab5cd87c44e0ea406c86215979bcdd756137 SHA512 3bed38f6c9145fc1e8f2fdff0c9675854ad4a8acb1cc5498fbcb6bd7ee7a3330140da85dfcf5de5f247d603b42995d0786215116df6f1bed6133bea37482719e
-DIST gentoo-kernel-6.0.15-1.amd64.gpkg.tar 75919360 BLAKE2B f48ea878985b13fdf57e123d8bda9d594f51187a53a24b2b62dcff44c9b90283c731a2e912778da9fa493303ae03602306096bcda89c193f78cb260c7c563743 SHA512 56da6853b0b66d9ba2586db115873af0b4dd1bacfef28af0c995d45f1dc217dfa36950ee15b29b4c9c79b5371018a981fde7a8a1c5870a5a9f50e2e0e6face4e
-DIST gentoo-kernel-6.0.15-1.arm64.gpkg.tar 68833280 BLAKE2B 770752caf91164ce5a84c146de9756150b64459c0ab13801bf540be80857c5b181d1f2438812e7063c4f8b65dbcd795d12ef9f521a679f56e96233ad90d2c20f SHA512 2641b8f0793f710cb08ff3b1076c7fc68e83720a80dd84ab2ab8744d5c47ef0218cf8f4f01411eb6f2379177b798e59708e5e726d4cb345894bbb1fa7d248aa8
-DIST gentoo-kernel-6.0.15-1.ppc64le.gpkg.tar 62156800 BLAKE2B e9e0e2f559ca57a51d0cc4f17278fdb70415e514eb7e816c351736bfc4e65f5212245cd3547c0dc2195419441484e4c2f35ece975472a28b569b880d9e41a679 SHA512 4af5fdd89ad8171990f4b7c0b6dfddea43a5e021a26f93058760c631f6ded682572482265f12c42be23fb389cc88215ac7b2d34e2278df86ffa86487528f258c
-DIST gentoo-kernel-6.0.15-1.x86.gpkg.tar 65320960 BLAKE2B aca1cb512c6445572b844e7c02243275e5bd8863d62b1b42dc2d7ffdd0197fe24c05e6319aec18e591ed7e99cfae7aecd4b76b54ce76ed4879c5eb05d8ca7c1c SHA512 9230759155e81b24dc8f2cb47ea7a6524a6598276c1b9f53509a83385d687c321b8eb5116fc4334f36dc8d20ef491c7b3e93454bf3b6e7df711be5a3947f9bc5
-DIST gentoo-kernel-6.0.16-1.amd64.gpkg.tar 75939840 BLAKE2B 2024eb9f9ed61b1efd2c06d0feeea4fa5dea13c768e5e1a4f447cb5c2ceb76d6f604d2e6b9ecece78c87cad18a41994840981685d4d2844d208333a9e4bfe873 SHA512 b362485887f83bba5986d8b281f9b239aaf3b80939e164a74c11b2c118821c12bfe21fd56614ab9c61ebe8a5ca2ff94100923dc4f4fedadc17ff0536c8789a8b
-DIST gentoo-kernel-6.0.16-1.arm64.gpkg.tar 68874240 BLAKE2B 92b2c8375fd5bade6c26c0edc0d8f5956452c6d63a8256492494759ea66470a22167e7fa2147bfd1d3e335f3327e62fac512436b8898898e66d8ae9a26bbf951 SHA512 7d5ba441399ba1ac216567d936c462e0b94638367c23f58f869bcd1d49e7b16c75b52f422e12932d6f0fb653ee5f262bf00f1ff88abcd94a8ca7912426a80ef1
-DIST gentoo-kernel-6.0.16-1.ppc64le.gpkg.tar 62187520 BLAKE2B 2d53e0ce908b31fedb4532853463b2bdfffa928502c0906d2e7ae756a20c69fcbdabf2ca04199cb25deb67ded066594ca12288bd41e77ba04c57beac32d5ea10 SHA512 63e2436914e711caebb0f6af8a47870648c8c61b72f7d1e95e1e2ced9737a6e9a5ce24169c4035a4801c5223a19f7df6cbdadb8ce146261ddadf558f7ef433b0
-DIST gentoo-kernel-6.0.16-1.x86.gpkg.tar 65341440 BLAKE2B e4a82d72ec2a56e0ea521a2c72a5c43f8702a601f64e412ef38e57ceb341f0ab79c3cfdc46f2ae84f47a0427ce655600f7ad396b81aa256a73833adaf8cb1cd9 SHA512 453a64d19552f0ff6c5981b96d7ad85aafa7365896c664e65a158b1932bc94fe85b27fe542bf0fc38baa739dc05c3ee577e63eba5c82ea6ce459c7daa9589509
-DIST gentoo-kernel-6.0.17-1.amd64.gpkg.tar 75970560 BLAKE2B 40fd55268fd91bf7a98d715c9d180568e017905620da1728c75f588a5c618ad6b55c9bfca98c786898f0481401c0743103bc90885c6e644c9043fe0863ff5586 SHA512 e73b26d666192889410730385cacbb5da7db677a59b1a3ba09965cdf31681ee4cb43021dd9d156d271e6b7298b677eaaa1476ad85eb3bdaa1ddc85f1d7e232c7
-DIST gentoo-kernel-6.0.17-1.arm64.gpkg.tar 68853760 BLAKE2B db5e1141d85d3e20f214dc72e457c1e908873f2946babe8c4d1ff1095d4e1340e8202add37abdd4804fc643349c6bbc711762436e6fe796f24f9542de450b46f SHA512 5675cf523d47d31da2df2caec9479e5baec480935bbb98035019b3dcf30bc05243b3edfe40514c7e928d3f2d6ccc600175ee85d954f9e15ad13f7afa634e4673
-DIST gentoo-kernel-6.0.17-1.ppc64le.gpkg.tar 62187520 BLAKE2B f6c647e0e7e5c7769b04b83f49b987c3d29274774bf7eed3f622d022ca4c77866a2ff4bce8d537085fd9ffe9be4dc54f74cb14f58a1766136fd530dd9ca7f170 SHA512 89027764b1d088a6d489ef1172bacd264d437e11b6773fe074b112a767f7a01418ca5490c1ef6c566727b808eba6970a4197180df56876ea2b3b13fd84657ae1
-DIST gentoo-kernel-6.0.17-1.x86.gpkg.tar 65351680 BLAKE2B 37951111c684362344a2dc0030ab2d5072992594f29ec61dde7c5bc1d506dc56af85775b461e543718b970df24efd7d98211217c5a40db996068bdfefc580375 SHA512 df48162cef6efefc6568a35844e49987a0c44a843e81ee4ca55e3d641ea8f00ce0c7c05a0311f5317a5ad49d64a498775d0d340ac3fc60992c17a66c91e40bd3
-DIST gentoo-kernel-6.0.18-1.amd64.gpkg.tar 75960320 BLAKE2B be535f34e767fe798573dcd55c8a4e9ef8237696f308d1dda0e0cbb586bb41ce448118bd20377b33102229b4915c6d950f374ea3340edf846ec20bcc5f2c6029 SHA512 eed2b6c9c69dabbea22fa722c9cefe229d30b41d732b22bee5661c021fc8444d776fe0b490be7224ace815f5ac404cbb18b646b950b44c36b0eff304382822ed
-DIST gentoo-kernel-6.0.18-1.arm64.gpkg.tar 68853760 BLAKE2B 8e0eb41a2d69caa0ec6ffeda227a70a3cd0f30489391b8d4bf52c6a4babe7886184e3b20656540764f53dd0fd6ebd054fab0e79f1e3bff3484fc731813684852 SHA512 0575de47a4c46e1afddcce36099d6f070cbe531d9d1221094ef794401cdb0dfce9dae8a80f1ebf3db58a6f057c03c156d2d81e5d032c9c9f3ff31d9c614a2c52
-DIST gentoo-kernel-6.0.18-1.ppc64le.gpkg.tar 62187520 BLAKE2B f6f853514d5144f5806b1abaf0900ef37e7f6a7cb278686e29ef3d071556db553b647863b11474767d47d716130457cb81ec17039c9e9f05e77f7eb383c78fd6 SHA512 a1c8becd7d5a98ad4c5f2c692bd790315b8aea619d0051a0983357e915395bab50d707268362bcf5341404209d81a4c3946e48eff787ea573e6e83ec5f75984d
-DIST gentoo-kernel-6.0.18-1.x86.gpkg.tar 65331200 BLAKE2B d20f6532681cd7bb60a01e5331415ec4907cf09e376496689bbfeada36cc767e027703858eee9f752e49f71fc9aa4815f9bd525b9af3aa957595ea07ed08b1c9 SHA512 e7abc12350c8458ceef1840ad54e041e943dc42b2db1b838afdff05da5d2221956dcf96581f7c89944fbd5b724eabc3dd93cbe34b034f286b83c306faf7d3bd5
 DIST gentoo-kernel-6.0.19-1.amd64.gpkg.tar 75950080 BLAKE2B 1d7b2ea9ca9a42c6e8be02f7370605b3556c5b647bfa874d5161eaeea8fd3b4089f2e75fa79bc8ea679b78beea1170f16f2d6a8b1e6e3ce811ddfdc217f6ad76 SHA512 3d28839dc1b0ec89fea4eda41216b76515f5a81a89b947dadb49ffa82ab8f0d4b8442c375ff5760a2c3967b048bbfdc6c791bc038dccfbd0bdfba298da978f7d
 DIST gentoo-kernel-6.0.19-1.arm64.gpkg.tar 68864000 BLAKE2B 803880fea6d252060de065c1adbd095cc17531ac3f13e833e486378254fd7540693f1c454a69e669d44ad205543e45e0c3b382c73f89658fefdcd37a6eda2bf2 SHA512 158e2eb02392d9354adb9c15d9809ec56a5b2cd9f77aa79d1efbef44fbae0cb3d20043f1c8c3639a8ec6502ca24e89fab91eaada307f1bb86a1356bc8b174826
 DIST gentoo-kernel-6.0.19-1.ppc64le.gpkg.tar 62177280 BLAKE2B 68a77a6d9704cd8ca9e7329ff4629ade5393d0c65750ae9fd2ef93e34a2bf9ae796df619fe79c7391c1f7e236c9671d8f92dcec35ffe918ad84e2b4b8bd542fc SHA512 1108eb3caf22c7b0d9b98504900cb0d2c1e583f90a722ffcd28bafb5f4a0e0f64da833b4b51a9cce2e9b77e84269b6f019c68b368c827f003081ad4b3c693da9
 DIST gentoo-kernel-6.0.19-1.x86.gpkg.tar 65351680 BLAKE2B 398261b34e3bca83f6f69c08eb53ca176524fe13926c19c36fb05b4e00046fd14dcfb08656ad513ef3981ec6a70dde9e10320f0a1e36f3893b57606e100989f4 SHA512 758d2b37d9ec578e5ff3d1fb27279a588f668aea96af33ee89751cee6ba6df48568deaa958e246c9984330104ad8f29ac81cfb504b8389b5ff3a302243b8fad4
-DIST gentoo-kernel-6.1.1-1.amd64.gpkg.tar 76697600 BLAKE2B 77999e02b8fdf5b4071ece990aed1044557ca87ed2999a94017319094c708d87af7ccdc2d784782f9a950c52660fd2663b2b2d336e94a6b0e351de53e9b28d15 SHA512 26c99f5cb710273a6bea1160ba13a01eafba3e7f0f911cb358aaa9f97e6f570ed423152e9bf310aeeb761652652bedec961e8ff5cf9fc589cd41b29dde93d389
-DIST gentoo-kernel-6.1.1-1.arm64.gpkg.tar 69304320 BLAKE2B 2bf8beea4688e5618cc60342fc202ccd4ef5995495768de73276e078260054070d085923afb79e006204b6cdf4505afbfac1ca7c305cb907d63a110909dc52f7 SHA512 d9e6aacf0c861b2febfbb5f00993de78cb8d4bcf743f1b45243c18e19a6785bfc661d2554dccf717fb3df841127ee38a9879274d3ab9f4b29fdeb23f9e5d856f
-DIST gentoo-kernel-6.1.1-1.ppc64le.gpkg.tar 62709760 BLAKE2B 9339668dfadc464ed02b86b69a23d30f4a20ec4e5cb6932c50707db66ef8713b94f8e11a5af0bd110c698d9702030c1983da3acc939afa6eb439205c8cf09ab0 SHA512 6e7416e48a82a902b9fe0f6b642e73552964e6fd615a9e53efc9e2d5bc85d29f18f0fd71ba2b7da883fc431878f9503226676f1bd1c8d06cdad4558815eb7948
-DIST gentoo-kernel-6.1.1-1.x86.gpkg.tar 65914880 BLAKE2B f7b6ca3bfa7c63c51fd3ac2678fcee76fe9649e3301d38a09c4f90ab6b9663c7bcf46b9c3ec6efb4319f4091f5526746d2e034d57887e826bf1d45f74d52e30d SHA512 433bcd0b29eb5688b27cf1649d9239df6807a76faaa7707b54f2b9185143ced429b897a026c2da01638746ebd56fcfb05b917bd015807cac8151559eb7814f8d
-DIST gentoo-kernel-6.1.2-1.amd64.gpkg.tar 76748800 BLAKE2B a616f03ab7cfb9059f6d1f1ab2ec3f4c31ba4fded8554adba58492723c32015c159a06d3a5794c80666520c8a4fc42858f7da181431ca6b1b8c8ee4a37c849cc SHA512 7a22e0f5acc12b433e245d01c466ebf44effc2bb8bb1a3403128648a1c1651674c7c075a82dbaf4f6834cb56d49bbe34e546ffdc97f464cc5d90cf250e5bba62
-DIST gentoo-kernel-6.1.2-1.arm64.gpkg.tar 69304320 BLAKE2B c9d23924cb2fcd6748241206b6181da10d139562161a738bc15341ab679b39b24d3a60d43a7e09b23aef7563bbdab117b90b97b0c059ff03e6e350109bb726d6 SHA512 36d116cd3fb6efc81014680fb6ae9e1ebd43618e17d3fe0bb4df022580b0bc526e9be3b8f86e2785983eb47db8cd1e983ce78cd960a8ce073402edf3b5e299f9
-DIST gentoo-kernel-6.1.2-1.ppc64le.gpkg.tar 62730240 BLAKE2B a3e5e85e3ac015b28667b6c090b5108edb4dcb9c37ea4048a056ac4ff2ef23466747882c3afa6ca5ad799b7a6856c68d8d2749a11f875a22b08f7df790aeb07a SHA512 7ab08ba8491c965c448ab7a1f395c2f8d90f26e84bdb91865551cd08c5453d6d83767656f91dee6f04da1f463377f51cb8c2cd333789b370391a29b649526988
-DIST gentoo-kernel-6.1.2-1.x86.gpkg.tar 65966080 BLAKE2B 05b6c2689808a257bf6d770e99066fa76d5fce909bb40a45cf99ffe7069dc70147246f0ce5e4a8a6858bb1ef35050f4b90e4a430be8372286bc0f690661b6bb2 SHA512 35502d64655e20b5a40f32a78cd240d7e2bce224139d8f50a12d05caa38aaebdb202761117dfbf057bc66bec0bd7e99c05cff3248526c2e25b03ffb4a64ccd2b
-DIST gentoo-kernel-6.1.3-1.amd64.gpkg.tar 76759040 BLAKE2B 5214ac8f7c103078be9e10f45767cd88311fbb853b84647f4af15894d6e262b61b8d58dcb0d3d53da95eb25db00c10027648666b7cc8aaa5beff9b47095a3b6f SHA512 77b95862a63fddaeb3a7ad8fbf6bb621259aebf3f0b1b8fde2d1d08a7b5ab8dbd8343c429cd7176d12ef80f713e12452fcbe6faa13a7a28ae9c8d56196b488c4
-DIST gentoo-kernel-6.1.3-1.arm64.gpkg.tar 69304320 BLAKE2B 58b2d41b52883b5cbab05869e94e7aee98b142d10fec0fb8e43c079e3f345efe9911795428db91545e17f670f7069ac0c88983dc4d2d2e3a777d6f4369743341 SHA512 28b80476b35b79cb9074ba9f0e47c5a8f9b6476bd4c4a9382d19c505661f0c1348acf9640d4e657f8c9ce471903ab98132bd828bee9252861ff87a93455f9900
-DIST gentoo-kernel-6.1.3-1.ppc64le.gpkg.tar 62730240 BLAKE2B fa7af513a96bd722f47b8c22a8ff76c034e3d5181ea171ebd719ef2bae1e9dc173f5425dbe4d909b614406dfe62744d93e94bcc14f0a2ebf41dd83d26deb3844 SHA512 a972539e4dae44556352755f0f6c0698a2af89d43f102c64bd1a90ed33cf6def6fead36f026bc44d863c688a41f19806194b249cf1647a26f82716bff6c5d6e3
-DIST gentoo-kernel-6.1.3-1.x86.gpkg.tar 65966080 BLAKE2B 30b5dd6accaa62cd51275589ce692f6af102482f17493fe63952a3d5f860c69642cbace872943e94a84162f6c623089d85099783aede28ab8f2304cc1f376a32 SHA512 0eb880c0eeb6d7667af05ed2813d7b5eb4a39ff2fdf76ff8c48718b1a1997c053acfba9d2cf80dd2588a0ba667a4436a6521e5373a155dbd68e0286bd7958fce
-DIST gentoo-kernel-6.1.4-1.amd64.gpkg.tar 76748800 BLAKE2B 670bc8f61cbe4df7a1f3e169aa8a88830ee2b4d909fb5b315c28e0279d228b81c0ecaa185f65c0ad832b333f7b8a6847d77e7cfdd19bd6bffeef6fdcd7897891 SHA512 9cd580cb2384fa8890ad683d2d2da75d3b8fa533e46c3e2a945cdc0c01855b5904024ffe53a490cd1929c5270b6ed065d22a6024012af5ca6e7df8989f00f3cb
-DIST gentoo-kernel-6.1.4-1.arm64.gpkg.tar 69324800 BLAKE2B ce6a67a1222314ef1ddbc698df42d6b61d90599fc0f3c2070b7fc91d036d44f806791adfdd9e5d52364b9357ced40cc2a433f893185c1d6c9ef767b50ca57ae4 SHA512 d83428226c3f394ea0b0639385aa914211dc4845ab6d375f24961f33f46ea477e457f1e09480a6bc4f7b7195bca45bf672197c29c5af2ada52e029c07bf66279
-DIST gentoo-kernel-6.1.4-1.ppc64le.gpkg.tar 62730240 BLAKE2B 31616dc52fcd36a075e414e1863581b8d6e5e3c3326cc743dd26eb7a64c95de285a974176e6a26384136e7dd71f64764c002f73856b09d6b4c9f8afced5ad1bf SHA512 f779a7afb735ec37828c9f56a681fc55971168921a15a3db8762ff38a1a20b5ee1d84a5ba33b17d94a6303dab9ed0c8458f6250e0123669a34075c27765ff391
-DIST gentoo-kernel-6.1.4-1.x86.gpkg.tar 65976320 BLAKE2B e47087b8819b05fde7701b7e85a5c7c3f70ce54234100fa5b0a5077eede01b3db955cd5c353fc45674775258bf6fb4e9836a6eaad2c07f5f84d349c590b14592 SHA512 dbd68b80872de1afe494cdfa314c8cf2ba80ad10e438ed51708529c4e862b9322b110499f82b34934b7259e3d2665ec2c5b5c602b9d3ebcc19d2d6077b8daedf
-DIST gentoo-kernel-6.1.5-1.amd64.gpkg.tar 76728320 BLAKE2B 38810ab12d580ca28ffb0f10abfa0f4586f8616e40aa92b4f64c10a7947d4e6fcc9a11847b7486e6c3d5bb1c27d59bc3bc4da8a31b85235aa64437f995c9ae59 SHA512 34b1fc305faece5a665a24a818444f5939118c269f00d682c14ddeca3ec56663ea4230f4af13469d2c9f083bb4dacacb40f8009495606f56b79479729cc5881a
-DIST gentoo-kernel-6.1.5-1.arm64.gpkg.tar 69304320 BLAKE2B 33e166cc84eb3204f804f77451e0caaa2306582bd097f8ac64d6a2838ea99358d36ddfbe5b8f3693f983192f75535261ad6800fa585c6940567a2756bbd3317c SHA512 0e777196bf654d125574f864145eb8765672c183038604adf9e327985a55815c732287d3595e1899d6b00629b758a2dfdc426c658927f69c0939247995ded77f
-DIST gentoo-kernel-6.1.5-1.ppc64le.gpkg.tar 62720000 BLAKE2B 1da226a56a8a2f0a49f1a597a472ed3b97e4a7a5c4b4b18922a613f01bcadf90005635c6224feb3e70b1f2543823ef99b3192ac8d53605a28736b54f63649ee0 SHA512 80755a351f65007123b3a2427d186fac8b24204c769580b810b9860f4d3531cd40b2be7006631371d4be9d959954537cd7dbf05344bc14b0d08ca4f9432a5484
-DIST gentoo-kernel-6.1.5-1.x86.gpkg.tar 65966080 BLAKE2B e7eb9f70e581f0feafb0edb6f82d6cc615c32ec8ffd3f9c735b7172e24f2ad81ed765c6c7cbdd7ea0a2916bf909108f0475b6d8b31e56fe15f49fa346a541a9c SHA512 4df6bedc4be616a4b347f1d35ba762dbe4cb489893a13ca22d0e392caf10514e4d96e60101014ae74a741eb80056e9d10be503a3cd1b46a0371e72f0da9c58c2
 DIST gentoo-kernel-6.1.6-1.amd64.gpkg.tar 76738560 BLAKE2B 24d6d3f29b4323d3ff080d05c14374f203c7086527402bdc042068e350df9ca596f0dbe07bd985c74326dde5652ca464ed093a9a0fd90ce98862dcc2dda9978e SHA512 26ed6dc543859a9b842e19e08cdd715e48143d7d3af76713fef0e18c12298432b601fbf2eda0c8fa01485492c97db37483634b694ff51cd5a00f2037867ad730
 DIST gentoo-kernel-6.1.6-1.arm64.gpkg.tar 69324800 BLAKE2B afbbd8f02b7127f95d9ca3e14e28d594716d17e472514886e83d4ac4a07e55aa6f1aa905a3328d55eab1b0857b6510ae9c5d2683a24f806136937ffa62e5fe35 SHA512 fcdd7700192661cd8b010389bef50c516f5f47e425c2122b3b2718a815c209ba5c64c54cc88c94dabe0968d65f5f52e8ebaca887ca1b3f741938dae8a384ebc5
 DIST gentoo-kernel-6.1.6-1.ppc64le.gpkg.tar 62730240 BLAKE2B 3a94df5fa51cb826a8501f12dc47deb77ea124ab59272bcb2d4506a137ffb26ef3f0c75d6efa10d08aece61064318642bf40257a7e3fef3766234725ec16e5c8 SHA512 24c267ff67fd980913ac7f7b494224ef46b0d102537ad89ba1a0e08f388a95fe9b4b817a0e9270a187c24d42d7b41f96a2c906079f9c06fb4fbbd8c5dab140f8
@@ -118,22 +46,10 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 EBUILD gentoo-kernel-bin-5.10.161-r1.ebuild 3022 BLAKE2B 6f21255ea312415373259e8272f59a2fab017b33d28a1ef86113acdc6778f2974273b63af219ed1003a0c2123fea99fb6c9a09625f9d00704339c2daf5fa836b SHA512 faa03d4a455bdb04c4e24ac62a5656a3411df53e83e6ebd4e4e8a02b9684e915582183184e3cb23029afa5f620d1dee5d3526ce06a215ddf10169cdb12b5769b
-EBUILD gentoo-kernel-bin-5.10.162.ebuild 3028 BLAKE2B f09e5f0570fd0166abc54b10b93433d1068d4f3a4713cfb6857697532f30b6e2a1df8d4afd66eaa665f4bd2023205334900392f020c62b0574c87a119479bc1a SHA512 e6a6510263e9cf194b9336e26cade4b76f190e1765b7000be003203f4e23fd2b2d64b645e37c0c69a35ba93c3a2e9c5e6f6b9d14eedc1b506b3b68debcf95911
 EBUILD gentoo-kernel-bin-5.10.163.ebuild 3028 BLAKE2B f09e5f0570fd0166abc54b10b93433d1068d4f3a4713cfb6857697532f30b6e2a1df8d4afd66eaa665f4bd2023205334900392f020c62b0574c87a119479bc1a SHA512 e6a6510263e9cf194b9336e26cade4b76f190e1765b7000be003203f4e23fd2b2d64b645e37c0c69a35ba93c3a2e9c5e6f6b9d14eedc1b506b3b68debcf95911
 EBUILD gentoo-kernel-bin-5.15.85-r1.ebuild 3022 BLAKE2B c2c44ef090e52703cf827e2e2b8416b2113bbfc487ec5b2b2d69056f9b18b256cbd17db766f4b3f14b3c40df8774404bea85f3e4d456afe3c3bd0484669ebbe1 SHA512 83fe8dff3b569a37e59aeb3b5e496298f61017ce6fd5efef54d1942ea3fc0f6bf14052b67bd8b6e64537242c497e808c035126db2d20c947051c86ec9787c7cb
-EBUILD gentoo-kernel-bin-5.15.86.ebuild 3028 BLAKE2B 27b19fb47bbb60d614d6e70734ba1eb4179ebd5136adb26534b528ac70f31d7f1e867ddeee94aedf437a6b920f8a2be5edf3fec909117a8d31e5cc9146850ce9 SHA512 c6c6e5842419638d1670e3a482de3bfc2bc35452441f2ac7abb3b0e3e4432aa767b612c3078470a98da5963c09615f6f9986c20dd9a1d18abba4fdf7d7ad6815
-EBUILD gentoo-kernel-bin-5.15.87.ebuild 3028 BLAKE2B c8314539c6ea447c8645bc304bfcf6cfa99398ad38f6106dc2fa6c9a9a759ccd288646b95f77a2e9a3e9ec2ab045ffd1544a70d9060096a0e04a91ecff46ad42 SHA512 22fbd6a7597f0a6b489e6e6cace828fa7df95cbffe48a6c79b7a4d568c2e79f7ffa7d8bc717fa2746015b0e4da295f446c6d7f20bc679fadf7d9ee6574921e2d
 EBUILD gentoo-kernel-bin-5.15.88.ebuild 3028 BLAKE2B c8314539c6ea447c8645bc304bfcf6cfa99398ad38f6106dc2fa6c9a9a759ccd288646b95f77a2e9a3e9ec2ab045ffd1544a70d9060096a0e04a91ecff46ad42 SHA512 22fbd6a7597f0a6b489e6e6cace828fa7df95cbffe48a6c79b7a4d568c2e79f7ffa7d8bc717fa2746015b0e4da295f446c6d7f20bc679fadf7d9ee6574921e2d
 EBUILD gentoo-kernel-bin-5.4.228-r1.ebuild 3022 BLAKE2B 253a58bd91ca83ca4e0317b6a746ac8e9277a0d6329139a1c263df53f026c013e1ecbfcfdcef1c90823ef24e591d9f707c9b6fc55974a7c73c5d74d70bb39fa2 SHA512 367bc272dfcf9f1c8e72d1256e86b80f21ed0405395bf992b3e15ce73b56ad251282074480724de522d572dc125ed86953f75d3a61198c1b9fcfa567d6621bad
-EBUILD gentoo-kernel-bin-6.0.15-r1.ebuild 3026 BLAKE2B d6545c6097f7bf334eab6ead5862b3b78c100b8d7df2da40378fd23aafeb09fdc904109b8f57a935712176a698b070cda01c25f9aefe31466be05911b82420ea SHA512 aab580d1b63953709cd9319c25c0adaafc96d0264f79afaeb0d1e34997138b9e51aa85d0fa378182e004ef22850270b0c69a7da00b95e5c3595f7b5d249ed16c
-EBUILD gentoo-kernel-bin-6.0.16.ebuild 3028 BLAKE2B 1efd8a8fecc5d89c5b783ffccb54a6285966c6d17a896d8abfd2f91c4a74ec42af4251f2c87e890cce842c7bd18d754a5e9e632b1c2ee107c3a13be840de7311 SHA512 838a9d5a2ee1ebbbee4824ab5e2fa5cf3397097346e544622e647886bb9ea19f38086d6d965ebe9eb38c9e77fbc629ba91a25f103bdd851da01471470f3a7504
-EBUILD gentoo-kernel-bin-6.0.17.ebuild 3028 BLAKE2B 62c25274a717e6a528b4a87266c6544de690f94107ebc968ff0cab73d077eb07a5e2b2567fd6b1cc390e8d64844c53c8251c0c14361fde6c5137e92682f812ac SHA512 a82d54f5acdecbe78f227aca6f0b461a66ccece4003e8033d1840af3b45ddc2c41e5af791427f80ad2ecace3fc8544b3d50cac851f66e1fd34b1a6304aadf696
-EBUILD gentoo-kernel-bin-6.0.18.ebuild 3028 BLAKE2B 62c25274a717e6a528b4a87266c6544de690f94107ebc968ff0cab73d077eb07a5e2b2567fd6b1cc390e8d64844c53c8251c0c14361fde6c5137e92682f812ac SHA512 a82d54f5acdecbe78f227aca6f0b461a66ccece4003e8033d1840af3b45ddc2c41e5af791427f80ad2ecace3fc8544b3d50cac851f66e1fd34b1a6304aadf696
 EBUILD gentoo-kernel-bin-6.0.19.ebuild 3028 BLAKE2B 62c25274a717e6a528b4a87266c6544de690f94107ebc968ff0cab73d077eb07a5e2b2567fd6b1cc390e8d64844c53c8251c0c14361fde6c5137e92682f812ac SHA512 a82d54f5acdecbe78f227aca6f0b461a66ccece4003e8033d1840af3b45ddc2c41e5af791427f80ad2ecace3fc8544b3d50cac851f66e1fd34b1a6304aadf696
-EBUILD gentoo-kernel-bin-6.1.1-r1.ebuild 3026 BLAKE2B 6fe3b60d2a686f0d72b72de862f980e633716a21809a6c63479244e0751b11ec37bc1e59049fccc82cd81fc0770cbad36b515855c2fd404739d7136b71a14c09 SHA512 03e391465c17e661ac705f6ee8620566055e0a7bbd848fdedbaed73d137fa0416e2f8ebda603013950cc96a837f9d139e0a615ad09ba82f6f565ae4765a4b273
-EBUILD gentoo-kernel-bin-6.1.2.ebuild 3028 BLAKE2B b1d469abe77572298742c141b60a3df71852fcd8e4ce4af8b822c2041f69e8b59848728b8f60f37c759ff2cd5b2355ebc524e90137a9ef54d7eb8a6c64102942 SHA512 d4212757d227fbd35620f129962dd285aed3d761581b9c2d6648a0f3ea327e0b3c0d9a946c7a74bf1210acb57e1699ee08bbafe78b807d387d75288d63459023
-EBUILD gentoo-kernel-bin-6.1.3.ebuild 3028 BLAKE2B 4bb3f46f40739c0304029ff6c4ccfdf255a4a8e247bef77c76e7d8bb57458e35ac2b2dddd1ebddbc189b1ce6402b97481c1e71e53337795b95de6700b1c1c1a7 SHA512 2bc1fd4438671d444003d3447618ae56c0efda7b2d82df6961cf48776d5c69ba39f4ffa83e6c0a818d7418291049cbf282a41d8c35de8fd7beff6c935c322bd6
-EBUILD gentoo-kernel-bin-6.1.4.ebuild 3028 BLAKE2B 4bb3f46f40739c0304029ff6c4ccfdf255a4a8e247bef77c76e7d8bb57458e35ac2b2dddd1ebddbc189b1ce6402b97481c1e71e53337795b95de6700b1c1c1a7 SHA512 2bc1fd4438671d444003d3447618ae56c0efda7b2d82df6961cf48776d5c69ba39f4ffa83e6c0a818d7418291049cbf282a41d8c35de8fd7beff6c935c322bd6
-EBUILD gentoo-kernel-bin-6.1.5.ebuild 3028 BLAKE2B f1a8609dc0df691418f250273a84d7d645ed2c84f3ec70d4bdf494938b2305053949c31dc1ca1020d602de2ecc66a5bf0a231205ecd5c1fc500d80577cab7071 SHA512 c01314ba4cdad6a38de547bf178cd75d2c3cd5b8ee732bf60facda3d1ebdfef371fc1bea1603111fc96e36426996ff247150751f6a23f67dc1eaa688910f2f56
 EBUILD gentoo-kernel-bin-6.1.6.ebuild 3028 BLAKE2B f1a8609dc0df691418f250273a84d7d645ed2c84f3ec70d4bdf494938b2305053949c31dc1ca1020d602de2ecc66a5bf0a231205ecd5c1fc500d80577cab7071 SHA512 c01314ba4cdad6a38de547bf178cd75d2c3cd5b8ee732bf60facda3d1ebdfef371fc1bea1603111fc96e36426996ff247150751f6a23f67dc1eaa688910f2f56
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.162.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.162.ebuild
deleted file mode 100644
index 8f6c357c55e5..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.10.162.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-install toolchain-funcs unpacker
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 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
-	app-alternatives/yacc
-"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH="$(tc-arch-kernel)"
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"${BINPKG}/image/lib/modules/${KPV}"
-}
-
-src_install() {
-	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
-		mv "${BINPKG}"/image/boot "${ED}"/ || die
-	fi
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.86.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.86.ebuild
deleted file mode 100644
index 43ce4df76615..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.86.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##*.} + 4 ))
-BINPKG=${P/-bin}-1
-
-DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.amd64.gpkg.tar
-	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.arm64.gpkg.tar
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.ppc64le.gpkg.tar
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.x86.gpkg.tar
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	app-alternatives/yacc
-"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH="$(tc-arch-kernel)"
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"${BINPKG}/image/lib/modules/${KPV}"
-}
-
-src_install() {
-	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
-		mv "${BINPKG}"/image/boot "${ED}"/ || die
-	fi
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.87.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.87.ebuild
deleted file mode 100644
index 27016e1b991a..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-5.15.87.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-install toolchain-funcs unpacker
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-BINPKG=${P/-bin}-1
-
-DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.amd64.gpkg.tar
-	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.arm64.gpkg.tar
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.ppc64le.gpkg.tar
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.x86.gpkg.tar
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	app-alternatives/yacc
-"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH="$(tc-arch-kernel)"
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"${BINPKG}/image/lib/modules/${KPV}"
-}
-
-src_install() {
-	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
-		mv "${BINPKG}"/image/boot "${ED}"/ || die
-	fi
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.15-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.15-r1.ebuild
deleted file mode 100644
index 7634c204448c..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.15-r1.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##*.} + 0 ))
-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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.amd64.gpkg.tar
-	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.arm64.gpkg.tar
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.ppc64le.gpkg.tar
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.x86.gpkg.tar
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	app-alternatives/yacc
-"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH="$(tc-arch-kernel)"
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"${BINPKG}/image/lib/modules/${KPV}"
-}
-
-src_install() {
-	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
-		mv "${BINPKG}"/image/boot "${ED}"/ || die
-	fi
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.16.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.16.ebuild
deleted file mode 100644
index 00650e13196d..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.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##*.} + 0 ))
-BINPKG=${P/-bin}-1
-
-DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.amd64.gpkg.tar
-	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.arm64.gpkg.tar
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.ppc64le.gpkg.tar
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.x86.gpkg.tar
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	app-alternatives/yacc
-"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH="$(tc-arch-kernel)"
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"${BINPKG}/image/lib/modules/${KPV}"
-}
-
-src_install() {
-	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
-		mv "${BINPKG}"/image/boot "${ED}"/ || die
-	fi
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.17.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.17.ebuild
deleted file mode 100644
index 877c81f2e72e..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.17.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-install toolchain-funcs unpacker
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 0 ))
-BINPKG=${P/-bin}-1
-
-DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.amd64.gpkg.tar
-	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.arm64.gpkg.tar
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.ppc64le.gpkg.tar
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.x86.gpkg.tar
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	app-alternatives/yacc
-"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH="$(tc-arch-kernel)"
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"${BINPKG}/image/lib/modules/${KPV}"
-}
-
-src_install() {
-	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
-		mv "${BINPKG}"/image/boot "${ED}"/ || die
-	fi
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.18.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.18.ebuild
deleted file mode 100644
index 877c81f2e72e..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.0.18.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-install toolchain-funcs unpacker
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 0 ))
-BINPKG=${P/-bin}-1
-
-DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.amd64.gpkg.tar
-	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.arm64.gpkg.tar
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.ppc64le.gpkg.tar
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.x86.gpkg.tar
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	app-alternatives/yacc
-"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH="$(tc-arch-kernel)"
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"${BINPKG}/image/lib/modules/${KPV}"
-}
-
-src_install() {
-	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
-		mv "${BINPKG}"/image/boot "${ED}"/ || die
-	fi
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.1-r1.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.1-r1.ebuild
deleted file mode 100644
index c8200881ca18..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.1-r1.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##*.} + 1 ))
-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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.amd64.gpkg.tar
-	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.arm64.gpkg.tar
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.ppc64le.gpkg.tar
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.x86.gpkg.tar
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	app-alternatives/yacc
-"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH="$(tc-arch-kernel)"
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"${BINPKG}/image/lib/modules/${KPV}"
-}
-
-src_install() {
-	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
-		mv "${BINPKG}"/image/boot "${ED}"/ || die
-	fi
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.2.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.2.ebuild
deleted file mode 100644
index 08f0fc48296e..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.2.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##*.} + 1 ))
-BINPKG=${P/-bin}-1
-
-DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.amd64.gpkg.tar
-	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.arm64.gpkg.tar
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.ppc64le.gpkg.tar
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.x86.gpkg.tar
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	app-alternatives/yacc
-"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH="$(tc-arch-kernel)"
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"${BINPKG}/image/lib/modules/${KPV}"
-}
-
-src_install() {
-	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
-		mv "${BINPKG}"/image/boot "${ED}"/ || die
-	fi
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.3.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.3.ebuild
deleted file mode 100644
index 37a5c18539e9..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.3.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-install toolchain-funcs unpacker
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin}-1
-
-DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.amd64.gpkg.tar
-	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.arm64.gpkg.tar
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.ppc64le.gpkg.tar
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.x86.gpkg.tar
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	app-alternatives/yacc
-"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH="$(tc-arch-kernel)"
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"${BINPKG}/image/lib/modules/${KPV}"
-}
-
-src_install() {
-	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
-		mv "${BINPKG}"/image/boot "${ED}"/ || die
-	fi
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.4.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.4.ebuild
deleted file mode 100644
index 37a5c18539e9..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.4.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-install toolchain-funcs unpacker
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-BINPKG=${P/-bin}-1
-
-DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.amd64.gpkg.tar
-	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.arm64.gpkg.tar
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.ppc64le.gpkg.tar
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.x86.gpkg.tar
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	app-alternatives/yacc
-"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH="$(tc-arch-kernel)"
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"${BINPKG}/image/lib/modules/${KPV}"
-}
-
-src_install() {
-	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
-		mv "${BINPKG}"/image/boot "${ED}"/ || die
-	fi
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.5.ebuild b/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.5.ebuild
deleted file mode 100644
index ed76d510db0b..000000000000
--- a/sys-kernel/gentoo-kernel-bin/gentoo-kernel-bin-6.1.5.ebuild
+++ /dev/null
@@ -1,127 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-install toolchain-funcs unpacker
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-BINPKG=${P/-bin}-1
-
-DESCRIPTION="Pre-built Linux kernel with Gentoo patches"
-HOMEPAGE="https://www.kernel.org/"
-SRC_URI+="
-	https://cdn.kernel.org/pub/linux/kernel/v$(ver_cut 1).x/${MY_P}.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~mpagano/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	amd64? (
-		https://dev.gentoo.org/~mgorny/binpkg/amd64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.amd64.gpkg.tar
-	)
-	arm64? (
-		https://dev.gentoo.org/~mgorny/binpkg/arm64/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.arm64.gpkg.tar
-	)
-	ppc64? (
-		https://dev.gentoo.org/~mgorny/binpkg/ppc64le/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.ppc64le.gpkg.tar
-	)
-	x86? (
-		https://dev.gentoo.org/~mgorny/binpkg/x86/kernel/sys-kernel/gentoo-kernel/${BINPKG}.gpkg.tar
-			-> ${BINPKG}.x86.gpkg.tar
-	)
-"
-S=${WORKDIR}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel:${SLOT}
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-BDEPEND="
-	sys-devel/bc
-	sys-devel/flex
-	virtual/libelf
-	app-alternatives/yacc
-"
-
-QA_PREBUILT='*'
-
-KV_LOCALVERSION='-gentoo-dist'
-KPV=${PV}${KV_LOCALVERSION}
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	cd "${MY_P}" || die
-	default
-}
-
-src_configure() {
-	# force ld.bfd if we can find it easily
-	local LD="$(tc-getLD)"
-	if type -P "${LD}.bfd" &>/dev/null; then
-		LD+=.bfd
-	fi
-
-	tc-export_build_env
-	local makeargs=(
-		V=1
-
-		HOSTCC="$(tc-getBUILD_CC)"
-		HOSTCXX="$(tc-getBUILD_CXX)"
-		HOSTCFLAGS="${BUILD_CFLAGS}"
-		HOSTLDFLAGS="${BUILD_LDFLAGS}"
-
-		CROSS_COMPILE=${CHOST}-
-		AS="$(tc-getAS)"
-		CC="$(tc-getCC)"
-		LD="${LD}"
-		AR="$(tc-getAR)"
-		NM="$(tc-getNM)"
-		STRIP=":"
-		OBJCOPY="$(tc-getOBJCOPY)"
-		OBJDUMP="$(tc-getOBJDUMP)"
-
-		# we need to pass it to override colliding Gentoo envvar
-		ARCH="$(tc-arch-kernel)"
-
-		O="${WORKDIR}"/modprep
-	)
-
-	mkdir modprep || die
-	cp "${BINPKG}/image/usr/src/linux-${KPV}/.config" modprep/ || die
-	emake -C "${MY_P}" "${makeargs[@]}" modules_prepare
-}
-
-src_test() {
-	kernel-install_test "${KPV}" \
-		"${WORKDIR}/${BINPKG}/image/usr/src/linux-${KPV}/$(dist-kernel_get_image_path)" \
-		"${BINPKG}/image/lib/modules/${KPV}"
-}
-
-src_install() {
-	mv "${BINPKG}"/image/{lib,usr} "${ED}"/ || die
-
-	# FIXME: requires proper mount-boot
-	if [[ -d ${BINPKG}/image/boot/dtbs ]]; then
-		mv "${BINPKG}"/image/boot "${ED}"/ || die
-	fi
-
-	# strip out-of-source build stuffs from modprep
-	# and then copy built files
-	find modprep -type f '(' \
-			-name Makefile -o \
-			-name '*.[ao]' -o \
-			'(' -name '.*' -a -not -name '.config' ')' \
-		')' -delete || die
-	rm modprep/source || die
-	cp -p -R modprep/. "${ED}/usr/src/linux-${KPV}"/ || die
-}
diff --git a/sys-kernel/gentoo-kernel/Manifest b/sys-kernel/gentoo-kernel/Manifest
index 064ec37e1c78..8830e862f4ca 100644
--- a/sys-kernel/gentoo-kernel/Manifest
+++ b/sys-kernel/gentoo-kernel/Manifest
@@ -1,67 +1,37 @@
 DIST genpatches-5.10-170.base.tar.xz 4506932 BLAKE2B 9503a369d1d653fc08e0c24438943dd3b583c25d187b5913a5308d41a7322a6467324be402b3748d201040b004980a5c6021704142008e49888d4898ec6194b2 SHA512 7b737194adc2876f589be2a155b1142a48353a099872cf1f75f653fe0c2fbb1899cee2c39970147c827c46ae31d5151aaef18d0a805fdb28d8efc0fce4c808c7
 DIST genpatches-5.10-170.extras.tar.xz 3868 BLAKE2B fcba4ddac271a957a8f2645fc833338bd2da71ded4cb935bf1f2df267f50fdf1bab0e2bb0967a3cae975bc7cfaeae932261ae0aab4bcad40b32546ff69850c41 SHA512 bb272928563d33ddf9a90db610ed013f625121f8a05cf497c14dfb74052300cae361474e71203be35949ace7aa9bdc23e98f2dedfe3eef885a59674a90166c6e
-DIST genpatches-5.10-171.base.tar.xz 4617172 BLAKE2B 7ab9b6676f808124a6e2996bd3ad36b1e76228ac969f16ad3956b50b31e8f5f12f3f4588afc88df42b157bd6847474e8cb1e1317e863ea63da94503ee0b73e18 SHA512 5243ffe0b9c79e75f1649f3deafd6293cb016475459e51fc4f298513245d974803a5d802c1670022840d1c087daa55e5d1133caa5e5b49b39d1aa1e7604e897b
-DIST genpatches-5.10-171.extras.tar.xz 3872 BLAKE2B 27eff9d6f83ae27c147de7910f5d8e1c43f286f3f3da6cb56caa048c2c226c28926a32fc40b47cb0dae39347754fd65e1f26ef9c350065cd7db62ee5935372e5 SHA512 bc82b100c55bd0c935363c10dc87607a8aa2539401ea6a1c6618d37deae072b390cb33e3075a4dab3583d52c7f0a79e30f2dfc8b0a6eb5fcf5f59d8a01020ede
 DIST genpatches-5.10-172.base.tar.xz 4831748 BLAKE2B 46acfe58044df90c98057fc25903c1af1ff3baccace354659b79b939ca6b2054488c8823c456620880e4af9221e0d26eadfd355aaccf4679989ce2e6077507e5 SHA512 8951a10959454b515269be97e163e73aa7cc8374abc7d0fa73243f67944bd1592051736ec06e2ce29ee01d4e0b79ec783d30b40664105f12aad24c9c4cff0a33
 DIST genpatches-5.10-172.extras.tar.xz 3868 BLAKE2B 32ee2c036c224c800ce53fa94d8f6676c70023bb733cef143355ed5907a4815cb252bc43d1660bedd841dffc814c15a9016d8c0d43b80ece58c9f4bf77c472eb SHA512 10372d1ab1d8bd73dc1c7412498cfb5ce91dc74d5e40c6497aeac24fb71d9c007d03cdbe58b2b7d6304af11816a4981cfc4bdefcd39da19009cb2f0bef9ba5ea
 DIST genpatches-5.15-89.base.tar.xz 3552056 BLAKE2B 2131869a216e9e99fe893e502e9dff10ef486fcbd0a130db2621ecbc61194d4f224745d146213edf35083752de89624346eb7fcd7c2fb53f414d3ddc200b5b51 SHA512 ac840d8ea832f5a388ace30cc435501112992a16834dfd01bef764683b415405b1f9fa644062c8ca3ecb18739e55133f2282281436847d9ceae8fd6104dc583e
 DIST genpatches-5.15-89.extras.tar.xz 3932 BLAKE2B 25a5b47eed2412b6d660572c266fd8d22be0c3e570dab6d45a7e6a0015227a1b4cd468582bebe3ebc7f47600d3ad30a5853dc2398e39ae02352a1b5df1faea36 SHA512 b4ce39a33610e5ff1c3309f787dddca702e55d81b19dbfb9300386a246e758ca9192eb98189ed01ba138d38947fa35e27dc6d3b459da059807bee93289845879
-DIST genpatches-5.15-90.base.tar.xz 3757428 BLAKE2B 30e129e5362a5fd690d8273a36e102510e113415e3241f838b366c2e35dbf1b95fa30d6e34e6e36c5d938855aefcc66a039f1242ea8a69263fdbaf84c46434c4 SHA512 bca6d1252657ad611a71ed2ea128887b131f9dad83f4c0007573b2637fd79b117023d0ade5b833070a8c86ab4f698d0b3250e01b612a0b65515a164fdc9d1212
-DIST genpatches-5.15-90.extras.tar.xz 3932 BLAKE2B e84edd591a94f2d21593f86aa7ed2a27980e099b388f49e899655dd687d459be87491c6441b73a5c024c43bb81f74103ef226d3bc3ae42d089749db0b06ccf45 SHA512 687240f034abd1e91d85e057bae2693129ef6fc4b6119c71df00c306ae2d1cc64ea294a76ce8017b7f2b0ac557c41b9ac70d4fb466ca2899a3c544490421df45
-DIST genpatches-5.15-91.base.tar.xz 3838856 BLAKE2B e42746d0b7342cd6e2ab1b6b907a202277365a4fe52df5eae5d3685c68efbcbce58ab1c6d00e0b89c1f581f6818ba830f35af96d40e1bbf80ac824b0be572715 SHA512 37b31c9f878dc1cc4c5446fe7810b6fb9caf556296e99975de1e37bde9e798f5f74e90cd6d825ae1f474bbd8ae31da3f07e5527d3ce6aff42761ce8425634949
-DIST genpatches-5.15-91.extras.tar.xz 3932 BLAKE2B 139a9a7876504ce63abf76db63904b3b4330ab101ec7f0c97717ee83ff861595df31a36f5fe4fbaf3b70641e6029e399235a7ec3e26feb98522c57e6b4b5d71b SHA512 9486f83b99c1f0bcd23e556229c7c0947be4fa097d688b510b6d57d94584e6fffcc9a2412c3620ceeffc2b347fad1ea1e12f58b2f0629cf93a2bde19f567ee5d
 DIST genpatches-5.15-92.base.tar.xz 3843196 BLAKE2B 1a70c672f4ceda221611ba1bad20fc4e791a51e27f412995308cb7f39962c6e237efc1bb7912c67b8e3dabaffce3bb6ceb55d62f4f12b79671910b70c1e7a8dd SHA512 33390b3e24783405971f2eacb24e715faf841a66e477a03d4055d61694fa72694d7563d799b95d47037ad0d7e7c234e56c894ddd7cd1dba59077efb901bbba26
 DIST genpatches-5.15-92.extras.tar.xz 3932 BLAKE2B 12936d0ac139d69f2e5947436ffd34add80625aa383aa23e51b4419a5e2ad3c38ace4d69c9e7066bfeae32ab727013e602c3a1c3424e128562597c517c7e5903 SHA512 6595eca7525db97672a15275228dbb9b14e7e234514b549e0fc17daeda4b48d298f6dbcde46e5862fe02bac9f50ffd7b05d82a174541469456289bdc6eb7f4b1
 DIST genpatches-5.4-233.base.tar.xz 5294692 BLAKE2B 357046687c6f2797d5d7090dad357e00675eed329ccef44223dd476551cf04e9f711f1020144cfc59796657cb5b1e6d76b607ecb164e27636869a8bc8984f567 SHA512 45f6b35dbca12e8b9e6a9f99d12c44e47a6e471e5091ab75c42346f1d8bc12dc454cbb335f1549b497842c2d9f13a5930c80b5000cb86bd3db7b03347dfebcf4
 DIST genpatches-5.4-233.extras.tar.xz 1812 BLAKE2B abedf631da893391a98a98cf48d264f9eaf9f9f7811bf595c36a774c8dde21f105afaf6f4e113e04de472bd6ce0c759bd41fd95aa980b7e05499d8571f3e8a44 SHA512 16b09d0a4465123079360ef9f070e0c163f45f9784714e98fe53f7174e836fe7b2562af01e5c2dc932571bb3eafe2d9afedfd60b5c8467bd8410de651ab82473
-DIST genpatches-6.0-15.base.tar.xz 709204 BLAKE2B cba74ce5f9a6d8a00991f87fe33771f615640c8c3adaee94432580f5df51cb2a488794a376c9355d568ab4b3014fe23e4c9fb000bb9ed6948b4225211df862d6 SHA512 64d5d04b8c1b3c3967fd22cfd975b7f9bbf37e7d7d4e966c7017b589837cfa02200a80880f13ac52942fd845c9835143d809817f5517c91992e30e101b15c775
-DIST genpatches-6.0-15.extras.tar.xz 3804 BLAKE2B 84856863ba0897a7ac9238094fec3d46a39cfed7db81d1021b236fcf0bbd4bd893ba44af4ddcc9ae955ab66424afd70ead4fa714a1b68e11d7e66539f94a6cf5 SHA512 7e49da632e9bf5a78c80a0817708e571452f92a99fa91daca8495282fd0ed955bb16a5fb57ebbfff68e9fe6733655c4d04967c6931d1acf6dc6102a44bd9b04f
-DIST genpatches-6.0-16.base.tar.xz 995192 BLAKE2B 17cfba17971fadc2e389f14e4787604489f8a30760f3687df364d053999819dfbe63264eaff4b04bf7df00d66278e6d56d856e09a043407e282bbcb2fbce4c7d SHA512 fc199b59ee9392693147cdfcd11d26cacc5ae5b4a76a3734f32e2b86a027e0d13a4ad5927ab06d333b7ec89f1983acacd876c272cb48e6555e1b067b0c7ae63d
-DIST genpatches-6.0-16.extras.tar.xz 3804 BLAKE2B e03fc44e706291fe586f115e0cf58c78fea7f259a02cbc05cd9bd44166de7f329c538e00a86ca9151cdcad66f029f52266816199743fcf176e0e0295c785a833 SHA512 06ad99c99c6b130e6b6aca4918ffdd693b04830ec475a397f697e70ed2356c43a177a67ef46141d28fdc7ade2eb9941f24402c82304340b000f28831f4ea83e2
-DIST genpatches-6.0-17.base.tar.xz 1012800 BLAKE2B 66ba9821444aa24e2e2a4b400417ca11b97818a6fd2cecbbfb6c3e66b5f1b66f957b464e2fd7e6ccca80a513855a4c54bb1e54fcb9e58c33161ba721345eb87d SHA512 ffdf33470043972e06084e725061a0d508502696079f8cae0c6a23b0c1977da9213f73069890483952b19ffceef822ff409314c2b763024767cf8cc85adf6645
-DIST genpatches-6.0-17.extras.tar.xz 3804 BLAKE2B 46529c32e888478e4542e581837bb51322f68234470ba8a66a2f532bbe1469cdeebf7895931084d7e177562d201720bb8d8b6d32d92f27854d4728beee17423e SHA512 aa1125ef91fecafb21ef0cea18c9d8f0569e46c0ae24460cbe864e48c7bfba5c287bb05e958544592962e77992d6acaf2306041faa6f2542026d923a7140b43d
-DIST genpatches-6.0-18.base.tar.xz 1058696 BLAKE2B d196ac73218aba9a040cbb227010f8a698f7073d9c18e59b38dec48f2c86cb013544d66d57f2c2a9a6ad81646d753ece44222426f62348ff0dbf6dde1ea3622a SHA512 55aa267c66bc1baf908b6f1ee4e38c0ec8dbfbeb699635727efccd7d8561459cc49c973bc9a59c61a320550781dcb274d4e70d274bd46f59bbfa4b8cf8117147
-DIST genpatches-6.0-18.extras.tar.xz 3804 BLAKE2B feeb5ba822e8d1fd70fce07f7e3f74b5678ca17fa54c81e64f364d45ee8801edf5d1e88ad237d9944288163b7c776ea0a9d8ab19aef43aa436f814e50c9fd10d SHA512 a40804af99da5f085046a121e2f400229a9c091969d17dcb0ee2f21ee837ad08dcc56dcfd0f826883dfb3f61f36d9277880b9819fc17e8a318f5720853e81b98
 DIST genpatches-6.0-19.base.tar.xz 1107844 BLAKE2B e185f0d47ac23c92668d523a32d56a3b8c7dbb67db40e7cc776b267e6e5ffec4d25d10ec85df396687d96460937eeeb47bb4a9e6213199ee32f0c2a0f5e034a4 SHA512 beb49081cf89405825638cb49eb95fd8fb0d2b59790a663c629b4c4bf5c7c55e424cbf96fe9bc83220c14270ed2fee39481ad79f287aded00c7bd0cbf755c400
 DIST genpatches-6.0-19.extras.tar.xz 3804 BLAKE2B b3111f38985093d7ae6936f7ceedacce53fda92163973d79984a9bf19c127ba7dd203f55bf5c57b69591310851c91127848edec87eb715c4d20ab8051bc8d30e SHA512 2212c66beddfb576e90f8c4015ed64aca1cae44367f5ffca98c949e208e68eba6b357b00a6196671cefd7811a3f1f2e188337dcf10457c8b7955129d096c5bb0
-DIST genpatches-6.1-2.base.tar.xz 15048 BLAKE2B 84d1f7b4cb2c13e70b0d542853856f05de48739400f66253fd277167144ae0c259579e539d43ce65d2ee206a2820ec2ef288d9296c68a4dbd674c43d378102b9 SHA512 e349b8b535e8ab9f70cd01c513480cf75bd10dd2f2d5ef15f97734ecc9e481f137dc1cfa4c50f8a1a2f3549bf0142f83f7224603f881e66af130cbe1f8023496
-DIST genpatches-6.1-2.extras.tar.xz 3808 BLAKE2B 70f549904446897e8f955146dba039b43681e03e0d72049e35473ac6ff5d05a1a72c124d410fdfe065d5652c0f0312c6eb4907afbb475e3cd9828c3f0edb6fa2 SHA512 9f92c3b899a8b106649003acccd33cb3cfaf9838ec421998d3b587893b2e6705068fdc0ff7b52ae78203dc793b6064742b721e68bb1e8d7160c48b419062448a
-DIST genpatches-6.1-3.base.tar.xz 331284 BLAKE2B 66670841382237e0d222ba04fea65c98420c15160c7c9073b3107efc2779aceca0bea1643be6c06d5d1ea15558cf53676d25921013bd437027090be4acb85228 SHA512 5873cfa3f67a8118d92b141406298760b54c8b3625081c5dae79fe0c07e3eae20474cbc85601e871a6bdb5b3ed2f70e16e1939d8e4af67db7598af845853f0f1
-DIST genpatches-6.1-3.extras.tar.xz 3808 BLAKE2B e4dbbeabac30e90a113041d4402bcb53d27a77408cdcf2e36dba448e680899efe7a62abd6b64574d778b8b058bba09ca0ae9830fc2ce4956cc2548dd243f00ef SHA512 17482b5ac89d4a2da96142195dbb6660295f0a2d8a321a92b1629d5f77e50c125115f2dbab6409867a989747dd28d6d42ca57d2f1e0193e731eb9d57ed5e1dd2
-DIST genpatches-6.1-4.base.tar.xz 350692 BLAKE2B e310351161d4e0bbe0f498285da235a12b585fe5974b9dd35d6567af5eadcd291d63af5bfe036b7f0c03fb5a5c4285a7a4d771010474eba32a2bdd806f95b808 SHA512 42888c297a002e68575a4fb8f5de844418ff610b8770d544404b1c410c86f68f1a1c28c60d32ccea34c10d2ee8e0383e057cb24d4a99edaccbff6388570c5b24
-DIST genpatches-6.1-4.extras.tar.xz 3808 BLAKE2B af64347e6fd2f640d86b0839feac7c6768489235fdaf6be7bc46ced24cd0e20490fd18b06096ddf2ad7ac70973339c895e75aa2ce3d19e368b87a4a0219fe54c SHA512 a0a94512517ece1bef28101433e3f59433c87a0e4b1f7c3937ae4f753a3d3c49f14e5a6780c9d4416082bf5282430e0386dd9bb72c924af72bd1fd902586ec0d
-DIST genpatches-6.1-5.base.tar.xz 416352 BLAKE2B c3aedee62099a942b85016df0493ca1ca403efddc3c6b8c3e5d91246448cdc2a3626af200ee62865270f3ea5bb9dff131fed425fa78f6ecbaff08818e7a48022 SHA512 c3b8b2e58e4f6e5c7750d8c2bed54952feac33b319c318f562b8b5a894ff5d25ffe0149f5373f2b1655c1be6757eef8c6890460228f54828a42c59a1f869bf45
-DIST genpatches-6.1-5.extras.tar.xz 3804 BLAKE2B ef944c72d659c38fcf1d279693fa3c1a7e2aeca6fa5d706699dd3f862247d0f0ffa2522a326aa896b57eac985417d04ddb652a260a96924b97c6dbf9ae940562 SHA512 e7461ef3c47af3b6c4e9861a95dacd56b71bef7a518b69abc0ff94b40fb3beae0d3fc04a16ff80332cebcfd16eff0ffd334e02377d7e15bb1a824f51ee143173
-DIST genpatches-6.1-7.base.tar.xz 470576 BLAKE2B 09a0d003fb9d121c51423d05729a9a72b27d5eb57e0e671d454cf14a8a72a1109a5d869ea25792602e3f7a53008d3ff7b568389b16400ff7bd04c9c1ee311a59 SHA512 80db2cdacffa2ac85830ebef934c33345dc113f5ccae252ad18201d322b7b4ad4bee5826e077cba4029f97e871fc16ce22fcd994d58cb787c71c746088cccc34
-DIST genpatches-6.1-7.extras.tar.xz 3808 BLAKE2B 1640a94b258538c462e74f566b290e18a6c88a1993aad96e9442b40c498d8a8dd33b634816f53cd6ac39a1e95d9b0f9462d345970c706e3424ec6be8ff99d902 SHA512 e843e33fb1fefd0f3e0e426132ecf56dcc9702cca1d57cde74e4b43d414acc01e0334b3b1bf767391c2d1bbc4499d5e73508778b47ec849b256569392d77f84f
 DIST genpatches-6.1-8.base.tar.xz 477364 BLAKE2B 29fa8d45feed6333883e1f4733ace6ed52b5424aeeada3e71917a0e3d85f87a7b99f0863ff468e678ee5631c6e0f0dd7c3a0115a58d80512ac1a27d58a2df149 SHA512 d1f32215ced0ed39cc1c6d224b1a12ae3f80bcc19f1ea23189e853367ebc661c74d17d335bd615c2fc1f3c21271f6f170a35caa38194b2dfd09f78e405739ae0
 DIST genpatches-6.1-8.extras.tar.xz 3808 BLAKE2B af83b01895f1b3af4c0220a89b0dabc3642e578920475402c02dbe0300c520dbc621a2245eb66842addac48565c8b612198138c49491dca7909d594a9d2ef818 SHA512 22f9378bc7b4413d60672656c2e73bfbcc6debd10179a0eb2b523bceb5f3adeacecbd433ede3aa057143163a9cc2971d5023d73ac8187eaad59508dd229feba7
 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 gentoo-kernel-config-g4.tar.gz 4459 BLAKE2B 8a481315e427c2da5d14847bfa00e7904aec8cbe6dddde504bc4ce016a19b8c9f67d09dd1bc2f6feea22368b91555a74a045ae1d0f9aa1395616f008e74dbdc5 SHA512 c4b1d3a67cf614f0f9c0af4adaa23d97c0e91b467a1e69f88a0994760c187bfb403fffc0a5fdeb09f9fc4af849013f7f993cd55a8a4a82ba32309475f09deef5
 DIST gentoo-kernel-config-g5.tar.gz 4503 BLAKE2B 165733068786f274ac3bec94e0e29a10992f5a1b188970b2f7195348bb98ddcbd5d4dd45131b00d41c6bfd0bdfdaff1069debdbac560f92b9d62d30812d830df SHA512 565f6a35b534ee2e34e05769c95ac532aa6cb8e27073aaa8292fa3d19af8329f812e8a2d2c5c2696ac0fc28858e4461cde1644d0499f2563de43903b7043f386
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.6.0.8-gentoo 249703 BLAKE2B d62624ff7072694a5ad98084925fbc892ac381fec0fce0aa01309df06ce9f115b0aaecf578a3e2ce6e6c3b25de9fe14d0c5b4ec2182fdf21dff30ed393ebbd8a SHA512 dc7d2aaa191f0ee2a61b563716c60dd1d62c741f16b6599dbc97a86e076cd5af7c93c264cf94ee4ab5570c7dc268ff50076372a8ffceeed4d0731b6b88757f9c
-DIST kernel-aarch64-fedora.config.6.1.0-gentoo 253136 BLAKE2B d9b56f81336b532559590e64960623eb124a42aeb701c037da0b4c412bcc847c51715f8cf9dfe8b5879dec3c4a44ff592cc4383fcba9bba36ee04205d6417e75 SHA512 48789b44755c3f43239e7e0b30a4be45cff398e20dabacbfa253987fa602d9c9b2e86d1d51795757d583ab704adace455099e22c7b8297a7ed19b119c7425b3c
 DIST kernel-aarch64-fedora.config.6.1.2-gentoo 253196 BLAKE2B 92483220cb6820926478ed830d14c156d2c51e16eaf1bf05699958e23374dd61f38b2aa9c8385eb8aed0a00a4cd3b1d9373aa2d5f851f1cc13cf3c68932c9907 SHA512 09ce9f3f2b11361e4a641cfe95ff89098d2c8fa97957e1b74a1a7ae6db72cbe400593a498c10ff175be98fd506292cf25c8f315719b4d6cb7f72047746126d12
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.6.0.8-gentoo 225904 BLAKE2B 4ff7e1866d3a76b34e462a20d539ea0a9a588b3588c222c1b17737414c7e883f68095959d68e374819a1e14079e410fa049cf6d264bd4995299299275de95b5b SHA512 6c518d1dd2130dfcb8001d97df66dd10cdc55e6e4d7a751d9a01978d2c47735a63a9c4e04e42965484ecff42255aa82f7d6725f018b0436140511ca6b4b7bc6a
-DIST kernel-i686-fedora.config.6.1.0-gentoo 228266 BLAKE2B 63759e0111877d4ced283970909904a581d75fa71d5e0e0d5afc0ff426c67a6c334b23986c22eece9e8a000bbb277877a9e8791f2c76801ce6f3a285b470a2e8 SHA512 3bda0cf66427130bf4c66323e0ef575561d5b7fe2d4097a4fcc42d41e38cf2aa9a50f884ea7cf06f2270b1dd08a44a8367e9aed068dab087ccd7aa76d91cdd4b
 DIST kernel-i686-fedora.config.6.1.2-gentoo 228267 BLAKE2B 51c15ad3d0371212c94e3e79832df10f845e242ec3ed7d1e8cee1d00b467d1892454b9c10f83c53e271a40952fa69678b3ede74133d330df2f28bbcbf1afaa62 SHA512 09309d861c15e9b2ba10ccac60679bc0fbf1b9625f78de640b0d7914472b3cfcd8b34f996c399de3e31d86c5bdb1dd394005986a317d24b04dc2e82188735f74
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
 DIST kernel-ppc64le-fedora.config.6.0.8-gentoo 215817 BLAKE2B 75cb973385e1580b5d3b03762db6ad830e1cf2d6748a5f2591a0296d98c6e3fb9f3730c333e3dc85c8b06ebac41716a3e762e3b612017dbf7db75c7e4bc90872 SHA512 a568e97367927fb5e390ff7d30eba9b27ef27c89f8a20c02919589b8098205d94970685e386ca559b9d92898dd75a3a34b4113426dd2fa95bb025de284573a5a
-DIST kernel-ppc64le-fedora.config.6.1.0-gentoo 218534 BLAKE2B 93e252ec2360cd61666be36a4154619a54536a55bbc45ee5b938deedbb859e2a28edf73876bf65bba5234b72f5dcbd4471cb7b70674021f78156762d3c1ab719 SHA512 efaf13a73dbf9426a4f696ade2e009a77b80873b59549c098fbd913bec9ea91c2e636564e0a99dda520d044d61c2aef65ad7bf6faf18643584263ba07584e85c
 DIST kernel-ppc64le-fedora.config.6.1.2-gentoo 218535 BLAKE2B 2655ce32ab464eaa18b9fa10355b39cbbafa425c99ce78381d443783f06dee6c836b16d9f870cfce09deac5c4022aff76e1921a34fb377036731fb0b577c7792 SHA512 7c0c2a83236f98fa63778b581d6498fb9321312730c68640f6c00a17294142f01c09ece7df8b623d73c0bf04b32b62339dba832ef7fd43f8e2a4b6b0432d5bf8
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.6.0.8-gentoo 226579 BLAKE2B 61661976712081684f28daf26559b489f1e9e0bae749c2ab19f8de7154c86408791fc5333ff589b277fe060bf44edf02b525f0233e44fdcb3c90e519b51f6fc9 SHA512 5dc327afaa87e51330881f5f8b1b83d7cad360626744023fe98146390c8a745da00f60c6f7363e594eee87bc4dc27970af88e9e31a415267b0d2752bea8ca08d
-DIST kernel-x86_64-fedora.config.6.1.0-gentoo 228930 BLAKE2B 947829257514fd7e5bd819cc008b096bd5d8fb23c5cc32fe7f27074b2d7b19cb4bdbd11ce00f6f300f53ae66ab792f443d702309a23771eca23b85d94706a114 SHA512 ab85c5111270537cd6351589720439e3aba6d9ec6c6fa2f81d353101362a2b9468727c555df9902d93aa67d91a42604d05e127f040bdc17325d67f7b83f6ee25
 DIST kernel-x86_64-fedora.config.6.1.2-gentoo 228931 BLAKE2B 9cecffddfc2799acbd2a1f4119fe41f0b591be4d8ac40c673e8d53c42e9d03f8b43656b679bc723011b77237369314ecadfc4f25d28ac81249dc0582d33ccc3e SHA512 501942a4c1362ae9ebdf55737792c65fd6f94daf6744ca7535a2c4fd5212f883f43911743486b90637eb49abaeeeec6d9ffe6ad07606e66c59296dab58f516f9
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.tar.xz 116606704 BLAKE2B b923d7b66309224f42f35f8a5fa219421b0a9362d2adacdadd8d96251f61f7230878ea297a269a7f3b3c56830f0b177e068691e1d7f88501a05653b0a13274d1 SHA512 95bc137d0cf9148da6a9d1f1a878698dc27b40f68e22c597544010a6c591ce1b256f083489d3ff45ff77753289b535135590194d88ef9f007d0ddab3d74de70e
@@ -70,22 +40,10 @@ DIST linux-5.4.tar.xz 109441440 BLAKE2B 193bc4a3147e147d5529956164ec4912fad5d5c6
 DIST linux-6.0.tar.xz 133886176 BLAKE2B c09a9c877ac0fac83dc31d2d04d96f0a3331d4ed78e3ad4edfd4dc077e1c11d0c49f419fdac4008b5c93d1b09c2b724e12ef0b38371ad0962908abf85dfa95fa SHA512 bac41a7aeb6e809616cee2f13dcd1c45e829dfd1ccf60aee1dc4c46b1e28532f4485c7d819a32940de84fdfbf89db80a4e919bce8a74b2948c5a01551771b714
 DIST linux-6.1.tar.xz 134728520 BLAKE2B ae60257860b2bd1bd708d183f0443afc60ebbd2b3d535c45e44c2e541bd0928530a3b62de6385dd4e4726ebbedcc0a871d4f3ffb4105b9f1f6d8ed7467f5688e SHA512 6ed2a73c2699d0810e54753715635736fc370288ad5ce95c594f2379959b0e418665cd71bc512a0273fe226fe90074d8b10d14c209080a6466498417a4fdda68
 EBUILD gentoo-kernel-5.10.161.ebuild 3596 BLAKE2B 862e8da83e0e335ac202ea0d0d4107062b203ed4d6e1f438a8cb860649dba325082935cea6f4d08f92648cd206d67f13600ed24f7849f10dbadd1457a2f69ccc SHA512 b7d09fe2b0b1a46916bbd61f613e1da08ad7a12f48e0c0b408850224e58c07382e23cd964d31f33a89541a56be4a21543fecc86cca065dca0f60f21235a6b90f
-EBUILD gentoo-kernel-5.10.162.ebuild 3602 BLAKE2B 459521aac4185ff8b5b26dce3aa62379c286d311553b4f77d5057fc7d869ec7e0c50df0e396780560dd21b57154db15b26635ed61b113b74b385a1816377c245 SHA512 a4ab5da22f2c2aa78c805a1d4cba5a7de53d22c247a0b0c603c2885e42241a365c6a611669ac57a2315fe17058b4e07473cfc3d43661bd021f8c6ceda570c693
 EBUILD gentoo-kernel-5.10.163.ebuild 3602 BLAKE2B 660624358ac35a6a9caeea29406af4bc093d13054a6ddf5cf7be868b3cb32f5bd27e30ef3d5b4a1b5d19ac06c85e34fd43ab3f9509e3bd486dc70d398f3cc154 SHA512 38d738d5ac3ba627541b665e442077a20aeda89f7656505435a3e21c275c25fd3b004c2266407c0cbe52799a400f4ec083923d28c0c33f2e84e13734fcd3017d
 EBUILD gentoo-kernel-5.15.85.ebuild 3593 BLAKE2B ca333666fe35d2df100f147f640f88ac514169bf66560f5f13640de7415899756eb7ed172a577742dde903ec1530788411fbdade882eb495a3f83dbbc61a6bf2 SHA512 12d96643b5e0f1b99535fc4de43475b85ce7533d0034bf12df653e49570262ba9df8cb82ff71ac4b99ad927e0dd1c3ab408319f25bc194313cc766f7ce6bf6b5
-EBUILD gentoo-kernel-5.15.86.ebuild 3599 BLAKE2B ce2f332e14d6420a0ce635a8f1ea29788e46f385b7aef0fd7f86b2358c66574ea9e713927df98ae3e95b37ef0cf321cc4325bd1e8ad3a0da128d8942097286c9 SHA512 bc805c80743ad1ce74a09910c234e3ceddd6ff333eafc0babc7ff9ac7ba44ddc09d2c9e108a74b3223e6677eb77f91fe832b58f25e82a204a4adf8cc85517dec
-EBUILD gentoo-kernel-5.15.87.ebuild 3599 BLAKE2B d46271e5a7f13133b586dc6d386fbe809803f149bcc6b89827db8dfd46ef02ac386cd9301165787454127c41e5b003d5754bf59683afa7c9e89c7d79271192b5 SHA512 9b19c0923e459d55a2808bb0ee0af5b21b14a119538149cde61120bbaf9e3b65166e8ec65fb37d48025fbcac8c96b106e1e7b09ea1a8024f5cdd64a96f8f0577
 EBUILD gentoo-kernel-5.15.88.ebuild 3599 BLAKE2B d46271e5a7f13133b586dc6d386fbe809803f149bcc6b89827db8dfd46ef02ac386cd9301165787454127c41e5b003d5754bf59683afa7c9e89c7d79271192b5 SHA512 9b19c0923e459d55a2808bb0ee0af5b21b14a119538149cde61120bbaf9e3b65166e8ec65fb37d48025fbcac8c96b106e1e7b09ea1a8024f5cdd64a96f8f0577
 EBUILD gentoo-kernel-5.4.228.ebuild 2797 BLAKE2B bf6bb6f68e1a7458389c1a488dea8c8b5528eeacbfcba30371278eaa40961aa74fffeba292d8ee806e8c8f6057f2debc61010e3b32cbcfddfd515d8dc68da8ef SHA512 e1674ab6bd781577b805e1494dbeb43fc6b36c36e7605ba172f4324330488e7c6e81c6dac8080ba54f1b17705d02e23e895f3e34e2ca5d69b89d5b440906445e
-EBUILD gentoo-kernel-6.0.15.ebuild 3856 BLAKE2B 48a2e0b820e22cf8e12dd4b4b7ebb454c414f5077c6f9d5df417dacd915309ebb88becb225abd84fd2141e8b72435ad8411b1bb4766a97727073345abf94e860 SHA512 05e23e285445816dd8e23d5879f6a51e5640af55fac1d38129ac6dcad290b96b179fadc8e87a170d8c2a54969ec3ce05544607048a579604aa0d74b4589f93da
-EBUILD gentoo-kernel-6.0.16.ebuild 3858 BLAKE2B 6431c930908b4ee1ac63c6a792a9f227122ca5822d4cfa76825c6b2b0ce2e22daabf3e29d885ab5cc0cd8cd56f49df82fe20fcb0bd38ca274ddcedadf5420db5 SHA512 edda364adf40995b1ba2ac3b158aba4216e859ec1d09ed0d593092d3d4986f06ee3bd3f13356a0397ce0bef555b494e6202bed857f3be03d65039e330f3e6277
-EBUILD gentoo-kernel-6.0.17.ebuild 3858 BLAKE2B 291aaaf9a78524b1cf11e45e2706920780fc6370fdcbeae84ddd53045b226b4a96b87e1330db4d659e3e8d50a0df133f9fad5e7a30b842899bb71b02578961b4 SHA512 6c3f195f4c1bf3e254cb05fc11c1077f93e776e728f93c913a9012ddc2ff133a85510d2ec26addd1a4f8c9664710835e177d6a217f8f13ef80019f60e6d1d4b8
-EBUILD gentoo-kernel-6.0.18.ebuild 3858 BLAKE2B a87ca9d6e55673b964b083daa6f65ac2d5631688869941eb9ff8a54f14fd433fad3991cb6a34756118241658220a1425afb43569295ef9066a862f9bf516b1d4 SHA512 d164d4cf107833865cc10d7ab33d8c5b8b58ff9bc1cf85bd3c57fd966107b0ad8d9d102a2700fd86471439df59a6b4b7a5f649ee99545b7b22fb17a1bf4acfa9
 EBUILD gentoo-kernel-6.0.19.ebuild 3858 BLAKE2B a87ca9d6e55673b964b083daa6f65ac2d5631688869941eb9ff8a54f14fd433fad3991cb6a34756118241658220a1425afb43569295ef9066a862f9bf516b1d4 SHA512 d164d4cf107833865cc10d7ab33d8c5b8b58ff9bc1cf85bd3c57fd966107b0ad8d9d102a2700fd86471439df59a6b4b7a5f649ee99545b7b22fb17a1bf4acfa9
-EBUILD gentoo-kernel-6.1.1.ebuild 3856 BLAKE2B 053fbd428449390254dffbd2daee8feb629267ad2574ba50d5175e0ff47ab9397177d4cf6dca52d5d0ee64566d893b40856e79c9458905473e7cd9c49b8dcd9a SHA512 6bcd472d946d50755f9a36b837f3eb66e2298a0bceb90cd2e07a5dfdeb53a45620d5de10dfa1147931cec3b471b91b9132efcf01691cd6e2d56d2e48b494280c
-EBUILD gentoo-kernel-6.1.2.ebuild 3858 BLAKE2B 6677b42cca4a9bac82aa3a79b1941a030bc4a87127ddc163fdb7c466f4fac1908de8ed29f9fdc6a514bcb8501a76b02d15401b99a3f384dc678df8254b257ff8 SHA512 0c442183148d7476d937eef32d3a73f4e30d6deb21848676482c658c9d7e4fe7f7fe2bd4d0806becce56984a7eac8b44a3b11271a75e5ef68cb5299cd85a44a1
-EBUILD gentoo-kernel-6.1.3.ebuild 3858 BLAKE2B 63d21385de7511c8e4a58104dfb5c50a0be41f394646f2d27e1a777ad3f3900281c42c479c937afd49e06b06100e74a282b5dc8d2b164b8772e3e5b656bd575b SHA512 4461d3423e0b4b9c30eb3442c16562557017f1d1dba6c090719f34dd9297fe1841e9405dbe327eddcb1b008269e2d0485ed6dbb8af47201f409eacaebdb72762
-EBUILD gentoo-kernel-6.1.4.ebuild 3858 BLAKE2B d91f7156ce98a26392ec6df1ea85bc09900b6d52bc31d3a72b55cb96b3384be437bccb8ddf828570c0144470202e821142df8238014b9f7e7fbd2dead699a911 SHA512 e057c29925a106414a521bc879975821ede5dfa78cf05fc32094858aa4fdc7c5a11abda5f6c228773da11d34c0d41833d5fcea6f3f16ecfecdc1fcceb7979e1a
-EBUILD gentoo-kernel-6.1.5.ebuild 3858 BLAKE2B a21f1ffd668d8ecbcde8b7d240de6e881779b50a2c85360ff32c8b76786b491f2dce9c52aa245c832c0b4e8b1621288952f821cc4777bde6068b977e56159c4d SHA512 7cc0e69f210cc9d1112959af8bbd47ce47cf85fe292dd705cb54c938348aeb0831204d76b87820057e39dcda115190a80c6d23c79e9605dab36dd53d827063ca
 EBUILD gentoo-kernel-6.1.6.ebuild 3858 BLAKE2B a21f1ffd668d8ecbcde8b7d240de6e881779b50a2c85360ff32c8b76786b491f2dce9c52aa245c832c0b4e8b1621288952f821cc4777bde6068b977e56159c4d SHA512 7cc0e69f210cc9d1112959af8bbd47ce47cf85fe292dd705cb54c938348aeb0831204d76b87820057e39dcda115190a80c6d23c79e9605dab36dd53d827063ca
 MISC metadata.xml 465 BLAKE2B ea1260a1638588a48d9dd776e9eabd9730a181af8416ba778c936fa2e80a2360be146d3cc80599e50e0a72ac709eb9538184aac87cb96528e445ed450e34f4af SHA512 c7b7b1a45fb7082b8d8d66cf5a387cc4f7207cd9488d1d5e1d6900f1e4147aa9290b5522a94d941a885f1599b5df2482b529e40912d2b2cff400ecd4b1704c41
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.162.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.162.ebuild
deleted file mode 100644
index 547fe7615a81..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.10.162.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 9 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=g4
-
-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.15.86.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.86.ebuild
deleted file mode 100644
index 4ea02f952baa..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.86.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##*.} + 4 ))
-CONFIG_VER=5.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-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
-	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
-"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.87.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.87.ebuild
deleted file mode 100644
index 635cf489ceca..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-5.15.87.ebuild
+++ /dev/null
@@ -1,131 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 4 ))
-CONFIG_VER=5.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-GENTOO_CONFIG_VER=g5
-
-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
-	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
-"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.15.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.15.ebuild
deleted file mode 100644
index 595ff3e75b7e..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.15.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##*.} + 0 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.0.8-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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )
-	hppa? ( savedconfig )
-	riscv? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}
-"
-BDEPEND="
-	debug? ( dev-util/pahole )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-QA_FLAGS_IGNORED="
-	usr/src/linux-.*/scripts/gcc-plugins/.*.so
-	usr/src/linux-.*/vmlinux
-	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
-"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		riscv)
-			return
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.16.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.16.ebuild
deleted file mode 100644
index 8dad214e738b..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.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##*.} + 0 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.0.8-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-6.0.17.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.17.ebuild
deleted file mode 100644
index e4664663f6a9..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.17.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 0 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.0.8-gentoo
-GENTOO_CONFIG_VER=g4
-
-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-6.0.18.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.18.ebuild
deleted file mode 100644
index 903909222242..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.0.18.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 0 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.0.8-gentoo
-GENTOO_CONFIG_VER=g5
-
-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-6.1.1.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.1.ebuild
deleted file mode 100644
index 090967536549..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.1.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##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.1.0-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/~alicef/dist/genpatches/${GENPATCHES_P}.base.tar.xz
-	https://dev.gentoo.org/~alicef/dist/genpatches/${GENPATCHES_P}.extras.tar.xz
-	https://github.com/projg2/gentoo-kernel-config/archive/${GENTOO_CONFIG_VER}.tar.gz
-		-> gentoo-kernel-config-${GENTOO_CONFIG_VER}.tar.gz
-	amd64? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-x86_64-fedora.config
-			-> kernel-x86_64-fedora.config.${CONFIG_VER}
-	)
-	arm64? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-aarch64-fedora.config
-			-> kernel-aarch64-fedora.config.${CONFIG_VER}
-	)
-	ppc64? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-ppc64le-fedora.config
-			-> kernel-ppc64le-fedora.config.${CONFIG_VER}
-	)
-	x86? (
-		https://raw.githubusercontent.com/projg2/fedora-kernel-config-for-gentoo/${CONFIG_VER}/kernel-i686-fedora.config
-			-> kernel-i686-fedora.config.${CONFIG_VER}
-	)
-"
-S=${WORKDIR}/${MY_P}
-
-LICENSE="GPL-2"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-IUSE="debug hardened"
-REQUIRED_USE="arm? ( savedconfig )
-	hppa? ( savedconfig )
-	riscv? ( savedconfig )"
-
-RDEPEND="
-	!sys-kernel/gentoo-kernel-bin:${SLOT}
-"
-BDEPEND="
-	debug? ( dev-util/pahole )
-"
-PDEPEND="
-	>=virtual/dist-kernel-${PV}
-"
-
-QA_FLAGS_IGNORED="
-	usr/src/linux-.*/scripts/gcc-plugins/.*.so
-	usr/src/linux-.*/vmlinux
-	usr/src/linux-.*/arch/powerpc/kernel/vdso.*/vdso.*.so.dbg
-"
-
-src_prepare() {
-	local PATCHES=(
-		# meh, genpatches have no directory
-		"${WORKDIR}"/*.patch
-	)
-	default
-
-	local biendian=false
-
-	# prepare the default config
-	case ${ARCH} in
-		amd64)
-			cp "${DISTDIR}/kernel-x86_64-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		arm)
-			return
-			;;
-		arm64)
-			cp "${DISTDIR}/kernel-aarch64-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		hppa)
-			return
-			;;
-		ppc)
-			# assume powermac/powerbook defconfig
-			# we still package.use.force savedconfig
-			cp "${WORKDIR}/${MY_P}/arch/powerpc/configs/pmac32_defconfig" .config || die
-			;;
-		ppc64)
-			cp "${DISTDIR}/kernel-ppc64le-fedora.config.${CONFIG_VER}" .config || die
-			biendian=true
-			;;
-		riscv)
-			return
-			;;
-		x86)
-			cp "${DISTDIR}/kernel-i686-fedora.config.${CONFIG_VER}" .config || die
-			;;
-		*)
-			die "Unsupported arch ${ARCH}"
-			;;
-	esac
-
-	local myversion="-gentoo-dist"
-	use hardened && myversion+="-hardened"
-	echo "CONFIG_LOCALVERSION=\"${myversion}\"" > "${T}"/version.config || die
-	local dist_conf_path="${WORKDIR}/gentoo-kernel-config-${GENTOO_CONFIG_VER}"
-
-	local merge_configs=(
-		"${T}"/version.config
-		"${dist_conf_path}"/base.config
-	)
-	use debug || merge_configs+=(
-		"${dist_conf_path}"/no-debug.config
-	)
-	if use hardened; then
-		merge_configs+=( "${dist_conf_path}"/hardened-base.config )
-
-		tc-is-gcc && merge_configs+=( "${dist_conf_path}"/hardened-gcc-plugins.config )
-
-		if [[ -f "${dist_conf_path}/hardened-${ARCH}.config" ]]; then
-			merge_configs+=( "${dist_conf_path}/hardened-${ARCH}.config" )
-		fi
-	fi
-
-	# this covers ppc64 and aarch64_be only for now
-	if [[ ${biendian} == true && $(tc-endian) == big ]]; then
-		merge_configs+=( "${dist_conf_path}/big-endian.config" )
-	fi
-
-	kernel-build_merge_configs "${merge_configs[@]}"
-}
diff --git a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.2.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.2.ebuild
deleted file mode 100644
index 9b9df2d2f7d4..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.2.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##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.1.0-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-6.1.3.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.3.ebuild
deleted file mode 100644
index 65637895043a..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.3.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.1.2-gentoo
-GENTOO_CONFIG_VER=g4
-
-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-6.1.4.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.4.ebuild
deleted file mode 100644
index f41dbd4530d6..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.4.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 1 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.1.2-gentoo
-GENTOO_CONFIG_VER=g5
-
-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-6.1.5.ebuild b/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.5.ebuild
deleted file mode 100644
index 3072f5949bd6..000000000000
--- a/sys-kernel/gentoo-kernel/gentoo-kernel-6.1.5.ebuild
+++ /dev/null
@@ -1,137 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs
-
-MY_P=linux-${PV%.*}
-GENPATCHES_P=genpatches-${PV%.*}-$(( ${PV##*.} + 2 ))
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.1.2-gentoo
-GENTOO_CONFIG_VER=g5
-
-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/vanilla-kernel/Manifest b/sys-kernel/vanilla-kernel/Manifest
index 024848ea6368..a9bafda472ee 100644
--- a/sys-kernel/vanilla-kernel/Manifest
+++ b/sys-kernel/vanilla-kernel/Manifest
@@ -1,94 +1,53 @@
 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 gentoo-kernel-config-g4.tar.gz 4459 BLAKE2B 8a481315e427c2da5d14847bfa00e7904aec8cbe6dddde504bc4ce016a19b8c9f67d09dd1bc2f6feea22368b91555a74a045ae1d0f9aa1395616f008e74dbdc5 SHA512 c4b1d3a67cf614f0f9c0af4adaa23d97c0e91b467a1e69f88a0994760c187bfb403fffc0a5fdeb09f9fc4af849013f7f993cd55a8a4a82ba32309475f09deef5
 DIST gentoo-kernel-config-g5.tar.gz 4503 BLAKE2B 165733068786f274ac3bec94e0e29a10992f5a1b188970b2f7195348bb98ddcbd5d4dd45131b00d41c6bfd0bdfdaff1069debdbac560f92b9d62d30812d830df SHA512 565f6a35b534ee2e34e05769c95ac532aa6cb8e27073aaa8292fa3d19af8329f812e8a2d2c5c2696ac0fc28858e4461cde1644d0499f2563de43903b7043f386
 DIST kernel-aarch64-fedora.config.5.10.12 223184 BLAKE2B a0246dac2f7a4ad6a55b611538d24382ac87a8960077811a859c9595ac67f961b4bccb7e139a89abc7c0e26e80832da5c94211fc658082f2e7dde984f14dd29d SHA512 7d803b347b136331db1ad6e22e0445fe0224c3e26cd7c034cbe9794915d457b492e05f77664865079874ec001351553652646e2e08d0fee31e30b841b0008f52
 DIST kernel-aarch64-fedora.config.5.15.19 242615 BLAKE2B 94e59440681535e38137b71814e1ae53f57a347f62cf31e0c1c8571ae43d9ae9be9957743c8cbc9ec74850c964eaabefe6799a28bc311ea7b99ee31391b47fb1 SHA512 fb77d3b73a215f97d70cd6d8c96ed20e497786b99ed7d7a7f2ed60cc1251289c1a4c7e058c41b5efac62e4a9b4b3d917dbdb11585955bba2b6584981430f4ddb
 DIST kernel-aarch64-fedora.config.5.19.13-gentoo 246842 BLAKE2B 4a824d02999749a0404437cae28721576511e06a5eaa9ebb1b1479c74e2b54402c440be7ea9159bf304661d4baaa5381c36b266ac0bba0b9bf3820eb04c6e4e0 SHA512 8862cf24b177ef3871f118712ceace2b496b04a488b045bbe3d83ab22942f064995486f5534630321faaa96ce60e5f237c4ded24a5468bea6e365aa3ea9f09c4
 DIST kernel-aarch64-fedora.config.6.0.8-gentoo 249703 BLAKE2B d62624ff7072694a5ad98084925fbc892ac381fec0fce0aa01309df06ce9f115b0aaecf578a3e2ce6e6c3b25de9fe14d0c5b4ec2182fdf21dff30ed393ebbd8a SHA512 dc7d2aaa191f0ee2a61b563716c60dd1d62c741f16b6599dbc97a86e076cd5af7c93c264cf94ee4ab5570c7dc268ff50076372a8ffceeed4d0731b6b88757f9c
-DIST kernel-aarch64-fedora.config.6.1.0-gentoo 253136 BLAKE2B d9b56f81336b532559590e64960623eb124a42aeb701c037da0b4c412bcc847c51715f8cf9dfe8b5879dec3c4a44ff592cc4383fcba9bba36ee04205d6417e75 SHA512 48789b44755c3f43239e7e0b30a4be45cff398e20dabacbfa253987fa602d9c9b2e86d1d51795757d583ab704adace455099e22c7b8297a7ed19b119c7425b3c
 DIST kernel-aarch64-fedora.config.6.1.2-gentoo 253196 BLAKE2B 92483220cb6820926478ed830d14c156d2c51e16eaf1bf05699958e23374dd61f38b2aa9c8385eb8aed0a00a4cd3b1d9373aa2d5f851f1cc13cf3c68932c9907 SHA512 09ce9f3f2b11361e4a641cfe95ff89098d2c8fa97957e1b74a1a7ae6db72cbe400593a498c10ff175be98fd506292cf25c8f315719b4d6cb7f72047746126d12
 DIST kernel-aarch64.config.5.4.21 199104 BLAKE2B 578ad451a76204df2a9bbbe34b5cb27051d2ac5e2c33967f562b01338c43f35da6dc33a4c2cc67ea6c3b32b155729360d3748ec28dcaa750f18449245b2e8a09 SHA512 66e9a437beb350fdc59512c17b8f72c5b5bfacf2b35070d810d77e66f49cf7929026cc28ad44b04a016d61e65d9fb4a10af6996ba09b604bf97e9c467d08f8ff
 DIST kernel-i686-fedora.config.5.10.12 205412 BLAKE2B 92c715b7e2cd7dd74da7970c05981f520597d3e403ce82c8cf4eee31c9f1f50b638792a6bdb256ef5bfdc99f1bcd594e819e8f44dc6febb2ad9a854bad817f2b SHA512 69d8db11723ae1b40fdedfaace74d15bb63198cdb0485e0a1e5eba95b31217110c93a93e39cc7370cf45f1d3a8bc7f75ec096d6db5ea9ecb28ac6b56702ebb10
 DIST kernel-i686-fedora.config.5.15.19 222233 BLAKE2B 9e0f4dd37058f59610e46a87d3165039e76299d3c186fbfc3312101bac1b8b198de404075f5bbc6f5e2ba04cfd45f9d02bdf94b01c3ed11b9275f37f11ee7617 SHA512 49ffc39de86763e707a5c0c07c1367d34e9249615f29fdf97904d7b61a375a86fc4ba37a2f02b5f61e4c76ad65d9ba12716d2523af6faa003f6336d7ae61a953
 DIST kernel-i686-fedora.config.5.19.13-gentoo 223571 BLAKE2B d56f8e019b0c58023b08ee358a9af46679ca0f734c075ba6cd65dd6e3277640c0b7683e5707c48f687644d815a3840eb58351c0dee84fe9ec1dcea525fb2e1e8 SHA512 0d9fa0592b6a9414f2967677c048a9e014a0e0d43274eea4fe10f8099befae7389bbcd033f4fb36c7c44bd30c2fb197e860151e27c10dc354fe9a86a8bb65e94
 DIST kernel-i686-fedora.config.6.0.8-gentoo 225904 BLAKE2B 4ff7e1866d3a76b34e462a20d539ea0a9a588b3588c222c1b17737414c7e883f68095959d68e374819a1e14079e410fa049cf6d264bd4995299299275de95b5b SHA512 6c518d1dd2130dfcb8001d97df66dd10cdc55e6e4d7a751d9a01978d2c47735a63a9c4e04e42965484ecff42255aa82f7d6725f018b0436140511ca6b4b7bc6a
-DIST kernel-i686-fedora.config.6.1.0-gentoo 228266 BLAKE2B 63759e0111877d4ced283970909904a581d75fa71d5e0e0d5afc0ff426c67a6c334b23986c22eece9e8a000bbb277877a9e8791f2c76801ce6f3a285b470a2e8 SHA512 3bda0cf66427130bf4c66323e0ef575561d5b7fe2d4097a4fcc42d41e38cf2aa9a50f884ea7cf06f2270b1dd08a44a8367e9aed068dab087ccd7aa76d91cdd4b
 DIST kernel-i686-fedora.config.6.1.2-gentoo 228267 BLAKE2B 51c15ad3d0371212c94e3e79832df10f845e242ec3ed7d1e8cee1d00b467d1892454b9c10f83c53e271a40952fa69678b3ede74133d330df2f28bbcbf1afaa62 SHA512 09309d861c15e9b2ba10ccac60679bc0fbf1b9625f78de640b0d7914472b3cfcd8b34f996c399de3e31d86c5bdb1dd394005986a317d24b04dc2e82188735f74
 DIST kernel-i686.config.5.4.21 183910 BLAKE2B 185126ffb85718bb73761d01683def80b6f002d7a7a6eddd8e858a30d8eadc863fb378d83a1cd2ed82b3540337fa66ae44475e31fb41ebc46d77005b6f54e5c0 SHA512 6307afc2295902e44fe65b1cccaa7a0260b295a5f21f1d67ec66197bd972bd3f5675b624f08d9da8b224cb3ec987d5c21cbd743599aeab9ac6214bc651f43476
 DIST kernel-ppc64le-fedora.config.5.10.12 192105 BLAKE2B 889141debb0656a358a3381bae14b5216b982acdfce0bc758f9445c16647807a68a788fb290199c2a1a23627bda1ef4c9405b3f5ac2a4176d1d2b55c71fb7db9 SHA512 3ab0f1401d9f50a61477c71369dede438f575d9d2c3a2f5c2cf36d624c2b59a938efca9c981b075511b3860c983eaaf5e5a9f877d659277f09ceba45edd43770
 DIST kernel-ppc64le-fedora.config.5.15.19 213339 BLAKE2B db6bbc9f402b8b48a2441e39d1a78dc112656ae842bc5594065cfd2ec3f6d462e4bde200e8736a70192af35fb3a5d1fc42683783a5b7620881f3a95bb0bc5f4d SHA512 b43439c24be8fa8bdd17d4c0beece799544ae45b2c289f0202fa5eb7a52dce0165a0cbc924b0decf877582af9688efd675cbfbd2313ff85fcc2c8563bba4b1ad
 DIST kernel-ppc64le-fedora.config.5.19.13-gentoo 213984 BLAKE2B 9abc1d2e03bb34908019dbbc4e54d3d176acddca6e7af72fe73461e60eb249486c4e8a81bfe2515849aa26939d9abef5e981deeaa55605b34bb59552cd3444fe SHA512 d857ce4178950a96ff029c3c9870211424e1c5e95dfef88d25d6d1d517493a6fd95d9d398f42b8a6cf72482b07789be38f674dd4a2b9855da57c8391b0c2708d
 DIST kernel-ppc64le-fedora.config.6.0.8-gentoo 215817 BLAKE2B 75cb973385e1580b5d3b03762db6ad830e1cf2d6748a5f2591a0296d98c6e3fb9f3730c333e3dc85c8b06ebac41716a3e762e3b612017dbf7db75c7e4bc90872 SHA512 a568e97367927fb5e390ff7d30eba9b27ef27c89f8a20c02919589b8098205d94970685e386ca559b9d92898dd75a3a34b4113426dd2fa95bb025de284573a5a
-DIST kernel-ppc64le-fedora.config.6.1.0-gentoo 218534 BLAKE2B 93e252ec2360cd61666be36a4154619a54536a55bbc45ee5b938deedbb859e2a28edf73876bf65bba5234b72f5dcbd4471cb7b70674021f78156762d3c1ab719 SHA512 efaf13a73dbf9426a4f696ade2e009a77b80873b59549c098fbd913bec9ea91c2e636564e0a99dda520d044d61c2aef65ad7bf6faf18643584263ba07584e85c
 DIST kernel-ppc64le-fedora.config.6.1.2-gentoo 218535 BLAKE2B 2655ce32ab464eaa18b9fa10355b39cbbafa425c99ce78381d443783f06dee6c836b16d9f870cfce09deac5c4022aff76e1921a34fb377036731fb0b577c7792 SHA512 7c0c2a83236f98fa63778b581d6498fb9321312730c68640f6c00a17294142f01c09ece7df8b623d73c0bf04b32b62339dba832ef7fd43f8e2a4b6b0432d5bf8
 DIST kernel-ppc64le.config.5.4.21 172003 BLAKE2B b53887cb44f7c378cb3866780f8e556e19fdb02130d3b0df01d97698d2a91f7d90a200012559f288e962935742c3fdb67dfb6711876fad37862fe55cdca5b5f6 SHA512 82df8d0be47e9eb20bd7db570539bb061d0b6e2101dc78a54596cf4d0b4e0c536041449304ff9240b051ee09b342ea336c5645e9a3b66a5dfb96d7778ff86008
 DIST kernel-x86_64-fedora.config.5.10.12 206357 BLAKE2B 0eda9d4f3f973336cabd67c1ac78f100aabde926354743e8dcb7ff84496f0de49210d45f99bc850a2096078b0b4687aa7fd965d999248559506004f2b29dac0c SHA512 b12f43d3c1a52a4915cd73db98874ce9ae6c425672c0f1c19ed1b1101341c868ebf1c9620bef5449752ec0d7342c1ce38fb77779d0f89b9267096a605ebf7a26
 DIST kernel-x86_64-fedora.config.5.15.19 223286 BLAKE2B 239995703c01dcb6d179133dd115bc0a57872c07d7a08afaf4d92cf6d78f0c17b19487b5b399ac7fdde5d460fa7931628147817a569fef2c3a62951c96054bdf SHA512 9bee4aff7e5ef4ada57bee7496aaf47b8fdd5c936c4c9b580660d130db0678eaecdebdbcab0dfcaf5c17a71f6419069840db10f5886806b6fc810f8a3619554f
 DIST kernel-x86_64-fedora.config.5.19.13-gentoo 224246 BLAKE2B 6dd95fc7a8bd38387a3bfd6c00733220b34091961c8437cdac61e4376de8b35529808f3b8e2db91c1a0c90e1115395df153f94107e6f9884a61bf646cb40d25e SHA512 1393e6315581a4934a35f3e66146d014ad154025fbc71245bd4b6e7639952387449b69df41605df8590a4d363a5aab5111b442b1a9f56b4d2996ca416f7e5c23
 DIST kernel-x86_64-fedora.config.6.0.8-gentoo 226579 BLAKE2B 61661976712081684f28daf26559b489f1e9e0bae749c2ab19f8de7154c86408791fc5333ff589b277fe060bf44edf02b525f0233e44fdcb3c90e519b51f6fc9 SHA512 5dc327afaa87e51330881f5f8b1b83d7cad360626744023fe98146390c8a745da00f60c6f7363e594eee87bc4dc27970af88e9e31a415267b0d2752bea8ca08d
-DIST kernel-x86_64-fedora.config.6.1.0-gentoo 228930 BLAKE2B 947829257514fd7e5bd819cc008b096bd5d8fb23c5cc32fe7f27074b2d7b19cb4bdbd11ce00f6f300f53ae66ab792f443d702309a23771eca23b85d94706a114 SHA512 ab85c5111270537cd6351589720439e3aba6d9ec6c6fa2f81d353101362a2b9468727c555df9902d93aa67d91a42604d05e127f040bdc17325d67f7b83f6ee25
 DIST kernel-x86_64-fedora.config.6.1.2-gentoo 228931 BLAKE2B 9cecffddfc2799acbd2a1f4119fe41f0b591be4d8ac40c673e8d53c42e9d03f8b43656b679bc723011b77237369314ecadfc4f25d28ac81249dc0582d33ccc3e SHA512 501942a4c1362ae9ebdf55737792c65fd6f94daf6744ca7535a2c4fd5212f883f43911743486b90637eb49abaeeeec6d9ffe6ad07606e66c59296dab58f516f9
 DIST kernel-x86_64.config.5.4.21 184907 BLAKE2B 0eb2b07c14cea7545350fcdf3a94f2a531f0137c502ebda9299cacf44da5385686e2049b480b28bc153c9d413d453cfe682b9655eefe70428cb720f57c7bd200 SHA512 f3b3ee6841555ac3a9cc11536a7d44e1a5a8df2bab14ba341fda7df1ceb0de45cf1c799a1d54a64f2858fd1272d348bb52cf269ffa396878c5402baf2730237f
 DIST linux-5.10.161.tar.sign 993 BLAKE2B 9237c5037a39e92c2eca9b2c16de865ca5ad1155fe937e781027aeab18d353c4fbdafaa912c27e73c6f64a4e788b8f1cf5b0317572dbd87dfee27074bb715679 SHA512 9fd26a9b250f38d395d9206a7d87f4b710a72774284a48b99f9fada48e241a513bebc8552247f951d498d453fd32fc06a93987e95548f39c861a0671d1fc9e0c
 DIST linux-5.10.161.tar.xz 120516432 BLAKE2B b35e08b3ed843fe0d0ea2a08728f192ab795b61438a60c148097c8bc00c1bdc9b6bca925bf4e3cd124ac3c5d50920f2bf1a481c24a97b8787c012e3df993d8bb SHA512 aad3c70cc6eef39623ba038e74fc5435764ab81cf8782d44ab07c50f50c66f303d1cd49b439aee46193caaa43f4c322924691ea5e3ac2b01142420efe11700d5
-DIST linux-5.10.162.tar.sign 993 BLAKE2B dbf8a63c4035e3085b59d13c5e0763d0e3884798a59c69c627d00a15813db8bf4fc84b4952a68d0c2230d3e5bfacf6407f8915c13bf5bdb69c98a8ed1d93f27d SHA512 329319be28334b3ad351394e6f3e6e6f93530511ec52b53012d8abee2bc1d9e7f043f277d9b3a9c9b4bd0abce69c05167b45cb58b6dfb6ee96367fbb5eec7a67
-DIST linux-5.10.162.tar.xz 120528796 BLAKE2B c06f95f9232cae822f390e7d443eae46fc5e4b5625397f0de64d8ed3a6fae68fcebdb855b0aa6e55829d920f94f3b602e165634b59da637ef92a804f6317bfb6 SHA512 941c7ddd7c27f49b4491e1c8fbf1efedcbac50b48ed8836ec91091ead69723f820a61bfda795378dcc728a782d2206189903333e83e255b723eec01157bbb0bb
 DIST linux-5.10.163.tar.sign 993 BLAKE2B e085bd8633c659a431f1d6cf070761238e2cd52b63421be67870009afbb90316cdf5ad6c58cce17614cb0a06f067f5daf22d864aa00bd9940b59deba0b31a294 SHA512 6e6d962157828fddbae6c98d00c27d22efb3a2cfbb45d3dccc86ca1a73e6d70f80e5a58f92469e18a5448237e40b77c995623deff88fc328ff333d48fa91dbac
 DIST linux-5.10.163.tar.xz 120553276 BLAKE2B a9806d2fcc28783976a78d5f1fb4d10f1523f0fce35c5bb04485cf54db843b505350be3dbd31bba2b528289bfc97cd2719b54756512409fd03a158f37cc1940b SHA512 8c405ccc8e0ab1748058d7e135ccde5501500d535fb8c2023c4c6a399be8957e5d6f9398ff30769078bc8699509db333f158f79fb8a6e7b816aa1ec413ba8ea1
 DIST linux-5.15.85.tar.sign 991 BLAKE2B dc06c346781a947993743eeb08784d35091b64c2f6d617f05e6b8eb6143887362d34a8f5e819be24cb423ee0d4e92dc040246d6f979d9ddecbf79fea439b0bf7 SHA512 c2d734b5bf0f4b5b568d5c9217bddbff319c727d3489afb8eba64f67b225d34ce8de079e2e8c4210c4096097c28cac255c9187b0267dac9b842806ce71a47220
 DIST linux-5.15.85.tar.xz 126501228 BLAKE2B 481cea334dee4146d72704ecb88f654bd38ca62a5a28540f365a57f5cd522551c4b7f854c09380ec614098a9efa5dff4cef70c9cafe6277a410d3d2099eca1cc SHA512 8cc19124c82f14e09b5ff8d2e343cd41cdfced74e5c0c501abd258555d9dbaa79e79cb23256a474cd59311ae8626b0457c2117263bd64a206151c09b54f3ff46
-DIST linux-5.15.86.tar.sign 991 BLAKE2B 18dd86da143bb3e3afa28e9de2778ed384d44988857968ff6e7eca13029cfdcdddc9f707d7df1f37751b321be216b94b91fbab985ad09d2f487698f83e1f4107 SHA512 e3f6e14db0edbc41d3d9cd4e2c296eb8cf7e678daf71567aa7a814bf9541f610a1f91996b93104e7d9c35d1b079b9f9b1e14be2e30b5fbaaf587c5ef69555911
-DIST linux-5.15.86.tar.xz 126498884 BLAKE2B 6d088a5abcc1a8c56c2fdf05932f757ad5bbca48f5e60f5a302b2513186b7519af44daeebcb2ac96bd30967c58967426a3b33f492b22b5db7d75d3bd81411eb4 SHA512 5acbf5e7ff56484b8a4eda3f7e1662029eb2bc7621082386887ba893bef172da49512f1a6e05c590c32e591c3d8b1a41c6a11fc1befe5196f28e60c9f0a7b22f
-DIST linux-5.15.87.tar.sign 991 BLAKE2B c1151b495ac95643e4508424a7ca7e0b845d0a7dd5b8a1c0059698450905461203128909c0b06f65dfaf5bc40b16150c12c8543631c35d452ff5875c048d8f25 SHA512 958080d6e5508c91e1131005f3d004d54f95c3b9f1ace941721f149ffed3ecd8974c1a15b3ed191f904bdefde33c0f5bb13f697261dfa48f61d1a0b6fa18411d
-DIST linux-5.15.87.tar.xz 126508400 BLAKE2B 3a98b315a0734500971de4a6d1e5d9e66ea7a5ec84db54fc5f84a89d00b071deaf29a4d4ceae46da71db566d5539d0ed7037d0038f4fbd3c59f18416bc004b4b SHA512 f5e9d5eb2555c6a879ff11d30d355da18e91693b9eb7c42249f30da170a568b9d3878cf83ed0a25b1210f20fba907539653a8101872a111438f7cc7df6f70f7e
 DIST linux-5.15.88.tar.sign 991 BLAKE2B 928ea938758c904971cde08ea5d390ee483eda4ad5c7ced83d606e219d823966bd6ea745c64b2c954e81d444369507d57cfa3b54e18e433d9733325007fca93e SHA512 b9f1744190bdcb220d8a17b295784aa34ca0ab7035d4fc832dab0605ce665dcc9ac356ceefdf47a2996dfd33b05b0ec8a2dcd66c785146c756cca74ad10ad0a2
 DIST linux-5.15.88.tar.xz 126523892 BLAKE2B 26ec7427e3370c417a048ca76f394cd9aeb25f6cf8b6bbceb074707a85c75f668c8d70c9f1b19cd05ce33212f259736ac1b554793ead30a007d1745d4329879c SHA512 2ecb84f7800a6fe22577f890c403e2bad383a1638b6a176c20cd8d1311ea433c016e08ef00d1441099c1dba974d82c4211acc190c8d59aaa9feb12588af1b348
 DIST linux-5.4.228.tar.sign 991 BLAKE2B 4edd63de96c2cceeedf8b20ab4696fb4c8b8e45916d95ea9279de4911874e4537aa8f8acc4014545746d4546bce66843a3e56d56c90592e730e4ae1165c1486d SHA512 72be75fbf5704706d6d772a50646550e3d54458044e5fe5a49afa7dd98360f30b0a4e345744e691b09d8951712d1d766d050846fa7ce13bbf4f1e9dd26063d4d
 DIST linux-5.4.228.tar.xz 112978736 BLAKE2B ade9b21e3f434435230e31d67d39ea07d15d92cdf932b3b181fc532669f10ebd2f0eb7d5fb20ae9eae93c782f10db5ab3454bb13c01694f674f83146bcae8187 SHA512 f3fa33da1df3dd10ba9536d30b8aebf92796abe84872c402776c94b35bf3efb4256a6c3f0267bd97741db9853352d1b22bcb42d7d03f167960804bb9f7407601
-DIST linux-6.0.15.tar.sign 989 BLAKE2B 214ba7092718635f5dd39f2374615854c276e450ee81b8811b2e5a9dcff300eb38c4acbda4ebc1dcc0d7a2866e4a6bea8c2e5280309428164df8294bc616f8b3 SHA512 f39bebbb1d60ab7457e861ac7005a5cb975cb53519d777ff66119d2ca087f9a654cf1f11ecb4f7b58af6da574c698dccc69c9daa99ded277da178593c5fdaf76
-DIST linux-6.0.15.tar.xz 133929584 BLAKE2B 2d01f57c447ad7eecaa77a9b245ab1a79a35bdcede9d0b234dafd96d383a14a878868a6872d9c24cbc1a6a1332ccdeb15b492724063423ee833ccc56f9c5348d SHA512 1db7e086aaceabf12749728f100842c68886158202250cd9a582083488ee7073bc925f933f44b5c70a8f8c5bea48c73462da9ba979ef696005f16031d11312f6
-DIST linux-6.0.16.tar.sign 989 BLAKE2B 9c9d6f50affb9798b12b554f5368e2dac75582d5e17d34b37b26a4e3b4d3024c0b6d5576ee0945a97f5484b5553be486a8a4d7b5aa760ee022c2e8987a8eaf54 SHA512 7e0faa197b0444dddc58ed2b8d1bb822b7e06a05dff7c75fbddaba3773c69dc76b9984c3e6d812f44968c81309c43373d0293b6c602cf2a1b95e613a69662efe
-DIST linux-6.0.16.tar.xz 133909080 BLAKE2B 9e7b042e1f8fefd5b84aa867a0dfc3d86da8e531fdbdf84aed81dfe987c01bf2b4d4df13fcad5ceca0fec206032268c5324ce1dfefc8611016e44c3ddb50584d SHA512 769d4a1a6042efdfb97fbb63c2e619e6ffdcf7808a26f380fd7a1b64d8788dd1c568b16315d0d371b69c1a23b817d6618c1c669824f9f09f5ac20850ad55d0f4
-DIST linux-6.0.17.tar.sign 989 BLAKE2B 568e54c45f30560e9b02908241e0bb5ca752a604b13331587b10eba7180c9e963fd66ab82622c852ce3839a934c8c398c908243020dddf5d76c261ba20428bd8 SHA512 2a994abdf9e03779878808fe36280fa3b5384ffa09c2c2b7be53a8d3ae6435e51d53e2c6ee2ff3546e77976e85e2894ee8763570d72f92d3971b87b354e01ad0
-DIST linux-6.0.17.tar.xz 133926564 BLAKE2B 18ec2a1893eadd6e64c284d2aec81f449a11b0aed9740ed12bd0ead85da9e600f2a6c3b09b523ce25a00e1f5d00ee47cd053fac1a777fbc99456ec7a8df9d231 SHA512 48e65a9296c795c80d44cda9f0facb06aa23bf1069ec6051525c79eb7ced8beac31242cafc4899022891c3f48a163800dbc86f0cbae27bd9e900b803370d001b
-DIST linux-6.0.18.tar.sign 989 BLAKE2B da2020ca6cac5c40fc635428c38f068f275d30fa0d77b03090cf161756c5873dc07f4f10657399f898368e1cf794518ebb5035577a309bc65a6cc9a208c63e9c SHA512 74c6bfbf1533016f6c58809b44a2f15c05bd2f57eb08751d046d3fcdc6f7fd50ec2fe564c6d24cb5b31ee3c8cfefd9daded125f57416ab18a99b1bdfb3c00062
-DIST linux-6.0.18.tar.xz 133958940 BLAKE2B 4092c72e5605b04386355ef8e07ecfa70893af7d6d12da79955ebeac8303be785a329e6e4914238e9991dc314c6992c61c8f38c9fb10eefcb652fd98311e9471 SHA512 4fe661ec730e2907af25b26e30f1d11f0865e6c95da47ef9e95df496b84fc932af1321e86ce97059a23bd7d8d9381008b1e1b7e581f956295cd467ad13ffc0d3
 DIST linux-6.0.19.tar.sign 989 BLAKE2B 282c6f308c8617ffac058ccd9c57d90c0d4cd9d1046c2909fc2b134e17705da73ea8b389a6547e38bb88ae3048648d37243a57c8c32e65231f5c317ffe5cbafd SHA512 2a6ecc919c878ddd8704b04f5cfb360fb8dd6260fa809eb08ad65f140c8081e456d7b0e2842fd7fdbe6abcacb55c66fe72900230d2eee901ca7a319b3dd98d40
 DIST linux-6.0.19.tar.xz 133963104 BLAKE2B a19a5db545cc8d4d220942b791ced3c2e6b9c8980d1f427de9b3b1804cca5468475d0222b2e905ef96baa229c7df227f149a1703a9c94fc0e0d7126744740e94 SHA512 4a7d9af032aac53e6474b49d29297d5c20fb5f16391042646a0100ed6b6308d24f088572b110b6fe2a741800a161006e795835aea7a874735f036aa0457163d7
-DIST linux-6.1.1.tar.sign 987 BLAKE2B a240a6428c456557362103620cb9d0d9eb0eb57d7e46ad7aa8183eee673b5578a811642222388cf99a9728bc47e35d7489dd05728b36c939227a109435a0e7ea SHA512 a089b3bfc255fcf10594ace137ca2553e717dd231434b08039252c23c2c7242fc3037b49a8a6fa8d55a92c99173f448bdcabd6116f185ed31078f7455aaa23ba
-DIST linux-6.1.1.tar.xz 134730676 BLAKE2B 8d25e501419dfe800b9cbbe219c39883be67a80e015c1c6034e83a9b142aa16bfc4db14a788a5331f6c44c03ca013f0c73e028b207e2e424dff1d3924d9a58fc SHA512 c303f53ace62cf5b860934130fa5c34d2a43e7719959bcc3f2b7f0e753ecca550da4d0dc52409b6b6dc1c9c515cbab75427a15e51b58e9f8b1ce12982d82d629
-DIST linux-6.1.2.tar.sign 987 BLAKE2B 496c6817ca39458b0ef0853b84bcd89b5caa76b63739730056376713266d49298328342d1716980a244f00c57c74de03a6d36d6a80542590bb642ee2bb92e1e4 SHA512 c338bf4e330dab849c568a747209b8665e8cbb27ad7870eb26c41e66b828b2f8edeb03a3f02ac35523b1e2896f0156d5ba0f1f1900351dccaa1b4d5db6590317
-DIST linux-6.1.2.tar.xz 134757304 BLAKE2B 0bca96ecd7ef972ee436f790c84e7d35c4a592dfbf1bd27fd9d66c8d3aacab311bb4ee06c42f22079b20c7fbe8ae9df12844f699a673d7e534f76b5f5b6ce788 SHA512 a906c15b1eb4f3015b1d9a0e6a321b5a399e77ccd0127cb8caabbe7cb337e77a85a432bac4763ab5448d86dd319441eef865aad41939ca1f796663c2b52170e6
-DIST linux-6.1.3.tar.sign 987 BLAKE2B 0b3ce2aaf73f676ed680633bfd0cdc6da8eea231b1bed22359512a43eb4e6a08b5d94b3502c15b33aa98ebfee03a1360a1755706b5fab09a6796491e2ffd68c0 SHA512 112db39f21c260f632f45ae13f1e74a96897dbab522e5c8177c2aea9886ba13e5e74a48aba5d76c1fd12b802baf843204a1ed597c5cb627a424af3fef1b4f2b4
-DIST linux-6.1.3.tar.xz 134747072 BLAKE2B 0ec03d153778032d8ada33c1e3c44579d889978a0b20118c103ac96676fd4b9d96ee9828d7c9f2c25fe4eb1e469922bd389c01293b43dc5080bd9f360a9bd60c SHA512 05294aa24b805253ab9a5faca626e267982677e83f12657c233b8d00d91bf8a77c967a84dd83048e929f81b9e3b416c2906e01a27dde30e2406a079605c0d8c9
-DIST linux-6.1.4.tar.sign 987 BLAKE2B 3a2607dde89f6b07187dba936720a128722959361c8d52f2e0bb84224a487d3aa105358c5f65d2ff60f28b30e6ddf0b0adf5cf6bb608e111fc1b4a23ac6fb395 SHA512 d48abd7bc6dd9c409237895f0932c6f2f9d75d3a8881fce3d748470c60369c6773e8336060d9761c70b7150668353632850297d7d233af2eee8218cf66a96df4
-DIST linux-6.1.4.tar.xz 134741224 BLAKE2B 4222225ad841f96df6fdda38e64934012dc6712f7c751c8de735163831bd3605ee107ecf82b1046590f5dd0c66459923aff7c23d5181a45ae7556ac419255740 SHA512 9f75756a88e1b07a0970a59d71d03683886e782cfa472b6d2422753842929d3e964238d54cbd2df9b2779b206f8b7a676a2287a607da95300a73b0846da19fd8
-DIST linux-6.1.5.tar.sign 987 BLAKE2B 4d72a0c3a13e1a2c4fa826e0c2120abe7ed0155d6eca2eeeeb006f9e00f0a15bdf25661ff5e7db5a31ba4583d0d3b6f3c257dc0af768849ceb75e696173777dd SHA512 c98d25c1ef7b20175f7ca8b7fa8a0e1108b9e1eafbc4b51b3195d7888282177e8b4acdb01b8b6094917cd08f1d32098519785d56d848e2c299f753b80a30c58b
-DIST linux-6.1.5.tar.xz 134771916 BLAKE2B b3e47f1184171febcd563285b82682e15fff8d932c8f897157e528e1195ca926153659be2defaf3fe294999625757f6efd02b0a786536b7e7c695721be7144aa SHA512 f359a8ff3d2d4f1e95bd90431209fa17b7b37029a246b4fbadd618afb734f2e0385a21ebdc21c9fe6b5cc84876b34a59d7ae582c97c34cf29238231db4161275
 DIST linux-6.1.6.tar.sign 987 BLAKE2B 3d47959aff69520879ce9f2d63b2e9f3d8c0f33c9a5e9caa98902df1d37115e87627470680250f256f80aaf3a3152d11b42658e0c89ead28ef1b88df2aa77b8d SHA512 8b31481f4e8034f453129f98d8caadedfd771d7a9ba23c2e41c2f932261263183ddf78ceafea3f38c14f441c2c857caad0ab98056da510d78a21d2fc35774ba7
 DIST linux-6.1.6.tar.xz 134782796 BLAKE2B 47fdcc432bd473b3948bc4b618caa329887026b86029dfad055a9d4dd5cccfdd86df48bed7dec7f9f1a037cf955e9c024f368600b5ee8bbb0a46e4620abbde10 SHA512 b162ef2033485796fcdef5613c3a11aa7fb23faa590a1d5391e29af4526dbbad49554d7a7d94f5c5bd7cb9f25b8f73e898684b4bbe9a1e45fc181e7d0fd3e0b2
 EBUILD vanilla-kernel-5.10.161.ebuild 3715 BLAKE2B 43376b8725a469a9f7e98e105b2e7617ee5c663b367b096292bd58e9b66905d1d40a8325714668ba3e04bf1d21d809950198aefab7b63b152c685f08b9bc497f SHA512 4bffc17a9a76ce0fd938ddd272587a294719262af38165686bafaa48a7a543068817b0b5136365e512a0f141bad06d545ded287786afb89df3bcd253280f30ff
-EBUILD vanilla-kernel-5.10.162.ebuild 3715 BLAKE2B 307a710805227c6da8af6a27356164d737c1d581ec44b8c37f453a21750bb77339c536745ccb302e183896a624034d691f705be1f6507a264adffe3aea2c3e48 SHA512 b723850925e6c7b7f9da1668f0f7df3e6c681de6982526e743e9b4f2a63e3b16984f8a638c76a5fb0d0dbc1980613ab41a90f8ad772054b71515975011d122f6
 EBUILD vanilla-kernel-5.10.163.ebuild 3715 BLAKE2B 0859ec6fa0c4207925572fc6db80ed8d89af637fc45717643d15156bf922bbdb79fdc458ee7111f46a7a11f395be1d6f4fc9afc82b21f5924b47c5007806908b SHA512 7a29fee2e69c5865e269dadd9bdb4c188a074e6378034d411dbaf967d81af0e411b14db0f17c24160d92f0c22c44348011079a7fb7668471dd19b87a419401ff
 EBUILD vanilla-kernel-5.10.9999.ebuild 3234 BLAKE2B d1ae98cbcc1aa58bb90e787f61a60a3a1f5936fc7667d2ccf9d441c1445bedeec835e40609c28b586e199adb2ea75b68b01b1422d712eeef6d8129c516afa935 SHA512 304afe6d49b898671901bf8d8ebb380a4adb774d3263ddb19b8797d97708badb281e5cff02ef95392057be52e13004902d59fe5d91f5a2d7db0a734ec91a321b
 EBUILD vanilla-kernel-5.15.85.ebuild 3715 BLAKE2B 5f9721371b3ba0e5498b275fa2ed31fdb6f640e2506d4d246076460f085f33f1850adca9db07260deccd65b92c94488f60625b0f8fdb66d9294ae2a697f16493 SHA512 84eae31a460385f9508ced76a7f3f02be83a2283e6691fe94b56a8e68bacaa4c97604dde3691903195fef01ab5e1f55063421c895aa8d1737adca071aabd9477
-EBUILD vanilla-kernel-5.15.86.ebuild 3715 BLAKE2B 5f9721371b3ba0e5498b275fa2ed31fdb6f640e2506d4d246076460f085f33f1850adca9db07260deccd65b92c94488f60625b0f8fdb66d9294ae2a697f16493 SHA512 84eae31a460385f9508ced76a7f3f02be83a2283e6691fe94b56a8e68bacaa4c97604dde3691903195fef01ab5e1f55063421c895aa8d1737adca071aabd9477
-EBUILD vanilla-kernel-5.15.87.ebuild 3715 BLAKE2B 342e25d7cb6bdf400f24ac65de1f2d9a77d6b06412361c62727ba4289656f42d056406a47892b2418b8574b51c0860caf8da6e417558b1117495020decf22489 SHA512 edfebfe20592f21864c8a1d025e8cb60f032d2102439dbcde8ea518a65d044eac9c0dc6a112545f590265c619ab822ea60e527a7463bb2aa02873e3b1c0fab3e
 EBUILD vanilla-kernel-5.15.88.ebuild 3715 BLAKE2B 342e25d7cb6bdf400f24ac65de1f2d9a77d6b06412361c62727ba4289656f42d056406a47892b2418b8574b51c0860caf8da6e417558b1117495020decf22489 SHA512 edfebfe20592f21864c8a1d025e8cb60f032d2102439dbcde8ea518a65d044eac9c0dc6a112545f590265c619ab822ea60e527a7463bb2aa02873e3b1c0fab3e
 EBUILD vanilla-kernel-5.15.9999.ebuild 3234 BLAKE2B 996eac76e626ce6dc0a984e1edd9a0c0b7e5676c1a7537ec30f49041658600daccef70fbf325611dc1001ab5e73c24f5e107f7d78bc7460b911636c38c13e0f2 SHA512 505cee407fde3af7ba4cd631f743df29a1770396828de0090b1fb371eae3f811754bef70f8f6f61bf8eb2505285fdf93dbfe600d8fadaf5f0878a557388060e8
 EBUILD vanilla-kernel-5.19.9999.ebuild 3354 BLAKE2B 7d153d91d316f3f1a27a4f44d3b0d455182b046d0db44bf34adc00bcee00cda1e23cdd359bc655d8b67c74763cad8364a582c28fc57626e0ffb836ce4eeef369 SHA512 de41900154fc4c6e44b63e68caa6d87c60934acf4453b122103f1e655b10b23c601365af65d1af45246c4fc3cd763ab73bfd828e118398ec5b09d0c5b69d3f08
 EBUILD vanilla-kernel-5.4.228.ebuild 3001 BLAKE2B 2327a3c19157c0658328235c8853a8806b7e10af269041a7ff1d3a8d7b3df4ef767ebf12829b57d32892d9795619e946a574b704004da55b6f8641e71d832e69 SHA512 5068ce6fb368e17c40629eedc4cf78a7a5b9ca50b102d0378fe0022eeaba14ef710da4f5b31c7021b013c7745fcf52c569bc0bb11c8cb3de038a6f150680edfd
 EBUILD vanilla-kernel-5.4.9999.ebuild 2574 BLAKE2B 6a8f6619bc9a88b8076a80ad6158b8996544b2608a78571107ba0b7be09b5f35add48d99d54ab6a2232f110156df1cbf6f325da036be23c793b4f84bc0f995e5 SHA512 c95bf760e931180ca9cf09c91e7fe05039f2aa2d743ddc8aa3e14d765928d40fcea628754e0177cc66df3fddc0fa2fed54d962e8682c5aaa7fa416f0fe3ac323
-EBUILD vanilla-kernel-6.0.15.ebuild 3833 BLAKE2B 7c090455c5ac0a6b565f9cab974114e41bca494d7d95bdc18c2579d24253cd15919173dc25c53de1f03f7165cce7596e8c615d5244e4f5881f63557900b765be SHA512 b4e7c79adff4cae9d2a515fa71f2f59cbf40eda3ce5c1f71e0ab3235a84baad434d531bd1bebaf853ffcf9ad3709046f477254849e1e310eb937be86d29cdd1f
-EBUILD vanilla-kernel-6.0.16.ebuild 3833 BLAKE2B 7c090455c5ac0a6b565f9cab974114e41bca494d7d95bdc18c2579d24253cd15919173dc25c53de1f03f7165cce7596e8c615d5244e4f5881f63557900b765be SHA512 b4e7c79adff4cae9d2a515fa71f2f59cbf40eda3ce5c1f71e0ab3235a84baad434d531bd1bebaf853ffcf9ad3709046f477254849e1e310eb937be86d29cdd1f
-EBUILD vanilla-kernel-6.0.17.ebuild 3833 BLAKE2B 9cf667afd317524e3ee69b48f925c4feed4b8284c7efc72bfe52710fe415a71a605bb8c9cdf06c40ef70be87b6cd93aff26c0c144bb3a2c998e773ff811f7600 SHA512 c84289a3b5623c03f881afd4af54e65db12567293e6f73edd51e563b9a2ebb7ae73c6d1115a81d54888c9742b7e12bc169f2b4688e53a8f104e0c32612626e94
-EBUILD vanilla-kernel-6.0.18.ebuild 3833 BLAKE2B c39c827e633c7b62ba93dbc9d67b965252d4428e35d78b57649df3fff9ceab462b1ebbe12a9b5b00fe5193aa527fc8c8762de7910a2a5c27473d470d2288d607 SHA512 d3b2aac2d168111299929391d16e8a19431b2ed371407fca039a0edb2e9e067667ee196b23a30a3bdb0c6fb119f177e534d614c06abd25d209606e3f9322fa00
 EBUILD vanilla-kernel-6.0.19.ebuild 3833 BLAKE2B c39c827e633c7b62ba93dbc9d67b965252d4428e35d78b57649df3fff9ceab462b1ebbe12a9b5b00fe5193aa527fc8c8762de7910a2a5c27473d470d2288d607 SHA512 d3b2aac2d168111299929391d16e8a19431b2ed371407fca039a0edb2e9e067667ee196b23a30a3bdb0c6fb119f177e534d614c06abd25d209606e3f9322fa00
-EBUILD vanilla-kernel-6.1.1.ebuild 3833 BLAKE2B 1e15560940a0b62e1f80988346c5c9b523ffed313ef67133bba0a8b5b46b8b45fbff901cf70920b6bb35383ddf75aac380efa17c09a3a527252df3bb8672cb50 SHA512 d396d1ad7fbb3b0c9577bffc433379a52d3a06ea49aca5f5d5b3a4fafdf47dd8df75d905004692e75af9b7caec965b234503ba7ad0d621f4096f57165ad48bc3
-EBUILD vanilla-kernel-6.1.2.ebuild 3833 BLAKE2B 1e15560940a0b62e1f80988346c5c9b523ffed313ef67133bba0a8b5b46b8b45fbff901cf70920b6bb35383ddf75aac380efa17c09a3a527252df3bb8672cb50 SHA512 d396d1ad7fbb3b0c9577bffc433379a52d3a06ea49aca5f5d5b3a4fafdf47dd8df75d905004692e75af9b7caec965b234503ba7ad0d621f4096f57165ad48bc3
-EBUILD vanilla-kernel-6.1.3.ebuild 3833 BLAKE2B ba3ea1fb2051ebf4427d8987443402d115b1b7edfe12d6cb58f18d3ec2ef9ed0a481fdb59221a87043a13b96f870089fa1802038d34159cb813df73781142f2b SHA512 a46e4637d6a67f48717c94d15eea6dc1a86fbbcbe2f61c09ee3f914fd5c291e4fb59a67c5d0e1bb530085ca3b457ee242c5f799c44522fb168ca84959d5f0391
-EBUILD vanilla-kernel-6.1.4.ebuild 3833 BLAKE2B f21229dbf3992443fb50b3de7ba847e991474cd9af2013bdb483f2f3a8b93aa4188684b302c4759fc7ba4ef8361b98e60321d405c259e761a0f761942c10ceb5 SHA512 6bb78c451e683580905009f35371fbb881dc4a468f525e37f6399c71ef80ab0b22f976e620733053a047223ea85a6d8f1a524cd4d07ec80985c74502cfd0404b
-EBUILD vanilla-kernel-6.1.5.ebuild 3833 BLAKE2B f21229dbf3992443fb50b3de7ba847e991474cd9af2013bdb483f2f3a8b93aa4188684b302c4759fc7ba4ef8361b98e60321d405c259e761a0f761942c10ceb5 SHA512 6bb78c451e683580905009f35371fbb881dc4a468f525e37f6399c71ef80ab0b22f976e620733053a047223ea85a6d8f1a524cd4d07ec80985c74502cfd0404b
 EBUILD vanilla-kernel-6.1.6.ebuild 3833 BLAKE2B f21229dbf3992443fb50b3de7ba847e991474cd9af2013bdb483f2f3a8b93aa4188684b302c4759fc7ba4ef8361b98e60321d405c259e761a0f761942c10ceb5 SHA512 6bb78c451e683580905009f35371fbb881dc4a468f525e37f6399c71ef80ab0b22f976e620733053a047223ea85a6d8f1a524cd4d07ec80985c74502cfd0404b
 MISC metadata.xml 353 BLAKE2B cd022bd01b289ae703ae6ef6c2539fcfce833206c55e328ba02fc42b360d60f76b1920927b259dbb199724e6d3e7b0f68ba2044680d962d3cd03a973475582ff SHA512 10b10fd24801843108a71ca7d0c27514965b0a15a60da4d9b521fc41493448a1b1685ae3278dbd46cede0d069e51dede402d2c1448c8ae6a7fcfce8acf415bf3
diff --git a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.162.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.162.ebuild
deleted file mode 100644
index e719ee96afa6..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.10.162.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.10.12
-CONFIG_HASH=836165dd2dff34e4f2c47ca8f9c803002c1e6530
-GENTOO_CONFIG_VER=g4
-
-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.15.86.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.86.ebuild
deleted file mode 100644
index e9d460c7094d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.86.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.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-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.15.87.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.87.ebuild
deleted file mode 100644
index 7aa02200877c..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-5.15.87.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-CONFIG_VER=5.15.19
-CONFIG_HASH=ec69da7a42b5b7c3da91572ef22097b069ddbd01
-GENTOO_CONFIG_VER=g5
-
-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-6.0.15.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.15.ebuild
deleted file mode 100644
index d2f94947b12d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.15.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=6.0.8-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-6.0.16.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.16.ebuild
deleted file mode 100644
index d2f94947b12d..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.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=6.0.8-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-6.0.17.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.17.ebuild
deleted file mode 100644
index facdbf016386..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.17.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.0.8-gentoo
-GENTOO_CONFIG_VER=g4
-
-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-6.0.18.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.18.ebuild
deleted file mode 100644
index c9b57a73dafe..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.0.18.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.0.8-gentoo
-GENTOO_CONFIG_VER=g5
-
-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-6.1.1.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.1.ebuild
deleted file mode 100644
index bf548bba57b9..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.1.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=6.1.0-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-6.1.2.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.2.ebuild
deleted file mode 100644
index bf548bba57b9..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.2.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=6.1.0-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-6.1.3.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.3.ebuild
deleted file mode 100644
index 98ca0a57d5be..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.3.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.1.2-gentoo
-GENTOO_CONFIG_VER=g4
-
-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-6.1.4.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.4.ebuild
deleted file mode 100644
index 2b1628c7d41b..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.4.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.1.2-gentoo
-GENTOO_CONFIG_VER=g5
-
-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-6.1.5.ebuild b/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.5.ebuild
deleted file mode 100644
index 2b1628c7d41b..000000000000
--- a/sys-kernel/vanilla-kernel/vanilla-kernel-6.1.5.ebuild
+++ /dev/null
@@ -1,134 +0,0 @@
-# Copyright 2020-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=8
-
-inherit kernel-build toolchain-funcs verify-sig
-
-MY_P=linux-${PV}
-# https://koji.fedoraproject.org/koji/packageinfo?packageID=8
-# forked to https://github.com/projg2/fedora-kernel-config-for-gentoo
-CONFIG_VER=6.1.2-gentoo
-GENTOO_CONFIG_VER=g5
-
-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/virtual/Manifest.gz b/virtual/Manifest.gz
index a944d6f0e839..a3d32e1102af 100644
--- a/virtual/Manifest.gz
+++ b/virtual/Manifest.gz
diff --git a/virtual/dist-kernel/Manifest b/virtual/dist-kernel/Manifest
index 210e179a6d4a..27eccf52a1e5 100644
--- a/virtual/dist-kernel/Manifest
+++ b/virtual/dist-kernel/Manifest
@@ -1,20 +1,8 @@
 EBUILD dist-kernel-5.10.161.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
-EBUILD dist-kernel-5.10.162.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
 EBUILD dist-kernel-5.10.163.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
 EBUILD dist-kernel-5.15.85.ebuild 399 BLAKE2B 69c219977a0039ac43c6d4915c2328768340b1aed5cf30564cc284912cf114713e2065633f0abdf195c5384b26b791f124259189a2bd691abe82847437c02ae9 SHA512 aa0ef63357b18176f14bc297ad6099177c279ba4748115ae985ae2d4ce6270d00965d5297f77b703c71acc25b2595a77740b62b9f531aeddba4b36c704e6ed24
-EBUILD dist-kernel-5.15.86.ebuild 403 BLAKE2B 145674cc4648e69b6cd6df4b8d32a5f0a8c69843372eca005202b632d782fc31f3c639d0d3cc2f641f09da0280d5066cca9764bf7185ff4fd1a7091a038dc53c SHA512 a0e91fc0f7433912609d5938581b06abf4b5a69292ba982b6188ba47c1514239f2074c7e3234a60e98b8652da5da2ae6626f14eb714e38489690cf4b09ac83ed
-EBUILD dist-kernel-5.15.87.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
 EBUILD dist-kernel-5.15.88.ebuild 403 BLAKE2B 72e6e772c29df1b3f4896f121951335142a301e69b16db2de5365c71aeaad94bd4eba84350d10233c1498f1e530ed17eb71494821d2c029e2ec6a1a2e02be1f5 SHA512 078d71787560e178305e3f3561012b262a6f618156775e9b55937a04c477c047d1e7672009e6c0b7adec1b7e120b4ea7c636aab368e6dd37263e65b8013d6e3b
 EBUILD dist-kernel-5.4.228.ebuild 388 BLAKE2B 2cdbd973ff8c248bfe49420683c3040deb65612b315e212e61657b071338e9e54b321a9167467da27a04f185d9e8c4f38142f5195a8a9d658c2a464f76c0ee49 SHA512 164347601db14a749e61850cc9407485f8581a05efca57df2d57561ba467184728373f7ef5cf5b956bc695274814a4880ab3556b6e71187ae0050cf6bd228a11
-EBUILD dist-kernel-6.0.15.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
-EBUILD dist-kernel-6.0.16.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
-EBUILD dist-kernel-6.0.17.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
-EBUILD dist-kernel-6.0.18.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.0.19.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
-EBUILD dist-kernel-6.1.1.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
-EBUILD dist-kernel-6.1.2.ebuild 410 BLAKE2B 4fb6bcce0ba2d9710cc7a84d98203b5460c25c122aa052270a1c6c08a3201df47704fb9a2421f7894150830b1433a36137e8446f5d70749bdc7ff70678903be6 SHA512 40f1d6476b3076c1f5983bc08d1d5bd236d594a749e5a9147d7201d8b146d66255156b724d80e6af6ad7615c789f82fac3a432b97890c2cac2c062a6e3e7c0fe
-EBUILD dist-kernel-6.1.3.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
-EBUILD dist-kernel-6.1.4.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
-EBUILD dist-kernel-6.1.5.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 EBUILD dist-kernel-6.1.6.ebuild 410 BLAKE2B a5a524ee164758572d09c29f9280de19c49244ac9a0d342f8e573b5bed5afa18c38165dd96b6b9309b777931b2a2fe220efc87ecd42d820625644cd2ee8fe8f5 SHA512 0188b6bbc10445d4426604cc95be8c24682dd07232adb81a7b62095f1f86078947cb90c0b4482d940378b0a6efdf302a1099030bb0b5fd534a2443977acf29fe
 MISC metadata.xml 291 BLAKE2B f8eaa7c5aaced8dad269f9939139bcdd32c64dcc4ebff2b0b41dea61de5aed39723d73721bc44c2bee64717de093b97dc326037a335616caada3ea857c98fb07 SHA512 4fb007791c48eddbb1ee30cde6c1618ef67fbe62a29f3b805a7224818c34ce986b6e3d9378ab500875e012e9ea48663809204d69a410b23d12925f11ada333ca
diff --git a/virtual/dist-kernel/dist-kernel-5.10.162.ebuild b/virtual/dist-kernel/dist-kernel-5.10.162.ebuild
deleted file mode 100644
index 407f5d349eb1..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.10.162.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-5.15.86.ebuild b/virtual/dist-kernel/dist-kernel-5.15.86.ebuild
deleted file mode 100644
index 5594b4186dc8..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.15.86.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.15.87.ebuild b/virtual/dist-kernel/dist-kernel-5.15.87.ebuild
deleted file mode 100644
index 407f5d349eb1..000000000000
--- a/virtual/dist-kernel/dist-kernel-5.15.87.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.0.15.ebuild b/virtual/dist-kernel/dist-kernel-6.0.15.ebuild
deleted file mode 100644
index c2caefd6cfca..000000000000
--- a/virtual/dist-kernel/dist-kernel-6.0.15.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-6.0.16.ebuild b/virtual/dist-kernel/dist-kernel-6.0.16.ebuild
deleted file mode 100644
index c2caefd6cfca..000000000000
--- a/virtual/dist-kernel/dist-kernel-6.0.16.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-6.0.17.ebuild b/virtual/dist-kernel/dist-kernel-6.0.17.ebuild
deleted file mode 100644
index d3f0fa8764cf..000000000000
--- a/virtual/dist-kernel/dist-kernel-6.0.17.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.0.18.ebuild b/virtual/dist-kernel/dist-kernel-6.0.18.ebuild
deleted file mode 100644
index d3f0fa8764cf..000000000000
--- a/virtual/dist-kernel/dist-kernel-6.0.18.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.1.1.ebuild b/virtual/dist-kernel/dist-kernel-6.1.1.ebuild
deleted file mode 100644
index c2caefd6cfca..000000000000
--- a/virtual/dist-kernel/dist-kernel-6.1.1.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-6.1.2.ebuild b/virtual/dist-kernel/dist-kernel-6.1.2.ebuild
deleted file mode 100644
index c2caefd6cfca..000000000000
--- a/virtual/dist-kernel/dist-kernel-6.1.2.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-6.1.3.ebuild b/virtual/dist-kernel/dist-kernel-6.1.3.ebuild
deleted file mode 100644
index d3f0fa8764cf..000000000000
--- a/virtual/dist-kernel/dist-kernel-6.1.3.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.1.4.ebuild b/virtual/dist-kernel/dist-kernel-6.1.4.ebuild
deleted file mode 100644
index d3f0fa8764cf..000000000000
--- a/virtual/dist-kernel/dist-kernel-6.1.4.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/virtual/dist-kernel/dist-kernel-6.1.5.ebuild b/virtual/dist-kernel/dist-kernel-6.1.5.ebuild
deleted file mode 100644
index d3f0fa8764cf..000000000000
--- a/virtual/dist-kernel/dist-kernel-6.1.5.ebuild
+++ /dev/null
@@ -1,19 +0,0 @@
-# Copyright 2021-2023 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-DESCRIPTION="Virtual to depend on any Distribution Kernel"
-HOMEPAGE=""
-SRC_URI=""
-
-LICENSE=""
-SLOT="0/${PV}"
-KEYWORDS="~amd64 ~arm ~arm64 ~hppa ~ppc ~ppc64 ~riscv ~x86"
-
-RDEPEND="
-	|| (
-		~sys-kernel/gentoo-kernel-${PV}
-		~sys-kernel/gentoo-kernel-bin-${PV}
-		~sys-kernel/vanilla-kernel-${PV}
-	)"
diff --git a/www-apps/Manifest.gz b/www-apps/Manifest.gz
index c3caa7a3b3f3..2472641784d2 100644
--- a/www-apps/Manifest.gz
+++ b/www-apps/Manifest.gz
diff --git a/www-apps/chromedriver-bin/Manifest b/www-apps/chromedriver-bin/Manifest
index 99b837439b00..96dd5c45f6e1 100644
--- a/www-apps/chromedriver-bin/Manifest
+++ b/www-apps/chromedriver-bin/Manifest
@@ -1,3 +1,3 @@
 DIST chromedriver-bin-109.0.5414.74.linux64.zip 7300223 BLAKE2B 2974008f430e18717deb0415ffa24c7022536d87da73026ed4a66ed45ef92dde11beb8c12a6e01958a8fe6dab144d78b92fe05481810cc843ee6e3c1ffb7885c SHA512 581b3f13a935ac719e0d36c91e5ae247befbeb247e126a43c5e7b0c5735c786e5b1fc89a938383c822d6ee375bc4a6948d7072ad31df70ab6f9d4379678210cd
-EBUILD chromedriver-bin-109.0.5414.74.ebuild 605 BLAKE2B 9467acca8f9f84f2a35396dc3723360da7a64f59d5ec13b4e82f03dff5e731be1407a44a61252bcc28d80036a1de86f3014b461617a1dfc683d2a8047742e634 SHA512 23ebced93d2bf10c007c9cfd6fc0fe1345475ac8067e8f8a390a7ee20453294f557aa9d1e1c104f03028e79ced84843fb8ca11262fc9000a92072424af587244
+EBUILD chromedriver-bin-109.0.5414.74.ebuild 604 BLAKE2B 6e6ed41ec8e0ce379052733d3eeec09f5dd4e8ba8b0266102662c87bc7e42da037e41b51b6d0367d0c99503081487e8bd5dad94c4cbb9754924adf7913609510 SHA512 71c6f5f2dd5039b8a98795ac72f48fb49957a2a2d9a8ac5bd45496909c51d2bcb67c56d0de54f4dab000d497c702c79c3d4b04b42822a41e95f76c1b35c082aa
 MISC metadata.xml 461 BLAKE2B 4e6e0fd9bf732be9040a4defe4dc1ca63ba7e1ba860abfc97ad487d6220f7bc5cb1e304d001409cb866408fdf393ca42f3b95eb9b8dc258a0627aaa978f66e6e SHA512 3c9217fe5af26ee8ddc705edad8a32604d542ad60c3e78ed8aba9e08a5bd2b3508234e42710d4524149f8b7626bba08f83cb96f7f942fe5ccdfbd8bd98908bec
diff --git a/www-apps/chromedriver-bin/chromedriver-bin-109.0.5414.74.ebuild b/www-apps/chromedriver-bin/chromedriver-bin-109.0.5414.74.ebuild
index a1cec5ad599a..e8f4b845d0f7 100644
--- a/www-apps/chromedriver-bin/chromedriver-bin-109.0.5414.74.ebuild
+++ b/www-apps/chromedriver-bin/chromedriver-bin-109.0.5414.74.ebuild
@@ -9,7 +9,7 @@ SRC_URI="amd64? ( https://chromedriver.storage.googleapis.com/${PV}/chromedriver
 
 LICENSE="google-chrome"
 SLOT="0"
-KEYWORDS="~amd64"
+KEYWORDS="amd64"
 
 RESTRICT="bindist mirror strip"
 
diff --git a/www-servers/Manifest.gz b/www-servers/Manifest.gz
index 298b36867b89..32e56ba30cf5 100644
--- a/www-servers/Manifest.gz
+++ b/www-servers/Manifest.gz
diff --git a/www-servers/tomcat/Manifest b/www-servers/tomcat/Manifest
index 76403f200e3d..0d7b1ddae177 100644
--- a/www-servers/tomcat/Manifest
+++ b/www-servers/tomcat/Manifest
@@ -8,13 +8,19 @@ AUX tomcat-r1.init 3200 BLAKE2B eb913d32bb8c1883e58551a25ff9516337d947c6fd2c7b44
 AUX tomcat.conf 1811 BLAKE2B a92606e113172c6f0f73e18ab8ad8796f38bd8c741bb2fd1f6c43d7682728729d0198d4150e42282c7e732750231b7cdbfb51de9b24f2ba780a22700965113c5 SHA512 0747dd2fdad6c68123425adce39f625d34924ae3e7c9d5a00361565a593047d7a4d01dee64c1ef831e5ad79b51750babaf642b0588d4b5948bbed441d53d654d
 DIST apache-tomcat-10.1.4-src.tar.gz 6065442 BLAKE2B 92e8a2dbe686ce2faa7b766f523f3e2f49d70e6a34cf1d25628842ea22ea94400b6415c676ac52712ebee2950451ff220d8db3fc415ccddf4f1e74a953ba0c82 SHA512 36f2272b017536af140771875e956441a7ee714c533d679d153cb2143ff2eae9e3277acc48541bbe29bfebdf79619f7742f2d719fbd8c330e070dc54d08d40a2
 DIST apache-tomcat-10.1.4-src.tar.gz.asc 849 BLAKE2B 27aa419e86171188ed510db939e943dd19d24dcfdca4072458c1d37be14f28ef0e7887b6f9f4bace2bab26a4e82f3ae71fbdb7371de6b01a93123d74cf68228e SHA512 60b1c5decddd37d8d1c11a4d1c73c5c50b8823136588cca53149480613c1baee3c06a54f84d8e4adbc1a3c67a12af7db0d5ede95251e8763d32c7e7a17176243
+DIST apache-tomcat-10.1.5-src.tar.gz 6066163 BLAKE2B 96c03f053b8585cfc466e7bf870a85d82e5637169028d0bca43508480f14834ebccf2ddf68744b29510fa93cc8fd0994c72a61d0949da0d4e6b095da87704d0d SHA512 d52cf7fd4c4982b7934cd14000e540998cf2599a730083c7647d57939993f3522b6d208a82cdfcb0f7ffc084d9d2ea2b27104203398a61bb765667d97fc13c02
+DIST apache-tomcat-10.1.5-src.tar.gz.asc 849 BLAKE2B 6b733488772bea88ea6a6710651bf60a83c78187463850f0216ca5152f0698648ab8ba37f86480916caa816792095a1f434bc84d5706ae9e6f6ed882b8b29d4b SHA512 600580fb89620937c103fa5581669b9ab7cb359db32b0d1d2cd81e9dc41cec6e3df7e852baa3564ed94e4af30d506453e6761fa20ff8fd37d7c4dafa33aac712
 DIST apache-tomcat-8.5.84-src.tar.gz 6027185 BLAKE2B 8637f65653ae025448d7ce3a96839825d5ec6b77a06fc8a410ff4de786af140deaf00cedc5c9de00172c9cc759a7728521a2384d722bdf63dcfc71aedec7308f SHA512 5224ee4d6c61ed1975fd7a20814eb53b3b5a3d88b31fd3227a94fcc261274aa69f992f161e14217dadea476e4720b7f0a24c733346533d5873206b899ee86695
 DIST apache-tomcat-8.5.84-src.tar.gz.asc 849 BLAKE2B eeeb4c22190c9bb5c087db86807b194ef87d8a03d399cbc36e910dc3cf6f28c845efde4d3748eb8a362d06e870724869acf259b3e75cf892ca72fbea4a4bf943 SHA512 6f2478da242a49a72b0ebb9e51f17e681f84228d69cb9b7119ca9c772032c3fb5112f908077a200d5286b2170ac1529914c7682d5ed97ac58d3b8ff6baf00bf2
 DIST apache-tomcat-9.0.70-src.tar.gz 6219156 BLAKE2B c7cf415c11701edcd90bb35cd840036755876724394c48277236af1e169572f42599ffc2ec167363cd643dde608437cd06ee5c11289edec91a378f280f385259 SHA512 266ffbdfa57bd9778ea3485f5e2cabf9a2d389235afa74b154e684bcf2806a4fe7a54049f2bd8ea96414396d06695fe890b1eed9672278d9eb345ba3cd71032e
 DIST apache-tomcat-9.0.70-src.tar.gz.asc 833 BLAKE2B 979ffa63dccfeb89209a8ee357b231400d762a4ea7e4143960f2dd9fbf83a129c383dd06676c5800f7fc003a1a0cf832c392294cd9da080796fea06742ad9eb7 SHA512 6547167bf808c760bd5833d8049a80c4a64dbb258a80d5cbf6fd2fa459c1231635d55d62e2d0e7e07d0449403b4bddd87a6e22ff29a0eb9486ea7b996bdb1d07
+DIST apache-tomcat-9.0.71-src.tar.gz 6222516 BLAKE2B 41b4ea0006e813a1be885cd48cb76e7debde4794e79b88e1110d505b179ac7c45b516265fd0e2f90cd20f0cac6ec7d04577ba1b3384570531902e00a7f599f0a SHA512 0c62a5e526178e39c68717223ce2cb4a31096e5765b718639e4ba4bbf3d70ba28238cd1bb5cf74747f718b35baf98de32c7ee8a7ebd445c6191700070c1ca930
+DIST apache-tomcat-9.0.71-src.tar.gz.asc 833 BLAKE2B 137f8f2ba0ec727e478291bd82000f0eb3bb411c5e27916892424cbfc49e75e52d0f14da732946d1e8e5cf06493392b604952b5bfea3288753a4fc53fd90b743 SHA512 398c4782de8339c332381156dd36f05f2006f8c5a78bd78ee32ef05fbb1ab121a21020b3726020282e632bdc14f98cf2828f329c229801d63a06d55cab8f3c80
 DIST biz.aQute.bnd-6.3.1.jar 16703723 BLAKE2B 97cc171a926be326abe95695e795ccb575bc6ca770b4c4df7764bdedbd6dfcf5643673484f50cc34f845f27d03ddf8a971c1c502b3b63db2541266c2b35e8e23 SHA512 59d3a50575ea8fcfc5f5c2178f7d40248c987c77ae8afeb0a8c9ec397ce9e4ceae277ba3b26dafc245bd2185bbafeaef219dd1af0988921631b6a8fe0cbd0abf
 DIST biz.aQute.bndlib-6.3.1.jar 3183076 BLAKE2B 73bef88e8f3c8015d259ac36b953672ed9cb0aa5d9dfca3361033a7f37646bb65bbea8be4ef1fb425518e85ec8a9cc63032815671ece5f956b754ecf555dc174 SHA512 7c3f7bc0280beb1b15182c558ef23f431719c046da8473545efe9aeec935776ebf6682cabbb7e7f53dcf2ccca168d8df35859be77121dab04340a5ec7e993608
 EBUILD tomcat-10.1.4.ebuild 6535 BLAKE2B fe7d420607b9a0be02b0a51e4d15d2340187157bc921d6dcc3329edaa045e1404ef123ec2e3a17ff41f16653ea90376685111e3e82b106c52eb558aecce59d1b SHA512 d8b2da94ee390e6f6ea38f6849d4a32d96b9dc0f5553b952b05d675d73dd32b40a6a1b5309c869f4bef7ca3bf7d3c139f0597d8086c11e2298c84f22173ae3f1
+EBUILD tomcat-10.1.5.ebuild 6536 BLAKE2B 17a176b1da199b5fd3c07ab162279ed5e45c0e288ff08b423f3499148e6a88c3372b1ac6890bfdc32556893527ff8739b34aac9adcda08d648af9e252b12ce36 SHA512 024100bf609f16c0ae4f95e2538f6a754dbdb5ef92cb5787ca85f4105aa7ed8d115e0d1badf6a1856bac6eac1f2bd39953d6bb47e890e61694ed1a6b53cd95f1
 EBUILD tomcat-8.5.84.ebuild 5433 BLAKE2B 779607815b07ff151b82e94c6547acd08407b536f297fd4bd56453b5738230ad6c2b35a438d84ce75677234516cd85ac921343ac42c19b148ed8ffafe093565f SHA512 2bb0cbcab94901ffafb0d31a0e8a198e1835e3a432ee36b02764e24db199946308aed92c244432d5143d6791787a694667f28bb3d65609d92b88771b1d871c4c
 EBUILD tomcat-9.0.70.ebuild 6424 BLAKE2B 2189fb588d1e9d65c7ba6e00acc2db9bf747af77693011e9333be410a217c4c6aea6836e168f3b2929edbd63d32d5d45ed443f4e950702ee8b80482f9409ddff SHA512 64bd43df27bad8e5119e1e42d5af81a9a8381a108be27dcb3f143ad4755215aeab7424acf3a389a237cc139603a8c38603dda81f961e34c1a509e3d136bd2766
+EBUILD tomcat-9.0.71.ebuild 6425 BLAKE2B 5ceb76a060f2de8dde7efeeeae73fa7c49a3b7dddedde1cb099fe033f6ae604688dbe4fac740d8d5ad6ec76f155cf6d38202e158fd3f25bbae664abd6a565f28 SHA512 a1aeb48c83c6979efe6824d2057c6c0b3411c257836b8e3b34535a426cdba34c7b3e7962a329bcbbd47a6abbe2adbbe7ba73a83cfcd42530b33cbebd78c09220
 MISC metadata.xml 621 BLAKE2B 5565658450eaf5d63d832ed5f771084532243318f93e66a6241acd067cba1262cd957f8450e5aacdb68dc30933d889889cbceeb8b630b6bb8e8e39e8b95688c8 SHA512 89273106acd986ea2ac909f858ebcd538e42364b1d4a756b3550a805d3477f731db796307acb3db7376b33e199bd714c03bb1201578e97541f45f3100e7480f9
diff --git a/www-servers/tomcat/tomcat-10.1.5.ebuild b/www-servers/tomcat/tomcat-10.1.5.ebuild
new file mode 100644
index 000000000000..d9e29d5a3d86
--- /dev/null
+++ b/www-servers/tomcat/tomcat-10.1.5.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.3.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-6.0/JSP-3.1/EL-5.0/WebSocket-2.1/JASPIC-3.0 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-10/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="10.1"
+KEYWORDS="~amd64 ~amd64-linux"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+ECJ_SLOT="4.26"
+SERVLET_API_SLOT="6.0"
+JSP_API_SLOT="3.1"
+EL_API_SLOT="5.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/glassfish-xmlrpc-api:0
+	>=dev-java/jakartaee-migration-1.0.5:0
+	~dev-java/tomcat-el-api-${PV}:${EL_API_SLOT}
+	~dev-java/tomcat-jsp-api-${PV}:${JSP_API_SLOT}
+	~dev-java/tomcat-servlet-api-${PV}:${SERVLET_API_SLOT}
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-11:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	dev-java/ant-core
+	>=virtual/jdk-11:*
+	test? (
+		dev-java/ant-junit:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/jakarta/{el,servlet} || die
+
+	eapply "${FILESDIR}/${PN}-10.1.0-build.xml.patch"
+
+	local vm_version="$(java-config -g PROVIDES_VERSION)"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},jakartaee-migration,tomcat-servlet-api-${SERVLET_API_SLOT},tomcat-jsp-api-${JSP_API_SLOT},tomcat-el-api-${EL_API_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "Please note that since version 10 the primary package for all implemented APIs"
+	ewarn "has changed from javax.* to jakarta.*. This will almost certainly require code"
+	ewarn "changes to enable applications to migrate from Tomcat 9 and earlier to Tomcat 10 and later."
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/www-servers/tomcat/tomcat-9.0.71.ebuild b/www-servers/tomcat/tomcat-9.0.71.ebuild
new file mode 100644
index 000000000000..d9ebbde0ef2d
--- /dev/null
+++ b/www-servers/tomcat/tomcat-9.0.71.ebuild
@@ -0,0 +1,202 @@
+# Copyright 1999-2023 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=8
+
+JAVA_PKG_IUSE="doc source test"
+
+inherit java-pkg-2 java-ant-2 prefix verify-sig
+
+MY_P="apache-${PN}-${PV}-src"
+
+# Currently we bundle binary versions of bnd.jar and bndlib.jar
+# See bugs #203080 and #676116
+BND_VERSION="6.3.1"
+BND="biz.aQute.bnd-${BND_VERSION}.jar"
+BNDLIB="biz.aQute.bndlib-${BND_VERSION}.jar"
+
+DESCRIPTION="Tomcat Servlet-4.0/JSP-2.3/EL-3.0/WebSocket-1.1/JASPIC-1.1 Container"
+HOMEPAGE="https://tomcat.apache.org/"
+SRC_URI="mirror://apache/${PN}/tomcat-9/v${PV}/src/${MY_P}.tar.gz
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bnd/${BND_VERSION}/${BND}
+	https://repo.maven.apache.org/maven2/biz/aQute/bnd/biz.aQute.bndlib/${BND_VERSION}/${BNDLIB}
+	verify-sig? ( https://downloads.apache.org/tomcat/tomcat-$(ver_cut 1)/v${PV}/src/apache-tomcat-${PV}-src.tar.gz.asc )"
+
+LICENSE="Apache-2.0"
+SLOT="9"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux ~x86-solaris"
+IUSE="extra-webapps"
+
+RESTRICT="test" # can we run them on a production system?
+
+# though it could work with 4.22 and upstream uses 4.20,
+# we still use 4.15 because 4.20+ is currently built with java 11
+# and it would force Tomcat to use at least java 11 too
+ECJ_SLOT="4.26"
+SERVLET_API_SLOT="4.0"
+JSP_API_SLOT="2.3"
+EL_API_SLOT="3.0"
+
+COMMON_DEP="dev-java/eclipse-ecj:${ECJ_SLOT}
+	dev-java/glassfish-xmlrpc-api:0
+	~dev-java/tomcat-el-api-${PV}:${EL_API_SLOT}
+	~dev-java/tomcat-jsp-api-${PV}:${JSP_API_SLOT}
+	~dev-java/tomcat-servlet-api-${PV}:${SERVLET_API_SLOT}
+	dev-java/wsdl4j:0"
+RDEPEND="${COMMON_DEP}
+	acct-group/tomcat
+	acct-user/tomcat
+	>=virtual/jre-1.8:*"
+DEPEND="${COMMON_DEP}
+	app-admin/pwgen
+	>=dev-java/ant-core-1.9.13
+	>=virtual/jdk-1.8:*
+	test? (
+		>=dev-java/ant-junit-1.9:0
+		dev-java/easymock:3.2
+	)"
+
+BDEPEND="verify-sig? ( ~sec-keys/openpgp-keys-apache-tomcat-${PV}:${PV} )"
+VERIFY_SIG_OPENPGP_KEY_PATH="${BROOT}/usr/share/openpgp-keys/tomcat-${PV}.apache.org.asc"
+
+S=${WORKDIR}/${MY_P}
+
+PATCHES=(
+	"${FILESDIR}/${PN}-9.0.50-insufficient-ecj.patch"
+)
+
+BND_HOME="${S}/tomcat-build-libs/bnd"
+BNDLIB_HOME="${S}/tomcat-build-libs/bndlib"
+BND_JAR="${BND_HOME}/${BND}"
+BNDLIB_JAR="${BNDLIB_HOME}/${BND_LIB}"
+
+src_unpack() {
+	if use verify-sig; then
+		verify-sig_verify_detached "${DISTDIR}"/${MY_P}.tar.gz{,.asc}
+	fi
+
+	unpack ${MY_P}.tar.gz
+
+	mkdir -p "${BND_HOME}" "${BNDLIB_HOME}" || die "Failed to create dir"
+	ln -s "${DISTDIR}/${BND}" "${BND_HOME}/" || die "Failed to symlink bnd-*.jar"
+	ln -s "${DISTDIR}/${BND}" "${BNDLIB_HOME}/" || die "Failed to symlink bndlib-*.jar"
+}
+
+src_prepare() {
+	default
+
+	find -name '*.jar' -type f -delete -print || die
+
+	# Remove bundled servlet-api
+	rm -rv java/javax/{el,servlet} || die
+
+	eapply "${FILESDIR}/${PN}-9.0.62-build.xml.patch"
+
+	# For use of catalina.sh in netbeans
+	sed -i -e "/^# ----- Execute The Requested Command/ a\
+		CLASSPATH=\`java-config --with-dependencies --classpath ${PN}-${SLOT}\`" \
+		bin/catalina.sh || die
+
+	java-pkg-2_src_prepare
+}
+
+JAVA_ANT_REWRITE_CLASSPATH="true"
+
+EANT_BUILD_TARGET="deploy"
+EANT_GENTOO_CLASSPATH="eclipse-ecj-${ECJ_SLOT},tomcat-servlet-api-${SERVLET_API_SLOT},tomcat-jsp-api-${JSP_API_SLOT},tomcat-el-api-${EL_API_SLOT},wsdl4j"
+EANT_TEST_GENTOO_CLASSPATH="easymock-3.2"
+EANT_GENTOO_CLASSPATH_EXTRA="${S}/output/classes"
+EANT_NEEDS_TOOLS="true"
+EANT_EXTRA_ARGS="-Dversion=${PV}-gentoo -Dversion.number=${PV} -Dcompile.debug=false -Dbnd.jar=${BND_JAR} -Dbndlib.jar=${BNDLIB_JAR}"
+
+# revisions of the scripts
+IM_REV="-r2"
+INIT_REV="-r1"
+
+src_configure() {
+	java-ant-2_src_configure
+
+	eapply "${FILESDIR}/${PN}-9.0.37-fix-build-rewrite.patch"
+}
+
+src_compile() {
+	EANT_GENTOO_CLASSPATH_EXTRA+=":$(java-pkg_getjar --build-only ant-core ant.jar):$(java-pkg_getjars --build-only glassfish-xmlrpc-api)"
+	LC_ALL=C java-pkg-2_src_compile
+}
+
+src_test() {
+	java-pkg-2_src_test
+}
+
+src_install() {
+	local dest="/usr/share/${PN}-${SLOT}"
+
+	java-pkg_jarinto "${dest}"/bin
+	java-pkg_dojar output/build/bin/*.jar
+	exeinto "${dest}"/bin
+	doexe output/build/bin/*.sh
+
+	java-pkg_jarinto "${dest}"/lib
+	java-pkg_dojar output/build/lib/*.jar
+
+	dodoc RELEASE-NOTES RUNNING.txt
+	use doc && java-pkg_dojavadoc output/dist/webapps/docs/api
+	use source && java-pkg_dosrc java/*
+
+	### Webapps ###
+
+	# add missing docBase
+	local apps="host-manager manager"
+	for app in ${apps}; do
+		sed -i -e "s|=\"true\" >|=\"true\" docBase=\"\$\{catalina.home\}/webapps/${app}\" >|" \
+			output/build/webapps/${app}/META-INF/context.xml || die
+	done
+
+	insinto "${dest}"/webapps
+	doins -r output/build/webapps/{host-manager,manager,ROOT}
+	use extra-webapps && doins -r output/build/webapps/{docs,examples}
+
+	### Config ###
+
+	# create "logs" directory in $CATALINA_BASE
+	# and set correct perms, see #458890
+	dodir "${dest}"/logs
+	fperms 0750 "${dest}"/logs
+
+	# replace the default pw with a random one, see #92281
+	local randpw="$(pwgen -s -B 15 1)"
+	sed -i -e "s|SHUTDOWN|${randpw}|" output/build/conf/server.xml || die
+
+	# prepend gentoo.classpath to common.loader, see #453212
+	sed -i -e 's/^common\.loader=/\0${gentoo.classpath},/' output/build/conf/catalina.properties || die
+
+	insinto "${dest}"
+	doins -r output/build/conf
+
+	### rc ###
+
+	cp "${FILESDIR}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} "${T}" || die
+	eprefixify "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash}
+	sed -i -e "s|@SLOT@|${SLOT}|g" "${T}"/tomcat{.conf,${INIT_REV}.init,-instance-manager${IM_REV}.bash} || die
+
+	insinto "${dest}"/gentoo
+	doins "${T}"/tomcat.conf
+	exeinto "${dest}"/gentoo
+	newexe "${T}"/tomcat${INIT_REV}.init tomcat.init
+	newexe "${T}"/tomcat-instance-manager${IM_REV}.bash tomcat-instance-manager.bash
+}
+
+pkg_postinst() {
+	elog "New ebuilds of Tomcat support running multiple instances. If you used prior version"
+	elog "of Tomcat (<7.0.32), you have to migrate your existing instance to work with new Tomcat."
+	elog "You can find more information at https://wiki.gentoo.org/wiki/Apache_Tomcat"
+
+	elog "To manage Tomcat instances, run:"
+	elog "  ${EPREFIX}/usr/share/${PN}-${SLOT}/gentoo/tomcat-instance-manager.bash --help"
+
+	ewarn "tomcat-dbcp.jar is not built at this time. Please fetch jar"
+	ewarn "from upstream binary if you need it. Gentoo Bug # 144276"
+
+	einfo "Please read https://wiki.gentoo.org/wiki/Apache_Tomcat and"
+	einfo "https://wiki.gentoo.org/wiki/Project:Java/Tomcat_6_Guide for more information."
+}
diff --git a/x11-terms/Manifest.gz b/x11-terms/Manifest.gz
index 52e261051f05..0155a674afc5 100644
--- a/x11-terms/Manifest.gz
+++ b/x11-terms/Manifest.gz
diff --git a/x11-terms/kitty/Manifest b/x11-terms/kitty/Manifest
index c8daad347798..881cc5165b12 100644
--- a/x11-terms/kitty/Manifest
+++ b/x11-terms/kitty/Manifest
@@ -1,5 +1,5 @@
 DIST kitty-0.26.5.tar.xz 4749988 BLAKE2B 488969b4d7c6aed489a540a8e3bee183345fcfb7e05ae5604f4af40f0720ed931cff82cf389e2fa4015eed74762c0630481a99eeb9302c22c89c4f3e247170d4 SHA512 086ae03d0e382afbe3001e357ef51388c7a8e81fa5b4bf9ce8b123a7fc8bfff3bd68d074e926f540a1f2b83062baa831e44d29c017cabfe8221bebe49b64e808
 DIST kitty-0.26.5.tar.xz.sig 566 BLAKE2B 377202d46e66854e0cf1998506e0fafca54b33d85264e47c13aa4b98d272c786809375f1e277ec169291e06809f11b5b061ec1243a708711fa2350243ad1eca2 SHA512 0c691d8becff2b0f24e09b941d7315efaac831beacfed6f66b9186bde9c502f2ae86289f4b0d8fa6a34624dce7a1e958ba2d0502fd87003ba08b07fa07c6ae17
 EBUILD kitty-0.26.5-r1.ebuild 3431 BLAKE2B 51eec6dbc5250040fb5c223646586f6114f97eefaa718baab7b3e9c338351467f67a26dd668cf511b18b082d0083ca202a60e8eb7d79a6aaa63ebbe8ba60e821 SHA512 42b24d286efc77299eb984fabf2b4272ced8d9a0a567251ab750b417dfe3584234c04afd8fd19f487d164954915a3ae382fd6bbd4be13d87e5d9544bc5de3920
-EBUILD kitty-9999.ebuild 3932 BLAKE2B 12e20e39d05db393c186f9502723940cffdcd9910293268e2f66c9dcc05872f40c5c52031a21ae24b8f664835852d0895a5d8de79264bd0c51a3ce45941b8b47 SHA512 baf5f0f4fb2f6709752ada50364db8459172601bbc6332061c7c77e96e5904f4c64f435bdf9cfed45ef3aae18975354cc8523ef82c7603149d9720f296a8b723
+EBUILD kitty-9999.ebuild 3928 BLAKE2B c2f6da85b4338bbaa0f921be13368ef3733960e805ef056d032299dcdf2b4731e8477968cf6a9ecd9a1d1ca59aab287cb0d5cdd962612f76c4bbe0fdfcfb9a4e SHA512 c816fa286c98a0848d08eec0a2b7ec943d17ce1a21c64fd3580a6e754e035baf2b0801d78fe5d603b1c1abc92c318a6c924b4a2385ae8205bab345d3c0d86599
 MISC metadata.xml 653 BLAKE2B fd4fd98a8cac30a2e941770c43af4cd475eea1609f35f454780eb4463e052ccb44a1c7f84fe3f1e29eef08041d57d5bc8a688a404d105e7d15691f41cf701f48 SHA512 4c3c390b41e81444a7a22eb78afa92b7a5a15ad8558e92d387da64364bbe0c2fa1088aa9ea7516814280eefc1e7221a7b963a54beeab0213dc2974fcbc2fd003
diff --git a/x11-terms/kitty/kitty-9999.ebuild b/x11-terms/kitty/kitty-9999.ebuild
index 283036724d01..bba4e7fe09c5 100644
--- a/x11-terms/kitty/kitty-9999.ebuild
+++ b/x11-terms/kitty/kitty-9999.ebuild
@@ -68,7 +68,7 @@ BDEPEND="
 	wayland? ( dev-util/wayland-scanner )"
 [[ ${PV} == 9999 ]] || BDEPEND+=" verify-sig? ( sec-keys/openpgp-keys-kovidgoyal )"
 
-QA_FLAGS_IGNORED="usr/bin/kitty-tool" # written in Go
+QA_FLAGS_IGNORED="usr/bin/kitten" # written in Go
 
 src_unpack() {
 	if [[ ${PV} == 9999 ]]; then
author	V3n3RiX <venerix@koprulu.sector>	2023-01-15 11:54:41 +0000
committer	V3n3RiX <venerix@koprulu.sector>	2023-01-15 11:54:41 +0000
commit	046c3c0984fd20387a9f86cdd0842fd81e70d94f (patch)
tree	cc10a34db3ff175a68ebd1f398672156c9aad0e9
parent	bdc9b55c978e3939e16252e66e83950cbecbf77c (diff)